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

Rename DeferredWindow to DeferredWin32Window

Browse Source
This commit is contained in:
Robbert van der Helm
2021-07-21 14:26:34 +02:00
parent 68d4a6610e
commit a38e7c3588
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/editor.cpp
+5 -4
View File
@@ -177,14 +177,15 @@ xcb_window_t get_x11_handle(HWND win32_handle) noexcept;
*/ */
ATOM get_window_class() noexcept; ATOM get_window_class() noexcept;
DeferredWindow::DeferredWindow(MainContext& main_context, DeferredWin32Window::DeferredWin32Window(
std::shared_ptr<xcb_connection_t> x11_connection, MainContext& main_context,
HWND window) noexcept std::shared_ptr<xcb_connection_t> x11_connection,
HWND window) noexcept
: handle(window), : handle(window),
main_context(main_context), main_context(main_context),
x11_connection(x11_connection) {} x11_connection(x11_connection) {}
DeferredWindow::~DeferredWindow() noexcept { DeferredWin32Window::~DeferredWin32Window() noexcept {
// NOTE: For some rason, Wine will sometimes try to delete a window twice if // NOTE: For some rason, Wine will sometimes try to delete a window twice if
// the parent window no longer exists. I've only seen this cause // the parent window no longer exists. I've only seen this cause
// issues with plugins that hang when their window is hidden, like the // issues with plugins that hang when their window is hidden, like the
src/wine-host/editor.h
+7 -7
View File
@@ -88,7 +88,7 @@ struct Size {
* This is essentially an alternative around `std::unique_ptr` with a non-static * This is essentially an alternative around `std::unique_ptr` with a non-static
* custom deleter. * custom deleter.
*/ */
class DeferredWindow { class DeferredWin32Window {
public: public:
/** /**
* Manage a window so that it will be asynchronously closed when this object * Manage a window so that it will be asynchronously closed when this object
@@ -100,15 +100,15 @@ class DeferredWindow {
* editor. * editor.
* @param window A `HWND` obtained through a call to `CreateWindowEx` * @param window A `HWND` obtained through a call to `CreateWindowEx`
*/ */
DeferredWindow(MainContext& main_context, DeferredWin32Window(MainContext& main_context,
std::shared_ptr<xcb_connection_t> x11_connection, std::shared_ptr<xcb_connection_t> x11_connection,
HWND window) noexcept; HWND window) noexcept;
/** /**
* Post a `WM_CLOSE` message to the `handle`'s message queue as described * Post a `WM_CLOSE` message to the `handle`'s message queue as described
* above. * above.
*/ */
~DeferredWindow() noexcept; ~DeferredWin32Window() noexcept;
const HWND handle; const HWND handle;
@@ -292,7 +292,7 @@ class Editor {
* The handle for the window created through Wine that the plugin uses to * The handle for the window created through Wine that the plugin uses to
* embed itself in. * embed itself in.
*/ */
DeferredWindow win32_window; DeferredWin32Window win32_window;
/** /**
* A child window embedded inside of `win32_window`. This is only used if * A child window embedded inside of `win32_window`. This is only used if
@@ -302,7 +302,7 @@ class Editor {
* of the readme for more details). The plugin should then embed itself * of the readme for more details). The plugin should then embed itself
* within this child window. * within this child window.
*/ */
std::optional<DeferredWindow> win32_child_window; std::optional<DeferredWin32Window> win32_child_window;
/** /**
* A timer we'll use to periodically run `idle_timer_proc`, if set. Thisi is * A timer we'll use to periodically run `idle_timer_proc`, if set. Thisi is