mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Move view repositioning logic into shell

Browse Source 
Remove the listener for output destroy from weston_view and instead
iterate views owned by the shell in its own output destroy listener.

This simplifies the code a bit since keeping the view listening for the
destroy on the right output was a bit complicated. This also removes the
function pointer output_destroyed from weston_view. The only user for it
was desktop shell, but now this is all handled in shell.c.
This commit is contained in:
Ander Conselvan de Oliveira
2014-01-29 18:47:54 +02:00
committed by Kristian Høgsberg
parent a8a9baf873
commit c94d6229dc
3 changed files with 70 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+70 -16
View File
@@ -3010,8 +3010,6 @@ shell_handle_surface_destroy(struct wl_listener *listener, void *data)
static void
shell_surface_configure(struct weston_surface *, int32_t, int32_t);
static void
shell_surface_output_destroyed(struct weston_surface *);
struct shell_surface *
get_shell_surface(struct weston_surface *surface)
@@ -3048,7 +3046,6 @@ create_common_surface(void *shell, struct weston_surface *surface,
surface->configure = shell_surface_configure;
surface->configure_private = shsurf;
surface->output_destroyed = shell_surface_output_destroyed;
shsurf->shell = (struct desktop_shell *) shell;
shsurf->unresponsive = 0;
@@ -4853,19 +4850,6 @@ shell_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
}
}
static void
shell_surface_output_destroyed(struct weston_surface *es)
{
struct shell_surface *shsurf = get_shell_surface(es);
assert(shsurf);
shsurf->saved_position_valid = false;
shsurf->next_state.maximized = false;
shsurf->next_state.fullscreen = false;
shsurf->state_changed = true;
}
static void launch_desktop_shell_process(void *data);
static void
@@ -5484,12 +5468,82 @@ workspace_move_surface_down_binding(struct weston_seat *seat, uint32_t time,
take_surface_to_workspace_by_seat(shell, seat, new_index);
}
static void
shell_reposition_view_on_output_destroy(struct weston_view *view)
{
struct weston_output *output, *first_output;
struct weston_compositor *ec = view->surface->compositor;
struct shell_surface *shsurf;
float x, y;
int visible;
x = view->geometry.x;
y = view->geometry.y;
/* At this point the destroyed output is not in the list anymore.
* If the view is still visible somewhere, we leave where it is,
* otherwise, move it to the first output. */
visible = 0;
wl_list_for_each(output, &ec->output_list, link) {
if (pixman_region32_contains_point(&output->region,
x, y, NULL)) {
visible = 1;
break;
}
}
if (!visible) {
first_output = container_of(ec->output_list.next,
struct weston_output, link);
x = first_output->x + first_output->width / 4;
y = first_output->y + first_output->height / 4;
}
weston_view_set_position(view, x, y);
shsurf = get_shell_surface(view->surface);
if (shsurf) {
shsurf->saved_position_valid = false;
shsurf->next_state.maximized = false;
shsurf->next_state.fullscreen = false;
shsurf->state_changed = true;
}
}
static void
shell_reposition_views_on_output_destroy(struct shell_output *shell_output)
{
struct desktop_shell *shell = shell_output->shell;
struct weston_output *output = shell_output->output;
struct weston_layer *layer;
struct weston_view *view;
/* Move all views in the layers owned by the shell */
wl_list_for_each(layer, shell->fullscreen_layer.link.prev, link) {
wl_list_for_each(view, &layer->view_list, layer_link) {
if (view->output != output)
continue;
shell_reposition_view_on_output_destroy(view);
}
/* We don't start from the beggining of the layer list, so
* make sure we don't wrap around it. */
if (layer == &shell->background_layer)
break;
}
}
static void
handle_output_destroy(struct wl_listener *listener, void *data)
{
struct shell_output *output_listener =
container_of(listener, struct shell_output, destroy_listener);
shell_reposition_views_on_output_destroy(output_listener);
wl_list_remove(&output_listener->destroy_listener.link);
wl_list_remove(&output_listener->link);
free(output_listener);