Mercurial > mplayer.hg

changeset 33954:8082db6c946a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some cosmetic changes in wsFullScreen(). Place vo_x11_ewmh_fullscreen() statements before non-EWMH statements and set isFullScreen flag right after state has been changed.
author ib
date Thu, 01 Sep 2011 18:32:33 +0000
parents 4721b1537f80
children f56df2bcfc7b
files gui/wm/ws.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Thu Sep 01 18:22:58 2011 +0000
+++ b/gui/wm/ws.c	Thu Sep 01 18:32:33 2011 +0000
@@ -900,12 +900,14 @@
             decoration  = win->Decorations;
         }
 
+        win->isFullScreen = False;
+
 #ifdef ENABLE_DPMS
         wsScreenSaverOn(wsDisplay);
 #endif
+    } else {
+        vo_x11_ewmh_fullscreen(win->WindowID, _NET_WM_STATE_ADD); // adds fullscreen state if wm supports EWMH
 
-        win->isFullScreen = False;
-    } else {
         if (!(vo_fs_type & vo_wm_FULLSCREEN)) { // shouldn't be needed with EWMH fs
             win->OldX      = win->X;
             win->OldY      = win->Y;
@@ -931,11 +933,10 @@
         }
 
         win->isFullScreen = True;
+
 #ifdef ENABLE_DPMS
         wsScreenSaverOff(wsDisplay);
 #endif
-
-        vo_x11_ewmh_fullscreen(win->WindowID, _NET_WM_STATE_ADD); // adds fullscreen state if wm supports EWMH
     }
 
     if (!(vo_fs_type & vo_wm_FULLSCREEN)) { // shouldn't be needed with EWMH fs