vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-22 20:07:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Listen to the correct window for focus and enter

Browse Source 
This now all got shifted one window by the introduction of the wrapper
window.
This commit is contained in:
Robbert van der Helm
2021-07-21 22:52:23 +02:00
parent 68c47064a0
commit 99304d19b8
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/editor.cpp
+11 -6
View File
@@ -56,8 +56,10 @@ constexpr uint32_t host_event_mask =
XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_VISIBILITY_CHANGE; XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_VISIBILITY_CHANGE;
/** /**
* The X11 event mask for the parent window. We need this structure notify here * The X11 event mask for the parent window. We'll use this for input focus
* as well to detect reparents. * grabbing (we'll receive the `EnterNotify` and `LeaveNotify` events for
* `wrapper_window`). We also need this structure notify here as well to detect
* reparents.
*/ */
constexpr uint32_t parent_event_mask = constexpr uint32_t parent_event_mask =
host_event_mask | XCB_EVENT_MASK_FOCUS_CHANGE | host_event_mask | XCB_EVENT_MASK_FOCUS_CHANGE |
@@ -545,15 +547,18 @@ void Editor::handle_x11_events() noexcept {
}); });
} }
if (window == parent_window && !use_xembed) { if (window == parent_window ||
fix_local_coordinates(); window == wrapper_window.window) {
if (!use_xembed) {
fix_local_coordinates();
}
} }
// In case the WM somehow does not support // In case the WM somehow does not support
// `_NET_ACTIVE_WINDOW`, a more naive focus grabbing method // `_NET_ACTIVE_WINDOW`, a more naive focus grabbing method
// implemented in the `WM_PARENTNOTIFY` handler will be // implemented in the `WM_PARENTNOTIFY` handler will be
// used. // used.
if (window == wine_window && if (window == wrapper_window.window &&
supports_ewmh_active_window() && supports_ewmh_active_window() &&
is_wine_window_active()) { is_wine_window_active()) {
set_input_focus(true); set_input_focus(true);
@@ -585,7 +590,7 @@ void Editor::handle_x11_events() noexcept {
// with an actual Win32 dropdown menu). Without this check // with an actual Win32 dropdown menu). Without this check
// these fake dropdowns would immediately close when // these fake dropdowns would immediately close when
// hovering over them. // hovering over them.
if (event->child == wine_window && if (event->child == wrapper_window.window &&
event->detail != XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL && event->detail != XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL &&
supports_ewmh_active_window() && supports_ewmh_active_window() &&
is_wine_window_active()) { is_wine_window_active()) {