--- ./src/switchmenu.c.orig-winlistbug	Sat Aug 22 18:24:03 1998
+++ ./src/switchmenu.c	Tue Sep  1 13:04:26 1998
@@ -187,8 +187,19 @@
 	    sprintf(entry->rtext, "[%s]", 
 		    scr->workspaces[wwin->frame->workspace]->name);
 	
-	if (wwin->flags.focused)
+	if (wwin->flags.hidden) {
+	    entry->flags.indicator_type = MI_HIDDEN;
 	    entry->flags.indicator_on = 1;
+	} else if (wwin->flags.miniaturized) {
+	    entry->flags.indicator_type = MI_MINIWINDOW;
+	    entry->flags.indicator_on = 1;
+	} else if (wwin->flags.focused) {
+	    entry->flags.indicator_type = MI_DIAMOND;
+	    entry->flags.indicator_on = 1;
+	} else if (wwin->flags.shaded) {
+	    entry->flags.indicator_type = MI_SHADED;
+	    entry->flags.indicator_on = 1;
+	}
 
 	wMenuRealize(switchmenu);
 	checkVisibility = 1;
@@ -238,7 +249,8 @@
 		    } else if (wwin->flags.miniaturized) {
 			entry->flags.indicator_type = MI_MINIWINDOW;
 			entry->flags.indicator_on = 1;
-		    } else if (wwin->flags.shaded) {
+		    } else if (wwin->flags.shaded &&
+			       !wwin->flags.focused) {
 			entry->flags.indicator_type = MI_SHADED;
 			entry->flags.indicator_on = 1;
 		    } else {