Mercurial > mplayer.hg

changeset 35754:5b5a3108e59f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Partly revert r35847. There were non-cosmetic changes that weren't suppose to be in that commit. Revert them.
author ib
date Thu, 24 Jan 2013 15:34:10 +0000
parents 9c74edcbbc96
children 589cf8a5f165
files gui/wm/ws.c
diffstat 1 files changed, 5 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Thu Jan 24 15:27:26 2013 +0000
+++ b/gui/wm/ws.c	Thu Jan 24 15:34:10 2013 +0000
@@ -1019,6 +1019,9 @@
     }
 }
 
+// ----------------------------------------------------------------------------------------------
+//    Set window background to 'color'.
+// ----------------------------------------------------------------------------------------------
 /**
  * @brief Pack color components @a r, @a g and @a b into 15 bits.
  *
@@ -1063,16 +1066,6 @@
     return pixel;
 }
 
-/**
- * @brief Set and fill, or unset a window background.
- *
- * @param win pointer to a ws window structure
- * @param r red (0 - 255, or -1)
- * @param g green (0 - 255, or -1)
- * @param b blue (0 - 255, or -1)
- *
- * @note Passing -1 for @a r, @a g and @a b unsets the background.
- */
 void wsWindowBackground(wsWindow *win, int r, int g, int b)
 {
     int color = 0;
@@ -1108,12 +1101,8 @@
         ;
     }
 
-    if (r == -1 && g == -1 && b == -1)
-        XSetWindowBackgroundPixmap(wsDisplay, win->WindowID, None);
-    else {
-        XSetWindowBackground(wsDisplay, win->WindowID, color);
-        XClearWindow(wsDisplay, win->WindowID);
-    }
+    XSetWindowBackground(wsDisplay, win->WindowID, color);
+    XClearWindow(wsDisplay, win->WindowID);
 }
 
 // ----------------------------------------------------------------------------------------------