Added tag 0.8 for changeset cd15de32e173f8ce97bfe1c9b6607937b59056b4

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index b8cfffd..869c2f2 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>


@@ -14,6 +13,7 @@ static void
 drawborder(void)
 {
        XPoint points[5];
 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;


@@ -30,9 +30,10 @@ drawborder(void)
 }
 
 static unsigned int
 }
 
 static unsigned int

-textnw(char *text, unsigned int len)
+textnw(const char *text, unsigned int len)

 {
        XRectangle r;
 {
        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;


@@ -41,24 +42,22 @@ textnw(char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, Bool invert)

 {
        int x, y, w, h;
 {
        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 };
 
        XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

-
-       w = 0;
-       if(border)
-               drawborder();
+       drawborder();

 
        if(!text)
                return;
 
 
        if(!text)
                return;
 

+       w = 0;

        len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;


@@ -105,31 +104,30 @@ drawall()
 void
 drawstatus()
 {
 void
 drawstatus()
 {

-       int i;
+       int i, x;

        Bool istile = arrange == dotile;
 
        dc.x = dc.y = 0;
        dc.w = bw;
        Bool istile = arrange == dotile;
 
        dc.x = dc.y = 0;
        dc.w = bw;

-       drawtext(NULL, !istile, False);
+       drawtext(NULL, !istile);

 
        dc.w = 0;
 
        dc.w = 0;

-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {

                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)
                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)

-                       drawtext(tags[i], (i == tsel), True);
+                       drawtext(tags[i], (i == tsel));

                else
                else

-                       drawtext(tags[i], (i != tsel), True);
-       }
-       if(sel) {
-               dc.x += dc.w;
-               dc.w = textw(sel->name);
-               drawtext(sel->name, istile, True);
+                       drawtext(tags[i], (i != tsel));

        }
        }

+       x = dc.x + dc.w;

        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;

-       drawtext(stext, !istile, False);
-
+       drawtext(stext, !istile);
+       if(sel && ((dc.w = dc.x - x) >= bh)) {
+               dc.x = x;
+               drawtext(sel->name, istile);
+       }

        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
 }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
 }


@@ -140,7 +138,7 @@ drawtitle(Client *c)
        int i;
        Bool istile = arrange == dotile;
 
        int i;
        Bool istile = arrange == dotile;
 

-       if(c == sel) {
+       if(c == sel && issel) {

                drawstatus();
                XUnmapWindow(dpy, c->title);
                XSetWindowBorder(dpy, c->win, dc.fg);
                drawstatus();
                XUnmapWindow(dpy, c->title);
                XSetWindowBorder(dpy, c->win, dc.fg);


@@ -153,16 +151,16 @@ drawtitle(Client *c)
        dc.x = dc.y = 0;
 
        dc.w = 0;
        dc.x = dc.y = 0;
 
        dc.w = 0;

-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {

                if(c->tags[i]) {
                        dc.x += dc.w;
                if(c->tags[i]) {
                        dc.x += dc.w;

-                       dc.w = textw(c->tags[i]);
-                       drawtext(c->tags[i], !istile, True);
+                       dc.w = textw(tags[i]);
+                       drawtext(tags[i], !istile);

                }
        }
        dc.x += dc.w;
        dc.w = textw(c->name);
                }
        }
        dc.x += dc.w;
        dc.w = textw(c->name);

-       drawtext(c->name, !istile, True);
+       drawtext(c->name, !istile);

        XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }
        XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }


@@ -170,8 +168,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;


@@ -229,7 +227,7 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 unsigned int

-textw(char *text)
+textw(const char *text)

 {
        return textnw(text, strlen(text)) + dc.font.height;
 }
 {
        return textnw(text, strlen(text)) + dc.font.height;
 }