X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/7a7a5aa57185b7307be2a1f33e3f6c789c86153b..f82969b59c414218f709b1d95a799fae6fc40f49:/spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index 75df373..d67d875 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		*focus_raise;		/* 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 */
@@ -845,6 +846,8 @@ enum actionid {
 	FN_MVRG_7,
 	FN_MVRG_8,
 	FN_MVRG_9,
+	KF_MVRG_NEXT,
+	KF_MVRG_PREV,
 	FN_MVWS_1,
 	FN_MVWS_2,
 	FN_MVWS_3,
@@ -869,6 +872,7 @@ enum actionid {
 	FN_MVWS_22,
 	FN_NAME_WORKSPACE,
 	FN_QUIT,
+	FN_RAISE,
 	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_focus(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);
@@ -1154,6 +1159,7 @@ void	 search_win(struct binding *, struct swm_region *, union arg *);
 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_rg_relative(struct binding *, struct swm_region *, union arg *);
 void	 send_to_ws(struct binding *, struct swm_region *, union arg *);
 void	 set_region(struct swm_region *);
 int	 setautorun(const char *, const char *, int);
@@ -2410,7 +2416,7 @@ bar_urgent(char *s, size_t sz)
 			strlcat(s, "- ", sz);
 		}
 	}
-	if(urgent_collapse && s[0])
+	if (urgent_collapse && s[0])
 		s[strlen(s) - 1] = 0;
 }
 
@@ -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->focus_raise)
+				ws->focus_raise = 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->focus_raise == win && !FLOATING(win)) {
+			update_win_stacking(win);
+		}
 	}
 
 	if (validate_win(win->ws->focus)) {
@@ -4166,8 +4177,6 @@ switchws(struct binding *bp, struct swm_region *r, union arg *args)
 	int			wsid = args->id;
 	bool			unmap_old = false;
 
-	(void)bp;
-
 	if (!(r && r->s))
 		return;
 
@@ -4187,7 +4196,8 @@ switchws(struct binding *bp, struct swm_region *r, union arg *args)
 		return;
 
 	other_r = new_ws->r;
-	if (other_r && workspace_clamp) {
+	if (other_r && workspace_clamp &&
+	    bp->action != FN_RG_MOVE_NEXT && bp->action != FN_RG_MOVE_PREV) {
 		DNPRINTF(SWM_D_WS, "switchws: ws clamped.\n");
 
 		if (warp_focus) {
@@ -5626,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_rg_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)
 {
@@ -5733,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_focus(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->focus_raise = 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)
 {
@@ -6115,7 +6174,7 @@ ewmh_update_desktop_names(void)
 			++len;
 		}
 
-		if((name_list = calloc(len, sizeof(char))) == NULL)
+		if ((name_list = calloc(len, sizeof(char))) == NULL)
 			err(1, "update_desktop_names: calloc: failed to "
 			    "allocate memory.");
 
@@ -7301,6 +7360,8 @@ struct action {
 	{ "mvrg_7",		send_to_rg,	0, {.id = 6} },
 	{ "mvrg_8",		send_to_rg,	0, {.id = 7} },
 	{ "mvrg_9",		send_to_rg,	0, {.id = 8} },
+	{ "mvrg_next",		send_to_rg_relative,	0, {.id = 1} },
+	{ "mvrg_prev",		send_to_rg_relative,	0, {.id = -1} },
 	{ "mvws_1",		send_to_ws,	0, {.id = 0} },
 	{ "mvws_2",		send_to_ws,	0, {.id = 1} },
 	{ "mvws_3",		send_to_ws,	0, {.id = 2} },
@@ -7325,6 +7386,7 @@ struct action {
 	{ "mvws_22",		send_to_ws,	0, {.id = 21} },
 	{ "name_workspace",	name_workspace,	0, {0} },
 	{ "quit",		quit,		0, {0} },
+	{ "raise",		raise_focus,	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} },
@@ -8107,6 +8169,7 @@ setup_keybindings(void)
 	BINDKEY(MODSHIFT,	XK_F12,			FN_MVWS_22);
 	BINDKEY(MODSHIFT,	XK_slash,		FN_NAME_WORKSPACE);
 	BINDKEY(MODSHIFT,	XK_q,			FN_QUIT);
+	BINDKEY(MODKEY,		XK_r,			FN_RAISE);
 	BINDKEY(MODSHIFT,	XK_r,			FN_RAISE_TOGGLE);
 	BINDKEY(MODKEY,		XK_q,			FN_RESTART);
 	BINDKEY(MODKEY,		XK_KP_End,		FN_RG_1);
@@ -10315,7 +10378,7 @@ get_stack_mode_name(uint8_t mode)
 {
 	char	*name;
 
-	switch(mode) {
+	switch (mode) {
 	case XCB_STACK_MODE_ABOVE:
 		name = "Above";
 		break;
@@ -11715,6 +11778,7 @@ setup_screens(void)
 			ws->focus = NULL;
 			ws->focus_prev = NULL;
 			ws->focus_pending = NULL;
+			ws->focus_raise = NULL;
 			ws->r = NULL;
 			ws->old_r = NULL;
 			ws->state = SWM_WS_STATE_HIDDEN;