vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-09 20:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ignore Wine windows in the drag-and-drop handling

Browse Source 
Wine will be able to handle this better than we can, and we of course
don't want any conflicts here.
This commit is contained in:
Robbert van der Helm
2021-07-10 19:56:54 +02:00
parent 998e222651
commit 92daa33adf
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/xdnd-proxy.cpp
+10 -2
View File
@@ -201,6 +201,7 @@ void WineXdndProxy::run_xdnd_loop() {
const xcb_window_t root_window = const xcb_window_t root_window =
xcb_setup_roots_iterator(xcb_get_setup(x11_connection.get())) xcb_setup_roots_iterator(xcb_get_setup(x11_connection.get()))
.data->root; .data->root;
const HWND windows_desktop_window = GetDesktopWindow();
// We cannot just grab the pointer because Wine is already doing that, and // We cannot just grab the pointer because Wine is already doing that, and
// it's also blocking the GUI thread. So instead we will periodically poll // it's also blocking the GUI thread. So instead we will periodically poll
@@ -211,7 +212,6 @@ void WineXdndProxy::run_xdnd_loop() {
while (IsWindow(tracker_window)) { while (IsWindow(tracker_window)) {
usleep(1000); usleep(1000);
// TODO: Can we somehow ignore plugin windows?
std::unique_ptr<xcb_generic_event_t> generic_event; std::unique_ptr<xcb_generic_event_t> generic_event;
while (generic_event.reset(xcb_poll_for_event(x11_connection.get())), while (generic_event.reset(xcb_poll_for_event(x11_connection.get())),
generic_event != nullptr) { generic_event != nullptr) {
@@ -233,12 +233,20 @@ void WineXdndProxy::run_xdnd_loop() {
free(error); free(error);
continue; continue;
} }
if (query_pointer_reply->root_x == last_pointer_x && if (query_pointer_reply->root_x == last_pointer_x &&
query_pointer_reply->root_y == last_pointer_y) { query_pointer_reply->root_y == last_pointer_y) {
continue; continue;
} }
// We want to ignore all Wine windows (within this prefix), since Wine
// will be able to handle the drag-and-drop better than we can
POINT windows_pointer_pos;
GetCursorPos(&windows_pointer_pos);
if (HWND windows_window = WindowFromPoint(windows_pointer_pos);
windows_window && windows_window != windows_desktop_window) {
continue;
}
// TODO: Fetch the window under the mouse cursor, send messages to it // TODO: Fetch the window under the mouse cursor, send messages to it
// according to the XDND protocol // according to the XDND protocol