Mercurial > mplayer.hg

changeset 35700:7820bad7c1f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename ws functions for the sake of consistency. These have been forgotten in r35775: wsSizeHint -> wsWindowSizeHint wsMapWait -> wsWindowMapWait
author ib
date Sat, 19 Jan 2013 13:00:41 +0000
parents 36527758158b
children c7866af24567
files gui/wm/ws.c
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Sat Jan 19 12:55:26 2013 +0000
+++ b/gui/wm/ws.c	Sat Jan 19 13:00:41 2013 +0000
@@ -733,7 +733,7 @@
  *
  * @param win pointer to a ws window structure
  */
-static void wsSizeHint(wsWindow *win)
+static void wsWindowSizeHint(wsWindow *win)
 {
     XSizeHints size;
 
@@ -820,7 +820,7 @@
  *
  * @param win pointer to a ws window structure
  */
-static void wsMapWait(wsWindow *win)
+static void wsWindowMapWait(wsWindow *win)
 {
     XEvent xev;
 
@@ -940,7 +940,7 @@
     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 @@
 
     if (p & wsShowWindow) {
         XMapWindow(wsDisplay, win->WindowID);
-        wsMapWait(win);
+        wsWindowMapWait(win);
     }
 
     wsImageCreate(win, win->Width, win->Height);
@@ -1151,7 +1151,7 @@
     } 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 @@
     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 @@
         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 @@
     case wsShowWindow:
 
         XMapRaised(wsDisplay, win->WindowID);
-        wsMapWait(win);
+        wsWindowMapWait(win);
 
         if (vo_fs_type & vo_wm_FULLSCREEN)
             win->isFullScreen = False;