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

[ib]

Author: ib
Date: Thu Jan 24 16:34:10 2013
New Revision: 35848

Log:
Partly revert r35847.

There were non-cosmetic changes that weren't suppose
to be in that commit. Revert them.

Modified:
   trunk/gui/wm/ws.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jan 24 16:27:26 2013	(r35847)
+++ trunk/gui/wm/ws.c	Thu Jan 24 16:34:10 2013	(r35848)
@@ -1019,6 +1019,9 @@ void wsWindowIcon(Display *display, Wind
     }
 }
 
+// ----------------------------------------------------------------------------------------------
+//    Set window background to 'color'.
+// ----------------------------------------------------------------------------------------------
 /**
  * @brief Pack color components @a r, @a g and @a b into 15 bits.
  *
@@ -1063,16 +1066,6 @@ static int pack_rgb16(int r, int g, int 
     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 @@ void wsWindowBackground(wsWindow *win, i
         ;
     }
 
-    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);
 }
 
 // ----------------------------------------------------------------------------------------------