stashed_change_wsitem

Author: netcrop

2bwm.c

@@ -118,7 +118,7 @@ static void cleanup(void);
 static uint32_t getwmdesktop(xcb_drawable_t);
 static void addtoworkspace(struct client *, uint32_t);
 static void grabbuttons(struct client *);
-static void delfromworkspace(struct client *, uint32_t);
+static void delfromworkspace(struct client *);
 static void unkillablewindow(struct client *);
 static void fixwindow(struct client *);
 static uint32_t getcolor(const char *);
@@ -188,10 +188,13 @@ focusnext(const Arg *arg)
 }
 
 void
-delfromworkspace(struct client *client, uint32_t ws)
+delfromworkspace(struct client *client)
 {
-	delitem(&wslist[ws], client->wsitem[ws]);
-	client->wsitem[ws] = NULL;
+	if(client->ws < 0)
+		return;
+	delitem(&wslist[client->ws], client->wsitem);
+	client->wsitem = NULL;
+	client->ws = -1;
 }
 
 void
@@ -459,7 +462,8 @@ addtoworkspace(struct client *client, uint32_t ws)
 		return;
 
 	/* Remember our place in the workspace window list. */
-	client->wsitem[ws] = item;
+	client->wsitem = item;
+	client->ws = ws;
 	item->data         = client;
 
 	/* Set window hint property so we can survive a crash. Like "fixed" */
@@ -482,36 +486,31 @@ changeworkspace_helper(const uint32_t ws)
 	xcb_query_pointer_reply_t *pointer;
 	struct client *client;
 	struct item *item;
-
-
 	if (ws == curws)
 		return;
-
 	xcb_ewmh_set_current_desktop(ewmh, 0, ws);
+	/* Go through list of current ws.
+	 * Unmap everything that isn't fixed. */
 	for (item=wslist[curws]; item != NULL;) {
-		/* Go through list of current ws.
-		 * Unmap everything that isn't fixed. */
 		client = item->data;
 		item = item->next;
 		setborders(client,false);
-		if (!client->fixed)
+		if (!client->fixed){
 			xcb_unmap_window(conn, client->id);
-		else{
+		}else{
+			// correct order is delete first add later.
+			delfromworkspace(client);
 			addtoworkspace(client,ws);
-			delfromworkspace(client,curws);
 		}
 	}
-
 	for (item=wslist[ws]; item != NULL; item = item->next) {
 		client = item->data;
 		if (!client->fixed && !client->iconic)
 			xcb_map_window(conn, client->id);
 	}
-
 	curws = ws;
 	pointer = xcb_query_pointer_reply(conn, xcb_query_pointer(conn,
 				screen->root), 0);
-
 	if(pointer == NULL)
 		setfocus(NULL);
 	else {
@@ -599,9 +598,9 @@ sendtoworkspace(const Arg *arg)
 {
     if (NULL == focuswin||focuswin->fixed||arg->i == curws)
 	    return;
-
+	// correct order is delete first add later.
+    delfromworkspace(focuswin);
     addtoworkspace(focuswin, arg->i);
-    delfromworkspace(focuswin, curws);
     xcb_unmap_window(conn, focuswin->id);
     xcb_flush(conn);
 }
@@ -643,14 +642,10 @@ forgetclient(struct client *client)
 
 	if (NULL == client)
 		return;
-
 	if (client->id == top_win)
 		top_win = 0;
-
-	/* Delete client from the workspace lists it belongs to.
-	 * (can be on several) */
-	for (ws=0; ws < WORKSPACES; ws ++)
-		if (NULL != client->wsitem[ws]) delfromworkspace(client, ws);
+	/* Delete client from the workspace list it belongs to. */
+	delfromworkspace(client);
 
 	/* Remove from global window list. */
 	freeitem(&winlist, NULL, client->winitem);
@@ -960,8 +955,8 @@ setupwin(xcb_window_t win)
 	client->winitem       = item;
 
 	/* Initialize workspace pointers. */
-	for (ws=0; ws < WORKSPACES; ws ++)
-		client->wsitem[ws] = NULL;
+	client->wsitem = NULL;
+	client->ws = -1;
 
 	/* Get window geometry. */
 	getgeom(&client->id, &client->x, &client->y, &client->width,
@@ -1503,91 +1498,56 @@ movewindow(xcb_drawable_t win, const int16_t x, const int16_t y)
 
 	xcb_flush(conn);
 }
-
-/* Change focus to next in window ring. */
 void
 focusnext_helper(bool arg)
 {
 	struct client *cl = NULL;
-	/* no windows on current workspace*/
-	if (NULL == wslist[curws])
+	struct item *head = wslist[curws];
+	struct item *tail,*item = NULL;
+    // no windows on current workspace
+    if (NULL == head)
 		return;
-	/* If we currently have no focus focus first in list. */
-	if (NULL == focuswin || NULL == focuswin->wsitem[curws]) {
-		cl  = wslist[curws]->data;
-		while (cl->iconic==true && cl->wsitem[curws]->next!=NULL)
-			cl = cl->wsitem[curws]->next->data;
-	} else {
+	// if no focus on current workspace, find first valid item on list.
+    if (NULL == focuswin || focuswin->ws != curws) {
+		for(item = head;item != NULL;item = item->next){
+			cl = item->data;
+			if(!cl->iconic)
+				break;
+		}
+    }else{
+		// find tail of list and make list circular.
+		for(tail = head = item = wslist[curws]; item != NULL;
+			tail = item,item = item->next);
+		head->prev = tail;
+		tail->next = head;
 		if (arg == TWOBWM_FOCUS_NEXT) {
-			if (NULL == focuswin->wsitem[curws]->prev) {
-				/* We were at the head of list.
-				 * Focusing on last window in list unless
-				 * we were already there.*/
-				cl = wslist[curws]->data;
-
-				/* Go to the end of the list */
-				while(cl->wsitem[curws]->next != NULL)
-					cl = cl->wsitem[curws]->next->data;
-				/* walk backward until we find
-				 * a window that isn't iconic */
-				while(cl->iconic == true)
-					cl = cl->wsitem[curws]->prev->data;
-			} else
-				if (focuswin!=wslist[curws]->data) {
-					cl = focuswin->wsitem[curws]->prev->data;
-					while (cl->iconic == true
-						&& cl->wsitem[curws]->prev
-							!= NULL)
-						cl = cl->wsitem[curws]->prev->data;
-					/* move to the head an didn't find a
-					 * window to focus so move to the end
-					 * starting from the focused win */
-					if(cl->iconic == true) {
-						cl = focuswin;
-						/* Go to the end of the list */
-						while(cl->wsitem[curws]->next
-								!= NULL)
-							cl = cl->wsitem[curws]->next->data;
-						while (cl->iconic == true)
-							cl = cl->wsitem[curws]->prev->data;
-					}
-				}
-		} else {
-			/* We were at the tail of list.
-			 * Focusing on last window in list unless we
-			 * were already there.*/
-			if (NULL == focuswin->wsitem[curws]->next) {
-				/* We were at the end of list.
-				 * Focusing on first window in list unless we
-				 * were already there. */
-				cl = wslist[curws]->data;
-				while(cl->iconic && cl->wsitem[curws]->next
-						!= NULL)
-					cl = cl->wsitem[curws]->next->data;
-			} else {
-				cl = focuswin->wsitem[curws]->next->data;
-				while (cl->iconic == true
-						&& cl->wsitem[curws]->next
-						!= NULL)
-					cl = cl->wsitem[curws]->next->data;
-				/* we reached the end of the list without a
-				 * new win to focus, so reloop from the head */
-				if (cl->iconic == true) {
-					cl = wslist[curws]->data;
-					while(cl->iconic
-						&& cl->wsitem[curws]->next
-						!= NULL)
-						cl = cl->wsitem[curws]->next->data;
-				}
-			}
+			// start from focus next and find first valid item on circular list.
+			head = item = focuswin->wsitem->next;
+			do{
+				cl = item->data;
+				if(!cl->iconic)
+					break;
+				item = item->next;
+			}while(item != head);
+		}else{
+			// start from focus previous and find first valid on circular list.
+			tail = item = focuswin->wsitem->prev;
+			do{
+				cl = item->data;
+				if(!cl->iconic)
+					break;
+				item = item->prev;
+			}while(item != tail);
 		}
+		// restore list.
+		wslist[curws]->prev->next = NULL;
+		wslist[curws]->prev = NULL;
 	}
-	/* if NULL focuswin */
-	if (NULL != cl && focuswin != cl && cl->iconic==false) {
-		raisewindow(cl->id);
-		centerpointer(cl->id,cl);
-		setfocus(cl);
-	}
+	if(!item || !(cl = item->data) || cl->iconic)
+		return;
+	raisewindow(cl->id);
+	centerpointer(cl->id,cl);
+	setfocus(cl);
 }
 /* Mark window win as unfocused. */
 void setunfocus(void)
@@ -1609,8 +1569,9 @@ findclient(const xcb_drawable_t *win)
 	for (item = winlist; item != NULL; item = item->next) {
 		client = item->data;
 
-		if (*win == client->id)
+		if (*win == client->id){
 			return client;
+		}
 	}
 
 	return NULL;
@@ -1856,7 +1817,7 @@ snapwindow(struct client *client)
 void
 mousemove(const int16_t rel_x, const int16_t rel_y)
 {
-	if (focuswin == NULL || focuswin->wsitem[curws] == NULL)
+	if (focuswin == NULL || focuswin->ws != curws)
 		return;
 
 	focuswin->x = rel_x;
@@ -2282,15 +2243,12 @@ getpointer(const xcb_drawable_t *win, int16_t *x, int16_t *y)
 
 	pointer = xcb_query_pointer_reply(conn,
 			xcb_query_pointer(conn, *win), 0);
-
+	if (NULL == pointer)
+		return false;
 	*x = pointer->win_x;
 	*y = pointer->win_y;
 
 	free(pointer);
-
-	if (NULL == pointer)
-		return false;
-
 	return true;
 }
 
@@ -2975,7 +2933,6 @@ unmapnotify(xcb_generic_event_t *ev)
 {
 	xcb_unmap_notify_event_t *e = (xcb_unmap_notify_event_t *)ev;
 	struct client *client = NULL;
-
 	/*
 	 * Find the window in our current workspace list, then forget about it.
 	 * Note that we might not know about the window we got the UnmapNotify
@@ -2990,14 +2947,11 @@ unmapnotify(xcb_generic_event_t *ev)
 	 * If we do this, we need to keep track of our own windows and
 	 * ignore UnmapNotify on them.
 	 */
-
 	client = findclient( & e->window);
-	if (NULL == client || client->wsitem[curws]==NULL)
+	if (NULL == client || client->ws != curws)
 		return;
-
 	if (focuswin!=NULL && client->id == focuswin->id)
 		focuswin = NULL;
-
 	if (client->iconic == false)
 		forgetclient(client);
 

config.h

@@ -160,7 +160,7 @@ static key keys[] = {
     {  MOD |SHIFT ,       XK_v,          sendtonextworkspace,{}},
     {  MOD |SHIFT ,       XK_c,          sendtoprevworkspace,{}},
     // Iconify the window
-    //{  MOD ,              XK_i,          hide,              {}},
+    {  MOD ,              XK_i,          hide,              {}},
     // Make the window unkillable
     {  MOD ,              XK_a,          unkillable,        {}},
     // Make the window appear always on top

types.h

@@ -7,7 +7,7 @@ struct monitor {
 };
 typedef union {
 	const char** com;
-	const int8_t i;
+	const uint32_t i;
 } Arg;
 typedef struct {
 	unsigned int mod;
@@ -36,7 +36,8 @@ struct client {                     // Everything we know about a window.
 	bool fixed,unkillable,vertmaxed,hormaxed,maxed,verthor,ignore_borders,iconic;
 	struct monitor *monitor;        // The physical output this window is on.
 	struct item *winitem;           // Pointer to our place in global windows list.
-	struct item *wsitem[WORKSPACES];// Pointer to our place in every workspace window list.
+	struct item *wsitem;            // Pointer to workspace window list.
+	int ws;                         // In which workspace this window belongs to.
 };
 struct winconf {                    // Window configuration data.
 	int16_t      x, y;