Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
using the term 'indicated' instead of 'higlighted'
[dwm.git]
/
draw.c
diff --git
a/draw.c
b/draw.c
index
65a3d51
..
4441a88
100644
(file)
--- a/
draw.c
+++ b/
draw.c
@@
-1,5
+1,4
@@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
@@
-9,6
+8,16
@@
/* static */
/* static */
+static Bool
+isoccupied(unsigned int t)
+{
+ Client *c;
+ for(c = clients; c; c = c->next)
+ if(c->tags[t])
+ return True;
+ return False;
+}
+
static unsigned int
textnw(const char *text, unsigned int len) {
XRectangle r;
static unsigned int
textnw(const char *text, unsigned int len) {
XRectangle r;
@@
-21,7
+30,7
@@
textnw(const char *text, unsigned int len) {
}
static void
}
static void
-drawtext(const char *text, unsigned long col[ColLast], Bool
highligh
t) {
+drawtext(const char *text, unsigned long col[ColLast], Bool
ldot, Bool rdo
t) {
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
@@
-30,21
+39,17
@@
drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
if(!text)
return;
if(!text)
return;
-
w = 0;
olen = len = strlen(text);
if(len >= sizeof(buf))
len = sizeof(buf) - 1;
memcpy(buf, text, len);
buf[len] = 0;
w = 0;
olen = 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);
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;
/* shorten text if necessary */
while(len && (w = textnw(buf, len)) > dc.w - h)
buf[--len] = 0;
@@
-56,7
+61,6
@@
drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
if(len > 3)
buf[len - 3] = '.';
}
if(len > 3)
buf[len - 3] = '.';
}
-
if(w > dc.w)
return; /* too long */
gcv.foreground = col[ColFG];
if(w > dc.w)
return; /* too long */
gcv.foreground = col[ColFG];
@@
-69,10
+73,16
@@
drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
- if(
highligh
t) {
+ if(
ldo
t) {
r.x = dc.x + 2;
r.y = dc.y + 2;
r.x = dc.x + 2;
r.y = dc.y + 2;
- r.width = r.height = 3;
+ r.width = r.height = (h + 2) / 4;
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ }
+ if(rdot) {
+ r.width = r.height = (h + 2) / 4;
+ r.x = dc.x + dc.w - r.width - 2;
+ r.y = dc.y + dc.h - r.height - 2;
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
}
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
}
@@
-80,7
+90,7
@@
drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
/* extern */
void
/* extern */
void
-drawall() {
+drawall(
void
) {
Client *c;
for(c = clients; c; c = getnext(c->next))
Client *c;
for(c = clients; c; c = getnext(c->next))
@@
-89,38
+99,31
@@
drawall() {
}
void
}
void
-drawstatus() {
+drawstatus(
void
) {
int i, x;
dc.x = dc.y = 0;
int i, x;
dc.x = dc.y = 0;
-
for(i = 0; i < ntags; i++) {
dc.w = textw(tags[i]);
if(seltag[i])
for(i = 0; i < ntags; i++) {
dc.w = textw(tags[i]);
if(seltag[i])
- drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+ drawtext(tags[i], dc.sel, sel && sel->tags[i]
, isoccupied(i)
);
else
else
- drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+ drawtext(tags[i], dc.norm, sel && sel->tags[i]
, isoccupied(i)
);
dc.x += dc.w;
}
dc.x += dc.w;
}
-
dc.w = bmw;
dc.w = bmw;
- drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
-
+ drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
x = dc.x + dc.w;
dc.w = textw(stext);
x = dc.x + dc.w;
dc.w = textw(stext);
- dc.x = b
x + b
w - dc.w;
+ dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
dc.w = bw - x;
}
if(dc.x < x) {
dc.x = x;
dc.w = bw - x;
}
- drawtext(stext, dc.status, False);
-
+ drawtext(stext, dc.status, False, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(sel)
- drawtext(sel->name, dc.sel, False);
- else
- drawtext(NULL, dc.norm, False);
+ drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
}
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
}
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
@@
-134,12
+137,11
@@
drawtitle(Client *c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
return;
}
XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
return;
}
-
XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
XMapWindow(dpy, c->twin);
dc.x = dc.y = 0;
dc.w = c->tw;
XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
XMapWindow(dpy, c->twin);
dc.x = dc.y = 0;
dc.w = c->tw;
- drawtext(c->name, dc.norm, False);
+ drawtext(c->name, dc.norm, False
,False
);
XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
XSync(dpy, False);
}
XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
XSync(dpy, False);
}
@@
-149,7
+151,8
@@
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
- XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+ eprint("error, cannot allocate color '%s'\n", colstr);
return color.pixel;
}
return color.pixel;
}
@@
-176,7
+179,6
@@
setfont(const char *fontstr) {
XFontSetExtents *font_extents;
XFontStruct **xfonts;
char **font_names;
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);
dc.font.ascent = dc.font.descent = 0;
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);