Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
firefox instance is different now
[dwm.git] / event.c
diff --git a/event.c b/event.c
index 2d8a728..db95dfd 100644 (file)
--- a/event.c
+++ b/event.c
@@ -11,48 +11,116 @@
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
-/********** CUSTOMIZE **********/
-
+/* CUSTOMIZE */
+const char *browse[] = { "firefox", NULL };
+const char *gimp[] = { "gimp", NULL };
 const char *term[] = { 
 const char *term[] = { 
-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn",
-       "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL
+       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+       "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
 };
-const char *browse[] = { "firefox", NULL };
 const char *xlock[] = { "xlock", NULL };
 
 Key key[] = {
        /* modifier                             key                     function        arguments */
 const char *xlock[] = { "xlock", NULL };
 
 Key key[] = {
        /* modifier                             key                     function        arguments */
-       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
-       { Mod1Mask,                             XK_k,           focusprev,              { 0 } },
-       { Mod1Mask,                             XK_j,           focusnext,              { 0 } }, 
-       { Mod1Mask,                             XK_m,           maximize,               { 0 } }, 
+       { 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_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_space,       dotile,         { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 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_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_q,           quit,           { 0 } },
-       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
+       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
        { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
        { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
-       { Mod1Mask|ShiftMask,   XK_l,           spawn,          { .argv = xlock } },
-       { 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|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
 };
 
 };
 
-/********** CUSTOMIZE **********/
+/* 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);
+                       break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               }
+       }
+}
 
 
-/* static functions */
+static void
+resizemouse(Client *c)
+{
+       XEvent ev;
+       int ocx, ocy;
 
 
-static void movemouse(Client *c);
-static void resizemouse(Client *c);
+       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;
+                       resize(c, True);
+                       break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               }
+       }
+}
 
 static void
 buttonpress(XEvent *e)
 
 static void
 buttonpress(XEvent *e)
@@ -63,18 +131,34 @@ buttonpress(XEvent *e)
        Client *c;
 
        if(barwin == ev->window) {
        Client *c;
 
        if(barwin == ev->window) {
-               x = (arrange == dofloat) ? textw("~") : 0;
-               for(a.i = 0; a.i < TLast; a.i++) {
-                       x += textw(tags[a.i]);
-                       if(ev->x < x) {
-                               view(&a);
-                               break;
+               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))) {
                }
        }
        else if((c = getclient(ev->window))) {
-               if(arrange == dotile && !c->dofloat)
+               if(arrange == dotile && !c->isfloat) {
+                       if((ev->state & ControlMask) && (ev->button == Button1))
+                               zoom(NULL);
                        return;
                        return;
+               }
+               /* floating windows */
                higher(c);
                switch(ev->button) {
                default:
                higher(c);
                switch(ev->button) {
                default:
@@ -103,13 +187,13 @@ configurerequest(XEvent *e)
        if((c = getclient(ev->window))) {
                gravitate(c, True);
                if(ev->value_mask & CWX)
        if((c = getclient(ev->window))) {
                gravitate(c, True);
                if(ev->value_mask & CWX)
-                       c->x = ev->x;
+                       *c->x = ev->x;
                if(ev->value_mask & CWY)
                if(ev->value_mask & CWY)
-                       c->y = ev->y;
+                       *c->y = ev->y;
                if(ev->value_mask & CWWidth)
                if(ev->value_mask & CWWidth)
-                       c->w = ev->width;
+                       *c->w = ev->width;
                if(ev->value_mask & CWHeight)
                if(ev->value_mask & CWHeight)
-                       c->h = ev->height;
+                       *c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                        c->border = 1;
                gravitate(c, False);
                if(ev->value_mask & CWBorderWidth)
                        c->border = 1;
                gravitate(c, False);
@@ -126,7 +210,7 @@ configurerequest(XEvent *e)
        ev->value_mask &= ~CWStackMode;
        ev->value_mask |= CWBorderWidth;
        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
        ev->value_mask &= ~CWStackMode;
        ev->value_mask |= CWBorderWidth;
        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-       XFlush(dpy);
+       XSync(dpy, False);
 }
 
 static void
 }
 
 static void
@@ -213,40 +297,6 @@ maprequest(XEvent *e)
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 
-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:
-                       XFlush(dpy);
-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False);
-                       break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
-               }
-       }
-}
-
 static void
 propertynotify(XEvent *e)
 {
 static void
 propertynotify(XEvent *e)
 {
@@ -258,7 +308,7 @@ propertynotify(XEvent *e)
                return; /* ignore */
 
        if((c = getclient(ev->window))) {
                return; /* ignore */
 
        if((c = getclient(ev->window))) {
-               if(ev->atom == wm_atom[WMProtocols]) {
+               if(ev->atom == wmatom[WMProtocols]) {
                        c->proto = getproto(c->win);
                        return;
                }
                        c->proto = getproto(c->win);
                        return;
                }
@@ -266,54 +316,20 @@ propertynotify(XEvent *e)
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->dofloat && (c->dofloat = (trans != 0)))
+                               if(!c->isfloat && (c->isfloat = (trans != 0)))
                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                setsize(c);
                                break;
                }
                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                setsize(c);
                                break;
                }
-               if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
+               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        settitle(c);
                        drawtitle(c);
                }
        }
 }
 
                        settitle(c);
                        drawtitle(c);
                }
        }
 }
 
-static void
-resizemouse(Client *c)
-{
-       XEvent ev;
-       int ocx, ocy;
-
-       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:
-                       XFlush(dpy);
-                       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;
-                       resize(c, True);
-                       break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
-               }
-       }
-}
-
 static void
 unmapnotify(XEvent *e)
 {
 static void
 unmapnotify(XEvent *e)
 {
@@ -324,7 +340,7 @@ unmapnotify(XEvent *e)
                unmanage(c);
 }
 
                unmanage(c);
 }
 
-/* extern functions */
+/* extern */
 
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
 
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,