Skip to content

W
wine-cw
Commit 8f0d3ec1 authored by Alexandros Frantzis's avatar Alexandros Frantzis Committed by Alexandre Julliard
Browse files
Options

winewayland.drv: Store and use the latest window config for a wayland_surface.

Instead of querying the window config for a wayland_surface on demand, query it and store it only when it is applied through SetWindowPos. In addition to being more efficient, this prevents deadlocks by avoiding calling NtUser functions that require the user lock, while holding the window_surface lock.
parent 52decb1c
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 27 deletions
dlls/winewayland.drv/wayland_surface.c
View file @ 8f0d3ec1
......@@ -349,22 +349,16 @@ static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_confi
*/
BOOL wayland_surface_reconfigure(struct wayland_surface *surface)
{
RECT window_rect;
struct wayland_window_config *window = &surface->window;
int width, height;
enum wayland_surface_config_state window_state;
if (!surface->xdg_toplevel) return TRUE;
if (!NtUserGetWindowRect(surface->hwnd, &window_rect)) return FALSE;
width = window_rect.right - window_rect.left;
height = window_rect.bottom - window_rect.top;
window_state =
(NtUserGetWindowLongW(surface->hwnd, GWL_STYLE) & WS_MAXIMIZE) ?
WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0;
width = surface->window.rect.right - surface->window.rect.left;
height = surface->window.rect.bottom - surface->window.rect.top;
TRACE("hwnd=%p window=%dx%d,%#x processing=%dx%d,%#x current=%dx%d,%#x\n",
surface->hwnd, width, height, window_state,
surface->hwnd, width, height, window->state,
surface->processing.width, surface->processing.height,
surface->processing.state, surface->current.width,
surface->current.height, surface->current.state);
......@@ -373,7 +367,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface)
if (surface->processing.serial && surface->processing.processed &&
wayland_surface_configure_is_compatible(&surface->processing,
width, height,
window_state))
window->state))
{
surface->current = surface->processing;
memset(&surface->processing, 0, sizeof(surface->processing));
......@@ -385,7 +379,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface)
else if (!surface->current.serial && surface->requested.serial &&
wayland_surface_configure_is_compatible(&surface->requested,
width, height,
window_state))
window->state))
{
surface->current = surface->requested;
memset(&surface->requested, 0, sizeof(surface->requested));
......@@ -394,7 +388,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface)
else if (!surface->current.serial ||
!wayland_surface_configure_is_compatible(&surface->current,
width, height,
window_state))
window->state))
{
return FALSE;
}
......
dlls/winewayland.drv/waylanddrv.h
View file @ 8f0d3ec1
......@@ -141,6 +141,12 @@ struct wayland_surface_config
BOOL processed;
};
struct wayland_window_config
{
RECT rect;
enum wayland_surface_config_state state;
};
struct wayland_surface
{
HWND hwnd;
......@@ -151,6 +157,7 @@ struct wayland_surface
struct wayland_surface_config pending, requested, processing, current;
struct wayland_shm_buffer *latest_window_buffer;
BOOL resizing;
struct wayland_window_config window;
};
struct wayland_shm_buffer
......
dlls/winewayland.drv/window.c
View file @ 8f0d3ec1
......@@ -43,6 +43,8 @@ struct wayland_win_data
struct wayland_surface *wayland_surface;
/* wine window_surface backing this window */
struct window_surface *window_surface;
/* USER window rectangle relative to win32 parent window client area */
RECT window_rect;
};
static int wayland_win_data_cmp_rb(const void *key,
......@@ -65,7 +67,8 @@ static struct rb_tree win_data_rb = { wayland_win_data_cmp_rb };
*
* Create a data window structure for an existing window.
*/
static struct wayland_win_data *wayland_win_data_create(HWND hwnd)
static struct wayland_win_data *wayland_win_data_create(HWND hwnd,
const RECT *window_rect)
{
struct wayland_win_data *data;
struct rb_entry *rb_entry;
......@@ -79,6 +82,7 @@ static struct wayland_win_data *wayland_win_data_create(HWND hwnd)
if (!(data = calloc(1, sizeof(*data)))) return NULL;
data->hwnd = hwnd;
data->window_rect = *window_rect;
pthread_mutex_lock(&win_data_mutex);
......@@ -146,6 +150,14 @@ static void wayland_win_data_release(struct wayland_win_data *data)
pthread_mutex_unlock(&win_data_mutex);
}
static void wayland_win_data_get_config(struct wayland_win_data *data,
struct wayland_window_config *conf)
{
conf->rect = data->window_rect;
conf->state = (NtUserGetWindowLongW(data->hwnd, GWL_STYLE) & WS_MAXIMIZE) ?
WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0;
}
static void wayland_win_data_update_wayland_surface(struct wayland_win_data *data)
{
struct wayland_surface *surface = data->wayland_surface;
......@@ -170,20 +182,22 @@ static void wayland_win_data_update_wayland_surface(struct wayland_win_data *dat
visible = (NtUserGetWindowLongW(data->hwnd, GWL_STYLE) & WS_VISIBLE) == WS_VISIBLE;
xdg_visible = surface->xdg_toplevel != NULL;
pthread_mutex_lock(&surface->mutex);
if (visible != xdg_visible)
{
pthread_mutex_lock(&surface->mutex);
/* If we have a pre-existing surface ensure it has no role. */
if (data->wayland_surface) wayland_surface_clear_role(surface);
/* If the window is a visible toplevel make it a wayland
* xdg_toplevel. Otherwise keep it role-less to avoid polluting the
* compositor with empty xdg_toplevels. */
if (visible) wayland_surface_make_toplevel(surface);
pthread_mutex_unlock(&surface->mutex);
}
wayland_win_data_get_config(data, &surface->window);
pthread_mutex_unlock(&surface->mutex);
if (data->window_surface)
wayland_window_surface_update_wayland_surface(data->window_surface, surface);
......@@ -195,22 +209,17 @@ out:
static void wayland_win_data_update_wayland_state(struct wayland_win_data *data)
{
struct wayland_surface *surface = data->wayland_surface;
uint32_t window_state;
BOOL processing_config;
pthread_mutex_lock(&surface->mutex);
if (!surface->xdg_toplevel) goto out;
window_state =
(NtUserGetWindowLongW(surface->hwnd, GWL_STYLE) & WS_MAXIMIZE) ?
WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0;
processing_config = surface->processing.serial &&
!surface->processing.processed;
TRACE("hwnd=%p window_state=%#x %s->state=%#x\n",
data->hwnd, window_state,
data->hwnd, surface->window.state,
processing_config ? "processing" : "current",
processing_config ? surface->processing.state : surface->current.state);
......@@ -218,12 +227,12 @@ static void wayland_win_data_update_wayland_state(struct wayland_win_data *data)
* window state to determine and update the Wayland state. */
if (!processing_config)
{
if ((window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) &&
if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) &&
!(surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED))
{
xdg_toplevel_set_maximized(surface->xdg_toplevel);
}
else if (!(window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) &&
else if (!(surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) &&
(surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED))
{
xdg_toplevel_unset_maximized(surface->xdg_toplevel);
......@@ -268,7 +277,7 @@ BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags,
hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect),
wine_dbgstr_rect(visible_rect), insert_after, swp_flags);
if (!data && !(data = wayland_win_data_create(hwnd))) return TRUE;
if (!data && !(data = wayland_win_data_create(hwnd, window_rect))) return TRUE;
/* Release the dummy surface wine provides for toplevels. */
if (*surface) window_surface_release(*surface);
......@@ -318,6 +327,8 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags,
if (!data) return;
data->window_rect = *window_rect;
if (surface) window_surface_add_ref(surface);
if (data->window_surface) window_surface_release(data->window_surface);
data->window_surface = surface;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment