X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=647433f95f1c158883fb99e4e7f3c0c831a13c0d;hb=f4dcc22a555b197724343e2c3cc30da8d4cedeca;hp=a0f7e05cac500fd874f074612569db68911ba6d9;hpb=11120d6ae8fab0c43758254a3ac2f0903df1d1cf;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index a0f7e05..647433f 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -161,9 +161,18 @@ u_int32_t		swm_debug = 0
 #define Y(r)			(r)->g.y
 #define WIDTH(r)		(r)->g.w
 #define HEIGHT(r)		(r)->g.h
+#define SH_MIN(w)		(w)->sh_mask & PMinSize
+#define SH_MIN_W(w)		(w)->sh.min_width
+#define SH_MIN_H(w)		(w)->sh.min_height
+#define SH_MAX(w)		(w)->sh_mask & PMaxSize
+#define SH_MAX_W(w)		(w)->sh.max_width
+#define SH_MAX_H(w)		(w)->sh.max_height
+#define SH_INC(w)		(w)->sh_mask & PResizeInc
+#define SH_INC_W(w)		(w)->sh.width_inc
+#define SH_INC_H(w)		(w)->sh.height_inc
 #define SWM_MAX_FONT_STEPS	(3)
-#define WINID(w)		(w ? w->id : 0)
-#define YESNO(x)		(x ? "yes" : "no")
+#define WINID(w)		((w) ? (w)->id : 0)
+#define YESNO(x)		((x) ? "yes" : "no")
 
 #define SWM_FOCUS_DEFAULT	(0)
 #define SWM_FOCUS_SYNERGY	(1)
@@ -337,6 +346,7 @@ struct ws_win {
 	struct swm_screen	*s;	/* always valid, never changes */
 	XWindowAttributes	wa;
 	XSizeHints		sh;
+	long			sh_mask;
 	XClassHint		ch;
 	XWMHints		*hints;
 };
@@ -501,7 +511,7 @@ struct quirk {
 #define SWM_Q_FOCUSPREV		(1<<5)	/* focus on caller */
 };
 TAILQ_HEAD(quirk_list, quirk);
-struct quirk_list	quirks = TAILQ_HEAD_INITIALIZER(quirks);
+struct quirk_list		quirks = TAILQ_HEAD_INITIALIZER(quirks);
 
 /*
  * Supported EWMH hints should be added to
@@ -553,7 +563,7 @@ struct ewmh_hint {
 void		 store_float_geom(struct ws_win *, struct swm_region *);
 int		 floating_toggle_win(struct ws_win *);
 void		 spawn_select(struct swm_region *, union arg *, char *, int *);
-unsigned char	*get_win_name(Display *, Window, Atom, Atom, unsigned long *);
+unsigned char	*get_win_name(Display *, Window);
 
 int
 get_property(Window id, Atom atom, long count, Atom type,
@@ -995,7 +1005,7 @@ geteventname(XEvent *e)
 char *
 xrandr_geteventname(XEvent *e)
 {
-	char 			*name = NULL;
+	char			*name = NULL;
 
 	switch(e->type - xrandr_eventbase) {
 	case RRScreenChangeNotify:
@@ -1016,34 +1026,34 @@ dumpwins(struct swm_region *r, union arg *args)
 	XWindowAttributes	wa;
 
 	if (r->ws == NULL) {
-		fprintf(stderr, "dumpwins: invalid workspace\n");
+		warnx("dumpwins: invalid workspace");
 		return;
 	}
 
-	fprintf(stderr, "=== managed window list ws %02d ===\n", r->ws->idx);
+	warnx("=== managed window list ws %02d ===", r->ws->idx);
 
 	TAILQ_FOREACH(win, &r->ws->winlist, entry) {
 		state = getstate(win->id);
 		if (!XGetWindowAttributes(display, win->id, &wa))
-			fprintf(stderr, "window: 0x%lx, failed "
-			    "XGetWindowAttributes\n", win->id);
-		fprintf(stderr, "window: 0x%lx, map_state: %d, state: %d, "
-		    "transient: 0x%lx\n",
-		    win->id, wa.map_state, state, win->transient);
+			warnx("window: 0x%lx, failed XGetWindowAttributes",
+			    win->id);
+		warnx("window: 0x%lx, map_state: %d, state: %d, "
+		    "transient: 0x%lx", win->id, wa.map_state, state,
+		    win->transient);
 	}
 
-	fprintf(stderr, "===== unmanaged window list =====\n");
+	warnx("===== unmanaged window list =====");
 	TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) {
 		state = getstate(win->id);
 		if (!XGetWindowAttributes(display, win->id, &wa))
-			fprintf(stderr, "window: 0x%lx, failed "
-			    "XGetWindowAttributes\n", win->id);
-		fprintf(stderr, "window: 0x%lx, map_state: %d, state: %d, "
-		    "transient: 0x%lx\n",
-		    win->id, wa.map_state, state, win->transient);
+			warnx("window: 0x%lx, failed XGetWindowAttributes",
+			    win->id);
+		warnx("window: 0x%lx, map_state: %d, state: %d, "
+		    "transient: 0x%lx", win->id, wa.map_state, state,
+		    win->transient);
 	}
 
-	fprintf(stderr, "=================================\n");
+	warnx("=================================");
 }
 #else
 void
@@ -1173,7 +1183,7 @@ name_to_color(char *colorname)
 	if (status)
 		result = screen_def.pixel;
 	else
-		fprintf(stderr, "color '%s' not found.\n", colorname);
+		warnx("color '%s' not found", colorname);
 
 	return (result);
 }
@@ -1240,9 +1250,8 @@ custom_region(char *val)
 	    y > DisplayHeight(display, sidx) ||
 	    w + x > DisplayWidth(display, sidx) ||
 	    h + y > DisplayHeight(display, sidx)) {
-		fprintf(stderr, "ignoring region %ux%u+%u+%u "
-		    "- not within screen boundaries "
-		    "(%ux%u)\n", w, h, x, y,
+		warnx("ignoring region %ux%u+%u+%u - not within screen "
+		    "boundaries (%ux%u)", w, h, x, y,
 		    DisplayWidth(display, sidx), DisplayHeight(display, sidx));
 		return;
 	}
@@ -1345,11 +1354,10 @@ void
 bar_window_name(char *s, ssize_t sz, struct ws_win *cur_focus)
 {
 	unsigned char		*title;
-	unsigned long		len;
 
 	if (window_name_enabled && cur_focus != NULL) {
-		if ((title = get_win_name(display, cur_focus->id, a_netwmname,
-		    a_utf8_string, &len)) != NULL) {
+		title = get_win_name(display, cur_focus->id);
+		if (title != NULL) {
 			DNPRINTF(SWM_D_BAR, "bar_window_name: title: %s\n",
 			    title);
 
@@ -1424,8 +1432,7 @@ bar_update(void)
 				strlcpy((char *)bar_ext, b, sizeof bar_ext);
 			}
 		if (b == NULL && errno != EAGAIN) {
-			fprintf(stderr, "bar_update: bar_extra failed: "
-			    "errno: %d %s\n", errno, strerror(errno));
+			warn("bar_update: bar_extra failed");
 			bar_extra_stop();
 		}
 	} else
@@ -1436,7 +1443,8 @@ bar_update(void)
 	else {
 		time(&tmt);
 		localtime_r(&tmt, &tm);
-		strftime(s, sizeof s, clock_format, &tm);
+		len = strftime(s, sizeof s, clock_format, &tm);
+		s[len] = '\0';
 		strlcat(s, "    ", sizeof s);
 	}
 
@@ -1709,6 +1717,43 @@ config_win(struct ws_win *win, XConfigureRequestEvent  *ev)
 		ce.display = ev->display;
 		ce.event = ev->window;
 		ce.window = ev->window;
+
+		/* make response appear more WM_SIZE_HINTS-compliant */
+		if (win->sh_mask)
+			DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%lx,"
+			    " sh_mask: %ld, min: %d x %d, max: %d x %d, inc: "
+			    "%d x %d\n", win->id, win->sh_mask, SH_MIN_W(win),
+			    SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win),
+			    SH_INC_W(win), SH_INC_H(win));
+
+		/* min size */
+		if (SH_MIN(win)) {
+			/* the hint may be set... to 0! */
+			if (SH_MIN_W(win) > 0 && ce.width < SH_MIN_W(win))
+				ce.width = SH_MIN_W(win);
+			if (SH_MIN_H(win) > 0 && ce.height < SH_MIN_H(win))
+				ce.height = SH_MIN_H(win);
+		}
+
+		/* max size */
+		if (SH_MAX(win)) {
+			/* may also be advertized as 0 */
+			if (SH_MAX_W(win) > 0 && ce.width > SH_MAX_W(win))
+				ce.width = SH_MAX_W(win);
+			if (SH_MAX_H(win) > 0 && ce.height > SH_MAX_H(win))
+				ce.height = SH_MAX_H(win);
+		}
+
+		/* resize increment. */
+		if (SH_INC(win)) {
+			if (SH_INC_W(win) > 1 && ce.width > SH_INC_W(win))
+				ce.width -= (ce.width - SH_MIN_W(win)) %
+				    SH_INC_W(win);
+			if (SH_INC_H(win) > 1 && ce.height > SH_INC_H(win))
+				ce.height -= (ce.height - SH_MIN_H(win)) %
+				    SH_INC_H(win);
+		}
+
 		/* adjust x and y for requested border_width. */
 		ce.x += border_width - ev->border_width;
 		ce.y += border_width - ev->border_width;
@@ -1825,8 +1870,7 @@ restart(struct swm_region *r, union arg *args)
 	unmap_all();
 	XCloseDisplay(display);
 	execvp(start_argv[0], start_argv);
-	fprintf(stderr, "execvp failed\n");
-	perror(" failed");
+	warn("execvp failed");
 	quit(NULL, NULL);
 }
 
@@ -1920,7 +1964,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 	setenv("LD_PRELOAD", SWM_LIB, 1);
 
 	if (asprintf(&ret, "%d", ws_idx) == -1) {
-		perror("_SWM_WS");
+		warn("spawn: asprintf SWM_WS");
 		_exit(1);
 	}
 	setenv("_SWM_WS", ret, 1);
@@ -1928,7 +1972,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 	ret = NULL;
 
 	if (asprintf(&ret, "%d", getpid()) == -1) {
-		perror("_SWM_PID");
+		warn("spawn: asprintf _SWM_PID");
 		_exit(1);
 	}
 	setenv("_SWM_PID", ret, 1);
@@ -1936,7 +1980,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 	ret = NULL;
 
 	if (setsid() == -1) {
-		perror("setsid");
+		warn("spawn: setsid");
 		_exit(1);
 	}
 
@@ -1947,7 +1991,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 		 * leave stderr open to record errors
 		*/
 		if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) == -1) {
-			perror("open");
+			warn("spawn: open");
 			_exit(1);
 		}
 		dup2(fd, STDIN_FILENO);
@@ -1958,7 +2002,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 
 	execvp(args->argv[0], args->argv);
 
-	perror("execvp");
+	warn("spawn: execvp");
 	_exit(1);
 }
 
@@ -2162,7 +2206,7 @@ focus_win(struct ws_win *win)
 		    PropModeReplace, (unsigned char *)&win->id,1);
 	}
 
-	if (window_name_enabled)
+	if (window_name_enabled || title_class_enabled || title_name_enabled)
 		bar_update();
 }
 
@@ -2341,7 +2385,7 @@ sort_windows(struct ws_win_list *wl)
 		if (win->transient) {
 			parent = find_window(win->transient);
 			if (parent == NULL) {
-				fprintf(stderr, "not possible bug\n");
+				warnx("not possible bug");
 				continue;
 			}
 			TAILQ_REMOVE(wl, win, entry);
@@ -2485,7 +2529,6 @@ done:
 		if (window_name_enabled || title_name_enabled ||
 		    title_class_enabled)
 			bar_update();
-		
 		return;
 	}
 
@@ -3269,31 +3312,29 @@ iconify(struct swm_region *r, union arg *args)
 }
 
 unsigned char *
-get_win_name(Display *dpy, Window win, Atom wname, Atom stype,
-    unsigned long *slen)
+get_win_name(Display *dpy, Window win)
 {
 	int			status, retfmt;
 	unsigned long		nitems, nbytes, nextra;
 	unsigned char		*prop = NULL;
 	Atom			rettype;
 
-	status = XGetWindowProperty(dpy, win, wname, 0L, 0L, False, stype,
-	    &rettype, &retfmt,  &nitems, &nbytes, &prop);
+	status = XGetWindowProperty(dpy, win, a_netwmname, 0L, 0L, False,
+	    a_utf8_string, &rettype, &retfmt,  &nitems, &nbytes, &prop);
 	if (status != Success)
 		return (NULL);
 	XFree(prop);
 
-	status = XGetWindowProperty(dpy, win, wname, 0L, nbytes, False,
-	    stype, &rettype, &retfmt, &nitems, &nextra, &prop);
+	status = XGetWindowProperty(dpy, win, a_netwmname, 0L, nbytes, False,
+	    a_utf8_string, &rettype, &retfmt, &nitems, &nextra, &prop);
 	if (status != Success) {
 		XFree(prop);
 		return (NULL);
 	}
-	if (rettype != stype) {
+	if (rettype != a_utf8_string) {
 		XFree(prop);
 		return (NULL);
 	}
-	*slen = nitems;
 	return (prop);
 }
 
@@ -3304,7 +3345,6 @@ uniconify(struct swm_region *r, union arg *args)
 	FILE			*lfile;
 	unsigned char		*name;
 	int			count = 0;
-	unsigned long		len;
 
 	DNPRINTF(SWM_D_MISC, "uniconify\n");
 
@@ -3336,8 +3376,7 @@ uniconify(struct swm_region *r, union arg *args)
 		if (win->iconic == 0)
 			continue;
 
-		name = get_win_name(display, win->id, a_netwmname,
-		    a_utf8_string, &len);
+		name = get_win_name(display, win->id);
 		if (name == NULL)
 			continue;
 		fprintf(lfile, "%s.%lu\n", name, win->id);
@@ -3445,8 +3484,7 @@ search_win(struct swm_region *r, union arg *args)
 
 		sw = calloc(1, sizeof(struct search_window));
 		if (sw == NULL) {
-			fprintf(stderr, "search_win: calloc: %s",
-			    strerror(errno));
+			warn("search_win: calloc");
 			fclose(lfile);
 			search_win_cleanup();
 			return;
@@ -3495,8 +3533,7 @@ search_resp_uniconify(char *resp, unsigned long len)
 	TAILQ_FOREACH(win, &search_r->ws->winlist, entry) {
 		if (win->iconic == 0)
 			continue;
-		name = get_win_name(display, win->id, a_netwmname,
-		    a_utf8_string, &len);
+		name = get_win_name(display, win->id);
 		if (name == NULL)
 			continue;
 		if (asprintf(&s, "%s.%lu", name, win->id) == -1) {
@@ -3619,13 +3656,13 @@ search_do_resp(void)
 	searchpid = 0;
 
 	if ((resp = calloc(1, MAX_RESP_LEN + 1)) == NULL) {
-		fprintf(stderr, "search: calloc\n");
+		warn("search: calloc");
 		goto done;
 	}
 
 	rbytes = read(select_resp_pipe[0], resp, MAX_RESP_LEN);
 	if (rbytes <= 0) {
-		fprintf(stderr, "search: read error: %s\n", strerror(errno));
+		warn("search: read error");
 		goto done;
 	}
 	resp[rbytes] = '\0';
@@ -4344,8 +4381,7 @@ spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
 			prog = &spawns[i];
 	}
 	if (prog == NULL) {
-		fprintf(stderr, "spawn_custom: program %s not found\n",
-		    spawn_name);
+		warnx("spawn_custom: program %s not found", spawn_name);
 		return (-1);
 	}
 
@@ -4509,8 +4545,7 @@ setspawn(struct spawn_prog *prog)
 	}
 
 	if (prog->argv == NULL) {
-		fprintf(stderr,
-		    "error: setspawn: cannot find program: %s", prog->name);
+		warnx("error: setspawn: cannot find program: %s", prog->name);
 		free(prog);
 		return;
 	}
@@ -4522,8 +4557,7 @@ setspawn(struct spawn_prog *prog)
 		spawns = malloc((size_t)spawns_size *
 		    sizeof(struct spawn_prog));
 		if (spawns == NULL) {
-			fprintf(stderr, "setspawn: malloc failed\n");
-			perror(" failed");
+			warn("setspawn: malloc failed");
 			quit(NULL, NULL);
 		}
 	} else if (spawns_length == spawns_size) {
@@ -4532,8 +4566,7 @@ setspawn(struct spawn_prog *prog)
 		spawns = realloc(spawns, (size_t)spawns_size *
 		    sizeof(struct spawn_prog));
 		if (spawns == NULL) {
-			fprintf(stderr, "setspawn: realloc failed\n");
-			perror(" failed");
+			warn("setspawn: realloc failed");
 			quit(NULL, NULL);
 		}
 	}
@@ -4544,9 +4577,9 @@ setspawn(struct spawn_prog *prog)
 		i = spawns_length++;
 		spawns[i] = *prog;
 	} else {
-		fprintf(stderr, "spawns array problem?\n");
+		warnx("spawns array problem?");
 		if (spawns == NULL) {
-			fprintf(stderr, "spawns array is NULL!\n");
+			warnx("spawns array is NULL!");
 			quit(NULL, NULL);
 		}
 	}
@@ -5031,7 +5064,7 @@ parsequirks(char *qstr, unsigned long *quirk)
 void
 quirk_insert(const char *class, const char *name, unsigned long quirk)
 {
-	struct quirk	*qp;
+	struct quirk		*qp;
 
 	DNPRINTF(SWM_D_QUIRK, "quirk_insert: %s:%s [%lu]\n", class, name,
 	    quirk);
@@ -5079,10 +5112,10 @@ quirk_replace(struct quirk *qp, const char *class, const char *name,
 void
 setquirk(const char *class, const char *name, unsigned long quirk)
 {
-	struct quirk	*qp;
+	struct quirk		*qp;
 
 	DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name,
-	   quirk); 
+	   quirk);
 
 	TAILQ_FOREACH(qp, &quirks, entry) {
 		if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) {
@@ -5496,7 +5529,7 @@ conf_load(char *filename, int keymapping)
 	DNPRINTF(SWM_D_CONF, "conf_load: begin\n");
 
 	if (filename == NULL) {
-		fprintf(stderr, "conf_load: no filename\n");
+		warnx("conf_load: no filename");
 		return (1);
 	}
 	if ((config = fopen(filename, "r")) == NULL) {
@@ -5575,12 +5608,9 @@ conf_load(char *filename, int keymapping)
 		optval = strdup(cp);
 		/* call function to deal with it all */
 		if (configopt[optind].func(optsub, optval,
-		    configopt[optind].funcflags) != 0) {
-			fprintf(stderr, "%s line %zd: %s\n",
-			    filename, lineno, line);
+		    configopt[optind].funcflags) != 0)
 			errx(1, "%s: line %zd: invalid data for %s",
 			    filename, lineno, configopt[optind].optname);
-		}
 		free(optval);
 		free(optsub);
 		free(line);
@@ -5615,7 +5645,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 		    " for 0x%lx trans 0x%lx\n", win->id, win->transient);
 
 		if (win->hints == NULL) {
-			fprintf(stderr, "no hints for 0x%lx\n", win->id);
+			warnx("no hints for 0x%lx", win->id);
 			return;
 		}
 
@@ -5627,8 +5657,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 				XFree(wmh);
 
 			if ((wmh = XGetWMHints(display, w->id)) == NULL) {
-				fprintf(stderr, "can't get hints for 0x%lx\n",
-				    w->id);
+				warnx("can't get hints for 0x%lx", w->id);
 				continue;
 			}
 
@@ -5746,7 +5775,7 @@ manage_window(Window id)
 		    False, XA_STRING, &type, &format, &nitems, &bytes, &prop);
 	}
 	XGetWindowAttributes(display, id, &win->wa);
-	XGetWMNormalHints(display, id, &win->sh, &mask);
+	XGetWMNormalHints(display, id, &win->sh, &win->sh_mask);
 	win->hints = XGetWMHints(display, id);
 	XGetTransientForHint(display, id, &trans);
 	if (trans) {
@@ -5799,9 +5828,8 @@ manage_window(Window id)
 					if (ww->ws->r)
 						r = ww->ws->r;
 					else
-						fprintf(stderr,
-						    "manage_window: fix this "
-						    "bug mcbride\n");
+						warnx("manage_window: fix this "
+						    "bug mcbride");
 					border_me = 1;
 				}
 	}
@@ -5955,7 +5983,10 @@ unmanage_window(struct ws_win *win)
 
 	focus_prev(win);
 
-	XFree(win->hints);
+	if (win->hints) {
+		XFree(win->hints);
+		win->hints = NULL;
+	}
 
 	TAILQ_REMOVE(&win->ws->winlist, win, entry);
 	TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
@@ -6084,14 +6115,13 @@ void
 configurenotify(XEvent *e)
 {
 	struct ws_win		*win;
-	long			mask;
 
 	DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%lx\n",
 	    e->xconfigure.window);
 
 	win = find_window(e->xconfigure.window);
 	if (win) {
-		XGetWMNormalHints(display, win->id, &win->sh, &mask);
+		XGetWMNormalHints(display, win->id, &win->sh, &win->sh_mask);
 		adjust_font(win);
 		if (font_adjusted)
 			stack();
@@ -6282,7 +6312,7 @@ focusevent(XEvent *e)
 			    SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color);
 		break;
 	default:
-		fprintf(stderr, "ignoring focusevent\n");
+		warnx("ignoring focusevent");
 		DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n");
 		break;
 	}
@@ -6370,11 +6400,11 @@ propertynotify(XEvent *e)
 	case XA_WM_NORMAL_HINTS:
 		long		mask;
 		XGetWMNormalHints(display, win->id, &win->sh, &mask);
-		fprintf(stderr, "normal hints: flag 0x%x\n", win->sh.flags);
+		warnx("normal hints: flag 0x%x", win->sh.flags);
 		if (win->sh.flags & PMinSize) {
 			WIDTH(win) = win->sh.min_width;
 			HEIGHT(win) = win->sh.min_height;
-			fprintf(stderr, "min %d %d\n", WIDTH(win), HEIGHT(win));
+			warnx("min %d %d", WIDTH(win), HEIGHT(win));
 		}
 		XMoveResizeWindow(display, win->id,
 		    X(win), Y(win), WIDTH(win), HEIGHT(win));
@@ -6511,7 +6541,7 @@ xerror_start(Display *d, XErrorEvent *ee)
 int
 xerror(Display *d, XErrorEvent *ee)
 {
-	/* fprintf(stderr, "error: %p %p\n", display, ee); */
+	/* warnx("error: %p %p", display, ee); */
 	return (-1);
 }
 
@@ -6870,8 +6900,7 @@ main(int argc, char *argv[])
 	struct sigaction	sact;
 
 	start_argv = argv;
-	fprintf(stderr, "Welcome to scrotwm V%s Build: %s\n",
-	    SCROTWM_VERSION, buildstr);
+	warnx("Welcome to scrotwm V%s Build: %s", SCROTWM_VERSION, buildstr);
 	if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") ||
 	    !XSupportsLocale())
 		warnx("no locale support");