Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed ARRANGE into DEFMODE
[dwm.git]
/
tag.c
diff --git
a/tag.c
b/tag.c
index
186a5ae
..
f6c33ea
100644
(file)
--- a/
tag.c
+++ b/
tag.c
@@
-18,23
+18,12
@@
typedef struct {
Bool isfloat;
} Rule;
Bool isfloat;
} Rule;
-/* CUSTOMIZE */
-static Rule rule[] = {
- /* class:instance tags isfloat */
- { "Firefox.*", { [Twww] = "www" }, False },
- { "Gimp.*", { 0 }, True},
-};
+TAGS
+RULES
-/* extern */
+void (*arrange)(Arg *) = DEFMODE;
-/* CUSTOMIZE */
-char *tags[TLast] = {
- [Tscratch] = "scratch",
- [Tdev] = "dev",
- [Twww] = "www",
- [Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
+/* extern */
void
appendtag(Arg *arg)
void
appendtag(Arg *arg)
@@
-51,8
+40,8
@@
dofloat(Arg *arg)
{
Client *c;
{
Client *c;
- arrange = dofloat;
for(c = clients; c; c = c->next) {
for(c = clients; c; c = c->next) {
+ c->ismax = False;
if(c->tags[tsel]) {
resize(c, True, TopLeft);
}
if(c->tags[tsel]) {
resize(c, True, TopLeft);
}
@@
-60,10
+49,12
@@
dofloat(Arg *arg)
ban(c);
}
if(sel && !sel->tags[tsel]) {
ban(c);
}
if(sel && !sel->tags[tsel]) {
- if((sel = getnext(clients, tsel))) {
+ if((sel = getnext(clients))) {
higher(sel);
focus(sel);
}
higher(sel);
focus(sel);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
drawall();
}
}
drawall();
}
@@
-75,7
+66,6
@@
dotile(Arg *arg)
Client *c;
w = sw - mw;
Client *c;
w = sw - mw;
- arrange = dotile;
for(n = 0, c = clients; c; c = c->next)
if(c->tags[tsel] && !c->isfloat)
n++;
for(n = 0, c = clients; c; c = c->next)
if(c->tags[tsel] && !c->isfloat)
n++;
@@
-86,6
+76,7
@@
dotile(Arg *arg)
h = sh - bh;
for(i = 0, c = clients; c; c = c->next) {
h = sh - bh;
for(i = 0, c = clients; c; c = c->next) {
+ c->ismax = False;
if(c->tags[tsel]) {
if(c->isfloat) {
higher(c);
if(c->tags[tsel]) {
if(c->isfloat) {
higher(c);
@@
-123,38
+114,28
@@
dotile(Arg *arg)
ban(c);
}
if(!sel || (sel && !sel->tags[tsel])) {
ban(c);
}
if(!sel || (sel && !sel->tags[tsel])) {
- if((sel = getnext(clients, tsel))) {
+ if((sel = getnext(clients))) {
higher(sel);
focus(sel);
}
higher(sel);
focus(sel);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
drawall();
}
Client *
}
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;
}
return c;
}
-void
-heretag(Arg *arg)
+Client *
+getprev(Client *c)
{
{
- int i;
- Client *c;
-
- if(arg->i == tsel)
- return;
-
- if(!(c = getnext(clients, arg->i)))
- return;
-
- for(i = 0; i < TLast; i++)
- c->tags[i] = NULL;
- c->tags[tsel] = tags[tsel];
- pop(c);
- focus(c);
+ for(; c && !c->tags[tsel]; c = c->prev);
+ return c;
}
void
}
void
@@
-174,18
+155,13
@@
void
settags(Client *c)
{
char classinst[256];
settags(Client *c)
{
char classinst[256];
- static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+ static unsigned int len = sizeof(rule) / sizeof(rule[0]);
unsigned int i, j;
regex_t regex;
regmatch_t tmp;
Bool matched = False;
XClassHint ch;
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 : "",
if(XGetClassHint(dpy, c->win, &ch)) {
snprintf(classinst, sizeof(classinst), "%s:%s",
ch.res_class ? ch.res_class : "",
@@
-213,9
+189,30
@@
settags(Client *c)
}
void
}
void
+togglemode(Arg *arg)
+{
+ arrange = arrange == dofloat ? dotile : dofloat;
+ arrange(NULL);
+}
+
+void
view(Arg *arg)
{
tsel = arg->i;
arrange(NULL);
drawall();
}
view(Arg *arg)
{
tsel = arg->i;
arrange(NULL);
drawall();
}
+
+void
+viewnext(Arg *arg)
+{
+ arg->i = (tsel < TLast-1) ? tsel+1 : 0;
+ view(arg);
+}
+
+void
+viewprev(Arg *arg)
+{
+ arg->i = (tsel > 0) ? tsel-1 : TLast-1;
+ view(arg);
+}