moved draw.c to libdraw.a

[dmenu.git] / dinput.c

diff --git a/dinput.c b/dinput.c
index 15f5e26..283b018 100644 (file)
--- a/dinput.c
+++ b/dinput.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <strings.h>

 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>


@@ -38,20 +37,20 @@ static char *prompt = NULL;
 static char text[4096];
 static int promptw = 0;
 static int ret = 0;
 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 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 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) {
 
 void
 cleanup(void) {

-       drawcleanup();
+       cleanupdraw(&dc);

        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
 }
        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 };
 
 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);
 }
 
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 }
 


@@ -73,15 +72,15 @@ drawinput(void)
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;

-       drawtext(NULL, dc.norm);
+       drawtext(&dc, NULL, normcol);

        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;

-               drawtext(prompt, dc.sel);
+               drawtext(&dc, prompt, selcol);

                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;

-       drawtext(*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);
        drawcursor();
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);


@@ -269,15 +268,21 @@ setup(Bool topbar) {
                }
        XFreeModifiermap(modmap);
 
                }
        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);
+       fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);

 
 

-       /* menu window */
+       /* input window */

        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
 
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | 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;
 #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);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       drawsetup();
+       setupdraw(&dc, win);

        if(prompt)
        if(prompt)

-               promptw = MIN(textw(prompt), mw / 5);
+               promptw = MIN(textw(&dc, prompt), mw / 5);

        cursor = strlen(text);
        XMapRaised(dpy, win);
 }
        cursor = strlen(text);
        XMapRaised(dpy, win);
 }