From: SooChan Lim Date: Thu, 26 Oct 2023 04:48:10 +0000 (+0900) Subject: e_client: remove the unused hooks for e_zone X-Git-Tag: accepted/tizen/unified/20231030.034814~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b2b3bdd6707f3c647e46c3a3ddd56eafbdaa61b;p=platform%2Fupstream%2Fenlightenment.git e_client: remove the unused hooks for e_zone There are the new hooks for e_zone refactoring, but it is not used anymore because the hooks are replaced by wl_signals and listeners. Change-Id: If4aab55671ca6a04db03329efdcf15858fd103cb --- diff --git a/src/bin/e_client.c b/src/bin/e_client.c index c075e01ebf..fd7fb0e508 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -176,10 +176,6 @@ static Eina_Inlist *_e_client_hooks[] = [E_CLIENT_HOOK_RESIZE_UPDATE] = NULL, [E_CLIENT_HOOK_RESIZE_END] = NULL, [E_CLIENT_HOOK_FULLSCREEN_PRE] = NULL, -//#ifdef REFACTOR_ZONE_DESK - [E_CLIENT_HOOK_FULLSCREEN] = NULL, - [E_CLIENT_HOOK_UNFULLSCREEN] = NULL, -//#endif [E_CLIENT_HOOK_DEL] = NULL, [E_CLIENT_HOOK_UNREDIRECT] = NULL, [E_CLIENT_HOOK_REDIRECT] = NULL, @@ -194,12 +190,6 @@ static Eina_Inlist *_e_client_hooks[] = [E_CLIENT_HOOK_TRANSFORM_CHANGE] = NULL, [E_CLIENT_HOOK_ACTIVATE_DONE] = NULL, [E_CLIENT_HOOK_EVAL_VISIBILITY_END] = NULL, -//#ifdef REFACTOR_ZONE_DESK - [E_CLIENT_HOOK_STICK] = NULL, - [E_CLIENT_HOOK_UNSTICK] = NULL, - [E_CLIENT_HOOK_MAXIMIZE] = NULL, - [E_CLIENT_HOOK_UNMAXIMIZE] = NULL, -//#endif }; static Eina_Inlist *_e_client_intercept_hooks[] = @@ -5800,15 +5790,8 @@ e_client_maximize(E_Client *ec, E_Maximize max) return; } - // store the E_Maximize value requested - ec->requested_max = max; - // call the maximize hook of a client wl_signal_emit_mutable(&PRI(ec)->events.maximize, &max); - _e_client_hook_call(E_CLIENT_HOOK_MAXIMIZE, ec); - - // clear the E_Maximize value requested - ec->requested_max = E_MAXIMIZE_NONE; // store the E_Maximize value ec->maximized = max; @@ -5911,15 +5894,8 @@ e_client_unmaximize(E_Client *ec, E_Maximize max) evas_object_smart_callback_call(ec->frame, "unmaximize_pre", NULL); - // store the E_Maximize value requested - ec->requested_max = max; - // call the unmaximize hook of a client wl_signal_emit_mutable(&PRI(ec)->events.unmaximize, &max); - _e_client_hook_call(E_CLIENT_HOOK_UNMAXIMIZE, ec); - - // clear the E_Maximize value requested - ec->requested_max = E_MAXIMIZE_NONE; evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL); ec->changes.need_unmaximize = 0; @@ -6063,11 +6039,10 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy) wl_signal_emit_mutable(&PRI(ec)->events.fullscreen_pre, NULL); _e_client_hook_call(E_CLIENT_HOOK_FULLSCREEN_PRE, ec); - ec->fullscreen_policy = policy; - // call the fullscreen hook of a client wl_signal_emit_mutable(&PRI(ec)->events.fullscreen, &policy); - _e_client_hook_call(E_CLIENT_HOOK_FULLSCREEN, ec); + + ec->fullscreen_policy = policy; _e_client_event_simple(ec, E_EVENT_CLIENT_FULLSCREEN); #else @@ -6160,7 +6135,8 @@ e_client_unfullscreen(E_Client *ec) // call the unfullscreen hook of a client wl_signal_emit_mutable(&PRI(ec)->events.unfullscreen, NULL); - _e_client_hook_call(E_CLIENT_HOOK_UNFULLSCREEN, ec); + + ec->fullscreen_policy = E_FULLSCREEN_RESIZE; _e_client_event_simple(ec, E_EVENT_CLIENT_UNFULLSCREEN); #else @@ -6503,7 +6479,6 @@ e_client_stick(E_Client *ec) // call the stick hook of a client wl_signal_emit_mutable(&PRI(ec)->events.stick, NULL); - _e_client_hook_call(E_CLIENT_HOOK_STICK, ec); // send the sticky property event of a client _e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY); @@ -6547,7 +6522,6 @@ e_client_unstick(E_Client *ec) // call the unstick hook of a client wl_signal_emit_mutable(&PRI(ec)->events.unstick, NULL); - _e_client_hook_call(E_CLIENT_HOOK_UNSTICK, ec); // send the sticky property event of a client _e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY); diff --git a/src/bin/e_client.h b/src/bin/e_client.h index e38b41fa11..1d3956b64f 100644 --- a/src/bin/e_client.h +++ b/src/bin/e_client.h @@ -268,10 +268,6 @@ typedef enum _E_Client_Hook_Point E_CLIENT_HOOK_RESIZE_UPDATE, E_CLIENT_HOOK_RESIZE_END, E_CLIENT_HOOK_FULLSCREEN_PRE, -//#ifdef REFACTOR_ZONE_DESK - E_CLIENT_HOOK_FULLSCREEN, - E_CLIENT_HOOK_UNFULLSCREEN, -//#endif E_CLIENT_HOOK_DEL, E_CLIENT_HOOK_UNREDIRECT, E_CLIENT_HOOK_REDIRECT, @@ -286,12 +282,6 @@ typedef enum _E_Client_Hook_Point E_CLIENT_HOOK_TRANSFORM_CHANGE, E_CLIENT_HOOK_ACTIVATE_DONE, E_CLIENT_HOOK_EVAL_VISIBILITY_END, -//#ifdef REFACTOR_ZONE_DESK - E_CLIENT_HOOK_STICK, - E_CLIENT_HOOK_UNSTICK, - E_CLIENT_HOOK_MAXIMIZE, - E_CLIENT_HOOK_UNMAXIMIZE, -//#endif E_CLIENT_HOOK_LAST, } E_Client_Hook_Point; @@ -787,7 +777,6 @@ struct E_Client unsigned int take_focus : 1; unsigned int want_focus : 1; unsigned int user_skip_winlist : 1; - E_Maximize requested_max; E_Maximize maximized; E_Fullscreen fullscreen_policy; // TODO: should be removed - yigl E_Transient transient_policy;