brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Don't require a new buffer to move windows with dx/dy

Browse Source 
This doesn't match what Weston does. I don't know of any apps that this
fixes (we don't have any apps that even use non-zero dx/dy, I don't
think), but this is part of a cleanup for window geometry.
This commit is contained in:
Jasper St. Pierre 2014-07-17 14:15:05 -04:00
parent 567ca15610
commit 90d7737fc1
1 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/wayland/meta-wayland-surface.c
View File

@ -166,36 +166,33 @@ static void
toplevel_surface_commit (MetaWaylandSurface *surface, toplevel_surface_commit (MetaWaylandSurface *surface,
MetaWaylandPendingState *pending) MetaWaylandPendingState *pending)
{ {
MetaWindow *window = surface->window;
/* Sanity check. */
if (surface->buffer == NULL)
{
wl_resource_post_error (surface->resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"Cannot commit a NULL buffer to an xdg_surface");
return;
}
if (pending->frame_extents_changed) if (pending->frame_extents_changed)
meta_window_set_custom_frame_extents (surface->window, &pending->frame_extents); meta_window_set_custom_frame_extents (surface->window, &pending->frame_extents);
if (pending->newly_attached) /* We resize X based surfaces according to X events */
if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
{ {
MetaWindow *window = surface->window; int new_width, new_height;
MetaWaylandBuffer *buffer = pending->buffer;
if (buffer == NULL) new_width = cogl_texture_get_width (surface->buffer->texture);
{ new_height = cogl_texture_get_height (surface->buffer->texture);
wl_resource_post_error (surface->resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"Cannot commit a NULL buffer to an xdg_surface");
return;
}
/* We resize X based surfaces according to X events */ if (new_width != window->rect.width ||
if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND) new_height != window->rect.height ||
{ pending->dx != 0 ||
int new_width, new_height; pending->dy != 0)
meta_window_wayland_move_resize (window, new_width, new_height, pending->dx, pending->dy);
new_width = cogl_texture_get_width (buffer->texture);
new_height = cogl_texture_get_height (buffer->texture);
if (new_width != window->rect.width ||
new_height != window->rect.height ||
pending->dx != 0 ||
pending->dy != 0)
meta_window_wayland_move_resize (window, new_width, new_height, pending->dx, pending->dy);
}
} }
} }
@ -269,22 +266,18 @@ static void
subsurface_surface_commit (MetaWaylandSurface *surface, subsurface_surface_commit (MetaWaylandSurface *surface,
MetaWaylandPendingState *pending) MetaWaylandPendingState *pending)
{ {
if (pending->newly_attached) MetaSurfaceActor *surface_actor = surface->surface_actor;
{ float x, y;
MetaSurfaceActor *surface_actor = surface->surface_actor;
MetaWaylandBuffer *buffer = pending->buffer;
float x, y;
if (buffer != NULL) if (surface->buffer != NULL)
clutter_actor_show (CLUTTER_ACTOR (surface_actor)); clutter_actor_show (CLUTTER_ACTOR (surface_actor));
else else
clutter_actor_hide (CLUTTER_ACTOR (surface_actor)); clutter_actor_hide (CLUTTER_ACTOR (surface_actor));
clutter_actor_get_position (CLUTTER_ACTOR (surface_actor), &x, &y); clutter_actor_get_position (CLUTTER_ACTOR (surface_actor), &x, &y);
x += pending->dx; x += pending->dx;
y += pending->dy; y += pending->dy;
clutter_actor_set_position (CLUTTER_ACTOR (surface_actor), x, y); clutter_actor_set_position (CLUTTER_ACTOR (surface_actor), x, y);
}
} }
static void static void
@ -423,16 +416,13 @@ wl_surface_attach (struct wl_client *client,
else else
buffer = NULL; buffer = NULL;
if (surface->buffer == buffer)
return;
if (surface->pending.buffer) if (surface->pending.buffer)
wl_list_remove (&surface->pending.buffer_destroy_listener.link); wl_list_remove (&surface->pending.buffer_destroy_listener.link);
surface->pending.newly_attached = TRUE;
surface->pending.buffer = buffer;
surface->pending.dx = dx; surface->pending.dx = dx;
surface->pending.dy = dy; surface->pending.dy = dy;
surface->pending.buffer = buffer;
surface->pending.newly_attached = TRUE;
if (buffer) if (buffer)
wl_signal_add (&buffer->destroy_signal, wl_signal_add (&buffer->destroy_signal,