Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
applied Sanders resize patch, fixed lower bug
[dwm.git] / event.c
diff --git a/event.c b/event.c
index d6977d3..9d69373 100644 (file)
--- a/event.c
+++ b/event.c
@@ -2,223 +2,300 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
 
-#include <fcntl.h>
 #include <stdlib.h>
 #include <stdlib.h>
-#include <string.h>
 #include <X11/keysym.h>
 #include <X11/keysym.h>
+#include <X11/Xatom.h>
 
 
-#include "wm.h"
+#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
+#define MouseMask       (ButtonMask | PointerMotionMask)
 
 
-/* local functions */
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void leavenotify(XEvent *e);
-static void expose(XEvent *e);
-static void keypress(XEvent *e);
-static void keymapnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
-
-void (*handler[LASTEvent]) (XEvent *) = {
-       [ConfigureRequest] = configurerequest,
-       [DestroyNotify] = destroynotify,
-       [EnterNotify] = enternotify,
-       [LeaveNotify] = leavenotify,
-       [Expose] = expose,
-       [KeyPress] = keypress,
-       [KeymapNotify] = keymapnotify,
-       [MapRequest] = maprequest,
-       [PropertyNotify] = propertynotify,
-       [UnmapNotify] = unmapnotify
+/* CUSTOMIZE */
+const char *browse[] = { "firefox", NULL };
+const char *gimp[] = { "gimp", NULL };
+const char *term[] = { 
+       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+       "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
+};
+const char *xlock[] = { "xlock", NULL };
+
+Key key[] = {
+       /* modifier                             key                     function        arguments */
+       { ControlMask,                  XK_0,           appendtag,      { .i = Tscratch } }, 
+       { ControlMask,                  XK_1,           appendtag,      { .i = Tdev } }, 
+       { ControlMask,                  XK_2,           appendtag,      { .i = Twww } }, 
+       { ControlMask,                  XK_3,           appendtag,      { .i = Twork } }, 
+       { Mod1Mask,                             XK_0,           view,           { .i = Tscratch } }, 
+       { Mod1Mask,                             XK_1,           view,           { .i = Tdev } }, 
+       { Mod1Mask,                             XK_2,           view,           { .i = Twww } }, 
+       { Mod1Mask,                             XK_3,           view,           { .i = Twork } }, 
+       { Mod1Mask,                             XK_j,           focusnext,              { 0 } }, 
+       { Mod1Mask,                             XK_k,           focusprev,              { 0 } },
+       { Mod1Mask,                             XK_m,           maximize,               { 0 } }, 
+       { Mod1Mask,                             XK_space,       dotile,         { 0 } }, 
+       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
+       { ControlMask|ShiftMask,XK_0,           heretag,        { .i = Tscratch } }, 
+       { ControlMask|ShiftMask,XK_1,           heretag,        { .i = Tdev } }, 
+       { ControlMask|ShiftMask,XK_2,           heretag,        { .i = Twww } }, 
+       { ControlMask|ShiftMask,XK_3,           heretag,        { .i = Twork } }, 
+       { Mod1Mask|ShiftMask,   XK_0,           replacetag,             { .i = Tscratch } }, 
+       { Mod1Mask|ShiftMask,   XK_1,           replacetag,             { .i = Tdev } }, 
+       { Mod1Mask|ShiftMask,   XK_2,           replacetag,             { .i = Twww } }, 
+       { Mod1Mask|ShiftMask,   XK_3,           replacetag,             { .i = Twork } }, 
+       { Mod1Mask|ShiftMask,   XK_c,           killclient,             { 0 } }, 
+       { Mod1Mask|ShiftMask,   XK_g,           spawn,          { .argv = gimp } },
+       { Mod1Mask|ShiftMask,   XK_l,           spawn,          { .argv = xlock } },
+       { Mod1Mask|ShiftMask,   XK_q,           quit,           { 0 } },
+       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
+       { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
+       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
 };
 
 };
 
-unsigned int
-flush_masked_events(long even_mask)
+/* static */
+
+static void
+movemouse(Client *c)
+{
+       XEvent ev;
+       int x1, y1, ocx, ocy, di;
+       unsigned int dui;
+       Window dummy;
+
+       ocx = *c->x;
+       ocy = *c->y;
+       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+                               None, cursor[CurMove], CurrentTime) != GrabSuccess)
+               return;
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       for(;;) {
+               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               switch (ev.type) {
+               default: break;
+               case Expose:
+                       handler[Expose](&ev);
+                       break;
+               case MotionNotify:
+                       XSync(dpy, False);
+                       *c->x = ocx + (ev.xmotion.x - x1);
+                       *c->y = ocy + (ev.xmotion.y - y1);
+                       resize(c, False, TopLeft);
+                       break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               }
+       }
+}
+
+static void
+resizemouse(Client *c)
 {
        XEvent ev;
 {
        XEvent ev;
-       unsigned int n = 0;
-       while(XCheckMaskEvent(dpy, even_mask, &ev)) n++;
-       return n;
+       int ocx, ocy;
+       Corner sticky;
+
+       ocx = *c->x;
+       ocy = *c->y;
+       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+               return;
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, *c->w, *c->h);
+       for(;;) {
+               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               switch(ev.type) {
+               default: break;
+               case Expose:
+                       handler[Expose](&ev);
+                       break;
+               case MotionNotify:
+                       XSync(dpy, False);
+                       *c->w = abs(ocx - ev.xmotion.x);
+                       *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) {
+                               if(ocy <= ev.xmotion.y)
+                                       sticky = TopLeft;
+                               else
+                                       sticky = BottomLeft;
+                       } else {
+                               if(ocy <= ev.xmotion.y)
+                                       sticky = TopRight;
+                               else
+                                       sticky = BottomRight;
+                       }
+                       resize(c, True, sticky);
+                       break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               }
+       }
+}
+
+static void
+buttonpress(XEvent *e)
+{
+       int x;
+       Arg a;
+       XButtonPressedEvent *ev = &e->xbutton;
+       Client *c;
+
+       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) {
+                                       view(&a);
+                                       break;
+                               }
+                       }
+                       break;
+               case Button4:
+                       a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
+                       view(&a);
+                       break;
+               case Button5:
+                       a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
+                       view(&a);
+                       break;
+               }
+       }
+       else if((c = getclient(ev->window))) {
+               switch(ev->button) {
+               default:
+                       break;
+               case Button1:
+                       if(arrange == dotile && !c->isfloat) {
+                               if((ev->state & ControlMask) && (ev->button == Button1))
+                                       zoom(NULL);
+                       }
+                       else {
+                               higher(c);
+                               movemouse(c);
+                       }
+                       break;
+               case Button2:
+                       lower(c);
+                       break;
+               case Button3:
+                       if(arrange == dofloat || c->isfloat) {
+                               higher(c);
+                               resizemouse(c);
+                       }
+                       break;
+               }
+       }
 }
 
 static void
 configurerequest(XEvent *e)
 {
 }
 
 static void
 configurerequest(XEvent *e)
 {
-#if 0
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
-       XRectangle *frect;
        Client *c;
 
        Client *c;
 
-       c = client_of_win(ev->window);
        ev->value_mask &= ~CWSibling;
        ev->value_mask &= ~CWSibling;
-       if(c) {
-               gravitate_client(c, True);
-
+       if((c = getclient(ev->window))) {
+               gravitate(c, True);
                if(ev->value_mask & CWX)
                if(ev->value_mask & CWX)
-                       c->rect.x = ev->x;
+                       *c->x = ev->x;
                if(ev->value_mask & CWY)
                if(ev->value_mask & CWY)
-                       c->rect.y = ev->y;
+                       *c->y = ev->y;
                if(ev->value_mask & CWWidth)
                if(ev->value_mask & CWWidth)
-                       c->rect.width = ev->width;
+                       *c->w = ev->width;
                if(ev->value_mask & CWHeight)
                if(ev->value_mask & CWHeight)
-                       c->rect.height = ev->height;
+                       *c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWBorderWidth)
-                       c->border = ev->border_width;
-
-               gravitate_client(c, False);
-
-               if(c->frame) {
-                       if(c->sel->area->floating)
-                               frect=&c->sel->rect;
-                       else
-                               frect=&c->sel->revert;
-
-                       if(c->rect.width >= screen->rect.width && c->rect.height >= screen->rect.height) {
-                               frect->y = wc.y = -height_of_bar();
-                               frect->x = wc.x = -def.border;
-                       }
-                       else {
-                               frect->y = wc.y = c->rect.y - height_of_bar();
-                               frect->x = wc.x = c->rect.x - def.border;
-                       }
-                       frect->width = wc.width = c->rect.width + 2 * def.border;
-                       frect->height = wc.height = c->rect.height + def.border
-                               + height_of_bar();
-                       wc.border_width = 1;
-                       wc.sibling = None;
-                       wc.stack_mode = ev->detail;
-                       if(c->sel->area->view != screen->sel)
-                               wc.x += 2 * screen->rect.width;
-                       if(c->sel->area->floating) {
-                               XConfigureWindow(dpy, c->framewin, ev->value_mask, &wc);
-                               configure_client(c);
-                       }
-               }
+                       c->border = 1;
+               gravitate(c, False);
+               resize(c, True, TopLeft);
        }
 
        wc.x = ev->x;
        wc.y = ev->y;
        wc.width = ev->width;
        wc.height = ev->height;
        }
 
        wc.x = ev->x;
        wc.y = ev->y;
        wc.width = ev->width;
        wc.height = ev->height;
-
-       if(c && c->frame) {
-               wc.x = def.border;
-               wc.y = height_of_bar();
-               wc.width = c->sel->rect.width - 2 * def.border;
-               wc.height = c->sel->rect.height - def.border - height_of_bar();
-       }
-
-       wc.border_width = 0;
+       wc.border_width = 1;
        wc.sibling = None;
        wc.stack_mode = Above;
        ev->value_mask &= ~CWStackMode;
        ev->value_mask |= CWBorderWidth;
        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
        wc.sibling = None;
        wc.stack_mode = Above;
        ev->value_mask &= ~CWStackMode;
        ev->value_mask |= CWBorderWidth;
        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-
-       XFlush(dpy);
-#endif
+       XSync(dpy, False);
 }
 
 static void
 destroynotify(XEvent *e)
 {
 }
 
 static void
 destroynotify(XEvent *e)
 {
-#if 0
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
-       if((c = client_of_win(ev->window)))
-               destroy_client(c);
-#endif
+       if((c = getclient(ev->window)))
+               unmanage(c);
 }
 
 static void
 enternotify(XEvent *e)
 {
 }
 
 static void
 enternotify(XEvent *e)
 {
-#if 0
        XCrossingEvent *ev = &e->xcrossing;
        Client *c;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
        XCrossingEvent *ev = &e->xcrossing;
        Client *c;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
-       if((c = client_of_win(ev->window))) {
-               Frame *f = c->sel;
-               Area *a = f->area;
-               if(a->mode == Colmax)
-                       c = a->sel->client;
-               focus(c, False);
-       }
-       else if(ev->window == root) {
-               sel_screen = True;
-               draw_frames();
-       }
-#endif
-}
-
-static void
-leavenotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen) {
-               sel_screen = True;
-               /*draw_frames();*/
-       }
+       if((c = getclient(ev->window)))
+               focus(c);
+       else if(ev->window == root)
+               issel = True;
 }
 
 static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;
 }
 
 static void
 expose(XEvent *e)
 {
        XExposeEvent *ev = &e->xexpose;
+       Client *c;
 
        if(ev->count == 0) {
 
        if(ev->count == 0) {
-               if(ev->window == barwin)
-                       draw_bar();
+               if(barwin == ev->window)
+                       drawstatus();
+               else if((c = getctitle(ev->window)))
+                       drawtitle(c);
        }
 }
 
 static void
 keypress(XEvent *e)
 {
        }
 }
 
 static void
 keypress(XEvent *e)
 {
-#if 0
        XKeyEvent *ev = &e->xkey;
        XKeyEvent *ev = &e->xkey;
-       KeySym k = 0;
-       char buf[32];
-       int n;
-       static Frame *f;
-
-
-       ev->state &= valid_mask;
-       if((f = frame_of_win(ev->window))) {
-               buf[0] = 0;
-               n = XLookupString(ev, buf, sizeof(buf), &k, 0);
-               if(IsFunctionKey(k) || IsKeypadKey(k) || IsMiscFunctionKey(k)
-                               || IsPFKey(k) || IsPrivateKeypadKey(k))
+       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       unsigned int i;
+       KeySym keysym;
+
+       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+       for(i = 0; i < len; i++)
+               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
+                       if(key[i].func)
+                               key[i].func(&key[i].arg);
                        return;
                        return;
-               buf[n] = 0;
-               blitz_kpress_input(&f->tagbar, ev->state, k, buf);
-       }
-       else
-               key(root, ev->state, (KeyCode) ev->keycode);
-#endif
+               }
 }
 
 static void
 }
 
 static void
-keymapnotify(XEvent *e)
+leavenotify(XEvent *e)
 {
 {
-#if 0
-       update_keys();
-#endif
+       XCrossingEvent *ev = &e->xcrossing;
+
+       if((ev->window == root) && !ev->same_screen)
+               issel = True;
 }
 
 static void
 maprequest(XEvent *e)
 {
 }
 
 static void
 maprequest(XEvent *e)
 {
-#if 0
        XMapRequestEvent *ev = &e->xmaprequest;
        static XWindowAttributes wa;
 
        XMapRequestEvent *ev = &e->xmaprequest;
        static XWindowAttributes wa;
 
@@ -231,34 +308,79 @@ maprequest(XEvent *e)
                return;
        }
 
                return;
        }
 
-       if(!client_of_win(ev->window))
-               manage_client(create_client(ev->window, &wa));
-#endif
+       if(!getclient(ev->window))
+               manage(ev->window, &wa);
 }
 
 static void
 propertynotify(XEvent *e)
 {
 }
 
 static void
 propertynotify(XEvent *e)
 {
-#if 0
        XPropertyEvent *ev = &e->xproperty;
        XPropertyEvent *ev = &e->xproperty;
+       Window trans;
        Client *c;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
        Client *c;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
-       if((c = client_of_win(ev->window)))
-               prop_client(c, ev);
-#endif
+       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(NULL);
+                               break;
+                       case XA_WM_NORMAL_HINTS:
+                               setsize(c);
+                               break;
+               }
+               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+                       settitle(c);
+                       drawtitle(c);
+               }
+       }
 }
 
 static void
 unmapnotify(XEvent *e)
 {
 }
 
 static void
 unmapnotify(XEvent *e)
 {
-#if 0
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
-       if((c = client_of_win(ev->window)))
-               destroy_client(c);
-#endif
+       if((c = getclient(ev->window)))
+               unmanage(c);
+}
+
+/* extern */
+
+void (*handler[LASTEvent]) (XEvent *) = {
+       [ButtonPress] = buttonpress,
+       [ConfigureRequest] = configurerequest,
+       [DestroyNotify] = destroynotify,
+       [EnterNotify] = enternotify,
+       [LeaveNotify] = leavenotify,
+       [Expose] = expose,
+       [KeyPress] = keypress,
+       [MapRequest] = maprequest,
+       [PropertyNotify] = propertynotify,
+       [UnmapNotify] = unmapnotify
+};
+
+void
+grabkeys()
+{
+       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       unsigned int i;
+       KeyCode code;
+
+       for(i = 0; i < len; i++) {
+               code = XKeysymToKeycode(dpy, key[i].keysym);
+               XUngrabKey(dpy, code, key[i].mod, root);
+               XGrabKey(dpy, code, key[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+       }
 }
 }