applied Martin Hurton's scan() patch with slight modifications

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index d0239f4..265ffb9 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -24,7 +24,6 @@
  * To understand everything else, start reading main().
  */
 #include <errno.h>
  * To understand everything else, start reading main().
  */
 #include <errno.h>

-#include <locale.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -202,8 +201,10 @@ static void zoom(const Arg *arg);
 
 /* variables */
 static char stext[256];
 
 /* variables */
 static char stext[256];

-static int screen, sx, sy, sw, sh;
-static int by, bh, blw, wx, wy, ww, wh;
+static int screen;
+static int sx, sy, sw, sh; /* X display screen geometry x, y, width, height */ 
+static int by, bh, blw;    /* bar geometry y, height and layout symbol width */
+static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */

 static unsigned int seltags = 0, sellt = 0;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static unsigned int seltags = 0, sellt = 0;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;


@@ -568,23 +569,22 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
        int i, x, y, h, len, olen;
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
        int i, x, y, h, len, olen;

-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

        char buf[256];
        char buf[256];

+       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);
        if(!text)
                return;
        olen = strlen(text);
 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        olen = strlen(text);

-       len = MIN(olen, sizeof buf);
-       memcpy(buf, text, len);

        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */
        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */

-       for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+       for(len = MIN(olen, sizeof buf); len && (i = textnw(buf, len)) > dc.w - h; len--);

        if(!len)
                return;
        if(!len)
                return;

+       memcpy(buf, text, len);

        if(len < olen)
                for(i = len; i && i > len - 3; buf[--i] = '.');
        XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
        if(len < olen)
                for(i = len; i && i > len - 3; buf[--i] = '.');
        XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);


@@ -865,8 +865,7 @@ killclient(const Arg *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

-       Status rettrans;
-       Window trans;
+       Window trans = 0;

        XWindowChanges wc;
 
        if(!(c = calloc(1, sizeof(Client))))
        XWindowChanges wc;
 
        if(!(c = calloc(1, sizeof(Client))))


@@ -903,14 +902,14 @@ manage(Window w, XWindowAttributes *wa) {
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);

-       if((rettrans = XGetTransientForHint(dpy, w, &trans)) == Success)
+       if(XGetTransientForHint(dpy, w, &trans))

                t = getclient(trans);
        if(t)
                c->tags = t->tags;
        else
                applyrules(c);
        if(!c->isfloating)
                t = getclient(trans);
        if(t)
                c->tags = t->tags;
        else
                applyrules(c);
        if(!c->isfloating)

-               c->isfloating = (rettrans == Success) || c->isfixed;
+               c->isfloating = trans || c->isfixed;

        if(c->isfloating)
                XRaiseWindow(dpy, c->win);
        attach(c);
        if(c->isfloating)
                XRaiseWindow(dpy, c->win);
        attach(c);


@@ -1247,10 +1246,9 @@ run(void) {
 void
 scan(void) {
        unsigned int i, num;
 void
 scan(void) {
        unsigned int i, num;

-       Window *wins, d1, d2;
+       Window d1, d2, *wins = NULL;

        XWindowAttributes wa;
 
        XWindowAttributes wa;
 

-       wins = NULL;

        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)


@@ -1266,9 +1264,9 @@ scan(void) {
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }

+               if(wins)
+                       XFree(wins);

        }
        }

-       if(wins)
-               XFree(wins);

 }
 
 void
 }
 
 void


@@ -1640,10 +1638,10 @@ updatewmhints(Client *c) {
 
 void
 view(const Arg *arg) {
 
 void
 view(const Arg *arg) {

-       if(arg && (arg->ui & TAGMASK) == tagset[seltags])
+       if((arg->ui & TAGMASK) == tagset[seltags])

                return;
        seltags ^= 1; /* toggle sel tagset */
                return;
        seltags ^= 1; /* toggle sel tagset */

-       if(arg && (arg->ui & TAGMASK))
+       if(arg->ui & TAGMASK)

                tagset[seltags] = arg->ui & TAGMASK;
        clearurgent();
        arrange();
                tagset[seltags] = arg->ui & TAGMASK;
        clearurgent();
        arrange();


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

-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+       if(!XSupportsLocale())

                fprintf(stderr, "warning: no locale support\n");
 
        if(!(dpy = XOpenDisplay(0)))
                fprintf(stderr, "warning: no locale support\n");
 
        if(!(dpy = XOpenDisplay(0)))