X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=8cc95715ad7b13689de518aa966492e4e7f9a32c;hp=f123400cc874a8f582fc1d0cdf000dafab9c1ec5;hb=271b0614b4ecf0670ca9f9f89edb983055920ece;hpb=0f44b250c447cf79c42b0bd7533ffa2b8bacf04c diff --git a/dwm.c b/dwm.c index f123400..8cc9571 100644 --- a/dwm.c +++ b/dwm.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -54,17 +55,18 @@ #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 */ enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */ enum { NetSupported, NetWMName, NetWMState, NetWMFullscreen, NetWMWindowOpacity, NetActiveWindow, NetWMWindowType, - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ + 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; @@ -90,8 +92,9 @@ struct Client { int oldx, oldy, oldw, oldh; int basew, baseh, incw, inch, maxw, maxh, minw, minh; int bw, oldbw; + int opacity; unsigned int tags; - Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; + Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, screen_hog; Client *next; Client *snext; Monitor *mon; @@ -137,6 +140,7 @@ typedef struct { const char *title; unsigned int tags; Bool isfloating; + Bool screen_hog; int monitor; } Rule; @@ -145,6 +149,7 @@ static void applyrules(Client *c); static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact); static void arrange(Monitor *m); static void arrangemon(Monitor *m); +static void attach_as_master(Client *c); static void attach(Client *c); static void attachstack(Client *c); static void buttonpress(XEvent *e); @@ -184,13 +189,14 @@ 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); static void quit(const Arg *arg); static Monitor *recttomon(int x, int y, int w, int h); -static void resize(Client *c, int x, int y, int w, int h, Bool interact); -static void resizeclient(Client *c, int x, int y, int w, int h); +static void resize(Client *c, int x, int y, int w, int h, Bool interact, Client *base); +static void resizeclient(Client *c, int x, int y, int w, int h, Client *base); static void resizemouse(const Arg *arg); static void restack(Monitor *m); static void run(void); @@ -205,9 +211,11 @@ 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); +static void jason_layout(Monitor *); static void tile(Monitor *); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); @@ -234,12 +242,13 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); -/* variables */ +// 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,16 +278,59 @@ static Monitor *mons, *selmon; static Window root; // unfocused windows get transparent (feature) -static const unsigned long unfocused_opacity[] = { 0xbfffffff }; +static const unsigned long opacities[] = { 0, 0xbfffffff, 0x00000000 }; // first unused 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 void update_window_opacities(Monitor *m); +void +window_set_opacity(Client *c, int opacity_index) { + if (c->opacity == opacity_index) { + return; + } + c->opacity = opacity_index; + if (opacity_index == 0) { + XDeleteProperty(dpy, c->win, netatom[NetWMWindowOpacity]); + } else { + XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)(&opacities[opacity_index]), 1); + } +} void window_set_opaque(Client *c) { - XDeleteProperty(dpy, c->win, netatom[NetWMWindowOpacity]); + window_set_opacity(c, 0); } void window_set_translucent(Client *c) { - XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)unfocused_opacity, 1); + window_set_opacity(c, 1); +} +void +window_set_invisible(Client *c) { + window_set_opacity(c, 2); +} +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 || (selection_floating && (c == master || c == slave))) { + window_set_opaque(c); + } else if (c == master || c == slave) { + window_set_translucent(c); + } else { + window_set_opaque(c); + } + } + } } @@ -298,19 +350,23 @@ applyrules(Client *c) { XClassHint ch = { NULL, NULL }; /* rule matching */ - c->isfloating = c->tags = 0; + c->isfloating = c->tags = c->screen_hog = 0; XGetClassHint(dpy, c->win, &ch); class = ch.res_class ? ch.res_class : broken; instance = ch.res_name ? ch.res_name : broken; for(i = 0; i < LENGTH(rules); i++) { r = &rules[i]; - if((!r->title || strstr(c->name, r->title)) + if((!r->title || c->name == strstr(c->name, r->title)) && (!r->class || strstr(class, r->class)) && (!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); if(m) c->mon = m; @@ -326,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); @@ -341,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) @@ -410,13 +467,17 @@ arrangemon(Monitor *m) { } void +attach_as_master(Client *c) { + c->next = c->mon->clients; + c->mon->clients = c; +} +void attach(Client *c) { if (c->mon->sel) { c->next = c->mon->sel->next; c->mon->sel->next = c; } else { - c->next = c->mon->clients; - c->mon->clients = c; + attach_as_master(c); } } @@ -428,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 */ @@ -442,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 @@ -547,6 +612,8 @@ 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; c->mon->tagset[c->mon->seltags] = c->tags; @@ -588,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); } @@ -696,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) { @@ -737,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); } @@ -766,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); } @@ -789,6 +850,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); @@ -834,6 +897,8 @@ focus(Client *c) { XDeleteProperty(dpy, root, netatom[NetActiveWindow]); } selmon->sel = c; + arrange(selmon); + update_window_opacities(selmon); drawbars(); if(c && (!root || (c->win!=root)) ) window_set_opaque(c); @@ -969,22 +1034,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 }; @@ -995,7 +1061,8 @@ 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); + True, GrabModeAsync, + keys[i].func == kbspawn ? GrabModeSync : GrabModeAsync); } } @@ -1024,11 +1091,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 @@ -1054,6 +1123,7 @@ manage(Window w, XWindowAttributes *wa) { if(!(c = calloc(1, sizeof(Client)))) die("fatal: could not malloc() %u bytes\n", sizeof(Client)); + c->opacity = -1; // who knows c->win = w; updatetitle(c); if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) { @@ -1065,8 +1135,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; @@ -1106,11 +1181,16 @@ manage(Window w, XWindowAttributes *wa) { arrange(c->mon); XMapWindow(dpy, c->win); focus(c); + if(key_buffering) { + key_buffering = False; + XAllowEvents(dpy, AsyncKeyboard, CurrentTime); + } } void mappingnotify(XEvent *e) { XMappingEvent *ev = &e->xmapping; + // fprintf(stderr, "MapNotify\n"); XRefreshKeyboardMapping(ev); if(ev->request == MappingKeyboard) @@ -1122,10 +1202,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); } @@ -1140,8 +1222,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); + 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 @@ -1210,7 +1298,7 @@ movemouse(const Arg *arg) { togglefloating(NULL); } if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) - resize(c, nx, ny, c->w, c->h, True); + resize(c, nx, ny, c->w, c->h, True, 0); break; } } while(ev.type != ButtonRelease); @@ -1229,6 +1317,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; @@ -1237,7 +1331,7 @@ nextvisible(Client *c) { void pop(Client *c) { detach(c); - attach(c); + attach_as_master(c); focus(c); arrange(c->mon); } @@ -1297,21 +1391,28 @@ recttomon(int x, int y, int w, int h) { } void -resize(Client *c, int x, int y, int w, int h, Bool interact) { +resize(Client *c, int x, int y, int w, int h, Bool interact, Client *base) { if(applysizehints(c, &x, &y, &w, &h, interact)) - resizeclient(c, x, y, w, h); + resizeclient(c, x, y, w, h, base); } void -resizeclient(Client *c, int x, int y, int w, int h) { +resizeclient(Client *c, int x, int y, int w, int h, Client *base) { XWindowChanges wc; + unsigned long mask = CWX|CWY|CWWidth|CWHeight|CWBorderWidth; c->oldx = c->x; c->x = wc.x = x; 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; + if (base) { + wc.stack_mode = Above; + wc.sibling = base->win; + mask |= CWStackMode|CWSibling; + } wc.border_width = c->bw; - XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + XConfigureWindow(dpy, c->win, mask, &wc); configure(c); XSync(dpy, False); } @@ -1358,7 +1459,7 @@ resizemouse(const Arg *arg) { togglefloating(NULL); } if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) - resize(c, c->x, c->y, nw, nh, True); + resize(c, c->x, c->y, nw, nh, True, 0); break; } } while(ev.type != ButtonRelease); @@ -1386,10 +1487,11 @@ restack(Monitor *m) { if(m->lt[m->sellt]->arrange) { wc.stack_mode = Below; wc.sibling = m->barwin; - for(c = m->stack; c; c = c->snext) + for(c = m->clients; c; c = c->next) if(!c->isfloating && ISVISIBLE(c)) { XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc); wc.sibling = c->win; + wc.stack_mode = Above; } } XSync(dpy, False); @@ -1401,9 +1503,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 @@ -1500,7 +1607,7 @@ setfullscreen(Client *c, Bool fullscreen) { c->oldbw = c->bw; c->bw = 0; c->isfloating = True; - resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh); + resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh, 0); XRaiseWindow(dpy, c->win); } else { @@ -1513,7 +1620,7 @@ setfullscreen(Client *c, Bool fullscreen) { c->y = c->oldy; c->w = c->oldw; c->h = c->oldh; - resizeclient(c, c->x, c->y, c->w, c->h); + resizeclient(c, c->x, c->y, c->w, c->h, 0); arrange(c->mon); } } @@ -1576,6 +1683,8 @@ setup(void) { netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); 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); @@ -1611,7 +1720,7 @@ showhide(Client *c) { if(ISVISIBLE(c)) { /* show clients top down */ XMoveWindow(dpy, c->win, c->x, c->y); if((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen) - resize(c, c->x, c->y, c->w, c->h, False); + resize(c, c->x, c->y, c->w, c->h, False, 0); showhide(c->snext); } else { /* hide clients bottom up */ @@ -1628,7 +1737,24 @@ 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 || arg->v == belltermcmd || arg->v == runcmd) { + for(i = 0; i < 32; ++i) { + if(selmon->tagset[selmon->seltags] & (1 << i)) { + tag = i; + break; + } + } + WORKSPACE_NUMBER[17] = workspace_numbers_str[tag][0]; + WORKSPACE_NUMBER[18] = workspace_numbers_str[tag][1]; // 2nd digit or null + } if(arg->v == dmenucmd) dmenumon[0] = '0' + selmon->num; if(fork() == 0) { @@ -1669,21 +1795,101 @@ tile(Monitor *m) { if(n > m->nmaster) mw = m->nmaster ? m->ww * m->mfact : 0; - else - mw = m->ww; + else { + c = nexttiled(m->clients); + if (c && !c->screen_hog) + mw = m->ww * m->mfact; + else + mw = m->ww; + } for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) if(i < m->nmaster) { h = (m->wh - my) / (MIN(n, m->nmaster) - i); - resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False); + resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False, 0); my += HEIGHT(c); } else { h = (m->wh - ty) / (n - i); - resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False); + resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False, 0); ty += HEIGHT(c); } } +#define GUTTER_PX 4 +#define TAB_HEIGHT (bh / 2 - GUTTER_PX) +#define TAB_PAD GUTTER_PX + +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]); + + for(tiled_count = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), tiled_count++) { + if (tiled_count == 0) { // master + if (c->next) { + if (m->sel && (m->sel == c || m->sel->isfloating || !ISVISIBLE(m->sel))) { + vis_slave = nexttiled(c->next); + } else { + vis_slave = m->sel; + } + } + } else { + if (c == vis_slave) { + tab_count = &(tab_counts[1]); + } else { + (*tab_count) += 1; + } + } + } + if(tiled_count == 0) { + return; + } + + if(tiled_count > 1 || (tiled_count == 1 && !nexttiled(m->clients)->screen_hog)) { + mw = m->ww * m->mfact; + } else { + mw = m->ww; + } + right_width = m->ww - mw - GUTTER_PX; + tab_count = &(tab_counts[0]); + 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 + GUTTER_PX, + m->my + TAB_HEIGHT + TAB_PAD, + right_width, + m->wh, + False, + base + ); + tab_count = &(tab_counts[1]); + 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 + GUTTER_PX + right_width * cur_tab / (*tab_count), + tab_top, + right_width, + m->wh, + False, + base + ); + cur_tab += 1; + } + } + base = c; + } +} + void togglebar(const Arg *arg) { selmon->showbar = !selmon->showbar; @@ -1701,7 +1907,7 @@ togglefloating(const Arg *arg) { selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; if(selmon->sel->isfloating) resize(selmon->sel, selmon->sel->x, selmon->sel->y, - selmon->sel->w, selmon->sel->h, False); + selmon->sel->w, selmon->sel->h, False, 0); arrange(selmon); } @@ -1734,8 +1940,6 @@ void unfocus(Client *c, Bool setfocus) { if(!c) return; - if(!root || c->win!=root) - window_set_translucent(c); grabbuttons(c, False); XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->rgb); if(setfocus) { @@ -1793,9 +1997,15 @@ 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, + PropModeReplace, (unsigned char *) &(m->barwin), 1); + XChangeProperty(dpy, m->barwin, netatom[NetSupportingWMCheck], XA_WINDOW, 32, + PropModeReplace, (unsigned char *) &(m->barwin), 1); + XChangeProperty(dpy, m->barwin, netatom[NetWMName], XA_STRING, 8, + PropModeReplace, (unsigned char *) "dwm", 3); XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); XMapRaised(dpy, m->barwin); }