- Fixed Clip's workspace menu mapping to be consistent with the others

- Fixed bug in wmsetbg that caused scale and maxscale to both do maxscale
  (Alexey Voinov <voins@voins.program.ru>)

ChangeLog

@@ -62,6 +62,9 @@ Changes since version 0.80.2:
 - Autoarrange icons after unhiding an application that has miniaturized
   windows, else they may cover other icons which are now in the positions
   they have occupied before hiding
+- Fixed Clip's workspace menu mapping to be consistent with the others
+- Fixed bug in wmsetbg that caused scale and maxscale to both do maxscale
+  (Alexey Voinov <voins@voins.program.ru>)
 
 
 Changes since version 0.80.1:

TODO

@@ -14,7 +14,6 @@ Do ASAP:
 
 Need to do:
 ===========
-- fix scaling/maxscaling code. it seem to always maxscale
 - impelment a generic pixmap type, which receives attributes
   (scaled/maxscaled/centered/tiled, smoothed, size/position, ...)
 - allow user to select/restore default root menu from wprefs

src/dock.c

@@ -2641,9 +2641,10 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
 }
 
 
-static int onScreen(WScreen *scr, int x, int y, int sx, int ex, int sy, int ey)
+static int
+onScreen(WScreen *scr, int x, int y, int sx, int ex, int sy, int ey)
 {
-    WMRect rect = { (x), (y), (ICON_SIZE), (ICON_SIZE) };
+    WMRect rect = {x, y, ICON_SIZE, ICON_SIZE};
     int flags;
 
     wGetRectPlacementInfo(scr, rect, &flags);
@@ -2651,8 +2652,6 @@ static int onScreen(WScreen *scr, int x, int y, int sx, int ex, int sy, int ey)
     return !(flags & (XFLAG_DEAD | XFLAG_PARTIAL));
 }
 
-#define ON_SCREEN(x, y, sx, ex, sy, ey) onScreen(scr, x, y, sx, ex, sy, ey)
-
 
 /*
  * returns true if it can find a free slot in the dock,
@@ -2886,7 +2885,7 @@ wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
 	    y = -i;
 	    ty = dock->y_pos + y*ICON_SIZE;
 	    if (slot_map[XY2OFS(x,y)]==0
-		&& ON_SCREEN(tx, ty, sx, ex, sy, ey)) {
+		&& onScreen(scr, tx, ty, sx, ex, sy, ey)) {
 		*x_pos = x;
 		*y_pos = y;
 		done = 1;
@@ -2895,7 +2894,7 @@ wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
 	    y = i;
 	    ty = dock->y_pos + y*ICON_SIZE;
 	    if (slot_map[XY2OFS(x,y)]==0
-		&& ON_SCREEN(tx, ty, sx, ex, sy, ey)) {
+		&& onScreen(scr, tx, ty, sx, ex, sy, ey)) {
 		*x_pos = x;
 		*y_pos = y;
 		done = 1;
@@ -2908,7 +2907,7 @@ wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
 	    x = -i;
 	    tx = dock->x_pos + x*ICON_SIZE;
 	    if (slot_map[XY2OFS(x,y)]==0
-		&& ON_SCREEN(tx, ty, sx, ex, sy, ey)) {
+		&& onScreen(scr, tx, ty, sx, ex, sy, ey)) {
 		*x_pos = x;
 		*y_pos = y;
 		done = 1;
@@ -2917,7 +2916,7 @@ wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
 	    x = i;
 	    tx = dock->x_pos + x*ICON_SIZE;
 	    if (slot_map[XY2OFS(x,y)]==0
-		&& ON_SCREEN(tx, ty, sx, ex, sy, ey)) {
+		&& onScreen(scr, tx, ty, sx, ex, sy, ey)) {
 		*x_pos = x;
 		*y_pos = y;
 		done = 1;
@@ -3573,17 +3572,6 @@ openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event)
 }
 
 
-static void
-openClipWorkspaceMenu(WScreen *scr, int x, int y)
-{
-    if (!scr->clip_ws_menu) {
-	scr->clip_ws_menu = wWorkspaceMenuMake(scr, False);
-    }
-    wWorkspaceMenuUpdate(scr, scr->clip_ws_menu);
-    wMenuMapAt(scr->clip_ws_menu, x, y, False);
-}
-
-
 /******************************************************************/
 static void
 iconDblClick(WObjDescriptor *desc, XEvent *event)
@@ -4157,13 +4145,24 @@ iconMouseDown(WObjDescriptor *desc, XEvent *event)
 
     } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
                aicon==scr->clip_icon) {
-        openClipWorkspaceMenu(scr, event->xbutton.x_root+2,
-			      event->xbutton.y_root+2);
+        if (!scr->clip_ws_menu) {
+            scr->clip_ws_menu = wWorkspaceMenuMake(scr, False);
+        }
         if (scr->clip_ws_menu) {
-            WMenu *menu;
-	    menu = scr->clip_ws_menu;
-            desc = &menu->menu->descriptor;
+            WMenu *wsMenu = scr->clip_ws_menu;
+            int xpos;
 
+            wWorkspaceMenuUpdate(scr, wsMenu);
+
+            xpos = event->xbutton.x_root - wsMenu->frame->core->width/2 - 1;
+            if (xpos < 0) {
+                xpos = 0;
+            } else if (xpos + wsMenu->frame->core->width > scr->scr_width-2) {
+                xpos = scr->scr_width - wsMenu->frame->core->width - 4;
+            }
+            wMenuMapAt(wsMenu, xpos, event->xbutton.y_root+2, False);
+
+            desc = &wsMenu->menu->descriptor;
             event->xany.send_event = True;
             (*desc->handle_mousedown)(desc, event);
         }

util/wmsetbg.c

@@ -134,7 +134,7 @@ applyImage(RContext *rc, BackgroundTexture *texture, RImage *image, char type,
     switch (toupper(type)) {
     case 'S':
     case 'M':
-        if (type == 'S') {
+        if (toupper(type) == 'S') {
             w = width;
             h = height;
         } else {