mirror of https://github.com/9wm/xss.git
fix xkeygrab latency bug, finally
This commit is contained in:
parent
92bb54aaa2
commit
ebea23e5c0
234
xkeygrab.c
234
xkeygrab.c
|
@ -1,10 +1,11 @@
|
||||||
/* xkeygrab -- grab keyboard and mouse, writing typed lines to stdout
|
/*
|
||||||
* Copyright (C) 2008 Neale Pickett <neale@woozle.org>
|
* xkeygrab -- grab keyboard and mouse, writing typed lines to stdout
|
||||||
|
* Copyright (C) 2008 Neale Pickett <neale@woozle.org>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or
|
||||||
* it under the terms of the GNU General Public License as published by
|
* modify it under the terms of the GNU General Public License as
|
||||||
* the Free Software Foundation, either version 3 of the License, or (at
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
* your option) any later version.
|
* License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful, but
|
* This program is distributed in the hope that it will be useful, but
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -28,104 +29,135 @@
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
Display *display = NULL;
|
Display *display = NULL;
|
||||||
|
|
||||||
if (argc != 1) {
|
if (argc != 1) {
|
||||||
(void)fprintf(stderr, "Usage: %s\n", argv[0]);
|
(void) fprintf(stderr, "Usage: %s\n", argv[0]);
|
||||||
return 64; /* EX_USAGE */
|
return 64; /* EX_USAGE */
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
Window root;
|
|
||||||
char obuf[4096];
|
|
||||||
int obuflen = 0;
|
|
||||||
struct pollfd fds[2];
|
|
||||||
|
|
||||||
if (! (display = XOpenDisplay(NULL))) raise("cannot open display");
|
|
||||||
root = DefaultRootWindow(display);
|
|
||||||
|
|
||||||
fds[0].fd = STDOUT_FILENO;
|
|
||||||
fds[0].events = 0;
|
|
||||||
fds[1].fd = ConnectionNumber(display);
|
|
||||||
fds[1].events = POLLIN;
|
|
||||||
while (1) {
|
|
||||||
int tograb = 3;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (tograb) {
|
|
||||||
if ((tograb & 1) && (GrabSuccess == XGrabKeyboard(display, root,
|
|
||||||
True,
|
|
||||||
GrabModeAsync, GrabModeAsync,
|
|
||||||
CurrentTime))) {
|
|
||||||
tograb |= 1;
|
|
||||||
}
|
|
||||||
if ((tograb & 2) && (GrabSuccess == XGrabPointer(display, root,
|
|
||||||
False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
|
|
||||||
GrabModeAsync, GrabModeAsync,
|
|
||||||
None, None, CurrentTime))) {
|
|
||||||
tograb |= 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = poll(fds, 2, (tograb?100:-1));
|
|
||||||
|
|
||||||
if (fds[0].revents & POLLERR) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (fds[1].revents & POLLIN) {
|
|
||||||
XEvent event;
|
|
||||||
|
|
||||||
(void)XNextEvent(display, &event);
|
|
||||||
if (KeyPress == event.type) {
|
|
||||||
char buf[32];
|
|
||||||
KeySym ksym;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (obuflen == sizeof(obuf)) continue;
|
|
||||||
i = XLookupString(&event.xkey, buf, sizeof(buf), &ksym, NULL);
|
|
||||||
switch (ksym) {
|
|
||||||
case XK_Return:
|
|
||||||
if (obuflen) {
|
|
||||||
(void)write(STDOUT_FILENO, obuf, obuflen);
|
|
||||||
(void)write(STDOUT_FILENO, "\n", 1);
|
|
||||||
obuflen = 0;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case XK_BackSpace:
|
|
||||||
if (obuflen) obuflen -= 1;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if (1 == i) {
|
|
||||||
switch (buf[0]) {
|
|
||||||
case '\025':
|
|
||||||
obuflen = 0;
|
|
||||||
break;
|
|
||||||
case ' ' ... '~':
|
|
||||||
obuf[obuflen++] = buf[0];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (obuflen == sizeof(obuf)) {
|
|
||||||
(void)write(STDOUT_FILENO, obuf, obuflen);
|
|
||||||
obuflen = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} while (0);
|
|
||||||
|
|
||||||
if (display) {
|
try {
|
||||||
(void)XUngrabKeyboard(display, CurrentTime);
|
Window root;
|
||||||
(void)XUngrabPointer(display, CurrentTime);
|
char obuf[4096];
|
||||||
(void)XCloseDisplay(display);
|
int obuflen = 0;
|
||||||
}
|
struct pollfd fds[2];
|
||||||
|
|
||||||
except {
|
if (!(display = XOpenDisplay(NULL)))
|
||||||
(void)fprintf(stderr, "Error: %s\n", exception);
|
raise("cannot open display");
|
||||||
return 69; /* EX_UNAVAILABLE */
|
root = DefaultRootWindow(display);
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
if (getenv("NOROOT")) {
|
||||||
|
int screen = DefaultScreen(display);
|
||||||
|
|
||||||
|
XSetWindowAttributes wa;
|
||||||
|
|
||||||
|
zero(wa);
|
||||||
|
|
||||||
|
wa.override_redirect = 1;
|
||||||
|
wa.background_pixel = BlackPixel(display, screen);
|
||||||
|
root = XCreateWindow(display, root,
|
||||||
|
0, 0,
|
||||||
|
50, 50, 0,
|
||||||
|
CopyFromParent, CopyFromParent,
|
||||||
|
CopyFromParent, CWBackPixel, &wa);
|
||||||
|
XMapWindow(display, root);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fds[0].fd = STDOUT_FILENO;
|
||||||
|
fds[0].events = 0;
|
||||||
|
fds[1].fd = ConnectionNumber(display);
|
||||||
|
fds[1].events = POLLIN;
|
||||||
|
while (1) {
|
||||||
|
int tograb = 3;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (tograb) {
|
||||||
|
if ((tograb & 1)
|
||||||
|
&& (GrabSuccess ==
|
||||||
|
XGrabKeyboard(display, root, True, GrabModeAsync,
|
||||||
|
GrabModeAsync, CurrentTime))) {
|
||||||
|
tograb |= 1;
|
||||||
|
}
|
||||||
|
if ((tograb & 2)
|
||||||
|
&& (GrabSuccess ==
|
||||||
|
XGrabPointer(display, root, False,
|
||||||
|
ButtonPressMask | ButtonReleaseMask |
|
||||||
|
PointerMotionMask, GrabModeAsync,
|
||||||
|
GrabModeAsync, None, None,
|
||||||
|
CurrentTime))) {
|
||||||
|
tograb |= 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = poll(fds, 2, (tograb ? 100 : -1));
|
||||||
|
if (-1 == ret)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (fds[0].revents & POLLERR) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (fds[1].revents & POLLIN) {
|
||||||
|
XEvent event;
|
||||||
|
|
||||||
|
do {
|
||||||
|
(void) XNextEvent(display, &event);
|
||||||
|
if (KeyPress == event.type) {
|
||||||
|
char buf[32];
|
||||||
|
KeySym ksym;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (obuflen == sizeof(obuf))
|
||||||
|
continue;
|
||||||
|
i = XLookupString(&event.xkey, buf, sizeof(buf),
|
||||||
|
&ksym, NULL);
|
||||||
|
switch (ksym) {
|
||||||
|
case XK_Return:
|
||||||
|
if (obuflen) {
|
||||||
|
(void) write(STDOUT_FILENO, obuf,
|
||||||
|
obuflen);
|
||||||
|
(void) write(STDOUT_FILENO, "\n", 1);
|
||||||
|
obuflen = 0;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case XK_BackSpace:
|
||||||
|
if (obuflen)
|
||||||
|
obuflen -= 1;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (1 == i) {
|
||||||
|
switch (buf[0]) {
|
||||||
|
case '\025':
|
||||||
|
obuflen = 0;
|
||||||
|
break;
|
||||||
|
case ' ' ... '~':
|
||||||
|
obuf[obuflen++] = buf[0];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (obuflen == sizeof(obuf)) {
|
||||||
|
(void) write(STDOUT_FILENO, obuf, obuflen);
|
||||||
|
obuflen = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (XPending(display));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while (0);
|
||||||
|
|
||||||
|
if (display) {
|
||||||
|
(void) XUngrabKeyboard(display, CurrentTime);
|
||||||
|
(void) XUngrabPointer(display, CurrentTime);
|
||||||
|
(void) XCloseDisplay(display);
|
||||||
|
}
|
||||||
|
|
||||||
|
except {
|
||||||
|
(void) fprintf(stderr, "Error: %s\n", exception);
|
||||||
|
return 69; /* EX_UNAVAILABLE */
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue