X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=898b9172a86ce4795adcda8d7589977c74379690;hp=362e902d268b30f3bd16987b0da1da38e6e5e658;hb=HEAD;hpb=9ed26226d2f8ca1253e77d7ae8bcfbdbb6cf1b72 diff --git a/dwm.c b/dwm.c index 362e902..898b917 100644 --- a/dwm.c +++ b/dwm.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -54,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 */ @@ -64,7 +66,7 @@ enum { NetSupported, NetWMName, NetWMState, NetWMWindowTypeDialog, NetClientList, NetSupportingWMCheck, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, - ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ + ClkClientWin, ClkRootWin, ClkAnywhere, ClkLast }; /* clicks */ typedef union { int i; @@ -187,6 +189,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); @@ -208,6 +211,7 @@ static void setmfact(const Arg *arg); static void setup(void); static void showhide(Client *c); static void sigchld(int unused); +static void kbspawn(const Arg *arg); static void spawn(const Arg *arg); static void tag(const Arg *arg); static void tagmon(const Arg *arg); @@ -238,12 +242,14 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); -/* variables */ +// variables +enum { KeyBufferingOff, KeyBufferingAwaitingWindow, KeyBufferingAwaitingFocus }; +static unsigned int key_buffering = 0; 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 *) = { @@ -278,6 +284,7 @@ static void window_set_opaque(Client *c); static void window_set_translucent(Client *c); static void window_set_invisible(Client *c); static void window_set_opacity(Client *c, int opacity_index); +static Client* choose_slave (Client *master, Client *focused); static void update_window_opacities(Monitor *m); void window_set_opacity(Client *c, int opacity_index) { @@ -305,25 +312,23 @@ window_set_invisible(Client *c) { } void update_window_opacities(Monitor *m) { - Client *master, *slave, *c; - Bool selection_floating = False; - slave = master = nexttiled(m->clients); - if (master) slave = nexttiled(master->next); - if (m->sel && m->sel != master) { - if (nexttiled(m->sel) == m->sel) // if selection is tiled - slave = m->sel; - else - selection_floating = True; - } - for (c = m->clients; c; c = c->next) { - if (ISVISIBLE(c)) { - if (c->isfloating || c == m->sel || (c == master && selection_floating)) { - window_set_opaque(c); - } else if (c == master || c == slave) { - window_set_translucent(c); - } else { - window_set_opaque(c); - } + Client *master, *slave, *focused, *c; + Bool focused_is_floating = False; + master = nexttiled(m->clients); + focused = (m->sel && ISVISIBLE(m->sel)) ? m->sel : NULL; + slave = choose_slave(master, focused); + // detect if the focused window is floating (and visible) + if (master && focused && focused != slave && focused != master) { + if (nexttiled(focused) != focused) { + focused_is_floating = True; + } + } + // set opacity of visible floaters, master and slave + for (c = nextvisible(m->clients); c; c = nextvisible(c->next)) { + if (c->isfloating || c == focused || (focused_is_floating && (c == master || c == slave))) { + window_set_opaque(c); + } else if (c == master || c == slave) { + window_set_translucent(c); } } } @@ -357,6 +362,9 @@ applyrules(Client *c) { && (!r->instance || strstr(instance, r->instance))) { c->isfloating = r->isfloating; + if(r->isfloating) { + c->x = -1; c->y = -2; // secret code for centered + } c->tags |= r->tags; c->screen_hog = r->screen_hog; for(m = mons; m && m->num != r->monitor; m = m->next); @@ -374,7 +382,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 +397,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) @@ -480,11 +489,23 @@ attachstack(Client *c) { void buttonpress(XEvent *e) { - unsigned int i, x, click; + unsigned int i, click; Arg arg = {0}; Client *c; Monitor *m; XButtonPressedEvent *ev = &e->xbutton; + Bool called = False; + + for(i = 0; i < LENGTH(buttons); i++) { + if(buttons[i].click == ClkAnywhere && buttons[i].button == ev->button + && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) { + buttons[i].func(&buttons[i].arg); + called = True; + } + } + if (called) { + return; + } click = ClkRootWin; /* focus monitor if necessary */ @@ -494,29 +515,21 @@ buttonpress(XEvent *e) { focus(NULL); } if(ev->window == selmon->barwin) { - i = x = 0; - do - x += TEXTW(tags[i]); - while(ev->x >= x && ++i < LENGTH(tags)); - if(i < LENGTH(tags)) { - click = ClkTagBar; - arg.ui = 1 << i; - } - else if(ev->x < x + blw) - click = ClkLtSymbol; - else if(ev->x > selmon->ww - TEXTW(stext)) - click = ClkStatusText; - else - click = ClkWinTitle; - } - else if((c = wintoclient(ev->window))) { + return; + } else if((c = wintoclient(ev->window))) { focus(c); click = ClkClientWin; } - for(i = 0; i < LENGTH(buttons); i++) + for(i = 0; i < LENGTH(buttons); i++) { if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button - && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) - buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); + && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) { + if (click == ClkTagBar && buttons[i].arg.i == 0) { + buttons[i].func(&arg); + } else { + buttons[i].func(&buttons[i].arg); + } + } + } } void @@ -599,6 +612,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; @@ -749,10 +763,11 @@ detachstack(Client *c) { for(i = nextvisible(c->mon->clients); i && i != c; i = nextvisible(i->next)) next_sel = i; // failing that, find first visible window (besides c) - if (!next_sel) + if (!next_sel) { for(i = nextvisible(c->mon->clients); i && i == c; i = nextvisible(i->next)); if (i != c) next_sel = i; + } c->mon->sel = next_sel; } if (prev) { @@ -790,17 +805,11 @@ 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); @@ -842,6 +851,8 @@ enternotify(XEvent *e) { Monitor *m; XCrossingEvent *ev = &e->xcrossing; + return; // jason: added to stop mouse focus + if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) return; c = wintoclient(ev->window); @@ -881,13 +892,12 @@ focus(Client *c) { grabbuttons(c, True); XSetWindowBorder(dpy, c->win, scheme[SchemeSel].border->rgb); setfocus(c); - } - else { + } else { XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XDeleteProperty(dpy, root, netatom[NetActiveWindow]); } selmon->sel = c; - jason_layout(selmon); + arrange(selmon); update_window_opacities(selmon); drawbars(); if(c && (!root || (c->win!=root)) ) @@ -900,6 +910,19 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */ if(selmon->sel && ev->window != selmon->sel->win) setfocus(selmon->sel); + + if(key_buffering == KeyBufferingAwaitingFocus) { + key_buffering = KeyBufferingOff; + // there's a few ways to release the grab, with different effects (below) + // In this example F2 is mapped to kbspawn + // XAllowEvents(dpy, AsyncKeyboard, CurrentTime); + // swallows key presses while F2 is still down. + // XAllowEvents(dpy, ReplayKeyboard, CurrentTime); + // sends the F2 keydown and all the queued events + // XUngrabKeyboard(dpy, CurrentTime); + // sends everything queued and the F2 key_UP_ + XUngrabKeyboard(dpy, CurrentTime); + } } void @@ -1024,22 +1047,23 @@ grabbuttons(Client *c, Bool focused) { XUngrabButton(dpy, AnyButton, AnyModifier, c->win); if(focused) { for(i = 0; i < LENGTH(buttons); i++) - if(buttons[i].click == ClkClientWin) + if(buttons[i].click == ClkClientWin || buttons[i].click == ClkAnywhere) for(j = 0; j < LENGTH(modifiers); j++) XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); - } - else + } else { XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); + } } } void grabkeys(void) { updatenumlockmask(); + //XUngrabKey(dpy, AnyKey, AnyModifier, root); { unsigned int i, j; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; @@ -1050,7 +1074,9 @@ grabkeys(void) { 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, GrabModeAsync); + False, // report keys to focused window too? + GrabModeAsync, // mouse grab mode + keys[i].func == kbspawn ? GrabModeSync : GrabModeAsync); } } @@ -1079,11 +1105,13 @@ keypress(XEvent *e) { ev = &e->xkey; 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].func(&(keys[i].arg)); + } + } } void @@ -1121,8 +1149,13 @@ manage(Window w, XWindowAttributes *wa) { applyrules(c); } /* geometry */ - c->x = c->oldx = wa->x; - c->y = c->oldy = wa->y; + if(c->x == -1 && c->y == -2) { // secret code for centered + c->x = c->oldx = (c->mon->ww - wa->width) / 2; + c->y = c->oldy = (c->mon->wh - wa->height) / 2; + } else { + c->x = c->oldx = wa->x; + c->y = c->oldy = wa->y; + } c->w = c->oldw = wa->width; c->h = c->oldh = wa->height; c->oldbw = wa->border_width; @@ -1162,11 +1195,16 @@ manage(Window w, XWindowAttributes *wa) { arrange(c->mon); XMapWindow(dpy, c->win); focus(c); + if(key_buffering == KeyBufferingAwaitingWindow) { + // almost there! but wait until we are notified that it has focus + key_buffering = KeyBufferingAwaitingFocus; + } } void mappingnotify(XEvent *e) { XMappingEvent *ev = &e->xmapping; + // fprintf(stderr, "MapNotify\n"); XRefreshKeyboardMapping(ev); if(ev->request == MappingKeyboard) @@ -1178,10 +1216,12 @@ maprequest(XEvent *e) { static XWindowAttributes wa; XMapRequestEvent *ev = &e->xmaprequest; + // fprintf(stderr, "MapRequest\n"); if(!XGetWindowAttributes(dpy, ev->window, &wa)) return; - if(wa.override_redirect) + if(wa.override_redirect) { return; + } if(!wintoclient(ev->window)) manage(ev->window, &wa); } @@ -1196,8 +1236,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 @@ -1285,6 +1331,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; @@ -1367,7 +1419,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; @@ -1465,9 +1517,14 @@ run(void) { XEvent ev; /* main event loop */ XSync(dpy, False); - while(running && !XNextEvent(dpy, &ev)) - if(handler[ev.type]) + while(running && !XNextEvent(dpy, &ev)) { + if(handler[ev.type]) { + // fprintf(stderr, "handling event type %i\n", ev.type); handler[ev.type](&ev); /* call handler */ + } else { + // fprintf(stderr, "evt type %i\n", ev.type); + } + } } void @@ -1548,8 +1605,8 @@ setfocus(Client *c) { if(!c->neverfocus) { XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XChangeProperty(dpy, root, netatom[NetActiveWindow], - XA_WINDOW, 32, PropModeReplace, - (unsigned char *) &(c->win), 1); + XA_WINDOW, 32, PropModeReplace, + (unsigned char *) &(c->win), 1); } sendevent(c, wmatom[WMTakeFocus]); } @@ -1641,6 +1698,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); @@ -1693,9 +1751,15 @@ sigchld(int unused) { } void +kbspawn(const Arg *arg) { + key_buffering = True; + 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; @@ -1703,7 +1767,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; @@ -1765,66 +1829,98 @@ tile(Monitor *m) { } } -#define TAB_HEIGHT 19 -#define TAB_PAD 7 - -void -jason_layout(Monitor *m) { - unsigned int i, tiled_count, mw, right_width, tab_counts[2] = {0,0}, cur_tab = 0, *tab_count; - int tab_top; - Client *c, *vis_slave = 0, *base = 0; - - tab_count = &(tab_counts[0]); +// search forward from start, return the last client before end +Client* +prev_tiled (Client *start, Client *end) { + Client *w, *n; + for (w = start; w && (n = nexttiled(w->next)); w = n) { + if (n == end) { + return w; + } + } + return NULL; +} - for(tiled_count = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), tiled_count++) { - if (tiled_count == 0) { // master - if (c == m->sel) { - if (c->next) { - vis_slave = nexttiled(c->next); - } +// return the window to show on the right side +Client* +choose_slave (Client *master, Client *focused) { + if (!master) { + return NULL; + } + if (focused) { + // FIXME put this same algorithm in update_window_opacities + if (focused->isfloating) { + // show the window just "under" it + Client *prev = prev_tiled(master, focused); + // fall back to the first slave + if (prev && prev != master) { + return prev; } else { - vis_slave = m->sel; + return nexttiled(master->next); } } else { - if (c == vis_slave) { - tab_count = &(tab_counts[1]); + // focused window is tiled + if (focused == master) { + // master is focused, show first slave + return nexttiled(master->next); } else { - (*tab_count) += 1; + // focused window is a slave, so show that one + return focused; } } } - if(tiled_count == 0) { + // maybe we get called when there's no focused? + return nexttiled(master->next); +} + +#define GUTTER_PX 4 + +void +jason_layout(Monitor *m) { + Client *c, *master, *slave, *focused, *base = 0; + unsigned int master_width, slave_width, slave_left; + + // find master + master = nexttiled(m->clients); + + // no master? nothing to do + if (!master) { return; } - if(tiled_count > 1 || (tiled_count == 1 && !nexttiled(m->clients)->screen_hog)) { - mw = m->ww * m->mfact; + // find focused and slave + focused = (m->sel && ISVISIBLE(m->sel)) ? m->sel : NULL; + slave = choose_slave(master, focused); + + // calculate window widths + if (!slave && master->screen_hog) { + master_width = m->ww; } else { - // one of these: - // * zero tiled windows - // * one tiled window that's not a screen hog - // * miltiple tiled windows - mw = m->ww; - } - right_width = m->ww - mw; - 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++) { - 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); - 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); - cur_tab += 1; - } - } + master_width = m->ww * m->mfact - GUTTER_PX / 2; + } + slave_left = m->ww * m->mfact + GUTTER_PX / 2; + slave_width = m->ww * (1 - m->mfact) - GUTTER_PX / 2; + + // resize/reposition master + resize(master, + m->wx, + m->wy, + master_width, + m->wh, + False, + 0 + ); + // resize/reposition slaves + base = master; // window to be above in the stacking order + for (c = nexttiled(master->next); c; c = nexttiled(c->next)) { + resize(c, + slave_left, + c == slave ? m->wy : m->wy - m->wh, + slave_width, + m->wh, + False, + base + ); base = c; } }