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

compositor: Remove weston_output::move_signal

Browse Source 
Since that signal is per output, it is necessary to track in which
output a view is in so that the signal is handled properly.

Instead, add a compositor wide output moved signal, that is handled by
the shell. The shell iterates over the layers it owns to move views
appropriately.
This commit is contained in:
Ander Conselvan de Oliveira
2014-01-29 18:47:52 +02:00
committed by Kristian Høgsberg
parent 7908bffdf9
commit a8a9baf873
4 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+34
View File
@@ -5523,6 +5523,37 @@ handle_output_create(struct wl_listener *listener, void *data)
create_shell_output(shell, output);
}
static void
handle_output_move(struct wl_listener *listener, void *data)
{
struct desktop_shell *shell;
struct weston_output *output;
struct weston_layer *layer;
struct weston_view *view;
float x, y;
shell = container_of(listener, struct desktop_shell,
output_move_listener);
output = data;
/* 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;
x = view->geometry.x + output->move_x;
y = view->geometry.y + output->move_y;
weston_view_set_position(view, x, y);
}
/* 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
setup_output_destroy_handler(struct weston_compositor *ec,
struct desktop_shell *shell)
@@ -5536,6 +5567,9 @@ setup_output_destroy_handler(struct weston_compositor *ec,
shell->output_create_listener.notify = handle_output_create;
wl_signal_add(&ec->output_created_signal,
&shell->output_create_listener);
shell->output_move_listener.notify = handle_output_move;
wl_signal_add(&ec->output_moved_signal, &shell->output_move_listener);
}
static void
desktop-shell/shell.h
+1
View File
@@ -184,6 +184,7 @@ struct desktop_shell {
enum animation_type focus_animation_type;
struct wl_listener output_create_listener;
struct wl_listener output_move_listener;
struct wl_list output_list;
char *client;