libdraw now has own repo

[dmenu.git] / dinput.c

diff --git a/dinput.c b/dinput.c
index 15f5e26..64ce036 100644 (file)
--- a/dinput.c
+++ b/dinput.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
@@ -13,6 +12,7 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
+#include <draw.h>
 
 /* macros */
 #define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
@@ -26,32 +26,31 @@ static void cleanup(void);
 static void drawcursor(void);
 static void drawinput(void);
 static Bool grabkeyboard(void);
-static void kpress(XKeyEvent * e);
+static void kpress(XKeyEvent *e);
 static void run(void);
 static void setup(Bool topbar);
 
 #include "config.h"
-#include "draw.h"
 
 /* variables */
 static char *prompt = NULL;
 static char text[4096];
 static int promptw = 0;
 static int ret = 0;
+static int screen;
 static unsigned int cursor = 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 Window win;
-
-Display *dpy;
-DC dc;
-int screen;
-unsigned int mw, mh;
-Window parent;
+static DC dc;
+static Display *dpy;
+static Window win, parent;
 
 void
 cleanup(void) {
-       drawcleanup();
+       cleanupdraw(&dc);
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
 }
@@ -60,9 +59,9 @@ void
 drawcursor(void) {
        XRectangle r = { dc.x, dc.y + 2, 1, dc.font.height - 2 };
 
-       r.x += textnw(text, cursor) + dc.font.height / 2;
+       r.x += textnw(&dc, text, cursor) + dc.font.height / 2;
 
-       XSetForeground(dpy, dc.gc, dc.norm[ColFG]);
+       XSetForeground(dpy, dc.gc, normcol[ColFG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 }
 
@@ -73,15 +72,15 @@ drawinput(void)
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
-       drawtext(NULL, dc.norm);
+       drawtext(&dc, NULL, normcol, False);
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
-               drawtext(prompt, dc.sel);
+               drawtext(&dc, prompt, selcol, False);
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
-       drawtext(*text ? text : NULL, dc.norm);
+       drawtext(&dc, *text ? text : NULL, normcol, False);
        drawcursor();
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
@@ -101,7 +100,7 @@ grabkeyboard(void) {
 }
 
 void
-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {
        char buf[sizeof text];
        int num;
        unsigned int i, len;
@@ -141,6 +140,7 @@ kpress(XKeyEvent * e) {
                        ksym = XK_BackSpace;
                        break;
                case XK_j:
+               case XK_m:
                        ksym = XK_Return;
                        break;
                case XK_k:
@@ -233,7 +233,7 @@ run(void) {
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
-               switch (ev.type) {
+               switch(ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);
                        break;
@@ -269,15 +269,20 @@ setup(Bool topbar) {
                }
        XFreeModifiermap(modmap);
 
-       initfont(font);
+       dc.dpy = dpy;
+       normcol[ColBG] = getcolor(&dc, normbgcolor);
+       normcol[ColFG] = getcolor(&dc, normfgcolor);
+       selcol[ColBG] = getcolor(&dc, selbgcolor);
+       selcol[ColFG] = getcolor(&dc, selfgcolor);
+       initfont(&dc, font);
 
-       /* menu window */
+       /* input window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 
-       /* menu window geometry */
-       mh = (dc.font.height + 2);
+       /* input window geometry */
+       mh = dc.font.height + 2;
 #if XINERAMA
        if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
                i = 0;
@@ -309,9 +314,9 @@ setup(Bool topbar) {
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-       drawsetup();
+       setupdraw(&dc, win);
        if(prompt)
-               promptw = MIN(textw(prompt), mw / 5);
+               promptw = MIN(textw(&dc, prompt), mw / 5);
        cursor = strlen(text);
        XMapRaised(dpy, win);
 }
@@ -324,11 +329,15 @@ main(int argc, char *argv[]) {
        /* command line args */
        progname = argv[0];
        for(i = 1; i < argc; i++)
-               if(!strcmp(argv[i], "-b"))
+               if(!strcmp(argv[i], "-i"))
+                       ;  /* ignore flag */
+               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"))
+                       i++;  /* ignore flag */
                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }
@@ -347,13 +356,17 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfgcolor = argv[i];
                }
-               else if(!strcmp(argv[i], "-v"))
-                       eprint("dinput-"VERSION", © 2006-2010 dinput engineers, see LICENSE for details\n");
+               else if(!strcmp(argv[i], "-v")) {
+                       printf("dinput-"VERSION", © 2006-2010 dinput engineers, see LICENSE for details\n");
+                       exit(EXIT_SUCCESS);
+               }
                else if(!*text)
                        strncpy(text, argv[i], sizeof text);
-               else
-                       eprint("usage: dinput [-b] [-e <xid>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                              "              [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n");
+               else {
+                       fputs("usage: dinput [-b] [-e <xid>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+                             "              [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n", stderr);
+                       exit(EXIT_FAILURE);
+               }
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dinput: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))