X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/adaa28a6e600f636f5e86244ccef69e98419ba1a..c225e1afc23e6862f9864bad3b7b11399dda36a1:/tag.c
diff --git a/tag.c b/tag.c
index 8951dd8..72d87d3 100644
--- a/tag.c
+++ b/tag.c
@@ -3,29 +3,36 @@
* See LICENSE file for license details.
*/
#include "dwm.h"
-
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <X11/Xutil.h>
-/********** CUSTOMIZE **********/
-char *tags[TLast] = {
- [Tscratch] = "scratch",
- [Tdev] = "dev",
- [Twww] = "www",
- [Twork] = "work",
-};
+typedef struct {
+ const char *clpattern;
+ const char *tpattern;
+ Bool isfloat;
+} Rule;
+
+typedef struct {
+ regex_t *clregex;
+ regex_t *tregex;
+} RReg;
-static Rule rule[] = {
- /* class instance tags dofloat */
- { "Firefox-bin", "Gecko", { [Twww] = "www" }, False },
-};
+/* static */
-/********** CUSTOMIZE **********/
+TAGS
+RULES
-/* extern functions */
+static RReg *rreg = NULL;
+static unsigned int len = 0;
-void (*arrange)(Arg *) = dotile;
+void (*arrange)(Arg *) = DEFMODE;
+
+/* extern */
void
appendtag(Arg *arg)
@@ -33,7 +40,7 @@ appendtag(Arg *arg)
if(!sel)
return;
- sel->tags[arg->i] = tags[arg->i];
+ sel->tags[arg->i] = True;
arrange(NULL);
}
@@ -42,32 +49,32 @@ dofloat(Arg *arg)
{
Client *c;
- arrange = dofloat;
for(c = clients; c; c = c->next) {
- if(c->tags[tsel])
- resize(c, True);
+ c->ismax = False;
+ if(c->tags[tsel]) {
+ resize(c, True, TopLeft);
+ }
else
ban(c);
}
- if(sel && !sel->tags[tsel]) {
- if((sel = getnext(clients))) {
- higher(sel);
- focus(sel);
- }
+ if((sel = getnext(clients))) {
+ higher(sel);
+ focus(sel);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
drawall();
}
void
dotile(Arg *arg)
{
- Client *c;
int n, i, w, h;
+ Client *c;
w = sw - mw;
- arrange = dotile;
for(n = 0, c = clients; c; c = c->next)
- if(c->tags[tsel] && !c->dofloat)
+ if(c->tags[tsel] && !c->isfloat)
n++;
if(n > 1)
@@ -76,42 +83,49 @@ dotile(Arg *arg)
h = sh - bh;
for(i = 0, c = clients; c; c = c->next) {
+ c->ismax = False;
if(c->tags[tsel]) {
- if(c->dofloat) {
+ if(c->isfloat) {
higher(c);
- resize(c, True);
+ resize(c, True, TopLeft);
continue;
}
if(n == 1) {
c->x = sx;
c->y = sy + bh;
- c->w = sw - 2 * c->border;
- c->h = sh - 2 * c->border - bh;
+ c->w = sw - 2;
+ c->h = sh - 2 - bh;
}
else if(i == 0) {
c->x = sx;
c->y = sy + bh;
- c->w = mw - 2 * c->border;
- c->h = sh - 2 * c->border - bh;
+ c->w = mw - 2;
+ c->h = sh - 2 - bh;
}
- else {
+ else if(h > bh) {
c->x = sx + mw;
c->y = sy + (i - 1) * h + bh;
- c->w = w - 2 * c->border;
- c->h = h - 2 * c->border;
+ c->w = w - 2;
+ c->h = h - 2;
+ }
+ else { /* fallback if h < bh */
+ c->x = sx + mw;
+ c->y = sy + bh;
+ c->w = w - 2;
+ c->h = sh - 2 - bh;
}
- resize(c, False);
+ resize(c, False, TopLeft);
i++;
}
else
ban(c);
}
- if(!sel || (sel && !sel->tags[tsel])) {
- if((sel = getnext(clients))) {
- higher(sel);
- focus(sel);
- }
+ if((sel = getnext(clients))) {
+ higher(sel);
+ focus(sel);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
drawall();
}
@@ -122,52 +136,92 @@ getnext(Client *c)
return c;
}
+Client *
+getprev(Client *c)
+{
+ for(; c && !c->tags[tsel]; c = c->prev);
+ return c;
+}
+
+void
+initrregs()
+{
+ unsigned int i;
+ regex_t *reg;
+
+ if(rreg)
+ return;
+ len = sizeof(rule) / sizeof(rule[0]);
+ rreg = emallocz(len * sizeof(RReg));
+
+ for(i = 0; i < len; i++) {
+ if(rule[i].clpattern) {
+ reg = emallocz(sizeof(regex_t));
+ if(regcomp(reg, rule[i].clpattern, 0))
+ free(reg);
+ else
+ rreg[i].clregex = reg;
+ }
+ if(rule[i].tpattern) {
+ reg = emallocz(sizeof(regex_t));
+ if(regcomp(reg, rule[i].tpattern, 0))
+ free(reg);
+ else
+ rreg[i].tregex = reg;
+ }
+ }
+}
+
void
replacetag(Arg *arg)
{
int i;
+
if(!sel)
return;
- for(i = 0; i < TLast; i++)
- sel->tags[i] = NULL;
+ for(i = 0; i < ntags; i++)
+ sel->tags[i] = False;
appendtag(arg);
}
void
settags(Client *c)
{
- XClassHint ch;
- static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+ char classinst[256];
unsigned int i, j;
+ regmatch_t tmp;
Bool matched = False;
-
- if(!len) {
- c->tags[tsel] = tags[tsel];
- return;
- }
+ XClassHint ch;
if(XGetClassHint(dpy, c->win, &ch)) {
- if(ch.res_class && ch.res_name) {
- for(i = 0; i < len; i++)
- if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
- && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
- {
- for(j = 0; j < TLast; j++)
- c->tags[j] = rule[i].tags[j];
- c->dofloat = rule[i].dofloat;
- matched = True;
- break;
+ snprintf(classinst, sizeof(classinst), "%s:%s",
+ ch.res_class ? ch.res_class : "",
+ ch.res_name ? ch.res_name : "");
+ for(i = 0; !matched && i < len; i++)
+ if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
+ c->isfloat = rule[i].isfloat;
+ for(j = 0; rreg[i].tregex && j < ntags; j++) {
+ if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) {
+ matched = True;
+ c->tags[j] = True;
+ }
}
- }
+ }
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
}
-
if(!matched)
- c->tags[tsel] = tags[tsel];
+ c->tags[tsel] = True;
+}
+
+void
+togglemode(Arg *arg)
+{
+ arrange = arrange == dofloat ? dotile : dofloat;
+ arrange(NULL);
}
void
@@ -177,3 +231,17 @@ view(Arg *arg)
arrange(NULL);
drawall();
}
+
+void
+viewnext(Arg *arg)
+{
+ arg->i = (tsel < ntags-1) ? tsel+1 : 0;
+ view(arg);
+}
+
+void
+viewprev(Arg *arg)
+{
+ arg->i = (tsel > 0) ? tsel-1 : ntags-1;
+ view(arg);
+}