pinosaur
/
dwm.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaned up code
[dwm.git]
/
draw.c
diff --git
a/draw.c
b/draw.c
index
ec0e964
..
b5d8bd2
100644
(file)
--- a/
draw.c
+++ b/
draw.c
@@
-8,12
+8,13
@@
#include <string.h>
#include <X11/Xlocale.h>
#include <string.h>
#include <X11/Xlocale.h>
-/* static
functions
*/
+/* static */
static void
drawborder(void)
{
XPoint points[5];
static void
drawborder(void)
{
XPoint points[5];
+
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
XSetForeground(dpy, dc.gc, dc.border);
points[0].x = dc.x;
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
XSetForeground(dpy, dc.gc, dc.border);
points[0].x = dc.x;
@@
-33,6
+34,7
@@
static unsigned int
textnw(char *text, unsigned int len)
{
XRectangle r;
textnw(char *text, unsigned int len)
{
XRectangle r;
+
if(dc.font.set) {
XmbTextExtents(dc.font.set, text, len, NULL, &r);
return r.width;
if(dc.font.set) {
XmbTextExtents(dc.font.set, text, len, NULL, &r);
return r.width;
@@
-44,8
+46,8
@@
static void
drawtext(const char *text, Bool invert, Bool border)
{
int x, y, w, h;
drawtext(const char *text, Bool invert, Bool border)
{
int x, y, w, h;
- unsigned int len;
static char buf[256];
static char buf[256];
+ unsigned int len;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@
-90,14
+92,14
@@
drawtext(const char *text, Bool invert, Bool border)
}
}
}
}
-/* extern
functions
*/
+/* extern */
void
drawall()
{
Client *c;
void
drawall()
{
Client *c;
- for(c = clients; c; c = getnext(c->next))
+ for(c = clients; c; c = getnext(c->next
, tsel
))
drawtitle(c);
drawstatus();
}
drawtitle(c);
drawstatus();
}
@@
-170,8
+172,8
@@
drawtitle(Client *c)
unsigned long
getcolor(const char *colstr)
{
unsigned long
getcolor(const char *colstr)
{
- XColor color;
Colormap cmap = DefaultColormap(dpy, screen);
Colormap cmap = DefaultColormap(dpy, screen);
+ XColor color;
XAllocNamedColor(dpy, cmap, colstr, &color, &color);
return color.pixel;
XAllocNamedColor(dpy, cmap, colstr, &color, &color);
return color.pixel;