FvwmIconMan: Sort: add screen

Allow to sort windows by the screen they're on.

XXX: WeightedSort to follow...

Author: ThomasAdam

modules/FvwmIconMan/FvwmIconMan.h

@@ -260,6 +260,7 @@ typedef enum {
 	SortId,            /* sort by window id */
 	SortName,          /* case insensitive name sorting */
 	SortNameCase,      /* case sensitive name sorting */
+	SortScreen,	   /* Sort by screen */
 	SortWeighted,      /* custom sort order */
 } SortType;
 
@@ -268,6 +269,7 @@ typedef struct {
 	char *classname;
 	char *titlename;
 	char *iconname;
+	char *screenname;
 	int weight;
 } WeightedSort;
 

modules/FvwmIconMan/readconfig.c

@@ -1834,6 +1834,9 @@ void read_in_resources(void)
 	else if (!strcasecmp(p, "none")) {
 	  i = SortNone;
 	}
+	else if (!strcasecmp(p, "screen")) {
+	  i = SortScreen;
+	}
 	else if (!strcasecmp(p, "weighted")) {
 	  i = SortWeighted;
 	}

modules/FvwmIconMan/xmanager.c

@@ -2204,6 +2204,11 @@ static int compare_windows(SortType type, WinData *a, WinData *b)
 		return strcmp((a->display_string)? a->display_string:"",
 			       (b->display_string)? b->display_string:"");
 	}
+	else if (type == SortScreen)
+	{
+		return (strcmp(a->monitor ? a->monitor : "",
+			b->monitor ? b->monitor : ""));
+	}
 	else if (type == SortWeighted)
 	{
 		wa = compute_weight(a);