X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=dc9f31800a171d738ae9be2844622a024f66ec04;hp=dd3bc843d801752e4a07d5324f255e611c8e7a29;hb=9e9918ad967382660aea6bd7e9634f5995de04e0;hpb=087f21a47c3cbb5990d2d2895a9ebc1a0667cf42

diff --git a/dwm.c b/dwm.c
index dd3bc84..dc9f318 100644
--- a/dwm.c
+++ b/dwm.c
@@ -177,6 +177,7 @@ static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
+static void grab_typing_keys(void);
 static void incnmaster(const Arg *arg);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
@@ -187,6 +188,7 @@ static void monocle(Monitor *m);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
+static Client *snexttiled(Client *c);
 static Client *nextvisible(Client *c);
 static void pop(Client *);
 static void propertynotify(XEvent *e);
@@ -199,6 +201,7 @@ static void restack(Monitor *m);
 static void run(void);
 static void scan(void);
 static Bool sendevent(Client *c, Atom proto);
+static void send_keycode(KeyCode key);
 static void sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);
@@ -239,6 +242,9 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 /* variables */
+static KeyCode key_buffer[100];
+static int key_buffer_len = 0;
+static Bool key_buffering = False;
 static const char broken[] = "broken";
 static char stext[256];
 static int screen;
@@ -374,7 +380,7 @@ applyrules(Client *c) {
 Bool
 applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
 	Bool baseismin;
-	Monitor *m = c->mon;
+	// Monitor *m = c->mon;
 
 	/* set minimum possible */
 	*w = MAX(1, *w);
@@ -389,16 +395,17 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
 		if(*y + *h + 2 * c->bw < 0)
 			*y = 0;
 	}
-	else {
-		if(*x >= m->wx + m->ww)
-			*x = m->wx + m->ww - WIDTH(c);
-		if(*y >= m->wy + m->wh)
-			*y = m->wy + m->wh - HEIGHT(c);
-		if(*x + *w + 2 * c->bw <= m->wx)
-			*x = m->wx;
-		if(*y + *h + 2 * c->bw <= m->wy)
-			*y = m->wy;
-	}
+	// jason: let windows be offscreen
+	//else {
+	//	if(*x >= m->wx + m->ww)
+	//		*x = m->wx + m->ww - WIDTH(c);
+	//	if(*y >= m->wy + m->wh)
+	//		*y = m->wy + m->wh - HEIGHT(c);
+	//	if(*x + *w + 2 * c->bw <= m->wx)
+	//		*x = m->wx;
+	//	if(*y + *h + 2 * c->bw <= m->wy)
+	//		*y = m->wy;
+	//}
 	if(*h < bh)
 		*h = bh;
 	if(*w < bh)
@@ -599,6 +606,7 @@ clientmessage(XEvent *e) {
 			              || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
 	}
 	else if(cme->message_type == netatom[NetActiveWindow]) {
+		// Jason added this so apps can't steal focus:
 		return;
 		if(!ISVISIBLE(c)) {
 			c->mon->seltags ^= 1;
@@ -889,7 +897,7 @@ focus(Client *c) {
 		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
 	}
 	selmon->sel = c;
-	jason_layout(selmon);
+	arrange(selmon);
 	update_window_opacities(selmon);
 	drawbars();
 	if(c && (!root || (c->win!=root)) )
@@ -1053,6 +1061,32 @@ grabkeys(void) {
 				for(j = 0; j < LENGTH(modifiers); j++)
 					XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
 						 True, GrabModeAsync, GrabModeAsync);
+		if(key_buffering)
+			grab_typing_keys();
+	}
+}
+
+void
+grab_typing_keys(void) {
+	updatenumlockmask();
+	{
+		unsigned int i, j;
+		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+		KeySym typing_keys[] = {
+			XK_space, XK_Return, XK_period, XK_slash, XK_minus, XK_apostrophe,
+			XK_A, XK_B, XK_C, XK_D, XK_E, XK_F, XK_G, XK_H, XK_I, XK_J, XK_K,
+			XK_L, XK_M, XK_N, XK_O, XK_P, XK_Q, XK_R, XK_S, XK_T, XK_U, XK_V,
+			XK_W, XK_X, XK_Y, XK_Z, XK_0, XK_1, XK_2, XK_3, XK_4, XK_5, XK_6,
+			XK_7, XK_8, XK_9,
+		};
+
+		KeyCode code;
+
+		for(i = 0; i < LENGTH(typing_keys); i++)
+			if((code = XKeysymToKeycode(dpy, typing_keys[i])))
+				for(j = 0; j < LENGTH(modifiers); j++)
+					XGrabKey(dpy, code, modifiers[j], root,
+						 True, GrabModeAsync, GrabModeAsync);
 	}
 }
 
@@ -1074,18 +1108,60 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
 #endif /* XINERAMA */
 
 void
+send_keycode(KeyCode key) {
+	XKeyEvent event;
+	if(!selmon->sel) {
+		return;
+	}
+	event.display = dpy;
+	event.root = root;
+	event.window = selmon->sel->win;
+	event.subwindow = None;
+	event.same_screen = True;
+	event.x = 1;
+	event.y = 1;
+	event.x_root = 1;
+	event.y_root = 1;
+	event.time = CurrentTime;
+	event.state = 0; // modifiers
+	event.keycode = key;
+	event.type = KeyPress;
+	XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
+	event.type = KeyRelease;
+	XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
+}
+
+void
 keypress(XEvent *e) {
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev;
+	Bool called = False;
 
 	ev = &e->xkey;
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < LENGTH(keys); i++)
 		if(keysym == keys[i].keysym
 		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-		&& keys[i].func)
+		&& keys[i].func) {
 			keys[i].func(&(keys[i].arg));
+			called = True;
+		}
+	if(!called) {
+		if(key_buffering) {
+			if(key_buffer_len == LENGTH(key_buffer)) {
+				// buffer full, bail
+				key_buffer_len = 0;
+				key_buffering = False;
+				grabkeys(); // stop grabbing typing keys
+			} else {
+				key_buffer[key_buffer_len] = (KeyCode)ev->keycode;
+				key_buffer_len += 1;
+			}
+		} else {
+			send_keycode(ev->keycode);
+		}
+	}
 }
 
 void
@@ -1108,6 +1184,7 @@ manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
 	Window trans = None;
 	XWindowChanges wc;
+	int i;
 
 	if(!(c = calloc(1, sizeof(Client))))
 		die("fatal: could not malloc() %u bytes\n", sizeof(Client));
@@ -1164,6 +1241,16 @@ manage(Window w, XWindowAttributes *wa) {
 	arrange(c->mon);
 	XMapWindow(dpy, c->win);
 	focus(c);
+	if(key_buffering) {
+		key_buffering = False;
+		grabkeys(); // stop grabbing typing keys
+		if(key_buffer_len > 0) {
+			for(i = 0; i < key_buffer_len; ++i) {
+				send_keycode(key_buffer[i]);
+			}
+		}
+		key_buffer_len = 0;
+	}
 }
 
 void
@@ -1198,8 +1285,14 @@ monocle(Monitor *m) {
 			n++;
 	if(n > 0) /* override layout symbol */
 		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-	for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False, 0);
+	for(c = snexttiled(m->stack); c; c = snexttiled(c->snext)) {
+		if (c == m->sel) {
+			resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False, 0);
+		} else {
+			// this window is should not be visible. move off top, but don't change h/w
+			resize(c, m->wx, m->wy - 4000, c->w, c->h, False, 0);
+		}
+	}
 }
 
 void
@@ -1287,6 +1380,12 @@ nexttiled(Client *c) {
 }
 
 Client *
+snexttiled(Client *c) {
+	for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->snext);
+	return c;
+}
+
+Client *
 nextvisible(Client *c) {
 	for(; c && !ISVISIBLE(c); c = c->next);
 	return c;
@@ -1369,7 +1468,7 @@ resizeclient(Client *c, int x, int y, int w, int h, Client *base) {
 	c->oldy = c->y; c->y = wc.y = y;
 	c->oldw = c->w; c->w = wc.width = w;
 	c->oldh = c->h; c->h = wc.height = h;
-	base = 0;
+	// base = 0;
 	if (base) {
 		wc.stack_mode = Above;
 		wc.sibling = base->win;
@@ -1643,6 +1742,7 @@ setup(void) {
 	netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
 	netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
 	netatom[NetSupportingWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
+	XInternAtom(dpy, "_MOTIF_WM_HINTS", False); /* clients may request borderless/fullscreen */
 	/* init cursors */
 	cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
 	cursor[CurResize] = drw_cur_create(drw, XC_sizing);
@@ -1709,6 +1809,9 @@ spawn(const Arg *arg) {
 	}
 	if(arg->v == dmenucmd)
 		dmenumon[0] = '0' + selmon->num;
+	key_buffering = True;
+	key_buffer_len = 0;
+	grab_typing_keys();
 	if(fork() == 0) {
 		if(dpy)
 			close(ConnectionNumber(dpy));