added Xinerama support to dmenu, reverted -b behavior, removed -x, -y, -w

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 5191a20..0faa02e 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -9,6 +9,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 
 /* macros */
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
@@ -56,7 +59,7 @@ void kpress(XKeyEvent * e);
 void match(char *pattern);
 void readstdin(void);
 void run(void);
-void setup(int x, int y, int w);
+void setup(Bool topbar);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 
@@ -76,7 +79,6 @@ int ret = 0;
 unsigned int cmdw = 0;
 unsigned int mw, mh;
 unsigned int promptw = 0;
-unsigned int nitem = 0;
 unsigned int numlockmask = 0;
 Bool running = True;
 Display *dpy;
@@ -296,7 +298,7 @@ grabkeyboard(void) {
 
        for(len = 1000; len; len--) {
                if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-                       == GrabSuccess)
+               == GrabSuccess)
                        break;
                usleep(1000);
        }
@@ -354,16 +356,14 @@ kpress(XKeyEvent * e) {
        len = strlen(text);
        buf[0] = 0;
        num = XLookupString(e, buf, sizeof buf, &ksym, 0);
-       if(IsKeypadKey(ksym)) { 
-               if(ksym == XK_KP_Enter) {
+       if(IsKeypadKey(ksym))
+               if(ksym == XK_KP_Enter)
                        ksym = XK_Return;
-               } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
+               else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
                        ksym = (ksym - XK_KP_0) + XK_0;
-               }
-       }
        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-                       || IsPrivateKeypadKey(ksym))
+       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
+       || IsPrivateKeypadKey(ksym))
                return;
        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {
@@ -524,27 +524,20 @@ match(char *pattern) {
                return;
        plen = strlen(pattern);
        item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       nitem = 0;
        for(i = allitems; i; i = i->next)
-               if(!fstrncmp(pattern, i->text, plen + 1)) {
+               if(!fstrncmp(pattern, i->text, plen + 1))
                        appenditem(i, &lexact, &exactend);
-                       nitem++;
-               }
-               else if(!fstrncmp(pattern, i->text, plen)) {
+               else if(!fstrncmp(pattern, i->text, plen))
                        appenditem(i, &lprefix, &prefixend);
-                       nitem++;
-               }
-               else if(fstrstr(i->text, pattern)) {
+               else if(fstrstr(i->text, pattern))
                        appenditem(i, &lsubstr, &substrend);
-                       nitem++;
-               }
        if(lexact) {
                item = lexact;
                itemend = exactend;
        }
        if(lprefix) {
                if(itemend) {
-                       itemend->right - lprefix;
+                       itemend->right = lprefix;
                        lprefix->left = itemend;
                }
                else
@@ -610,10 +603,13 @@ run(void) {
 }
 
 void
-setup(int x, int y, int w) {
-       unsigned int i, j;
+setup(Bool topbar) {
+       int i, j, x, y;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
+#if XINERAMA
+       XineramaScreenInfo *info = NULL;
+#endif
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
@@ -636,14 +632,25 @@ setup(int x, int y, int w) {
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-       mw = w ? w : DisplayWidth(dpy, screen);
+
+       /* menu window geometry */
        mh = dc.font.height + 2;
-       if(y < 0) {
-               if(y == (int)(unsigned int)-1)
-                       y = DisplayHeight(dpy, screen) - mh;
-               else
-                       y = (-1 * y) - mh;
+#if XINERAMA
+       if(XineramaIsActive(dpy)) {
+               info = XineramaQueryScreens(dpy, &i);
+               x = info[0].x_org;
+               y = topbar ? info[0].y_org : info[0].y_org + info[0].height - mh;
+               mw = info[0].width;
+               XFree(info);
        }
+       else
+#endif
+       {
+               x = 0;
+               y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
+               mw = DisplayWidth(dpy, screen);
+       }
+
        win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
@@ -686,8 +693,8 @@ textw(const char *text) {
 
 int
 main(int argc, char *argv[]) {
-       int x = 0, y = 0, w = 0;
        unsigned int i;
+       Bool topbar = True;
 
        /* command line args */
        for(i = 1; i < argc; i++)
@@ -695,6 +702,8 @@ main(int argc, char *argv[]) {
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
                }
+               else if(!strcmp(argv[i], "-b"))
+                       topbar = False;
                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }
@@ -713,26 +722,11 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfg = argv[i];
                }
-               else if(!strcmp(argv[i], "-x")) {
-                       if(++i < argc) x = atoi(argv[i]);
-               }
-               else if(!strcmp(argv[i], "-y")) {
-                       if(++i < argc) {
-                               if(!strcmp(argv[i], "-0"))
-                                       y = (int)(unsigned int)-1;
-                               else
-                                       y = atoi(argv[i]);
-                       }
-               }
-               else if(!strcmp(argv[i], "-w")) {
-                       if(++i < argc) w = atoi(argv[i]);
-               }
                else if(!strcmp(argv[i], "-v"))
                        eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
                else
-                       eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                              "             [-p <prompt>] [-sb <color>] [-sf <color>]\n"
-                              "             [-x <x>] [-y <y>] [-w <w>] [-v]\n");
+                       eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+                              "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
        setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)
@@ -749,7 +743,7 @@ main(int argc, char *argv[]) {
                readstdin();
        }
 
-       setup(x, y, w);
+       setup(topbar);
        drawmenu();
        XSync(dpy, False);
        run();