Workspace/WM: apply appropriate wmaker fixes.

Author: trunkmaster

Applications/Workspace/WM/appicon.c

@@ -159,6 +159,10 @@ WAppIcon *wAppIconCreateForDock(WScreen *scr, const char *command, const char *w
 
 void create_appicon_for_application(WApplication *wapp, WWindow *wwin)
 {
+  /* Transient windows should never get their own appicon */
+  if (wwin->transient_for != None && wwin->transient_for != wwin->screen->root_win) {
+    return;
+  }
   /* Try to create an icon from the dock or clip */
   create_appicon_from_dock(wwin, wapp, wapp->main_window);
 

Applications/Workspace/WM/window.c

@@ -2153,6 +2153,14 @@ void wWindowConfigure(WWindow *wwin, int req_x, int req_y, int req_width, int re
       wFrameWindowConfigure(wwin->frame, req_x, req_y, req_width, h);
     }
 
+    /*
+     * When the frame is resized/moved, the X server repositions a client
+     * with non-NorthWest gravity inside the frame to compensate (visible as
+     * a GravityNotify with xev), leaving it at the wrong offset.
+     */
+    if (wwin->normal_hints->win_gravity != NorthWestGravity)
+      XMoveWindow(dpy, wwin->client_win, 0, wwin->frame->top_width);
+    
     if (!(req_height > wwin->frame->core->height || req_width > wwin->frame->core->width))
       XResizeWindow(dpy, wwin->client_win, req_width, req_height);
 

Applications/Workspace/WM/wmspec.c

@@ -683,11 +683,13 @@ static RImage *_makeRImageFromARGBData(unsigned long *data)
   height = data[1];
   size = width * height;
 
-  if (size == 0)
+  if (size == 0) {
     return NULL;
-
+  }
   image = RCreateImage(width, height, True);
-
+  if (!image) {
+    return NULL;
+  }
   for (imgdata = image->data, i = 2; i < size + 2; i++, imgdata += 4) {
     pixel = data[i];
     imgdata[3] = (pixel >> 24) & 0xff; /* A */