/* See LICENSE file for copyright and license details. */
#include <ctype.h>
#include <locale.h>
-#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
+#include <draw.h>
/* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#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))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
static Bool grabkeyboard(void);
static void kpress(XKeyEvent *e);
static void run(void);
-static void setup(Bool topbar);
+static void setup(void);
#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 Bool topbar = True;
static DC dc;
static Display *dpy;
-static Window win, parent;
+static Window win, root;
void
cleanup(void) {
cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
+ XCloseDisplay(dpy);
}
void
/* print prompt? */
if(prompt) {
dc.w = promptw;
- drawtext(&dc, prompt, normcol, False);
+ drawtext(&dc, prompt, selcol, False);
dc.x += dc.w;
}
dc.w = mw - dc.x;
- drawtext(&dc, *text ? text : NULL, selcol, False);
+ drawtext(&dc, *text ? text : NULL, normcol, False);
drawcursor();
XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
- XFlush(dpy);
}
Bool
unsigned int len;
for(len = 1000; len; len--) {
- if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+ if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
== GrabSuccess)
break;
usleep(1000);
cursor = len;
break;
case XK_Escape:
- ret = 1;
- running = False;
- return;
+ exit(EXIT_FAILURE);
case XK_Home:
cursor = 0;
break;
case XK_Return:
fprintf(stdout, "%s", text);
fflush(stdout);
- running = False;
- return;
+ exit(EXIT_SUCCESS);
case XK_Right:
if(cursor == len)
return;
XEvent ev;
/* main event loop */
- while(running && !XNextEvent(dpy, &ev))
+ XSync(dpy, False);
+ while(!XNextEvent(dpy, &ev))
switch(ev.type) {
case KeyPress:
kpress(&ev.xkey);
drawinput();
break;
case VisibilityNotify:
- if (ev.xvisibility.state != VisibilityUnobscured)
+ if(ev.xvisibility.state != VisibilityUnobscured)
XRaiseWindow(dpy, win);
break;
}
+ exit(EXIT_FAILURE);
}
void
-setup(Bool topbar) {
+setup(void) {
int i, j, x, y;
#if XINERAMA
int n;
#endif
XModifierKeymap *modmap;
XSetWindowAttributes wa;
- XWindowAttributes pwa;
/* init modifier map */
modmap = XGetModifierMapping(dpy);
/* input window geometry */
mh = dc.font.height + 2;
#if XINERAMA
- if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+ if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
i = 0;
if(n > 1) {
int di;
unsigned int dui;
Window dummy;
- if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))
+ if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
for(i = 0; i < n; i++)
if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
break;
else
#endif
{
- XGetWindowAttributes(dpy, parent, &pwa);
x = 0;
- y = topbar ? 0 : pwa.height - mh;
- mw = pwa.width;
+ y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
+ mw = DisplayWidth(dpy, screen);
}
- win = XCreateWindow(dpy, parent, x, y, mw, mh, 0,
+ win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
int
main(int argc, char *argv[]) {
unsigned int i;
- Bool topbar = True;
/* command line args */
- progname = argv[0];
+ progname = "dinput";
for(i = 1; i < argc; i++)
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")) {
else if(!*text)
strncpy(text, argv[i], sizeof text);
else {
- fputs("usage: dinput [-b] [-e <xid>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+ fputs("usage: dinput [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
" [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n", stderr);
exit(EXIT_FAILURE);
}
fprintf(stderr, "dinput: warning: no locale support\n");
if(!(dpy = XOpenDisplay(NULL)))
eprint("cannot open display\n");
+ if(atexit(&cleanup) != 0)
+ eprint("cannot register cleanup\n");
screen = DefaultScreen(dpy);
- if(!parent)
- parent = RootWindow(dpy, screen);
+ root = RootWindow(dpy, screen);
- running = grabkeyboard();
- setup(topbar);
- drawinput();
- XSync(dpy, False);
+ grabkeyboard();
+ setup();
run();
- cleanup();
- XCloseDisplay(dpy);
- return ret;
+ return 0;
}