vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-07 03:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix rare hanging issue on Bitwig related to focus

Browse Source 
On Bitwig grabbing input focus this way would trigger many more FocusIn
events, which in certain situations could cause the interface to hang
while everything was being processed.
This commit is contained in:
Robbert van der Helm
2021-01-19 00:52:49 +01:00
parent b2ccfed2e6
commit 9788f21e0e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/editor.cpp
+10 -1
View File
@@ -295,6 +295,12 @@ HWND Editor::get_win32_handle() const {
}
void Editor::handle_x11_events() const {
// Calling `set_input_focus(true)` can trigger another `FocusIn` event,
// which will then once again call `set_input_focus(true)`. To work around
// this we prevent successive keyboard focus grabs within a single call of
// this function.
bool have_requested_input_focus = false;
xcb_generic_event_t* generic_event;
while ((generic_event = xcb_poll_for_event(x11_connection.get())) !=
nullptr) {
@@ -338,8 +344,10 @@ void Editor::handle_x11_events() const {
// In case the WM somehow does not support `_NET_ACTIVE_WINDOW`,
// a more naive focus grabbing method implemented in the
// `WM_PARENTNOTIFY` handler will be used.
if (supports_ewmh_active_window() && is_wine_window_active()) {
if (!have_requested_input_focus &&
supports_ewmh_active_window() && is_wine_window_active()) {
set_input_focus(true);
have_requested_input_focus = true;
}
break;
// When the user moves their mouse away from the Wine window _while
@@ -365,6 +373,7 @@ void Editor::handle_x11_events() const {
if (event->detail != XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL &&
supports_ewmh_active_window() && is_wine_window_active()) {
set_input_focus(false);
have_requested_input_focus = false;
}
} break;
}