From b1e217b29aab8936e9831961943676acd9cdcdd8 Mon Sep 17 00:00:00 2001
From: Adam Purkrt
Date: Sat, 15 Mar 2025 19:53:56 +0100
Subject: XUngrabKeyboard() instead of XUngrabKey()

XUngrabKey(), which is currently used in cleanup(), is not the right
counterpart to XGrabKeyboard(), which is used in grabkeyboard(),
called from main().

XUngrabKeyboard() is the function to use, as grabbing the whole
keyboard is different to grabbing individual keys.

With the current code the keyboard gets ungrabbed, as far as I can tell,
only by the final XCloseDisplay() in cleanup(), as the XUngrabKey()
there effectively does nothing.
---
 dmenu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dmenu.c')

diff --git a/dmenu.c b/dmenu.c
index 804da64..fd49549 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -100,7 +100,7 @@ cleanup(void)
 {
 	size_t i;
 
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
+	XUngrabKeyboard(dpy, CurrentTime);
 	for (i = 0; i < SchemeLast; i++)
 		free(scheme[i]);
 	for (i = 0; items && items[i].text; ++i)
-- 
cgit v1.2.3-59-g8ed1b

ush/'>summary</a><a href='/lush/refs/?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c'>refs</a><a class='active' href='/lush/log/test/history_test.lua?follow=1'>log</a><a href='/lush/tree/test/history_test.lua?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c'>tree</a><a href='/lush/commit/test/history_test.lua?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c&amp;follow=1'>commit</a><a href='/lush/diff/test/history_test.lua?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c&amp;follow=1'>diff</a><a href='/lush/stats/test/history_test.lua'>stats</a></td><td class='form'><form class='right' method='get' action='/lush/log/test/history_test.lua'>
<input type='hidden' name='id' value='2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c'/><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='/lush/log/?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c&amp;follow=1'>root</a>/<a href='/lush/log/test?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c&amp;follow=1'>test</a>/<a href='/lush/log/test/history_test.lua?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c&amp;follow=1'>history_test.lua</a> (<a href='/lush/log/test/history_test.lua?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/lush/log/test/history_test.lua?id=2fdc7ccbc06c1ea1ca347f5fa40f256296d6309c&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr><td><span title='2024-09-12 09:36:39 -0400'>2024-09-12</span></td><td><a href='/lush/commit/.github/workflows/build.yml?id=f21f5a82e3cc671ee4670226651ba368c5640364&amp;follow=1'>removed chsh in workflow</a></td><td><img src='//www.gravatar.com/avatar/d815ac54940fef927b7de42a76573a6f?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Lance Borden
</td><td>1</td><td><span class='deletions'>-4</span>/<span class='insertions'>+1</span></td></tr>