From: Enlightenment S. <no-...@en...> - 2009-07-27 00:30:24
|
Log: Remove whitespace. Use E_FREE for things created with E_NEW. Add new function to clear the toolbar. Add new function to return the number of the selected item. Author: devilhorns Date: 2009-07-26 17:30:06 -0700 (Sun, 26 Jul 2009) New Revision: 41501 Modified: trunk/e/src/bin/e_widget_toolbar.c trunk/e/src/bin/e_widget_toolbar.h Modified: trunk/e/src/bin/e_widget_toolbar.c =================================================================== --- trunk/e/src/bin/e_widget_toolbar.c 2009-07-26 17:01:42 UTC (rev 41500) +++ trunk/e/src/bin/e_widget_toolbar.c 2009-07-27 00:30:06 UTC (rev 41501) @@ -59,7 +59,8 @@ o = wd->o_base; e_scrollframe_custom_theme_set(o, "base/theme/widgets", "e/widgets/toolbar"); e_scrollframe_single_dir_set(o, 1); - e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_AUTO, E_SCROLLFRAME_POLICY_OFF); + e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_AUTO, + E_SCROLLFRAME_POLICY_OFF); e_scrollframe_thumbscroll_force(o, 1); evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _e_wid_cb_scrollframe_resize, obj); @@ -106,7 +107,7 @@ it->data1 = data1; it->data2 = data2; wd->items = eina_list_append(wd->items, it); - + edje_object_signal_callback_add(o, "e,action,click", "e", _e_wid_signal_cb1, it); edje_extern_object_min_size_set(icon, wd->icon_w, wd->icon_h); @@ -147,7 +148,7 @@ evas_object_del(it->o_base); evas_object_del(it->o_icon); wd->items = eina_list_remove(wd->items, it); - free(it); + E_FREE(it); } } @@ -158,7 +159,7 @@ Eina_List *l; Item *it; int i; - + wd = e_widget_data_get(obj); for (i = 0, l = wd->items; l; l = l->next, i++) { @@ -251,6 +252,43 @@ } } +EAPI void +e_widget_toolbar_clear(Evas_Object *obj) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + while (wd->items) + { + Item *it = NULL; + + if (!(it = wd->items->data)) continue; + evas_object_del(it->o_base); + evas_object_del(it->o_icon); + wd->items = eina_list_remove(wd->items, it); + E_FREE(it); + } +} + +EAPI int +e_widget_toolbar_item_selected_get(Evas_Object *obj) +{ + E_Widget_Data *wd = NULL; + Eina_List *l = NULL; + int i = 0; + + wd = e_widget_data_get(obj); + for (i = 0, l = wd->items; l; l = l->next, i++) + { + Item *it = NULL; + + if (!(it = l->data)) continue;; + if (it->selected) return i; + } + return 0; +} + +/* local functions */ static void _e_wid_del_hook(Evas_Object *obj) { @@ -264,10 +302,10 @@ it = wd->items->data; evas_object_del(it->o_base); evas_object_del(it->o_icon); - free(it); wd->items = eina_list_remove_list(wd->items, wd->items); + E_FREE(it); } - free(wd); + E_FREE(wd); } static void Modified: trunk/e/src/bin/e_widget_toolbar.h =================================================================== --- trunk/e/src/bin/e_widget_toolbar.h 2009-07-26 17:01:42 UTC (rev 41500) +++ trunk/e/src/bin/e_widget_toolbar.h 2009-07-27 00:30:06 UTC (rev 41501) @@ -13,6 +13,8 @@ EAPI void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label); EAPI void e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable); EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal); +EAPI void e_widget_toolbar_clear(Evas_Object *obj); +EAPI int e_widget_toolbar_item_selected_get(Evas_Object *obj); #endif #endif |
From: Enlightenment S. <no-...@en...> - 2009-07-28 01:59:12
|
Log: Two patches from Peter van de Werken - Hide eina_list internals by using eina macros - Cleanup some duplicate code Patches slightly modified for formatting & whitespace removal. Use eina_list internal macros in some places that were missed. Author: devilhorns Date: 2009-07-27 18:33:08 -0700 (Mon, 27 Jul 2009) New Revision: 41518 Modified: trunk/e/src/bin/e_widget_toolbar.c Modified: trunk/e/src/bin/e_widget_toolbar.c =================================================================== --- trunk/e/src/bin/e_widget_toolbar.c 2009-07-27 21:35:25 UTC (rev 41517) +++ trunk/e/src/bin/e_widget_toolbar.c 2009-07-28 01:33:08 UTC (rev 41518) @@ -30,6 +30,8 @@ static void _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _e_wid_cb_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _item_show(Item *it); +static void _item_select(Item *it); +static void _item_unselect(Item *it); /* local subsystem functions */ @@ -40,18 +42,18 @@ Evas_Object *obj, *o; E_Widget_Data *wd; Evas_Coord mw = 0, mh = 0; - + obj = e_widget_add(evas); - + e_widget_del_hook_set(obj, _e_wid_del_hook); e_widget_focus_hook_set(obj, _e_wid_focus_hook); e_widget_disable_hook_set(obj, _e_wid_disable_hook); - wd = calloc(1, sizeof(E_Widget_Data)); + wd = E_NEW(E_Widget_Data, 1); e_widget_data_set(obj, wd); wd->icon_w = icon_w; wd->icon_h = icon_h; wd->focus_steal = EINA_TRUE; - + o = e_scrollframe_add(evas); wd->o_base = o; o = e_box_add(evas); @@ -79,11 +81,11 @@ e_scrollframe_child_set(wd->o_base, o); e_widget_sub_object_add(obj, o); evas_object_show(o); - + edje_object_size_min_calc (e_scrollframe_edje_object_get(wd->o_base), &mw, &mh); e_widget_min_size_set(obj, mw, mh); - + return obj; } @@ -94,7 +96,7 @@ Evas_Object *o; Item *it; Evas_Coord mw = 0, mh = 0, vw = 0, vh = 0; - + wd = e_widget_data_get(obj); o = edje_object_add(evas_object_evas_get(obj)); e_theme_edje_object_set(o, "base/theme/widgets", @@ -155,43 +157,31 @@ EAPI void e_widget_toolbar_item_select(Evas_Object *obj, int num) { - E_Widget_Data *wd; - Eina_List *l; - Item *it; - int i; + E_Widget_Data *wd = NULL; + Eina_List *l = NULL; + Item *it = NULL; + int i = 0; wd = e_widget_data_get(obj); - for (i = 0, l = wd->items; l; l = l->next, i++) + EINA_LIST_FOREACH(wd->items, l, it) { - it = l->data; if (i == num) { - if (!it->selected) - { - it->selected = EINA_TRUE; - edje_object_signal_emit(it->o_base, "e,state,selected", "e"); - edje_object_signal_emit(it->o_icon, "e,state,selected", "e"); - _item_show(it); - if (it->func) it->func(it->data1, it->data2); - } + if (!it->selected) _item_select(it); } else { - if (it->selected) - { - it->selected = EINA_FALSE; - edje_object_signal_emit(it->o_base, "e,state,unselected", "e"); - edje_object_signal_emit(it->o_icon, "e,state,unselected", "e"); - } + if (it->selected) _item_unselect(it); } + i++; } } EAPI void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label) { - E_Widget_Data *wd; - Item *it; + E_Widget_Data *wd = NULL; + Item *it = NULL; wd = e_widget_data_get(obj); it = eina_list_nth(wd->items, num); @@ -216,7 +206,7 @@ { E_Widget_Data *wd; Evas_Coord mw = 0, mh = 0, vw = 0, vh = 0; - + wd = e_widget_data_get(obj); wd->scrollable = scrollable; e_box_min_size_get(wd->o_box, &mw, &mh); @@ -255,18 +245,15 @@ EAPI void e_widget_toolbar_clear(Evas_Object *obj) { - E_Widget_Data *wd; + E_Widget_Data *wd = NULL; + Item *it = NULL; wd = e_widget_data_get(obj); - while (wd->items) + EINA_LIST_FREE(wd->items, it) { - Item *it = NULL; - - if (!(it = wd->items->data)) continue; - evas_object_del(it->o_base); - evas_object_del(it->o_icon); - wd->items = eina_list_remove(wd->items, it); - E_FREE(it); + evas_object_del(it->o_base); + evas_object_del(it->o_icon); + E_FREE(it); } } @@ -275,15 +262,14 @@ { E_Widget_Data *wd = NULL; Eina_List *l = NULL; + Item *it = NULL; int i = 0; wd = e_widget_data_get(obj); - for (i = 0, l = wd->items; l; l = l->next, i++) + EINA_LIST_FOREACH(wd->items, l, it) { - Item *it = NULL; - - if (!(it = l->data)) continue;; if (it->selected) return i; + i++; } return 0; } @@ -293,16 +279,13 @@ _e_wid_del_hook(Evas_Object *obj) { E_Widget_Data *wd; - + Item *it; + wd = e_widget_data_get(obj); - while (wd->items) + EINA_LIST_FREE(wd->items, it) { - Item *it; - - it = wd->items->data; evas_object_del(it->o_base); evas_object_del(it->o_icon); - wd->items = eina_list_remove_list(wd->items, wd->items); E_FREE(it); } E_FREE(wd); @@ -312,7 +295,7 @@ _e_wid_disable_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); if (e_widget_disabled_get(obj)) edje_object_signal_emit @@ -328,26 +311,19 @@ Item *it, *it2; E_Widget_Data *wd; Eina_List *l; - - it = data; + + if (!(it = data)) return; if (it->selected) return; wd = e_widget_data_get(it->o_toolbar); - for (l = wd->items; l; l = l->next) + EINA_LIST_FOREACH(wd->items, l, it2) { - it2 = l->data; if (it2->selected) { - it2->selected = EINA_FALSE; - edje_object_signal_emit(it2->o_base, "e,state,unselected", "e"); - edje_object_signal_emit(it2->o_icon, "e,state,unselected", "e"); + _item_unselect(it2); break; } } - it->selected = EINA_TRUE; - edje_object_signal_emit(it->o_base, "e,state,selected", "e"); - edje_object_signal_emit(it->o_icon, "e,state,selected", "e"); - _item_show(it); - if (it->func) it->func(it->data1, it->data2); + _item_select(it); } static void @@ -357,7 +333,7 @@ Evas_Coord mw, mh, vw, vh, w, h; Eina_List *l; Item *it; - + wd = e_widget_data_get(data); if (wd->o_base == NULL || wd->o_box == NULL) return ; @@ -369,9 +345,8 @@ { if (w != vw) evas_object_resize(wd->o_box, vw, h); } - for (l = wd->items; l; l = l->next) + EINA_LIST_FOREACH(wd->items, l, it) { - it = l->data; if (it->selected) { _item_show(it); @@ -385,74 +360,67 @@ { Evas_Event_Key_Down *ev; E_Widget_Data *wd; - Eina_List *l; + Eina_List *l, *l2; Item *it = NULL, *it2 = NULL; - + ev = event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; wd = e_widget_data_get(data); if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")) || - (!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left")) - ) + (!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left"))) { - for (l = wd->items; l; l = l->next) + EINA_LIST_FOREACH(wd->items, l, it) { - it = l->data; if (it->selected) { - if (l->prev) it2 = l->prev->data; + l2 = eina_list_prev(l); + if (l2) it2 = eina_list_data_get(l2); break; } } } - else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")) || - (!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right")) - ) + else if ((!strcmp(ev->keyname, "Down")) || + (!strcmp(ev->keyname, "KP_Down")) || + (!strcmp(ev->keyname, "Right")) || + (!strcmp(ev->keyname, "KP_Right"))) { - for (l = wd->items; l; l = l->next) + EINA_LIST_FOREACH(wd->items, l, it) { - it = l->data; if (it->selected) { - if (l->next) it2 = l->next->data; + l2 = eina_list_next(l); + if (l2) it2 = eina_list_data_get(l2); break; } } } - else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) + else if ((!strcmp(ev->keyname, "Home")) || + (!strcmp(ev->keyname, "KP_Home"))) { - for (l = wd->items; l; l = l->next) + EINA_LIST_FOREACH(wd->items, l, it) { - it = l->data; if (it->selected) { - it2 = wd->items->data; + it2 = eina_list_data_get(wd->items); break; } } } else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) { - for (l = wd->items; l; l = l->next) - { - it = l->data; + EINA_LIST_FOREACH(wd->items, l, it) + { if (it->selected) { - it2 = eina_list_last(wd->items)->data; + it2 = eina_list_data_get(eina_list_last(wd->items)); break; } - } + } } if ((it) && (it2) && (it != it2)) { - it->selected = EINA_FALSE; - edje_object_signal_emit(it->o_base, "e,state,unselected", "e"); - edje_object_signal_emit(it->o_icon, "e,state,unselected", "e"); - it2->selected = EINA_TRUE; - edje_object_signal_emit(it2->o_base, "e,state,selected", "e"); - edje_object_signal_emit(it2->o_icon, "e,state,selected", "e"); - _item_show(it2); - if (it2->func) it->func(it2->data1, it2->data2); + _item_unselect(it); + _item_select(it2); } } @@ -460,17 +428,17 @@ _e_wid_focus_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); if (e_widget_focus_get(obj)) { edje_object_signal_emit(wd->o_base, "e,state,focused", "e"); - evas_object_focus_set(obj, 1); + evas_object_focus_set(obj, EINA_TRUE); } else { edje_object_signal_emit(wd->o_base, "e,state,unfocused", "e"); - evas_object_focus_set(obj, 0); + evas_object_focus_set(obj, EINA_FALSE); } } @@ -485,10 +453,27 @@ { E_Widget_Data *wd; Evas_Coord x, y, w, h, bx, by; - + wd = e_widget_data_get(it->o_toolbar); evas_object_geometry_get(wd->o_box, &bx, &by, NULL, NULL); evas_object_geometry_get(it->o_base, &x, &y, &w, &h); e_scrollframe_child_region_show(wd->o_base, x - bx, y - by, w, h); } +static void +_item_select(Item *it) +{ + it->selected = EINA_TRUE; + edje_object_signal_emit(it->o_base, "e,state,selected", "e"); + edje_object_signal_emit(it->o_icon, "e,state,selected", "e"); + _item_show(it); + if (it->func) it->func(it->data1, it->data2); +} + +static void +_item_unselect(Item *it) +{ + it->selected = EINA_FALSE; + edje_object_signal_emit(it->o_base, "e,state,unselected", "e"); + edje_object_signal_emit(it->o_icon, "e,state,unselected", "e"); +} |
From: Enlightenment S. <no-...@en...> - 2009-07-29 19:31:58
|
Log: Use E_NEW, E_FREE and EINA_LIST macros. Author: devilhorns Date: 2009-07-29 12:31:41 -0700 (Wed, 29 Jul 2009) New Revision: 41538 Modified: trunk/e/src/bin/e_xinerama.c Modified: trunk/e/src/bin/e_xinerama.c =================================================================== --- trunk/e/src/bin/e_xinerama.c 2009-07-29 18:34:27 UTC (rev 41537) +++ trunk/e/src/bin/e_xinerama.c 2009-07-29 19:31:41 UTC (rev 41538) @@ -51,7 +51,7 @@ { E_Screen *scr; - scr = calloc(1, sizeof(E_Screen)); + scr = E_NEW(E_Screen, 1); scr->screen = eina_list_count(fake_screens); scr->escreen = scr->screen; scr->x = x; @@ -65,20 +65,13 @@ static void _e_xinerama_clean(void) { - while (all_screens) - { - free(all_screens->data); - all_screens = eina_list_remove_list(all_screens, all_screens); - } - while (chosen_screens) - { - chosen_screens = eina_list_remove_list(chosen_screens, chosen_screens); - } - while (fake_screens) - { - free(fake_screens->data); - fake_screens = eina_list_remove_list(fake_screens, fake_screens); - } + E_Screen *s = NULL; + + EINA_LIST_FREE(all_screens, s) + E_FREE(s); + EINA_LIST_FREE(chosen_screens, s); + EINA_LIST_FREE(fake_screens, s) + E_FREE(s); } static void @@ -112,7 +105,7 @@ { E_Screen *scr; - scr = calloc(1, sizeof(E_Screen)); + scr = E_NEW(E_Screen, 1); scr->screen = 0; scr->x = 0; scr->y = 0; @@ -134,7 +127,7 @@ printf("E17 INIT: XINERAMA SCREEN: [%i], %ix%i+%i+%i\n", i, w, h, x, y); /* add it to our list */ - scr = calloc(1, sizeof(E_Screen)); + scr = E_NEW(E_Screen, 1); scr->screen = i; scr->x = x; scr->y = y; |
From: Enlightenment S. <no-...@en...> - 2009-08-02 20:44:21
|
Log: Removed duplicated code. Use E_FREE to free pointer. Author: devilhorns Date: 2009-08-02 13:44:04 -0700 (Sun, 02 Aug 2009) New Revision: 41560 Modified: trunk/e/src/bin/e_pointer.c Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2009-08-01 16:34:01 UTC (rev 41559) +++ trunk/e/src/bin/e_pointer.c 2009-08-02 20:44:04 UTC (rev 41560) @@ -81,19 +81,12 @@ p = E_OBJECT_ALLOC(E_Pointer, E_POINTER_TYPE, _e_pointer_free); if (!p) return NULL; + p->e_cursor = e_config->use_e_cursor; + p->win = win; + p->color = 0; if (e_config->use_e_cursor) - { - p->e_cursor = 1; - p->win = win; - /* Init the cursor object */ - if (ecore_x_cursor_color_supported_get()) p->color = 1; - else p->color = 0; - } - else - { - p->e_cursor = 0; - p->win = win; - } + if (ecore_x_cursor_color_supported_get()) p->color = 1; + ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4); if (filled) e_pointer_type_push(p, p, "default"); _e_pointers = eina_list_append(_e_pointers, p); @@ -183,8 +176,7 @@ for (l = p->stack; l; l = l->next) { stack = l->data; - if ((stack->obj == obj) && - ((!type) || (!strcmp(stack->type, type)))) + if ((stack->obj == obj) && ((!type) || (!strcmp(stack->type, type)))) { _e_pointer_stack_free(stack); p->stack = eina_list_remove_list(p->stack, l); @@ -232,7 +224,8 @@ { Ecore_X_Cursor cur; - cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h, p->hot.x, p->hot.y); + cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h, + p->hot.x, p->hot.y); ecore_x_window_cursor_set(p->win, cur); ecore_x_cursor_free(cur); evas_render_updates_free(updates); @@ -267,17 +260,13 @@ p->pixels = malloc(p->w * p->h * sizeof(int)); if (!p->pixels) { - evas_free(p->evas); - p->evas = NULL; + _e_pointer_canvas_del(p); return; } einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(p->evas); if (!einfo) { - free(p->pixels); - p->pixels = NULL; - evas_free(p->evas); - p->evas = NULL; + _e_pointer_canvas_del(p); return; } einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32; @@ -357,7 +346,7 @@ p->type = NULL; p->idle_timer = NULL; p->idle_poller = NULL; - free(p); + E_FREE(p); } static void @@ -392,17 +381,13 @@ if (!p->evas) _e_pointer_canvas_add(p); o = p->pointer_object; if (p->color) - { - snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/color", type); - if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) - goto fallback; - } + snprintf(cursor, sizeof(cursor), + "e/pointer/enlightenment/%s/color", type); else - { - snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/mono", type); - if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) - goto fallback; - } + snprintf(cursor, sizeof(cursor), + "e/pointer/enlightenment/%s/mono", type); + if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) + goto fallback; edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object); edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", @@ -421,92 +406,40 @@ if (p->evas) _e_pointer_canvas_del(p); if (!strcmp(type, "move")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR); #if 0 else if (!strcmp(type, "resize")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING); #endif else if (!strcmp(type, "resize_tl")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER); else if (!strcmp(type, "resize_t")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE); else if (!strcmp(type, "resize_tr")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER); else if (!strcmp(type, "resize_r")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE); else if (!strcmp(type, "resize_br")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER); else if (!strcmp(type, "resize_b")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE); else if (!strcmp(type, "resize_bl")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER); else if (!strcmp(type, "resize_l")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE); else if (!strcmp(type, "entry")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM); else if (!strcmp(type, "default")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR); else if (!strcmp(type, "plus")) - { - cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS); - if (!cursor) printf("X Cursor for %s is missing\n", type); - ecore_x_window_cursor_set(p->win, cursor); - } + cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS); else { printf("Unknown pointer type: %s\n", type); cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_ARROW); - if (!cursor) printf("X Cursor for default is missing\n"); - ecore_x_window_cursor_set(p->win, cursor); } + if (!cursor) printf("X Cursor for %s is missing\n", type); + ecore_x_window_cursor_set(p->win, cursor); if (cursor) ecore_x_cursor_free(cursor); } return 1; @@ -534,7 +467,7 @@ p->idle = 0; } if (e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) return; - /* and scedule a pre-idle check in 1 second if no more events happen */ + /* and schedule a pre-idle check in 1 second if no more events happen */ if (!e_config->idle_cursor) return; p->idle_timer = ecore_timer_loop_add(1.0, _e_pointer_cb_idle_timer_pre, p); } @@ -554,7 +487,8 @@ if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME) { if (p->pointer_object) - edje_object_signal_emit(p->pointer_object, "e,action,mouse,down", "e"); + edje_object_signal_emit(p->pointer_object, + "e,action,mouse,down", "e"); } } return 1; @@ -575,7 +509,8 @@ if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME) { if (p->pointer_object) - edje_object_signal_emit(p->pointer_object, "e,action,mouse,up", "e"); + edje_object_signal_emit(p->pointer_object, + "e,action,mouse,up", "e"); } } return 1; @@ -596,7 +531,8 @@ if (e_powersave_mode_get() < E_POWERSAVE_MODE_HIGH) { if (p->pointer_object) - edje_object_signal_emit(p->pointer_object, "e,action,mouse,move", "e"); + edje_object_signal_emit(p->pointer_object, + "e,action,mouse,move", "e"); } } return 1; @@ -617,7 +553,8 @@ if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME) { if (p->pointer_object) - edje_object_signal_emit(p->pointer_object, "e,action,mouse,wheel", "e"); + edje_object_signal_emit(p->pointer_object, + "e,action,mouse,wheel", "e"); } } return 1; @@ -683,7 +620,8 @@ if (p->idle) { if (p->pointer_object) - edje_object_signal_emit(p->pointer_object, "e,state,mouse,active", "e"); + edje_object_signal_emit(p->pointer_object, + "e,state,mouse,active", "e"); p->idle = 0; } /* use poller to check from now on */ |
From: Enlightenment S. <no-...@en...> - 2009-08-02 21:11:06
|
Log: Remove useless variable and just use a direct object reference. No need for _type_set to return an 'int' as we never check it anywhere, so make the function return 'void'. Author: devilhorns Date: 2009-08-02 14:10:52 -0700 (Sun, 02 Aug 2009) New Revision: 41561 Modified: trunk/e/src/bin/e_pointer.c Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2009-08-02 20:44:04 UTC (rev 41560) +++ trunk/e/src/bin/e_pointer.c 2009-08-02 21:10:52 UTC (rev 41561) @@ -25,7 +25,7 @@ static void _e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _e_pointer_free(E_Pointer *p); static void _e_pointer_stack_free(E_Pointer_Stack *elem); -static int _e_pointer_type_set(E_Pointer *p, const char *type); +static void _e_pointer_type_set(E_Pointer *p, const char *type); static void _e_pointer_active_handle(E_Pointer *p); static int _e_pointer_cb_mouse_down(void *data, int type, void *event); @@ -356,11 +356,11 @@ free(elem); } -static int +static void _e_pointer_type_set(E_Pointer *p, const char *type) { /* Check if this pointer is already set */ - if ((p->type) && (!strcmp(p->type, type))) return 1; + if ((p->type) && (!strcmp(p->type, type))) return; if (p->type) eina_stringshare_del(p->type); p->type = eina_stringshare_add(type); @@ -369,24 +369,23 @@ if (!e_config->show_cursor) { ecore_x_window_cursor_set(p->win, 0); - return 1; + return; } if (p->e_cursor) { - Evas_Object *o; char cursor[1024]; Evas_Coord x, y; if (!p->evas) _e_pointer_canvas_add(p); - o = p->pointer_object; if (p->color) snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/color", type); else snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/mono", type); - if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) + if (!e_theme_edje_object_set(p->pointer_object, + "base/theme/pointer", cursor)) goto fallback; edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object); @@ -398,7 +397,7 @@ p->hot.y = y; } p->hot.update = 1; - return 1; + return; } fallback: { @@ -442,7 +441,6 @@ ecore_x_window_cursor_set(p->win, cursor); if (cursor) ecore_x_cursor_free(cursor); } - return 1; } static void |
From: Enlightenment S. <no-...@en...> - 2009-08-06 23:37:46
|
Log: Bump copyright year as it's now 2009 :) Author: devilhorns Date: 2009-08-06 16:37:34 -0700 (Thu, 06 Aug 2009) New Revision: 41627 Modified: trunk/e/src/bin/e_about.c Modified: trunk/e/src/bin/e_about.c =================================================================== --- trunk/e/src/bin/e_about.c 2009-08-06 22:35:45 UTC (rev 41626) +++ trunk/e/src/bin/e_about.c 2009-08-06 23:37:34 UTC (rev 41627) @@ -23,7 +23,7 @@ e_obj_dialog_obj_part_text_set (od, "e.textblock.about", _( - "Copyright © 1999-2008, by the Enlightenment Development Team.<br>" + "Copyright © 1999-2009, by the Enlightenment Development Team.<br>" "<br>" "We hope you enjoy using this software as much as we enjoyed " "writing it.<br>" |
From: Enlightenment S. <no-...@en...> - 2009-08-08 02:09:07
|
Log: Victor's <vic...@gm...> patch for 'Shelf content placement on screen resize fix'. Tested here, no adverse effects. Author: devilhorns Date: 2009-08-07 18:39:30 -0700 (Fri, 07 Aug 2009) New Revision: 41637 Modified: trunk/e/src/bin/e_shelf.c Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2009-08-07 21:38:36 UTC (rev 41636) +++ trunk/e/src/bin/e_shelf.c 2009-08-08 01:39:30 UTC (rev 41637) @@ -399,6 +399,7 @@ es->y = y; es->w = w; es->h = h; + e_gadcon_swallowed_min_size_set(es->gadcon, w, h); if (es->popup) e_popup_move_resize(es->popup, es->x, es->y, es->w, es->h); else |
From: Enlightenment S. <no-...@en...> - 2009-08-10 18:34:21
|
Log: Revert Victor's Shelf content placement patch as some people are experiencing problems with it...strange, worked here, but eh ;) Author: devilhorns Date: 2009-08-10 11:34:07 -0700 (Mon, 10 Aug 2009) New Revision: 41672 Modified: trunk/e/src/bin/e_shelf.c Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2009-08-10 18:29:11 UTC (rev 41671) +++ trunk/e/src/bin/e_shelf.c 2009-08-10 18:34:07 UTC (rev 41672) @@ -399,7 +399,6 @@ es->y = y; es->w = w; es->h = h; - e_gadcon_swallowed_min_size_set(es->gadcon, w, h); if (es->popup) e_popup_move_resize(es->popup, es->x, es->y, es->w, es->h); else |
From: Enlightenment S. <no-...@en...> - 2009-08-12 16:50:14
|
Log: Fix function prototypes by adding missing __UNUSED__. For some reason, the __unused__ was in the function declaration itself, but not the prototype. Author: devilhorns Date: 2009-08-12 09:49:59 -0700 (Wed, 12 Aug 2009) New Revision: 41712 Modified: trunk/e/src/bin/e_ipc.c Modified: trunk/e/src/bin/e_ipc.c =================================================================== --- trunk/e/src/bin/e_ipc.c 2009-08-12 16:43:46 UTC (rev 41711) +++ trunk/e/src/bin/e_ipc.c 2009-08-12 16:49:59 UTC (rev 41712) @@ -2,9 +2,9 @@ #ifdef USE_IPC /* local subsystem functions */ -static int _e_ipc_cb_client_add(void *data, int type, void *event); -static int _e_ipc_cb_client_del(void *data, int type, void *event); -static int _e_ipc_cb_client_data(void *data, int type, void *event); +static int _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event); +static int _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event); +static int _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event); /* local subsystem globals */ static Ecore_Ipc_Server *_e_ipc_server = NULL; |
From: Enlightenment S. <no-...@en...> - 2009-08-12 17:38:24
|
Log: Fix up formatting a little. Add function prototype. Add __UNUSED__ to function & prototype. Author: devilhorns Date: 2009-08-12 10:38:17 -0700 (Wed, 12 Aug 2009) New Revision: 41713 Modified: trunk/e/src/bin/e_init.c Modified: trunk/e/src/bin/e_init.c =================================================================== --- trunk/e/src/bin/e_init.c 2009-08-12 16:49:59 UTC (rev 41712) +++ trunk/e/src/bin/e_init.c 2009-08-12 17:38:17 UTC (rev 41713) @@ -3,6 +3,10 @@ */ #include "e.h" +/* local function prototypes */ +static int _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event); + +/* local variables */ static const char *title = NULL; static const char *version = NULL; static Ecore_Exe *init_exe = NULL; @@ -12,27 +16,13 @@ static int undone = 0; static Eina_List *stats = NULL; -static int -_e_init_cb_exe_event_del(void *data, int type, void *event) -{ - Ecore_Exe_Event_Del *ev; - - ev = event; - if (ev->exe == init_exe) - { - /* init exited */ -// ecore_exe_free(init_exe); - init_exe = NULL; - } - return 1; -} - +/* public functions */ EAPI int e_init_init(void) { - exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, - _e_init_cb_exe_event_del, - NULL); + exe_del_handler = + ecore_event_handler_add(ECORE_EXE_EVENT_DEL, + _e_init_cb_exe_event_del, NULL); client = NULL; done = 0; return 1; @@ -77,12 +67,11 @@ if (version) ver = strdup(e_util_filename_escape(version)); else ver = strdup("XvX"); - snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'", - e_prefix_lib_get(), - theme, + snprintf(buf, sizeof(buf), + "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'", + e_prefix_lib_get(), theme, e_canvas_engine_decide(e_config->evas_engine_init), - e_config->font_hinting, - tit, ver); + e_config->font_hinting, tit, ver); printf("RUN INIT: %s\n", buf); free(theme); free(tit); @@ -145,7 +134,6 @@ undone++; } - EAPI void e_init_client_data(Ecore_Ipc_Event_Client_Data *e) { @@ -214,3 +202,19 @@ } } } + +/* local functions */ +static int +_e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event) +{ + Ecore_Exe_Event_Del *ev; + + ev = event; + if (ev->exe == init_exe) + { + /* init exited */ +// ecore_exe_free(init_exe); + init_exe = NULL; + } + return 1; +} |
From: Enlightenment S. <no-...@en...> - 2009-08-20 16:58:13
|
Log: Formatting. Use E_NEW & E_FREE. Author: devilhorns Date: 2009-08-20 09:57:59 -0700 (Thu, 20 Aug 2009) New Revision: 41890 Modified: trunk/e/src/bin/e_widget_toolbook.c Modified: trunk/e/src/bin/e_widget_toolbook.c =================================================================== --- trunk/e/src/bin/e_widget_toolbook.c 2009-08-20 15:02:28 UTC (rev 41889) +++ trunk/e/src/bin/e_widget_toolbook.c 2009-08-20 16:57:59 UTC (rev 41890) @@ -20,10 +20,10 @@ Evas_Object *obj, *o; E_Widget_Data *wd; Evas_Coord mw, mh; - + obj = e_widget_add(evas); e_widget_del_hook_set(obj, _e_wid_del_hook); - wd = calloc(1, sizeof(E_Widget_Data)); + wd = E_NEW(E_Widget_Data, 1); e_widget_data_set(obj, wd); wd->o_widget = obj; @@ -32,7 +32,7 @@ evas_object_show(o); e_widget_sub_object_add(obj, o); wd->o_tb = o; - + o = e_widget_toolbar_add(evas, icon_w, icon_h); e_widget_table_object_append(wd->o_tb, o, 0, 0, 1, 1, 1, 1, 1, 0); wd->o_bar = o; @@ -64,7 +64,7 @@ e_widget_toolbook_page_show(Evas_Object *toolbook, int n) { E_Widget_Data *wd; - + wd = e_widget_data_get(toolbook); e_widget_toolbar_item_select(wd->o_bar, n); } @@ -74,10 +74,10 @@ _e_wid_del_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); eina_list_free(wd->content); - free(wd); + E_FREE(wd); } static void @@ -86,15 +86,15 @@ E_Widget_Data *wd; Evas_Object *obj, *sobj; Eina_List *l; - + obj = data1; sobj = data2; wd = e_widget_data_get(obj); - + for (l = wd->content; l; l = l->next) { Evas_Object *o; - + o = l->data; if (o == sobj) evas_object_show(o); else evas_object_hide(o); |
From: Enlightenment S. <no-...@en...> - 2009-08-20 17:43:39
|
Log: Not sure why, but this didn't seem to commit... formatting/whitespace. Use E_NEW & E_FREE Author: devilhorns Date: 2009-08-20 10:43:24 -0700 (Thu, 20 Aug 2009) New Revision: 41891 Modified: trunk/e/src/bin/e_widget_toolbook.c Modified: trunk/e/src/bin/e_widget_toolbook.c =================================================================== --- trunk/e/src/bin/e_widget_toolbook.c 2009-08-20 16:57:59 UTC (rev 41890) +++ trunk/e/src/bin/e_widget_toolbook.c 2009-08-20 17:43:24 UTC (rev 41891) @@ -50,13 +50,13 @@ wd = e_widget_data_get(toolbook); e_widget_toolbar_item_append(wd->o_bar, icon, label, _item_sel, toolbook, content); - e_widget_table_object_align_append(wd->o_tb, content, - 0, 1, 1, 1, + e_widget_table_object_align_append(wd->o_tb, content, 0, 1, 1, 1, fill_w, fill_h, expand_w, expand_h, ax, ay); evas_object_hide(content); wd->content = eina_list_append(wd->content, content); e_widget_min_size_get(wd->o_tb, &minw, &minh); + printf("Toolbook: %d %d\n", minw, minh); e_widget_min_size_set(toolbook, minw, minh); } |
From: Enlightenment S. <no-...@en...> - 2009-08-20 17:49:21
|
Log: Ooops, remove printf Author: devilhorns Date: 2009-08-20 10:49:01 -0700 (Thu, 20 Aug 2009) New Revision: 41892 Modified: trunk/e/src/bin/e_widget_toolbook.c Modified: trunk/e/src/bin/e_widget_toolbook.c =================================================================== --- trunk/e/src/bin/e_widget_toolbook.c 2009-08-20 17:43:24 UTC (rev 41891) +++ trunk/e/src/bin/e_widget_toolbook.c 2009-08-20 17:49:01 UTC (rev 41892) @@ -56,7 +56,6 @@ evas_object_hide(content); wd->content = eina_list_append(wd->content, content); e_widget_min_size_get(wd->o_tb, &minw, &minh); - printf("Toolbook: %d %d\n", minw, minh); e_widget_min_size_set(toolbook, minw, minh); } |
From: Enlightenment S. <no-...@en...> - 2009-08-21 06:05:47
|
Log: Formatting. Author: devilhorns Date: 2009-08-20 23:05:35 -0700 (Thu, 20 Aug 2009) New Revision: 41908 Modified: trunk/e/src/bin/e_widget_toolbar.c Modified: trunk/e/src/bin/e_widget_toolbar.c =================================================================== --- trunk/e/src/bin/e_widget_toolbar.c 2009-08-21 03:03:59 UTC (rev 41907) +++ trunk/e/src/bin/e_widget_toolbar.c 2009-08-21 06:05:35 UTC (rev 41908) @@ -335,9 +335,8 @@ Item *it; wd = e_widget_data_get(data); + if ((!wd->o_base) || (!wd->o_box)) return; - if (wd->o_base == NULL || wd->o_box == NULL) return ; - e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh); e_box_min_size_get(wd->o_box, &mw, &mh); evas_object_geometry_get(wd->o_box, NULL, NULL, &w, &h); |
From: Enlightenment S. <no-...@en...> - 2009-08-23 02:03:53
|
Log: Formatting. Whitespace Removal. Fetch the windows evas once instead of multiple calls to e_win_evas_get. Use E_FREE to free the config dialog structure. Make sure the window is centered when switching between Basic & Advanced. Author: devilhorns Date: 2009-08-22 19:03:30 -0700 (Sat, 22 Aug 2009) New Revision: 41931 Modified: trunk/e/src/bin/e_config_dialog.c Modified: trunk/e/src/bin/e_config_dialog.c =================================================================== --- trunk/e/src/bin/e_config_dialog.c 2009-08-22 21:22:38 UTC (rev 41930) +++ trunk/e/src/bin/e_config_dialog.c 2009-08-23 02:03:30 UTC (rev 41931) @@ -24,8 +24,9 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data) { E_Config_Dialog *cfd; - - cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free); + + cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, + _e_config_dialog_free); cfd->view = view; cfd->con = con; cfd->title = eina_stringshare_add(title); @@ -44,7 +45,8 @@ if (cfd->view->override_auto_apply) { /* Dialog Requested To Not Auto-Apply */ - if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata)) + if ((cfd->view->basic.apply_cfdata) || + (cfd->view->advanced.apply_cfdata)) cfd->hide_buttons = 0; } else @@ -54,7 +56,8 @@ cfd->hide_buttons = 1; else { - if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata)) + if ((cfd->view->basic.apply_cfdata) || + (cfd->view->advanced.apply_cfdata)) cfd->hide_buttons = 0; } } @@ -73,7 +76,7 @@ break; } _e_config_dialog_list = eina_list_append(_e_config_dialog_list, cfd); - + return cfd; } @@ -82,7 +85,7 @@ { Eina_List *l; E_Config_Dialog *cfd; - + EINA_LIST_FOREACH(_e_config_dialog_list, l, cfd) { if ((!e_util_strcmp(name, cfd->name)) && @@ -129,7 +132,6 @@ } /* local subsystem functions */ - static void _e_config_dialog_free(E_Config_Dialog *cfd) { @@ -151,12 +153,13 @@ cfd->dia = NULL; } E_FREE(cfd->view); - free(cfd); + E_FREE(cfd); } static void _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) { + Evas *evas; E_Dialog *pdia; Evas_Object *o, *ob, *sf; Evas_Coord mw = 0, mh = 0; @@ -175,7 +178,8 @@ cfd->dia = e_dialog_normal_win_new(cfd->con, cfd->name, buf); else cfd->dia = e_dialog_new(cfd->con, cfd->name, buf); - e_object_del_attach_func_set(E_OBJECT(cfd->dia), _e_config_dialog_cb_dialog_del); + e_object_del_attach_func_set(E_OBJECT(cfd->dia), + _e_config_dialog_cb_dialog_del); } /* window was created before - deleting content only */ else if (cfd->dia->content_object) evas_object_del(cfd->dia->content_object); @@ -184,32 +188,33 @@ e_dialog_title_set(cfd->dia, cfd->title); if (!cfd->cfdata) cfd->cfdata = cfd->view->create_cfdata(cfd); + evas = e_win_evas_get(cfd->dia->win); if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) { if (cfd->view->advanced.create_widgets) { o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); - ob = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + ob = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { e_widget_min_size_resize(ob); - sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob); + sf = e_widget_scrollframe_simple_add(evas, ob); e_widget_list_object_append(o, sf, 1, 1, 0.0); } else e_widget_list_object_append(o, ob, 1, 1, 0.0); - ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), + ob = e_widget_button_add(evas, _("Advanced"), "go-next", _e_config_dialog_cb_advanced, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } else { - o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + o = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { e_widget_min_size_resize(o); - o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o); + o = e_widget_scrollframe_simple_add(evas, o); } } } @@ -217,32 +222,32 @@ { if (cfd->view->basic.create_widgets) { - o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); - ob = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + o = e_widget_list_add(evas, 0, 0); + ob = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { e_widget_min_size_resize(ob); - sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob); + sf = e_widget_scrollframe_simple_add(evas, ob); e_widget_list_object_append(o, sf, 1, 1, 0.0); } else e_widget_list_object_append(o, ob, 1, 1, 0.0); - ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), + ob = e_widget_button_add(evas, _("Basic"), "go-next", _e_config_dialog_cb_basic, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } else { - o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + o = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata); if (cfd->view->scroll) { e_widget_min_size_resize(o); - o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o); + o = e_widget_scrollframe_simple_add(evas, o); } } } - + e_widget_min_size_get(o, &mw, &mh); e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd); e_dialog_content_set(cfd->dia, o, mw, mh); @@ -268,6 +273,7 @@ e_dialog_show(cfd->dia); if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon); + e_win_centered_set(cfd->dia->win, 1); cfd->view_type = type; } @@ -315,16 +321,16 @@ cfd = dia->data; if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) - { - if (cfd->view->basic.apply_cfdata) - ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); - } + { + if (cfd->view->basic.apply_cfdata) + ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); + } else - { - if (cfd->view->advanced.apply_cfdata) - ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); - } - if (ok) + { + if (cfd->view->advanced.apply_cfdata) + ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); + } + if (ok) e_util_defer_object_del(E_OBJECT(cfd)); } @@ -336,15 +342,15 @@ cfd = dia->data; if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) - { - if (cfd->view->basic.apply_cfdata) - ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); - } + { + if (cfd->view->basic.apply_cfdata) + ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); + } else - { - if (cfd->view->advanced.apply_cfdata) - ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); - } + { + if (cfd->view->advanced.apply_cfdata) + ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); + } if ((ok) && (!cfd->hide_buttons)) { cfd->cfg_changed = 0; @@ -384,9 +390,10 @@ } else { - if (cfd->auto_apply_timer) - ecore_timer_del(cfd->auto_apply_timer); - cfd->auto_apply_timer = ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd); + if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer); + cfd->auto_apply_timer = NULL; + cfd->auto_apply_timer = + ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd); } } |
From: Enlightenment S. <no-...@en...> - 2009-08-23 03:40:37
|
Log: Don't center window when changing modes as the user may have moved it. Author: devilhorns Date: 2009-08-22 20:40:25 -0700 (Sat, 22 Aug 2009) New Revision: 41933 Modified: trunk/e/src/bin/e_config_dialog.c Modified: trunk/e/src/bin/e_config_dialog.c =================================================================== --- trunk/e/src/bin/e_config_dialog.c 2009-08-23 03:12:05 UTC (rev 41932) +++ trunk/e/src/bin/e_config_dialog.c 2009-08-23 03:40:25 UTC (rev 41933) @@ -273,7 +273,6 @@ e_dialog_show(cfd->dia); if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon); - e_win_centered_set(cfd->dia->win, 1); cfd->view_type = type; } |
From: Enlightenment S. <no-...@en...> - 2009-08-25 06:06:41
|
Log: Patch from victor to fix removing modules via the "Set Contents" dialog. Author: devilhorns Date: 2009-08-24 23:06:26 -0700 (Mon, 24 Aug 2009) New Revision: 41966 Modified: trunk/e/src/bin/e_int_gadcon_config.c Modified: trunk/e/src/bin/e_int_gadcon_config.c =================================================================== --- trunk/e/src/bin/e_int_gadcon_config.c 2009-08-25 05:15:50 UTC (rev 41965) +++ trunk/e/src/bin/e_int_gadcon_config.c 2009-08-25 06:06:26 UTC (rev 41966) @@ -341,7 +341,7 @@ if (!(cfdata = data)) return; i = -1; - EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_avail), l, item) + EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_sel), l, item) { const char *name = NULL; |
From: Enlightenment S. <no-...@en...> - 2009-08-25 11:50:00
|
Log: Formatting. Author: devilhorns Date: 2009-08-25 04:49:46 -0700 (Tue, 25 Aug 2009) New Revision: 41973 Modified: trunk/e/src/bin/e_toolbar.h Modified: trunk/e/src/bin/e_toolbar.h =================================================================== --- trunk/e/src/bin/e_toolbar.h 2009-08-25 11:23:46 UTC (rev 41972) +++ trunk/e/src/bin/e_toolbar.h 2009-08-25 11:49:46 UTC (rev 41973) @@ -26,21 +26,21 @@ Evas_Object *o_base, *o_event; }; -EAPI int e_toolbar_init (void); -EAPI int e_toolbar_shutdown (void); -EAPI E_Toolbar *e_toolbar_new (Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2); -EAPI void e_toolbar_fwin_set (E_Toolbar *tbar, E_Win *fwin); -EAPI E_Win *e_toolbar_fwin_get (E_Toolbar *tbar); -EAPI void e_toolbar_fm2_set (E_Toolbar *tbar, Evas_Object *fm2); -EAPI Evas_Object *e_toolbar_fm2_get (E_Toolbar *tbar); -EAPI void e_toolbar_show (E_Toolbar *tbar); -EAPI void e_toolbar_hide (E_Toolbar *tbar); -EAPI void e_toolbar_move (E_Toolbar *tbar, int x, int y); -EAPI void e_toolbar_resize (E_Toolbar *tbar, int w, int h); -EAPI void e_toolbar_move_resize (E_Toolbar *tbar, int x, int y, int w, int h); -EAPI void e_toolbar_orient (E_Toolbar *tbar, E_Gadcon_Orient orient); -EAPI void e_toolbar_position_calc (E_Toolbar *tbar); -EAPI void e_toolbar_populate (E_Toolbar *tbar); +EAPI int e_toolbar_init(void); +EAPI int e_toolbar_shutdown(void); +EAPI E_Toolbar *e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2); +EAPI void e_toolbar_fwin_set(E_Toolbar *tbar, E_Win *fwin); +EAPI E_Win *e_toolbar_fwin_get(E_Toolbar *tbar); +EAPI void e_toolbar_fm2_set(E_Toolbar *tbar, Evas_Object *fm2); +EAPI Evas_Object *e_toolbar_fm2_get(E_Toolbar *tbar); +EAPI void e_toolbar_show(E_Toolbar *tbar); +EAPI void e_toolbar_hide(E_Toolbar *tbar); +EAPI void e_toolbar_move(E_Toolbar *tbar, int x, int y); +EAPI void e_toolbar_resize(E_Toolbar *tbar, int w, int h); +EAPI void e_toolbar_move_resize(E_Toolbar *tbar, int x, int y, int w, int h); +EAPI void e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient); +EAPI void e_toolbar_position_calc(E_Toolbar *tbar); +EAPI void e_toolbar_populate(E_Toolbar *tbar); #endif #endif |
From: Enlightenment S. <no-...@en...> - 2009-08-25 23:04:28
|
Log: Formatting. Author: devilhorns Date: 2009-08-25 16:04:22 -0700 (Tue, 25 Aug 2009) New Revision: 41995 Modified: trunk/e/src/bin/e_widget_button.c Modified: trunk/e/src/bin/e_widget_button.c =================================================================== --- trunk/e/src/bin/e_widget_button.c 2009-08-25 22:58:23 UTC (rev 41994) +++ trunk/e/src/bin/e_widget_button.c 2009-08-25 23:04:22 UTC (rev 41995) @@ -56,7 +56,7 @@ "e/widgets/button"); edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj); - if (label && label[0] != 0) + if ((label) && (label[0] != 0)) { edje_object_part_text_set(o, "e.text.label", label); wd->type |= E_WIDGET_BUTTON_TEXT; @@ -93,7 +93,7 @@ wd = e_widget_data_get(obj); edje_object_part_text_set(wd->o_button, "e.text.label", label); - if (label && label[0] != 0) + if ((label) && (label[0] != 0)) wd->type |= E_WIDGET_BUTTON_TEXT; else wd->type = ~(wd->type & E_WIDGET_BUTTON_TEXT); @@ -197,7 +197,7 @@ static void _e_wid_button_state_send(E_Widget_Data *wd) { - if (!wd || !wd->o_button) return; + if ((!wd) || (!wd->o_button)) return; if (wd->type & E_WIDGET_BUTTON_TEXT) { if (wd->type & E_WIDGET_BUTTON_ICON) |
From: Enlightenment S. <no-...@en...> - 2009-08-25 23:06:52
|
Log: Use simpler method for testing disabled state vs what we want it to be. Author: devilhorns Date: 2009-08-25 16:06:40 -0700 (Tue, 25 Aug 2009) New Revision: 41996 Modified: trunk/e/src/bin/e_widget.c Modified: trunk/e/src/bin/e_widget.c =================================================================== --- trunk/e/src/bin/e_widget.c 2009-08-25 23:04:22 UTC (rev 41995) +++ trunk/e/src/bin/e_widget.c 2009-08-25 23:06:40 UTC (rev 41996) @@ -426,8 +426,7 @@ e_widget_disabled_set(Evas_Object *obj, int disabled) { API_ENTRY return; - if (((sd->disabled) && (disabled)) || - ((!sd->disabled) && (!disabled))) return; + if (sd->disabled == disabled) return; sd->disabled = disabled; if (sd->focused) { |
From: Enlightenment S. <no-...@en...> - 2009-09-05 14:23:03
|
Log: Do not allow windows (which are not ECORE_X_WINDOW_TYPE_NORMAL) to be Iconified, Maximized, or Fullscreen'd via the border menu. These type of windows do not support those actions via the border buttons, so do not support them via the menu either. Author: devilhorns Date: 2009-09-05 07:22:50 -0700 (Sat, 05 Sep 2009) New Revision: 42279 Modified: trunk/e/src/bin/e_int_border_menu.c Modified: trunk/e/src/bin/e_int_border_menu.c =================================================================== --- trunk/e/src/bin/e_int_border_menu.c 2009-09-05 12:43:44 UTC (rev 42278) +++ trunk/e/src/bin/e_int_border_menu.c 2009-09-05 14:22:50 UTC (rev 42279) @@ -143,7 +143,8 @@ (bd->client.icccm.min_h == bd->client.icccm.max_h)) || (bd->lock_user_maximize))) { - if ((!bd->lock_user_maximize) && (!bd->shaded) && (!bd->fullscreen)) + if ((!bd->lock_user_maximize) && (!bd->shaded) && (!bd->fullscreen) && + (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL)) { separator = 0; mi = e_menu_item_new(m); @@ -158,7 +159,8 @@ if (!bd->internal) { - if ((!bd->lock_user_iconify) && (!bd->fullscreen)) + if ((!bd->lock_user_iconify) && (!bd->fullscreen) && + (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL)) { separator = 0; mi = e_menu_item_new(m); @@ -1032,7 +1034,8 @@ "e/widgets/border/default/stick"); } - if ((!bd->lock_user_fullscreen) && (!bd->shaded)) + if ((!bd->lock_user_fullscreen) && (!bd->shaded) && + (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL)) { submi = e_menu_item_new(subm); e_menu_item_label_set(submi, _("Fullscreen")); |
From: Enlightenment S. <no-...@en...> - 2009-10-25 18:42:59
|
Log: Remove a bunch of wasted whitespace. Fix some formatting. Fix compiler warning wrt e_icon. Author: devilhorns Date: 2009-10-25 11:42:47 -0700 (Sun, 25 Oct 2009) New Revision: 43275 Modified: trunk/e/src/bin/e_menu.c Modified: trunk/e/src/bin/e_menu.c =================================================================== --- trunk/e/src/bin/e_menu.c 2009-10-25 18:35:54 UTC (rev 43274) +++ trunk/e/src/bin/e_menu.c 2009-10-25 18:42:47 UTC (rev 43275) @@ -33,84 +33,83 @@ }; /* local subsystem functions */ -static void _e_menu_free (E_Menu *m); -static void _e_menu_item_free (E_Menu_Item *mi); -static void _e_menu_item_realize (E_Menu_Item *mi); -static void _e_menu_realize (E_Menu *m); -static void _e_menu_items_layout_update (E_Menu *m); -static void _e_menu_item_unrealize (E_Menu_Item *mi); -static void _e_menu_unrealize (E_Menu *m); -static void _e_menu_activate_internal (E_Menu *m, E_Zone *zone); -static void _e_menu_deactivate_all (void); -static void _e_menu_deactivate_above (E_Menu *m); -static void _e_menu_submenu_activate (E_Menu_Item *mi); -static void _e_menu_submenu_deactivate (E_Menu_Item *mi); -static void _e_menu_reposition (E_Menu *m); -static int _e_menu_active_call (void); -static int _e_menu_realize_call (E_Menu_Item *mi); -static void _e_menu_item_activate_next (void); -static void _e_menu_item_activate_previous (void); -static void _e_menu_item_activate_first (void); -static void _e_menu_item_activate_last (void); -static void _e_menu_item_activate_nth (int n); -static void _e_menu_item_activate_char (const char * key_compose); -static void _e_menu_activate_next (void); -static void _e_menu_activate_previous (void); -static void _e_menu_activate_first (void); -static void _e_menu_activate_last (void); +static void _e_menu_free(E_Menu *m); +static void _e_menu_item_free(E_Menu_Item *mi); +static void _e_menu_item_realize(E_Menu_Item *mi); +static void _e_menu_realize(E_Menu *m); +static void _e_menu_items_layout_update(E_Menu *m); +static void _e_menu_item_unrealize(E_Menu_Item *mi); +static void _e_menu_unrealize(E_Menu *m); +static void _e_menu_activate_internal(E_Menu *m, E_Zone *zone); +static void _e_menu_deactivate_all(void); +static void _e_menu_deactivate_above(E_Menu *m); +static void _e_menu_submenu_activate(E_Menu_Item *mi); +static void _e_menu_submenu_deactivate(E_Menu_Item *mi); +static void _e_menu_reposition(E_Menu *m); +static int _e_menu_active_call(void); +static int _e_menu_realize_call(E_Menu_Item *mi); +static void _e_menu_item_activate_next(void); +static void _e_menu_item_activate_previous(void); +static void _e_menu_item_activate_first(void); +static void _e_menu_item_activate_last(void); +static void _e_menu_item_activate_nth(int n); +static void _e_menu_item_activate_char(const char * key_compose); +static void _e_menu_activate_next(void); +static void _e_menu_activate_previous(void); +static void _e_menu_activate_first(void); +static void _e_menu_activate_last(void); #if 0 -static void _e_menu_activate_nth (int n); +static void _e_menu_activate_nth(int n); #endif -static E_Menu *_e_menu_active_get (void); -static E_Menu_Item *_e_menu_item_active_get (void); -static Eina_List * _e_menu_list_item_active_get (void); -static int _e_menu_outside_bounds_get (int xdir, int ydir); -static void _e_menu_scroll_by (int dx, int dy); -static void _e_menu_mouse_autoscroll_check (void); -static void _e_menu_item_ensure_onscreen (E_Menu_Item *mi); -static int _e_menu_auto_place (E_Menu *m, int x, int y, int w, int h); -static void _e_menu_cb_intercept_item_move (void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y); -static void _e_menu_cb_intercept_item_resize (void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); -static void _e_menu_cb_intercept_container_move (void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y); -static void _e_menu_cb_intercept_container_resize (void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); -static void _e_menu_cb_ecore_evas_resize (Ecore_Evas *ee); -static void _e_menu_cb_item_in (void *data, Evas *evas, Evas_Object *obj, void *event_info); -static void _e_menu_cb_item_out (void *data, Evas *evas, Evas_Object *obj, void *event_info); -static int _e_menu_cb_key_down (void *data, int type, void *event); -static int _e_menu_cb_key_up (void *data, int type, void *event); -static int _e_menu_cb_mouse_down (void *data, int type, void *event); -static int _e_menu_cb_mouse_up (void *data, int type, void *event); -static int _e_menu_cb_mouse_move (void *data, int type, void *event); -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 E_Menu *_e_menu_active_get(void); +static E_Menu_Item *_e_menu_item_active_get(void); +static Eina_List *_e_menu_list_item_active_get(void); +static int _e_menu_outside_bounds_get(int xdir, int ydir); +static void _e_menu_scroll_by(int dx, int dy); +static void _e_menu_mouse_autoscroll_check(void); +static void _e_menu_item_ensure_onscreen(E_Menu_Item *mi); +static int _e_menu_auto_place(E_Menu *m, int x, int y, int w, int h); +static void _e_menu_cb_intercept_item_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y); +static void _e_menu_cb_intercept_item_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); +static void _e_menu_cb_intercept_container_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y); +static void _e_menu_cb_intercept_container_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); +static void _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee); +static void _e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info); +static void _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info); +static int _e_menu_cb_key_down(void *data, int type, void *event); +static int _e_menu_cb_key_up(void *data, int type, void *event); +static int _e_menu_cb_mouse_down(void *data, int type, void *event); +static int _e_menu_cb_mouse_up(void *data, int type, void *event); +static int _e_menu_cb_mouse_move(void *data, int type, void *event); +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); -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); - /* local subsystem globals */ -static Ecore_X_Window _e_menu_win = 0; -static Eina_List *_e_active_menus = NULL; -static E_Menu_Item *_e_active_menu_item = NULL; +static Ecore_X_Window _e_menu_win = 0; +static Eina_List *_e_active_menus = NULL; +static E_Menu_Item *_e_active_menu_item = NULL; /*static Eina_Hash *_e_menu_category_items = NULL;*/ -static Eina_Hash *_e_menu_categories = NULL; -static Ecore_X_Time _e_menu_activate_time = 0; -static int _e_menu_activate_floating = 0; -static int _e_menu_activate_maybe_drag = 0; -static int _e_menu_activate_dragging = 0; -static Ecore_Animator *_e_menu_scroll_animator = NULL; -static double _e_menu_scroll_start = 0.0; -static int _e_menu_x = 0; -static int _e_menu_y = 0; -static Ecore_X_Time _e_menu_time = 0; -static int _e_menu_autoscroll_x = 0; -static int _e_menu_autoscroll_y = 0; -static Ecore_Event_Handler *_e_menu_key_down_handler = NULL; -static Ecore_Event_Handler *_e_menu_key_up_handler = NULL; -static Ecore_Event_Handler *_e_menu_mouse_down_handler = NULL; -static Ecore_Event_Handler *_e_menu_mouse_up_handler = NULL; -static Ecore_Event_Handler *_e_menu_mouse_move_handler = NULL; -static Ecore_Event_Handler *_e_menu_mouse_wheel_handler = NULL; +static Eina_Hash *_e_menu_categories = NULL; +static Ecore_X_Time _e_menu_activate_time = 0; +static int _e_menu_activate_floating = 0; +static int _e_menu_activate_maybe_drag = 0; +static int _e_menu_activate_dragging = 0; +static Ecore_Animator *_e_menu_scroll_animator = NULL; +static double _e_menu_scroll_start = 0.0; +static int _e_menu_x = 0; +static int _e_menu_y = 0; +static Ecore_X_Time _e_menu_time = 0; +static int _e_menu_autoscroll_x = 0; +static int _e_menu_autoscroll_y = 0; +static Ecore_Event_Handler *_e_menu_key_down_handler = NULL; +static Ecore_Event_Handler *_e_menu_key_up_handler = NULL; +static Ecore_Event_Handler *_e_menu_mouse_down_handler = NULL; +static Ecore_Event_Handler *_e_menu_mouse_up_handler = NULL; +static Ecore_Event_Handler *_e_menu_mouse_move_handler = NULL; +static Ecore_Event_Handler *_e_menu_mouse_wheel_handler = NULL; static Ecore_Event_Handler *_e_menu_window_shape_handler = NULL; static Eina_List * @@ -141,13 +140,25 @@ 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 @@ 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_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)); - } + 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 @@ { 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 @@ 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"); @@ -1433,7 +1444,7 @@ if (ok) { const char *shape_option; - + shape_option = edje_object_data_get(o, "shaped"); if (shape_option) { @@ -1471,9 +1482,7 @@ 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_item_realize(mi); _e_menu_items_layout_update(m); e_box_thaw(m->container_object); @@ -1713,9 +1722,7 @@ m->shape = NULL; e_box_freeze(m->container_object); EINA_LIST_FOREACH(m->items, l, mi) - { - _e_menu_item_unrealize(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,9 +1792,7 @@ { E_Menu_Category_Callback *cb; EINA_LIST_FOREACH(cat->callbacks, l, cb) - { - if (cb->create) cb->create(m, cat->data, cb->data); - } + if (cb->create) cb->create(m, cat->data, cb->data); } } m->cur.visible = 1; @@ -1903,9 +1908,7 @@ tmp = _e_active_menus_copy_ref(); EINA_LIST_FOREACH(m->items, l, mi) - { - if ((mi->active) && (mi->submenu)) _e_menu_reposition(mi->submenu); - } + if ((mi->active) && (mi->submenu)) _e_menu_reposition(mi->submenu); _e_menu_list_free_unref(tmp); } @@ -1994,7 +1997,7 @@ 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); @@ -2125,7 +2128,7 @@ /* While we don't have a label OR we don't match AND we haven't * wrapped around */ while ((!mi->label || strncasecmp(key_compose, mi->label, strlen(key_compose))) - && ll != ll_orig) + && ll != ll_orig) { do { @@ -2546,32 +2549,23 @@ 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"))) { _e_menu_active_call(); - } - else if ((!strcmp(ev->key, "Return")) || - (!strcmp(ev->key, "KP_Enter"))) - { - _e_menu_active_call(); _e_menu_deactivate_all(); } else if (!strcmp(ev->key, "Escape")) @@ -2721,8 +2715,7 @@ 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); } } |
From: Enlightenment S. <no-...@en...> - 2009-10-27 17:24:01
|
Log: Fix compiler warning. Formatting. Author: devilhorns Date: 2009-10-27 10:23:46 -0700 (Tue, 27 Oct 2009) New Revision: 43309 Modified: trunk/e/src/bin/e_exehist.c Modified: trunk/e/src/bin/e_exehist.c =================================================================== --- trunk/e/src/bin/e_exehist.c 2009-10-27 15:29:36 UTC (rev 43308) +++ trunk/e/src/bin/e_exehist.c 2009-10-27 17:23:46 UTC (rev 43309) @@ -240,6 +240,7 @@ else { const char *exe; + EINA_LIST_FOREACH(list, m, exe) { if (!exe) continue; @@ -437,9 +438,8 @@ const char *ret; Eina_Bool flag = EINA_FALSE; - base = basename(exe); - if (base[0] == '.' && base[1] == '\0') - return NULL; + base = basename((char *)exe); + if ((base[0] == '.') && (base[1] == '\0')) return NULL; base = strdup(base); cp = base; @@ -447,31 +447,26 @@ { if (isspace(*cp)) { - if (!space) - space = cp; - if (flag) - flag = EINA_FALSE; + if (!space) space = cp; + if (flag) flag = EINA_FALSE; } else if (!flag) { - /* usually a variable in the desktop exe field */ if (space && *cp == '%') flag = EINA_TRUE; else { char lower = tolower(*cp); - space = NULL; - if (lower != *cp) - *cp = lower; + space = NULL; + if (lower != *cp) *cp = lower; } } cp++; } - if (space) - *space = '\0'; + if (space) *space = '\0'; ret = eina_stringshare_add(base); free(base); @@ -499,8 +494,8 @@ ei1 = d1; ei2 = d2; - if (!ei1 || !ei1->normalized_exe) return 1; - if (!ei2 || !ei2->normalized_exe) return -1; + if ((!ei1) || (!ei1->normalized_exe)) return 1; + if ((!ei2) || (!ei2->normalized_exe)) return -1; return strcmp(ei1->normalized_exe, ei2->normalized_exe); } @@ -510,11 +505,8 @@ { const E_Exehist_Item *ei1, *ei2; - ei1 = d1; - ei2 = d2; + if (!(ei1 = d1)) return 1; + if (!(ei2 = d2)) return -1; - if (!ei1) return 1; - if (!ei2) return -1; - return ei2->count - ei1->count; } |
From: Enlightenment S. <no-...@en...> - 2009-10-27 17:34:08
|
Log: Fix compiler warnings. Author: devilhorns Date: 2009-10-27 10:33:56 -0700 (Tue, 27 Oct 2009) New Revision: 43310 Modified: trunk/e/src/bin/e_gadcon.c Modified: trunk/e/src/bin/e_gadcon.c =================================================================== --- trunk/e/src/bin/e_gadcon.c 2009-10-27 17:23:46 UTC (rev 43309) +++ trunk/e/src/bin/e_gadcon.c 2009-10-27 17:33:56 UTC (rev 43310) @@ -248,9 +248,8 @@ } } EINA_LIST_FREE(dlist, gcc) - { - e_object_del(E_OBJECT(gcc)); - } + e_object_del(E_OBJECT(gcc)); + eina_hash_del(providers, cc->name, cc); providers_list = eina_list_remove(providers_list, cc); } @@ -425,13 +424,11 @@ cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc)); if (!cf_gcc->style) - { - gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id, - cc->default_style); - } + gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id, + cc->default_style); else gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id, - cf_gcc->style); + cf_gcc->style); if (gcc) { @@ -501,8 +498,8 @@ E_Gadcon_Client *gcc; if ((!cf_gcc->id) && - (_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new))) - cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc)); + (_e_gadcon_client_class_feature_check((E_Gadcon_Client_Class *)cc, "id_new", cc->func.id_new))) + cf_gcc->id = eina_stringshare_add(cc->func.id_new((E_Gadcon_Client_Class *)cc)); gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id, cf_gcc->style); @@ -1584,7 +1581,7 @@ e_gadcon_client_edit_end(gcc); gcc->client_class->func.shutdown(gcc); if (gcc->client_class->func.id_del) - gcc->client_class->func.id_del(gcc->client_class, gcc->cf->id); + gcc->client_class->func.id_del((E_Gadcon_Client_Class *)gcc->client_class, gcc->cf->id); gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc); if (gcc->o_box) evas_object_del(gcc->o_box); if (gcc->o_frame) evas_object_del(gcc->o_frame); @@ -1740,7 +1737,8 @@ _e_gadcon_cb_drag_finished); if (drag) { - o = gcc->client_class->func.icon(gcc->client_class, e_drag_evas_get(drag)); + o = gcc->client_class->func.icon((E_Gadcon_Client_Class *)gcc->client_class, + e_drag_evas_get(drag)); evas_object_geometry_get(o, NULL, NULL, &w, &h); if (!o) { |
From: Enlightenment S. <no-...@en...> - 2009-10-27 17:38:51
|
Log: Remove compiler warning about deprecated eina_error_print. Author: devilhorns Date: 2009-10-27 10:38:34 -0700 (Tue, 27 Oct 2009) New Revision: 43311 Modified: trunk/e/src/bin/e_fm_op_registry.c Modified: trunk/e/src/bin/e_fm_op_registry.c =================================================================== --- trunk/e/src/bin/e_fm_op_registry.c 2009-10-27 17:33:56 UTC (rev 43310) +++ trunk/e/src/bin/e_fm_op_registry.c 2009-10-27 17:38:34 UTC (rev 43311) @@ -362,9 +362,7 @@ err = eina_error_get(); if (err) { - EINA_ERROR_PERR("could not add listener: %s\n", - eina_error_msg_get(err)); - + printf("could not add listener: %s\n", eina_error_msg_get(err)); if (free_data) free_data((void *)data); free(listener); return; |