# HG changeset patch # User ib # Date 1358600441 0 # Node ID 7820bad7c1f8ba193672399f7052e1a2b139fa07 # Parent 36527758158b32e8376ae30d45377869e6736f85 Cosmetic: Rename ws functions for the sake of consistency. These have been forgotten in r35775: wsSizeHint -> wsWindowSizeHint wsMapWait -> wsWindowMapWait diff -r 36527758158b -r 7820bad7c1f8 gui/wm/ws.c --- 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;