Mercurial > mplayer.hg
changeset 35738:c2b6074cc28d
Remove wsWindowClear().
Since it always follows a wsWindowBackground() call, add XClearWindow()
to wsWindowBackground(). wsWindowClear() is obsolete then and can be
removed.
author | ib |
---|---|
date | Wed, 23 Jan 2013 14:25:22 +0000 |
parents | 1bdc6cea0722 |
children | 6b82e3079aea |
files | gui/interface.c gui/ui/actions.c gui/wm/ws.c gui/wm/ws.h |
diffstat | 4 files changed, 0 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Wed Jan 23 14:10:24 2013 +0000 +++ b/gui/interface.c Wed Jan 23 14:25:22 2013 +0000 @@ -203,7 +203,6 @@ guiApp.videoWindow.DandDHandler = uiDandDHandler; wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); - wsWindowClear(&guiApp.videoWindow); if (guiApp.video.Bitmap.Image) wsImageConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image); @@ -873,7 +872,6 @@ wsEvents(); uiVideoRender = True; wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); - wsWindowClear(&guiApp.videoWindow); wsWindowRedraw(&guiApp.videoWindow); wsMouseVisibility(&guiApp.videoWindow, wsShowMouseCursor); }
--- a/gui/ui/actions.c Wed Jan 23 14:10:24 2013 +0000 +++ b/gui/ui/actions.c Wed Jan 23 14:25:22 2013 +0000 @@ -91,7 +91,6 @@ gui(GUI_SET_STATE, (void *)GUI_PLAY); uiVideoRender = False; wsWindowBackground(&guiApp.videoWindow, 0, 0, 0); - wsWindowClear(&guiApp.videoWindow); } /** @@ -209,7 +208,6 @@ if (!guiInfo.Playing) { uiVideoRender = True; wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); - wsWindowClear(&guiApp.videoWindow); wsWindowRedraw(&guiApp.videoWindow); }
--- a/gui/wm/ws.c Wed Jan 23 14:10:24 2013 +0000 +++ b/gui/wm/ws.c Wed Jan 23 14:25:22 2013 +0000 @@ -1099,15 +1099,6 @@ } XSetWindowBackground(wsDisplay, win->WindowID, color); -} - -/** - * @brief Clear the entire area in a window. - * - * @param win pointer to a ws window structure - */ -void wsWindowClear(wsWindow *win) -{ XClearWindow(wsDisplay, win->WindowID); }
--- a/gui/wm/ws.h Wed Jan 23 14:10:24 2013 +0000 +++ b/gui/wm/ws.h Wed Jan 23 14:25:22 2013 +0000 @@ -172,7 +172,6 @@ void wsWindowIconify(wsWindow *win); void wsWindowRaiseTop(Display *display, Window Win); void wsWindowBackground(wsWindow *win, int r, int g, int b); -void wsWindowClear(wsWindow *win); void wsWindowVisibility(wsWindow *win, int vis); void wsWindowLayer(Display *display, Window Win, Bool fullscreen); void wsWindowFullscreen(wsWindow *win);