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
added a note how to achieve status info in the bar
[dwm.git]
/
tag.c
diff --git
a/tag.c
b/tag.c
index
82cf18a
..
f7ab6b9
100644
(file)
--- a/
tag.c
+++ b/
tag.c
@@
-20,22
+20,25
@@
typedef struct {
/* CUSTOMIZE */
static Rule rule[] = {
/* CUSTOMIZE */
static Rule rule[] = {
- /* class instance tags isfloat */
- { "Firefox.*", { [Twww] = "www" }, False },
- { "Gimp.*", { 0 }, True},
+ /* class:instance tags isfloat */
+ { "Firefox.*", { [Tnet] = "net" }, False },
+ { "Gimp.*", { 0 }, True},
};
};
-/* extern */
-
-/* CUSTOMIZE */
char *tags[TLast] = {
char *tags[TLast] = {
- [Tscratch] = "scratch",
+ [Tfnord] = "fnord",
[Tdev] = "dev",
[Tdev] = "dev",
- [Twww] = "www",
+ [Tnet] = "net",
[Twork] = "work",
[Twork] = "work",
+ [Tmisc] = "misc",
};
};
+
void (*arrange)(Arg *) = dotile;
void (*arrange)(Arg *) = dotile;
+/* END CUSTOMIZE */
+
+/* extern */
+
void
appendtag(Arg *arg)
{
void
appendtag(Arg *arg)
{
@@
-51,9
+54,8
@@
dofloat(Arg *arg)
{
Client *c;
{
Client *c;
- arrange = dofloat;
for(c = clients; c; c = c->next) {
for(c = clients; c; c = c->next) {
- setgeom(c);
+ c->ismax = False;
if(c->tags[tsel]) {
resize(c, True, TopLeft);
}
if(c->tags[tsel]) {
resize(c, True, TopLeft);
}
@@
-72,11
+74,10
@@
dofloat(Arg *arg)
void
dotile(Arg *arg)
{
void
dotile(Arg *arg)
{
- Client *c;
int n, i, w, h;
int n, i, w, h;
+ Client *c;
w = sw - mw;
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++;
@@
-87,7
+88,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) {
- setgeom(c);
+ c->ismax = False;
if(c->tags[tsel]) {
if(c->isfloat) {
higher(c);
if(c->tags[tsel]) {
if(c->isfloat) {
higher(c);
@@
-95,28
+96,28
@@
dotile(Arg *arg)
continue;
}
if(n == 1) {
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->x = sx;
+ c->y = sy + bh;
+ c->w = sw - 2 * c->border;
+ c->h = sh - 2 * c->border - bh;
}
else if(i == 0) {
}
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->x = sx;
+ c->y = sy + bh;
+ c->w = mw - 2 * c->border;
+ c->h = sh - 2 * c->border - bh;
}
else if(h > 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->x = sx + mw;
+ c->y = sy + (i - 1) * h + bh;
+ c->w = w - 2 * c->border;
+ c->h = h - 2 * c->border;
}
else { /* fallback if h < bh */
}
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->x = sx + mw;
+ c->y = sy + bh;
+ c->w = w - 2 * c->border;
+ c->h = sh - 2 * c->border - bh;
}
resize(c, False, TopLeft);
i++;
}
resize(c, False, TopLeft);
i++;
@@
-140,29
+141,18
@@
getnext(Client *c, unsigned int t)
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
replacetag(Arg *arg)
{
int i;
}
void
replacetag(Arg *arg)
{
int i;
+
if(!sel)
return;
if(!sel)
return;
@@
-214,6
+204,13
@@
settags(Client *c)
}
void
}
void
+togglemode(Arg *arg)
+{
+ arrange = arrange == dofloat ? dotile : dofloat;
+ arrange(NULL);
+}
+
+void
view(Arg *arg)
{
tsel = arg->i;
view(Arg *arg)
{
tsel = arg->i;