changeset: 364:c054dd495621
tag: tip
user: mark_AT_angus
date: Tue Nov 03 19:14:51 2009 +0100
files: dwm.suckless.org/patches/dwm-1504-fancycoloredbarclickable.diff dwm.suckless.org/patches/fancycoloredbarclickable.md
description:
a combined bar patch
diff -r 28c5bbbf49ea -r c054dd495621 dwm.suckless.org/patches/dwm-1504-fancycoloredbarclickable.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/dwm-1504-fancycoloredbarclickable.diff Tue Nov 03 19:14:51 2009 +0100
_AT_@ -0,0 +1,382 @@
+diff -r 25cb0e9856e6 config.def.h
+--- a/config.def.h Sat Oct 31 11:45:56 2009 +0000
++++ b/config.def.h Tue Nov 03 14:55:42 2009 +0100
+_AT_@ -8,6 +8,19 @@
+ static const char selbordercolor[] = "#0066ff";
+ static const char selbgcolor[] = "#0066ff";
+ static const char selfgcolor[] = "#ffffff";
++static const char* colors[NumColors][ColLast] = {
++ // border foreground background
++ { normbordercolor, normfgcolor, normbgcolor }, // normal
++ { selbordercolor, selfgcolor, selbgcolor }, // selected
++
++ { normbordercolor, selbgcolor, selfgcolor }, // warning
++ { normbordercolor, "#ffffff", "#ff0000" }, // error
++ { normbordercolor, "#7598b2", normbgcolor }, // delim
++
++ { normbordercolor, "#b10000", normbgcolor }, // hot
++ { normbordercolor, "#b15c00", normbgcolor }, // medium
++ { normbordercolor, "#6cb100", normbgcolor }, // cool
++};
+ static const unsigned int borderpx = 1; /* border pixel of windows */
+ static const unsigned int snap = 32; /* snap pixel */
+ static const Bool showbar = True; /* False means no bar */
+_AT_@ -89,6 +102,7 @@
+ /* click event mask button function argument */
+ { ClkLtSymbol, 0, Button1, setlayout, {0} },
+ { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
++ { ClkWinTitle, 0, Button1, focusonclick, {0} },
+ { ClkWinTitle, 0, Button2, zoom, {0} },
+ { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
+ { ClkClientWin, MODKEY, Button1, movemouse, {0} },
+diff -r 25cb0e9856e6 dwm.c
+--- a/dwm.c Sat Oct 31 11:45:56 2009 +0000
++++ b/dwm.c Tue Nov 03 14:55:42 2009 +0100
+_AT_@ -53,6 +53,7 @@
+ #define HEIGHT(X) ((X)->h + 2 * (X)->bw)
+ #define TAGMASK ((1 << LENGTH(tags)) - 1)
+ #define TEXTW(X) (textnw(X, strlen(X)) + dc.font.height)
++#define drawtext(text, col, invert) drawtext2(text, col, invert, True)
+
+ /* enums */
+ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+_AT_@ -138,6 +139,8 @@
+ Monitor *next;
+ Window barwin;
+ const Layout *lt[2];
++ int titlebarbegin;
++ int titlebarend;
+ };
+
+ typedef struct {
+_AT_@ -149,6 +152,8 @@
+ int monitor;
+ } Rule;
+
++enum { ColNorm, ColSel, ColUrg, ColErr, ColDelim, ColHot, ColMed, ColCool, NumColors };
++
+ /* function declarations */
+ static void applyrules(Client *c);
+ static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
+_AT_@ -173,10 +178,13 @@
+ static void drawbar(Monitor *m);
+ static void drawbars(void);
+ static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+-static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
++static void drawtext2(const char *text, unsigned long col[ColLast], Bool invert, Bool pad);
++static void drawvline(unsigned long col[ColLast]);
++static void drawcoloredtext(Monitor *m, char *text);
+ static void enternotify(XEvent *e);
+ static void expose(XEvent *e);
+ static void focus(Client *c);
++static void focusonclick(const Arg *arg);
+ static void focusin(XEvent *e);
+ static void focusmon(const Arg *arg);
+ static void focusstack(const Arg *arg);
+_AT_@ -269,6 +277,7 @@
+ static DC dc;
+ static Monitor *mons = NULL, *selmon = NULL;
+ static Window root;
++unsigned long barcolors[NumColors][ColLast];
+
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+_AT_@ -438,10 +447,12 @@
+ }
+ else if(ev->x < x + blw)
+ click = ClkLtSymbol;
+- else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))
++ else if(ev->x > selmon->titlebarend)
+ click = ClkStatusText;
+- else
++ else {
++ arg.ui = ev->x;
+ click = ClkWinTitle;
++ }
+ }
+ else if((c = wintoclient(ev->window))) {
+ focus(c);
+_AT_@ -450,7 +461,7 @@
+ for(i = 0; i < LENGTH(buttons); i++)
+ if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+- buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
++ buttons[i].func((click == ClkTagBar || click == ClkWinTitle) && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+ }
+
+ void
+_AT_@ -678,23 +689,28 @@
+
+ void
+ drawbar(Monitor *m) {
+- int x;
+- unsigned int i, occ = 0, urg = 0;
++ int x, a= 0, s= 0, ow, mw = 0, extra, tw;
++ char posbuf[10];
++ unsigned int i, n = 0, occ = 0, urg = 0;
+ unsigned long *col;
+- Client *c;
++ Client *c, *firstvis, *lastvis = NULL;
++ DC seldc;
+
+ for(c = m->clients; c; c = c->next) {
++ if(ISVISIBLE(c))
++ n++;
+ occ |= c->tags;
+ if(c->isurgent)
+ urg |= c->tags;
+ }
++
+ dc.x = 0;
+ for(i = 0; i < LENGTH(tags); i++) {
+ dc.w = TEXTW(tags[i]);
+ col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
+ drawtext(tags[i], col, urg & 1 << i);
+ drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+- occ & 1 << i, urg & 1 << i, col);
++ occ & 1 << i, urg & 1 << i, col);
+ dc.x += dc.w;
+ }
+ dc.w = blw = TEXTW(m->ltsymbol);
+_AT_@ -702,26 +718,95 @@
+ dc.x += dc.w;
+ x = dc.x;
+ if(m == selmon) { /* status is only drawn on selected monitor */
+- dc.w = TEXTW(stext);
++ if(m->lt[m->sellt]->arrange == monocle){
++ dc.x= x;
++ for(c= nexttiled(m->clients), a= 0, s= 0; c; c= nexttiled(c->next), a++)
++ if(c == m->stack)
++ s = a;
++ if(!s && a)
++ s = a;
++ snprintf(posbuf, LENGTH(posbuf), "[%d/%d]", s, a);
++ dc.w= TEXTW(posbuf);
++ drawtext(posbuf, dc.norm, False);
++ x= dc.x + dc.w;
++ }
++
++ dc.w=0;
++ char *buf = stext, *ptr = buf;
++ while( *ptr ) {
++ for( i = 0; *ptr < 0 || *ptr > NumColors; i++, ptr++);
++ dc.w += textnw(buf,i);
++ buf=++ptr;
++ }
++ dc.w+=dc.font.height;
+ dc.x = m->ww - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = m->ww - x;
+ }
+- drawtext(stext, dc.norm, False);
++ m->titlebarend=dc.x;
++ drawcoloredtext(m, stext);
+ }
+- else
++ else {
+ dc.x = m->ww;
+- if((dc.w = dc.x - x) > bh) {
+- dc.x = x;
+- if(m->sel) {
+- col = m == selmon ? dc.sel : dc.norm;
+- drawtext(m->sel->name, col, False);
+- drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);
++ m->titlebarbegin=dc.x;
++ }
++
++ for(c = m->clients; c && !ISVISIBLE(c); c = c->next);
++ firstvis = c;
++
++ col = m == selmon ? dc.sel : dc.norm;
++ dc.w = dc.x - x;
++ dc.x = x;
++
++ if(n > 0) {
++ mw = dc.w / n;
++ extra = 0;
++ seldc = dc;
++ i = 0;
++
++ while(c) {
++ lastvis = c;
++ tw = TEXTW(c->name);
++ if(tw < mw) extra += (mw - tw); else i++;
++ for(c = c->next; c && !ISVISIBLE(c); c = c->next);
++ }
++
++ if(i > 0) mw += extra / i;
++
++ c = firstvis;
++ x = dc.x;
++ }
++ m->titlebarbegin=dc.x;
++ while(dc.w > bh) {
++ if(c) {
++ ow = dc.w;
++ tw = TEXTW(c->name);
++ dc.w = MIN(ow, tw);
++
++ if(dc.w > mw) dc.w = mw;
++ if(m->sel == c) seldc = dc;
++ if(c == lastvis) dc.w = ow;
++
++ drawtext(c->name, col, False);
++ if(c != firstvis) drawvline(col);
++ drawsquare(c->isfixed, c->isfloating, False, col);
++
++ dc.x += dc.w;
++ dc.w = ow - dc.w;
++ for(c = c->next; c && !ISVISIBLE(c); c = c->next);
++ } else {
++ drawtext(NULL, dc.norm, False);
++ break;
+ }
+- else
+- drawtext(NULL, dc.norm, False);
+ }
++
++ if(m == selmon && m->sel && ISVISIBLE(m->sel)) {
++ dc = seldc;
++ drawtext(m->sel->name, col, True);
++ drawsquare(m->sel->isfixed, m->sel->isfloating, True, col);
++ }
++
+ XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
+ XSync(dpy, False);
+ }
+_AT_@ -756,7 +841,7 @@
+ }
+
+ void
+-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
++drawtext2(const char *text, unsigned long col[ColLast], Bool invert, Bool pad) {
+ char buf[256];
+ int i, x, y, h, len, olen;
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+_AT_@ -768,7 +853,7 @@
+ olen = strlen(text);
+ h = dc.font.ascent + dc.font.descent;
+ y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+- x = dc.x + (h / 2);
++ x = dc.x + ((pad ? (dc.font.ascent + dc.font.descent) : 0) / 2);
+ /* shorten text if necessary */
+ for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+ if(!len)
+_AT_@ -784,6 +869,45 @@
+ }
+
+ void
++drawvline(unsigned long col[ColLast]) {
++ XGCValues gcv;
++
++ gcv.foreground = col[ColFG];
++ XChangeGC(dpy, dc.gc, GCForeground, &gcv);
++ XDrawLine(dpy, dc.drawable, dc.gc, dc.x, dc.y, dc.x, dc.y + (dc.font.ascent + dc.font.descent + 2));
++}
++
++void
++drawcoloredtext(Monitor *m, char *text) {
++ Bool first=True;
++ char *buf = text, *ptr = buf, c = 1;
++ unsigned long *col = barcolors[0];
++ int i, ox = dc.x;
++
++ while( *ptr ) {
++ for( i = 0; *ptr < 0 || *ptr > NumColors; i++, ptr++);
++ if( !*ptr ) break;
++ c=*ptr;
++ *ptr=0;
++ if( i ) {
++ dc.w = m->ww - dc.x;
++ drawtext2(buf, col, False, first);
++ dc.x += textnw(buf, i);// + textnw(&c,1);
++ if( first ) dc.x += ( dc.font.ascent + dc.font.descent ) / 2;
++ first = False;
++ } else if( first ) {
++ ox = dc.x += textnw(&c,1);
++ }
++ *ptr = c;
++ col = barcolors[ c-1 ];
++ buf = ++ptr;
++ }
++ //if( !first ) dc.x-=(dc.font.ascent+dc.font.descent)/2;
++ drawtext2(buf, col, False, False);
++ dc.x = ox;
++}
++
++void
+ enternotify(XEvent *e) {
+ Client *c;
+ Monitor *m;
+_AT_@ -834,6 +958,50 @@
+ }
+
+ void
++focusonclick(const Arg *arg) {
++ int x, w, mw = 0, tw, n = 0, i = 0, extra = 0;
++ Monitor *m = selmon;
++ Client *c, *firstvis;
++
++ for(c = m->clients; c && !ISVISIBLE(c); c = c->next);
++ firstvis = c;
++
++ for(c = m->clients; c; c = c->next)
++ if (ISVISIBLE(c))
++ n++;
++
++ if(n > 0) {
++ mw = (m->titlebarend - m->titlebarbegin) / n;
++ c = firstvis;
++ while(c) {
++ tw = TEXTW(c->name);
++ if(tw < mw) extra += (mw - tw); else i++;
++ for(c = c->next; c && !ISVISIBLE(c); c = c->next);
++ }
++ if(i > 0) mw += extra / i;
++ }
++
++ x=m->titlebarbegin;
++
++ c = firstvis;
++ while(x < m->titlebarend) {
++ if(c) {
++ w=MIN(TEXTW(c->name), mw);
++ if (x < arg->i && x+w > arg->i) {
++ focus(c);
++ restack(selmon);
++ break;
++ } else
++ x+=w;
++
++ for(c = c->next; c && !ISVISIBLE(c); c = c->next);
++ } else {
++ break;
++ }
++ }
++}
++
++void
+ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+ XFocusChangeEvent *ev = &e->xfocus;
+
+_AT_@ -1475,6 +1643,7 @@
+ void
+ setup(void) {
+ XSetWindowAttributes wa;
++ int i;
+
+ /* clean up any zombies immediately */
+ sigchld(0);
+_AT_@ -1498,6 +1667,11 @@
+ cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
+ cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
+ /* init appearance */
++ for(i=0; i<NumColors; i++) {
++ barcolors[i][ColBorder] = getcolor( colors[i][ColBorder] );
++ barcolors[i][ColFG] = getcolor( colors[i][ColFG] );
++ barcolors[i][ColBG] = getcolor( colors[i][ColBG] );
++ }
+ dc.norm[ColBorder] = getcolor(normbordercolor);
+ dc.norm[ColBG] = getcolor(normbgcolor);
+ dc.norm[ColFG] = getcolor(normfgcolor);
diff -r 28c5bbbf49ea -r c054dd495621 dwm.suckless.org/patches/fancycoloredbarclickable.md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwm.suckless.org/patches/fancycoloredbarclickable.md Tue Nov 03 19:14:51 2009 +0100
_AT_@ -0,0 +1,26 @@
+# fancycoloredbarclickable
+
+## Description
+
+This patch provides colors in the status area, shows the titles of all
+visible Clients and provides a function to select a client by clicking
+on its title.
+Actually this patch combines the fancybar Patch and the statuscolors Patch
+with the additional selectby-click-on-title function.
+The fancybar patch used is rather new and unchanged, while the statuscolor
+patch is older and modified. The original statuscolor patch made gaps after
+changing the color and used its own color definition everywhere. This
+modified version made no gaps and the default color definition is used
+everywhere but in the status area.
+
+## Download
+
+ * [dwm-1504-fancycoloredbarclickable.diff](dwm-1504-fancycoloredbarclickable.diff) (dwm 5.7.2) (20091103)
+
+## Glueer (for is is a patch of patches, im not really the author, but one who glued things together ;)
+
+ * Stefan Mark - <0mark_AT_unserver.de>
+
+## Extensible status script with color support:
+
+ * [
http://0mark.unserver.de/dwmd](
http://0mark.unserver.de/dwmd) dwmd
Received on Tue Nov 03 2009 - 19:14:55 CET