[MPlayer-cvslog] r35794 - trunk/gui/wm/ws.c

[ib]

Author: ib
Date: Sat Jan 19 14:00:41 2013
New Revision: 35794

Log:
Cosmetic: Rename ws functions for the sake of consistency.

These have been forgotten in r35775:

  wsSizeHint	-> wsWindowSizeHint
  wsMapWait	-> wsWindowMapWait

Modified:
   trunk/gui/wm/ws.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Sat Jan 19 13:55:26 2013	(r35793)
+++ trunk/gui/wm/ws.c	Sat Jan 19 14:00:41 2013	(r35794)
@@ -733,7 +733,7 @@ static void wsWindowUpdatePosition(wsWin
  *
  * @param win pointer to a ws window structure
  */
-static void wsSizeHint(wsWindow *win)
+static void wsWindowSizeHint(wsWindow *win)
 {
     XSizeHints size;
 
@@ -820,7 +820,7 @@ static void wsWindowDecoration(wsWindow 
  *
  * @param win pointer to a ws window structure
  */
-static void wsMapWait(wsWindow *win)
+static void wsWindowMapWait(wsWindow *win)
 {
     XEvent xev;
 
@@ -940,7 +940,7 @@ void wsWindowCreate(wsWindow *win, int x
     wsClassHint.res_class = "MPlayer";
     XSetClassHint(wsDisplay, win->WindowID, &wsClassHint);
 
-    wsSizeHint(win);
+    wsWindowSizeHint(win);
 
     win->WMHints.flags = InputHint | StateHint;
     win->WMHints.input = True;
@@ -974,7 +974,7 @@ void wsWindowCreate(wsWindow *win, int x
 
     if (p & wsShowWindow) {
         XMapWindow(wsDisplay, win->WindowID);
-        wsMapWait(win);
+        wsWindowMapWait(win);
     }
 
     wsImageCreate(win, win->Width, win->Height);
@@ -1151,7 +1151,7 @@ void wsWindowMove(wsWindow *win, Bool ab
     } else
         wsWindowUpdatePosition(win, x, y, win->Width, win->Height);
 
-    wsSizeHint(win);
+    wsWindowSizeHint(win);
     XMoveWindow(wsDisplay, win->WindowID, win->X, win->Y);
 }
 
@@ -1201,7 +1201,7 @@ void wsWindowResize(wsWindow *win, int w
     if (vo_wm_type == 0)
         XUnmapWindow(wsDisplay, win->WindowID);
 
-    wsSizeHint(win);
+    wsWindowSizeHint(win);
     XResizeWindow(wsDisplay, win->WindowID, w, h);
 
     if (vo_wm_type == 0)
@@ -1256,7 +1256,7 @@ void wsWindowFullscreen(wsWindow *win)
         if (!win->isFullScreen)
             wsWindowDecoration(win);
 
-        wsSizeHint(win);
+        wsWindowSizeHint(win);
         wsWindowLayer(wsDisplay, win->WindowID, win->isFullScreen);
         XMoveResizeWindow(wsDisplay, win->WindowID, win->X, win->Y, win->Width, win->Height);
     }
@@ -1285,7 +1285,7 @@ void wsWindowVisibility(wsWindow *win, i
     case wsShowWindow:
 
         XMapRaised(wsDisplay, win->WindowID);
-        wsMapWait(win);
+        wsWindowMapWait(win);
 
         if (vo_fs_type & vo_wm_FULLSCREEN)
             win->isFullScreen = False;