Skip to content

Fix for #43 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrUlysses wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix for #43 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
374449e
Fix for #43
DrUlysses Jun 1, 2026
06950ac
Fix for #43
DrUlysses Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/WryWebViewPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,9 @@ class WryWebViewPanel(
fun isReady(): Boolean = webviewId != null

fun requestWebViewFocus() {
val action = { webviewId?.let { NativeBindings.focus(it) } }
val action = {
webviewId?.let { NativeBindings.focus(it) }
}
if (SwingUtilities.isEventDispatchThread()) {
action()
} else {
Expand Down
79 changes: 6 additions & 73 deletions wrywebview/src/main/rust/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,51 +355,20 @@ fn create_webview_inner(
// On Linux, set up focus handling for the GTK widget
#[cfg(target_os = "linux")]
{
use gdkx11::glib::translate::ToGlibPtr;
use gdkx11::glib::Cast;
use gdkx11::X11Display;
use gtk::prelude::WidgetExt;

let gtk_widget = webview.webview();
gtk_widget.set_can_focus(true);

// Connect to button-press-event to grab focus when clicked using X11
// Connect to button-press-event to grab focus when clicked.
// Avoid forcing raw X11 focus here because the host hierarchy may be
// managed by AWT/Swing and direct XSetInputFocus can desynchronize focus.
gtk_widget.connect_button_press_event(|widget, _event| {
wry_log!("[wrywebview] button_press_event -> grab_focus");

// Use X11 focus directly for proper keyboard input
if let Some(gdk_window) = widget.window() {
if let Some(display) = gdk::Display::default() {
if let Ok(x11_display) = display.downcast::<X11Display>() {
unsafe {
let gdk_window_ptr: *mut gdk::ffi::GdkWindow = gdk_window.to_glib_none().0;
let xid = gdkx11::ffi::gdk_x11_window_get_xid(
gdk_window_ptr as *mut gdkx11::ffi::GdkX11Window,
);

if xid != 0 {
let x11_display_ptr: *mut gdkx11::ffi::GdkX11Display = x11_display.to_glib_none().0;
let x_display = gdkx11::ffi::gdk_x11_display_get_xdisplay(x11_display_ptr);

if !x_display.is_null() {
x11::xlib::XSetInputFocus(
x_display as *mut x11::xlib::Display,
xid,
x11::xlib::RevertToParent,
x11::xlib::CurrentTime,
);
wry_log!("[wrywebview] button_press XSetInputFocus xid=0x{:x}", xid);
}
}
}
}
}
}

widget.grab_focus();
gtk::glib::Propagation::Proceed
});
wry_log!("[wrywebview] gtk focus handling configured with X11 support");
wry_log!("[wrywebview] gtk focus handling configured");
}

let id = register(webview, state, web_context)?;
Expand Down Expand Up @@ -723,13 +692,10 @@ pub fn reload(id: u64) -> Result<(), WebViewError> {
fn focus_inner(id: u64) -> Result<(), WebViewError> {
wry_log!("[wrywebview] focus id={}", id);
with_webview(id, |webview| {
// On Linux, we need to use X11 focus directly since the GTK widget
// is embedded in a foreign (AWT/Swing) window hierarchy
// On Linux, keep focus changes within GTK/Wry to avoid desynchronizing
// focus with the host AWT/Swing hierarchy.
#[cfg(target_os = "linux")]
{
use gdkx11::glib::translate::ToGlibPtr;
use gdkx11::glib::Cast;
use gdkx11::X11Display;
use gtk::prelude::WidgetExt;

let gtk_widget = webview.webview();
Expand All @@ -740,39 +706,6 @@ fn focus_inner(id: u64) -> Result<(), WebViewError> {
gtk_widget.realize();
}

// Get the GDK window and use X11 to set focus
if let Some(gdk_window) = gtk_widget.window() {
// Get the X11 display from GDK
if let Some(display) = gdk::Display::default() {
if let Ok(x11_display) = display.downcast::<X11Display>() {
unsafe {
// Get the X11 window ID (XID) from the GDK window
let gdk_window_ptr: *mut gdk::ffi::GdkWindow = gdk_window.to_glib_none().0;
let xid = gdkx11::ffi::gdk_x11_window_get_xid(
gdk_window_ptr as *mut gdkx11::ffi::GdkX11Window,
);

if xid != 0 {
// Get the raw X11 display pointer
let x11_display_ptr: *mut gdkx11::ffi::GdkX11Display = x11_display.to_glib_none().0;
let x_display = gdkx11::ffi::gdk_x11_display_get_xdisplay(x11_display_ptr);

if !x_display.is_null() {
// XSetInputFocus: RevertToParent = 2, CurrentTime = 0
x11::xlib::XSetInputFocus(
x_display as *mut x11::xlib::Display,
xid,
x11::xlib::RevertToParent,
x11::xlib::CurrentTime,
);
wry_log!("[wrywebview] XSetInputFocus xid=0x{:x}", xid);
}
}
}
}
}
}

// Also call GTK grab_focus as a fallback
gtk_widget.grab_focus();
wry_log!("[wrywebview] gtk grab_focus called");
Expand Down
Loading