Added ability to select multiple tags for viewing/assignment.

[dwm] / dwm.c

diff --git a/dwm.c b/dwm.c
index a507385..6c81540 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -235,6 +235,11 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 

+static void keyrelease(XEvent *e);
+static void combotag(const Arg *arg);
+static void comboview(const Arg *arg);
+
+

 /* variables */
 static const char broken[] = "broken";
 static char stext[256];
 /* variables */
 static const char broken[] = "broken";
 static char stext[256];


@@ -246,6 +251,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,

+       [ButtonRelease] = keyrelease,

        [ClientMessage] = clientmessage,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [ClientMessage] = clientmessage,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,


@@ -253,6 +259,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [EnterNotify] = enternotify,
        [Expose] = expose,
        [FocusIn] = focusin,
        [EnterNotify] = enternotify,
        [Expose] = expose,
        [FocusIn] = focusin,

+       [KeyRelease] = keyrelease,

        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,


@@ -276,6 +283,42 @@ static Window root, wmcheckwin;
 struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 
 /* function implementations */
 struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 
 /* function implementations */

+static int combo = 0;
+
+void
+keyrelease(XEvent *e) {
+       combo = 0;
+}
+
+void
+combotag(const Arg *arg) {
+       if(selmon->sel && arg->ui & TAGMASK) {
+               if (combo) {
+                       selmon->sel->tags |= arg->ui & TAGMASK;
+               } else {
+                       combo = 1;
+                       selmon->sel->tags = arg->ui & TAGMASK;
+               }
+               focus(NULL);
+               arrange(selmon);
+       }
+}
+
+void
+comboview(const Arg *arg) {
+       unsigned newtags = arg->ui & TAGMASK;
+       if (combo) {
+               selmon->tagset[selmon->seltags] |= newtags;
+       } else {
+               selmon->seltags ^= 1;   /*toggle tagset*/
+               combo = 1;
+               if (newtags)
+                       selmon->tagset[selmon->seltags] = newtags;
+       }
+       focus(NULL);
+       arrange(selmon);
+}
+

 void
 applyrules(Client *c)
 {
 void
 applyrules(Client *c)
 {