with this patch everything works fine for me

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 5be403b..eeb3e56 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -4,7 +4,6 @@
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>

-#include <X11/Xlocale.h>

 
 /* static */
 
 
 /* static */
 


@@ -30,7 +29,7 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, unsigned long col[ColLast], Bool filleddot, Bool emptydot) {
+drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) {

        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;


@@ -75,15 +74,15 @@ drawtext(const char *text, unsigned long col[ColLast], Bool filleddot, Bool empt
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        x = (h + 2) / 4;
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        x = (h + 2) / 4;

-       if(filleddot) {
-               r.x = dc.x + 2;
-               r.y = dc.y + 2;
-               r.width = r.height = x;
+       if(filledsquare) {
+               r.x = dc.x + 1;
+               r.y = dc.y + 1;
+               r.width = r.height = x + 1;

                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }

-       if(emptydot) {
-               pt[0].x = dc.x + 2;
-               pt[0].y = dc.y + 2;
+       else if(emptysquare) {
+               pt[0].x = dc.x + 1;
+               pt[0].y = dc.y + 1;

                pt[1].x = x;
                pt[1].y = 0;
                pt[2].x = 0;
                pt[1].x = x;
                pt[1].y = 0;
                pt[2].x = 0;


@@ -167,11 +166,10 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
 
 void
 setfont(const char *fontstr) {

-       char **missing, *def;
+       char *def, **missing;

        int i, n;
 
        missing = NULL;
        int i, n;
 
        missing = NULL;

-       setlocale(LC_ALL, "");

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);


@@ -179,10 +177,6 @@ setfont(const char *fontstr) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);

-               if(dc.font.set) {
-                       XFreeFontSet(dpy, dc.font.set);
-                       dc.font.set = NULL;
-               }

        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;
        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;