X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=648387cb899ce2caaa963ceb6af808802b861e08;hb=db15c5644f1c18c24a380d6eb4394e26fd24ec01;hp=1f092e9d9dd383cb043f8ba98325daa788927044;hpb=3facef670188a80de6984ca186e5d28385ec9e68;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 1f092e9..648387c 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -279,7 +279,6 @@ volatile sig_atomic_t   restart_wm = 0;
 xcb_timestamp_t		last_event_time = 0;
 int			outputs = 0;
 int			other_wm;
-int			ss_enabled = 0;
 int			xrandr_support;
 int			xrandr_eventbase;
 unsigned int		numlockmask = 0;
@@ -349,10 +348,9 @@ double			dialog_ratio = 0.6;
 char		*bar_argv[] = { NULL, NULL };
 int		 bar_pipe[2];
 char		 bar_ext[SWM_BAR_MAX];
+char		 bar_ext_buf[SWM_BAR_MAX];
 char		 bar_vertext[SWM_BAR_MAX];
 int		 bar_version = 0;
-sig_atomic_t	 bar_alarm = 0;
-int		 bar_delay = 30;
 int		 bar_enabled = 1;
 int		 bar_border_width = 1;
 int		 bar_at_bottom = 0;
@@ -822,22 +820,21 @@ void	 adjust_font(struct ws_win *);
 void	 bar_class_name(char *, size_t, struct swm_region *);
 void	 bar_class_title_name(char *, size_t, struct swm_region *);
 void	 bar_cleanup(struct swm_region *);
+void	 bar_extra_setup(void);
 void	 bar_extra_stop(void);
+void	 bar_extra_update(void);
 void	 bar_fmt(const char *, char *, struct swm_region *, size_t);
 void	 bar_fmt_expand(char *, size_t);
-void	 bar_fmt_print(void);
+void	 bar_draw(void);
 void	 bar_print(struct swm_region *, const char *);
 void	 bar_print_legacy(struct swm_region *, const char *);
-void	 bar_refresh(void);
 void	 bar_replace(char *, char *, struct swm_region *, size_t);
 void	 bar_replace_pad(char *, int *, size_t);
 char *	 bar_replace_seq(char *, char *, struct swm_region *, size_t *,
 	     size_t);
 void	 bar_setup(struct swm_region *);
-void	 bar_signal(int);
 void	 bar_title_name(char *, size_t, struct swm_region *);
 void	 bar_toggle(struct swm_region *, union arg *);
-void	 bar_update(void);
 void	 bar_urgent(char *, size_t);
 void	 bar_window_float(char *, size_t, struct swm_region *);
 void	 bar_window_name(char *, size_t, struct swm_region *);
@@ -2163,8 +2160,9 @@ bar_fmt_expand(char *fmtexp, size_t sz)
 #endif
 }
 
+/* Redraws the bar; need to follow with xcb_flush() or focus_flush(). */
 void
-bar_fmt_print(void)
+bar_draw(void)
 {
 	char			fmtexp[SWM_BAR_MAX], fmtnew[SWM_BAR_MAX];
 	char			fmtrep[SWM_BAR_MAX];
@@ -2197,39 +2195,63 @@ bar_fmt_print(void)
 	}
 }
 
+/* Reads external script output; call when stdin is readable. */
 void
-bar_update(void)
+bar_extra_update(void)
 {
-	size_t			len;
-	char			*b;
+	size_t		len;
+	char		b[SWM_BAR_MAX];
+	int		redraw = 0;
 
-	if (!bar_enabled)
-		return;
-	if (bar_extra && bar_extra_running) {
-		/* ignore short reads; it'll correct itself */
-		while ((b = fgetln(stdin, &len)) != NULL)
-			if (b && b[len - 1] == '\n') {
-				b[len - 1] = '\0';
-				strlcpy(bar_ext, b, sizeof bar_ext);
+	if (bar_enabled && bar_extra && bar_extra_running) {
+		while (fgets(b, sizeof(b), stdin) != NULL) {
+			len = strlen(b);
+			if (b[len - 1] == '\n') {
+				/* Remove newline. */
+				b[--len] = '\0';
+
+				/* "Clear" bar_ext. */
+				bar_ext[0] = '\0';
+
+				/* Flush buffered output. */
+				strlcpy(bar_ext, bar_ext_buf, sizeof(bar_ext));
+				bar_ext_buf[0] = '\0';
+
+				/* Append new output to bar. */
+				strlcat(bar_ext, b, sizeof(bar_ext));
+
+				redraw = 1;
+			} else {
+				/* Buffer output. */
+				strlcat(bar_ext_buf, b, sizeof(bar_ext_buf));
 			}
-		if (b == NULL && errno != EAGAIN) {
-			warn("bar_update: bar_extra failed");
+		}
+
+		if (errno != EAGAIN) {
+			warn("bar_action failed");
 			bar_extra_stop();
 		}
-	} else
-		strlcpy(bar_ext, "", sizeof bar_ext);
+	} else {
+		/*
+		 * Attempt to drain stdin, so it doesn't cause the main loop to
+		 * call us as fast as it can.
+		 */
+		while (fgets(b, sizeof(b), stdin) != NULL);
 
-	bar_fmt_print();
-	alarm(bar_delay);
-}
+		if (!bar_enabled)
+			return;
 
-void
-bar_signal(int sig)
-{
-	/* suppress unused warning since var is needed */
-	(void)sig;
+		/* Clear bar script output if bar script is not running. */
+		if (bar_ext[0] != '\0') {
+			bar_ext[0] = '\0';
+			redraw = 1;
+		}
+	}
 
-	bar_alarm = 1;
+	if (redraw) {
+		bar_draw();
+		xcb_flush(conn);
+	}
 }
 
 void
@@ -2271,13 +2293,13 @@ bar_toggle(struct swm_region *r, union arg *args)
 	stack();
 
 	/* must be after stack */
-	bar_update();
+	bar_draw();
 
 	focus_flush();
 }
 
 void
-bar_refresh(void)
+bar_extra_setup(void)
 {
 	struct swm_region	*r;
 	uint32_t		wa[2];
@@ -2291,10 +2313,15 @@ bar_refresh(void)
 			err(1, "pipe error");
 		socket_setnonblock(bar_pipe[0]);
 		socket_setnonblock(bar_pipe[1]); /* XXX hmmm, really? */
+
+		/* Set stdin to read from the pipe. */
 		if (dup2(bar_pipe[0], 0) == -1)
 			err(1, "dup2");
+
+		/* Set stdout to write to the pipe. */
 		if (dup2(bar_pipe[1], 1) == -1)
 			err(1, "dup2");
+
 		if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
 			err(1, "could not disable SIGPIPE");
 		switch (bar_pid = fork()) {
@@ -2322,7 +2349,9 @@ bar_refresh(void)
 			xcb_change_window_attributes(conn, r->bar->id,
 			    XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
 		}
-	bar_update();
+
+	bar_draw();
+	xcb_flush(conn);
 }
 
 int
@@ -2488,9 +2517,7 @@ bar_setup(struct swm_region *r)
 	    "%d x %d\n", WINID(r->bar), X(r->bar), Y(r->bar), WIDTH(r->bar),
 	    HEIGHT(r->bar));
 
-	if (signal(SIGALRM, bar_signal) == SIG_ERR)
-		err(1, "could not install bar_signal");
-	bar_refresh();
+	bar_extra_setup();
 }
 
 void
@@ -2553,8 +2580,8 @@ version(struct swm_region *r, union arg *args)
 		    "Version: %s Build: %s", SPECTRWM_VERSION, buildstr);
 	else
 		strlcpy(bar_vertext, "", sizeof bar_vertext);
-	bar_update();
 
+	bar_draw();
 	xcb_flush(conn);
 }
 
@@ -3124,6 +3151,9 @@ focus_win(struct ws_win *win)
 	if (win->ws == NULL)
 		goto out;
 
+	if (!win->mapped)
+		goto out;
+
 	ws = win->ws;
 
 	if (validate_ws(ws))
@@ -3209,7 +3239,7 @@ focus_win(struct ws_win *win)
 	}
 
 out:
-	bar_update();
+	bar_draw();
 
 	DNPRINTF(SWM_D_FOCUS, "focus_win: done.\n");
 }
@@ -3331,7 +3361,7 @@ switchws(struct swm_region *r, union arg *args)
 
 	/* Clear bar if new ws is empty. */
 	if (new_ws->focus_pending == NULL)
-		bar_update();
+		bar_draw();
 
 	focus_flush();
 
@@ -3440,7 +3470,7 @@ cyclescr(struct swm_region *r, union arg *args)
 				rr->s[i].root, XCB_CURRENT_TIME);
 
 		/* Clear bar since empty. */
-		bar_update();
+		bar_draw();
 	}
 
 	focus_flush();
@@ -3753,7 +3783,7 @@ cycle_layout(struct swm_region *r, union arg *args)
 		ws->cur_layout = &layouts[0];
 
 	stack();
-	bar_update();
+	bar_draw();
 
 	focus_win(get_region_focus(r));
 
@@ -3773,7 +3803,7 @@ stack_config(struct swm_region *r, union arg *args)
 
 	if (args->id != SWM_ARG_ID_STACKINIT)
 		stack();
-	bar_update();
+	bar_draw();
 
 	focus_flush();
 }
@@ -4325,8 +4355,8 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 		}
 
 		/* Unmap unwanted windows if not multi-screen. */
-		if (!(num_screens > 1 || outputs > 1) && (w != win ||
-		    w != parent || w->transient != win->id))
+		if (num_screens <= 1 && outputs <= 1 && w != win &&
+		    w != parent && w->transient != win->id)
 			unmap_window(w);
 	}
 
@@ -6435,6 +6465,7 @@ enum {
 	SWM_S_BAR_BORDER_WIDTH,
 	SWM_S_BAR_DELAY,
 	SWM_S_BAR_ENABLED,
+	SWM_S_BAR_ENABLED_WS,
 	SWM_S_BAR_FONT,
 	SWM_S_BAR_FORMAT,
 	SWM_S_BAR_JUSTIFY,
@@ -6466,8 +6497,9 @@ enum {
 int
 setconfvalue(char *selector, char *value, int flags)
 {
-	int	i;
-	char	*b;
+	struct workspace	*ws;
+	int			i, ws_id, num_screens;
+	char			*b;
 
 	/* suppress unused warning since var is needed */
 	(void)selector;
@@ -6487,11 +6519,23 @@ setconfvalue(char *selector, char *value, int flags)
 			bar_border_width = 0;
 		break;
 	case SWM_S_BAR_DELAY:
-		bar_delay = atoi(value);
+		/* No longer needed; leave to not break old conf files. */
 		break;
 	case SWM_S_BAR_ENABLED:
 		bar_enabled = atoi(value);
 		break;
+	case SWM_S_BAR_ENABLED_WS:
+		ws_id = atoi(selector) - 1;
+		if (ws_id < 0 || ws_id >= workspace_limit)
+			errx(1, "setconfvalue: bar_enabled_ws: invalid "
+			    "workspace %d.", ws_id + 1);
+
+		num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+		for (i = 0; i < num_screens; i++) {
+			ws = (struct workspace *)&screens[i].ws;
+			ws[ws_id].bar_enabled = atoi(value);
+		}
+		break;
 	case SWM_S_BAR_FONT:
 		b = bar_fonts;
 		if (asprintf(&bar_fonts, "%s,%s", value, bar_fonts) == -1)
@@ -6608,9 +6652,10 @@ setconfvalue(char *selector, char *value, int flags)
 		setconfspawn("spawn_term", value, 0);
 		break;
 	case SWM_S_SS_APP:
+		/* No longer needed; leave to not break old conf files. */
 		break;
 	case SWM_S_SS_ENABLED:
-		ss_enabled = atoi(value);
+		/* No longer needed; leave to not break old conf files. */
 		break;
 	case SWM_S_STACK_ENABLED:
 		stack_enabled = atoi(value);
@@ -6856,50 +6901,51 @@ struct config_option {
 	int			funcflags;
 };
 struct config_option configopt[] = {
-	{ "bar_enabled",		setconfvalue,	SWM_S_BAR_ENABLED },
+	{ "autorun",			setautorun,	0 },
+	{ "bar_action",			setconfvalue,	SWM_S_BAR_ACTION },
 	{ "bar_at_bottom",		setconfvalue,	SWM_S_BAR_AT_BOTTOM },
 	{ "bar_border",			setconfcolor,	SWM_S_COLOR_BAR_BORDER },
 	{ "bar_border_width",		setconfvalue,	SWM_S_BAR_BORDER_WIDTH },
 	{ "bar_color",			setconfcolor,	SWM_S_COLOR_BAR },
-	{ "bar_font_color",		setconfcolor,	SWM_S_COLOR_BAR_FONT },
-	{ "bar_font",			setconfvalue,	SWM_S_BAR_FONT },
-	{ "bar_action",			setconfvalue,	SWM_S_BAR_ACTION },
 	{ "bar_delay",			setconfvalue,	SWM_S_BAR_DELAY },
-	{ "bar_justify",		setconfvalue,	SWM_S_BAR_JUSTIFY },
+	{ "bar_enabled",		setconfvalue,	SWM_S_BAR_ENABLED },
+	{ "bar_enabled_ws",		setconfvalue,	SWM_S_BAR_ENABLED_WS },
+	{ "bar_font",			setconfvalue,	SWM_S_BAR_FONT },
+	{ "bar_font_color",		setconfcolor,	SWM_S_COLOR_BAR_FONT },
 	{ "bar_format",			setconfvalue,	SWM_S_BAR_FORMAT },
-	{ "keyboard_mapping",		setkeymapping,	0 },
+	{ "bar_justify",		setconfvalue,	SWM_S_BAR_JUSTIFY },
 	{ "bind",			setconfbinding,	0 },
-	{ "stack_enabled",		setconfvalue,	SWM_S_STACK_ENABLED },
+	{ "border_width",		setconfvalue,	SWM_S_BORDER_WIDTH },
 	{ "clock_enabled",		setconfvalue,	SWM_S_CLOCK_ENABLED },
 	{ "clock_format",		setconfvalue,	SWM_S_CLOCK_FORMAT },
 	{ "color_focus",		setconfcolor,	SWM_S_COLOR_FOCUS },
 	{ "color_unfocus",		setconfcolor,	SWM_S_COLOR_UNFOCUS },
 	{ "cycle_empty",		setconfvalue,	SWM_S_CYCLE_EMPTY },
 	{ "cycle_visible",		setconfvalue,	SWM_S_CYCLE_VISIBLE },
-	{ "workspace_limit",		setconfvalue,	SWM_S_WORKSPACE_LIMIT },
 	{ "dialog_ratio",		setconfvalue,	SWM_S_DIALOG_RATIO },
-	{ "verbose_layout",		setconfvalue,	SWM_S_VERBOSE_LAYOUT },
+	{ "disable_border",		setconfvalue,	SWM_S_DISABLE_BORDER },
+	{ "focus_close",		setconfvalue,	SWM_S_FOCUS_CLOSE },
+	{ "focus_close_wrap",		setconfvalue,	SWM_S_FOCUS_CLOSE_WRAP },
+	{ "focus_default",		setconfvalue,	SWM_S_FOCUS_DEFAULT },
+	{ "focus_mode",			setconfvalue,	SWM_S_FOCUS_MODE },
+	{ "keyboard_mapping",		setkeymapping,	0 },
+	{ "layout",			setlayout,	0 },
 	{ "modkey",			setconfmodkey,	0 },
 	{ "program",			setconfspawn,	0 },
 	{ "quirk",			setconfquirk,	0 },
 	{ "region",			setconfregion,	0 },
-	{ "spawn_term",			setconfvalue,	SWM_S_SPAWN_TERM },
-	{ "screenshot_enabled",		setconfvalue,	SWM_S_SS_ENABLED },
 	{ "screenshot_app",		setconfvalue,	SWM_S_SS_APP },
-	{ "window_name_enabled",	setconfvalue,	SWM_S_WINDOW_NAME_ENABLED },
-	{ "urgent_enabled",		setconfvalue,	SWM_S_URGENT_ENABLED },
+	{ "screenshot_enabled",		setconfvalue,	SWM_S_SS_ENABLED },
+	{ "spawn_position",		setconfvalue,	SWM_S_SPAWN_ORDER },
+	{ "spawn_term",			setconfvalue,	SWM_S_SPAWN_TERM },
+	{ "stack_enabled",		setconfvalue,	SWM_S_STACK_ENABLED },
 	{ "term_width",			setconfvalue,	SWM_S_TERM_WIDTH },
 	{ "title_class_enabled",	setconfvalue,	SWM_S_TITLE_CLASS_ENABLED },
 	{ "title_name_enabled",		setconfvalue,	SWM_S_TITLE_NAME_ENABLED },
-	{ "focus_mode",			setconfvalue,	SWM_S_FOCUS_MODE },
-	{ "focus_close",		setconfvalue,	SWM_S_FOCUS_CLOSE },
-	{ "focus_close_wrap",		setconfvalue,	SWM_S_FOCUS_CLOSE_WRAP },
-	{ "focus_default",		setconfvalue,	SWM_S_FOCUS_DEFAULT },
-	{ "spawn_position",		setconfvalue,	SWM_S_SPAWN_ORDER },
-	{ "disable_border",		setconfvalue,	SWM_S_DISABLE_BORDER },
-	{ "border_width",		setconfvalue,	SWM_S_BORDER_WIDTH },
-	{ "autorun",			setautorun,	0 },
-	{ "layout",			setlayout,	0 },
+	{ "urgent_enabled",		setconfvalue,	SWM_S_URGENT_ENABLED },
+	{ "verbose_layout",		setconfvalue,	SWM_S_VERBOSE_LAYOUT },
+	{ "window_name_enabled",	setconfvalue,	SWM_S_WINDOW_NAME_ENABLED },
+	{ "workspace_limit",		setconfvalue,	SWM_S_WORKSPACE_LIMIT },
 };
 
 int
@@ -7412,7 +7458,7 @@ expose(xcb_expose_event_t *e)
 	for (i = 0; i < num_screens; i++)
 		TAILQ_FOREACH(r, &screens[i].rl, entry)
 			if (e->window == WINID(r->bar))
-				bar_update();
+				bar_draw();
 
 	xcb_flush(conn);
 }
@@ -7497,7 +7543,7 @@ buttonpress(xcb_button_press_event_t *e)
 				    XCB_INPUT_FOCUS_PARENT, e->root, e->time);
 
 				/* Clear bar since empty. */
-				bar_update();
+				bar_draw();
 
 				handled = 1;
 				goto out;
@@ -7878,7 +7924,7 @@ enternotify(xcb_enter_notify_event_t *e)
 				    XCB_INPUT_FOCUS_PARENT, e->root, e->time);
 
 				/* Clear bar since empty. */
-				bar_update();
+				bar_draw();
 
 				focus_flush();
 			}
@@ -8076,7 +8122,7 @@ propertynotify(xcb_property_notify_event_t *e)
 		}
 	} else if (e->atom == XCB_ATOM_WM_CLASS ||
 	    e->atom == XCB_ATOM_WM_NAME) {
-		bar_update();
+		bar_draw();
 	}
 
 	xcb_flush(conn);
@@ -8823,6 +8869,9 @@ main(int argc, char *argv[])
 	xcb_generic_event_t	*evt;
 	struct timeval          tv;
 	fd_set			rd;
+	int			rd_max;
+	int			stdin_ready = 0;
+	int			num_readable;
 
 	/* suppress unused warning since var is needed */
 	(void)argc;
@@ -8953,6 +9002,8 @@ noconfig:
 	xcb_ungrab_server(conn);
 	xcb_flush(conn);
 
+	rd_max = xfd > STDIN_FILENO ? xfd : STDIN_FILENO;
+
 	while (running) {
 		while ((evt = xcb_poll_for_event(conn))) {
 			if (!running)
@@ -8977,22 +9028,29 @@ noconfig:
 		}
 
 		FD_ZERO(&rd);
+		FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
 		tv.tv_sec = 1;
 		tv.tv_usec = 0;
-		if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
-			if (errno != EINTR) {
-				DNPRINTF(SWM_D_MISC, "select failed");
-			}
+		num_readable = select(rd_max + 1, &rd, NULL, NULL, &tv);
+		if (num_readable == -1 && errno != EINTR) {
+			DNPRINTF(SWM_D_MISC, "select failed");
+		} else if (num_readable > 0 && FD_ISSET(STDIN_FILENO, &rd)) {
+			stdin_ready = 1;
+		}
+
 		if (restart_wm)
 			restart(NULL, NULL);
+
 		if (search_resp)
 			search_do_resp();
+
 		if (!running)
 			goto done;
-		if (bar_alarm) {
-			bar_alarm = 0;
-			bar_update();
+
+		if (stdin_ready) {
+			stdin_ready = 0;
+			bar_extra_update();
 		}
 	}
 done: