styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a bunch of wasted whitespace. 

Fix some formatting.
Fix compiler warning wrt e_icon.



SVN revision: 43275
This commit is contained in:
Christopher Michael 2009-10-25 18:42:47 +00:00
parent ad1669b3ec
commit 5970c2685d
1 changed files with 113 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/bin/e_menu.c
View File

@ -84,7 +84,6 @@ static int _e_menu_cb_mouse_move (void *data, int type, void *e
static int _e_menu_cb_mouse_wheel(void *data, int type, void *event);
static int _e_menu_cb_scroll_animator(void *data);
static int _e_menu_cb_window_shape(void *data, int ev_type, void *ev);
static void _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi);
static Eina_Bool _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
@ -141,13 +140,25 @@ _e_menu_list_free_unref(Eina_List *l)
EAPI int
e_menu_init(void)
{
_e_menu_key_down_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_menu_cb_key_down, NULL);
_e_menu_key_up_handler = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _e_menu_cb_key_up, NULL);
_e_menu_mouse_down_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_menu_cb_mouse_down, NULL);
_e_menu_mouse_up_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _e_menu_cb_mouse_up, NULL);
_e_menu_mouse_move_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_menu_cb_mouse_move, NULL);
_e_menu_mouse_wheel_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, _e_menu_cb_mouse_wheel, NULL);
_e_menu_window_shape_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_menu_cb_window_shape, NULL);
_e_menu_key_down_handler =
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_menu_cb_key_down, NULL);
_e_menu_key_up_handler =
ecore_event_handler_add(ECORE_EVENT_KEY_UP, _e_menu_cb_key_up, NULL);
_e_menu_mouse_down_handler =
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
_e_menu_cb_mouse_down, NULL);
_e_menu_mouse_up_handler =
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
_e_menu_cb_mouse_up, NULL);
_e_menu_mouse_move_handler =
ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE,
_e_menu_cb_mouse_move, NULL);
_e_menu_mouse_wheel_handler =
ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
_e_menu_cb_mouse_wheel, NULL);
_e_menu_window_shape_handler =
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,
_e_menu_cb_window_shape, NULL);
_e_menu_categories = eina_hash_string_superfast_new(NULL);
return 1;
}
@ -291,6 +302,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
m->cur.y = y + h - m->cur.h;
break;
case E_MENU_POP_DIRECTION_RIGHT:
_e_menu_realize(m);
m->cur.x = x + w;
m->cur.y = y;
break;
@ -1055,9 +1067,7 @@ _e_menu_free(E_Menu *m)
E_FREE(m->shape_rects);
m->shape_rects_num = 0;
EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi)
{
e_object_del(E_OBJECT(mi));
}
if (m->in_active_list)
{
_e_active_menus = eina_list_remove(_e_active_menus, m);
@ -1273,9 +1283,9 @@ _e_menu_item_realize(E_Menu_Item *mi)
{
o = e_icon_add(mi->menu->evas);
mi->icon_object = o;
e_icon_preload_set(mi->icon, 1);
e_icon_preload_set(mi->icon_object, 1);
e_icon_file_set(o, mi->icon);
e_icon_fill_inside_set(o, 1);
e_icon_fill_inside_set(mi->icon_object, 1);
e_icon_size_get(mi->icon_object, &icon_w, &icon_h);
}
}
@ -1417,7 +1427,8 @@ _e_menu_realize(E_Menu *m)
evas_event_freeze(m->evas);
/* move cursor out to avoid event cycles during setup */
evas_event_feed_mouse_in(m->evas, ecore_x_current_time_get(), NULL);
evas_event_feed_mouse_move(m->evas, -1000000, -1000000, ecore_x_current_time_get(), NULL);
evas_event_feed_mouse_move(m->evas, -1000000, -1000000,
ecore_x_current_time_get(), NULL);
ecore_x_window_shape_events_select(m->evas_win, 1);
ecore_evas_name_class_set(m->ecore_evas, "E", "_e_menu_window");
ecore_evas_title_set(m->ecore_evas, "E Menu");
@ -1471,9 +1482,7 @@ _e_menu_realize(E_Menu *m)
edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);
EINA_LIST_FOREACH(m->items, l, mi)
{
_e_menu_item_realize(mi);
}
_e_menu_items_layout_update(m);
e_box_thaw(m->container_object);
@ -1713,9 +1722,7 @@ _e_menu_unrealize(E_Menu *m)
m->shape = NULL;
e_box_freeze(m->container_object);
EINA_LIST_FOREACH(m->items, l, mi)
{
_e_menu_item_unrealize(mi);
}
if (m->header.icon) evas_object_del(m->header.icon);
m->header.icon = NULL;
if (m->bg_object) evas_object_del(m->bg_object);
@ -1785,11 +1792,9 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
{
E_Menu_Category_Callback *cb;
EINA_LIST_FOREACH(cat->callbacks, l, cb)
{
if (cb->create) cb->create(m, cat->data, cb->data);
}
}
}
m->cur.visible = 1;
}
@ -1903,9 +1908,7 @@ _e_menu_reposition(E_Menu *m)
tmp = _e_active_menus_copy_ref();
EINA_LIST_FOREACH(m->items, l, mi)
{
if ((mi->active) && (mi->submenu)) _e_menu_reposition(mi->submenu);
}
_e_menu_list_free_unref(tmp);
}
@ -1994,7 +1997,7 @@ _e_menu_item_activate_previous(void)
ll = eina_list_prev(ll);
mi = eina_list_data_get(ll);
}
while (mi->separator || mi->disable);
while ((mi->separator) || (mi->disable));
e_menu_item_active_set(mi, 1);
_e_menu_item_ensure_onscreen(mi);
@ -2546,30 +2549,21 @@ _e_menu_cb_key_down(void *data, int type, void *event)
ev = event;
if (ev->window != _e_menu_win) return 1;
if ((!strcmp(ev->key, "Up")) ||
(!strcmp(ev->key, "KP_Up")))
if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
_e_menu_item_activate_previous();
else if ((!strcmp(ev->key, "Down")) ||
(!strcmp(ev->key, "KP_Down")))
else if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
_e_menu_item_activate_next();
else if ((!strcmp(ev->key, "Left")) ||
(!strcmp(ev->key, "KP_Left")))
else if ((!strcmp(ev->key, "Left")) || (!strcmp(ev->key, "KP_Left")))
_e_menu_activate_previous();
else if ((!strcmp(ev->key, "Right")) ||
(!strcmp(ev->key, "KP_Right")))
else if ((!strcmp(ev->key, "Right")) || (!strcmp(ev->key, "KP_Right")))
_e_menu_activate_next();
else if ((!strcmp(ev->key, "Home")) ||
(!strcmp(ev->key, "KP_Home")))
else if ((!strcmp(ev->key, "Home")) || (!strcmp(ev->key, "KP_Home")))
_e_menu_item_activate_first();
else if ((!strcmp(ev->key, "End")) ||
(!strcmp(ev->key, "KP_End")))
else if ((!strcmp(ev->key, "End")) || (!strcmp(ev->key, "KP_End")))
_e_menu_item_activate_last();
else if (!strcmp(ev->key, "space"))
{
_e_menu_active_call();
}
else if ((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->key, "KP_Enter")))
else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
{
_e_menu_active_call();
_e_menu_deactivate_all();
@ -2721,8 +2715,7 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
evas_event_feed_mouse_move(m->evas,
ev->x - m->cur.x + m->zone->x,
ev->y - m->cur.y + m->zone->y,
ev->timestamp,
NULL);
ev->timestamp, NULL);
}
}