X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/79df455b47cbdf9b79e8beb9a20b22e91c8912a2..4f61f954631d86255dab707a0b91b44b63fed06f:/spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index c6b6069..1542fe1 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -333,7 +333,9 @@ bool			cycle_visible = false;
 int			term_width = 0;
 int			font_adjusted = 0;
 unsigned int		mod_key = MODKEY;
+bool			warp_focus = false;
 bool			warp_pointer = false;
+bool			workspace_clamp = false;
 
 /* dmenu search */
 struct swm_region	*search_r;
@@ -1097,6 +1099,7 @@ void	 print_win_geom(xcb_window_t);
 #endif
 void	 propertynotify(xcb_property_notify_event_t *);
 void	 quirk_free(struct quirk *);
+void	 clear_quirks(void);
 void	 quirk_insert(const char *, const char *, const char *, uint32_t, int);
 void	 quirk_remove(struct quirk *);
 void	 quirk_replace(struct quirk *, const char *, const char *, const char *,
@@ -1156,6 +1159,7 @@ int	 spawn_expand(struct swm_region *, union arg *, const char *, char ***);
 void	 spawn_insert(const char *, const char *, int);
 struct spawn_prog	*spawn_find(const char *);
 void	 spawn_remove(struct spawn_prog *);
+void	 clear_spawns(void);
 void	 spawn_replace(struct spawn_prog *, const char *, const char *, int);
 void	 spawn_select(struct swm_region *, union arg *, const char *, int *);
 void	 stack_config(struct swm_region *, union arg *);
@@ -3883,6 +3887,20 @@ switchws(struct swm_region *r, union arg *args)
 	if (new_ws == old_ws)
 		return;
 
+	other_r = new_ws->r;
+	if (other_r && workspace_clamp) {
+		DNPRINTF(SWM_D_WS, "switchws: ws clamped.\n");
+
+		if (warp_focus) {
+			DNPRINTF(SWM_D_WS, "switchws: warping focus to region "
+			    "with ws %d.\n", wsid);
+			focus_region(other_r);
+			center_pointer(other_r);
+			focus_flush();
+		}
+		return;
+	}
+
 	if ((win = old_ws->focus) != NULL) {
 		update_window_color(win);
 
@@ -3891,17 +3909,17 @@ switchws(struct swm_region *r, union arg *args)
 		    &none);
 	}
 
-	other_r = new_ws->r;
-	if (other_r == NULL) {
-		/* the other workspace is hidden, hide this one */
-		old_ws->r = NULL;
-		unmap_old = true;
-	} else {
+	if (other_r) {
 		/* the other ws is visible in another region, exchange them */
 		other_r->ws_prior = new_ws;
 		other_r->ws = old_ws;
 		old_ws->r = other_r;
+	} else {
+		/* the other workspace is hidden, hide this one */
+		old_ws->r = NULL;
+		unmap_old = true;
 	}
+
 	this_r->ws_prior = old_ws;
 	this_r->ws = new_ws;
 	new_ws->r = this_r;
@@ -5842,10 +5860,13 @@ ewmh_update_current_desktop(void)
 	int			num_screens, i;
 
 	num_screens = get_screen_count();
-	for (i = 0; i < num_screens; ++i)
-		xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
-		    screens[i].root, ewmh[_NET_CURRENT_DESKTOP].atom,
-		    XCB_ATOM_CARDINAL, 32, 1, &screens[i].r_focus->ws->idx);
+	for (i = 0; i < num_screens; ++i) {
+		if (screens[i].r_focus)
+			xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+			    screens[i].root, ewmh[_NET_CURRENT_DESKTOP].atom,
+			    XCB_ATOM_CARDINAL, 32, 1,
+			    &screens[i].r_focus->ws->idx);
+	}
 }
 
 void
@@ -7102,6 +7123,16 @@ spawn_remove(struct spawn_prog *sp)
 	DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n");
 }
 
+void
+clear_spawns(void)
+{
+	struct spawn_prog	*sp;
+
+	while ((sp = TAILQ_FIRST(&spawns)) != NULL) {
+		spawn_remove(sp);
+	}
+}
+
 struct spawn_prog*
 spawn_find(const char *name)
 {
@@ -7856,6 +7887,16 @@ quirk_free(struct quirk *qp)
 	free(qp);
 }
 
+void
+clear_quirks(void)
+{
+	struct quirk		*qp;
+
+	while ((qp = TAILQ_FIRST(&quirks)) != NULL) {
+		quirk_remove(qp);
+	}
+}
+
 void
 quirk_replace(struct quirk *qp, const char *class, const char *instance,
     const char *name, uint32_t quirk, int ws)
@@ -8043,10 +8084,12 @@ enum {
 	SWM_S_URGENT_COLLAPSE,
 	SWM_S_URGENT_ENABLED,
 	SWM_S_VERBOSE_LAYOUT,
+	SWM_S_WARP_FOCUS,
 	SWM_S_WARP_POINTER,
 	SWM_S_WINDOW_CLASS_ENABLED,
 	SWM_S_WINDOW_INSTANCE_ENABLED,
 	SWM_S_WINDOW_NAME_ENABLED,
+	SWM_S_WORKSPACE_CLAMP,
 	SWM_S_WORKSPACE_LIMIT,
 	SWM_S_WORKSPACE_NAME,
 };
@@ -8261,6 +8304,9 @@ setconfvalue(const char *selector, const char *value, int flags)
 				layouts[i].l_string = plain_stacker;
 		}
 		break;
+	case SWM_S_WARP_FOCUS:
+		warp_focus = (atoi(value) != 0);
+		break;
 	case SWM_S_WARP_POINTER:
 		warp_pointer = (atoi(value) != 0);
 		break;
@@ -8273,6 +8319,9 @@ setconfvalue(const char *selector, const char *value, int flags)
 	case SWM_S_WINDOW_NAME_ENABLED:
 		window_name_enabled = (atoi(value) != 0);
 		break;
+	case SWM_S_WORKSPACE_CLAMP:
+		workspace_clamp = (atoi(value) != 0);
+		break;
 	case SWM_S_WORKSPACE_LIMIT:
 		workspace_limit = atoi(value);
 		if (workspace_limit > SWM_WS_MAX)
@@ -8601,10 +8650,12 @@ struct config_option configopt[] = {
 	{ "urgent_collapse",		setconfvalue,	SWM_S_URGENT_COLLAPSE },
 	{ "urgent_enabled",		setconfvalue,	SWM_S_URGENT_ENABLED },
 	{ "verbose_layout",		setconfvalue,	SWM_S_VERBOSE_LAYOUT },
+	{ "warp_focus",			setconfvalue,	SWM_S_WARP_FOCUS },
 	{ "warp_pointer",		setconfvalue,	SWM_S_WARP_POINTER },
 	{ "window_class_enabled",	setconfvalue,	SWM_S_WINDOW_CLASS_ENABLED },
 	{ "window_instance_enabled",	setconfvalue,	SWM_S_WINDOW_INSTANCE_ENABLED },
 	{ "window_name_enabled",	setconfvalue,	SWM_S_WINDOW_NAME_ENABLED },
+	{ "workspace_clamp",		setconfvalue,	SWM_S_WORKSPACE_CLAMP },
 	{ "workspace_limit",		setconfvalue,	SWM_S_WORKSPACE_LIMIT },
 	{ "name",			setconfvalue,	SWM_S_WORKSPACE_NAME },
 };
@@ -10735,10 +10786,16 @@ shutdown_cleanup(void)
 
 	cursors_cleanup();
 
+	clear_quirks();
+	clear_spawns();
+	clear_keys();
+
 	teardown_ewmh();
 
 	num_screens = get_screen_count();
 	for (i = 0; i < num_screens; ++i) {
+		int j;
+
 		xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
 		    screens[i].root, XCB_CURRENT_TIME);
 
@@ -10750,7 +10807,19 @@ shutdown_cleanup(void)
 			XftColorFree(display, DefaultVisual(display, i),
 			    DefaultColormap(display, i), &search_font_color);
 		}
+
+		for (j = 0; j < SWM_S_COLOR_MAX; ++j) {
+			free(screens[i].c[j].name);
+		}
+
+		for (j = 0; j < SWM_WS_MAX; ++j) {
+			free(screens[i].ws[j].name);
+		}
 	}
+	free(screens);
+
+	free(bar_format);
+	free(clock_format);
 
 	if (bar_font_legacy)
 		XFreeFontSet(display, bar_fs);