Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Added tag 0.9 for changeset fae61afa861755636c4a1070694209ace8efbb6c
[dwm.git]
/
event.c
diff --git
a/event.c
b/event.c
index
0c159c7
..
5209be3
100644
(file)
--- a/
event.c
+++ b/
event.c
@@
-18,7
+18,7
@@
typedef struct {
KEYS
KEYS
-#define CLEANMASK(mask) (mask & ~(
NUMLOCKMASK
| LockMask))
+#define CLEANMASK(mask) (mask & ~(
numlockmask
| LockMask))
static void
movemouse(Client *c)
static void
movemouse(Client *c)
@@
-58,6
+58,7
@@
static void
resizemouse(Client *c)
{
int ocx, ocy;
resizemouse(Client *c)
{
int ocx, ocy;
+ int nw, nh;
Corner sticky;
XEvent ev;
Corner sticky;
XEvent ev;
@@
-76,8
+77,10
@@
resizemouse(Client *c)
break;
case MotionNotify:
XSync(dpy, False);
break;
case MotionNotify:
XSync(dpy, False);
- c->w = abs(ocx - ev.xmotion.x);
- c->h = abs(ocy - ev.xmotion.y);
+ if((nw = abs(ocx - ev.xmotion.x)))
+ c->w = abs(ocx - ev.xmotion.x);
+ if((nh = abs(ocy - ev.xmotion.y)))
+ c->h = abs(ocy - ev.xmotion.y);
c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
if(ocx <= ev.xmotion.x)
c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
if(ocx <= ev.xmotion.x)
@@
-102,23
+105,16
@@
buttonpress(XEvent *e)
XButtonPressedEvent *ev = &e->xbutton;
if(barwin == ev->window) {
XButtonPressedEvent *ev = &e->xbutton;
if(barwin == ev->window) {
- switch(ev->button) {
- default:
- x = 0;
- for(a.i = 0; a.i < TLast; a.i++) {
- x += textw(tags[a.i]);
- if(ev->x < x) {
+ x = 0;
+ for(a.i = 0; a.i < ntags; a.i++) {
+ x += textw(tags[a.i]);
+ if(ev->x < x) {
+ if(ev->button == Button1)
view(&a);
view(&a);
- break;
- }
+ else if(ev->button == Button3)
+ toggleview(&a);
+ return;
}
}
- break;
- case Button4:
- viewnext(&a);
- break;
- case Button5:
- viewprev(&a);
- break;
}
}
else if((c = getclient(ev->window))) {
}
}
else if((c = getclient(ev->window))) {
@@
-128,16
+124,16
@@
buttonpress(XEvent *e)
break;
case Button1:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
break;
case Button1:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-
higher
(c);
+
restack
(c);
movemouse(c);
}
break;
case Button2:
movemouse(c);
}
break;
case Button2:
-
lower(c
);
+
zoom(NULL
);
break;
case Button3:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
break;
case Button3:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-
higher
(c);
+
restack
(c);
resizemouse(c);
}
break;
resizemouse(c);
}
break;
@@
-148,30
+144,25
@@
buttonpress(XEvent *e)
static void
configurerequest(XEvent *e)
{
static void
configurerequest(XEvent *e)
{
+ unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XEvent synev;
XWindowChanges wc;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XEvent synev;
XWindowChanges wc;
- unsigned long newmask;
if((c = getclient(ev->window))) {
gravitate(c, True);
if((c = getclient(ev->window))) {
gravitate(c, True);
- if(c->isfloat) {
- 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 & 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;
gravitate(c, False);
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
gravitate(c, False);
-
- resize(c, True, TopLeft);
-
wc.x = c->x;
wc.y = c->y;
wc.width = c->w;
wc.x = c->x;
wc.y = c->y;
wc.width = c->w;
@@
-193,6
+184,11
@@
configurerequest(XEvent *e)
/* Send synthetic ConfigureNotify */
XSendEvent(dpy, c->win, True, NoEventMask, &synev);
}
/* Send synthetic ConfigureNotify */
XSendEvent(dpy, c->win, True, NoEventMask, &synev);
}
+ XSync(dpy, False);
+ if(c->isfloat)
+ resize(c, False, TopLeft);
+ else
+ arrange(NULL);
}
else {
wc.x = ev->x;
}
else {
wc.x = ev->x;
@@
-203,8
+199,8
@@
configurerequest(XEvent *e)
wc.sibling = ev->above;
wc.stack_mode = ev->detail;
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
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
}
static void
@@
-223,13
+219,16
@@
enternotify(XEvent *e)
Client *c;
XCrossingEvent *ev = &e->xcrossing;
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->detail == NotifyInferior)
+ if(ev->
mode != NotifyNormal || ev->
detail == NotifyInferior)
return;
if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
focus(c);
return;
if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
focus(c);
- else if(ev->window == root)
+ else if(ev->window == root)
{
issel = True;
issel = True;
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ drawall();
+ }
}
static void
}
static void
@@
-255,13
+254,15
@@
keypress(XEvent *e)
XKeyEvent *ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
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 &&
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);
return;
}
if(key[i].func)
key[i].func(&key[i].arg);
return;
}
+ }
}
static void
}
static void
@@
-269,8
+270,20
@@
leavenotify(XEvent *e)
{
XCrossingEvent *ev = &e->xcrossing;
{
XCrossingEvent *ev = &e->xcrossing;
- if((ev->window == root) && !ev->same_screen)
- issel = True;
+ if((ev->window == root) && !ev->same_screen) {
+ issel = False;
+ drawall();
+ }
+}
+
+static void
+mappingnotify(XEvent *e)
+{
+ XMappingEvent *ev = &e->xmapping;
+
+ XRefreshKeyboardMapping(ev);
+ if(ev->request == MappingKeyboard)
+ grabkeys();
}
static void
}
static void
@@
-345,6
+358,7
@@
void (*handler[LASTEvent]) (XEvent *) = {
[LeaveNotify] = leavenotify,
[Expose] = expose,
[KeyPress] = keypress,
[LeaveNotify] = leavenotify,
[Expose] = expose,
[KeyPress] = keypress,
+ [MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
@@
-357,23
+371,29
@@
grabkeys()
unsigned int i;
KeyCode code;
unsigned int i;
KeyCode code;
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < len; i++) {
code = XKeysymToKeycode(dpy, key[i].keysym);
for(i = 0; i < len; i++) {
code = XKeysymToKeycode(dpy, key[i].keysym);
- /* normal */
- XUngrabKey(dpy, code, key[i].mod, root);
XGrabKey(dpy, code, key[i].mod, root, True,
GrabModeAsync, GrabModeAsync);
XGrabKey(dpy, code, key[i].mod, root, True,
GrabModeAsync, GrabModeAsync);
- /* capslock */
- XUngrabKey(dpy, code, key[i].mod | LockMask, root);
XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
- /* numlock */
- XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
- XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+ XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
GrabModeAsync, GrabModeAsync);
GrabModeAsync, GrabModeAsync);
- /* capslock & numlock */
- XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
- XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+ XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
}
}
GrabModeAsync, GrabModeAsync);
}
}
+
+void
+procevent()
+{
+ XEvent ev;
+
+ while(XPending(dpy)) {
+ XNextEvent(dpy, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev); /* call handler */
+ }
+}
+