atexit cleanup

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 8059f29..2cc2cad 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,11 +1,9 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>

-#include <stdarg.h>

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

-#include <strings.h>

 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>


@@ -13,9 +11,9 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif

+#include <draw.h>

 
 /* macros */
 
 /* 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))
 #define MAX(a, b)               ((a) > (b) ? (a) : (b))
 #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))
 #define MAX(a, b)               ((a) > (b) ? (a) : (b))


@@ -38,30 +36,29 @@ static void dinput(void);
 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);

-static Bool grabkeyboard(void);
+static void grabkeyboard(void);

 static void kpress(XKeyEvent *e);
 static void match(char *pattern);
 static void readstdin(void);
 static void run(void);
 static void kpress(XKeyEvent *e);
 static void match(char *pattern);
 static void readstdin(void);
 static void run(void);

-static void setup(Bool topbar);
+static void setup(void);

 
 #include "config.h"
 
 #include "config.h"

-#include "draw.h"

 
 /* variables */
 
 /* variables */

+static char **argp = NULL;

 static char *maxname = NULL;
 static char *prompt = NULL;
 static char text[4096];
 static int cmdw = 0;
 static int promptw = 0;
 static char *maxname = NULL;
 static char *prompt = NULL;
 static char text[4096];
 static int cmdw = 0;
 static int promptw = 0;

-static int ret = 0;

 static int screen;
 static unsigned int lines = 0;
 static unsigned int numlockmask = 0;
 static unsigned int mw, mh;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static int screen;
 static unsigned int lines = 0;
 static unsigned int numlockmask = 0;
 static unsigned int mw, mh;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];

-static Bool running = True;
+static Bool topbar = True;

 static DC dc;
 static Display *dpy;
 static Item *allitems = NULL;  /* first of all items */
 static DC dc;
 static Display *dpy;
 static Item *allitems = NULL;  /* first of all items */


@@ -70,7 +67,7 @@ static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;

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

 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 static void (*calcoffsets)(void) = calcoffsetsh;
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 static void (*calcoffsets)(void) = calcoffsetsh;


@@ -88,15 +85,15 @@ appenditem(Item *i, Item **list, Item **last) {
 
 void
 calcoffsetsh(void) {
 
 void
 calcoffsetsh(void) {

-       unsigned int w;
+       unsigned int x;

 
 

-       w = promptw + cmdw + (2 * spaceitem);
+       x = promptw + cmdw + (2 * spaceitem);

        for(next = curr; next; next = next->right)
        for(next = curr; next; next = next->right)

-               if((w += MIN(textw(&dc, next->text), mw / 3)) > mw)
+               if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)

                        break;
                        break;

-       w = promptw + cmdw + (2 * spaceitem);
+       x = promptw + cmdw + (2 * spaceitem);

        for(prev = curr; prev && prev->left; prev = prev->left)
        for(prev = curr; prev && prev->left; prev = prev->left)

-               if((w += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+               if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)

                        break;
 }
 
                        break;
 }
 


@@ -107,6 +104,7 @@ calcoffsetsv(void) {
        next = prev = curr;
        for(i = 0; i < lines && next; i++)
                next = next->right;
        next = prev = curr;
        for(i = 0; i < lines && next; i++)
                next = next->right;

+       mh = (dc.font.height + 2) * (i + 1);

        for(i = 0; i < lines && prev && prev->left; i++)
                prev = prev->left;
 }
        for(i = 0; i < lines && prev && prev->left; i++)
                prev = prev->left;
 }


@@ -146,12 +144,15 @@ cleanup(void) {
        cleanupdraw(&dc);
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
        cleanupdraw(&dc);
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);

+       XCloseDisplay(dpy);

 }
 
 void
 dinput(void) {
        cleanup();
 }
 
 void
 dinput(void) {
        cleanup();

-       execlp("dinput", "dinput", text, NULL); /* todo: argv */
+       argp[0] = "dinput";
+       argp[1] = text;
+       execvp("dinput", argp);

        eprint("cannot exec dinput\n");
 }
 
        eprint("cannot exec dinput\n");
 }
 


@@ -162,6 +163,8 @@ drawmenu(void) {
        dc.w = mw;
        dc.h = mh;
        drawtext(&dc, NULL, normcol, False);
        dc.w = mw;
        dc.h = mh;
        drawtext(&dc, NULL, normcol, False);

+       dc.h = dc.font.height + 2;
+       dc.y = topbar ? 0 : mh - dc.h;

        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;


@@ -173,14 +176,11 @@ drawmenu(void) {
        if(cmdw && item && lines == 0)
                dc.w = cmdw;
        drawtext(&dc, *text ? text : NULL, normcol, False);
        if(cmdw && item && lines == 0)
                dc.w = cmdw;
        drawtext(&dc, *text ? text : NULL, normcol, False);

-       if(curr) {
-               if(lines > 0)
-                       drawmenuv();
-               else
-                       drawmenuh();
-       }
+       if(lines > 0)
+               drawmenuv();
+       else if(curr)
+               drawmenuh();

        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);

-       XFlush(dpy);

 }
 
 void
 }
 
 void


@@ -204,29 +204,31 @@ drawmenuh(void) {
 void
 drawmenuv(void) {
        Item *i;
 void
 drawmenuv(void) {
        Item *i;

+       XWindowAttributes wa;

 
 

+       dc.y = topbar ? dc.h : 0;

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

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

        for(i = curr; i != next; i = i->right) {
                drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
                dc.y += dc.h;
        }
        for(i = curr; i != next; i = i->right) {
                drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
                dc.y += dc.h;
        }

-       dc.h = mh - dc.y;
-       drawtext(&dc, NULL, normcol, False);
+       if(!XGetWindowAttributes(dpy, win, &wa))
+               eprint("cannot get window attributes");
+       XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);

 }
 
 }
 

-Bool
+void

 grabkeyboard(void) {
        unsigned int len;
 
        for(len = 1000; len; len--) {
 grabkeyboard(void) {
        unsigned int len;
 
        for(len = 1000; len; len--) {

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

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

-       return len > 0;
+       if(!len)
+               exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void


@@ -295,9 +297,6 @@ kpress(XKeyEvent *e) {
                        text[++i] = '\0';
                        match(text);
                        break;
                        text[++i] = '\0';
                        match(text);
                        break;

-               case XK_x:
-                       dinput();
-                       break;

                }
        }
        switch(ksym) {
                }
        }
        switch(ksym) {


@@ -326,9 +325,7 @@ kpress(XKeyEvent *e) {
                        sel = sel->right;
                break;
        case XK_Escape:
                        sel = sel->right;
                break;
        case XK_Escape:

-               ret = 1;
-               running = False;
-               return;
+               exit(EXIT_FAILURE);

        case XK_Home:
                sel = curr = item;
                calcoffsets();
        case XK_Home:
                sel = curr = item;
                calcoffsets();


@@ -356,13 +353,11 @@ kpress(XKeyEvent *e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:

-               if((e->state & ShiftMask) || !sel)
-                       fprintf(stdout, "%s", text);
-               else
-                       fprintf(stdout, "%s", sel->text);
+               if(e->state & ShiftMask)
+                       dinput();
+               fprintf(stdout, "%s", sel ? sel->text : text);

                fflush(stdout);
                fflush(stdout);

-               running = False;
-               return;
+               exit(EXIT_SUCCESS);

        case XK_Right:
        case XK_Down:
                if(!sel || !sel->right)
        case XK_Right:
        case XK_Down:
                if(!sel || !sel->right)


@@ -455,7 +450,8 @@ run(void) {
        XEvent ev;
 
        /* main event loop */
        XEvent ev;
 
        /* main event loop */

-       while(running && !XNextEvent(dpy, &ev))
+       XSync(dpy, False);
+       while(!XNextEvent(dpy, &ev))

                switch(ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);
                switch(ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);


@@ -465,14 +461,15 @@ run(void) {
                                drawmenu();
                        break;
                case VisibilityNotify:
                                drawmenu();
                        break;
                case VisibilityNotify:

-                       if (ev.xvisibility.state != VisibilityUnobscured)
+                       if(ev.xvisibility.state != VisibilityUnobscured)

                                XRaiseWindow(dpy, win);
                        break;
                }
                                XRaiseWindow(dpy, win);
                        break;
                }

+       exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void

-setup(Bool topbar) {
+setup(void) {

        int i, j, x, y;
 #if XINERAMA
        int n;
        int i, j, x, y;
 #if XINERAMA
        int n;


@@ -480,7 +477,6 @@ 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);


@@ -507,13 +503,13 @@ setup(Bool topbar) {
        /* menu window geometry */
        mh = (dc.font.height + 2) * (lines + 1);
 #if XINERAMA
        /* menu window geometry */
        mh = (dc.font.height + 2) * (lines + 1);
 #if XINERAMA

-       if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+       if(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, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))
+                       if(XQueryPointer(dpy, root, &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;


@@ -526,13 +522,12 @@ setup(Bool topbar) {
        else
 #endif
        {
        else
 #endif
        {

-               XGetWindowAttributes(dpy, parent, &pwa);

                x = 0;
                x = 0;

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

        }
 
        }
 

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

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


@@ -550,10 +545,9 @@ setup(Bool topbar) {
 int
 main(int argc, char *argv[]) {
        unsigned int i;
 int
 main(int argc, char *argv[]) {
        unsigned int i;

-       Bool topbar = True;

 
        /* command line args */
 
        /* command line args */

-       progname = argv[0];
+       progname = "dmenu";

        for(i = 1; i < argc; i++)
                if(!strcmp(argv[i], "-i")) {
                        fstrncmp = strncasecmp;
        for(i = 1; i < argc; i++)
                if(!strcmp(argv[i], "-i")) {
                        fstrncmp = strncasecmp;


@@ -561,9 +555,6 @@ main(int argc, char *argv[]) {
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;

-               else if(!strcmp(argv[i], "-e")) {
-                       if(++i < argc) parent = atoi(argv[i]);
-               }

                else if(!strcmp(argv[i], "-l")) {
                        if(++i < argc) lines = atoi(argv[i]);
                        if(lines > 0)
                else if(!strcmp(argv[i], "-l")) {
                        if(++i < argc) lines = atoi(argv[i]);
                        if(lines > 0)


@@ -587,27 +578,30 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfgcolor = argv[i];
                }

-               else if(!strcmp(argv[i], "-v"))
-                       eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
-               else
-                       eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-                              "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+               else if(!strcmp(argv[i], "-v")) {
+                       printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+                       exit(EXIT_SUCCESS);
+               }
+               else {
+                       fputs("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+                             "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
+                       exit(EXIT_FAILURE);
+               }

        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dmenu: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("cannot open display\n");
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dmenu: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("cannot open display\n");

+       if(atexit(&cleanup) != 0)
+               eprint("cannot register cleanup\n");

        screen = DefaultScreen(dpy);
        screen = DefaultScreen(dpy);

-       if(!parent)
-               parent = RootWindow(dpy, screen);
+       root = RootWindow(dpy, screen);
+       if(!(argp = malloc(sizeof *argp * (argc+2))))
+               eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
+       memcpy(argp + 2, argv + 1, sizeof *argp * argc);

 
        readstdin();
 
        readstdin();

-       running = grabkeyboard();
-
-       setup(topbar);
-       drawmenu();
-       XSync(dpy, False);
+       grabkeyboard();
+       setup();

        run();
        run();

-       cleanup();
-       XCloseDisplay(dpy);
-       return ret;
+       return 0;

 }
 }