about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.arg.h12
-rw-r--r--config.default.h20
-rw-r--r--dwm.h6
-rw-r--r--tag.c65
4 files changed, 55 insertions, 48 deletions
diff --git a/config.arg.h b/config.arg.h
index 17215fb..a2257cf 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -33,17 +33,17 @@ static Key key[] = { \
 	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
-	{ MODKEY|ShiftMask,		XK_1,		replacetag,	{ .i = 0 } }, \
-	{ MODKEY|ShiftMask,		XK_2,		replacetag,	{ .i = 1 } }, \
-	{ MODKEY|ShiftMask,		XK_3,		replacetag,	{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
 		{ .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb " \
 			"-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		appendtag,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		appendtag,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		appendtag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
 };
 
 #define RULES \
diff --git a/config.default.h b/config.default.h
index 6a6fb4d..a8a2c0e 100644
--- a/config.default.h
+++ b/config.default.h
@@ -34,19 +34,19 @@ static Key key[] = { \
 	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 2 } }, \
 	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 3 } }, \
 	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 4 } }, \
-	{ MODKEY|ShiftMask,		XK_0,		replacetag,	{ .i = 0 } }, \
-	{ MODKEY|ShiftMask,		XK_1,		replacetag,	{ .i = 1 } }, \
-	{ MODKEY|ShiftMask,		XK_2,		replacetag,	{ .i = 2 } }, \
-	{ MODKEY|ShiftMask,		XK_3,		replacetag,	{ .i = 3 } }, \
-	{ MODKEY|ShiftMask,		XK_4,		replacetag,	{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		{ .i = 0 } }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 1 } }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 3 } }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 4 } }, \
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_0,		appendtag,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		appendtag,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		appendtag,	{ .i = 2 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		appendtag,	{ .i = 3 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_4,		appendtag,	{ .i = 4 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_0,		toggletag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 4 } }, \
 };
 
 #define RULES \
diff --git a/dwm.h b/dwm.h
index c13179f..10eaf30 100644
--- a/dwm.h
+++ b/dwm.h
@@ -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
index edf68c6..51407e3 100644
--- a/tag.c
+++ b/tag.c
@@ -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;
@@ -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;
@@ -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;
@@ -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);
+}
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-08-03 14:27:37 +0000
pan class="p">(dpy, dc.gc, dc.border); points[0].x = dc.x; points[0].y = dc.y; points[1].x = dc.w - 1; points[1].y = 0; points[2].x = 0; points[2].y = dc.h - 1; points[3].x = -(dc.w - 1); points[3].y = 0; points[4].x = 0; points[4].y = -(dc.h - 1); XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); } static unsigned int textnw(char *text, unsigned int len) { XRectangle r; if(dc.font.set) { XmbTextExtents(dc.font.set, text, len, NULL, &r); return r.width; } return XTextWidth(dc.font.xfont, text, len); } static void drawtext(const char *text, Bool invert, Bool border) { int x, y, w, h; unsigned int len; static char buf[256]; XGCValues gcv; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); w = 0; if(border) drawborder(); if(!text) return; len = strlen(text); if(len >= sizeof(buf)) len = sizeof(buf) - 1; memcpy(buf, text, len); buf[len] = 0; h = dc.font.ascent + dc.font.descent; y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; x = dc.x + (h / 2); /* shorten text if necessary */ while(len && (w = textnw(buf, len)) > dc.w - h) buf[--len] = 0; if(w > dc.w) return; /* too long */ gcv.foreground = invert ? dc.bg : dc.fg; gcv.background = invert ? dc.fg : dc.bg; if(dc.font.set) { XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); } else { gcv.font = dc.font.xfont->fid; XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); } } /* extern functions */ void drawall() { Client *c; for(c = clients; c; c = getnext(c->next)) drawtitle(c); drawstatus(); } void drawstatus() { int i; Bool istile = arrange == dotile; dc.x = dc.y = 0; dc.w = bw; drawtext(NULL, !istile, False); dc.w = 0; for(i = 0; i < TLast; i++) { dc.x += dc.w; dc.w = textw(tags[i]); if(istile) drawtext(tags[i], (i == tsel), True); else drawtext(tags[i], (i != tsel), True); } if(sel) { dc.x += dc.w; dc.w = textw(sel->name); drawtext(sel->name, istile, True); } dc.w = textw(stext); dc.x = bx + bw - dc.w; drawtext(stext, !istile, False); XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); XSync(dpy, False); } void drawtitle(Client *c) { int i; Bool istile = arrange == dotile; if(c == sel) { drawstatus(); XUnmapWindow(dpy, c->title); XSetWindowBorder(dpy, c->win, dc.fg); return; } XSetWindowBorder(dpy, c->win, dc.bg); XMapWindow(dpy, c->title); dc.x = dc.y = 0; dc.w = 0; for(i = 0; i < TLast; i++) { if(c->tags[i]) { dc.x += dc.w; dc.w = textw(c->tags[i]); drawtext(c->tags[i], !istile, True); } } dc.x += dc.w; dc.w = textw(c->name); drawtext(c->name, !istile, True); XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0); XSync(dpy, False); } unsigned long getcolor(const char *colstr) { XColor color; Colormap cmap = DefaultColormap(dpy, screen); XAllocNamedColor(dpy, cmap, colstr, &color, &color); return color.pixel; } void setfont(const char *fontstr) { char **missing, *def; int i, n; missing = NULL; setlocale(LC_ALL, ""); if(dc.font.set) XFreeFontSet(dpy, dc.font.set); dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); if(missing) { while(n--) fprintf(stderr, "missing fontset: %s\n", missing[n]); XFreeStringList(missing); if(dc.font.set) { XFreeFontSet(dpy, dc.font.set); dc.font.set = NULL; } } if(dc.font.set) { XFontSetExtents *font_extents; XFontStruct **xfonts; char **font_names; dc.font.ascent = dc.font.descent = 0; font_extents = XExtentsOfFontSet(dc.font.set); n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { if(dc.font.ascent < (*xfonts)->ascent) dc.font.ascent = (*xfonts)->ascent; if(dc.font.descent < (*xfonts)->descent) dc.font.descent = (*xfonts)->descent; xfonts++; } } else { if(dc.font.xfont) XFreeFont(dpy, dc.font.xfont); dc.font.xfont = NULL; dc.font.xfont = XLoadQueryFont(dpy, fontstr); if (!dc.font.xfont) dc.font.xfont = XLoadQueryFont(dpy, "fixed"); if (!dc.font.xfont) eprint("error, cannot init 'fixed' font\n"); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; } dc.font.height = dc.font.ascent + dc.font.descent; } unsigned int textw(char *text) { return textnw(text, strlen(text)) + dc.font.height; }