implemented early keyboard grab for dmenu with a timeout for stdin data writers to prevent endless grabbings of the keyboard
This commit is contained in:
parent
0fa5a339ff
commit
32f7fe4835
|
@ -8,3 +8,4 @@
|
||||||
#define SELFGCOLOR "#eeeeee"
|
#define SELFGCOLOR "#eeeeee"
|
||||||
#define NORMBGCOLOR "#333333"
|
#define NORMBGCOLOR "#333333"
|
||||||
#define NORMFGCOLOR "#dddddd"
|
#define NORMFGCOLOR "#dddddd"
|
||||||
|
#define STDIN_TIMEOUT 3 /* seconds */
|
||||||
|
|
|
@ -8,3 +8,4 @@
|
||||||
#define SELFGCOLOR "#eeeeee"
|
#define SELFGCOLOR "#eeeeee"
|
||||||
#define NORMBGCOLOR "#333366"
|
#define NORMBGCOLOR "#333366"
|
||||||
#define NORMFGCOLOR "#cccccc"
|
#define NORMFGCOLOR "#cccccc"
|
||||||
|
#define STDIN_TIMEOUT 3 /* seconds */
|
||||||
|
|
23
main.c
23
main.c
|
@ -11,6 +11,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/time.h>
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
|
@ -290,6 +292,8 @@ int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
char *maxname;
|
char *maxname;
|
||||||
|
fd_set rd;
|
||||||
|
struct timeval timeout;
|
||||||
Item *i;
|
Item *i;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
XSetWindowAttributes wa;
|
XSetWindowAttributes wa;
|
||||||
|
@ -307,13 +311,23 @@ main(int argc, char *argv[])
|
||||||
screen = DefaultScreen(dpy);
|
screen = DefaultScreen(dpy);
|
||||||
root = RootWindow(dpy, screen);
|
root = RootWindow(dpy, screen);
|
||||||
|
|
||||||
maxname = readstdin();
|
/* Note, the select() construction allows to grab all keypresses as
|
||||||
|
* early as possible, to not loose them. But if there is no standard
|
||||||
/* grab as early as possible, but after reading all items!!! */
|
* input supplied, we will make sure to exit after MAX_WAIT_STDIN
|
||||||
|
* seconds. This is convenience behavior for rapid typers.
|
||||||
|
*/
|
||||||
while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
|
while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
|
||||||
GrabModeAsync, CurrentTime) != GrabSuccess)
|
GrabModeAsync, CurrentTime) != GrabSuccess)
|
||||||
usleep(1000);
|
usleep(1000);
|
||||||
|
|
||||||
|
timeout.tv_usec = 0;
|
||||||
|
timeout.tv_sec = STDIN_TIMEOUT;
|
||||||
|
FD_ZERO(&rd);
|
||||||
|
FD_SET(STDIN_FILENO, &rd);
|
||||||
|
if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
|
||||||
|
goto UninitializedEnd;
|
||||||
|
maxname = readstdin();
|
||||||
|
|
||||||
/* style */
|
/* style */
|
||||||
dc.sel[ColBG] = getcolor(SELBGCOLOR);
|
dc.sel[ColBG] = getcolor(SELBGCOLOR);
|
||||||
dc.sel[ColFG] = getcolor(SELFGCOLOR);
|
dc.sel[ColFG] = getcolor(SELFGCOLOR);
|
||||||
|
@ -366,7 +380,6 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
XUngrabKeyboard(dpy, CurrentTime);
|
|
||||||
while(allitems) {
|
while(allitems) {
|
||||||
i = allitems->next;
|
i = allitems->next;
|
||||||
free(allitems->text);
|
free(allitems->text);
|
||||||
|
@ -380,6 +393,8 @@ main(int argc, char *argv[])
|
||||||
XFreePixmap(dpy, dc.drawable);
|
XFreePixmap(dpy, dc.drawable);
|
||||||
XFreeGC(dpy, dc.gc);
|
XFreeGC(dpy, dc.gc);
|
||||||
XDestroyWindow(dpy, win);
|
XDestroyWindow(dpy, win);
|
||||||
|
UninitializedEnd:
|
||||||
|
XUngrabKeyboard(dpy, CurrentTime);
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue