X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/11737233a7ce6bc656bc7bc061c68eeda824ee9b..0228dcd58f7948c2f5d85e995102b62c9c4a8664:/tag.c
diff --git a/tag.c b/tag.c
index 8509867..3aa0263 100644
--- a/tag.c
+++ b/tag.c
@@ -3,38 +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>
-/* static */
typedef struct {
- const char *pattern;
- char *tags[TLast];
+ const char *clpattern;
+ const char *tpattern;
Bool isfloat;
} Rule;
-/* CUSTOMIZE */
-static Rule rule[] = {
- /* class instance tags isfloat */
- { "Firefox.*", { [Twww] = "www" }, False },
- { "Gimp.*", { 0 }, True},
-};
+typedef struct {
+ regex_t *clregex;
+ regex_t *tregex;
+} RReg;
+
+/* static */
-/* extern */
+TAGS
+RULES
-/* CUSTOMIZE */
-char *tags[TLast] = {
- [Tscratch] = "scratch",
- [Tdev] = "dev",
- [Twww] = "www",
- [Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
+static RReg *rreg = NULL;
+static unsigned int len = 0;
+
+void (*arrange)(Arg *) = DEFMODE;
+
+/* extern */
void
appendtag(Arg *arg)
@@ -42,7 +40,7 @@ appendtag(Arg *arg)
if(!sel)
return;
- sel->tags[arg->i] = tags[arg->i];
+ sel->tags[arg->i] = True;
arrange(NULL);
}
@@ -51,31 +49,30 @@ dofloat(Arg *arg)
{
Client *c;
- arrange = dofloat;
for(c = clients; c; c = c->next) {
+ c->ismax = False;
if(c->tags[tsel]) {
resize(c, True, TopLeft);
}
else
ban(c);
}
- if(sel && !sel->tags[tsel]) {
- if((sel = getnext(clients, tsel))) {
- 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->isfloat)
n++;
@@ -86,6 +83,7 @@ dotile(Arg *arg)
h = sh - bh;
for(i = 0, c = clients; c; c = c->next) {
+ c->ismax = False;
if(c->tags[tsel]) {
if(c->isfloat) {
higher(c);
@@ -95,26 +93,29 @@ dotile(Arg *arg)
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 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;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2;
+ else
+ c->h = h - 2;
}
else { /* fallback if h < bh */
c->x = sx + mw;
c->y = sy + bh;
- c->w = w - 2 * c->border;
- c->h = sh - 2 * c->border - bh;
+ c->w = w - 2;
+ c->h = sh - 2 - bh;
}
resize(c, False, TopLeft);
i++;
@@ -122,50 +123,68 @@ dotile(Arg *arg)
else
ban(c);
}
- if(!sel || (sel && !sel->tags[tsel])) {
- if((sel = getnext(clients, tsel))) {
- higher(sel);
- focus(sel);
- }
+ if((sel = getnext(clients))) {
+ higher(sel);
+ focus(sel);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
drawall();
}
Client *
-getnext(Client *c, unsigned int t)
+getnext(Client *c)
{
- for(; c && !c->tags[t]; c = c->next);
+ for(; c && !c->tags[tsel]; c = c->next);
return c;
}
-void
-heretag(Arg *arg)
+Client *
+getprev(Client *c)
{
- int i;
- Client *c;
+ for(; c && !c->tags[tsel]; c = c->prev);
+ return c;
+}
- if(arg->i == tsel)
- return;
+void
+initrregs()
+{
+ unsigned int i;
+ regex_t *reg;
- if(!(c = getnext(clients, arg->i)))
+ if(rreg)
return;
-
- for(i = 0; i < TLast; i++)
- c->tags[i] = NULL;
- c->tags[tsel] = tags[tsel];
- pop(c);
- focus(c);
+ 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);
}
@@ -173,42 +192,39 @@ void
settags(Client *c)
{
char classinst[256];
- static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
unsigned int i, j;
- regex_t regex;
regmatch_t tmp;
Bool matched = False;
XClassHint ch;
- if(!len) {
- c->tags[tsel] = tags[tsel];
- return;
- }
-
if(XGetClassHint(dpy, c->win, &ch)) {
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(!regcomp(®ex, rule[i].pattern, 0)) {
- if(!regexec(®ex, classinst, 1, &tmp, 0)) {
- for(j = 0; j < TLast; j++) {
- if(rule[i].tags[j])
- matched = True;
- c->tags[j] = rule[i].tags[j];
+ 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;
}
- c->isfloat = rule[i].isfloat;
}
- regfree(®ex);
}
- }
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
@@ -218,3 +234,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);
+}