X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=17409e92b7792bb5cb0b0e7612f4583933fbe978;hb=86961e0bd6c263394cd0e984d1d67b212a486d93;hp=835c1d413664ae1378ed0fb981e3acbc256e4dfa;hpb=bbb499e87a8c905214478e1badd67465701fc5cb;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 835c1d4..17409e9 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -50,7 +50,7 @@
 
 static const char	*cvstag = "$scrotwm$";
 
-#define	SWM_VERSION	"0.8"
+#define	SWM_VERSION	"0.9"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -140,6 +140,8 @@ u_int32_t		swm_debug = 0
 
 char			**start_argv;
 Atom			astate;
+Atom			aprot;
+Atom			adelete;
 int			(*xerrorxlib)(Display *, XErrorEvent *);
 int			other_wm;
 int			running = 1;
@@ -228,6 +230,7 @@ struct ws_win {
 	int			font_size_boundary[SWM_MAX_FONT_STEPS];
 	int			font_steps;
 	int			last_inc;
+	int			can_delete;
 	unsigned long		quirks;
 	struct workspace	*ws;	/* always valid */
 	struct swm_screen	*s;	/* always valid, never changes */
@@ -330,6 +333,8 @@ union arg {
 #define SWM_ARG_ID_SS_WINDOW	(1)
 #define SWM_ARG_ID_DONTCENTER	(0)
 #define SWM_ARG_ID_CENTER	(1)
+#define SWM_ARG_ID_KILLWINDOW	(0)
+#define SWM_ARG_ID_DELETEWINDOW	(1)
 	char			**argv;
 };
 
@@ -650,7 +655,6 @@ bar_update(void)
 
 	if (bar_enabled == 0)
 		return;
-
 	if (bar_extra && bar_extra_running) {
 		/* ignore short reads; it'll correct itself */
 		while ((b = fgetln(stdin, &len)) != NULL)
@@ -705,16 +709,13 @@ bar_toggle(struct swm_region *r, union arg *args)
 				XMapRaised(display, tmpr->bar_window);
 	}
 	bar_enabled = !bar_enabled;
-	XSync(display, False);
 	for (i = 0; i < sc; i++)
 		for (j = 0; j < SWM_WS_MAX; j++)
 			screens[i].ws[j].restack = 1;
 
 	stack();
 	/* must be after stack */
-	for (i = 0; i < sc; i++)
-		TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
-			bar_update();
+	bar_update();
 }
 
 void
@@ -810,6 +811,21 @@ version(struct swm_region *r, union arg *args)
 }
 
 void
+client_msg(struct ws_win *win, Atom a)
+{
+	XClientMessageEvent	cm;
+
+	bzero(&cm, sizeof cm);
+	cm.type = ClientMessage;
+	cm.window = win->id;
+	cm.message_type = aprot;
+	cm.format = 32;
+	cm.data.l[0] = a;
+	cm.data.l[1] = CurrentTime;
+	XSendEvent(display, win->id, False, 0L, (XEvent *)&cm);
+}
+
+void
 config_win(struct ws_win *win)
 {
 	XConfigureEvent		ce;
@@ -1410,8 +1426,9 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	XWindowChanges		wc;
 	struct swm_geometry	win_g, r_g = *g;
 	struct ws_win		*win, *winfocus;
-	int			i, j, s, w_inc, h_inc, w_base, h_base, stacks; 
-	int			hrh, extra, h_slice, last_h = 0;
+	int			i, j, s, stacks; 
+	int			w_inc = 1, h_inc, w_base = 1, h_base;
+	int			hrh, extra = 0, h_slice, last_h = 0;
 	int			split, colno, winno, mwin, msize, mscale;
 	int			remain, missing, v_slice;;
 	unsigned int		mask;
@@ -1426,7 +1443,13 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 		ws->focus = TAILQ_FIRST(&ws->winlist);
 	winfocus = cur_focus ? cur_focus : ws->focus;
 
-	win = TAILQ_FIRST(&ws->winlist);
+	TAILQ_FOREACH(win, &ws->winlist, entry)
+		if (win->transient == 0 && win->floating == 0)
+			break;
+
+	if (win == NULL)
+		goto notiles;
+
 	if (rot) {
 		w_inc = win->sh.width_inc;
 		w_base = win->sh.base_width;
@@ -1460,14 +1483,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 			/* adjust for window's requested size increment */
 			remain = (win_g.w - w_base) % w_inc;
 			missing = w_inc - remain;
-
-			if (missing <= extra || j == 0) {
-				extra -= missing;
-				win_g.w += missing;
-			} else {
-				win_g.w -= remain;
-				extra += remain;
-			}
+			win_g.w -= remain;
+			extra += remain;
 		}
 
 		msize = win_g.w;
@@ -1558,6 +1575,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 		j++;
 	}
 
+ notiles:
 	/* now, stack all the floaters and transients */
 	TAILQ_FOREACH(win, &ws->winlist, entry) {
 		if (win->transient == 0 && win->floating == 0)
@@ -1763,9 +1781,16 @@ send_to_ws(struct swm_region *r, union arg *args)
 void
 wkill(struct swm_region *r, union arg *args)
 {
-	DNPRINTF(SWM_D_MISC, "wkill\n");
-	if(r->ws->focus != NULL)
+	DNPRINTF(SWM_D_MISC, "wkill %d\n", args->id);
+
+	if(r->ws->focus == NULL)
+		return;
+
+	if (args->id == SWM_ARG_ID_KILLWINDOW)
 		XKillClient(display, r->ws->focus->id);
+	else
+		if (r->ws->focus->can_delete)
+			client_msg(r->ws->focus, adelete);
 }
 
 void
@@ -1859,7 +1884,8 @@ struct key {
 	{ MODKEY,		XK_b,		bar_toggle,	{0} },
 	{ MODKEY,		XK_Tab,		focus,		{.id = SWM_ARG_ID_FOCUSNEXT} },
 	{ MODKEY | ShiftMask,	XK_Tab,		focus,		{.id = SWM_ARG_ID_FOCUSPREV} },
-	{ MODKEY | ShiftMask,	XK_x,		wkill,		{0} },
+	{ MODKEY | ShiftMask,	XK_x,		wkill,		{.id = SWM_ARG_ID_KILLWINDOW} },
+	{ MODKEY,		XK_x,		wkill,		{.id = SWM_ARG_ID_DELETEWINDOW} },
 	{ MODKEY,		XK_s,		screenshot,	{.id = SWM_ARG_ID_SS_ALL} },
 	{ MODKEY | ShiftMask,	XK_s,		screenshot,	{.id = SWM_ARG_ID_SS_WINDOW} },
 	{ MODKEY,		XK_t,		floating_toggle,{0} },
@@ -1920,10 +1946,10 @@ resize(struct ws_win *win, union arg *args)
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			if (ev.xmotion.x < 0)
-				ev.xmotion.x = 0;
-			if (ev.xmotion.y < 0)
-				ev.xmotion.y = 0;
+			if (ev.xmotion.x <= 1)
+				ev.xmotion.x = 1;
+			if (ev.xmotion.y <= 1)
+				ev.xmotion.y = 1;
 			win->g.w = ev.xmotion.x;
 			win->g.h = ev.xmotion.y;
 
@@ -2171,9 +2197,10 @@ manage_window(Window id)
 	Window			trans;
 	struct workspace	*ws;
 	struct ws_win		*win;
-	int			format, i, ws_idx;
+	int			format, i, ws_idx, n;
 	unsigned long		nitems, bytes;
 	Atom			ws_idx_atom = 0, type;
+	Atom			*prot = NULL, *pp;
 	unsigned char		ws_idx_str[SWM_PROPLEN], *prop = NULL;
 	struct swm_region	*r;
 	long			mask;
@@ -2199,6 +2226,14 @@ manage_window(Window id)
 		DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
 		    (unsigned)win->id, win->transient);
 	}
+	/* get supported protocols */
+	if (XGetWMProtocols(display, id, &prot, &n)) {
+		for (i = 0, pp = prot; i < n; i++, pp++)
+			if (*pp == adelete)
+				win->can_delete = 1;
+		if (prot)
+			XFree(prot);
+	}
 
 	/*
 	 * Figure out where to put the window. If it was previously assigned to
@@ -2651,7 +2686,6 @@ new_region(struct swm_screen *s, int x, int y, int w, int h)
 	r->ws = ws;
 	ws->r = r;
 	TAILQ_INSERT_TAIL(&s->rl, r, entry);
-	bar_setup(r);
 }
 
 void
@@ -2841,10 +2875,11 @@ int
 main(int argc, char *argv[])
 {
 	struct passwd		*pwd;
+	struct swm_region	*r;
 	char			conf[PATH_MAX], *cfile = NULL;
 	struct stat		sb;
 	XEvent			e;
-	int			xfd;
+	int			xfd, i;
 	fd_set			rd;
 
 	start_argv = argv;
@@ -2860,6 +2895,8 @@ main(int argc, char *argv[])
 		errx(1, "other wm running");
 
 	astate = XInternAtom(display, "WM_STATE", False);
+	aprot = XInternAtom(display, "WM_PROTOCOLS", False);
+	adelete = XInternAtom(display, "WM_DELETE_WINDOW", False);
 
 	/* look for local and global conf file */
 	pwd = getpwuid(getuid());
@@ -2881,7 +2918,11 @@ main(int argc, char *argv[])
 	}
 	if (cfile)
 		conf_load(cfile);
-	bar_refresh();
+
+	/* setup all bars */
+	for (i = 0; i < ScreenCount(display); i++)
+		TAILQ_FOREACH(r, &screens[i].rl, entry)
+			bar_setup(r);
 
 	/* ws[0].focus = TAILQ_FIRST(&ws[0].winlist); */