Xinqi Bao's Git
projects
/
dmenu.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
updated to new libdraw
[dmenu.git]
/
dinput.c
diff --git
a/dinput.c
b/dinput.c
index
0bf2679
..
0d0adeb
100644
(file)
--- a/
dinput.c
+++ b/
dinput.c
@@
-1,7
+1,6
@@
/* See LICENSE file for copyright and license details. */
#include <ctype.h>
#include <locale.h>
/* 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>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-12,9
+11,9
@@
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
+#include <draw.h>
/* macros */
/* 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))
#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))
@@
-22,47
+21,35
@@
/* forward declarations */
static void cleanup(void);
/* forward declarations */
static void cleanup(void);
-static void drawcursor(void);
static void drawinput(void);
static void drawinput(void);
-static
Bool
grabkeyboard(void);
+static
void
grabkeyboard(void);
static void kpress(XKeyEvent *e);
static void run(void);
static void kpress(XKeyEvent *e);
static void run(void);
-static void setup(
Bool topbar
);
+static void setup(
void
);
#include "config.h"
#include "config.h"
-#include "draw.h"
/* variables */
static char *prompt = NULL;
static char text[4096];
static int promptw = 0;
/* variables */
static char *prompt = NULL;
static char text[4096];
static int promptw = 0;
-static int ret = 0;
static int screen;
static int screen;
-static
unsigned in
t cursor = 0;
+static
size_
t cursor = 0;
static unsigned int numlockmask = 0;
static unsigned int mw, mh;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
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 DC dc;
static Display *dpy;
-static Window win,
paren
t;
+static Window win,
roo
t;
void
cleanup(void) {
cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
void
cleanup(void) {
cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
-}
-
-void
-drawcursor(void) {
- XRectangle r = { dc.x, dc.y + 2, 1, dc.font.height - 2 };
-
- r.x += textnw(&dc, text, cursor) + dc.font.height / 2;
-
- XSetForeground(dpy, dc.gc, normcol[ColFG]);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ XCloseDisplay(dpy);
}
void
}
void
@@
-72,31
+59,30
@@
drawinput(void)
dc.y = 0;
dc.w = mw;
dc.h = mh;
dc.y = 0;
dc.w = mw;
dc.h = mh;
- drawtext(&dc, NULL, normcol
, False
);
+ drawtext(&dc, NULL, normcol);
/* print prompt? */
if(prompt) {
dc.w = promptw;
/* print prompt? */
if(prompt) {
dc.w = promptw;
- drawtext(&dc, prompt, selcol
, False
);
+ drawtext(&dc, prompt, selcol);
dc.x += dc.w;
}
dc.w = mw - dc.x;
dc.x += dc.w;
}
dc.w = mw - dc.x;
- drawtext(&dc, *text ? text : NULL, normcol, False);
- drawcursor();
- XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
- XFlush(dpy);
+ drawtext(&dc, text, normcol);
+ drawcursor(&dc, text, cursor, normcol);
+ commitdraw(&dc, win);
}
}
-Bool
+void
grabkeyboard(void) {
unsigned int len;
for(len = 1000; len; len--) {
grabkeyboard(void) {
unsigned int len;
for(len = 1000; len; len--) {
- if(XGrabKeyboard(dpy,
paren
t, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+ if(XGrabKeyboard(dpy,
roo
t, True, GrabModeAsync, GrabModeAsync, CurrentTime)
== GrabSuccess)
== GrabSuccess)
-
break
;
+
return
;
usleep(1000);
}
usleep(1000);
}
-
return len > 0
;
+
exit(EXIT_FAILURE)
;
}
void
}
void
@@
-202,9
+188,7
@@
kpress(XKeyEvent *e) {
cursor = len;
break;
case XK_Escape:
cursor = len;
break;
case XK_Escape:
- ret = 1;
- running = False;
- return;
+ exit(EXIT_FAILURE);
case XK_Home:
cursor = 0;
break;
case XK_Home:
cursor = 0;
break;
@@
-216,8
+200,7
@@
kpress(XKeyEvent *e) {
case XK_Return:
fprintf(stdout, "%s", text);
fflush(stdout);
case XK_Return:
fprintf(stdout, "%s", text);
fflush(stdout);
- running = False;
- return;
+ exit(EXIT_SUCCESS);
case XK_Right:
if(cursor == len)
return;
case XK_Right:
if(cursor == len)
return;
@@
-232,7
+215,8
@@
run(void) {
XEvent ev;
/* main event loop */
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);
switch(ev.type) {
case KeyPress:
kpress(&ev.xkey);
@@
-242,14
+226,15
@@
run(void) {
drawinput();
break;
case VisibilityNotify:
drawinput();
break;
case VisibilityNotify:
- if
(ev.xvisibility.state != VisibilityUnobscured)
+ if(ev.xvisibility.state != VisibilityUnobscured)
XRaiseWindow(dpy, win);
break;
}
XRaiseWindow(dpy, win);
break;
}
+ exit(EXIT_FAILURE);
}
void
}
void
-setup(
Bool topbar
) {
+setup(
void
) {
int i, j, x, y;
#if XINERAMA
int n;
int i, j, x, y;
#if XINERAMA
int n;
@@
-257,7
+242,6
@@
setup(Bool topbar) {
#endif
XModifierKeymap *modmap;
XSetWindowAttributes wa;
#endif
XModifierKeymap *modmap;
XSetWindowAttributes wa;
- XWindowAttributes pwa;
/* init modifier map */
modmap = XGetModifierMapping(dpy);
/* init modifier map */
modmap = XGetModifierMapping(dpy);
@@
-284,13
+268,13
@@
setup(Bool topbar) {
/* input window geometry */
mh = dc.font.height + 2;
#if XINERAMA
/* 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;
i = 0;
if(n > 1) {
int di;
unsigned int dui;
Window dummy;
- if(XQueryPointer(dpy,
paren
t, &dummy, &dummy, &x, &y, &di, &di, &dui))
+ if(XQueryPointer(dpy,
roo
t, &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;
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;
@@
-303,13
+287,12
@@
setup(Bool topbar) {
else
#endif
{
else
#endif
{
- XGetWindowAttributes(dpy, parent, &pwa);
x = 0;
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,
paren
t, x, y, mw, mh, 0,
+ win = XCreateWindow(dpy,
roo
t, x, y, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@
-324,16
+307,16
@@
setup(Bool topbar) {
int
main(int argc, char *argv[]) {
unsigned int i;
int
main(int argc, char *argv[]) {
unsigned int i;
- Bool topbar = True;
/* command line args */
/* command line args */
- progname =
argv[0]
;
+ progname =
"dinput"
;
for(i = 1; i < argc; i++)
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;
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];
}
else if(!strcmp(argv[i], "-fn")) {
if(++i < argc) font = argv[i];
}
@@
-352,27
+335,28
@@
main(int argc, char *argv[]) {
else if(!strcmp(argv[i], "-sf")) {
if(++i < argc) selfgcolor = argv[i];
}
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 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] [-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)))
eprint("cannot open display\n");
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
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);
screen = DefaultScreen(dpy);
- if(!parent)
- parent = RootWindow(dpy, screen);
+ root = RootWindow(dpy, screen);
- running = grabkeyboard();
- setup(topbar);
- drawinput();
- XSync(dpy, False);
+ grabkeyboard();
+ setup();
run();
run();
- cleanup();
- XCloseDisplay(dpy);
- return ret;
+ return 0;
}
}