E: Reduce need for extra variable and just directly add handlers to

the list.



SVN revision: 63530
This commit is contained in:
Christopher Michael 2011-09-22 05:45:45 +00:00
parent a0a0b42146
commit 277cbfdcaf
1 changed files with 40 additions and 17 deletions

View File

@ -84,7 +84,6 @@ EAPI E_Manager *
e_manager_new(Ecore_X_Window root, int num) e_manager_new(Ecore_X_Window root, int num)
{ {
E_Manager *man; E_Manager *man;
Ecore_Event_Handler *h;
if (!ecore_x_window_manage(root)) return NULL; if (!ecore_x_window_manage(root)) return NULL;
ecore_x_window_background_color_set(root, 0, 0, 0); ecore_x_window_background_color_set(root, 0, 0, 0);
@ -106,22 +105,46 @@ e_manager_new(Ecore_X_Window root, int num)
man->win = man->root; man->win = man->root;
} }
h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_manager_cb_window_show_request, man); man->handlers =
if (h) man->handlers = eina_list_append(man->handlers, h); eina_list_append(man->handlers,
h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, _e_manager_cb_window_configure, man); ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST,
if (h) man->handlers = eina_list_append(man->handlers, h); _e_manager_cb_window_show_request,
h = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_manager_cb_key_down, man); man));
if (h) man->handlers = eina_list_append(man->handlers, h); man->handlers =
h = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _e_manager_cb_key_up, man); eina_list_append(man->handlers,
if (h) man->handlers = eina_list_append(man->handlers, h); ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
h = ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST, _e_manager_cb_frame_extents_request, man); _e_manager_cb_window_configure,
if (h) man->handlers = eina_list_append(man->handlers, h); man));
h = ecore_event_handler_add(ECORE_X_EVENT_PING, _e_manager_cb_ping, man); man->handlers =
if (h) man->handlers = eina_list_append(man->handlers, h); eina_list_append(man->handlers,
h = ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY, _e_manager_cb_screensaver_notify, man); ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
if (h) man->handlers = eina_list_append(man->handlers, h); _e_manager_cb_key_down,
h = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _e_manager_cb_client_message, man); man));
if (h) man->handlers = eina_list_append(man->handlers, h); man->handlers =
eina_list_append(man->handlers,
ecore_event_handler_add(ECORE_EVENT_KEY_UP,
_e_manager_cb_key_up,
man));
man->handlers =
eina_list_append(man->handlers,
ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST,
_e_manager_cb_frame_extents_request,
man));
man->handlers =
eina_list_append(man->handlers,
ecore_event_handler_add(ECORE_X_EVENT_PING,
_e_manager_cb_ping,
man));
man->handlers =
eina_list_append(man->handlers,
ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY,
_e_manager_cb_screensaver_notify,
man));
man->handlers =
eina_list_append(man->handlers,
ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
_e_manager_cb_client_message,
man));
man->pointer = e_pointer_window_new(man->root, 1); man->pointer = e_pointer_window_new(man->root, 1);