[vlc-devel] commit: X11 common: code factorization ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Thu Apr  9 12:47:30 2009 +0300| [62701cf226049855068ca4d773a904877ed15cdd] | committer: Rémi Denis-Courmont 

X11 common: code factorization

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62701cf226049855068ca4d773a904877ed15cdd
---

 modules/video_output/x11/xcommon.c |   53 +++++++++++------------------------
 1 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 7d9bf64..4b9835e 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -3315,47 +3315,28 @@ static int ConvertKey( int i_key )
  *****************************************************************************/
 static int WindowOnTop( vout_thread_t *p_vout, bool b_on_top )
 {
-    if( p_vout->p_sys->b_net_wm_state_stays_on_top )
-    {
-        XClientMessageEvent event;
+    XClientMessageEvent event;
 
-        memset( &event, 0, sizeof( XClientMessageEvent ) );
+    memset( &event, 0, sizeof( XClientMessageEvent ) );
+    event.type = ClientMessage;
+    event.message_type = p_vout->p_sys->net_wm_state;
+    event.display = p_vout->p_sys->p_display;
+    event.window = p_vout->p_sys->p_win->base_window;
+    event.format = 32;
+    event.data.l[ 0 ] = b_on_top; /* set property */
 
-        event.type = ClientMessage;
-        event.message_type = p_vout->p_sys->net_wm_state;
-        event.display = p_vout->p_sys->p_display;
-        event.window = p_vout->p_sys->p_win->base_window;
-        event.format = 32;
-        event.data.l[ 0 ] = b_on_top; /* set property */
+    if( p_vout->p_sys->b_net_wm_state_stays_on_top )
         event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_stays_on_top;
-
-        XSendEvent( p_vout->p_sys->p_display,
-                    DefaultRootWindow( p_vout->p_sys->p_display ),
-                    False, SubstructureRedirectMask,
-                    (XEvent*)&event );
-    }
-
-    /* use _NET_WM_STATE_ABOVE if window manager
-     * doesn't handle _NET_WM_STATE_STAYS_ON_TOP */
     else if( p_vout->p_sys->b_net_wm_state_above )
-    {
-        XClientMessageEvent event;
-
-        memset( &event, 0, sizeof( XClientMessageEvent ) );
-
-        event.type = ClientMessage;
-        event.message_type = p_vout->p_sys->net_wm_state;
-        event.display = p_vout->p_sys->p_display;
-        event.window = p_vout->p_sys->p_win->base_window;
-        event.format = 32;
-        event.data.l[ 0 ] = b_on_top; /* set property */
+        /* use _NET_WM_STATE_ABOVE if window manager
+         * doesn't handle _NET_WM_STATE_STAYS_ON_TOP */
         event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_above;
+    else
+        return VLC_EGENERIC;
 
-        XSendEvent( p_vout->p_sys->p_display,
-                    DefaultRootWindow( p_vout->p_sys->p_display ),
-                    False, SubstructureRedirectMask,
-                    (XEvent*)&event );
-    }
-
+    XSendEvent( p_vout->p_sys->p_display,
+                DefaultRootWindow( p_vout->p_sys->p_display ),
+                False, SubstructureRedirectMask,
+                (XEvent*)&event );
     return VLC_SUCCESS;
 }