various bug fixes

src/dialog.c

@@ -968,8 +968,10 @@ wShowInfoPanel(WScreen *scr)
 
 
     if (thePanel) {
-	wRaiseFrame(thePanel->wwin->frame->core);
-	wSetFocusTo(scr, thePanel->wwin);
+	if (thePanel->scr == scr) {
+	    wRaiseFrame(thePanel->wwin->frame->core);
+	    wSetFocusTo(scr, thePanel->wwin);
+	}
 	return;
     }
     

src/dock.c

@@ -425,14 +425,12 @@ wClipMakeTile(WScreen *scr, RImage *normalTile)
     ROperateLine(tile, RAddOperation, tp, 2, wPreferences.icon_size-3,
 		 pt, &light);
 
-    //RDrawLine(tile, ICON_SIZE - 6 - as, 5, ICON_SIZE - 6, 5, &black);
     ROperateLine(tile, RSubtractOperation, ICON_SIZE - 5 - as, 5,
                  ICON_SIZE - 6, 5, &dark);
     ROperateLine(tile, RSubtractOperation, ICON_SIZE - 6 - as, 5,
 		 ICON_SIZE - 6, 5 + as, &dark);
     ROperateLine(tile, RAddOperation, ICON_SIZE - 6, 5, ICON_SIZE - 6, 5 + as,
 		 &light);
-
     
     /* bottom left */
     ROperateLine(tile, RAddOperation, 2, tp+2, pt-2,
@@ -443,14 +441,12 @@ wClipMakeTile(WScreen *scr, RImage *normalTile)
 
     ROperateLine(tile, RSubtractOperation, 5, ICON_SIZE - 6 - as, 
 		 5 + as, ICON_SIZE - 6, &dark);
-    //RDrawLine(tile, 5, ICON_SIZE - 6 - as, 5, ICON_SIZE - 6, &black);
     ROperateLine(tile, RSubtractOperation, 5, ICON_SIZE - 5 - as, 5,
                  ICON_SIZE - 6, &dark);
     
     ROperateLine(tile, RAddOperation, 5, ICON_SIZE - 6, 5 + as, ICON_SIZE - 6,
 		 &light);
 
-
     return tile;
 }
 
@@ -3314,7 +3310,8 @@ iconDblClick(WObjDescriptor *desc, XEvent *event)
 	unhideHere = (event->xbutton.state & ShiftMask);
 
         /* go to the last workspace that the user worked on the app */
-	if (!unhideHere) {
+	if (wapp->last_workspace != dock->screen_ptr->current_workspace
+	    && !unhideHere) {
 	    wWorkspaceChange(dock->screen_ptr, wapp->last_workspace);
 	}
 

src/dockedapp.c

@@ -206,12 +206,15 @@ panelBtnCallback(WMWidget *self, void *data)
 	    char *buf;
 	    
 	    buf = wmalloc(strlen(text) + 64);
-	    sprintf(buf, _("Could not open specified icon file:%s"), text);
-	    wMessageDialog(panel->wwin->screen_ptr, _("Error"), buf, _("OK"),
-			   NULL, NULL);
+	    sprintf(buf, _("Could not open specified icon file: %s"), text);
+	    if (wMessageDialog(panel->wwin->screen_ptr, _("Error"), buf, 
+			       _("OK"), _("Ignore"), NULL) == WAPRDefault) {
+		if (text)
+		    free(text);
+		free(buf);
+		return;
+	    }
 	    free(buf);
-	    done = 0;
-	    return;
 	} else {
 	    WAppIcon *aicon = panel->editedIcon;
 

src/event.c

@@ -1025,16 +1025,16 @@ handleEnterNotify(XEvent *event)
 	 * is for the frame window and window doesn't have focus yet */
 	if ((wPreferences.focus_mode==WKF_POINTER
 	     || wPreferences.focus_mode==WKF_SLOPPY)
-		&& wwin->frame->core->window==event->xcrossing.window
+	    && wwin->frame->core->window==event->xcrossing.window
 	    && !scr->flags.doing_alt_tab) {
-
-		if (!wwin->flags.focused)
+	    
+	    if (!wwin->flags.focused && !WFLAGP(wwin, no_focusable))
 		wSetFocusTo(scr, wwin);
-
-		if (scr->autoRaiseTimer)
-			WMDeleteTimerHandler(scr->autoRaiseTimer);
-		scr->autoRaiseTimer = NULL;
-
+	    
+	    if (scr->autoRaiseTimer)
+		WMDeleteTimerHandler(scr->autoRaiseTimer);
+	    scr->autoRaiseTimer = NULL;
+	    
 	    if (wPreferences.raise_delay && !WFLAGP(wwin, no_focusable)) {
 		scr->autoRaiseWindow = wwin->frame->core->window;
 		scr->autoRaiseTimer

src/kwm.c

@@ -1752,8 +1752,6 @@ wKWMSelectRootRegion(WScreen *scr, int x, int y, int w, int h, Bool control)
     if (sock < 0)
 	return;
     puts("SENDING DATA");
-
-    writeSocket(sock, "refreshDesktop");
     
     sprintf(buffer, "selectRootIcons %i %i %i %i %c", x, y, w, h, control);
     writeSocket(sock, buffer);

src/placement.c

@@ -81,6 +81,7 @@ iconPosition(WCoreWindow *wcore, int sx1, int sy1, int sx2, int sy2,
 	       (((WIcon*)parent)->owner->frame->workspace == workspace
 		|| IS_OMNIPRESENT(((WIcon*)parent)->owner)
 		|| wPreferences.sticky_icons)
+	       && ((WIcon*)parent)->mapped
 	       && (!((WIcon*)parent)->owner->flags.hidden
 		   || wcore->screen_ptr->flags.startup)) {
 

src/screen.h

@@ -194,8 +194,6 @@ typedef struct _WScreen {
     GC disabled_menu_entry_gc;	       /* disabled menu entries */
     GC info_text_gc;		       /* for size/position display */
     GC icon_select_gc;
-    GC workspace_name_gc;	       /* for the name shown when workspace
-					* is changed */
 
     GC frame_gc;		       /* gc for resize/move frame (root) */
     GC line_gc;			       /* gc for drawing XORed lines (root) */