From 30285a679fa9572a43caa4eb77d5670274ecd0a7 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 9 Feb 2018 17:11:03 -0500
Subject: Fix X11 KeySym lookup with modifiers

On friends' systems there appear to be modifiers that are always set
which were intefering with selecting the KeySym based on the state of
shift.
---
 bin/gfx/x11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/gfx/x11.c b/bin/gfx/x11.c
index 5112efba..524c8c63 100644
--- a/bin/gfx/x11.c
+++ b/bin/gfx/x11.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[]) {
         switch (event.type) {
             case KeyPress: {
                 XKeyEvent key = event.xkey;
-                KeySym sym = XLookupKeysym(&key, key.state);
+                KeySym sym = XLookupKeysym(&key, key.state & ShiftMask);
                 if (sym > 0x80) break;
                 if (!input(sym)) return EX_OK;
                 XStoreName(display, window, status());
-- 
cgit 1.4.1

ef='/src/refs/?id=f46cbea7eb34106a07810c122c266ad19dbeefcf'>refs</a> <a class='active' href='/src/log/bin/man/ttpre.1?follow=1'>log</a> <a href='/src/tree/bin/man/ttpre.1?id=f46cbea7eb34106a07810c122c266ad19dbeefcf'>tree</a> <a href='/src/commit/bin/man/ttpre.1?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;follow=1'>commit</a> <a href='/src/diff/bin/man/ttpre.1?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/man/ttpre.1'>
<input type='hidden' name='id' value='f46cbea7eb34106a07810c122c266ad19dbeefcf'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;follow=1'>root</a>/<a href='/src/log/bin?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;follow=1'>bin</a>/<a href='/src/log/bin/man?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;follow=1'>man</a>/<a href='/src/log/bin/man/ttpre.1?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;follow=1'>ttpre.1</a> (<a href='/src/log/bin/man/ttpre.1?id=f46cbea7eb34106a07810c122c266ad19dbeefcf'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/man/ttpre.1?id=f46cbea7eb34106a07810c122c266ad19dbeefcf&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-01-10 20:12:15 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/profile?id=9e70c109553671702917be73e3c5ca9016d30aa5&amp;follow=1'>Remove profile and dot.profile</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-01-10 20:05:18 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/mail.c?id=64d994f34fef5d8d5b0c0e5cde1a8c2645e01953&amp;follow=1'>Replace strchrnul with strchr</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-01-10 20:01:33 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/test.c?id=cf9d2e8c389b84dba23c83b5cfc72082df65dfba&amp;follow=1'>Replace eaccess with faccessat</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-01-10 19:54:55 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/test.c?id=78f6ae64ec2ee68b3b7456c9dbdeff4c76577711&amp;follow=1'>Replace st_mtim with st_mtimespec</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-01-10 19:54:54 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/trap.c?id=e730ab9dd44b7be654f5044b436c701577150e90&amp;follow=1'>Replace sys_nsig with NSIG</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-01-10 19:49:20 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/Makefile?id=9846c004a1cec5c28f5f3eb4b9299e2a0cfdadad&amp;follow=1'>Replace cash Makefile</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-01-10 19:47:32 -0500'>2019-01-10</span></td><td><a href='/src/commit/bin/cash/test.c?id=55eaf9f19fb718b1e9b30c64d330a17589642e3e&amp;follow=1'>Move bltin out of subdirectory</a></td><td>June McEnroe