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

Delay editor_force_xdnd until the reparent #160

Browse Source 
This fixes the option not working correctly when REAPER reparents the
plugin's window to a new FX window.
This commit is contained in:
Robbert van der Helm
2022-01-29 01:44:03 +01:00
parent 7f14cdf208
commit d6260c1d6b
3 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/editor.cpp
+31 -15
View File
@@ -263,6 +263,7 @@ Editor::Editor(MainContext& main_context,
const size_t parent_window_handle,
std::optional<fu2::unique_function<void()>> timer_proc)
: use_coordinate_hack_(config.editor_coordinate_hack),
use_force_dnd_(config.editor_force_dnd),
use_xembed_(config.editor_xembed),
logger_(logger),
x11_connection_(xcb_connect(nullptr, nullptr), xcb_disconnect),
@@ -367,21 +368,6 @@ Editor::Editor(MainContext& main_context,
<< std::endl;
}
// If the `editor_force_dnd` option is set, we'll strip `XdndAware` from all
// of `wine_window_`'s ancestors (including `parent_window_`) to forcefully
// enable drag-and-drop support in REAPER. See the docstring on
// `Configuration::editor_force_dnd` and the option description in the
// readme for more information.
if (config.editor_force_dnd) {
const xcb_atom_t xcb_xdnd_aware_property =
get_atom_by_name(*x11_connection_, xdnd_aware_property_name);
for (const xcb_window_t& window :
find_ancestor_windows(*x11_connection_, parent_window_)) {
xcb_delete_property(x11_connection_.get(), window,
xcb_xdnd_aware_property);
}
}
// When using XEmbed we'll need the atoms for the corresponding properties
xcb_xembed_message_ =
get_atom_by_name(*x11_connection_, xembed_message_name);
@@ -492,6 +478,9 @@ void Editor::handle_x11_events() noexcept {
// which breaks our input focus handling. To work around
// this, we will just check if the host's window has
// changed whenever the parent window gets reparented.
// REAPER does the same thing when inserting a plugin on a
// new track with the `Track -> Insert virtual instrument
// on new track...` option.
case XCB_REPARENT_NOTIFY: {
const auto event =
reinterpret_cast<xcb_reparent_notify_event_t*>(
@@ -506,6 +495,33 @@ void Editor::handle_x11_events() noexcept {
});
redetect_host_window();
// If the `editor_force_dnd` option is set, we'll strip
// `XdndAware` from all of `wine_window_`'s ancestors
// (including `parent_window_`) to forcefully enable
// drag-and-drop support in REAPER. See the docstring on
// `Configuration::editor_force_dnd` and the option
// description in the readme for more information.
// NOTE: This also needs to be done here for the same reason
// as the one mentioned above
if (use_force_dnd_) {
logger_.log_editor_trace([&]() {
return "DEBUG: Removing XdndAware properties from "
"window " +
std::to_string(parent_window_) +
" and all of its ancestors";
});
const xcb_atom_t xcb_xdnd_aware_property =
get_atom_by_name(*x11_connection_,
xdnd_aware_property_name);
for (const xcb_window_t& window : find_ancestor_windows(
*x11_connection_, parent_window_)) {
xcb_delete_property(x11_connection_.get(), window,
xcb_xdnd_aware_property);
}
}
} break;
// We're listening for `ConfigureNotify` events on the host's
// window (i.e. the window that's actually going to get dragged