Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
alternate dwm.png
[dwm.git] / event.c
diff --git a/event.c b/event.c
index ecbb8d2..6f99ea2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -11,45 +11,39 @@
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
-/********** CUSTOMIZE **********/
-
-const char *term[] = { 
-       "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 };
+/* CUSTOMIZE */
+const char *term[] = { "xterm", NULL };
 
 Key key[] = {
        /* modifier                             key                     function        arguments */
 
 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_q,           quit,           { 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_q,           quit,           { 0 } },
+       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
        { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
        { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
-       { 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 } }, 
 };
 
 };
 
-/********** CUSTOMIZE **********/
-
-/* static functions */
+/* static */
 
 static void
 movemouse(Client *c)
 
 static void
 movemouse(Client *c)
@@ -59,8 +53,8 @@ movemouse(Client *c)
        unsigned int dui;
        Window dummy;
 
        unsigned int dui;
        Window dummy;
 
-       ocx = c->x;
-       ocy = c->y;
+       ocx = *c->x;
+       ocy = *c->y;
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
@@ -74,9 +68,9 @@ movemouse(Client *c)
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);
-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, 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);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
@@ -90,13 +84,14 @@ resizemouse(Client *c)
 {
        XEvent ev;
        int ocx, ocy;
 {
        XEvent ev;
        int ocx, ocy;
+       Corner sticky;
 
 
-       ocx = c->x;
-       ocy = c->y;
+       ocx = *c->x;
+       ocy = *c->y;
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        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);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, *c->w, *c->h);
        for(;;) {
                XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
                switch(ev.type) {
        for(;;) {
                XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
                switch(ev.type) {
@@ -106,11 +101,15 @@ 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);
-                       c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
-                       c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-                       resize(c, True);
+                       *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)
+                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+                       else
+                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+                       resize(c, True, sticky);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
@@ -150,24 +149,27 @@ buttonpress(XEvent *e)
                }
        }
        else if((c = getclient(ev->window))) {
                }
        }
        else if((c = getclient(ev->window))) {
-               if(arrange == dotile && !c->isfloat) {
-                       if((ev->state & ControlMask) && (ev->button == Button1))
-                               zoom(NULL);
-                       return;
-               }
-               /* floating windows */
-               higher(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
                switch(ev->button) {
                default:
                        break;
                case Button1:
-                       movemouse(c);
+                       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:
                        break;
                case Button2:
                        lower(c);
                        break;
                case Button3:
-                       resizemouse(c);
+                       if(arrange == dofloat || c->isfloat) {
+                               higher(c);
+                               resizemouse(c);
+                       }
                        break;
                }
        }
                        break;
                }
        }
@@ -184,17 +186,17 @@ 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);
-               resize(c, True);
+               resize(c, True, TopLeft);
        }
 
        wc.x = ev->x;
        }
 
        wc.x = ev->x;
@@ -337,7 +339,7 @@ unmapnotify(XEvent *e)
                unmanage(c);
 }
 
                unmanage(c);
 }
 
-/* extern functions */
+/* extern */
 
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
 
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,