kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: fix window stack implementation 

ref T5350
This commit is contained in:
Mike Blumenkrantz 2017-08-04 16:08:42 -04:00
parent 4f8a9b50f4
commit ffac7fc539
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/elementary/efl_ui_win.c
View File

@ -3105,7 +3105,19 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee)
static void
_elm_win_wlwindow_get(Efl_Ui_Win_Data *sd)
{
Ecore_Wl2_Window *pwin = sd->wl.win;
sd->wl.win = _elm_ee_wlwin_get(sd->ee);
if (sd->wl.win != pwin)
{
char buf[128];
int id;
snprintf(buf, sizeof(buf), "%u||%p", getpid(), sd->wl.win);
eina_stringshare_replace(&sd->stack_id, buf);
id = ecore_evas_aux_hint_id_get(sd->ee, "stack_id");
if (id >= 0) ecore_evas_aux_hint_val_set(sd->ee, id, sd->stack_id);
else ecore_evas_aux_hint_add(sd->ee, "stack_id", sd->stack_id);
}
}
void
@ -5037,6 +5049,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
{
case ELM_WIN_BASIC:
case ELM_WIN_DIALOG_BASIC:
case ELM_WIN_NAVIFRAME_BASIC:
case ELM_WIN_SPLASH:
case ELM_WIN_TOOLBAR:
case ELM_WIN_UTILITY:
@ -6433,7 +6446,15 @@ _efl_ui_win_stack_master_id_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const
eina_stringshare_replace(&(sd->stack_master_id), id);
#ifdef HAVE_ELEMENTARY_X
if (sd->x.xwin) _elm_win_xwin_update(sd);
else
#endif
{
int num = ecore_evas_aux_hint_id_get(sd->ee, "stack_master_id");
if (num >= 0)
ecore_evas_aux_hint_val_set(sd->ee, num, id);
else
ecore_evas_aux_hint_add(sd->ee, "stack_master_id", id);
}
}
EOLIAN static const char *
@ -6445,8 +6466,14 @@ _efl_ui_win_stack_master_id_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
EOLIAN static void
_efl_ui_win_stack_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool base)
{
int num;
if (sd->shown) return;
sd->stack_base = !!base;
num = ecore_evas_aux_hint_id_get(sd->ee, "stack_base");
if (num >= 0)
ecore_evas_aux_hint_val_set(sd->ee, num, sd->stack_base ? "1" : "0");
else
ecore_evas_aux_hint_add(sd->ee, "stack_base", sd->stack_base ? "1" : "0");
}
EOLIAN static Eina_Bool
@ -6517,8 +6544,13 @@ _efl_ui_win_stack_pop_to(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
}
ecore_x_ungrab();
}
else
#endif
// wayland - needs to be a special compositor request
{
int num = ecore_evas_aux_hint_id_get(sd->ee, "stack_pop_to");
if (num >= 0) ecore_evas_aux_hint_val_set(sd->ee, num, "1");
else ecore_evas_aux_hint_add(sd->ee, "stack_pop_to", "1");
}
// win32/osx ?
}

23
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -616,6 +616,24 @@ _ecore_evas_wl_common_cb_window_configure_complete(void *data EINA_UNUSED, int t
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_ecore_evas_wl_common_cb_aux_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
Ecore_Evas *ee;
Ecore_Wl2_Event_Aux_Message *ev;
ev = event;
ee = ecore_event_window_match(ev->win);
if (!ee) return ECORE_CALLBACK_PASS_ON;
if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
if (eina_streq(ev->key, "stack_del"))
{
if (ee->func.fn_delete_request)
ee->func.fn_delete_request(ee);
}
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
_ecore_evas_wl_common_cb_aux_hint_supported(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
@ -1229,6 +1247,9 @@ _ecore_evas_wl_common_init(void)
_ecore_evas_wl_event_hdls[16] =
ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE,
_ecore_evas_wl_common_cb_iconify_state_change, NULL);
_ecore_evas_wl_event_hdls[15] =
ecore_event_handler_add(ECORE_WL2_EVENT_AUX_MESSAGE,
_ecore_evas_wl_common_cb_aux_message, NULL);
ecore_event_evas_init();
@ -2454,6 +2475,8 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i
wdata->win = ecore_wl2_window_new(ewd, p, x, y, w + fw, h + fh);
ee->prop.window = ecore_wl2_window_id_get(wdata->win);
ee->prop.aux_hint.supported_list = ecore_wl2_window_aux_hints_supported_get(wdata->win);
ecore_evas_aux_hint_add(ee, "wm.policy.win.msg.use", "1");
ee->evas = evas_new();
evas_data_attach_set(ee->evas, ee);