/*SDL indicator*/
Ecore_Ipc_Server *ipc = NULL;
-std::vector<Ecore_Event_Handler*> mEcoreEventHandler;
+Eina_Array *mEcoreEventHandler;
#define IPC_HEAD(_type) \
Ecore_Ipc_Event_Client_##_type *e = event; \
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;
}
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
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;
}
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;
#include "SDL_tizenindicator.h"
#include "dbg.h"
-std::vector<Ecore_Event_Handler*> mEcoreEventHandler;
+Eina_Array *mEcoreEventHandler;
static Eina_Bool
_tizen_set_transient_for (appdata_s *ad, uint32_t child_id, uint32_t parent_id)
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
{
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);
int
main(int argc, char *argv[])
{
+ mEcoreEventHandler = eina_array_new(2);
appdata_s ad = {0,};
ad.indicator_type = SDL_INDICATOR_TRANSPARENT;
int ret = 0;
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;
}