X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/a77860696e9ca2b1f5184c9f3ff51daa50ac6123..bc124ae0b25f4cb24b860eb1ed62ea93917474da:/spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index d3ea727..fbddb8a 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -534,6 +534,7 @@ struct workspace {
 	struct ws_win		*focus;		/* may be NULL */
 	struct ws_win		*focus_prev;	/* may be NULL */
 	struct ws_win		*focus_pending;	/* may be NULL */
+	struct ws_win		*raised;	/* may be NULL */
 	struct swm_region	*r;		/* may be NULL */
 	struct swm_region	*old_r;		/* may be NULL */
 	struct ws_win_list	winlist;	/* list of windows in ws */
@@ -867,8 +868,11 @@ enum actionid {
 	FN_MVWS_20,
 	FN_MVWS_21,
 	FN_MVWS_22,
+	KF_MVWS_NEXT,
+	KF_MVWS_PREV,
 	FN_NAME_WORKSPACE,
 	FN_QUIT,
+	FN_RAISE_FOCUSED,
 	FN_RAISE_TOGGLE,
 	FN_RESIZE,
 	FN_RESIZE_CENTERED,
@@ -1132,6 +1136,7 @@ void	 quirk_remove(struct quirk *);
 void	 quirk_replace(struct quirk *, const char *, const char *, const char *,
 	     uint32_t, int);
 void	 quit(struct binding *, struct swm_region *, union arg *);
+void	 raise_focused(struct binding *, struct swm_region *, union arg *);
 void	 raise_toggle(struct binding *, struct swm_region *, union arg *);
 void	 raise_window(struct ws_win *);
 void	 region_containment(struct ws_win *, struct swm_region *, int);
@@ -1155,6 +1160,7 @@ void	 search_win_cleanup(void);
 void	 search_workspace(struct binding *, struct swm_region *, union arg *);
 void	 send_to_rg(struct binding *, struct swm_region *, union arg *);
 void	 send_to_ws(struct binding *, struct swm_region *, union arg *);
+void	 send_to_ws_relative(struct binding *, struct swm_region *, union arg *);
 void	 set_region(struct swm_region *);
 int	 setautorun(const char *, const char *, int);
 void	 setbinding(uint16_t, enum binding_type, uint32_t, enum actionid,
@@ -3770,6 +3776,8 @@ kill_refs(struct ws_win *win)
 				ws->focus_prev = NULL;
 			if (win == ws->focus_pending)
 				ws->focus_pending = NULL;
+			if (win == ws->raised)
+				ws->raised = NULL;
 
 			if (TRANS(win))
 				TAILQ_FOREACH(w, &ws->winlist, entry)
@@ -3855,6 +3863,9 @@ unfocus_win(struct ws_win *win)
 	if (win->ws->focus == win) {
 		win->ws->focus = NULL;
 		win->ws->focus_prev = win;
+		if(win->ws->raised == win && !FLOATING(win)) {
+			update_win_stacking(win);
+		}
 	}
 
 	if (validate_win(win->ws->focus)) {
@@ -5625,6 +5636,30 @@ send_to_ws(struct binding *bp, struct swm_region *r, union arg *args)
 	focus_flush();
 }
 
+/* Transfer focused window to region-relative workspace and focus. */
+void
+send_to_ws_relative(struct binding *bp, struct swm_region *r, union arg *args)
+{
+	union arg args_abs;
+	struct swm_region *r_other;
+
+	if (args->id == 1) {
+		r_other = TAILQ_NEXT(r, entry);
+		if (r_other == NULL)
+			r_other = TAILQ_FIRST(&r->s->rl);
+	} else {
+		r_other = TAILQ_PREV(r, swm_region_list, entry);
+		if (r_other == NULL)
+			r_other = TAILQ_LAST(&r->s->rl, swm_region_list);
+	}
+
+	/* Map relative to absolute */
+	args_abs = *args;
+	args_abs.id = r_other->ws->idx;
+
+	send_to_ws(bp, r, &args_abs);
+}
+
 void
 win_to_ws(struct ws_win *win, int wsid, bool unfocus)
 {
@@ -5732,6 +5767,31 @@ pressbutton(struct binding *bp, struct swm_region *r, union arg *args)
 	    XCB_CURRENT_TIME, XCB_WINDOW_NONE, 0, 0, 0);
 }
 
+void
+raise_focused(struct binding *bp, struct swm_region *r, union arg *args)
+{
+	struct ws_win	*win;
+	uint32_t	val;
+
+	/* Suppress warning. */
+	(void)bp;
+	(void)args;
+
+	if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
+		return;
+
+	win = r->ws->focus;
+	r->ws->raised = win;
+	raise_window(win);
+
+	/* Temporarily override stacking order also in the stack */
+	if (!FLOATING(win)) {
+		val = XCB_STACK_MODE_ABOVE;
+		xcb_configure_window(conn, win->frame,
+		    XCB_CONFIG_WINDOW_STACK_MODE, &val);
+	}
+}
+
 void
 raise_toggle(struct binding *bp, struct swm_region *r, union arg *args)
 {
@@ -7322,8 +7382,11 @@ struct action {
 	{ "mvws_20",		send_to_ws,	0, {.id = 19} },
 	{ "mvws_21",		send_to_ws,	0, {.id = 20} },
 	{ "mvws_22",		send_to_ws,	0, {.id = 21} },
+	{ "mvws_next",		send_to_ws_relative,	0, {.id = 1} },
+	{ "mvws_prev",		send_to_ws_relative,	0, {.id = -1} },
 	{ "name_workspace",	name_workspace,	0, {0} },
 	{ "quit",		quit,		0, {0} },
+	{ "raise_focused",	raise_focused,	0, {0} },
 	{ "raise_toggle",	raise_toggle,	0, {0} },
 	{ "resize",		resize, FN_F_NOREPLAY, {.id = SWM_ARG_ID_DONTCENTER} },
 	{ "resize_centered",	resize, FN_F_NOREPLAY, {.id = SWM_ARG_ID_CENTER} },
@@ -11714,6 +11777,7 @@ setup_screens(void)
 			ws->focus = NULL;
 			ws->focus_prev = NULL;
 			ws->focus_pending = NULL;
+			ws->raised = NULL;
 			ws->r = NULL;
 			ws->old_r = NULL;
 			ws->state = SWM_WS_STATE_HIDDEN;