prepared dmenu-4.1 release

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 97014cc..3fd9275 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -42,8 +42,8 @@ typedef struct {
 typedef struct Item Item;
 struct Item {
        char *text;
 typedef struct Item Item;
 struct Item {
        char *text;

-       Item *next;             /* traverses all items */
-       Item *left, *right;     /* traverses items matching current search pattern */
+       Item *next;         /* traverses all items */
+       Item *left, *right; /* traverses items matching current search pattern */

 };
 
 /* forward declarations */
 };
 
 /* forward declarations */


@@ -85,17 +85,16 @@ static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
 static DC dc;
 static Bool running = True;
 static Display *dpy;
 static DC dc;

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

 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;
 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;

-static Window root, win;
+static Window parent, win;

 static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;

-static Bool vlist = False;
-static unsigned int lines = 5;
+static unsigned int lines = 0;

 static void (*calcoffsets)(void) = calcoffsetsh;
 
 void
 static void (*calcoffsets)(void) = calcoffsetsh;
 
 void


@@ -159,12 +158,12 @@ cistrstr(const char *s, const char *sub) {
 
        if(!sub)
                return (char *)s;
 
        if(!sub)
                return (char *)s;

-       if((c = *sub++) != 0) {
+       if((c = *sub++) != '\0') {

                c = tolower(c);
                len = strlen(sub);
                do {
                        do {
                c = tolower(c);
                len = strlen(sub);
                do {
                        do {

-                               if((csub = *s++) == 0)
+                               if((csub = *s++) == '\0')

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


@@ -213,20 +212,19 @@ drawmenu(void) {
        dc.h = mh;
        drawtext(NULL, dc.norm);
        /* print prompt? */
        dc.h = mh;
        drawtext(NULL, dc.norm);
        /* print prompt? */

-       if(promptw) {
+       if(prompt) {

                dc.w = promptw;
                drawtext(prompt, dc.sel);
                dc.w = promptw;
                drawtext(prompt, dc.sel);

+               dc.x += dc.w;

        }
        }

-       dc.x += promptw;
-       dc.w = mw - promptw;
+       dc.w = mw - dc.x;

        /* print command */
        /* print command */

-       if(cmdw && item)
+       if(cmdw && item && lines == 0)

                dc.w = cmdw;
        drawtext(text[0] ? text : NULL, dc.norm);
        drawcursor();
                dc.w = cmdw;
        drawtext(text[0] ? text : NULL, dc.norm);
        drawcursor();

-       dc.x += cmdw;

        if(curr) {
        if(curr) {

-               if(vlist)
+               if(lines > 0)

                        drawmenuv();
                else
                        drawmenuh();
                        drawmenuv();
                else
                        drawmenuh();


@@ -239,17 +237,17 @@ void
 drawmenuh(void) {
        Item *i;
 
 drawmenuh(void) {
        Item *i;
 

+       dc.x += cmdw;

        dc.w = spaceitem;
        dc.w = spaceitem;

-       drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
+       drawtext(curr->left ? "<" : NULL, dc.norm);

        dc.x += dc.w;
        dc.x += dc.w;

-       /* determine maximum items */

        for(i = curr; i != next; i=i->right) {
                dc.w = MIN(textw(i->text), mw / 3);
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                dc.x += dc.w;
        }
        for(i = curr; i != next; i=i->right) {
                dc.w = MIN(textw(i->text), mw / 3);
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                dc.x += dc.w;
        }

-       dc.x = mw - spaceitem;

        dc.w = spaceitem;
        dc.w = spaceitem;

+       dc.x = mw - dc.w;

        drawtext(next ? ">" : NULL, dc.norm);
 }
 
        drawtext(next ? ">" : NULL, dc.norm);
 }
 


@@ -257,10 +255,8 @@ void
 drawmenuv(void) {
        Item *i;
 
 drawmenuv(void) {
        Item *i;
 

-       dc.x = 0;
-       dc.w = mw;
+       dc.w = mw - dc.x;

        dc.y += dc.font.height + 2;
        dc.y += dc.font.height + 2;

-       /* determine maximum items */

        for(i = curr; i != next; i=i->right) {
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                dc.y += dc.font.height + 2;
        for(i = curr; i != next; i=i->right) {
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                dc.y += dc.font.height + 2;


@@ -321,7 +317,7 @@ grabkeyboard(void) {
        unsigned int len;
 
        for(len = 1000; len; len--) {
        unsigned int len;
 
        for(len = 1000; len; len--) {

-               if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+               if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime)

                == GrabSuccess)
                        break;
                usleep(1000);
                == GrabSuccess)
                        break;
                usleep(1000);


@@ -341,13 +337,11 @@ initfont(const char *fontstr) {
        if(missing)
                XFreeStringList(missing);
        if(dc.font.set) {
        if(missing)
                XFreeStringList(missing);
        if(dc.font.set) {

-               XFontSetExtents *font_extents;

                XFontStruct **xfonts;
                char **font_names;
                dc.font.ascent = dc.font.descent = 0;
                XFontStruct **xfonts;
                char **font_names;
                dc.font.ascent = dc.font.descent = 0;

-               font_extents = XExtentsOfFontSet(dc.font.set);

                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);

-               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+               for(i = 0; i < n; i++) {

                        dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
                        dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
                        xfonts++;
                        dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
                        dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
                        xfonts++;


@@ -371,7 +365,7 @@ kpress(XKeyEvent * e) {
        KeySym ksym;
 
        len = strlen(text);
        KeySym ksym;
 
        len = strlen(text);

-       buf[0] = 0;
+       buf[0] = '\0';

        num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
        if(IsKeypadKey(ksym)) {
                if(ksym == XK_KP_Enter)
        num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
        if(IsKeypadKey(ksym)) {
                if(ksym == XK_KP_Enter)


@@ -414,7 +408,8 @@ kpress(XKeyEvent * e) {
                        break;
                case XK_u:
                case XK_U:
                        break;
                case XK_u:
                case XK_U:

-                       text[0] = 0;
+                       memmove(text, text + cursor, sizeof text - cursor + 1);
+                       cursor = 0;

                        match(text);
                        break;
                case XK_w:
                        match(text);
                        break;
                case XK_w:


@@ -626,7 +621,7 @@ readstdin(void) {
                        buf[--len] = '\0';
                if(!(p = strdup(buf)))
                        eprint("fatal: could not strdup() %u bytes\n", len);
                        buf[--len] = '\0';
                if(!(p = strdup(buf)))
                        eprint("fatal: could not strdup() %u bytes\n", len);

-               if(max < len) {
+               if(max < len || !maxname) {

                        maxname = p;
                        max = len;
                }
                        maxname = p;
                        max = len;
                }


@@ -658,6 +653,10 @@ run(void) {
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;

+               case VisibilityNotify:
+                       if (ev.xvisibility.state != VisibilityUnobscured)
+                               XRaiseWindow(dpy, win);
+                       break;

                }
 }
 
                }
 }
 


@@ -670,6 +669,7 @@ setup(Bool topbar) {
 #endif
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 #endif
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;

+       XWindowAttributes pwa;

 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);


@@ -691,19 +691,18 @@ setup(Bool topbar) {
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;

-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
+       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;

 
        /* menu window geometry */
 
        /* menu window geometry */

-       mh = dc.font.height + 2;
-       mh = vlist ? mh * (lines+1) : mh;
+       mh = (dc.font.height + 2) * (lines + 1);

 #if XINERAMA
 #if XINERAMA

-       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+       if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {

                i = 0;
                if(n > 1) {
                        int di;
                        unsigned int dui;
                        Window dummy;
                i = 0;
                if(n > 1) {
                        int di;
                        unsigned int dui;
                        Window dummy;

-                       if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+                       if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))

                                for(i = 0; i < n; i++)
                                        if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
                                                break;
                                for(i = 0; i < n; i++)
                                        if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
                                                break;


@@ -716,19 +715,20 @@ setup(Bool topbar) {
        else
 #endif
        {
        else
 #endif
        {

+               XGetWindowAttributes(dpy, parent, &pwa);

                x = 0;
                x = 0;

-               y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
-               mw = DisplayWidth(dpy, screen);
+               y = topbar ? 0 : pwa.height - mh;
+               mw = pwa.width;

        }
 
        }
 

-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
+       win = XCreateWindow(dpy, parent, x, y, mw, mh, 0,

                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
        /* pixmap */
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
        /* pixmap */

-       dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, NULL);
+       dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, parent, 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);


@@ -736,7 +736,7 @@ setup(Bool topbar) {
                cmdw = MIN(textw(maxname), mw / 3);
        if(prompt)
                promptw = MIN(textw(prompt), mw / 5);
                cmdw = MIN(textw(maxname), mw / 3);
        if(prompt)
                promptw = MIN(textw(prompt), mw / 5);

-       text[0] = 0;
+       text[0] = '\0';

        match(text);
        XMapRaised(dpy, win);
 }
        match(text);
        XMapRaised(dpy, win);
 }


@@ -771,10 +771,9 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
                else if(!strcmp(argv[i], "-e")) {
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
                else if(!strcmp(argv[i], "-e")) {

-                       if(++i < argc) root = atoi(argv[i]);
+                       if(++i < argc) parent = atoi(argv[i]);

                }
                else if(!strcmp(argv[i], "-l")) {
                }
                else if(!strcmp(argv[i], "-l")) {

-                       vlist = True;

                        calcoffsets = calcoffsetsv;
                        if(++i < argc) lines = atoi(argv[i]);
                }
                        calcoffsets = calcoffsetsv;
                        if(++i < argc) lines = atoi(argv[i]);
                }


@@ -806,8 +805,8 @@ main(int argc, char *argv[]) {
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);

-       if(!root)
-               root = RootWindow(dpy, screen);
+       if(!parent)
+               parent = RootWindow(dpy, screen);

 
        readstdin();
        running = grabkeyboard();
 
        readstdin();
        running = grabkeyboard();