isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Use helper to access pending state from the outside

Browse Source 
With the eventual aim of exposing the internals of MetaWaylandSurface
outside of meta-wayland-surface.c, make users of the pending state use a
helper to fetch it. While at it, rename the struct field to something
more descriptive.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/907
This commit is contained in:
Jonas Ådahl
2019-03-13 12:47:48 +01:00
parent 8dc730e5ca
commit d60d671fec
6 changed files with 108 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/wayland/meta-wayland-xdg-shell.c
View File

@ -346,6 +346,7 @@ xdg_toplevel_set_max_size (struct wl_client *client,
int32_t height)
{
MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource);
MetaWaylandPendingState *pending;
if (width < 0 || height < 0)
{
@ -356,9 +357,11 @@ xdg_toplevel_set_max_size (struct wl_client *client,
return;
}
surface->pending->has_new_max_size = TRUE;
surface->pending->new_max_width = width;
surface->pending->new_max_height = height;
pending = meta_wayland_surface_get_pending_state (surface);
pending->has_new_max_size = TRUE;
pending->new_max_width = width;
pending->new_max_height = height;
}
static void
@ -368,6 +371,7 @@ xdg_toplevel_set_min_size (struct wl_client *client,
int32_t height)
{
MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource);
MetaWaylandPendingState *pending;
if (width < 0 || height < 0)
{
@ -378,9 +382,11 @@ xdg_toplevel_set_min_size (struct wl_client *client,
return;
}
surface->pending->has_new_min_size = TRUE;
surface->pending->new_min_width = width;
surface->pending->new_min_height = height;
pending = meta_wayland_surface_get_pending_state (surface);
pending->has_new_min_size = TRUE;
pending->new_min_width = width;
pending->new_min_height = height;
}
static void
@ -1377,12 +1383,14 @@ xdg_surface_set_window_geometry (struct wl_client *client,
int32_t height)
{
MetaWaylandSurface *surface = surface_from_xdg_surface_resource (resource);
MetaWaylandPendingState *pending;
surface->pending->has_new_geometry = TRUE;
surface->pending->new_geometry.x = x;
surface->pending->new_geometry.y = y;
surface->pending->new_geometry.width = width;
surface->pending->new_geometry.height = height;
pending = meta_wayland_surface_get_pending_state (surface);
pending->has_new_geometry = TRUE;
pending->new_geometry.x = x;
pending->new_geometry.y = y;
pending->new_geometry.width = width;
pending->new_geometry.height = height;
}
static void