diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-11-07 13:05:18 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-11-09 14:23:11 -0500 |
| commit | 3a16a86ea3ceaae9c1b662f9055946ed9be9aff3 (patch) | |
| tree | 931c44c6d8f659b53432fc9d00dfcf41cc2e7d12 | |
| parent | cd2ebfe5326d05a5fd719213e39650a292ed71fd (diff) | |
| download | enlightenment-3a16a86ea3ceaae9c1b662f9055946ed9be9aff3.tar.gz | |
break out x11 client visibility setting into util functions
| -rw-r--r-- | src/bin/e_comp_x.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index bdeed0b4ce..46745046b8 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -936,22 +936,29 @@ _e_comp_x_evas_resize_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_i } static void -_e_comp_x_evas_hide_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_e_comp_x_client_hide(E_Client *ec) { - E_Client *ec = data, *tmp; unsigned int visible = 0; - Eina_List *l; if (!ec->comp_data) return; // already deleted, happens with internal wins ecore_x_window_shadow_tree_flush(); if ((!ec->iconic) && (!ec->override)) ecore_x_window_prop_card32_set(e_client_util_win_get(ec), E_ATOM_MAPPED, &visible, 1); - EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp) - evas_object_hide(tmp->frame); - if (ec->unredirected_single || ec->iconic) ecore_x_window_hide(_e_comp_x_client_window_get(ec)); +} + +static void +_e_comp_x_evas_hide_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + E_Client *ec = data, *tmp; + Eina_List *l; + + _e_comp_x_client_hide(ec); + + EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp) + evas_object_hide(tmp->frame); if (e_comp_config_get()->send_flush) ecore_x_e_comp_flush_send(e_client_util_win_get(ec)); @@ -960,12 +967,10 @@ _e_comp_x_evas_hide_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN } static void -_e_comp_x_evas_show_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_e_comp_x_client_show(E_Client *ec) { - E_Client *ec = data, *tmp; unsigned int visible = 1; Ecore_X_Window win; - Eina_List *l; if (!ec->comp_data) return; win = e_client_util_win_get(ec); @@ -982,6 +987,15 @@ _e_comp_x_evas_show_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN ecore_x_window_prop_card32_set(win, E_ATOM_MAPPED, &visible, 1); ecore_x_window_prop_card32_set(win, E_ATOM_MANAGED, &visible, 1); +} + +static void +_e_comp_x_evas_show_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + E_Client *ec = data, *tmp; + Eina_List *l; + + _e_comp_x_client_show(ec); if (ec->comp_data->frame_update) { |