* See LICENSE file for license details.
*/
#include "dwm.h"
-
#include <stdlib.h>
#include <string.h>
#include <X11/Xatom.h>
/* static functions */
+static void
+grabbutton(Client *c, unsigned int button, unsigned int modifier)
+{
+ XGrabButton(dpy, button, modifier, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, button, modifier | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, button, modifier | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, button, modifier | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+}
+
static void
resizetitle(Client *c)
{
int i;
c->tw = 0;
- for(i = 0; i < TLast; i++)
+ for(i = 0; i < ntags; i++)
if(c->tags[i])
- c->tw += textw(c->tags[i]);
+ c->tw += textw(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;
c->ty = c->y;
- if(c->tags[tsel])
+ if(isvisible(c))
XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
else
XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
}
+static void
+ungrabbutton(Client *c, unsigned int button, unsigned int modifier)
+{
+ XUngrabButton(dpy, button, modifier, c->win);
+ XUngrabButton(dpy, button, modifier | LockMask, c->win);
+ XUngrabButton(dpy, button, modifier | numlockmask, c->win);
+ XUngrabButton(dpy, button, modifier | numlockmask | LockMask, c->win);
+}
+
static int
xerrordummy(Display *dsply, XErrorEvent *ee)
{
focus(Client *c)
{
Client *old = sel;
- XEvent ev;
-
- sel = c;
- if(old && old != c)
- drawtitle(old);
- drawtitle(c);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-void
-focusnext(Arg *arg)
-{
- Client *c;
-
- if(!sel)
+ if(!issel)
return;
-
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getnext(sel->next)))
- c = getnext(clients);
- if(c) {
- higher(c);
- focus(c);
- }
-}
-
-void
-focusprev(Arg *arg)
-{
- Client *c;
-
if(!sel)
- return;
-
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getprev(sel->prev))) {
- for(c = clients; c && c->next; c = c->next);
- c = getprev(c);
- }
- if(c) {
- higher(c);
- focus(c);
+ sel = c;
+ else if(sel != c) {
+ if(sel->ismax)
+ togglemax(NULL);
+ sel = c;
+ grabbutton(old, AnyButton, 0);
+ drawtitle(old);
}
+ ungrabbutton(c, AnyButton, 0);
+ drawtitle(c);
+ XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
Client *
c->y += dy;
}
-void
-higher(Client *c)
-{
- XRaiseWindow(dpy, c->win);
- XRaiseWindow(dpy, c->title);
-}
-
void
killclient(Arg *arg)
{
XKillClient(dpy, sel->win);
}
-void
-lower(Client *c)
-{
- XLowerWindow(dpy, c->title);
- XLowerWindow(dpy, c->win);
-}
-
void
manage(Window w, XWindowAttributes *wa)
{
- Client *c;
+ unsigned int i;
+ Client *c, *tc;
Window trans;
XSetWindowAttributes twa;
c = emallocz(sizeof(Client));
+ c->tags = emallocz(ntags * sizeof(Bool));
c->win = w;
c->x = c->tx = wa->x;
c->y = c->ty = wa->y;
c->h = wa->height;
c->th = bh;
- if(c->y < bh)
- c->y = c->ty = bh;
+ c->border = 0;
+ setsize(c);
+
+ if(c->x + c->w + 2 > sw)
+ c->x = sw - c->w - 2;
+ if(c->x < 0)
+ c->x = 0;
+ if(c->y + c->h + 2 > sh)
+ c->y = sh - c->h - 2;
+ if(c->h != sh && c->y < bh)
+ c->y = bh;
- c->border = 1;
c->proto = getproto(c->win);
- setsize(c);
XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
- twa.event_mask = ExposureMask;
+ twa.event_mask = ExposureMask | EnterWindowMask;
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);
- settags(c);
-
if(clients)
clients->prev = c;
c->next = clients;
clients = c;
- XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
+ grabbutton(c, Button1, MODKEY);
+ grabbutton(c, Button2, MODKEY);
+ grabbutton(c, Button3, MODKEY);
+ if((tc = getclient(trans))) /* inherit tags */
+ for(i = 0; i < ntags; i++)
+ c->tags[i] = tc->tags[i];
+ else
+ settags(c);
if(!c->isfloat)
- c->isfloat = trans || (c->maxw && c->minw &&
- (c->maxw == c->minw) && (c->maxh == c->minh));
-
-
+ c->isfloat = trans
+ || (c->maxw && c->minw &&
+ c->maxw == c->minw && c->maxh == c->minh);
settitle(c);
+ if(isvisible(c))
+ sel = c;
arrange(NULL);
-
- /* mapping the window now prevents flicker */
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- if(c->tags[tsel])
+ XMapWindow(dpy, c->win);
+ XMapWindow(dpy, c->title);
+ if(isvisible(c))
focus(c);
}
c->y = bottom - c->h;
resizetitle(c);
-
- if(c->tags[tsel])
- wc.x = c->x;
- else
- wc.x = c->x + 2 * sw;
+ wc.x = c->x;
wc.y = c->y;
wc.width = c->w;
wc.height = c->h;
- wc.border_width = 1;
+ if(c->w == sw && c->h == sh)
+ wc.border_width = 0;
+ else
+ wc.border_width = 1;
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
XSync(dpy, False);
}
oh = sel->h;
sel->x = sx;
sel->y = sy + bh;
- sel->w = sw - 2 * sel->border;
- sel->h = sh - 2 * sel->border - bh;
+ sel->w = sw - 2;
+ sel->h = sh - 2 - bh;
- higher(sel);
- resize(sel, False, TopLeft);
+ restack();
+ resize(sel, arrange == dofloat, TopLeft);
sel->x = ox;
sel->y = oy;
c->next->prev = c->prev;
if(c == clients)
clients = c->next;
- if(sel == c) {
- sel = getnext(c->next);
- if(!sel)
- sel = getprev(c->prev);
- if(!sel)
- sel = clients;
- }
+ if(sel == c)
+ sel = getnext(clients);
+ free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange(NULL);
if(sel)
focus(sel);
-}
-
-void
-zoom(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
-
- if(sel == getnext(clients) && sel->next) {
- if((c = getnext(sel->next)))
- sel = c;
- }
-
- /* pop */
- if(sel->prev)
- sel->prev->next = sel->next;
- if(sel->next)
- sel->next->prev = sel->prev;
- sel->prev = NULL;
- if(clients)
- clients->prev = sel;
- sel->next = clients;
- clients = sel;
arrange(NULL);
- focus(sel);
}