X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=e1ea9b4c86ac0db4ff25c7b65032b2021fe0e40c;hp=fa48fb00fa46a4a8b01bc7940c92aec9ee6f2bf1;hb=3c838bad8f1825b710ea0f2acaa184391db12de2;hpb=33883da028e2eae2cc5c70b445e0d78434d11ac9 diff --git a/dwm.c b/dwm.c index fa48fb0..e1ea9b4 100644 --- a/dwm.c +++ b/dwm.c @@ -180,7 +180,6 @@ static void grabbuttons(Client *c, Bool focused); static void grabkeys(void); static void incnmaster(const Arg *arg); static void keypress(XEvent *e); -static void keyrelease(XEvent *e); static void killclient(const Arg *arg); static void manage(Window w, XWindowAttributes *wa); static void mappingnotify(XEvent *e); @@ -202,7 +201,6 @@ static void restack(Monitor *m); static void run(void); static void scan(void); static Bool sendevent(Client *c, Atom proto); -static void send_key_event(int type, KeyCode key, unsigned int state); static void sendmon(Client *c, Monitor *m); static void setclientstate(Client *c, long state); static void setfocus(Client *c); @@ -244,13 +242,6 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); /* variables */ -typedef struct { - KeyCode keycode; - unsigned int state; - int type; -} BufferedKey; -static BufferedKey key_buffer[200]; -static int key_buffer_len = 0; static Bool key_buffering = False; static const char broken[] = "broken"; static char stext[256]; @@ -269,7 +260,6 @@ static void (*handler[LASTEvent]) (XEvent *) = { [Expose] = expose, [FocusIn] = focusin, [KeyPress] = keypress, - [KeyRelease] = keyrelease, [MappingNotify] = mappingnotify, [MapRequest] = maprequest, [MotionNotify] = motionnotify, @@ -1067,8 +1057,19 @@ void grabkeys(void) { updatenumlockmask(); //XUngrabKey(dpy, AnyKey, AnyModifier, root); - // FIXME key grabbing causes FocusOut events, which confuses programs (they only get keypresses when they don't have focus) - XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, GrabModeAsync); + { + unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; + KeyCode code; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for(i = 0; i < LENGTH(keys); i++) + if((code = XKeysymToKeycode(dpy, keys[i].keysym))) + for(j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, + True, GrabModeAsync, + keys[i].func == kbspawn ? GrabModeSync : GrabModeAsync); + } } void @@ -1089,87 +1090,19 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) { #endif /* XINERAMA */ void -send_key_event(int type, KeyCode key, unsigned int state) { - int mask; - if (type == KeyPress) { - mask = KeyPressMask; - } else { - mask = KeyReleaseMask; - } - XKeyEvent event; - if(!selmon->sel) { - return; - } - event.type = type; - 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 = state; // modifiers - event.keycode = key; - event.same_screen = True; - XSendEvent(event.display, event.window, True, mask, (XEvent *)&event); -} - -void keypress(XEvent *e) { unsigned int i; KeySym keysym; XKeyEvent *ev; - Bool called = False; ev = &e->xkey; - // fprintf(stderr, "key DOWN %i\n", ev->keycode); keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); - for(i = 0; i < LENGTH(keys); i++) + 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].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; - } else { - key_buffer[key_buffer_len].keycode = (KeyCode)ev->keycode; - key_buffer[key_buffer_len].state = ev->state; - key_buffer[key_buffer_len].type = KeyPress; - key_buffer_len += 1; - } - } else { - send_key_event(KeyPress, (KeyCode)ev->keycode, ev->state); - } - } -} - -void -keyrelease(XEvent *e) { - XKeyEvent *ev; - ev = &e->xkey; - // fprintf(stderr, "key UP %i\n", ev->keycode); - if(key_buffering) { - if(key_buffer_len == LENGTH(key_buffer)) { - // buffer full, bail - key_buffer_len = 0; - key_buffering = False; - } else { - key_buffer[key_buffer_len].keycode = (KeyCode)ev->keycode; - key_buffer[key_buffer_len].state = ev->state; - key_buffer[key_buffer_len].type = KeyRelease; - key_buffer_len += 1; } - } else { - send_key_event(KeyRelease, (KeyCode)ev->keycode, ev->state); } } @@ -1193,7 +1126,6 @@ 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)); @@ -1256,11 +1188,8 @@ manage(Window w, XWindowAttributes *wa) { XMapWindow(dpy, c->win); focus(c); if(key_buffering) { - for(i = 0; i < key_buffer_len; ++i) { - send_key_event(key_buffer[i].type, key_buffer[i].keycode, key_buffer[i].state); - } - key_buffer_len = 0; key_buffering = False; + XAllowEvents(dpy, AsyncKeyboard, CurrentTime); } } @@ -1283,8 +1212,6 @@ maprequest(XEvent *e) { if(!XGetWindowAttributes(dpy, ev->window, &wa)) return; if(wa.override_redirect) { - key_buffer_len = 0; - key_buffering = False; return; } if(!wintoclient(ev->window)) @@ -1818,14 +1745,13 @@ sigchld(int unused) { void kbspawn(const Arg *arg) { key_buffering = True; - key_buffer_len = 0; spawn(arg); } void spawn(const Arg *arg) { int tag = 0, i; - if(arg->v == termcmd) { + if(arg->v == termcmd || arg->v == runcmd) { for(i = 0; i < 32; ++i) { if(selmon->tagset[selmon->seltags] & (1 << i)) { tag = i; @@ -1833,7 +1759,7 @@ spawn(const Arg *arg) { } } WORKSPACE_NUMBER[17] = workspace_numbers_str[tag][0]; - WORKSPACE_NUMBER[18] = workspace_numbers_str[tag][1]; + WORKSPACE_NUMBER[18] = workspace_numbers_str[tag][1]; // 2nd digit or null } if(arg->v == dmenucmd) dmenumon[0] = '0' + selmon->num; @@ -1897,6 +1823,7 @@ tile(Monitor *m) { #define TAB_HEIGHT 19 #define TAB_PAD 7 +#define GUTTER_PX 8 void jason_layout(Monitor *m) { @@ -1932,7 +1859,7 @@ jason_layout(Monitor *m) { } else { mw = m->ww; } - right_width = m->ww - mw; + right_width = m->ww - mw - GUTTER_PX; tab_count = &(tab_counts[0]); tab_top = m->wy - (m->wh - (2 * (TAB_HEIGHT + TAB_PAD))) + TAB_HEIGHT; for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { @@ -1940,14 +1867,14 @@ jason_layout(Monitor *m) { resize(c, m->wx, m->wy, mw, m->wh, False, 0); } else { if (c == vis_slave) { - resize(c, m->wx + mw, m->wy + TAB_HEIGHT + TAB_PAD, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base); + resize(c, m->wx + mw + GUTTER_PX, m->wy + TAB_HEIGHT + TAB_PAD, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base); tab_count = &(tab_counts[1]); tab_top = m->wy + m->wh - TAB_HEIGHT; cur_tab = 0; } else { // this function does not get called when focus changes // resize(c, m->wx + m->ww, m->wy, m->ww - mw, m->wh, False); - resize(c, m->wx + mw + right_width * cur_tab / (*tab_count), tab_top, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base); + resize(c, m->wx + mw + GUTTER_PX + right_width * cur_tab / (*tab_count), tab_top, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base); cur_tab += 1; } }