zymon/st
1
0
Fork 0
mirror of https://github.com/LukeSmithxyz/st.git synced 2025-04-04 18:41:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed mistakes on x.c portion of keyboard select patch file

Browse source
This commit is contained in:
Zachary Schlitt 2019-10-08 21:38:17 -05:00
parent 3403a97885
commit 83eb974206
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
keyboard-select.patch
View file

@ -289,19 +289,7 @@ diff --git a/x.c b/x.c
index 0422421..f5fa3e2 100644 index 0422421..f5fa3e2 100644
--- a/x.c --- a/x.c
+++ b/x.c +++ b/x.c
@@ -1869,16 +1869,23 @@ kpress(XEvent *ev) @@ -1882,4 +1882,11 @@ kpress(XEvent *ev)
{
XKeyEvent *e = &ev->xkey;
KeySym ksym;
char buf[32], *customkey;
int len;
Rune c;
Status status;
Shortcut *bp;
if (IS_SET(MODE_KBDLOCK))
return;
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
+ if ( IS_SET(MODE_KBDSELECT) ) { + if ( IS_SET(MODE_KBDSELECT) ) {
+ if ( match(XK_NO_MOD, e->state) || + if ( match(XK_NO_MOD, e->state) ||
@ -313,15 +301,7 @@ index 0422421..f5fa3e2 100644
/* 1. shortcuts */ /* 1. shortcuts */
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
if (ksym == bp->keysym && match(bp->mod, e->state)) { if (ksym == bp->keysym && match(bp->mod, e->state)) {
@@ -2107,14 +2114,22 @@ usage(void) @@ -2116,6 +2123,14 @@ usage(void)
{
die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
" [-n name] [-o file]\n"
" [-T title] [-t title] [-w windowid]"
" [[-e] command [args ...]]\n"
" %s [-aiv] [-c class] [-f font] [-g geometry]"
" [-n name] [-o file]\n"
" [-T title] [-t title] [-w windowid] -l line"
" [stty_args ...]\n", argv0, argv0); " [stty_args ...]\n", argv0, argv0);
} }