X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/e9c49ddd7a021e99dc2e7518736211ab5bc8cf2c..9800518ae3505e54c0e52ea3d40050f279e722d6:/event.c?ds=inline
diff --git a/event.c b/event.c
index 4b3c1e3..16201f3 100644
--- a/event.c
+++ b/event.c
@@ -1,23 +1,20 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
#include "dwm.h"
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
+#include <X11/Xutil.h>
/* static */
typedef struct {
unsigned long mod;
KeySym keysym;
- void (*func)(Arg *arg);
- Arg arg;
+ void (*func)(const char *arg);
+ const char *arg;
} Key;
-KEYS
-
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
static Client *
@@ -112,58 +109,45 @@ resizemouse(Client *c) {
static void
buttonpress(XEvent *e) {
- int x;
- Arg a;
+ unsigned int i, x;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
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) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(&a);
+ tag(tags[i]);
else
- view(&a);
+ view(tags[i]);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(&a);
+ toggletag(tags[i]);
else
- toggleview(&a);
+ toggleview(tags[i]);
}
return;
}
}
- if(ev->x < x + bmw)
- switch(ev->button) {
- case Button1:
- togglemode(NULL);
- break;
- case Button4:
- a.i = 1;
- incnmaster(&a);
- break;
- case Button5:
- a.i = -1;
- incnmaster(&a);
- break;
- }
+ if((ev->x < x + blw) && ev->button == Button1)
+ setlayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
- if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+ if(ev->button == Button1 && (isfloating() || c->isfloating)) {
restack();
movemouse(c);
}
else if(ev->button == Button2)
zoom(NULL);
else if(ev->button == Button3
- && (arrange == dofloat || c->isfloat) && !c->isfixed)
+ && (isfloating() || c->isfloating) && !c->isfixed)
{
restack();
resizemouse(c);
@@ -181,7 +165,7 @@ configurerequest(XEvent *e) {
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+ if(c->isfixed || c->isfloating || isfloating()) {
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
@@ -190,6 +174,10 @@ configurerequest(XEvent *e) {
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);
@@ -212,6 +200,21 @@ configurerequest(XEvent *e) {
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;
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ XResizeWindow(dpy, barwin, sw, bh);
+ updatebarpos();
+ arrange();
+ }
+}
+
static void
destroynotify(XEvent *e) {
Client *c;
@@ -228,12 +231,11 @@ enternotify(XEvent *e) {
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
- if((c = getclient(ev->window)) && isvisible(c))
+ if((c = getclient(ev->window)))
focus(c);
else if(ev->window == root) {
selscreen = True;
- for(c = stack; c && !isvisible(c); c = c->snext);
- focus(c);
+ focus(NULL);
}
}
@@ -243,24 +245,25 @@ expose(XEvent *e) {
if(ev->count == 0) {
if(barwin == ev->window)
- drawstatus();
+ drawbar();
}
}
static void
keypress(XEvent *e) {
- static unsigned int len = sizeof key / sizeof key[0];
+ KEYS
+ unsigned int len = sizeof keys / sizeof keys[0];
unsigned int i;
KeySym keysym;
XKeyEvent *ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < len; i++)
- if(keysym == key[i].keysym
- && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+ if(keysym == keys[i].keysym
+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
{
- if(key[i].func)
- key[i].func(&key[i].arg);
+ if(keys[i].func)
+ keys[i].func(keys[i].arg);
}
}
@@ -309,7 +312,7 @@ propertynotify(XEvent *e) {
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloat && (c->isfloat = (trans != 0)))
+ if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
arrange();
break;
case XA_WM_NORMAL_HINTS:
@@ -319,7 +322,7 @@ propertynotify(XEvent *e) {
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
if(c == sel)
- drawstatus();
+ drawbar();
}
}
}
@@ -338,6 +341,7 @@ unmapnotify(XEvent *e) {
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
+ [ConfigureNotify] = configurenotify,
[DestroyNotify] = destroynotify,
[EnterNotify] = enternotify,
[LeaveNotify] = leavenotify,
@@ -351,20 +355,21 @@ void (*handler[LASTEvent]) (XEvent *) = {
void
grabkeys(void) {
- static unsigned int len = sizeof key / sizeof key[0];
+ KEYS
+ unsigned int len = sizeof keys / sizeof keys[0];
unsigned int i;
KeyCode code;
XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < len; i++) {
- code = XKeysymToKeycode(dpy, key[i].keysym);
- XGrabKey(dpy, code, key[i].mod, root, True,
+ code = XKeysymToKeycode(dpy, keys[i].keysym);
+ XGrabKey(dpy, code, keys[i].mod, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
+ XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
+ XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
+ XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
}
}