[MPlayer-cvslog] r34078 - in trunk/gui: ui/menu.c ui/sub.c ui/widgets.c wm/ws.c wm/ws.h

[ib]

Author: ib
Date: Thu Sep  8 12:34:17 2011
New Revision: 34078

Log:
Cosmetic: Rename wsMoveTopWindow() wsRaiseWindowTop().

Additionally, rename parameter wsDisplay dsp and remove commented code.

Modified:
   trunk/gui/ui/menu.c
   trunk/gui/ui/sub.c
   trunk/gui/ui/widgets.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Wed Sep  7 21:17:00 2011	(r34077)
+++ trunk/gui/ui/menu.c	Thu Sep  8 12:34:17 2011	(r34078)
@@ -108,7 +108,7 @@ void uiShowMenu( int mx,int my )
  menuItem = 0;
 
  wsMoveWindow( &guiApp.menuWindow,False,x,y );
- wsMoveTopWindow( wsDisplay,guiApp.menuWindow.WindowID );
+ wsRaiseWindowTop( wsDisplay,guiApp.menuWindow.WindowID );
  wsSetLayer( wsDisplay,guiApp.menuWindow.WindowID,1 );
  menuRender=1;
  wsVisibleWindow( &guiApp.menuWindow,wsShowWindow );

Modified: trunk/gui/ui/sub.c
==============================================================================
--- trunk/gui/ui/sub.c	Wed Sep  7 21:17:00 2011	(r34077)
+++ trunk/gui/ui/sub.c	Thu Sep  8 12:34:17 2011	(r34078)
@@ -102,8 +102,8 @@ void uiSubMouseHandle( int Button,int X,
    case wsRLMouseButton:
           if ( ( !mplSubMoved )&&( guiApp.subWindow.isFullScreen ) )
            {
-            if( subVisible++%2 ) wsMoveTopWindow( wsDisplay,guiApp.mainWindow.WindowID );
-             else wsMoveTopWindow( wsDisplay,guiApp.subWindow.WindowID );
+            if( subVisible++%2 ) wsRaiseWindowTop( wsDisplay,guiApp.mainWindow.WindowID );
+             else wsRaiseWindowTop( wsDisplay,guiApp.subWindow.WindowID );
 	   }
           msButton=0;
           mplSubMoved=0;

Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/ui/widgets.c	Wed Sep  7 21:17:00 2011	(r34077)
+++ trunk/gui/ui/widgets.c	Thu Sep  8 12:34:17 2011	(r34078)
@@ -223,7 +223,7 @@ void gtkSetLayer(GtkWidget *wdg)
 
 void gtkActive(GtkWidget *wdg)
 {
-    wsMoveTopWindow(gdk_display, GDK_WINDOW_XWINDOW(wdg->window));
+    wsRaiseWindowTop(gdk_display, GDK_WINDOW_XWINDOW(wdg->window));
 }
 
 void gtkShow(int type, char *param)

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Wed Sep  7 21:17:00 2011	(r34077)
+++ trunk/gui/wm/ws.c	Thu Sep  8 12:34:17 2011	(r34078)
@@ -1141,12 +1141,10 @@ void wsIconify(wsTWindow win)
 // ----------------------------------------------------------------------------------------------
 //    Move top the window.
 // ----------------------------------------------------------------------------------------------
-void wsMoveTopWindow(Display *wsDisplay, Window win)
+void wsRaiseWindowTop(Display *dsp, Window win)
 {
-// XUnmapWindow( wsDisplay,win );
-// XMapWindow( wsDisplay,win );
-    XMapRaised(wsDisplay, win);
-    XRaiseWindow(wsDisplay, win);
+    XMapRaised(dsp, win);
+    XRaiseWindow(dsp, win);
 }
 
 // ----------------------------------------------------------------------------------------------

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Wed Sep  7 21:17:00 2011	(r34077)
+++ trunk/gui/wm/ws.h	Thu Sep  8 12:34:17 2011	(r34078)
@@ -232,7 +232,7 @@ void wsDestroyWindow(wsTWindow *win);
 void wsMoveWindow(wsTWindow *win, int b, int x, int y);
 void wsResizeWindow(wsTWindow *win, int sx, int sy);
 void wsIconify(wsTWindow win);
-void wsMoveTopWindow(Display *wsDisplay, Window win);
+void wsRaiseWindowTop(Display *dsp, Window win);
 void wsSetBackground(wsTWindow *win, int color);
 void wsSetForegroundRGB(wsTWindow *win, int r, int g, int b);
 void wsSetBackgroundRGB(wsTWindow *win, int r, int g, int b);