* See LICENSE file for license details.
*/
-#include <math.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
-#include "wm.h"
-
-void (*arrange)(void *aux);
-
-void
-max(void *aux)
-{
- if(!stack)
- return;
- stack->x = sx;
- stack->y = sy;
- stack->w = sw - 2 * stack->border;
- stack->h = sh - 2 * stack->border;
- resize(stack);
- discard_events(EnterWindowMask);
-}
-
-void
-floating(void *aux)
-{
- Client *c;
-
- arrange = floating;
- for(c = stack; c; c = c->snext)
- resize(c);
- discard_events(EnterWindowMask);
-}
-
-void
-grid(void *aux)
-{
- Client *c;
- int n, cols, rows, gw, gh, i, j;
- float rt, fd;
-
- arrange = grid;
- if(!clients)
- return;
- for(n = 0, c = clients; c; c = c->next, n++);
- rt = sqrt(n);
- if(modff(rt, &fd) < 0.5)
- rows = floor(rt);
- else
- rows = ceil(rt);
- if(rows * rows < n)
- cols = rows + 1;
- else
- cols = rows;
-
- gw = (sw - 2) / cols;
- gh = (sh - 2) / rows;
-
- for(i = j = 0, c = clients; c; c = c->next) {
- c->x = i * gw;
- c->y = j * gh;
- c->w = gw;
- c->h = gh;
- resize(c);
- if(++i == cols) {
- j++;
- i = 0;
- }
- }
- discard_events(EnterWindowMask);
-}
-
-void
-sel(void *aux)
-{
- const char *arg = aux;
- Client *c = NULL;
-
- if(!arg || !stack)
- return;
- if(!strncmp(arg, "next", 5))
- c = stack->snext ? stack->snext : stack;
- else if(!strncmp(arg, "prev", 5))
- for(c = stack; c && c->snext; c = c->snext);
- if(!c)
- c = stack;
- craise(c);
- focus(c);
-}
+#include "dwm.h"
void
-ckill(void *aux)
+ban(Client *c)
{
- Client *c = stack;
-
- if(!c)
- return;
- if(c->proto & WM_PROTOCOL_DELWIN)
- send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
- else
- XKillClient(dpy, c->win);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
}
static void
-resize_title(Client *c)
+resizetitle(Client *c)
{
int i;
c->tw = 0;
for(i = 0; i < TLast; i++)
if(c->tags[i])
- c->tw += textw(&brush.font, c->tags[i]) + brush.font.height;
- c->tw += textw(&brush.font, c->name) + brush.font.height;
+ c->tw += textw(c->tags[i]);
+ c->tw += textw(c->name);
if(c->tw > c->w)
c->tw = c->w + 2;
c->tx = c->x + c->w - c->tw + 2;
}
void
-update_name(Client *c)
+settitle(Client *c)
{
XTextProperty name;
int n;
}
}
XFree(name.value);
- resize_title(c);
+ resizetitle(c);
}
void
-update_size(Client *c)
+setsize(Client *c)
{
XSizeHints size;
long msize;
}
void
-craise(Client *c)
+higher(Client *c)
{
XRaiseWindow(dpy, c->win);
XRaiseWindow(dpy, c->title);
void
focus(Client *c)
{
- Client **l, *old;
-
- old = stack;
- for(l = &stack; *l && *l != c; l = &(*l)->snext);
- if(*l)
- *l = c->snext;
- c->snext = stack;
- stack = c;
- if(old && old != c) {
- XMapWindow(dpy, old->title);
- draw_client(old);
- }
- XUnmapWindow(dpy, c->title);
- draw_client(c);
+ Client *old = sel;
+ XEvent ev;
+
+ XFlush(dpy);
+ sel = c;
+ if(old && old != c)
+ drawtitle(old);
+ drawtitle(c);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
XFlush(dpy);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
{
Client *c, **l;
XSetWindowAttributes twa;
+ Window trans;
c = emallocz(sizeof(Client));
c->win = w;
c->tx = c->x = wa->x;
c->ty = c->y = wa->y;
+ if(c->y < bh)
+ c->ty = c->y += bh;
c->tw = c->w = wa->width;
c->h = wa->height;
- c->th = th;
+ c->th = bh;
c->border = 1;
- update_size(c);
- XSetWindowBorderWidth(dpy, c->win, 1);
- XSetWindowBorder(dpy, c->win, brush.border);
+ c->proto = getproto(c->win);
+ setsize(c);
XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
- XGetTransientForHint(dpy, c->win, &c->trans);
+ XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask;
- c->tags[tsel] = tags[tsel];
c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
- update_name(c);
- for(l=&clients; *l; l=&(*l)->next);
+ settitle(c);
+ settags(c);
+
+ for(l = &clients; *l; l = &(*l)->next);
c->next = *l; /* *l == nil */
*l = c;
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
+
XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
+
+ if(!c->dofloat)
+ c->dofloat = trans
+ || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
arrange(NULL);
- focus(c);
+ /* mapping the window now prevents flicker */
+ if(c->tags[tsel]) {
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
+ focus(c);
+ }
+ else {
+ ban(c);
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
+ }
}
void
void
-resize(Client *c)
+resize(Client *c, Bool inc)
{
XConfigureEvent e;
- if(c->incw)
- c->w -= (c->w - c->basew) % c->incw;
- if(c->inch)
- c->h -= (c->h - c->baseh) % c->inch;
+ if(inc) {
+ if(c->incw)
+ c->w -= (c->w - c->basew) % c->incw;
+ if(c->inch)
+ c->h -= (c->h - c->baseh) % c->inch;
+ }
+ if(c->x > sw) /* might happen on restart */
+ c->x = sw - c->w;
+ if(c->y > sh)
+ c->ty = c->y = sh - c->h;
if(c->minw && c->w < c->minw)
c->w = c->minw;
if(c->minh && c->h < c->minh)
c->w = c->maxw;
if(c->maxh && c->h > c->maxh)
c->h = c->maxh;
- resize_title(c);
+ resizetitle(c);
+ XSetWindowBorderWidth(dpy, c->win, 1);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
e.type = ConfigureNotify;
e.event = c->win;
}
static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+xerrordummy(Display *dsply, XErrorEvent *ee)
{
return 0;
}
Client **l;
XGrabServer(dpy);
- XSetErrorHandler(dummy_error_handler);
+ XSetErrorHandler(xerrordummy);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->title);
- for(l=&clients; *l && *l != c; l=&(*l)->next);
+ for(l = &clients; *l && *l != c; l = &(*l)->next);
*l = c->next;
- for(l=&stack; *l && *l != c; l=&(*l)->snext);
- *l = c->snext;
+ for(l = &clients; *l; l = &(*l)->next)
+ if((*l)->revert == c)
+ (*l)->revert = NULL;
+ if(sel == c)
+ sel = sel->revert ? sel->revert : clients;
+
free(c);
XFlush(dpy);
- XSetErrorHandler(error_handler);
+ XSetErrorHandler(xerror);
XUngrabServer(dpy);
arrange(NULL);
- if(stack)
- focus(stack);
+ if(sel)
+ focus(sel);
}
Client *
-gettitle(Window w)
+getctitle(Window w)
{
Client *c;
for(c = clients; c; c = c->next)
}
void
-draw_client(Client *c)
+zoom(Arg *arg)
{
- int i;
- if(c == stack)
+ Client **l, *c;
+
+ if(!sel)
return;
- brush.x = brush.y = 0;
- brush.h = c->th;
+ if(sel == getnext(clients) && sel->next) {
+ if((c = getnext(sel->next)))
+ sel = c;
+ }
- brush.w = 0;
- for(i = 0; i < TLast; i++) {
- if(c->tags[i]) {
- brush.x += brush.w;
- brush.w = textw(&brush.font, c->tags[i]) + brush.font.height;
- draw(dpy, &brush, True, c->tags[i]);
- }
+ for(l = &clients; *l && *l != sel; l = &(*l)->next);
+ *l = sel->next;
+
+ sel->next = clients; /* pop */
+ clients = sel;
+ arrange(NULL);
+ focus(sel);
+}
+
+void
+maximize(Arg *arg)
+{
+ if(!sel)
+ return;
+ sel->x = sx;
+ sel->y = sy + bh;
+ sel->w = sw - 2 * sel->border;
+ sel->h = sh - 2 * sel->border - bh;
+ higher(sel);
+ resize(sel, False);
+}
+
+void
+focusprev(Arg *arg)
+{
+ Client *c;
+
+ if(!sel)
+ return;
+
+ if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+ higher(c);
+ focus(c);
}
- brush.x += brush.w;
- brush.w = textw(&brush.font, c->name) + brush.font.height;
- draw(dpy, &brush, True, c->name);
- XCopyArea(dpy, brush.drawable, c->title, brush.gc,
- 0, 0, c->tw, c->th, 0, 0);
- XFlush(dpy);
+}
+
+void
+focusnext(Arg *arg)
+{
+ Client *c;
+
+ if(!sel)
+ return;
+
+ if(!(c = getnext(sel->next)))
+ c = getnext(clients);
+ if(c) {
+ higher(c);
+ c->revert = sel;
+ focus(c);
+ }
+}
+
+void
+killclient(Arg *arg)
+{
+ if(!sel)
+ return;
+ if(sel->proto & WM_PROTOCOL_DELWIN)
+ sendevent(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+ else
+ XKillClient(dpy, sel->win);
}
Got questions, comments, patches, etc.? Contact Jason Woofenden