updated code to use new bags

arbitrary window levels

src/Makefile.in

@@ -145,7 +145,7 @@ wconfig.h.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(wmaker_SOURCES)
 OBJECTS = $(wmaker_OBJECTS)
@@ -154,7 +154,7 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -295,7 +295,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

src/WindowMaker.h

@@ -65,7 +65,6 @@ enum {
 	WMMainMenuLevel = 6,
 	WMOuterSpaceLevel = 7
 };
-#define MAX_WINDOW_LEVELS 8
 
 /*
  * WObjDescriptor will be used by the event dispatcher to

src/event.c

@@ -1656,16 +1656,18 @@ handleKeyPress(XEvent *event)
         if (scr->shortcutWindows[index]) {
             WMBag *list = scr->shortcutWindows[index];
             int cw;
-	    int i;
 	    int count = WMGetBagItemCount(list);
 	    WWindow *twin;
+	    WMBagIterator iter;
+	    WWindow *wwin;
 
             wUnselectWindows(scr);
             cw = scr->current_workspace;
 
-            for (i = count-1; i >= 0; i--) {
-		WWindow *wwin = WMGetFromBag(list, i);
-
+	    for (wwin = WMBagLast(list, &iter);
+		 iter != NULL;
+		 wwin = WMBagPrevious(list, &iter)) {
+			
 		if (count > 1)
 		    wWindowChangeWorkspace(wwin, cw);
 
@@ -1676,8 +1678,8 @@ handleKeyPress(XEvent *event)
             }
 	    
 	    /* rotate the order of windows, to create a cycling effect */
-	    twin = WMGetFromBag(list, 0);
-	    WMDeleteFromBag(list, 0);
+	    twin = WMBagFirst(list, &iter);
+	    WMRemoveFromBag(list, twin);
 	    WMPutInBag(list, twin);
 
         } else if (wwin && ISMAPPED(wwin) && ISFOCUSED(wwin)) {

src/moveres.c

@@ -2053,7 +2053,9 @@ wUnselectWindows(WScreen *scr)
 	return;
     
     while (WMGetBagItemCount(scr->selected_windows)) {
-	wwin = WMGetFromBag(scr->selected_windows, 0);
+	WMBagIterator dummy;
+	
+	wwin = WMBagFirst(scr->selected_windows, &dummy);
         if (wwin->flags.miniaturized && wwin->icon && wwin->icon->selected)
             wIconSelect(wwin->icon);
 

src/placement.c

@@ -139,7 +139,7 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret)
     int x, y;
     int isize = wPreferences.icon_size;
     int done = 0;
-    int level;
+    WMBagIterator iter;
 
     /*
      * Find out screen boundaries.
@@ -196,9 +196,10 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret)
 
 #define INDEX(x,y)	(((y)+1)*(sw+2) + (x) + 1)
 
-    for (level = MAX_WINDOW_LEVELS-1; level >= WMDesktopLevel; level--) {
-	obj = scr->stacking_list[level];
-	
+    for (obj = WMBagLast(scr->stacking_list, &iter);
+	 obj != NULL;
+	 obj = WMBagNext(scr->stacking_list, &iter)) {
+
 	while (obj) {
 	    int x, y;
 

src/screen.c

@@ -653,6 +653,8 @@ wScreenInit(int screen_number)
 
     scr = wmalloc(sizeof(WScreen));
     memset(scr, 0, sizeof(WScreen));
+
+    scr->stacking_list = WMCreateTreeBag();
     
     /* initialize globals */
     scr->screen = screen_number;

src/screen.h

@@ -105,15 +105,14 @@ typedef struct _WScreen {
 
     struct WApplication *wapp_list;    /* list of all aplications */
 
-    struct _WCoreWindow *stacking_list[MAX_WINDOW_LEVELS];
-    				       /* array of lists of windows
+    WMBag *stacking_list;	       /* bag of lists of windows
 					* in stacking order.
-					* The array order is in window level
-					* order and each list on the array
+					* Indexed by window level
+					* and each list on the array
 					* is ordered from the topmost to
 					* the lowest window
 					*/
-/*    int window_level_count[MAX_WINDOW_LEVELS];*/
+
     int window_count;		       /* number of windows in window_list */
 
     int workspace_count;	       /* number of workspaces */

src/session.c

@@ -125,6 +125,7 @@ static proplist_t sShaded;
 static proplist_t sMiniaturized;
 static proplist_t sHidden;
 static proplist_t sGeometry;
+static proplist_t sShortcut;
 
 static proplist_t sDock;
 
@@ -147,6 +148,7 @@ make_keys()
     sHidden = PLMakeString("Hidden");
     sGeometry = PLMakeString("Geometry");
     sDock = PLMakeString("Dock");
+    sShortcut = PLMakeString("Shortcut");
 
     sYes = PLMakeString("Yes");
     sNo = PLMakeString("No");
@@ -185,6 +187,24 @@ getBool(proplist_t value)
 }
 
 
+static unsigned
+getInt(proplist_t value)
+{
+    char *val;
+    unsigned n;
+    
+    if (!PLIsString(value))
+	return 0;
+    val = PLGetString(value);
+    if (!val)
+	return 0;
+    if (sscanf(val, "%u", &n) != 1)
+	return 0;
+
+    return n;
+}
+
+
 
 static proplist_t
 makeWindowState(WWindow *wwin, WApplication *wapp)
@@ -193,10 +213,12 @@ makeWindowState(WWindow *wwin, WApplication *wapp)
     Window win;
     int argc;
     char **argv;
+    int i;
+    unsigned mask;
     char *class, *instance, *command=NULL, buffer[256];
     proplist_t win_state, cmd, name, workspace;
     proplist_t shaded, miniaturized, hidden, geometry;
-    proplist_t dock;
+    proplist_t dock, shortcut;
 
     if (wwin->main_window!=None && wwin->main_window!=wwin->client_win)
         win = wwin->main_window;
@@ -231,6 +253,15 @@ makeWindowState(WWindow *wwin, WApplication *wapp)
         sprintf(buffer, "%ix%i+%i+%i", wwin->client.width, wwin->client.height,
 		wwin->frame_x, wwin->frame_y);
         geometry = PLMakeString(buffer);
+	
+	for (mask = 0, i = 0; i < MAX_WINDOW_SHORTCUTS; i++) {
+	    if (WMGetFirstInBag(scr->shortcutWindows[i], wwin)) {
+		mask |= 1<<i;
+	    }
+	}
+
+	sprintf(buffer, "%u", mask);
+	shortcut = PLMakeString(buffer);
 
         win_state = PLMakeDictionaryFromEntries(sName, name,
                                                 sCommand, cmd,
@@ -238,6 +269,7 @@ makeWindowState(WWindow *wwin, WApplication *wapp)
                                                 sShaded, shaded,
                                                 sMiniaturized, miniaturized,
                                                 sHidden, hidden,
+						sShortcut, shortcut,
                                                 sGeometry, geometry,
                                                 NULL);
 
@@ -245,6 +277,7 @@ makeWindowState(WWindow *wwin, WApplication *wapp)
         PLRelease(cmd);
         PLRelease(workspace);
         PLRelease(geometry);
+	PLRelease(shortcut);
         if (wapp && wapp->app_icon && wapp->app_icon->dock) {
             int i;
             char *name;
@@ -381,6 +414,7 @@ getWindowState(WScreen *scr, proplist_t win_state)
     WSavedState *state = wmalloc(sizeof(WSavedState));
     proplist_t value;
     char *tmp;
+    unsigned mask;
     int i;
 
     memset(state, 0, sizeof(WSavedState));
@@ -406,6 +440,10 @@ getWindowState(WScreen *scr, proplist_t win_state)
         state->miniaturized = getBool(value);
     if ((value = PLGetDictionaryEntry(win_state, sHidden))!=NULL)
         state->hidden = getBool(value);
+    if ((value = PLGetDictionaryEntry(win_state, sHidden))!=NULL) {
+        mask = getInt(value);
+	state->window_shortcuts = mask;
+    }
 
     value = PLGetDictionaryEntry(win_state, sGeometry);
     if (value && PLIsString(value)) {

src/shutdown.c

@@ -161,7 +161,8 @@ Shutdown(WShutdownMode mode)
 void
 RestoreDesktop(WScreen *scr)
 {
-    int i;
+    WMBagIterator iter;
+    WCoreWindow *core;
 
     if (scr->helper_pid > 0) {
 	kill(scr->helper_pid, SIGTERM);
@@ -172,14 +173,12 @@ RestoreDesktop(WScreen *scr)
     wDestroyInspectorPanels();
 
     /* reparent windows back to the root window, keeping the stacking order */
-    for (i=0; i<MAX_WINDOW_LEVELS; i++) {
-        WCoreWindow *core, *next;
+    for (core = WMBagFirst(scr->stacking_list, &iter);
+	 core != NULL;
+	 core = WMBagNext(scr->stacking_list, &iter)) {
+        WCoreWindow *next;
         WWindow *wwin;
-        
-        if (!scr->stacking_list[i])
-            continue;
-        
-        core = scr->stacking_list[i];
+
         /* go to the end of the list */
         while (core->stacking->under)
             core = core->stacking->under;

src/stacking.c

@@ -45,6 +45,9 @@ extern XContext wStackContext;
 extern WPreferences wPreferences;
 
 
+
+
+
 /*
  *---------------------------------------------------------------------- 
  * RemakeStackList--
@@ -65,19 +68,16 @@ RemakeStackList(WScreen *scr)
     unsigned int nwindows;
     Window junkr, junkp;
     WCoreWindow *frame;
-    WCoreWindow *onbotw[MAX_WINDOW_LEVELS];
+    WCoreWindow *tmp;
     int level;
     int i, c;
-
+    
     if (!XQueryTree(dpy, scr->root_win, &junkr, &junkp, &windows, &nwindows)) {
 	wwarning(_("could not get window list!!"));
 	return;
     } else {
-	for (i=0; i<MAX_WINDOW_LEVELS; i++) {
-	    scr->stacking_list[i] = NULL;
-	    onbotw[i] = NULL;
-/*	    scr->window_level_count[i] = 0;*/
-	}
+	WMEmptyBag(scr->stacking_list);
+
 	/* verify list integrity */
 	c=0;
 	for (i=0; i<nwindows; i++) {
@@ -88,12 +88,12 @@ RemakeStackList(WScreen *scr)
 	    if (!frame) continue;
 	    c++;
 	    level = frame->stacking->window_level;
-	    if (onbotw[level])
-	      onbotw[level]->stacking->above = frame;
-	    frame->stacking->under = onbotw[level];
+	    tmp = WMGetFromBag(scr->stacking_list, level);
+	    if (tmp)
+		tmp->stacking->above = frame;
+	    frame->stacking->under = tmp;
 	    frame->stacking->above = NULL;
-	    onbotw[level] = frame;
-/*	    scr->window_level_count[level]++;*/
+	    WMSetInBag(scr->stacking_list, level, frame);
         }
         XFree(windows);
 #ifdef DEBUG
@@ -103,12 +103,6 @@ RemakeStackList(WScreen *scr)
 #endif
 	scr->window_count = c;
     }
-    /* now, just concatenate the lists */
-    for (i=0; i<MAX_WINDOW_LEVELS; i++) {
-	scr->stacking_list[i] = onbotw[i];
-	if (onbotw[i])
-	  onbotw[i]->stacking->above = NULL;
-    }
     
     CommitStacking(scr);
 }
@@ -128,15 +122,16 @@ void
 CommitStacking(WScreen *scr)
 {
     WCoreWindow *tmp;
-    int nwindows;
+    int nwindows, i;
     Window *windows;
-    int i, level;
+    WMBagIterator iter;
     
     nwindows = scr->window_count;
     windows = wmalloc(sizeof(Window)*nwindows);
-    i=0;
-    for (level=MAX_WINDOW_LEVELS-1; level>=0; level--) {
-	tmp = scr->stacking_list[level];
+
+    for (tmp = WMBagLast(scr->stacking_list, &iter), i = 0;
+	 iter != NULL;
+	 WMBagNext(scr->stacking_list, &iter)) {
 	while (tmp) {
 #ifdef DEBUG
 	    if (i>=nwindows) {
@@ -203,7 +198,7 @@ wRaiseFrame(WCoreWindow *frame)
 {
     WCoreWindow *wlist = frame, *wlist_above;
     int level = frame->stacking->window_level;
-    int i;
+    WScreen *scr = frame->screen_ptr;
 
     /* already on top */
     if (frame->stacking->above == NULL) {
@@ -211,7 +206,7 @@ wRaiseFrame(WCoreWindow *frame)
     }
 
     /* insert on top of other windows */
-#if 1
+
     while (wlist) {
 	if (wlist == (wlist_above = wlist->stacking->above)) {
 	    wwarning("You just found a bug in wmaker. Please try to figure what type of raising/lowering operations you did with which applications and report. Please give complete information about how to reproduce it.");
@@ -220,32 +215,30 @@ wRaiseFrame(WCoreWindow *frame)
 	    wlist=wlist_above;
 	}
     }
-#else
-    while (wlist)
-	wlist = wlist->stacking->above;
-#endif
+
     /* window is inserted before the point found */
     if (wlist==NULL) {
 	/* top most window (last on the list) */
 	if (frame->stacking->under)
-	  frame->stacking->under->stacking->above = frame->stacking->above;
+	    frame->stacking->under->stacking->above = frame->stacking->above;
 	if (frame->stacking->above)
-	  frame->stacking->above->stacking->under = frame->stacking->under;
+	    frame->stacking->above->stacking->under = frame->stacking->under;
 	
 	frame->stacking->above = NULL;
-	frame->stacking->under = frame->screen_ptr->stacking_list[level];
-	frame->screen_ptr->stacking_list[level]->stacking->above=frame;
-	frame->screen_ptr->stacking_list[level] = frame;
+	frame->stacking->under = WMGetFromBag(scr->stacking_list, level);
+	frame->stacking->under->stacking->above = frame;
+	WMSetInBag(scr->stacking_list, level, frame);
+
     } else if (frame!=wlist) {
 	if (frame->stacking->under)
-	  frame->stacking->under->stacking->above = frame->stacking->above;
+	    frame->stacking->under->stacking->above = frame->stacking->above;
 	if (frame->stacking->above)
-	  frame->stacking->above->stacking->under = frame->stacking->under;
+	    frame->stacking->above->stacking->under = frame->stacking->under;
 	
 	frame->stacking->above = wlist;
 	frame->stacking->under = wlist->stacking->under;
 	if (wlist->stacking->under)
-	  wlist->stacking->under->stacking->above = frame;
+	    wlist->stacking->under->stacking->above = frame;
 	wlist->stacking->under = frame;
     }
 #ifdef removed
@@ -254,7 +247,7 @@ wRaiseFrame(WCoreWindow *frame)
     {
 	/* raise transients under us from bottom to top 
 	 * so that the order is kept */
-	again:
+  again:
 	wlist = frame->stacking->under;
 	while (wlist && wlist->stacking->under)
 	  wlist = wlist->stacking->under;
@@ -281,17 +274,18 @@ wRaiseFrame(WCoreWindow *frame)
     /* try to optimize things a little */
     if (frame->stacking->above == NULL) {
 	WCoreWindow *above=NULL;
+	WMBagIterator iter;
 
-	for (i=level+1; i<MAX_WINDOW_LEVELS; i++) {
-	    if (frame->screen_ptr->stacking_list[i]!=NULL) {
-		/* can't optimize */
-		above = frame->screen_ptr->stacking_list[i];
-		while (above->stacking->under)
-		    above = above->stacking->under;
-		break;
-	    }
+	for (above = WMBagIteratorAtIndex(scr->stacking_list, level+1, &iter);
+	     above != NULL;
+	     above = WMBagNext(scr->stacking_list, &iter)) {
+	    
+	    /* can't optimize */
+	    while (above->stacking->under)
+		above = above->stacking->under;
+	    break;
 	}
-	if (!above) {
+	if (above == NULL) {
 	    XRaiseWindow(dpy, frame->window);
 	} else {
 	    moveFrameToUnder(above, frame);
@@ -303,12 +297,12 @@ wRaiseFrame(WCoreWindow *frame)
     {
 	WWindow *wwin = wWindowFor(frame->window);
 
-	if (wwin)
+	if (wwin != NULL)
 	    wKWMSendEventMessage(wwin, WKWMRaiseWindow);
     }
 #endif
 #ifdef VIRTUAL_DESKTOP
-    wWorkspaceRaiseEdge(frame->screen_ptr);
+    wWorkspaceRaiseEdge(scr);
 #endif
 }
 
@@ -328,7 +322,7 @@ wRaiseLowerFrame(WCoreWindow *frame)
 	while (scan) {
 
 	    if (scan->descriptor.parent_type == WCLASS_WINDOW) {
-		WWindow *scan_wwin = (WWindow*) scan->descriptor.parent;
+		WWindow *scan_wwin = (WWindow*)scan->descriptor.parent;
 		
 		if (wWindowObscuresWindow(scan_wwin, frame_wwin)
 		    && scan_wwin->flags.mapped) {
@@ -350,13 +344,12 @@ wRaiseLowerFrame(WCoreWindow *frame)
 void 
 wLowerFrame(WCoreWindow *frame)
 {
-    WScreen *scr=frame->screen_ptr;
+    WScreen *scr = frame->screen_ptr;
     WCoreWindow *prev, *wlist=frame;
     int level = frame->stacking->window_level;
-    int i;
 
     /* already in bottom */
-    if (wlist->stacking->under==NULL) {
+    if (wlist->stacking->under == NULL) {
 	return;
     }
 #ifdef removed
@@ -371,17 +364,17 @@ wLowerFrame(WCoreWindow *frame)
 #endif
     prev = wlist;
     /* remove from the list */
-    if (scr->stacking_list[level] == frame) {
+    if (WMGetFromBag(scr->stacking_list, level) == frame) {
 	/* it was the top window */
-	scr->stacking_list[level] = frame->stacking->under;
-	scr->stacking_list[level]->stacking->above = NULL;
+	WMSetInBag(scr->stacking_list, level, frame->stacking->under);
+	frame->stacking->under->stacking->above = NULL;
     } else {
 	if (frame->stacking->under)
-	  frame->stacking->under->stacking->above = frame->stacking->above;
+	    frame->stacking->under->stacking->above = frame->stacking->above;
 	if (frame->stacking->above)
-	  frame->stacking->above->stacking->under = frame->stacking->under;
+	    frame->stacking->above->stacking->under = frame->stacking->under;
     }
-    wlist = scr->stacking_list[level];
+    wlist = WMGetFromBag(scr->stacking_list, level);
     /* look for place to put this window */
 #ifdef removed
     if (wPreferences.on_top_transients)
@@ -410,20 +403,22 @@ wLowerFrame(WCoreWindow *frame)
     frame->stacking->above = wlist;
     frame->stacking->under = wlist->stacking->under;
     if (wlist->stacking->under)
-      wlist->stacking->under->stacking->above = frame;
+	wlist->stacking->under->stacking->above = frame;
     wlist->stacking->under = frame;
 
     /* try to optimize things a little */
     if (frame->stacking->above == NULL) {
 	WCoreWindow *above = NULL;
-	for (i=level-1; i>=0; i--) {
-	    if (scr->stacking_list[i]!=NULL) {
-		/* can't optimize */
-		above = scr->stacking_list[i];
-		while (above->stacking->under)
-		  above = above->stacking->under;
-		break;
-	    }
+	WMBagIterator iter;
+	
+	for (above = WMBagIteratorAtIndex(scr->stacking_list, level-1, &iter);
+	     above != NULL;
+	     above = WMBagPrevious(scr->stacking_list, &iter)) {
+	
+	    /* can't optimize */
+	    while (above->stacking->under)
+		above = above->stacking->under;
+	    break;
 	}
 	if (!above) {
 	    XLowerWindow(dpy, frame->window);
@@ -462,16 +457,16 @@ AddToStackList(WCoreWindow *frame)
 {
     WCoreWindow *prev, *tmpw, *wlist;
     int index = frame->stacking->window_level;
+    WScreen *scr = frame->screen_ptr;
 
     frame->screen_ptr->window_count++;
-/*    frame->screen_ptr->window_level_count[index]++;*/
     XSaveContext(dpy, frame->window, wStackContext, (XPointer)frame);
-    tmpw = frame->screen_ptr->stacking_list[index];
+    tmpw = WMGetFromBag(scr->stacking_list, index);
     if (!tmpw) {
-	frame->screen_ptr->stacking_list[index] = frame;
+	WMSetInBag(scr->stacking_list, index, frame);
 	frame->stacking->above = NULL;
 	frame->stacking->under = NULL;
-	CommitStacking(frame->screen_ptr);	
+	CommitStacking(scr);
 	return;
     }
     prev = tmpw;
@@ -482,7 +477,7 @@ AddToStackList(WCoreWindow *frame)
     {
 	WCoreWindow *trans = NULL;
 	  
-	wlist = frame->screen_ptr->stacking_list[index];
+	wlist = WMGetFromBag(scr->stacking_list, index);
 	while (wlist) {
 	    if (wlist->stacking->child_of == frame)
 	      trans = wlist;
@@ -499,7 +494,7 @@ AddToStackList(WCoreWindow *frame)
 	} else {
 	    frame->stacking->under = tmpw;
 	    tmpw->stacking->above = frame;
-	    frame->screen_ptr->stacking_list[index] = frame;	    
+	    WMSetInBag(scr->stacking_list, index, frame);	    
 	}
     }
 #ifdef removed
@@ -508,10 +503,10 @@ AddToStackList(WCoreWindow *frame)
 	frame->stacking->above = NULL;
 	frame->stacking->under = tmpw;
 	tmpw->stacking->above = frame;
-	frame->screen_ptr->stacking_list[index] = frame;
+	WMSetInBag(scr->stacking_list, index, frame);
     }
 #endif
-    CommitStacking(frame->screen_ptr);
+    CommitStacking(scr);
 }
 
 
@@ -532,6 +527,7 @@ void
 MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame)
 {
     WCoreWindow *tmpw;
+    WScreen *scr = frame->screen_ptr;
     int index;
 
     if (!next || frame->stacking->under == next)
@@ -542,9 +538,9 @@ MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame)
 
     index = frame->stacking->window_level;
 
-    tmpw = frame->screen_ptr->stacking_list[index];
+    tmpw = WMGetFromBag(scr->stacking_list, index);
     if (tmpw == frame)
-        frame->screen_ptr->stacking_list[index] = frame->stacking->under;
+	WMSetInBag(scr->stacking_list, index, frame->stacking->under);
     if (frame->stacking->under)
         frame->stacking->under->stacking->above = frame->stacking->above;
     if (frame->stacking->above)
@@ -555,23 +551,23 @@ MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame)
     frame->stacking->above = next->stacking->above;
     next->stacking->above = frame;
     if (tmpw == next)
-        frame->screen_ptr->stacking_list[index] = frame;
+	WMSetInBag(scr->stacking_list, index, frame);
 
     /* try to optimize things a little */
     if (frame->stacking->above == NULL) {
-        WCoreWindow *above=NULL;
-        int i;
+        WCoreWindow *above = NULL;
+	WMBagIterator iter;
 
-        for (i=index+1; i<MAX_WINDOW_LEVELS; i++) {
-            if (frame->screen_ptr->stacking_list[i]!=NULL) {
-                /* can't optimize */
-                above = frame->screen_ptr->stacking_list[i];
-                while (above->stacking->under)
-                    above = above->stacking->under;
-                break;
-            }
+	for (above = WMBagIteratorAtIndex(scr->stacking_list, index+1, &iter);
+	     above != NULL;
+	     above = WMBagNext(scr->stacking_list, &iter)) {
+
+	    /* can't optimize */
+	    while (above->stacking->under)
+		above = above->stacking->under;
+	    break;
         }
-        if (!above) {
+        if (above == NULL) {
             XRaiseWindow(dpy, frame->window);
         } else {
             moveFrameToUnder(above, frame);
@@ -600,6 +596,7 @@ MoveInStackListUnder(WCoreWindow *prev, WCoreWindow *frame)
 {
     WCoreWindow *tmpw;
     int index;
+    WScreen *scr = frame->screen_ptr;
 
     if (!prev || frame->stacking->above == prev)
         return;
@@ -609,9 +606,9 @@ MoveInStackListUnder(WCoreWindow *prev, WCoreWindow *frame)
 
     index = frame->stacking->window_level;
 
-    tmpw = frame->screen_ptr->stacking_list[index];
+    tmpw = WMGetFromBag(scr->stacking_list, index);
     if (tmpw == frame)
-        frame->screen_ptr->stacking_list[index] = frame->stacking->under;
+        WMSetInBag(scr->stacking_list, index, frame->stacking->under);
     if (frame->stacking->under)
         frame->stacking->under->stacking->above = frame->stacking->above;
     if (frame->stacking->above)
@@ -638,14 +635,14 @@ RemoveFromStackList(WCoreWindow *frame)
     }
     /* remove from the window stack list */
     if (frame->stacking->under)
-      frame->stacking->under->stacking->above = frame->stacking->above;
+	frame->stacking->under->stacking->above = frame->stacking->above;
     if (frame->stacking->above)
-      frame->stacking->above->stacking->under = frame->stacking->under;
+	frame->stacking->above->stacking->under = frame->stacking->under;
     else /* this was the first window on the list */
-      frame->screen_ptr->stacking_list[index] = frame->stacking->under;
+	WMSetInBag(frame->screen_ptr->stacking_list, index, 
+		   frame->stacking->under);
 
     frame->screen_ptr->window_count--;
-/*    frame->screen_ptr->window_level_count[index]--;*/
 }
 
 

src/window.c

@@ -834,7 +834,7 @@ wManageWindow(WScreen *scr, Window window)
 	    wwin->flags.miniaturized = wstate->miniaturized;
 	    workspace = wstate->workspace;
 
-	    if (scr->flags.startup && wstate->window_shortcuts >= 0) {
+	    if (scr->flags.startup && wstate->window_shortcuts > 0) {
 		int i;
 
 		for (i = 0; i < MAX_WINDOW_SHORTCUTS; i++) {