X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/373b11de11fd5cee875ef521e3ac0527565c4721..81aebf8caeb720406a238e8766bb615c501af15f:/event.c
diff --git a/event.c b/event.c
index c913320..4c0e4e7 100644
--- a/event.c
+++ b/event.c
@@ -1,7 +1,8 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
#include "dwm.h"
+#include <stdio.h>
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
@@ -11,8 +12,8 @@
typedef struct {
unsigned long mod;
KeySym keysym;
- void (*func)(Arg *arg);
- Arg arg;
+ void (*func)(const char *arg);
+ const char *arg;
} Key;
KEYS
@@ -20,15 +21,23 @@ KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
+static Client *
+getclient(Window w) {
+ Client *c;
+
+ for(c = clients; c && c->win != w; c = c->next);
+ return c;
+}
+
static void
movemouse(Client *c) {
- int x1, y1, ocx, ocy, di;
+ int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
Window dummy;
XEvent ev;
- ocx = c->x;
- ocy = c->y;
+ ocx = nx = c->x;
+ ocy = ny = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
@@ -38,7 +47,6 @@ movemouse(Client *c) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
switch (ev.type) {
case ButtonRelease:
- resize(c, True);
XUngrabPointer(dpy, CurrentTime);
return;
case ConfigureRequest:
@@ -48,17 +56,17 @@ movemouse(Client *c) {
break;
case MotionNotify:
XSync(dpy, False);
- c->x = ocx + (ev.xmotion.x - x1);
- c->y = ocy + (ev.xmotion.y - y1);
- if(abs(wax + c->x) < SNAP)
- c->x = wax;
- else if(abs((wax + waw) - (c->x + c->w + 2 * c->border)) < SNAP)
- c->x = wax + waw - c->w - 2 * c->border;
- if(abs(way - c->y) < SNAP)
- c->y = way;
- else if(abs((way + wah) - (c->y + c->h + 2 * c->border)) < SNAP)
- c->y = way + wah - c->h - 2 * c->border;
- resize(c, False);
+ nx = ocx + (ev.xmotion.x - x1);
+ ny = ocy + (ev.xmotion.y - y1);
+ if(abs(wax + nx) < SNAP)
+ nx = wax;
+ else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+ nx = wax + waw - c->w - 2 * c->border;
+ if(abs(way - ny) < SNAP)
+ ny = way;
+ else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+ ny = way + wah - c->h - 2 * c->border;
+ resize(c, nx, ny, c->w, c->h, False);
break;
}
}
@@ -81,8 +89,10 @@ resizemouse(Client *c) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
switch(ev.type) {
case ButtonRelease:
- resize(c, True);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
+ c->w + c->border - 1, c->h + c->border - 1);
XUngrabPointer(dpy, CurrentTime);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return;
case ConfigureRequest:
case Expose:
@@ -91,11 +101,11 @@ resizemouse(Client *c) {
break;
case MotionNotify:
XSync(dpy, False);
- nw = ev.xmotion.x - ocx - 2 * c->border + 1;
- c->w = nw > 0 ? nw : 1;
- nh = ev.xmotion.y - ocy - 2 * c->border + 1;
- c->h = nh > 0 ? nh : 1;
- resize(c, True);
+ if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+ nw = 1;
+ if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+ nh = 1;
+ resize(c, c->x, c->y, nw, nh, True);
break;
}
}
@@ -103,43 +113,37 @@ resizemouse(Client *c) {
static void
buttonpress(XEvent *e) {
- int x;
- Arg a;
+ static char buf[32];
+ unsigned int i, x;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
+ buf[0] = 0;
if(barwin == ev->window) {
x = 0;
- for(a.i = 0; a.i < ntags; a.i++) {
- x += textw(tags[a.i]);
+ for(i = 0; i < ntags; i++) {
+ x += textw(tags[i]);
if(ev->x < x) {
+ snprintf(buf, sizeof buf, "%d", i);
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(&a);
+ tag(buf);
else
- view(&a);
+ view(buf);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(&a);
+ toggletag(buf);
else
- toggleview(&a);
+ toggleview(buf);
}
return;
}
}
- if(ev->x < x + bmw)
+ if(ev->x < x + blw)
switch(ev->button) {
case Button1:
- togglemode(NULL);
- break;
- case Button4:
- a.i = 1;
- incnmaster(&a);
- break;
- case Button5:
- a.i = -1;
- incnmaster(&a);
+ setlayout(NULL);
break;
}
}
@@ -147,14 +151,15 @@ buttonpress(XEvent *e) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
- if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+ if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
restack();
movemouse(c);
}
else if(ev->button == Button2)
zoom(NULL);
- else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
- !c->isfixed) {
+ else if(ev->button == Button3
+ && (lt->arrange == floating || c->isfloating) && !c->isfixed)
+ {
restack();
resizemouse(c);
}
@@ -163,40 +168,35 @@ buttonpress(XEvent *e) {
static void
configurerequest(XEvent *e) {
- unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
if((c = getclient(ev->window))) {
c->ismax = False;
- if(ev->value_mask & CWX)
- c->x = ev->x;
- if(ev->value_mask & CWY)
- c->y = ev->y;
- if(ev->value_mask & CWWidth)
- c->w = ev->width;
- if(ev->value_mask & CWHeight)
- c->h = ev->height;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- wc.x = c->x;
- wc.y = c->y;
- wc.width = c->w;
- wc.height = c->h;
- newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
- if(newmask)
- XConfigureWindow(dpy, c->win, newmask, &wc);
- else
- configure(c);
- XSync(dpy, False);
- if(c->isfloat) {
- resize(c, False);
- if(!isvisible(c))
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
+ if(ev->value_mask & CWX)
+ c->x = ev->x;
+ if(ev->value_mask & CWY)
+ c->y = ev->y;
+ if(ev->value_mask & CWWidth)
+ c->w = ev->width;
+ if(ev->value_mask & CWHeight)
+ c->h = ev->height;
+ if((c->x + c->w) > sw && c->isfloating)
+ c->x = sw / 2 - c->w / 2; /* center in x direction */
+ if((c->y + c->h) > sh && c->isfloating)
+ c->y = sh / 2 - c->h / 2; /* center in y direction */
+ if((ev->value_mask & (CWX | CWY))
+ && !(ev->value_mask & (CWWidth | CWHeight)))
+ configure(c);
+ if(isvisible(c))
+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
- arrange();
+ configure(c);
}
else {
wc.x = ev->x;
@@ -207,7 +207,23 @@ configurerequest(XEvent *e) {
wc.sibling = ev->above;
wc.stack_mode = ev->detail;
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
- XSync(dpy, False);
+ }
+ XSync(dpy, False);
+}
+
+static void
+configurenotify(XEvent *e) {
+ XConfigureEvent *ev = &e->xconfigure;
+
+ if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
+ wah = sh - bh;
+ waw = sw;
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ XResizeWindow(dpy, barwin, sw, bh);
+ lt->arrange();
}
}
@@ -230,9 +246,8 @@ enternotify(XEvent *e) {
if((c = getclient(ev->window)) && isvisible(c))
focus(c);
else if(ev->window == root) {
- issel = True;
- for(c = stack; c && !isvisible(c); c = c->snext);
- focus(c);
+ selscreen = True;
+ focustopvisible();
}
}
@@ -254,14 +269,13 @@ keypress(XEvent *e) {
XKeyEvent *ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i < len; i++) {
+ for(i = 0; i < len; i++)
if(keysym == key[i].keysym
- && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+ && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
- key[i].func(&key[i].arg);
+ key[i].func(key[i].arg);
}
- }
}
static void
@@ -269,7 +283,7 @@ leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
- issel = False;
+ selscreen = False;
focus(NULL);
}
}
@@ -290,11 +304,8 @@ maprequest(XEvent *e) {
if(!XGetWindowAttributes(dpy, ev->window, &wa))
return;
- if(wa.override_redirect) {
- XSelectInput(dpy, ev->window,
- (StructureNotifyMask | PropertyChangeMask));
+ if(wa.override_redirect)
return;
- }
if(!getclient(ev->window))
manage(ev->window, &wa);
}
@@ -308,16 +319,12 @@ propertynotify(XEvent *e) {
if(ev->state == PropertyDelete)
return; /* ignore */
if((c = getclient(ev->window))) {
- if(ev->atom == wmatom[WMProtocols]) {
- c->proto = getproto(c->win);
- return;
- }
switch (ev->atom) {
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloat && (c->isfloat = (trans != 0)))
- arrange();
+ if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+ lt->arrange();
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);
@@ -345,6 +352,7 @@ unmapnotify(XEvent *e) {
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
+ [ConfigureNotify] = configurenotify,
[DestroyNotify] = destroynotify,
[EnterNotify] = enternotify,
[LeaveNotify] = leavenotify,
@@ -375,14 +383,3 @@ grabkeys(void) {
GrabModeAsync, GrabModeAsync);
}
}
-
-void
-procevent(void) {
- XEvent ev;
-
- while(XPending(dpy)) {
- XNextEvent(dpy, &ev);
- if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
-}