locale update

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index a5a9de2..0691029 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -310,8 +310,8 @@ buttonpress(XEvent *e) {
 
        click = ClkRootWin;
        if(ev->window == barwin) {
 
        click = ClkRootWin;
        if(ev->window == barwin) {

-               for(i = x = 0; ev->x >= x && ++i < LENGTH(tags); i++)
-                       x += TEXTW(tags[i]);
+               i = x = 0;
+               do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));

                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;


@@ -929,7 +929,7 @@ manage(Window w, XWindowAttributes *wa) {
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);

-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+       XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */

        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();


@@ -962,7 +962,7 @@ monocle(void) {
        Client *c;
 
        for(c = nexttiled(clients); c; c = nexttiled(c->next))
        Client *c;
 
        for(c = nexttiled(clients); c; c = nexttiled(c->next))

-               resize(c, wx, wy, ww, wh, resizehints);
+               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);

 }
 
 void
 }
 
 void


@@ -1704,7 +1704,9 @@ main(int argc, char *argv[]) {
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 

-       setlocale(LC_CTYPE, "");
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "warning: no locale support\n");
+

        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
 
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");