cleaned up

[dmenu.git] / dinput.c

diff --git a/dinput.c b/dinput.c
index 39889b3..228780c 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>
@@ -26,7 +25,7 @@ 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);
 
@@ -42,6 +41,8 @@ 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 DC dc;
 static Display *dpy;
@@ -60,7 +61,7 @@ drawcursor(void) {
 
        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);
 }
 
@@ -71,15 +72,15 @@ drawinput(void)
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
-       drawtext(&dc, NULL, dc.norm);
+       drawtext(&dc, NULL, normcol);
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
-               drawtext(&dc, prompt, dc.sel);
+               drawtext(&dc, prompt, selcol);
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
-       drawtext(&dc, *text ? text : NULL, dc.norm);
+       drawtext(&dc, *text ? text : NULL, normcol);
        drawcursor();
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
@@ -99,7 +100,7 @@ grabkeyboard(void) {
 }
 
 void
-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {
        char buf[sizeof text];
        int num;
        unsigned int i, len;
@@ -139,6 +140,7 @@ kpress(XKeyEvent * e) {
                        ksym = XK_BackSpace;
                        break;
                case XK_j:
+               case XK_m:
                        ksym = XK_Return;
                        break;
                case XK_k:
@@ -268,17 +270,16 @@ setup(Bool topbar) {
        XFreeModifiermap(modmap);
 
        dc.dpy = dpy;
-       dc.norm[ColBG] = getcolor(&dc, normbgcolor);
-       dc.norm[ColFG] = getcolor(&dc, normfgcolor);
-       dc.sel[ColBG] = getcolor(&dc, selbgcolor);
-       dc.sel[ColFG] = getcolor(&dc, selfgcolor);
+       normcol[ColBG] = getcolor(&dc, normbgcolor);
+       normcol[ColFG] = getcolor(&dc, normfgcolor);
+       selcol[ColBG] = getcolor(&dc, selbgcolor);
+       selcol[ColFG] = getcolor(&dc, selfgcolor);
        initfont(&dc, font);
-       fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);
 
        /* input window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 
        /* input window geometry */
        mh = dc.font.height + 2;