suckless
/
svkbd
mirror of git://git.suckless.org/svkbd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implemented key output option to stdout

This commit is contained in:
Maarten van Gompel 2021-03-06 21:40:40 +01:00 committed by Hiltjo Posthuma
parent d06db9eb4f
commit 174c86d8fa
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
svkbd.c
View File

@ -10,6 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
@ -171,7 +172,7 @@ motionnotify(XEvent *e)
if ((lostfocus != -1) && (gainedfocus != -1) && (lostfocus != gainedfocus)) { if ((lostfocus != -1) && (gainedfocus != -1) && (lostfocus != gainedfocus)) {
if (debug) printdbg("Clicking new key that gained focus\n"); if (debug) printdbg("Clicking new key that gained focus\n");
press(&keys[gainedfocus], keys[gainedfocus].keysym); press(&keys[gainedfocus], 0);
} }
} }
@ -440,7 +441,7 @@ press(Key *k, KeySym mod)
record_press_begin(k->keysym); record_press_begin(k->keysym);
//} //}
} else { } else {
if (debug) printdbg("Simulating press: %ld\n", k->keysym); if (debug) printdbg("Simulating press: %ld (mod %ld)\n", k->keysym, mod);
for (i = 0; i < numkeys; i++) { for (i = 0; i < numkeys; i++) {
if (keys[i].pressed && IsModifierKey(keys[i].keysym)) { if (keys[i].pressed && IsModifierKey(keys[i].keysym)) {
simulate_keypress(keys[i].keysym); simulate_keypress(keys[i].keysym);
@ -474,22 +475,43 @@ tmp_remap(KeySym keysym)
void void
printkey(Key *k, KeySym mod) { printkey(Key *k, KeySym mod) {
if (k->keysym == XK_Cancel) return; int shift = (mod == XK_Shift_L) || (mod == XK_Shift_R) || (mod == XK_Shift_Lock);
const char *l = 0; if (!shift) {
if ((mod == XK_Shift_L) || (mod == XK_Shift_R) || (mod == XK_Shift_Lock)) { for (int i = 0; i < numkeys; i++) {
KeySym upper = 0; if ((keys[i].pressed) && ((keys[i].keysym == XK_Shift_L) || (keys[i].keysym == XK_Shift_R) || (keys[i].keysym == XK_Shift_Lock))) {
XConvertCase(k->keysym, NULL, &upper); shift = True;
l = XKeysymToString(upper); break;
} else { }
l = XKeysymToString(k->keysym); }
} }
if (l != 0) printf("%s",l); if (debug) printdbg("Printing key %ld (shift=%d)\n", k->keysym, shift);
if (k->keysym == XK_Cancel) return;
KeySym * keysym = &(k->keysym);
XIM xim = XOpenIM(dpy, 0, 0, 0);
XIC xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, NULL);
XKeyPressedEvent event;
event.type = KeyPress;
event.display = dpy;
event.state = ShiftMask ? shift : 0;
event.keycode = XKeysymToKeycode(dpy, *keysym);
if (event.keycode == 0)
event.keycode = tmp_remap(*keysym);
char buffer[32];
KeySym ignore;
Status return_status;
Xutf8LookupString(xic, &event, buffer, 32, &ignore, &return_status);
XDestroyIC(xic);
XCloseIM(xim);
printf("%s", buffer);
} }
void void
simulate_keypress(KeySym keysym) simulate_keypress(KeySym keysym)
{ {
if (!simulateoutput) return; if (!simulateoutput) return;
KeyCode code = XKeysymToKeycode(dpy, keysym); KeyCode code = XKeysymToKeycode(dpy, keysym);
if (code == 0) if (code == 0)
code = tmp_remap(keysym); code = tmp_remap(keysym);
@ -499,7 +521,7 @@ simulate_keypress(KeySym keysym)
void void
simulate_keyrelease(KeySym keysym) simulate_keyrelease(KeySym keysym)
{ {
if (!simulateoutput) return; if (!simulateoutput) return;
KeyCode code = XKeysymToKeycode(dpy, keysym); KeyCode code = XKeysymToKeycode(dpy, keysym);
if (code == 0) if (code == 0)
code = tmp_remap(keysym); code = tmp_remap(keysym);
@ -514,8 +536,8 @@ get_press_duration(void)
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
return (double) ((now.tv_sec * 1000000L + now.tv_usec) - return (double) ((now.tv_sec * 1000000L + now.tv_usec) -
(pressbegin.tv_sec * 1000000L + pressbegin.tv_usec)) / (pressbegin.tv_sec * 1000000L + pressbegin.tv_usec)) /
(double) 1000000L; (double) 1000000L;
} }
void void
@ -654,11 +676,11 @@ run(void)
if (r == -1 || sigtermd) { if (r == -1 || sigtermd) {
/* an error occurred or we received a signal */ /* an error occurred or we received a signal */
/* E.g. Generally in scripts we want to call SIGTERM on svkbd in which case /* E.g. Generally in scripts we want to call SIGTERM on svkbd in which case
if the user is holding for example the enter key (to execute if the user is holding for example the enter key (to execute
the kill or script that does the kill), that causes an issue the kill or script that does the kill), that causes an issue
since then X doesn't know the keyup is never coming.. (since since then X doesn't know the keyup is never coming.. (since
process will be dead before finger lifts - in that case we process will be dead before finger lifts - in that case we
just trigger out fake up presses for all keys */ just trigger out fake up presses for all keys */
if (debug) printdbg("signal received, releasing all keys"); if (debug) printdbg("signal received, releasing all keys");
for (i = 0; i < numkeys; i++) { for (i = 0; i < numkeys; i++) {
XTestFakeKeyEvent(dpy, XKeysymToKeycode(dpy, keys[i].keysym), False, 0); XTestFakeKeyEvent(dpy, XKeysymToKeycode(dpy, keys[i].keysym), False, 0);