[hackers] [dwm] cleaner drawing || Connor Lane Smith

changeset: 1544:ad688b8e64d3
tag: tip
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Sat Jun 04 10:17:25 2011 +0100
files: dwm.c
description:
cleaner drawing

diff -r ba590e72eb2a -r ad688b8e64d3 dwm.c
--- a/dwm.c Sat May 21 20:26:26 2011 +0100
+++ b/dwm.c Sat Jun 04 10:17:25 2011 +0100
@@ -780,32 +780,22 @@
 void
 drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
         int x;
- XGCValues gcv;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
- gcv.foreground = col[invert ? ColBG : ColFG];
- XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+ XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
         x = (dc.font.ascent + dc.font.descent + 2) / 4;
- r.x = dc.x + 1;
- r.y = dc.y + 1;
- if(filled) {
- r.width = r.height = x + 1;
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- }
- else if(empty) {
- r.width = r.height = x;
- XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- }
+ if(filled)
+ XFillRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x+1, x+1);
+ else if(empty)
+ XDrawRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x, x);
 }
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
         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]);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ XFillRectangle(dpy, dc.drawable, dc.gc, dc.x, dc.y, dc.w, dc.h);
         if(!text)
                 return;
         olen = strlen(text);
Received on Sat Jun 04 2011 - 11:17:33 CEST