From 0902e5bb67ba185b9dd674b553b1b24574665287 Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Fri, 5 Apr 2024 12:06:59 +0900 Subject: [PATCH] Change std:vector to eina_array The standard vector is code for c++, so modify it to use eina_array Change-Id: I69e37853a06c26d2b8ebbb749d171fea348d5857 Signed-off-by: huiyu.eun --- src/video/tizen/SDL_tizenwindow.c | 114 +++++++++++++++---------- src/video/tizen/indicator/SDL_tizenindicator.c | 25 ++++-- 2 files changed, 85 insertions(+), 54 deletions(-) diff --git a/src/video/tizen/SDL_tizenwindow.c b/src/video/tizen/SDL_tizenwindow.c index 3b75b2c..7c8ca65 100755 --- a/src/video/tizen/SDL_tizenwindow.c +++ b/src/video/tizen/SDL_tizenwindow.c @@ -51,7 +51,7 @@ /*SDL indicator*/ Ecore_Ipc_Server *ipc = NULL; -std::vector mEcoreEventHandler; +Eina_Array *mEcoreEventHandler; #define IPC_HEAD(_type) \ Ecore_Ipc_Event_Client_##_type *e = event; \ @@ -232,9 +232,14 @@ _tizen_init_ecore_ipc() if(!ipc) ecore_ipc_shutdown(); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _cb_client_add, NULL)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _cb_client_del, NULL)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _cb_client_data, NULL)); + Ecore_Event_Handler *h; + + h = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _cb_client_add, NULL); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _cb_client_del, NULL); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _cb_client_data, NULL); + eina_array_push(mEcoreEventHandler, h); } return 0; } @@ -585,10 +590,14 @@ _tizen_output_transform_register(SDL_WindowData *wind) Ecore_Wl2_Output *output = ecore_wl2_window_output_find(wind->window); wind->output_rotation = ecore_wl2_output_transform_get(output) * 90; - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_OUTPUT_TRANSFORM, - _tizen_cb_output_transform, NULL)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_IGNORE_OUTPUT_TRANSFORM, - _tizen_cb_ignore_output_transform, NULL)); + Ecore_Event_Handler *h; + + h = ecore_event_handler_add(ECORE_WL2_EVENT_OUTPUT_TRANSFORM, + _tizen_cb_output_transform, NULL); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_IGNORE_OUTPUT_TRANSFORM, + _tizen_cb_ignore_output_transform, NULL); + eina_array_push(mEcoreEventHandler, h); } void @@ -1335,39 +1344,54 @@ Tizen_InitWindow(_THIS) SDL_VideoData *data = _this->driverdata; data->windows = eina_hash_int32_new(NULL); - - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_VISIBILITY_CHANGE, - _tizen_cb_event_window_visibility_change,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ROTATE, - _tizen_cb_event_window_rotate,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_CONFIGURE, - _tizen_cb_window_configure,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_SHOW, - _tizen_cb_event_window_show, _this)); - - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_KEY_UP, - _tizen_cb_event_keyup_change,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, - _tizen_cb_event_keydown_change,_this)); - - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, - _tizen_cb_event_mousedown_change,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, - _tizen_cb_event_mouseup_change,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, - _tizen_cb_event_mousemove_change,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_MOUSE_IN, - _tizen_cb_event_mouse_in,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_MOUSE_OUT, - _tizen_cb_event_mouse_out,_this)); - - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_IN, - _tizen_cb_event_focus_in,_this)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_OUT, - _tizen_cb_event_focus_out,_this)); - - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_EVENT_JOYSTICK, - _tizen_cb_event_joystick_change,_this)); + Ecore_Event_Handler *h; + + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_VISIBILITY_CHANGE, + _tizen_cb_event_window_visibility_change,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ROTATE, + _tizen_cb_event_window_rotate,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_CONFIGURE, + _tizen_cb_window_configure,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_SHOW, + _tizen_cb_event_window_show, _this); + eina_array_push(mEcoreEventHandler, h); + + h = ecore_event_handler_add(ECORE_EVENT_KEY_UP, + _tizen_cb_event_keyup_change,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, + _tizen_cb_event_keydown_change,_this); + eina_array_push(mEcoreEventHandler, h); + + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, + _tizen_cb_event_mousedown_change,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, + _tizen_cb_event_mouseup_change,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, + _tizen_cb_event_mousemove_change,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_IN, + _tizen_cb_event_mouse_in,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_OUT, + _tizen_cb_event_mouse_out,_this); + eina_array_push(mEcoreEventHandler, h); + + h = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_IN, + _tizen_cb_event_focus_in,_this); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_OUT, + _tizen_cb_event_focus_out,_this); + eina_array_push(mEcoreEventHandler, h); + + h = ecore_event_handler_add(ECORE_EVENT_JOYSTICK, + _tizen_cb_event_joystick_change,_this); + eina_array_push(mEcoreEventHandler, h); return 0; } @@ -1375,12 +1399,12 @@ Tizen_InitWindow(_THIS) void Tizen_DeinitWindow(_THIS) { - int size = mECoreEventHandler.size(); - for (int i = 0; i < size; i++) + if (mEcoreEventHandler) { - ecore_event_handler_del(*mECoreEventHandler[i]); + while (eina_array_count(mEcoreEventHandler)) + ecore_event_handler_del(eina_array_pop(mEcoreEventHandler)); + eina_array_free(mEcoreEventHandler); } - mEcoreEventHandler.Clear(); SDL_VideoData *data = _this->driverdata; diff --git a/src/video/tizen/indicator/SDL_tizenindicator.c b/src/video/tizen/indicator/SDL_tizenindicator.c index 93ad116..23fda5e 100644 --- a/src/video/tizen/indicator/SDL_tizenindicator.c +++ b/src/video/tizen/indicator/SDL_tizenindicator.c @@ -13,7 +13,7 @@ #include "SDL_tizenindicator.h" #include "dbg.h" -std::vector mEcoreEventHandler; +Eina_Array *mEcoreEventHandler; static Eina_Bool _tizen_set_transient_for (appdata_s *ad, uint32_t child_id, uint32_t parent_id) @@ -223,11 +223,15 @@ Eina_Bool handler_server_data(void *data, int ev_type EINA_UNUSED, void *ev) void create_ipcServer(appdata_s *ad) { ecore_ipc_init(); + Ecore_Event_Handler *h; if((ad->IpcServer = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, ECORE_IPC_INDICATOR, 0, NULL))) { - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, handler_server_add, ad)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, handler_server_del, NULL)); - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, handler_server_data, ad)); + h = ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, handler_server_add, ad); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, handler_server_del, NULL); + eina_array_push(mEcoreEventHandler, h); + h = ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, handler_server_data, ad); + eina_array_push(mEcoreEventHandler, h); } else { @@ -328,7 +332,9 @@ void init_info(appdata_s *ad) static void create_base_gui(appdata_s *ad) { - mEcoreEventHandler.push_back(ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_SHOW, _window_show_cb, ad)); + Ecore_Event_Handler *h; + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_SHOW, _window_show_cb, ad); + eina_array_push(mEcoreEventHandler, h); ad->win = (Evas_Object *)elm_win_create("SDL_Indicator"); evas_object_smart_callback_add(ad->win, "delete,request", win_delete_request_cb, NULL); @@ -423,6 +429,7 @@ ui_app_low_memory(app_event_info_h event_info, void *user_data) int main(int argc, char *argv[]) { + mEcoreEventHandler = eina_array_new(2); appdata_s ad = {0,}; ad.indicator_type = SDL_INDICATOR_TRANSPARENT; int ret = 0; @@ -448,11 +455,11 @@ main(int argc, char *argv[]) dlog_print(DLOG_ERROR, LOG_TAG, "app_main() is failed. err = %d", ret); } - int size = mECoreEventHandler.size(); - for (int i = 0; i < size; i++) + if (mEcoreEventHandler) { - ecore_event_handler_del(*mECoreEventHandler[i]); + while (eina_array_count(mEcoreEventHandler)) + ecore_event_handler_del(eina_array_pop(mEcoreEventHandler)); + eina_array_free(mEcoreEventHandler); } - mEcoreEventHandler.Clear(); return ret; } -- 2.7.4