Make screen option of icon boxes work again

Make IconBox screen option working again even with several monitors.

Signed-off-by: Werner Fink <werner@suse.de>

Author: bitstreamout

fvwm/icons.c

@@ -1786,18 +1786,18 @@ void AutoPlaceIcon(
     icon_boxes_ptr = NULL;              /* init */
     while(do_all_iconboxes(t, &icon_boxes_ptr))
     {
+      struct monitor *m;
       if (loc_ok == True)
       {
 	/* leave for loop */
 	break;
       }
       /* get the screen dimensions for the icon box */
-      FScreenGetScrRect(fscr, FSCREEN_CURRENT,
-		        &ref.x, &ref.y, &ref.width, &ref.height);
-      dim[1].screen_offset = ref.y;
-      dim[1].screen_dimension = ref.height;
-      dim[2].screen_offset = ref.x;
-      dim[2].screen_dimension = ref.width;
+      m = monitor_resolve_name(icon_boxes_ptr->IconScreen);
+      dim[1].screen_offset = ref.y = m->si->y;
+      dim[1].screen_dimension = ref.height = m->si->h;
+      dim[2].screen_offset = ref.x = m->si->x;
+      dim[2].screen_dimension = ref.width = m->si->w;
       /* y amount */
       dim[1].step = icon_boxes_ptr->IconGrid[1];
       /* init start from */
@@ -1939,8 +1939,14 @@ void AutoPlaceIcon(
 	    real_y = dim[1].real_start;
 	  }
 
+	  /* get real location of screen */
+	  fscreen_scr_t screen = ScreenToFScreen(icon_boxes_ptr->IconScreen);
+	  if (screen == FSCREEN_BY_NAME)
+	  {
+	    fscr->name = icon_boxes_ptr->IconScreen;
+	  }
 	  /* this may be a good location */
-	  if (FScreenIsRectangleOnScreen(fscr, FSCREEN_XYPOS, &ref))
+	  if (FScreenIsRectangleOnScreen(fscr, screen, &ref))
 	  {
 	    loc_ok = True;
 	  }
@@ -2035,6 +2041,8 @@ do_all_iconboxes(FvwmWindow *t, icon_boxes **icon_boxes_ptr)
 		global_icon_box_ptr->IconGrid[0] = 80;
 		global_icon_box_ptr->IconGrid[1] = 80;
 		global_icon_box_ptr->IconFlags = ICONFILLHRZ;
+		global_icon_box_ptr->IconScreen = "p";
+		global_icon_box_ptr->do_free_screen = 0;
 	}
 	if (*icon_boxes_ptr == NULL)
 	{

fvwm/style.c

@@ -1964,7 +1964,7 @@ static char *style_parse_icon_box_style(
 
 	/* otherwise try to parse the icon box */
 	IconBoxes = fxcalloc(1, sizeof(icon_boxes));
-	IconBoxes->IconScreen = "global";
+	IconBoxes->IconScreen = "g";
 	/* init grid x */
 	IconBoxes->IconGrid[0] = 3;
 	/* init grid y */
@@ -1976,7 +1976,9 @@ static char *style_parse_icon_box_style(
 		is_screen_given = True;
 		option = PeekToken(rest, &rest); /* skip screen */
 		option = PeekToken(rest, &rest); /* get the screen spec */
-		IconBoxes->IconScreen = option;
+		/* GetIntegerArguments() below removes screen */
+		IconBoxes->IconScreen = fxstrdup(option);
+		IconBoxes->do_free_screen = 1;
 	}
 
 	/* try for 4 numbers x y x y */

libs/FScreen.h

@@ -200,6 +200,23 @@ const char	*FScreenOfPointerXY(int, int);
 int		 monitor_get_count(void);
 struct monitor	*FindScreenOfXY(int, int);
 
+inline int ScreenToFScreen(const char *scr)
+{
+	if (!scr)
+		return FSCREEN_CURRENT;
+	switch (*scr) {
+	case 'g':
+		return FSCREEN_GLOBAL;
+	case 'p':
+		return FSCREEN_PRIMARY;
+	case 'c':
+		return FSCREEN_CURRENT;
+	case 'w':
+		return FSCREEN_XYPOS;
+	}
+	return FSCREEN_BY_NAME;
+}
+
 /* Clipping/positioning */
 int FScreenClipToScreen(fscreen_scr_arg *, fscreen_scr_t,
 	int *x, int *y, int w, int h);