# HG changeset patch # User ib # Date 1314901953 0 # Node ID 8082db6c946ab8bb40792296483c368ecaf18c43 # Parent 4721b1537f8055ee926795bb7b269e6e3366dcf1 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. diff -r 4721b1537f80 -r 8082db6c946a gui/wm/ws.c --- 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