vndangkhoa/vietc
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

fix: add XSelectInput on root window so X server delivers key events to our connection

Browse source 
Without XSelectInput, XGrabKeyboard grabs the keyboard but the X server
never sends KeyPress/KeyRelease events to our connection. Also flushes
after grab to ensure it takes effect.
This commit is contained in:
Khoa Vo 2026-06-26 09:27:15 +07:00
parent 82f7c5da9b
commit d6ded6e706
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
protocol/src/x11_capture.rs
View file

@ -1,4 +1,4 @@
use std::ffi::{c_char, c_int, c_void}; use std::ffi::{c_char, c_int, c_long, c_void};
type Display = c_void; type Display = c_void;
type Window = u64; type Window = u64;
@ -36,6 +36,8 @@ struct X11Lib {
x_lookup_string: unsafe extern "C" fn(*mut XKeyEvent, *mut c_char, c_int, *mut KeySym, *mut c_int) -> c_int, x_lookup_string: unsafe extern "C" fn(*mut XKeyEvent, *mut c_char, c_int, *mut KeySym, *mut c_int) -> c_int,
x_utf8_lookup_string: Option<unsafe extern "C" fn(*mut XKeyEvent, *mut c_char, c_int, *mut KeySym, *mut c_int) -> c_int>, x_utf8_lookup_string: Option<unsafe extern "C" fn(*mut XKeyEvent, *mut c_char, c_int, *mut KeySym, *mut c_int) -> c_int>,
x_flush: unsafe extern "C" fn(*mut Display) -> c_int, x_flush: unsafe extern "C" fn(*mut Display) -> c_int,
x_select_input: unsafe extern "C" fn(*mut Display, Window, c_long) -> c_int,
x_sync: unsafe extern "C" fn(*mut Display, c_int) -> c_int,
} }
impl X11Lib { impl X11Lib {
@ -77,6 +79,8 @@ impl X11Lib {
Some(std::mem::transmute(x_utf8_lookup_string)) Some(std::mem::transmute(x_utf8_lookup_string))
}; };
let x_flush = sym!("XFlush"); let x_flush = sym!("XFlush");
let x_select_input = sym!("XSelectInput");
let x_sync = sym!("XSync");
Ok(Self { Ok(Self {
handle, handle,
@ -90,6 +94,8 @@ impl X11Lib {
x_lookup_string, x_lookup_string,
x_utf8_lookup_string, x_utf8_lookup_string,
x_flush, x_flush,
x_select_input,
x_sync,
}) })
} }
} }
@ -173,6 +179,12 @@ impl X11Capture {
} }
let root = (lib.x_default_root_window)(display); let root = (lib.x_default_root_window)(display);
// Select for KeyPress and KeyRelease events on the root window
// so the X server delivers them to our connection
let key_press_mask: c_long = 1; // KeyPressMask
let key_release_mask: c_long = 2; // KeyReleaseMask
(lib.x_select_input)(display, root, key_press_mask | key_release_mask);
(lib.x_sync)(display, 0);
eprintln!("[vietc] X11Capture: initialized successfully"); eprintln!("[vietc] X11Capture: initialized successfully");
Some(Self { Some(Self {
lib, lib,
@ -196,6 +208,8 @@ impl X11Capture {
) as i32; ) as i32;
if status == 0 { if status == 0 {
self.grabbed = true; self.grabbed = true;
// Flush to ensure the grab is processed by the X server
(self.lib.x_flush)(self.display);
eprintln!("[vietc] X11Capture: grabbed keyboard successfully"); eprintln!("[vietc] X11Capture: grabbed keyboard successfully");
true true
} else { } else {