sander check this

This commit is contained in:
arg@mmvi 2006-09-22 09:43:21 +02:00
parent e34c4eaf61
commit 9eb226ff78
1 changed files with 37 additions and 19 deletions

56
event.c
View File

@ -20,6 +20,23 @@ KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void
synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
XEvent synev;
synev.type = ConfigureNotify;
synev.xconfigure.display = dpy;
synev.xconfigure.event = c->win;
synev.xconfigure.window = c->win;
synev.xconfigure.x = x;
synev.xconfigure.y = y;
synev.xconfigure.width = w;
synev.xconfigure.height = h;
synev.xconfigure.border_width = border;
synev.xconfigure.above = None;
XSendEvent(dpy, c->win, True, NoEventMask, &synev);
}
static void static void
movemouse(Client *c) { movemouse(Client *c) {
int x1, y1, ocx, ocy, di; int x1, y1, ocx, ocy, di;
@ -34,10 +51,14 @@ movemouse(Client *c) {
return; return;
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) { for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
switch (ev.type) { switch (ev.type) {
default: default:
break; break;
case ConfigureRequest:
synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
XSync(dpy, False);
break;
case Expose: case Expose:
handler[Expose](&ev); handler[Expose](&ev);
break; break;
@ -50,6 +71,11 @@ movemouse(Client *c) {
case ButtonRelease: case ButtonRelease:
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
return; return;
case DestroyNotify:
case UnmapNotify:
XUngrabPointer(dpy, CurrentTime);
handler[ev.type](&ev);
return;
} }
} }
} }
@ -68,10 +94,14 @@ resizemouse(Client *c) {
return; return;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
for(;;) { for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
switch(ev.type) { switch(ev.type) {
default: default:
break; break;
case ConfigureRequest:
synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
XSync(dpy, False);
break;
case Expose: case Expose:
handler[Expose](&ev); handler[Expose](&ev);
break; break;
@ -92,6 +122,11 @@ resizemouse(Client *c) {
case ButtonRelease: case ButtonRelease:
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
return; return;
case DestroyNotify:
case UnmapNotify:
XUngrabPointer(dpy, CurrentTime);
handler[ev.type](&ev);
return;
} }
} }
} }
@ -145,23 +180,6 @@ buttonpress(XEvent *e) {
} }
} }
static void
synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
XEvent synev;
synev.type = ConfigureNotify;
synev.xconfigure.display = dpy;
synev.xconfigure.event = c->win;
synev.xconfigure.window = c->win;
synev.xconfigure.x = x;
synev.xconfigure.y = y;
synev.xconfigure.width = w;
synev.xconfigure.height = h;
synev.xconfigure.border_width = border;
synev.xconfigure.above = None;
XSendEvent(dpy, c->win, True, NoEventMask, &synev);
}
static void static void
configurerequest(XEvent *e) { configurerequest(XEvent *e) {
unsigned long newmask; unsigned long newmask;