aboutsummaryrefslogtreecommitdiff
path: root/draw.c
diff options
context:
space:
mode:
Diffstat (limited to 'draw.c')
-rw-r--r--draw.c104
1 files changed, 52 insertions, 52 deletions
diff --git a/draw.c b/draw.c
index 9743ec1..1c6613f 100644
--- a/draw.c
+++ b/draw.c
@@ -29,51 +29,18 @@ drawborder(void)
XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
}
-/* extern functions */
-
-void
-drawall()
-{
- Client *c;
-
- for(c = clients; c; c = getnext(c->next))
- drawtitle(c);
- drawstatus();
-}
-
-void
-drawstatus()
+static unsigned int
+textnw(char *text, unsigned int len)
{
- 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);
+ XRectangle r;
+ if(dc.font.set) {
+ XmbTextExtents(dc.font.set, text, len, NULL, &r);
+ return r.width;
}
- 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);
- XFlush(dpy);
+ return XTextWidth(dc.font.xfont, text, len);
}
-void
+static void
drawtext(const char *text, Bool invert, Bool border)
{
int x, y, w, h;
@@ -123,6 +90,50 @@ drawtext(const char *text, Bool invert, Bool border)
}
}
+/* 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);
+ XFlush(dpy);
+}
+
void
drawtitle(Client *c)
{
@@ -219,17 +230,6 @@ setfont(const char *fontstr)
}
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);
-}
-
-unsigned int
textw(char *text)
{
return textnw(text, strlen(text)) + dc.font.height;