enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

ecore-wl2: restore previous session recovery behavior on hide 

ref 9492ee21df
This commit is contained in:
Mike Blumenkrantz 2016-12-14 11:43:39 -05:00
parent 6ff374256c
commit b4740389f9
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/ecore_wl2/ecore_wl2_display.c
View File

@ -296,7 +296,15 @@ _recovery_timer_add(Ecore_Wl2_Display *ewd)
_ecore_wl2_output_del(output);
EINA_INLIST_FOREACH_SAFE(ewd->windows, tmp, window)
ecore_wl2_window_hide(window);
{
Ecore_Wl2_Subsurface *subsurf;
EINA_INLIST_FOREACH_SAFE(window->subsurfs, tmp, subsurf)
_ecore_wl2_subsurf_unmap(subsurf);
_ecore_wl_window_semi_free(window);
window->configure_serial = 0;
window->configure_ack = NULL;
}
ewd->recovery_timer =
ecore_timer_add(0.5, (Ecore_Task_Cb)_recovery_timer, ewd);

1
src/lib/ecore_wl2/ecore_wl2_private.h
View File

@ -455,6 +455,7 @@ void _ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf);
void _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window);
void _ecore_wl2_window_www_surface_init(Ecore_Wl2_Window *window);
void _ecore_wl_window_semi_free(Ecore_Wl2_Window *window);
void _ecore_wl2_offer_unref(Ecore_Wl2_Offer *offer);

40
src/lib/ecore_wl2/ecore_wl2_window.c
View File

@ -4,6 +4,28 @@
#include "ecore_wl2_private.h"
void
_ecore_wl_window_semi_free(Ecore_Wl2_Window *window)
{
if (window->xdg_surface) xdg_surface_destroy(window->xdg_surface);
window->xdg_surface = NULL;
if (window->xdg_popup) xdg_popup_destroy(window->xdg_popup);
window->xdg_popup = NULL;
if (window->wl_shell_surface)
wl_shell_surface_destroy(window->wl_shell_surface);
window->wl_shell_surface = NULL;
if (window->www_surface)
www_surface_destroy(window->www_surface);
window->www_surface = NULL;
if (window->surface) wl_surface_destroy(window->surface);
window->surface = NULL;
window->surface_id = -1;
}
static void
_session_recovery_create_uuid(void *data, struct zwp_e_session_recovery *session_recovery EINA_UNUSED, struct wl_surface *surface EINA_UNUSED, const char *uuid)
{
@ -478,27 +500,11 @@ ecore_wl2_window_free(Ecore_Wl2_Window *window)
EINA_INLIST_FOREACH_SAFE(window->subsurfs, tmp, subsurf)
_ecore_wl2_subsurf_free(subsurf);
if (window->xdg_surface) xdg_surface_destroy(window->xdg_surface);
window->xdg_surface = NULL;
if (window->xdg_popup) xdg_popup_destroy(window->xdg_popup);
window->xdg_popup = NULL;
if (window->wl_shell_surface)
wl_shell_surface_destroy(window->wl_shell_surface);
window->wl_shell_surface = NULL;
if (window->www_surface)
www_surface_destroy(window->www_surface);
window->www_surface = NULL;
if (window->uuid && window->surface && window->display->wl.session_recovery)
zwp_e_session_recovery_destroy_uuid(window->display->wl.session_recovery,
window->surface, window->uuid);
if (window->surface) wl_surface_destroy(window->surface);
window->surface = NULL;
window->surface_id = -1;
_ecore_wl_window_semi_free(window);
eina_stringshare_replace(&window->uuid, NULL);