-m flag to fix dwm selmon bug

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 22fbfed..f0be02a 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -10,7 +10,7 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif

-#include <draw.h>
+#include <dc.h>

 
 #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 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))


@@ -42,6 +42,7 @@ static char text[BUFSIZ];
 static int bh, mw, mh;
 static int inputw = 0;
 static int lines = 0;
 static int bh, mw, mh;
 static int inputw = 0;
 static int lines = 0;

+static int monitor = -1;

 static int promptw;
 static size_t cursor = 0;
 static const char *font = NULL;
 static int promptw;
 static size_t cursor = 0;
 static const char *font = NULL;


@@ -83,10 +84,10 @@ calcoffsets(void) {
                n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
 
        for(i = 0, next = curr; next; next = next->right)
                n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
 
        for(i = 0, next = curr; next; next = next->right)

-               if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), mw/3)) > n)
+               if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n)

                        break;
        for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
                        break;
        for(i = 0, prev = curr; prev && prev->left; prev = prev->left)

-               if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), mw/3)) > n)
+               if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), n)) > n)

                        break;
 }
 
                        break;
 }
 


@@ -124,7 +125,7 @@ drawmenu(void) {
                        dc_drawtext(dc, "<", normcol);
                for(item = curr; item != next; item = item->right) {
                        dc->x += dc->w;
                        dc_drawtext(dc, "<", normcol);
                for(item = curr; item != next; item = item->right) {
                        dc->x += dc->w;

-                       dc->w = MIN(dc_textw(dc, item->text), mw/3);
+                       dc->w = MIN(dc_textw(dc, item->text), mw - dc->x - dc_textw(dc, ">"));

                        dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
                }
                dc->w = dc_textw(dc, ">");
                        dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
                }
                dc->w = dc_textw(dc, ">");


@@ -226,14 +227,11 @@ keypress(XKeyEvent *ev) {
                        while(cursor > 0 && text[nextrune(-1)] != ' ')
                                insert(NULL, nextrune(-1) - cursor);
                        break;
                        while(cursor > 0 && text[nextrune(-1)] != ' ')
                                insert(NULL, nextrune(-1) - cursor);
                        break;

-               case XK_y:  /* paste selection */
-                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
-                       return;

                }
        }
        switch(ksym) {
        default:
                }
        }
        switch(ksym) {
        default:

-               if(isprint(*buf))
+               if(!iscntrl(*buf))

                        insert(buf, strlen(buf));
                break;
        case XK_Delete:
                        insert(buf, strlen(buf));
                break;
        case XK_Delete:


@@ -266,6 +264,10 @@ keypress(XKeyEvent *ev) {
                sel = curr = matches;
                calcoffsets();
                break;
                sel = curr = matches;
                calcoffsets();
                break;

+       case XK_Insert:  /* paste selection */
+               if(ev->state & ShiftMask)
+                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+               return;

        case XK_Left:
                if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);
        case XK_Left:
                if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);


@@ -454,7 +456,8 @@ setup(void) {
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                for(i = 0; i < n; i++)
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                for(i = 0; i < n; i++)

-                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+                       if((monitor == info[i].screen_number)
+                       || (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))

                                break;
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
                                break;
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);


@@ -480,7 +483,7 @@ setup(void) {
        grabkeyboard();
        dc_resize(dc, mw, mh);
        inputw = MIN(inputw, mw/3);
        grabkeyboard();
        dc_resize(dc, mw, mh);
        inputw = MIN(inputw, mw/3);

-       promptw = prompt ? MIN(dc_textw(dc, prompt), mw/5) : 0;
+       promptw = prompt ? dc_textw(dc, prompt) : 0;

        XMapRaised(dc->dpy, win);
        text[0] = '\0';
        match();
        XMapRaised(dc->dpy, win);
        text[0] = '\0';
        match();


@@ -513,6 +516,8 @@ main(int argc, char *argv[]) {
                /* double flags */
                else if(!strcmp(argv[i], "-l"))
                        lines = atoi(argv[++i]);
                /* double flags */
                else if(!strcmp(argv[i], "-l"))
                        lines = atoi(argv[++i]);

+               else if(!strcmp(argv[i], "-m"))
+                       monitor = atoi(argv[++i]);

                else if(!strcmp(argv[i], "-p"))
                        prompt = argv[++i];
                else if(!strcmp(argv[i], "-fn"))
                else if(!strcmp(argv[i], "-p"))
                        prompt = argv[++i];
                else if(!strcmp(argv[i], "-fn"))