removed libdc dependence

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 9b6a382..9d6088b 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -10,7 +10,7 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <draw.h>
+#include "draw.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))
@@ -39,6 +39,11 @@ static void setup(void);
 static void usage(void);
 
 static char text[BUFSIZ];
+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 const char *prompt = NULL;
@@ -46,10 +51,6 @@ static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";
 static const char *selbgcolor  = "#0066ff";
 static const char *selfgcolor  = "#ffffff";
-static unsigned int bh, mw, mh;
-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int promptw;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
@@ -83,10 +84,10 @@ calcoffsets(void) {
                n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
        for(i = 0, next = curr; next; next = next->right)
-               if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), mw/3)) > n)
+               if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
                        break;
        for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
-               if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), mw/3)) > n)
+               if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
                        break;
 }
 
@@ -124,7 +125,7 @@ drawmenu(void) {
                        drawtext(dc, "<", normcol);
                for(item = curr; item != next; item = item->right) {
                        dc->x += dc->w;
-                       dc->w = MIN(textw(dc, item->text), mw/3);
+                       dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
                        drawtext(dc, item->text, (item == sel) ? selcol : normcol);
                }
                dc->w = textw(dc, ">");
@@ -132,7 +133,7 @@ drawmenu(void) {
                if(next)
                        drawtext(dc, ">", normcol);
        }
-       commitdraw(dc, win, mw, mh);
+       mapdc(dc, win, mw, mh);
 }
 
 char *
@@ -226,14 +227,11 @@ keypress(XKeyEvent *ev) {
                        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:
-               if(isprint(*buf))
+               if(!iscntrl(*buf))
                        insert(buf, strlen(buf));
                break;
        case XK_Delete:
@@ -266,6 +264,10 @@ keypress(XKeyEvent *ev) {
                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);
@@ -444,6 +446,7 @@ setup(void) {
 
        /* menu geometry */
        bh = dc->font.height + 2;
+       lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        if((info = XineramaQueryScreens(dc->dpy, &n))) {
@@ -453,7 +456,8 @@ setup(void) {
 
                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);
@@ -477,9 +481,9 @@ setup(void) {
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
        grabkeyboard();
-       setcanvas(dc, mw, mh);
+       resizedc(dc, mw, mh);
        inputw = MIN(inputw, mw/3);
-       promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+       promptw = prompt ? textw(dc, prompt) : 0;
        XMapRaised(dc->dpy, win);
        text[0] = '\0';
        match();
@@ -512,6 +516,8 @@ main(int argc, char *argv[]) {
                /* 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"))
@@ -527,7 +533,7 @@ main(int argc, char *argv[]) {
                else
                        usage();
 
-       dc = initdraw();
+       dc = initdc();
        initfont(dc, font);
        readstdin();
        setup();