X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=9d08e6e9fc1b06edd352b4e7ea694eac7151928f;hb=56230c5c167acf308dc45b98d5adeadac58f2e2f;hp=113452fd2240597de55ec74d38a1a1f51d351a49;hpb=157c555b7725e6977569c5206313240d3d448933;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 113452f..9d08e6e 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -870,6 +870,7 @@ RB_HEAD(key_tree, key);
 
 /* function prototypes */
 void	 adjust_font(struct ws_win *);
+char	*argsep(char **);
 void	 bar_cleanup(struct swm_region *);
 void	 bar_extra_setup(void);
 void	 bar_extra_stop(void);
@@ -6255,24 +6256,73 @@ spawn_select(struct swm_region *r, union arg *args, const char *spawn_name,
 	free(real_args);
 }
 
+/* Argument tokenizer. */
+char *
+argsep(char **sp) {
+	int			single_quoted = 0, double_quoted = 0;
+	char			*arg, *cp, *next;
+
+	if (*sp == NULL)
+		return NULL;
+
+	/* Eat and move characters until end of argument is found. */
+	for (arg = next = cp = *sp; *cp != '\0'; ++cp) {
+		if (!double_quoted && *cp == '\'') {
+			/* Eat single-quote. */
+			single_quoted = !single_quoted;
+		} else if (!single_quoted && *cp == '"') {
+			/* Eat double-quote. */
+			double_quoted = !double_quoted;
+		} else if (!single_quoted && *cp == '\\' && *(cp + 1) == '"') {
+			/* Eat backslash; copy escaped character to arg. */
+			*next++ = *(++cp);
+		} else if (!single_quoted && !double_quoted && *cp == '\\' &&
+		    (*(cp + 1) == '\'' || *(cp + 1) == ' ')) {
+			/* Eat backslash; move escaped character. */
+			*next++ = *(++cp);
+		} else if (!single_quoted && !double_quoted &&
+		    (*cp == ' ' || *cp == '\t')) {
+			/* Terminate argument. */
+			*next++ = '\0';
+			/* Point sp to beginning of next argument. */
+			*sp = ++cp;
+			break;
+		} else {
+			/* Move regular character. */
+			*next++ = *cp;
+		}
+	}
+
+	/* Terminate argument if end of string. */
+	if (*cp == '\0') {
+		*next = '\0';
+		*sp = NULL;
+	}
+
+	return arg;
+}
+
 void
 spawn_insert(const char *name, const char *args, int flags)
 {
-	char			*arg, *cp, *ptr;
 	struct spawn_prog	*sp;
+	char			*arg, *dup, *ptr;
 
-	DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name);
+	DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s[%s]\n", name, args);
+
+	if (args == NULL || *args == '\0')
+		return;
 
 	if ((sp = calloc(1, sizeof *sp)) == NULL)
 		err(1, "spawn_insert: calloc");
 	if ((sp->name = strdup(name)) == NULL)
 		err(1, "spawn_insert: strdup");
 
-	/* convert the arguments to an argument list */
-	if ((ptr = cp = strdup(args)) == NULL)
+	/* Convert the arguments to an argument list. */
+	if ((ptr = dup = strdup(args)) == NULL)
 		err(1, "spawn_insert: strdup");
-	while ((arg = strsep(&ptr, " \t")) != NULL) {
-		/* empty field; skip it */
+	while ((arg = argsep(&ptr)) != NULL) {
+		/* Null argument; skip it. */
 		if (*arg == '\0')
 			continue;
 
@@ -6283,10 +6333,11 @@ spawn_insert(const char *name, const char *args, int flags)
 		if ((sp->argv[sp->argc - 1] = strdup(arg)) == NULL)
 			err(1, "spawn_insert: strdup");
 	}
-	free(cp);
+	free(dup);
 
 	sp->flags = flags;
 
+	DNPRINTF(SWM_D_SPAWN, "arg %d: [%s]\n", sp->argc, sp->argv[sp->argc-1]);
 	TAILQ_INSERT_TAIL(&spawns, sp, entry);
 	DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n");
 }
@@ -6347,6 +6398,9 @@ setconfspawn(const char *selector, const char *value, int flags)
 {
 	char		*args;
 
+	if (selector == NULL || strlen(selector) == 0)
+		return (1);
+
 	args = expand_tilde(value);
 
 	DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
@@ -6595,8 +6649,9 @@ setconfbinding(const char *selector, const char *value, int flags)
 	/* suppress unused warning since var is needed */
 	(void)flags;
 
-	DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n");
-	if (selector == NULL) {
+	DNPRINTF(SWM_D_KEY, "setconfbinding: enter selector: [%s], "
+	    "value: [%s]\n", selector, value);
+	if (selector == NULL || strlen(selector) == 0) {
 		DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
 		if (parsekeys(value, mod_key, &mod, &ks) == 0) {
 			kfid = KF_INVALID;
@@ -6818,9 +6873,11 @@ updatenumlockmask(void)
 				    + j];
 				keycode = xcb_key_symbols_get_keycode(syms,
 						XK_Num_Lock);
-				if (kc == *keycode)
-					numlockmask = (1 << i);
-				free(keycode);
+				if (keycode) {
+					if (kc == *keycode)
+						numlockmask = (1 << i);
+					free(keycode);
+				}
 			}
 		}
 		free(modmap_r);
@@ -7111,7 +7168,7 @@ setconfquirk(const char *selector, const char *value, int flags)
 	/* suppress unused warning since var is needed */
 	(void)flags;
 
-	if (selector == NULL)
+	if (selector == NULL || strlen(selector) == 0)
 		return (0);
 
 	if ((str = strdup(selector)) == NULL)
@@ -7224,9 +7281,6 @@ setconfvalue(const char *selector, const char *value, int flags)
 	int			i, ws_id, num_screens;
 	char			*b, *str;
 
-	/* suppress unused warning since var is needed */
-	(void)selector;
-
 	switch (flags) {
 	case SWM_S_BAR_ACTION:
 		free(bar_argv[0]);
@@ -7466,7 +7520,9 @@ setconfmodkey(const char *selector, const char *value, int flags)
 int
 setconfcolor(const char *selector, const char *value, int flags)
 {
-	setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags);
+	setscreencolor(value,
+	    (selector == NULL || strlen(selector) == 0) ? -1 : atoi(selector),
+	    flags);
 	return (0);
 }
 
@@ -7979,7 +8035,7 @@ manage_window(xcb_window_t id, uint16_t mapped)
 	struct ws_win		*win, *ww;
 	int			ws_idx;
 	char			ws_idx_str[SWM_PROPLEN];
-	char			*name;
+	char			*class, *instance, *name;
 	struct swm_region	*r;
 	struct pid_e		*p;
 	struct quirk		*qp;
@@ -8105,40 +8161,38 @@ manage_window(xcb_window_t id, uint16_t mapped)
 	ewmh_autoquirk(win);
 
 	/* Determine initial quirks. */
-	if (xcb_icccm_get_wm_class_reply(conn,
+	xcb_icccm_get_wm_class_reply(conn,
 	    xcb_icccm_get_wm_class(conn, win->id),
-	    &win->ch, NULL)) {
-		name = get_win_name(win->id);
+	    &win->ch, NULL);
 
-		DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, instance: %s, "
-		    "name: %s\n",
-		    win->ch.class_name, win->ch.instance_name, name);
-
-		/* java is retarded so treat it special */
-		if (strstr(win->ch.instance_name, "sun-awt")) {
-			DNPRINTF(SWM_D_CLASS, "manage_window: java window "
-			    "detected.\n");
-			win->java = 1;
-		}
-
-		TAILQ_FOREACH(qp, &quirks, entry) {
-			if (regexec(&qp->regex_class, win->ch.class_name, 0,
-			    NULL, 0) == 0 && regexec(&qp->regex_instance,
-			    win->ch.instance_name, 0, NULL, 0) == 0 &&
-			    regexec(&qp->regex_name, name, 0, NULL, 0) == 0) {
-				DNPRINTF(SWM_D_CLASS, "manage_window: matched "
-				    "quirk: %s:%s:%s mask: %#lx\n", qp->class,
-				    qp->instance, qp->name, qp->quirk);
-				if (qp->quirk & SWM_Q_FLOAT)
-					win->floating = 1;
-				win->quirks = qp->quirk;
-			}
+	class = win->ch.class_name ? win->ch.class_name : "";
+	instance = win->ch.instance_name ? win->ch.instance_name : "";
+	name = get_win_name(win->id);
 
-		}
+	DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, instance: %s, "
+	    "name: %s\n", class, instance, name);
 
-		free(name);
+	/* java is retarded so treat it special */
+	if (win->ch.instance_name && strstr(win->ch.instance_name, "sun-awt")) {
+		DNPRINTF(SWM_D_CLASS, "manage_window: java window detected.\n");
+		win->java = 1;
+	}
+
+	TAILQ_FOREACH(qp, &quirks, entry) {
+		if (regexec(&qp->regex_class, class, 0, NULL, 0) == 0 &&
+		    regexec(&qp->regex_instance, instance, 0, NULL, 0) == 0 &&
+		    regexec(&qp->regex_name, name, 0, NULL, 0) == 0) {
+			DNPRINTF(SWM_D_CLASS, "manage_window: matched "
+			    "quirk: %s:%s:%s mask: %#lx\n", qp->class,
+			    qp->instance, qp->name, qp->quirk);
+			if (qp->quirk & SWM_Q_FLOAT)
+				win->floating = 1;
+			win->quirks = qp->quirk;
+		}
 	}
 
+	free(name);
+
 	/* Alter window position if quirky */
 	if (win->quirks & SWM_Q_ANYWHERE)
 		win->manual = 1;
@@ -8771,10 +8825,22 @@ mapnotify(xcb_map_notify_event_t *e)
 void
 mappingnotify(xcb_mapping_notify_event_t *e)
 {
+	struct ws_win	*w;
+	int	i, j, num_screens;
+
 	xcb_refresh_keyboard_mapping(syms, e);
 
-	if (e->request == XCB_MAPPING_KEYBOARD)
+	if (e->request == XCB_MAPPING_KEYBOARD) {
 		grabkeys();
+
+		/* Regrab buttons on all managed windows. */
+		num_screens = get_screen_count();
+		for (i = 0; i < num_screens; i++)
+			for (j = 0; j < workspace_limit; j++)
+				TAILQ_FOREACH(w, &screens[i].ws[j].winlist,
+				    entry)
+					grabbuttons(w);
+	}
 }
 
 void