fix GetKeyState while spamming Send

while Send-like operations take place, the list of pressed down keys was falsely not updated, which leads to wrong results when a lot is happening in loops ref #26
phil294 · Dec 19, 2022 · 93562b7 · 93562b7
1 parent 6da4328
commit 93562b7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/cmd/x11/keyboard/input.cr b/src/cmd/x11/keyboard/input.cr
@@ -46,8 +46,9 @@ class Cmd::X11::Keyboard::Input < Cmd::Base
 		end
 
 		buf = ""
-		listener = thread.runner.display.register_key_listener do |key_event, keysym, char| # TODO: inconsistency: KeyEvent/char vs. KeyCombination.key_name
-			next if key_event.type != ::X11::KeyRelease
+		listener = thread.runner.display.register_key_listener do |key_event, keysym, char, is_paused| # TODO: inconsistency: KeyEvent/char vs. KeyCombination.key_name
+			next if is_paused
+			next if key_event.type != ::X11::KeyPress
 			end_key = end_keys.find { |k| k.keysym == keysym }
 			if end_key
 				next channel.send("EndKey:#{end_key.key_name}")

diff --git a/src/run/display.cr b/src/run/display.cr
@@ -103,15 +103,14 @@ module Run
 
 		# TODO: put keysym and char into key_event in callers?
 		private def handle_event(key_event, keysym, char)
-			return if @is_paused
 			@key_listeners.each do |sub|
 				spawn same_thread: true do
-					sub.call(key_event, keysym, char)
+					sub.call(key_event, keysym, char, @is_paused)
 				end
 			end
 		end
-		@key_listeners = [] of Proc(::X11::KeyEvent, UInt64, Char?, Nil)
-		def register_key_listener(&block : ::X11::KeyEvent, UInt64, Char? -> _)
+		@key_listeners = [] of Proc(::X11::KeyEvent, UInt64, Char?, Bool, Nil)
+		def register_key_listener(&block : ::X11::KeyEvent, UInt64, Char?, Bool -> _)
 			@key_listeners << block
 			block
 		end

diff --git a/src/run/display/hotkeys.cr b/src/run/display/hotkeys.cr
@@ -9,8 +9,8 @@ module Run
 		end
 
 		def run
-			@runner.display.register_key_listener do |key_event, keysym, char|
-				handle_event(key_event, keysym, char)
+			@runner.display.register_key_listener do |key_event, keysym, char, is_paused|
+				handle_event(key_event, keysym, char, is_paused)
 			end
 			@runner.display.on_pause { pause }
 			@runner.display.on_suspend { resume }
@@ -62,7 +62,8 @@ module Run
 			hotkey
 		end
 
-		def handle_event(key_event, keysym, char)
+		def handle_event(key_event, keysym, char, is_paused)
+			return if is_paused
 			up = key_event.type == ::X11::KeyRelease || key_event.type == ::X11::ButtonRelease # TODO: externalize somehow because this is duplicate in various places
 
 			hotkey = @hotkeys.find do |hotkey|

diff --git a/src/run/display/hotstrings.cr b/src/run/display/hotstrings.cr
@@ -13,8 +13,8 @@ module Run
 		end
 
 		def run
-			@runner.display.register_key_listener do |key_event, keysym, char|
-				handle_event(key_event, keysym, char)
+			@runner.display.register_key_listener do |key_event, keysym, char, is_paused|
+				handle_event(key_event, keysym, char, is_paused)
 			end
 		end
 
@@ -31,8 +31,9 @@ module Run
 		@candidate : Hotstring? = nil
 		@modifier_keysyms : StaticArray(Int32, 13) = StaticArray[::X11::XK_Shift_L, ::X11::XK_Shift_R, ::X11::XK_Control_L, ::X11::XK_Control_R, ::X11::XK_Caps_Lock, ::X11::XK_Shift_Lock, ::X11::XK_Meta_L, ::X11::XK_Meta_R, ::X11::XK_Alt_L, ::X11::XK_Alt_R, ::X11::XK_Super_L, ::X11::XK_Super_R, ::X11::XK_Num_Lock]
 
-		def handle_event(key_event, keysym, char)
-			up = key_event.type == ::X11::KeyRelease || key_event.type == ::X11::ButtonRelease
+		def handle_event(key_event, keysym, char, is_paused)
+			return if is_paused
+			up = key_event.type == ::X11::KeyPress || key_event.type == ::X11::ButtonPress
 			return if ! up
 			prev_candidate = @candidate
 			@candidate = nil

diff --git a/src/run/display/pressed-keys.cr b/src/run/display/pressed-keys.cr
@@ -9,7 +9,7 @@ module Run
 		@pressed_down_keysyms : StaticArray(UInt64, 8) = StaticArray[0_u64,0_u64,0_u64,0_u64,0_u64,0_u64,0_u64,0_u64]
 
 		def run
-			@runner.display.register_key_listener do |key_event, keysym, char|
+			@runner.display.register_key_listener do |key_event, keysym, char, is_paused|
 				up = key_event.type == ::X11::KeyRelease || key_event.type == ::X11::ButtonRelease
 
 				if ! up