X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dinput.c;h=283b018c2e93633685c6013da09afaf5acb65f85;hb=4508fd2c4ee3171bdc1bffb7e53ecda8290292ef;hp=52118e58dd75747a3c86cf69deee9eb8aad05b44;hpb=bba30e26863c75e66678f9d028d394883d86150a;p=dmenu.git

diff --git a/dinput.c b/dinput.c
index 52118e5..283b018 100644
--- 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>
@@ -25,13 +24,13 @@
 static void cleanup(void);
 static void drawcursor(void);
 static void drawinput(void);
-static void eprint(const char *errstr, ...);
 static Bool grabkeyboard(void);
 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;
@@ -39,18 +38,19 @@ static char text[4096];
 static int promptw = 0;
 static int ret = 0;
 static int screen;
-static unsigned int mw, mh;
 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;
-static Window parent, win;
-
-#include "draw.c"
+static Window win, parent;
 
 void
 cleanup(void) {
-	dccleanup();
+	cleanupdraw(&dc);
 	XDestroyWindow(dpy, win);
 	XUngrabKeyboard(dpy, CurrentTime);
 }
@@ -59,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);
 }
 
@@ -72,30 +72,20 @@ drawinput(void)
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(NULL, dc.norm);
+	drawtext(&dc, NULL, normcol);
 	/* print prompt? */
 	if(prompt) {
 		dc.w = promptw;
-		drawtext(prompt, dc.sel);
+		drawtext(&dc, prompt, selcol);
 		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);
 }
 
-void
-eprint(const char *errstr, ...) {
-	va_list ap;
-
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
-}
-
 Bool
 grabkeyboard(void) {
 	unsigned int len;
@@ -173,7 +163,7 @@ kpress(XKeyEvent * e) {
 				FILE *fp;
 				char *s;
 				if(!(fp = popen("sselp", "r")))
-					eprint("dinput: cannot popen sselp\n");
+					eprint("cannot popen sselp\n");
 				s = fgets(buf, sizeof buf, fp);
 				pclose(fp);
 				if(s == NULL)
@@ -278,15 +268,21 @@ 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);
+	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;
 
-	/* 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;
@@ -318,9 +314,9 @@ setup(Bool topbar) {
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-	dcsetup();
+	setupdraw(&dc, win);
 	if(prompt)
-		promptw = MIN(textw(prompt), mw / 5);
+		promptw = MIN(textw(&dc, prompt), mw / 5);
 	cursor = strlen(text);
 	XMapRaised(dpy, win);
 }
@@ -331,6 +327,7 @@ main(int argc, char *argv[]) {
 	Bool topbar = True;
 
 	/* command line args */
+	progname = argv[0];
 	for(i = 1; i < argc; i++)
 		if(!strcmp(argv[i], "-b"))
 			topbar = False;
@@ -365,7 +362,7 @@ main(int argc, char *argv[]) {
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fprintf(stderr, "dinput: warning: no locale support\n");
 	if(!(dpy = XOpenDisplay(NULL)))
-		eprint("dinput: cannot open display\n");
+		eprint("cannot open display\n");
 	screen = DefaultScreen(dpy);
 	if(!parent)
 		parent = RootWindow(dpy, screen);