X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=16e04b0256d5b777a29a87a53db809ec2259e80e;hb=6bdef73a4f0c2a96f8984ddc10b55f1d753ab5fe;hp=28b8fdfc21e0fbb5ab8bc3c3f9038a03871db121;hpb=585294ce0f9ec693b5a4315e9ad794fbd0a7584d;p=dwm.git diff --git a/dwm.c b/dwm.c index 28b8fdf..16e04b0 100644 --- a/dwm.c +++ b/dwm.c @@ -39,20 +39,24 @@ #include #include #include +#ifdef XINERAMA +#include +#endif /* macros */ -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) -#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) -#define LENGTH(x) (sizeof x / sizeof x[0]) -#define MAXTAGLEN 16 -#define MOUSEMASK (BUTTONMASK|PointerMotionMask) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) +#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) +#define LENGTH(x) (sizeof x / sizeof x[0]) +#define MAXTAGLEN 16 +#define MOUSEMASK (BUTTONMASK|PointerMotionMask) /* enums */ -enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ -enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ +enum { BarTop, BarBot, BarOff, BarLast }; /* bar appearance */ +enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ +enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ +enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ /* typedefs */ @@ -166,6 +170,7 @@ void spawn(const char *arg); void tag(const char *arg); unsigned int textnw(const char *text, unsigned int len); unsigned int textw(const char *text); +void togglebar(const char *arg); void togglefloating(const char *arg); void togglelayout(const char *arg); void toggletag(const char *arg); @@ -179,7 +184,7 @@ void updatesizehints(Client *c); void updatetitle(Client *c); void updatewmhints(Client *c); void view(const char *arg); -void viewprevtag(const char *arg); /* views previous selected tags */ +void viewprevtag(const char *arg); int xerror(Display *dpy, XErrorEvent *ee); int xerrordummy(Display *dpy, XErrorEvent *ee); int xerrorstart(Display *dpy, XErrorEvent *ee); @@ -188,9 +193,9 @@ void zoom(const char *arg); /* variables */ char stext[256]; int screen, sx, sy, sw, sh; -int (*xerrorxlib)(Display *, XErrorEvent *); int bx, by, bw, bh, blw, wx, wy, ww, wh; int seltags = 0; +int (*xerrorxlib)(Display *, XErrorEvent *); unsigned int numlockmask = 0; void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, @@ -953,13 +958,13 @@ manage(Window w, XWindowAttributes *wa) { c->bw = wa->border_width; } else { - if(c->x + c->w + 2 * c->bw > wx + ww) - c->x = wx + ww - c->w - 2 * c->bw; - if(c->y + c->h + 2 * c->bw > wy + wh) - c->y = wy + wh - c->h - 2 * c->bw; - c->x = MAX(c->x, wx); - c->y = MAX(c->y, wy); - c->bw = BORDERPX; + if(c->x + c->w + 2 * c->bw > sx + sw) + c->x = sx + sw - c->w - 2 * c->bw; + if(c->y + c->h + 2 * c->bw > sy + sh) + c->y = sy + sh - c->h - 2 * c->bw; + c->x = MAX(c->x, sx); + c->y = MAX(c->y, by == 0 ? bh : sy); + c->bw = borderpx; } wc.border_width = c->bw; @@ -1037,16 +1042,19 @@ movemouse(Client *c) { XSync(dpy, False); nx = ocx + (ev.xmotion.x - x1); ny = ocy + (ev.xmotion.y - y1); - if(abs(wx - nx) < SNAP) - nx = wx; - else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP) - nx = wx + ww - c->w - 2 * c->bw; - if(abs(wy - ny) < SNAP) - ny = wy; - else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP) - ny = wy + wh - c->h - 2 * c->bw; - if(!c->isfloating && lt->arrange && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP)) - togglefloating(NULL); + if(snap && nx >= wx && nx <= wx + ww + && ny >= wy && ny <= wy + wh) { + if(abs(wx - nx) < snap) + nx = wx; + else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap) + nx = wx + ww - c->w - 2 * c->bw; + if(abs(wy - ny) < snap) + ny = wy; + else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap) + ny = wy + wh - c->h - 2 * c->bw; + if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) + togglefloating(NULL); + } if(!lt->arrange || c->isfloating) resize(c, nx, ny, c->w, c->h, False); break; @@ -1191,8 +1199,12 @@ resizemouse(Client *c) { XSync(dpy, False); nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1); nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1); - if(!c->isfloating && lt->arrange && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) { - togglefloating(NULL); + + if(snap && nw >= wx && nw <= wx + ww + && nh >= wy && nh <= wy + wh) { + if(!c->isfloating && lt->arrange + && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) + togglefloating(NULL); } if(!lt->arrange || c->isfloating) resize(c, c->x, c->y, nw, nh, True); @@ -1455,6 +1467,14 @@ textw(const char *text) { } void +togglebar(const char *arg) { + showbar = !showbar; + updategeom(); + updatebar(); + arrange(); +} + +void togglefloating(const char *arg) { if(!sel) return; @@ -1562,18 +1582,32 @@ updatebar(void) { void updategeom(void) { - unsigned int i; - - /* bar geometry */ - bx = 0; - by = 0; - bw = sw; + int i; +#ifdef XINERAMA + XineramaScreenInfo *info = NULL; /* window area geometry */ - wx = sx; - wy = sy + bh; - ww = sw; - wh = sh - bh; + if(XineramaIsActive(dpy)) { + info = XineramaQueryScreens(dpy, &i); + wx = info[0].x_org; + wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org; + ww = info[0].width; + wh = showbar ? info[0].height - bh : info[0].height; + XFree(info); + } + else +#endif + { + wx = sx; + wy = showbar && topbar ? sy + bh : sy; + ww = sw; + wh = showbar ? sh - bh : sh; + } + + /* bar geometry*/ + bx = wx; + by = showbar ? (topbar ? 0 : wy + wh) : -bh; + bw = ww; /* update layout geometries */ for(i = 0; i < LENGTH(layouts); i++)