Added tag 4.0 for changeset 78f9f72cc9c6

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 895bdc5..0f95af6 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#define _BSD_SOURCE

 #include <ctype.h>
 #include <ctype.h>

+#include <locale.h>

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


@@ -17,6 +17,7 @@
 /* macros */
 #define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
 /* macros */
 #define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))

+#define MIN(a, b)               ((a) < (b) ? (a) : (b))

 
 /* enums */
 enum { ColFG, ColBG, ColLast };
 
 /* enums */
 enum { ColFG, ColBG, ColLast };


@@ -77,7 +78,7 @@ static unsigned int mw, mh;
 static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
 static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;

-static DC dc = {0};
+static DC dc;

 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;


@@ -139,7 +140,7 @@ cistrstr(const char *s, const char *sub) {
                do {
                        do {
                                if((csub = *s++) == 0)
                do {
                        do {
                                if((csub = *s++) == 0)

-                                       return (NULL);
+                                       return NULL;

                        }
                        while(tolower(csub) != c);
                }
                        }
                        while(tolower(csub) != c);
                }


@@ -212,37 +213,25 @@ drawmenu(void) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast]) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast]) {

-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
+       char buf[256];
+       int i, x, y, h, len, olen;

        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;

-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
+       olen = strlen(text);

        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 */

-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
-       if(w > dc.w)
-               return; /* too long */
+       for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+       if(!len)
+               return;
+       memcpy(buf, text, len);
+       if(len < olen)
+               for(i = len; i && i > len - 3; buf[--i] = '.');

        XSetForeground(dpy, dc.gc, col[ColFG]);
        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        XSetForeground(dpy, dc.gc, col[ColFG]);
        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);


@@ -291,8 +280,6 @@ initfont(const char *fontstr) {
        if(!fontstr || fontstr[0] == '\0')
                eprint("error, cannot load font: '%s'\n", fontstr);
        missing = NULL;
        if(!fontstr || fontstr[0] == '\0')
                eprint("error, cannot load font: '%s'\n", fontstr);
        missing = NULL;

-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);

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


@@ -312,9 +299,6 @@ initfont(const char *fontstr) {
                }
        }
        else {
                }
        }
        else {

-               if(dc.font.xfont)
-                       XFreeFont(dpy, dc.font.xfont);
-               dc.font.xfont = NULL;

                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
                        eprint("error, cannot load font: '%s'\n", fontstr);
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
                        eprint("error, cannot load font: '%s'\n", fontstr);


@@ -333,7 +317,7 @@ kpress(XKeyEvent * e) {
 
        len = strlen(text);
        buf[0] = 0;
 
        len = strlen(text);
        buf[0] = 0;

-       num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+       num = XLookupString(e, buf, sizeof buf, &ksym, NULL);

        if(IsKeypadKey(ksym)) {
                if(ksym == XK_KP_Enter)
                        ksym = XK_Return;
        if(IsKeypadKey(ksym)) {
                if(ksym == XK_KP_Enter)
                        ksym = XK_Return;


@@ -411,10 +395,7 @@ kpress(XKeyEvent * e) {
        default:
                if(num && !iscntrl((int) buf[0])) {
                        buf[num] = 0;
        default:
                if(num && !iscntrl((int) buf[0])) {
                        buf[num] = 0;

-                       if(len > 0)
-                               strncat(text, buf, sizeof text);
-                       else
-                               strncpy(text, buf, sizeof text);
+                       strncpy(text + len, buf, sizeof text - len);

                        match(text);
                }
                break;
                        match(text);
                }
                break;


@@ -552,7 +533,7 @@ readstdin(void) {
                        maxname = p;
                        max = len;
                }
                        maxname = p;
                        max = len;
                }

-               if((new = (Item *)malloc(sizeof(Item))) == NULL)
+               if(!(new = (Item *)malloc(sizeof(Item))))

                        eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;
                        eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;


@@ -611,7 +592,7 @@ setup(Bool topbar) {
        initfont(font);
 
        /* menu window */
        initfont(font);
 
        /* menu window */

-       wa.override_redirect = 1;
+       wa.override_redirect = True;

        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
 
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
 


@@ -649,7 +630,7 @@ setup(Bool topbar) {
 
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
 
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));

-       dc.gc = XCreateGC(dpy, root, 0, 0);
+       dc.gc = XCreateGC(dpy, root, 0, NULL);

        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);


@@ -718,9 +699,9 @@ main(int argc, char *argv[]) {
                else
                        eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
                               "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
                else
                        eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
                               "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");

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

                fprintf(stderr, "warning: no locale support\n");
                fprintf(stderr, "warning: no locale support\n");

-       if(!(dpy = XOpenDisplay(0)))
+       if(!(dpy = XOpenDisplay(NULL)))

                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);