X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=8cc95715ad7b13689de518aa966492e4e7f9a32c;hp=fa48fb00fa46a4a8b01bc7940c92aec9ee6f2bf1;hb=271b0614b4ecf0670ca9f9f89edb983055920ece;hpb=33883da028e2eae2cc5c70b445e0d78434d11ac9 diff --git a/dwm.c b/dwm.c index fa48fb0..8cc9571 100644 --- a/dwm.c +++ b/dwm.c @@ -55,7 +55,8 @@ #define WIDTH(X) ((X)->w + 2 * (X)->bw) #define HEIGHT(X) ((X)->h + 2 * (X)->bw) #define TAGMASK ((1 << LENGTH(tags)) - 1) -#define TEXTW(X) (drw_font_getexts_width(drw->font, X, strlen(X)) + drw->font->h) +#define TEXTW_NOPAD(X) drw_font_getexts_width(drw->font, X, strlen(X)) +#define TEXTW(X) (TEXTW_NOPAD(X) + drw->font->h) /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ @@ -180,7 +181,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 +202,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); @@ -243,20 +242,13 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee); 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; +// variables static Bool key_buffering = False; static const char broken[] = "broken"; static char stext[256]; static int screen; -static int sw, sh; /* X display screen geometry width, height */ -static int bh, blw = 0; /* bar geometry */ +static int sw, sh; // X display screen geometry width, height +static int bh; // bar height static int (*xerrorxlib)(Display *, XErrorEvent *); static unsigned int numlockmask = 0; static void (*handler[LASTEvent]) (XEvent *) = { @@ -269,7 +261,6 @@ static void (*handler[LASTEvent]) (XEvent *) = { [Expose] = expose, [FocusIn] = focusin, [KeyPress] = keypress, - [KeyRelease] = keyrelease, [MappingNotify] = mappingnotify, [MapRequest] = maprequest, [MotionNotify] = motionnotify, @@ -664,7 +655,7 @@ configurenotify(XEvent *e) { drw_resize(drw, sw, bh); updatebars(); for(m = mons; m; m = m->next) - XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); + XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww * m->mfact, bh); focus(NULL); arrange(NULL); } @@ -814,24 +805,18 @@ drawbar(Monitor *m) { } x = 0; for(i = 0; i < LENGTH(tags); i++) { - w = TEXTW(tags[i]); + w = TEXTW_NOPAD(tags[i]); drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i); - drw_rect(drw, x, 0, w, bh, m == selmon && selmon->sel && selmon->sel->tags & 1 << i, - occ & 1 << i, urg & 1 << i); + drw_text_nopad(drw, x, 0, w, bh, tags[i], urg & 1 << i); x += w; } - w = blw = TEXTW(m->ltsymbol); - drw_setscheme(drw, &scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, m->ltsymbol, 0); - x += w; xx = x; if(m == selmon) { /* status is only drawn on selected monitor */ w = TEXTW(stext); - x = m->ww - w; + x = m->ww * m->mfact - w; if(x < xx) { x = xx; - w = m->ww - xx; + w = m->ww* m->mfact - xx; } drw_text(drw, x, 0, w, bh, stext, 0); } @@ -843,8 +828,7 @@ drawbar(Monitor *m) { drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]); drw_text(drw, x, 0, w, bh, m->sel->name, 0); drw_rect(drw, x, 0, w, bh, m->sel->isfixed, m->sel->isfloating, 0); - } - else { + } else { drw_setscheme(drw, &scheme[SchemeNorm]); drw_text(drw, x, 0, w, bh, NULL, 0); } @@ -1067,8 +1051,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,91 +1084,23 @@ 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); - } -} - -void killclient(const Arg *arg) { if(!selmon->sel) return; @@ -1193,7 +1120,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 +1182,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 +1206,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 +1739,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 == belltermcmd || arg->v == runcmd) { for(i = 0; i < 32; ++i) { if(selmon->tagset[selmon->seltags] & (1 << i)) { tag = i; @@ -1833,7 +1753,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; @@ -1895,8 +1815,9 @@ tile(Monitor *m) { } } -#define TAB_HEIGHT 19 -#define TAB_PAD 7 +#define GUTTER_PX 4 +#define TAB_HEIGHT (bh / 2 - GUTTER_PX) +#define TAB_PAD GUTTER_PX void jason_layout(Monitor *m) { @@ -1932,22 +1853,36 @@ 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; + tab_top = m->my - m->wh + TAB_HEIGHT; for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { if (i == 0) { 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->my + TAB_HEIGHT + TAB_PAD, + right_width, + m->wh, + False, + base + ); tab_count = &(tab_counts[1]); - tab_top = m->wy + m->wh - TAB_HEIGHT; + tab_top = m->my + m->mh - 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, + False, + base + ); cur_tab += 1; } } @@ -2062,7 +1997,7 @@ updatebars(void) { for(m = mons; m; m = m->next) { if (m->barwin) continue; - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), + m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww * m->mfact, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XChangeProperty(dpy, root, netatom[NetSupportingWMCheck], XA_WINDOW, 32,