From 112df1214b50157905d25b28b3b61f39e45db8c5 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 24 Oct 2019 13:53:40 +0900 Subject: [PATCH] e_hwc_window: change hook accepted_state_change to accpeted_state_set Change-Id: I80cfbe14bf259c4b7790d53dd918839233acf24f --- src/bin/e_hwc_window.c | 20 +++++++++++--------- src/bin/e_hwc_window.h | 2 +- src/bin/e_hwc_window_queue.c | 6 +++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index b888a6377c..db155cd5fd 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -105,7 +105,7 @@ typedef struct _Hwc_Window_Prop static Eina_Inlist *_e_hwc_window_hooks[] = { - [E_HWC_WINDOW_HOOK_ACCEPTED_STATE_CHANGE] = NULL, + [E_HWC_WINDOW_HOOK_ACCEPTED_STATE_SET] = NULL, }; static void @@ -1546,18 +1546,20 @@ e_hwc_window_accepted_state_set(E_Hwc_Window *hwc_window, E_Hwc_Window_State sta { EINA_SAFETY_ON_NULL_RETURN_VAL(hwc_window, EINA_FALSE); - if (hwc_window->accepted_state == state) return EINA_TRUE; + if (hwc_window->accepted_state != state) + { + hwc_window->accepted_state = state; - hwc_window->accepted_state = state; + if (hwc_window->accepted_state == E_HWC_WINDOW_STATE_NONE) + hwc_window->zpos = E_HWC_WINDOW_ZPOS_NONE; - if (hwc_window->accepted_state == E_HWC_WINDOW_STATE_NONE) - hwc_window->zpos = E_HWC_WINDOW_ZPOS_NONE; + EHWINF("Set Accepted state:%s -- {%s}", + hwc_window->ec, hwc_window->hwc, hwc_window, e_hwc_window_state_string_get(state), + e_hwc_window_name_get(hwc_window)); - EHWINF("Set Accepted state:%s -- {%s}", - hwc_window->ec, hwc_window->hwc, hwc_window, e_hwc_window_state_string_get(state), - e_hwc_window_name_get(hwc_window)); + } - _e_hwc_window_hook_call(E_HWC_WINDOW_HOOK_ACCEPTED_STATE_CHANGE, hwc_window); + _e_hwc_window_hook_call(E_HWC_WINDOW_HOOK_ACCEPTED_STATE_SET, hwc_window); return EINA_TRUE; } diff --git a/src/bin/e_hwc_window.h b/src/bin/e_hwc_window.h index 98ac151545..499e3cf911 100644 --- a/src/bin/e_hwc_window.h +++ b/src/bin/e_hwc_window.h @@ -52,7 +52,7 @@ typedef enum _E_Hwc_Window_Activation_State typedef enum _E_Hwc_Window_Hook_Point { - E_HWC_WINDOW_HOOK_ACCEPTED_STATE_CHANGE, + E_HWC_WINDOW_HOOK_ACCEPTED_STATE_SET, E_HWC_WINDOW_HOOK_LAST } E_Hwc_Window_Hook_Point; diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c index 6709c81b18..433ad96699 100644 --- a/src/bin/e_hwc_window_queue.c +++ b/src/bin/e_hwc_window_queue.c @@ -1037,7 +1037,7 @@ _e_hwc_window_queue_cb_buffer_change(void *data, E_Client *ec) } void -_e_hwc_window_queue_cb_accepted_state_change(void *data, E_Hwc_Window *hwc_window) +_e_hwc_window_queue_cb_accepted_state_set(void *data, E_Hwc_Window *hwc_window) { E_Hwc_Window_State state; E_Hwc_Window_Queue *queue = NULL; @@ -1171,8 +1171,8 @@ e_hwc_window_queue_init(void) E_LIST_HANDLER_APPEND(_hwc_winq_mgr->event_handlers, E_EVENT_HWC_WINDOW_QUEUE_UNSET, _e_hwc_window_queue_cb_unset, NULL); - E_HWC_WINDOW_HOOK_APPEND(hwc_window_queue_window_hooks, E_HWC_WINDOW_HOOK_ACCEPTED_STATE_CHANGE, - _e_hwc_window_queue_cb_accepted_state_change, NULL); + E_HWC_WINDOW_HOOK_APPEND(hwc_window_queue_window_hooks, E_HWC_WINDOW_HOOK_ACCEPTED_STATE_SET, + _e_hwc_window_queue_cb_accepted_state_set, NULL); E_COMP_WL_HOOK_APPEND(hwc_window_queue_comp_wl_hooks, E_COMP_WL_HOOK_BUFFER_CHANGE, _e_hwc_window_queue_cb_buffer_change, NULL); -- 2.34.1