tchanged replacetag into toggletag - dwm - [fork] customized build of dwm, the … | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 19da197f58bc005ad379d751f28f0a17cea3d3b8 | |
parent 666fae97e67810089ffbddd019d655bc4f9f7838 | |
Author: Anselm R.Garbe <[email protected]> | |
Date: Mon, 14 Aug 2006 16:59:18 +0200 | |
changed replacetag into toggletag | |
Diffstat: | |
M config.arg.h | 12 ++++++------ | |
M config.default.h | 20 ++++++++++---------- | |
M dwm.h | 6 +++--- | |
M tag.c | 65 +++++++++++++++++------------… | |
4 files changed, 55 insertions(+), 48 deletions(-) | |
--- | |
diff --git a/config.arg.h b/config.arg.h | |
t@@ -33,17 +33,17 @@ static Key key[] = { \ | |
{ MODKEY|ControlMask, XK_1, toggleview, … | |
{ MODKEY|ControlMask, XK_2, toggleview, … | |
{ MODKEY|ControlMask, XK_3, toggleview, … | |
- { MODKEY|ShiftMask, XK_1, replacetag, … | |
- { MODKEY|ShiftMask, XK_2, replacetag, … | |
- { MODKEY|ShiftMask, XK_3, replacetag, … | |
+ { MODKEY|ShiftMask, XK_1, tag, … | |
+ { MODKEY|ShiftMask, XK_2, tag, … | |
+ { MODKEY|ShiftMask, XK_3, tag, … | |
{ MODKEY|ShiftMask, XK_c, killclient, … | |
{ MODKEY|ShiftMask, XK_q, quit, … | |
{ MODKEY|ShiftMask, XK_Return, spawn, \ | |
{ .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -cr '#eee… | |
"-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*… | |
- { MODKEY|ControlMask|ShiftMask, XK_1, appendtag,… | |
- { MODKEY|ControlMask|ShiftMask, XK_2, appendtag,… | |
- { MODKEY|ControlMask|ShiftMask, XK_3, appendtag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_1, toggletag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_2, toggletag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_3, toggletag,… | |
}; | |
#define RULES \ | |
diff --git a/config.default.h b/config.default.h | |
t@@ -34,19 +34,19 @@ static Key key[] = { \ | |
{ MODKEY|ControlMask, XK_2, toggleview, … | |
{ MODKEY|ControlMask, XK_3, toggleview, … | |
{ MODKEY|ControlMask, XK_4, toggleview, … | |
- { MODKEY|ShiftMask, XK_0, replacetag, … | |
- { MODKEY|ShiftMask, XK_1, replacetag, … | |
- { MODKEY|ShiftMask, XK_2, replacetag, … | |
- { MODKEY|ShiftMask, XK_3, replacetag, … | |
- { MODKEY|ShiftMask, XK_4, replacetag, … | |
+ { MODKEY|ShiftMask, XK_0, tag, … | |
+ { MODKEY|ShiftMask, XK_1, tag, … | |
+ { MODKEY|ShiftMask, XK_2, tag, … | |
+ { MODKEY|ShiftMask, XK_3, tag, … | |
+ { MODKEY|ShiftMask, XK_4, tag, … | |
{ MODKEY|ShiftMask, XK_c, killclient, … | |
{ MODKEY|ShiftMask, XK_q, quit, … | |
{ MODKEY|ShiftMask, XK_Return, spawn, … | |
- { MODKEY|ControlMask|ShiftMask, XK_0, appendtag,… | |
- { MODKEY|ControlMask|ShiftMask, XK_1, appendtag,… | |
- { MODKEY|ControlMask|ShiftMask, XK_2, appendtag,… | |
- { MODKEY|ControlMask|ShiftMask, XK_3, appendtag,… | |
- { MODKEY|ControlMask|ShiftMask, XK_4, appendtag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_0, toggletag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_1, toggletag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_2, toggletag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_3, toggletag,… | |
+ { MODKEY|ControlMask|ShiftMask, XK_4, toggletag,… | |
}; | |
#define RULES \ | |
diff --git a/dwm.h b/dwm.h | |
t@@ -116,19 +116,19 @@ extern void sendevent(Window w, Atom a, long value); | |
extern int xerror(Display *dsply, XErrorEvent *ee); | |
/* tag.c */ | |
-extern void appendtag(Arg *arg); | |
extern void dofloat(Arg *arg); | |
extern void dotile(Arg *arg); | |
extern void initrregs(); | |
extern Bool isvisible(Client *c); | |
extern Client *getnext(Client *c); | |
extern Client *getprev(Client *c); | |
-extern void replacetag(Arg *arg); | |
extern void restack(); | |
extern void settags(Client *c); | |
+extern void tag(Arg *arg); | |
extern void togglemode(Arg *arg); | |
-extern void view(Arg *arg); | |
+extern void toggletag(Arg *arg); | |
extern void toggleview(Arg *arg); | |
+extern void view(Arg *arg); | |
/* util.c */ | |
extern void *emallocz(unsigned int size); | |
diff --git a/tag.c b/tag.c | |
t@@ -35,16 +35,6 @@ void (*arrange)(Arg *) = DEFMODE; | |
/* extern */ | |
void | |
-appendtag(Arg *arg) | |
-{ | |
- if(!sel) | |
- return; | |
- | |
- sel->tags[arg->i] = True; | |
- settitle(sel); | |
-} | |
- | |
-void | |
dofloat(Arg *arg) | |
{ | |
Client *c; | |
t@@ -183,19 +173,6 @@ isvisible(Client *c) | |
} | |
void | |
-replacetag(Arg *arg) | |
-{ | |
- int i; | |
- | |
- if(!sel) | |
- return; | |
- | |
- for(i = 0; i < ntags; i++) | |
- sel->tags[i] = False; | |
- appendtag(arg); | |
-} | |
- | |
-void | |
restack() | |
{ | |
static unsigned int nwins = 0; | |
t@@ -281,6 +258,20 @@ settags(Client *c) | |
} | |
void | |
+tag(Arg *arg) | |
+{ | |
+ unsigned int i; | |
+ | |
+ if(!sel) | |
+ return; | |
+ | |
+ for(i = 0; i < ntags; i++) | |
+ sel->tags[i] = False; | |
+ sel->tags[arg->i] = True; | |
+ settitle(sel); | |
+} | |
+ | |
+void | |
togglemode(Arg *arg) | |
{ | |
arrange = arrange == dofloat ? dotile : dofloat; | |
t@@ -288,24 +279,40 @@ togglemode(Arg *arg) | |
} | |
void | |
-view(Arg *arg) | |
+toggletag(Arg *arg) | |
{ | |
unsigned int i; | |
- for(i = 0; i < ntags; i++) | |
- seltag[i] = False; | |
- seltag[arg->i] = True; | |
- arrange(NULL); | |
+ if(!sel) | |
+ return; | |
+ | |
+ sel->tags[arg->i] = !sel->tags[arg->i]; | |
+ for(i = 0; i < ntags && !sel->tags[i]; i++); | |
+ if(i == ntags) | |
+ sel->tags[arg->i] = True; | |
+ settitle(sel); | |
} | |
+ | |
void | |
toggleview(Arg *arg) | |
{ | |
unsigned int i; | |
seltag[arg->i] = !seltag[arg->i]; | |
- for(i = 0; !seltag[i] && i < ntags; i++); | |
+ for(i = 0; i < ntags && !seltag[i]; i++); | |
if(i == ntags) | |
seltag[arg->i] = True; /* cannot toggle last view */ | |
arrange(NULL); | |
} | |
+ | |
+void | |
+view(Arg *arg) | |
+{ | |
+ unsigned int i; | |
+ | |
+ for(i = 0; i < ntags; i++) | |
+ seltag[i] = False; | |
+ seltag[arg->i] = True; | |
+ arrange(NULL); | |
+} |