X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=5e3ced2ad8491c9a89ae1879a1f93f96f64972d1;hb=c593b8309ed314f4abd0865cbeb5ae163d14f3ca;hp=b0793f32c9d6241bb466a55603169e5f063dd18f;hpb=7230e8cbf224cd6993a9f714acda44ada29eb2bc;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index b0793f3..5e3ced2 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -52,7 +52,7 @@
 
 static const char	*cvstag = "$scrotwm$";
 
-#define	SWM_VERSION	"0.9.17"
+#define	SWM_VERSION	"0.9.19"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -148,6 +148,7 @@ u_int32_t		swm_debug = 0
 #define WIDTH(r)		(r)->g.w
 #define HEIGHT(r)		(r)->g.h
 #define SWM_MAX_FONT_STEPS	(3)
+#define WINID(w)		(w ? w->id : 0)
 
 #ifndef SWM_LIB
 #define SWM_LIB			"/usr/local/lib/libswmhack.so"
@@ -420,7 +421,8 @@ union arg {
 
 void	focus(struct swm_region *, union arg *);
 void	focus_magic(struct ws_win *, int);
-
+#define SWM_F_GENERIC		(0)
+#define SWM_F_TRANSIENT		(1)
 /* quirks */
 struct quirk {
 	char			*class;
@@ -1351,6 +1353,8 @@ validate_ws(struct workspace *testws)
 void
 unfocus_win(struct ws_win *win)
 {
+	DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", WINID(win));
+
 	if (win == NULL)
 		return;
 	if (win->ws == NULL)
@@ -1387,22 +1391,26 @@ unfocus_win(struct ws_win *win)
 }
 
 void
-unfocus_all(void)
+unfocus_all_except(struct ws_win *except)
 {
 	struct ws_win		*win;
 	int			i, j;
 
-	DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n");
+	DNPRINTF(SWM_D_FOCUS, "unfocus_all_except: id: %lu\n", except->id);
 
 	for (i = 0; i < ScreenCount(display); i++)
 		for (j = 0; j < SWM_WS_MAX; j++)
 			TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
-				unfocus_win(win);
+				if (win != except)
+					unfocus_win(win);
 }
 
 void
 focus_win(struct ws_win *win)
 {
+	int			rtr;
+	Window			wf;
+
 	DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
 
 	if (win == NULL)
@@ -1418,7 +1426,7 @@ focus_win(struct ws_win *win)
 	}
 
 	/* use big hammer to make sure it works under all use cases */
-	unfocus_all();
+	unfocus_all_except(win);
 
 	if (validate_win(win)) {
 		kill_refs(win);
@@ -1428,14 +1436,17 @@ focus_win(struct ws_win *win)
 	win->ws->focus = win;
 
 	if (win->ws->r != NULL) {
-		grabbuttons(win, 1);
-		if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
-			XMapRaised(display, win->id);
+		XGetInputFocus(display, &wf, &rtr);
+		if (wf != win->id) {
+			grabbuttons(win, 1);
+			if (win->java == 0)
+				XSetInputFocus(display, win->id,
+				    RevertToParent, CurrentTime);
+		}
 		XSetWindowBorder(display, win->id,
 		    win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
-		if (win->java == 0)
-			XSetInputFocus(display, win->id,
-			    RevertToPointerRoot, CurrentTime);
+		if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
+			XMapRaised(display, win->id);
 	}
 }
 
@@ -1632,6 +1643,66 @@ swapwin(struct swm_region *r, union arg *args)
 }
 
 void
+focus_prev(struct ws_win *win)
+{
+	struct ws_win		*winfocus = NULL, *winlostfocus = NULL;
+	struct ws_win		*cur_focus = NULL;
+	struct ws_win_list	*wl = NULL;
+	struct workspace	*ws = NULL;
+
+	DNPRINTF(SWM_D_FOCUS, "focus_prev: id %lu\n", WINID(win));
+
+	if (!(win && win->ws))
+		return;
+
+	ws = win->ws;
+	wl = &ws->winlist;
+	cur_focus = ws->focus;
+	winlostfocus = cur_focus;
+
+	/* pickle, just focus on whatever */
+	if (cur_focus == NULL) {
+		/* use prev_focus if valid */
+		if (ws->focus_prev && ws->focus_prev != cur_focus &&
+		    find_window(WINID(ws->focus_prev)))
+			winfocus = ws->focus_prev;
+		if (winfocus == NULL)
+			winfocus = TAILQ_FIRST(wl);
+		goto done;
+	}
+
+	/* if transient focus on parent */
+	if (cur_focus->transient) {
+		winfocus = find_window(cur_focus->transient);
+		goto done;
+	}
+
+	/* if in max_stack try harder */
+	if (ws->cur_layout->flags & SWM_L_FOCUSPREV) {
+ 		if (cur_focus != ws->focus_prev)
+ 			winfocus = ws->focus_prev;
+ 		else if (cur_focus != ws->focus)
+ 			winfocus = ws->focus;
+		else
+			winfocus = TAILQ_PREV(win, ws_win_list, entry);
+		if (winfocus)
+			goto done;
+	}
+
+	if (cur_focus == win)
+		winfocus = TAILQ_PREV(win, ws_win_list, entry);
+	if (winfocus == NULL)
+		winfocus = TAILQ_LAST(wl, ws_win_list);
+	if (winfocus == NULL || winfocus == win)
+		winfocus = TAILQ_NEXT(cur_focus, entry);
+done:
+	if (winfocus == winlostfocus || winfocus == NULL)
+		return;
+
+	focus_magic(winfocus, SWM_F_GENERIC);
+}
+
+void
 focus(struct swm_region *r, union arg *args)
 {
 	struct ws_win		*winfocus = NULL, *winlostfocus = NULL;
@@ -1652,47 +1723,25 @@ focus(struct swm_region *r, union arg *args)
 			winfocus = r->ws->focus_prev;
 		else
 			winfocus = TAILQ_FIRST(&r->ws->winlist);
-			
-		focus_magic(winfocus, 0);
+
+		focus_magic(winfocus, SWM_F_GENERIC);
 		return;
 	}
 
-	if (r->ws->focus == NULL)
+	if ((cur_focus = r->ws->focus) == NULL)
 		return;
-
-	cur_focus = r->ws->focus;
 	ws = r->ws;
 	wl = &ws->winlist;
 
 	winlostfocus = cur_focus;
 
 	switch (args->id) {
-	case SWM_ARG_ID_FOCUSPREV:
-		if (cur_focus->transient)
-			winfocus = find_window(cur_focus->transient);
-		else if (ws->focus == cur_focus) {
-			/* if in max_stack try harder */
-			if (ws->cur_layout->flags & SWM_L_FOCUSPREV) {
-				if (cur_focus != ws->focus_prev)
-					winfocus = ws->focus_prev;
-				else if (cur_focus != ws->focus)
-					winfocus = ws->focus;
-			}
-
-			/* fallback and normal handling */
-			if (winfocus == NULL) {
-				if (TAILQ_FIRST(wl) == cur_focus)
-					winfocus = TAILQ_NEXT(cur_focus, entry);
-				else {
-					winfocus = TAILQ_PREV(ws->focus,
-					    ws_win_list, entry);
-					if (winfocus == NULL)
-						winfocus = TAILQ_LAST(wl,
-						    ws_win_list);
-				}
-			}
-		}
+ 	case SWM_ARG_ID_FOCUSPREV:
+		winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
+		if (winfocus == NULL)
+			winfocus = TAILQ_LAST(wl, ws_win_list);
 		break;
+
 	case SWM_ARG_ID_FOCUSNEXT:
 		winfocus = TAILQ_NEXT(cur_focus, entry);
 		if (winfocus == NULL)
@@ -1703,8 +1752,6 @@ focus(struct swm_region *r, union arg *args)
 		winfocus = TAILQ_FIRST(wl);
 		if (winfocus == cur_focus)
 			winfocus = cur_focus->ws->focus_prev;
-		if (winfocus == NULL)
-			return;
 		break;
 
 	default:
@@ -1714,7 +1761,7 @@ focus(struct swm_region *r, union arg *args)
 	if (winfocus == winlostfocus || winfocus == NULL)
 		return;
 
-	focus_magic(winfocus, 0);
+	focus_magic(winfocus, SWM_F_GENERIC);
 }
 
 void
@@ -1735,6 +1782,7 @@ cycle_layout(struct swm_region *r, union arg *args)
 	stack();
 	a.id = SWM_ARG_ID_FOCUSCUR;
 	focus(r, &a);
+	bar_update();
 }
 
 void
@@ -2182,7 +2230,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 		if (parent)
 			XMapRaised(display, parent->id);
 		stack_floater(wintrans, ws->r);
-		focus_magic(wintrans, 1);
+		focus_magic(wintrans, SWM_F_TRANSIENT);
 	}
 }
 
@@ -2202,6 +2250,8 @@ send_to_ws(struct swm_region *r, union arg *args)
 		return;
 	if (win == NULL)
 		return;
+	if (win->ws->idx == wsid)
+		return;
 
 	DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
 
@@ -3714,6 +3764,7 @@ unmanage_window(struct ws_win *win)
 			parent->child_trans = NULL;
 	}
 
+	focus_prev(win);
 	TAILQ_REMOVE(&win->ws->winlist, win, entry);
 	TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
 
@@ -3723,10 +3774,12 @@ unmanage_window(struct ws_win *win)
 void
 focus_magic(struct ws_win *win, int do_trans)
 {
+	DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu %d\n", WINID(win), do_trans);
+
 	if (win == NULL)
 		return;
 
-	if (do_trans && win->child_trans) {
+	if (do_trans == SWM_F_TRANSIENT && win->child_trans) {
 		/* win = parent & has a transient so focus on that */
 		if (win->java) {
 			focus_win(win->child_trans);
@@ -3792,7 +3845,7 @@ buttonpress(XEvent *e)
 	if ((win = find_window(ev->window)) == NULL)
 		return;
 
-	focus_magic(win, 1);
+	focus_magic(win, SWM_F_TRANSIENT);
 	action = client_click;
 
 	for (i = 0; i < LENGTH(buttons); i++)
@@ -3866,7 +3919,6 @@ destroynotify(XEvent *e)
 {
 	struct ws_win		*win;
 	XDestroyWindowEvent	*ev = &e->xdestroywindow;
-	union arg		a;
 
 	DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
@@ -3877,32 +3929,67 @@ destroynotify(XEvent *e)
 		return;
 	}
 
-	a.id = SWM_ARG_ID_FOCUSPREV;
-	focus(win->ws->r, &a);
 	unmanage_window(win);
-	free_window(win);
 	stack();
+	free_window(win);
 }
 
 void
 enternotify(XEvent *e)
 {
 	XCrossingEvent		*ev = &e->xcrossing;
+	XEvent			cne;
 	struct ws_win		*win;
 
-	DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
+	DNPRINTF(SWM_D_FOCUS, "enternotify: window: %lu mode %d detail %d root "
+	    "%lu subwindow %lu same_screen %d focus %d state %d\n",
+	    ev->window, ev->mode, ev->detail, ev->root, ev->subwindow,
+	    ev->same_screen, ev->focus, ev->state);
 
 	/*
+	 * all these checks need to be in this order because the
+	 * XCheckTypedWindowEvent relies on weeding out the previous events
+	 *
+	 * making this code an option would enable a follow mouse for focus
+	 * feature
+	 */
+
+	/*
+	 * state is set when we are switching workspaces and focus is set when
+	 * scrotwm launches via a restart
+	 */
+	if (ev->state || ev->focus)
+		return;
+	/*
 	 * happens when a window is created or destroyed and the border
-	 * crosses the mouse pointer
+	 * crosses the mouse pointer and when switching ws
+	 *
+	 * we need the subwindow test to see if we came from root in order
+	 * to give focus to floaters
 	 */
-	if (QLength(display))
+	if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual &&
+	    ev->subwindow == 0)
 		return;
 
+	/* this window already has focus */
+	if (ev->mode == NotifyNormal && ev->detail == NotifyInferior)
+		return;
+
+	/* this window is being deleted or moved to another ws */
+	if (XCheckTypedWindowEvent(display, ev->window, ConfigureNotify,
+	    &cne) == True) {
+		XPutBackEvent(display, &cne);
+		return;
+	}
+
 	if ((win = find_window(ev->window)) == NULL)
 		return;
 
-	focus_magic(win, 1);
+	/* in fullstack kill all enters */
+	if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV)
+		return;
+
+	focus_magic(win, SWM_F_TRANSIENT);
 }
 
 void
@@ -3965,7 +4052,7 @@ maprequest(XEvent *e)
 	/* make new win focused */
 	r = root_to_region(win->wa.root);
 	if (win->ws == r->ws)
-		focus_magic(win, 0);
+		focus_magic(win, SWM_F_GENERIC);
 }
 
 void
@@ -4007,7 +4094,6 @@ void
 unmapnotify(XEvent *e)
 {
 	struct ws_win		*win;
-	union arg		a;
 
 	DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
 
@@ -4016,10 +4102,14 @@ unmapnotify(XEvent *e)
 	if (win == NULL)
 		return;
 
+	/*
+	 * XXX this is a work around for going fullscreen on mplayer
+	 * remove this and find a better heuristic
+	 */
+	if (win->floating)
+		return;
+
 	if (getstate(e->xunmap.window) == NormalState) {
-		/* trash window and refocus */
-		a.id = SWM_ARG_ID_FOCUSPREV;
-		focus(win->ws->r, &a);
 		unmanage_window(win);
 		stack();
 	}