mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop-shell: Invalidate saved position when output is destroyed 

If the saved position for a fullscreen or maximized output view is in an
output that has been unplugged, the coordinates don't make sense
anymore. In that case, invalidate them and use the initial position
algorithm when changing them back to the basic state.

Signed-off-by: Zhang, Xiong Y <xiong.y.zhang@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
This commit is contained in:
Zhang, Xiong Y 2013-12-13 22:10:57 +02:00 committed by Kristian Høgsberg
parent 54e90c7e1e
commit 31236932a1
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desktop-shell/shell.c
View File

@ -2205,6 +2205,10 @@ set_fullscreen(struct shell_surface *shsurf,
* called from configure. */
}
static void
weston_view_set_initial_position(struct weston_view *view,
struct desktop_shell *shell);
static void
unset_fullscreen(struct shell_surface *shsurf)
{
@ -2225,8 +2229,12 @@ unset_fullscreen(struct shell_surface *shsurf)
weston_surface_destroy(shsurf->fullscreen.black_view->surface);
shsurf->fullscreen.black_view = NULL;
weston_view_set_position(shsurf->view,
shsurf->saved_x, shsurf->saved_y);
if (shsurf->saved_position_valid)
weston_view_set_position(shsurf->view,
shsurf->saved_x, shsurf->saved_y);
else
weston_view_set_initial_position(shsurf->view, shsurf->shell);
if (shsurf->saved_rotation_valid) {
wl_list_insert(&shsurf->view->geometry.transformation_list,
&shsurf->rotation.transform.link);
@ -2323,9 +2331,12 @@ unset_maximized(struct shell_surface *shsurf)
{
/* undo all maximized things here */
shsurf->output = get_default_output(shsurf->surface->compositor);
weston_view_set_position(shsurf->view,
shsurf->saved_x,
shsurf->saved_y);
if (shsurf->saved_position_valid)
weston_view_set_position(shsurf->view,
shsurf->saved_x, shsurf->saved_y);
else
weston_view_set_initial_position(shsurf->view, shsurf->shell);
if (shsurf->saved_rotation_valid) {
wl_list_insert(&shsurf->view->geometry.transformation_list,
@ -2907,6 +2918,8 @@ 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)
@ -2943,6 +2956,7 @@ 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;
@ -4955,6 +4969,14 @@ 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);
shsurf->saved_position_valid = false;
}
static void launch_desktop_shell_process(void *data);
static void

3
src/compositor.c
View File

@ -409,6 +409,9 @@ weston_view_output_destroy_handler(struct wl_listener *listener,
}
weston_view_set_position(ev, x, y);
if (ev->surface->output_destroyed)
ev->surface->output_destroyed(ev->surface);
}
WL_EXPORT struct weston_view *

6
src/compositor.h
View File

@ -885,6 +885,12 @@ struct weston_surface {
void (*configure)(struct weston_surface *es, int32_t sx, int32_t sy);
void *configure_private;
/* If non-NULL, this function will be called on surface->output::
* destroy, after the output is removed from the compositor's
* output list and the remaining outputs moved.
*/
void (*output_destroyed)(struct weston_surface *surface);
/* Parent's list of its sub-surfaces, weston_subsurface:parent_link.
* Contains also the parent itself as a dummy weston_subsurface,
* if the list is not empty.