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,13 +1786,19 @@ void AutoPlaceIcon(
     icon_boxes_ptr = NULL;              /* init */
     while(do_all_iconboxes(t, &icon_boxes_ptr))
     {
+      fscreen_scr_t screen;
       if (loc_ok == True)
       {
 	/* leave for loop */
 	break;
       }
       /* get the screen dimensions for the icon box */
-      FScreenGetScrRect(fscr, FSCREEN_CURRENT,
+      screen = FSCREEN_CURRENT;
+      if (icon_boxes_ptr->IconScreen)
+         screen = ScreenToFScreen(icon_boxes_ptr->IconScreen);
+      if (screen == FSCREEN_BY_NAME)
+	 fscr->name = icon_boxes_ptr->IconScreen;
+      FScreenGetScrRect(fscr, screen,
 		        &ref.x, &ref.y, &ref.width, &ref.height);
       dim[1].screen_offset = ref.y;
       dim[1].screen_dimension = ref.height;
@@ -1940,7 +1946,7 @@ void AutoPlaceIcon(
 	  }
 
 	  /* 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.c

@@ -241,6 +241,7 @@ monitor_resolve_name(const char *scr)
 	struct monitor	*m = NULL;
 	int		 pos = -1;
 	const char	*errstr;
+	fscreen_scr_t	 fscreen;
 
 	if (scr == NULL)
 	{
@@ -255,20 +256,25 @@ monitor_resolve_name(const char *scr)
 	if (errstr == NULL)
 		return (monitor_by_number(pos));
 
-	/* "@g" is for the global screen. */
-	if (strcmp(scr, "g") == 0) {
+	fscreen = ScreenToFScreen(scr);
+
+	switch (fscreen) {
+	case FSCREEN_GLOBAL:
 		m = monitor_get_global();
-	}
-	/* "@c" is for the current screen. */
-	else if (strcmp(scr, "c") == 0)
+		break;
+	case FSCREEN_CURRENT: FSCREEN_XYPOS:
 		m = monitor_get_current();
-	/* "@p" is for the primary screen. */
-	else if (strcmp(scr, "p") == 0)
+		break;
+	case FSCREEN_PRIMARY:
 		m = monitor_by_primary();
-	else
+		break;
+	case FSCREEN_BY_NAME:
+	default:
 		/* Assume the monitor name is a literal RandR name (such as
 		 * HDMI2). */
 		m = monitor_by_name(scr);
+		break;
+	}
 
 	return (m);
 }

libs/FScreen.h

@@ -200,6 +200,25 @@ 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;
+	if (*scr == '@')
+		scr++;
+	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);