RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 08:37:59 +00:00
Code Issues Releases Wiki Activity

First attempts at supporting -fs with -wid, -vo gl on X11 only so far

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29556 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-08-27 12:03:02 +00:00
parent bdf9a6321d
commit e8429f1f5b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvo/vo_gl.c
View File

@ -1149,6 +1149,9 @@ static int control(uint32_t request, void *data, ...)
if (scaled_osd) {r->w = image_width; r->h = image_height;} if (scaled_osd) {r->w = image_width; r->h = image_height;}
else if (vo_fs) { else if (vo_fs) {
r->w = vo_screenwidth; r->h = vo_screenheight; r->w = vo_screenwidth; r->h = vo_screenheight;
if (WinID >= 0) {
r->w = vo_dwidth; r->h = vo_dheight;
}
r->ml = r->mr = ass_border_x; r->ml = r->mr = ass_border_x;
r->mt = r->mb = ass_border_y; r->mt = r->mb = ass_border_y;
} else { } else {

7
libvo/x11_common.c
View File

@ -1086,6 +1086,7 @@ void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y,
{ {
XGCValues xgcv; XGCValues xgcv;
if (WinID >= 0) { if (WinID >= 0) {
vo_fs = flags & VOFLAG_FULLSCREEN;
vo_window = WinID ? (Window)WinID : mRootWin; vo_window = WinID ? (Window)WinID : mRootWin;
if (col_map != CopyFromParent) { if (col_map != CopyFromParent) {
unsigned long xswamask = CWColormap; unsigned long xswamask = CWColormap;
@ -1343,7 +1344,11 @@ void vo_x11_fullscreen(void)
{ {
int x, y, w, h; int x, y, w, h;
if (WinID >= 0 || vo_fs_flip) if (WinID >= 0) {
vo_fs = !vo_fs;
return;
}
if (vo_fs_flip)
return; return;
if (vo_fs) if (vo_fs)