[MPlayer-cvslog] r34087 - in trunk/gui/wm: ws.c ws.h

[ib]

Author: ib
Date: Fri Sep  9 15:13:57 2011
New Revision: 34087

Log:
Cosmetic: Rename all Display parameters dsp dpy.

Modified:
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Sep  8 17:31:25 2011	(r34086)
+++ trunk/gui/wm/ws.c	Fri Sep  9 15:13:57 2011	(r34087)
@@ -1171,13 +1171,13 @@ void wsIconify(wsTWindow win)
 /**
  * @brief Map a window and raise it to the top.
  *
- * @param dsp display
+ * @param dpy display
  * @param win window
  */
-void wsRaiseWindowTop(Display *dsp, Window win)
+void wsRaiseWindowTop(Display *dpy, Window win)
 {
-    XMapRaised(dsp, win);
-    XRaiseWindow(dsp, win);
+    XMapRaised(dpy, win);
+    XRaiseWindow(dpy, win);
 }
 
 // ----------------------------------------------------------------------------------------------
@@ -1572,18 +1572,18 @@ void wsSetShape(wsTWindow *win, char *da
  *        This function sets the X icon hint as well as
  *        the properties KWM_WIN_ICON and _NET_WM_ICON.
  *
- * @param dsp display
+ * @param dpy display
  * @param win window
  * @param icon pointer to the icons
  */
-void wsSetIcon(Display *dsp, Window win, guiIcon_t *icon)
+void wsSetIcon(Display *dpy, Window win, guiIcon_t *icon)
 {
     XWMHints *wm;
     Atom iconatom;
     long data[2];
 
     if (icon->normal) {
-        wm = XGetWMHints(dsp, win);
+        wm = XGetWMHints(dpy, win);
 
         if (!wm)
             wm = XAllocWMHints();
@@ -1592,20 +1592,20 @@ void wsSetIcon(Display *dsp, Window win,
         wm->icon_mask   = icon->normal_mask;
         wm->flags      |= IconPixmapHint | IconMaskHint;
 
-        XSetWMHints(dsp, win, wm);
+        XSetWMHints(dpy, win, wm);
         XFree(wm);
     }
 
     if (icon->small || icon->normal) {
-        iconatom = XInternAtom(dsp, "KWM_WIN_ICON", False);
+        iconatom = XInternAtom(dpy, "KWM_WIN_ICON", False);
         data[0]  = (icon->small ? icon->small : icon->normal);
         data[1]  = (icon->small ? icon->small_mask : icon->normal_mask);
 
-        XChangeProperty(dsp, win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);
+        XChangeProperty(dpy, win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);
     }
 
     if (icon->collection) {
-        iconatom = XInternAtom(dsp, "_NET_WM_ICON", False);
-        XChangeProperty(dsp, win, iconatom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)icon->collection, icon->collection_size);
+        iconatom = XInternAtom(dpy, "_NET_WM_ICON", False);
+        XChangeProperty(dpy, win, iconatom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)icon->collection, icon->collection_size);
     }
 }

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Thu Sep  8 17:31:25 2011	(r34086)
+++ trunk/gui/wm/ws.h	Fri Sep  9 15:13:57 2011	(r34087)
@@ -233,7 +233,7 @@ void wsMoveWindow(wsTWindow *win, Bool a
 void wsMoveWindowWithin(wsTWindow *win, Bool abs, int x, int y);
 void wsResizeWindow(wsTWindow *win, int sx, int sy);
 void wsIconify(wsTWindow win);
-void wsRaiseWindowTop(Display *dsp, Window win);
+void wsRaiseWindowTop(Display *dpy, Window win);
 void wsSetBackground(wsTWindow *win, int color);
 void wsSetForegroundRGB(wsTWindow *win, int r, int g, int b);
 void wsSetBackgroundRGB(wsTWindow *win, int r, int g, int b);
@@ -245,7 +245,7 @@ void wsSetLayer(Display *wsDisplay, Wind
 void wsFullScreen(wsTWindow *win);
 void wsPostRedisplay(wsTWindow *win);
 void wsSetShape(wsTWindow *win, char *data);
-void wsSetIcon(Display *dsp, Window win, guiIcon_t *icon);
+void wsSetIcon(Display *dpy, Window win, guiIcon_t *icon);
 
 // ----------------------------------------------------------------------------------------------
 //    Draw string at x,y with fc ( foreground color ) and bc ( background color ).