patch for dwm
This commit is contained in:
Frank Villaro-Dixon
parent
8d0b8735ce
commit
9511771b26
3 changed files with 385 additions and 0 deletions
1
bashrc
1
bashrc
|
|
@ -83,6 +83,7 @@ alias b-='xbacklight -dec 10% -steps 1 -time 0'
|
||||||
alias svim='sudo vim'
|
alias svim='sudo vim'
|
||||||
alias bim='vim'
|
alias bim='vim'
|
||||||
alias vi='vim'
|
alias vi='vim'
|
||||||
|
alias VIM='vim'
|
||||||
|
|
||||||
alias gl='git log --graph --abbrev-commit --pretty=oneline --decorate'
|
alias gl='git log --graph --abbrev-commit --pretty=oneline --decorate'
|
||||||
alias gitst='git status'
|
alias gitst='git status'
|
||||||
|
|
|
||||||
109
dwm/config.def.h.orig
Normal file
109
dwm/config.def.h.orig
Normal file
|
|
@ -0,0 +1,109 @@
|
||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/* appearance */
|
||||||
|
static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
|
||||||
|
static const char normbordercolor[] = "#444444";
|
||||||
|
static const char normbgcolor[] = "#222222";
|
||||||
|
static const char normfgcolor[] = "#bbbbbb";
|
||||||
|
static const char selbordercolor[] = "#005577";
|
||||||
|
static const char selbgcolor[] = "#005577";
|
||||||
|
static const char selfgcolor[] = "#eeeeee";
|
||||||
|
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 */
|
||||||
|
static const Bool topbar = True; /* False means bottom bar */
|
||||||
|
|
||||||
|
/* tagging */
|
||||||
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||||
|
|
||||||
|
static const Rule rules[] = {
|
||||||
|
/* xprop(1):
|
||||||
|
* WM_CLASS(STRING) = instance, class
|
||||||
|
* WM_NAME(STRING) = title
|
||||||
|
*/
|
||||||
|
/* class instance title tags mask isfloating monitor */
|
||||||
|
{ "Gimp", NULL, NULL, 0, True, -1 },
|
||||||
|
{ "Firefox", NULL, NULL, 1 << 8, False, -1 },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* layout(s) */
|
||||||
|
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||||
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
|
static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
|
||||||
|
|
||||||
|
static const Layout layouts[] = {
|
||||||
|
/* symbol arrange function */
|
||||||
|
{ "[]=", tile }, /* first entry is default */
|
||||||
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
|
{ "[M]", monocle },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* key definitions */
|
||||||
|
#define MODKEY Mod1Mask
|
||||||
|
#define TAGKEYS(KEY,TAG) \
|
||||||
|
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||||
|
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||||
|
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||||
|
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
||||||
|
|
||||||
|
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||||
|
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||||
|
|
||||||
|
/* commands */
|
||||||
|
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
|
||||||
|
static const char *termcmd[] = { "st", "-f", font, NULL };
|
||||||
|
|
||||||
|
static Key keys[] = {
|
||||||
|
/* modifier key function argument */
|
||||||
|
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
||||||
|
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||||
|
{ MODKEY, XK_b, togglebar, {0} },
|
||||||
|
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||||
|
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||||
|
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
||||||
|
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
||||||
|
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
||||||
|
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
||||||
|
{ MODKEY, XK_Return, zoom, {0} },
|
||||||
|
{ MODKEY, XK_Tab, view, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
||||||
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
||||||
|
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
||||||
|
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||||
|
TAGKEYS( XK_1, 0)
|
||||||
|
TAGKEYS( XK_2, 1)
|
||||||
|
TAGKEYS( XK_3, 2)
|
||||||
|
TAGKEYS( XK_4, 3)
|
||||||
|
TAGKEYS( XK_5, 4)
|
||||||
|
TAGKEYS( XK_6, 5)
|
||||||
|
TAGKEYS( XK_7, 6)
|
||||||
|
TAGKEYS( XK_8, 7)
|
||||||
|
TAGKEYS( XK_9, 8)
|
||||||
|
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* button definitions */
|
||||||
|
/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||||
|
static Button buttons[] = {
|
||||||
|
/* click event mask button function argument */
|
||||||
|
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||||
|
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||||
|
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||||
|
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||||
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||||
|
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||||
|
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||||
|
{ ClkTagBar, 0, Button1, view, {0} },
|
||||||
|
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||||
|
};
|
||||||
|
|
||||||
275
dwm/patch.patch
Normal file
275
dwm/patch.patch
Normal file
|
|
@ -0,0 +1,275 @@
|
||||||
|
diff --git a/config.h b/config.h
|
||||||
|
index 91cf439..6189d7e 100644
|
||||||
|
--- a/config.h
|
||||||
|
+++ b/config.h
|
||||||
|
@@ -2,12 +2,13 @@
|
||||||
|
|
||||||
|
/* appearance */
|
||||||
|
static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
|
||||||
|
-static const char normbordercolor[] = "#cccccc";
|
||||||
|
-static const char normbgcolor[] = "#cccccc";
|
||||||
|
-static const char normfgcolor[] = "#000000";
|
||||||
|
-static const char selbordercolor[] = "#0066ff";
|
||||||
|
-static const char selbgcolor[] = "#0066ff";
|
||||||
|
-static const char selfgcolor[] = "#ffffff";
|
||||||
|
+#define NUMCOLORS 3 // need at least 3
|
||||||
|
+static const char colors[NUMCOLORS][ColLast][8] = {
|
||||||
|
+ // border foreground background
|
||||||
|
+ { "#cccccc", "#888888", "#000000" }, // 0 = normal
|
||||||
|
+ { "#cc0000", "#ffff00", "#000000" }, // 1 = selected
|
||||||
|
+ { "#ff6600", "#000000", "#ff6600" }, // 2 = urgent/warning
|
||||||
|
+};
|
||||||
|
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 */
|
||||||
|
@@ -45,7 +46,7 @@ static const Layout layouts[] = {
|
||||||
|
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||||
|
|
||||||
|
/* commands */
|
||||||
|
-static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb",
|
||||||
|
normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor,
|
||||||
|
NULL };
|
||||||
|
+static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb",
|
||||||
|
colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG],
|
||||||
|
"-sf", colors[1][ColFG], NULL };
|
||||||
|
static const char *termcmd[] = { "uxterm", NULL };
|
||||||
|
|
||||||
|
static Key keys[] = {
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 670afbe..fd2f394 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -48,6 +48,7 @@
|
||||||
|
#define LENGTH(X) (sizeof X / sizeof X[0])
|
||||||
|
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
||||||
|
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
||||||
|
+#define MAXCOLORS 8 // avoid circular reference to NUMCOLORS
|
||||||
|
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
|
||||||
|
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
||||||
|
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
||||||
|
@@ -97,8 +98,7 @@ struct Client {
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int x, y, w, h;
|
||||||
|
- unsigned long norm[ColLast];
|
||||||
|
- unsigned long sel[ColLast];
|
||||||
|
+ unsigned long colors[MAXCOLORS][ColLast];
|
||||||
|
Drawable drawable;
|
||||||
|
GC gc;
|
||||||
|
struct {
|
||||||
|
@@ -175,8 +175,9 @@ static void die(const char *errstr, ...);
|
||||||
|
static Monitor *dirtomon(int dir);
|
||||||
|
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 drawcoloredtext(char *text);
|
||||||
|
+static void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
|
||||||
|
+static void drawtext(const char *text, unsigned long col[ColLast], Bool pad);
|
||||||
|
static void enternotify(XEvent *e);
|
||||||
|
static void expose(XEvent *e);
|
||||||
|
static void focus(Client *c);
|
||||||
|
@@ -696,36 +697,37 @@ drawbar(Monitor *m) {
|
||||||
|
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);
|
||||||
|
+ col = dc.colors[ (m->tagset[m->seltags] & 1 << i) ?
|
||||||
|
+ 1 : (urg & 1 << i ? 2:0) ];
|
||||||
|
+ drawtext(tags[i], col, True);
|
||||||
|
drawsquare(m == selmon && selmon->sel &&
|
||||||
|
selmon->sel->tags & 1 << i,
|
||||||
|
- occ & 1 << i, urg & 1 << i, col);
|
||||||
|
+ occ & 1 << i, col);
|
||||||
|
dc.x += dc.w;
|
||||||
|
}
|
||||||
|
dc.w = blw = TEXTW(m->ltsymbol);
|
||||||
|
- drawtext(m->ltsymbol, dc.norm, False);
|
||||||
|
+ drawtext(m->ltsymbol, dc.colors[0], False);
|
||||||
|
dc.x += dc.w;
|
||||||
|
x = dc.x;
|
||||||
|
if(m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
- dc.w = TEXTW(stext);
|
||||||
|
+ dc.w = textnw(stext, strlen(stext)); // no padding
|
||||||
|
dc.x = m->ww - dc.w;
|
||||||
|
if(dc.x < x) {
|
||||||
|
dc.x = x;
|
||||||
|
dc.w = m->ww - x;
|
||||||
|
}
|
||||||
|
- drawtext(stext, dc.norm, False);
|
||||||
|
+ drawcoloredtext(stext);
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
+ col = dc.colors[ m == selmon ? 1 : 0 ];
|
||||||
|
+ drawtext(m->sel->name, col, True);
|
||||||
|
+ drawsquare(m->sel->isfixed, m->sel->isfloating, col);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- drawtext(NULL, dc.norm, False);
|
||||||
|
+ drawtext(NULL, dc.colors[0], False);
|
||||||
|
}
|
||||||
|
XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
|
||||||
|
XSync(dpy, False);
|
||||||
|
@@ -740,12 +742,36 @@ drawbars(void) {
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
|
||||||
|
+drawcoloredtext(char *text) {
|
||||||
|
+ char *buf = text, *ptr = buf, c = 1;
|
||||||
|
+ unsigned long *col = dc.colors[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 = selmon->ww - dc.x;
|
||||||
|
+ drawtext(buf, col, False);
|
||||||
|
+ dc.x += textnw(buf, i);
|
||||||
|
+ }
|
||||||
|
+ *ptr = c;
|
||||||
|
+ col = dc.colors[ c-1 ];
|
||||||
|
+ buf = ++ptr;
|
||||||
|
+ }
|
||||||
|
+ drawtext(buf, col, False);
|
||||||
|
+ dc.x = ox;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
|
||||||
|
int x;
|
||||||
|
XGCValues gcv;
|
||||||
|
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
|
||||||
|
|
||||||
|
- gcv.foreground = col[invert ? ColBG : ColFG];
|
||||||
|
+ gcv.foreground = col[ColFG];
|
||||||
|
XChangeGC(dpy, dc.gc, GCForeground, &gcv);
|
||||||
|
x = (dc.font.ascent + dc.font.descent + 2) / 4;
|
||||||
|
r.x = dc.x + 1;
|
||||||
|
@@ -761,18 +787,18 @@ drawsquare(Bool filled, Bool empty, Bool invert,
|
||||||
|
unsigned long col[ColLast]) {
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
|
||||||
|
+drawtext(const char *text, unsigned long col[ColLast], Bool pad) {
|
||||||
|
char buf[256];
|
||||||
|
int i, x, y, h, len, olen;
|
||||||
|
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
|
||||||
|
|
||||||
|
- XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
|
||||||
|
+ XSetForeground(dpy, dc.gc, col[ColBG]);
|
||||||
|
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
|
||||||
|
if(!text)
|
||||||
|
return;
|
||||||
|
olen = strlen(text);
|
||||||
|
- h = dc.font.ascent + dc.font.descent;
|
||||||
|
- y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
|
||||||
|
+ h = pad ? (dc.font.ascent + dc.font.descent) : 0;
|
||||||
|
+ y = dc.y + ((dc.h + dc.font.ascent - dc.font.descent) / 2);
|
||||||
|
x = dc.x + (h / 2);
|
||||||
|
/* shorten text if necessary */
|
||||||
|
for(len = MIN(olen, sizeof buf); len && textnw(text, len) >
|
||||||
|
dc.w - h; len--);
|
||||||
|
@@ -781,7 +807,7 @@ drawtext(const char *text, unsigned long
|
||||||
|
col[ColLast], Bool invert) {
|
||||||
|
memcpy(buf, text, len);
|
||||||
|
if(len < olen)
|
||||||
|
for(i = len; i && i > len - 3; buf[--i] = '.');
|
||||||
|
- XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
|
||||||
|
+ XSetForeground(dpy, dc.gc, col[ColFG]);
|
||||||
|
if(dc.font.set)
|
||||||
|
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x,
|
||||||
|
y, buf, len);
|
||||||
|
else
|
||||||
|
@@ -830,7 +856,7 @@ focus(Client *c) {
|
||||||
|
detachstack(c);
|
||||||
|
attachstack(c);
|
||||||
|
grabbuttons(c, True);
|
||||||
|
- XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
|
||||||
|
+ XSetWindowBorder(dpy, c->win, dc.colors[1][ColBorder]);
|
||||||
|
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -1139,7 +1165,7 @@ manage(Window w, XWindowAttributes *wa) {
|
||||||
|
}
|
||||||
|
wc.border_width = c->bw;
|
||||||
|
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
|
||||||
|
- XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
|
||||||
|
+ XSetWindowBorder(dpy, w, dc.colors[0][ColBorder]);
|
||||||
|
configure(c); /* propagates border_width, if size doesn't change */
|
||||||
|
updatesizehints(c);
|
||||||
|
XSelectInput(dpy, w,
|
||||||
|
EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
|
||||||
|
@@ -1544,12 +1570,11 @@ setup(void) {
|
||||||
|
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
|
||||||
|
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
|
||||||
|
/* init appearance */
|
||||||
|
- dc.norm[ColBorder] = getcolor(normbordercolor);
|
||||||
|
- dc.norm[ColBG] = getcolor(normbgcolor);
|
||||||
|
- dc.norm[ColFG] = getcolor(normfgcolor);
|
||||||
|
- dc.sel[ColBorder] = getcolor(selbordercolor);
|
||||||
|
- dc.sel[ColBG] = getcolor(selbgcolor);
|
||||||
|
- dc.sel[ColFG] = getcolor(selfgcolor);
|
||||||
|
+ for(int i=0; i<NUMCOLORS; i++) {
|
||||||
|
+ dc.colors[i][ColBorder] = getcolor( colors[i][ColBorder] );
|
||||||
|
+ dc.colors[i][ColFG] = getcolor( colors[i][ColFG] );
|
||||||
|
+ dc.colors[i][ColBG] = getcolor( colors[i][ColBG] );
|
||||||
|
+ }
|
||||||
|
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen),
|
||||||
|
bh, DefaultDepth(dpy, screen));
|
||||||
|
dc.gc = XCreateGC(dpy, root, 0, NULL);
|
||||||
|
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
|
||||||
|
@@ -1625,13 +1650,27 @@ tagmon(const Arg *arg) {
|
||||||
|
|
||||||
|
int
|
||||||
|
textnw(const char *text, unsigned int len) {
|
||||||
|
+ // remove non-printing color codes before calculating width
|
||||||
|
+ char *ptr = (char *) text;
|
||||||
|
+ unsigned int i, ibuf, lenbuf=len;
|
||||||
|
+ char buf[len+1];
|
||||||
|
XRectangle r;
|
||||||
|
|
||||||
|
+ for(i=0, ibuf=0; *ptr && i<len; i++, ptr++) {
|
||||||
|
+ if(*ptr <= NUMCOLORS && *ptr > 0) {
|
||||||
|
+ if (i < len) { lenbuf--; }
|
||||||
|
+ } else {
|
||||||
|
+ buf[ibuf]=*ptr;
|
||||||
|
+ ibuf++;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ buf[ibuf]=0;
|
||||||
|
+
|
||||||
|
if(dc.font.set) {
|
||||||
|
- XmbTextExtents(dc.font.set, text, len, NULL, &r);
|
||||||
|
+ XmbTextExtents(dc.font.set, buf, lenbuf, NULL, &r);
|
||||||
|
return r.width;
|
||||||
|
}
|
||||||
|
- return XTextWidth(dc.font.xfont, text, len);
|
||||||
|
+ return XTextWidth(dc.font.xfont, buf, lenbuf);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1711,7 +1754,7 @@ unfocus(Client *c, Bool setfocus) {
|
||||||
|
if(!c)
|
||||||
|
return;
|
||||||
|
grabbuttons(c, False);
|
||||||
|
- XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
|
||||||
|
+ XSetWindowBorder(dpy, c->win, dc.colors[0][ColBorder]);
|
||||||
|
if(setfocus)
|
||||||
|
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue