From c24201e6af03c89be3e9f0b60612b1f93203f975 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 20 Apr 2023 16:10:17 +0900 Subject: [PATCH] e_client: remove the internal_elm_win internel_elm_win var is useless. Change-Id: I8b171c42b1e5bbc1737f0c2b8cf450d030d5cb11 --- src/bin/e_client.c | 15 --------------- src/bin/e_client.h | 2 -- src/bin/e_comp_object.c | 2 -- src/bin/e_comp_wl.c | 6 ++---- src/bin/e_comp_wl_shell.c | 8 ++++---- 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 6a6fddb..8b1a2d9 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -489,8 +489,6 @@ _e_client_action_finish(void) if (action_client) { action_client->keyboard_resizing = 0; - //if (action_client->internal_elm_win) - // ecore_event_window_ignore_events(elm_win_window_id_get(action_client->internal_elm_win), 0); } action_client = NULL; } @@ -1214,7 +1212,6 @@ _e_client_free(E_Client *ec) EINA_LIST_FREE(ec->e.state.video_child, tmp) tmp->e.state.video_parent_client = NULL; } - E_FREE_FUNC(ec->internal_elm_win, evas_object_del); E_FREE_FUNC(ec->post_job, ecore_idle_enterer_del); E_FREE_FUNC(ec->kill_timer, ecore_timer_del); @@ -1333,9 +1330,6 @@ _e_client_del(E_Client *ec) E_FREE_FUNC(ec->border_prop_dialog, e_object_del); E_FREE_FUNC(ec->color_editor, evas_object_del); - if (ec->internal_elm_win) - evas_object_hide(ec->internal_elm_win); - if (ec->focused) e_client_revert_focus(ec); @@ -1498,12 +1492,8 @@ _e_client_action_init(E_Client *ec) if (action_client) { action_client->keyboard_resizing = 0; - //if (action_client->internal_elm_win) - // ecore_event_window_ignore_events(elm_win_window_id_get(action_client->internal_elm_win), 0); } action_client = ec; - //if (ec->internal_elm_win) - // ecore_event_window_ignore_events(elm_win_window_id_get(ec->internal_elm_win), 1); } static void @@ -2529,11 +2519,6 @@ _e_client_cb_evas_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (e_object_is_del(data)) return; ec->pre_res_change.valid = 0; - if (ec->internal_elm_win) - { - EC_CHANGED(ec); - ec->changes.pos = 1; - } _e_client_event_simple(ec, E_EVENT_CLIENT_MOVE); diff --git a/src/bin/e_client.h b/src/bin/e_client.h index 7ac5598..3eb9b83 100644 --- a/src/bin/e_client.h +++ b/src/bin/e_client.h @@ -828,8 +828,6 @@ struct E_Client unsigned int internal_no_reopen : 1; Eina_Bool dead : 1; - Evas_Object *internal_elm_win; - double ping; unsigned char changed : 1; diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 32ebad6..6115cf6 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3331,8 +3331,6 @@ _e_comp_smart_show(Evas_Object *obj) edje_object_play_set(cw->frame_object, 1); } evas_object_show(cw->effect_obj); - if (cw->ec->internal_elm_win && (!evas_object_visible_get(cw->ec->internal_elm_win))) - evas_object_show(cw->ec->internal_elm_win); if (cw->mask.obj) evas_object_show(cw->mask.obj); if (cw->transform_bg_obj) evas_object_show(cw->transform_bg_obj); if (cw->transform_tranp_obj) evas_object_show(cw->transform_tranp_obj); diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index ac48cbc..2dd3c4e 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -616,7 +616,7 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN evas_object_hide(ec->frame); // e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h); } - else if (!ec->internal_elm_win) + else evas_object_show(ec->frame); } @@ -3782,7 +3782,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec) /* NB: could not find a better place to do this, BUT for internal windows, * we need to set delete_request else the close buttons on the frames do * basically nothing */ - if ((ec->internal) || (ec->internal_elm_win)) + if (ec->internal) ec->icccm.delete_request = EINA_TRUE; /* set initial client data properties */ @@ -3855,8 +3855,6 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec) if (ec->comp_data->surface) wl_resource_set_user_data(ec->comp_data->surface, NULL); - if (ec->internal_elm_win) - _e_comp_wl_surface_render_stop(ec); _e_comp_wl_focus_check(); if (ec->comp_data->aux_hint.hints) diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c index 71c7d5b..cd6a49d 100644 --- a/src/bin/e_comp_wl_shell.c +++ b/src/bin/e_comp_wl_shell.c @@ -128,7 +128,7 @@ e_shell_e_client_popup_set(E_Client *ec) e_client_unignore(ec); e_comp->new_clients++; if (!ec->internal) - ec->borderless = !ec->internal_elm_win; + ec->borderless = 1; ec->lock_border = EINA_TRUE; if (!ec->internal) ec->border.changed = ec->changes.border = !ec->borderless; @@ -531,7 +531,7 @@ _e_shell_surface_cb_popup_set(struct wl_client *client EINA_UNUSED, struct wl_re } if (!ec->internal) - ec->borderless = !ec->internal_elm_win; + ec->borderless = 1; ec->lock_border = EINA_TRUE; if (!ec->internal) ec->border.changed = ec->changes.border = !ec->borderless; @@ -1249,11 +1249,11 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_ { x = E_CLAMP(ec->parent->client.x + ec->comp_data->popup.x, ec->parent->client.x, - ec->parent->client.x + + ec->parent->client.x + ec->parent->client.w - ec->client.w); y = E_CLAMP(ec->parent->client.y + ec->comp_data->popup.y, ec->parent->client.y, - ec->parent->client.y + + ec->parent->client.y + ec->parent->client.h - ec->client.h); } } -- 2.7.4