From: Enlightenment S. <no-...@en...> - 2009-05-15 18:26:04
|
Log: Fix typo, Thanks Viktor :) Author: devilhorns Date: 2009-05-15 11:25:55 -0700 (Fri, 15 May 2009) New Revision: 40681 Modified: trunk/e/src/bin/e_pan.c Modified: trunk/e/src/bin/e_pan.c =================================================================== --- trunk/e/src/bin/e_pan.c 2009-05-15 18:11:41 UTC (rev 40680) +++ trunk/e/src/bin/e_pan.c 2009-05-15 18:25:55 UTC (rev 40681) @@ -171,7 +171,7 @@ { E_Smart_Data *sd; - sd = E_NEW(fSmart_Data, 1); + sd = E_NEW(E_Smart_Data, 1); if (!sd) return; sd->smart_obj = obj; sd->x = 0; |
From: Enlightenment S. <no-...@en...> - 2009-05-15 19:53:36
|
Log: Remove need for extra variables. Use E_NEW & E_FREE. Cleanup Formatting. Remove Whitespace. Author: devilhorns Date: 2009-05-15 12:53:25 -0700 (Fri, 15 May 2009) New Revision: 40682 Modified: trunk/e/src/bin/e_scrollframe.c Modified: trunk/e/src/bin/e_scrollframe.c =================================================================== --- trunk/e/src/bin/e_scrollframe.c 2009-05-15 18:25:55 UTC (rev 40681) +++ trunk/e/src/bin/e_scrollframe.c 2009-05-15 19:53:25 UTC (rev 40682) @@ -11,7 +11,7 @@ struct _E_Smart_Data { Evas_Coord x, y, w, h; - + Evas_Object *smart_obj; Evas_Object *child_obj; Evas_Object *pan_obj; @@ -25,8 +25,8 @@ Evas_Coord sx, sy; Evas_Coord dx, dy; struct { - Evas_Coord x, y; - double timestamp; + Evas_Coord x, y; + double timestamp; } history[20]; double anim_start; Ecore_Animator *momentum_animator; @@ -37,24 +37,28 @@ unsigned char dir_y : 1; unsigned char locked : 1; } down; - - struct { - Evas_Coord w, h; - } child; - struct { - Evas_Coord x, y; - } step, page; - struct { - void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y); - void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); - void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); - void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); - } pan_func; - struct { - Evas_Bool forced : 1; - } thumbscroll; - + struct + { + Evas_Coord w, h; + } child; + struct + { + Evas_Coord x, y; + } step, page; + + struct + { + void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y); + void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); + void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); + void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); + } pan_func; + struct + { + Evas_Bool forced : 1; + } thumbscroll; + unsigned char hbar_visible : 1; unsigned char vbar_visible : 1; unsigned char extern_pan : 1; @@ -105,16 +109,16 @@ EAPI void e_scrollframe_child_set(Evas_Object *obj, Evas_Object *child) { - Evas_Coord w, h; Evas_Object *o; - + API_ENTRY return; if (sd->child_obj) { e_pan_child_set(sd->pan_obj, NULL); - evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, _e_smart_child_del_hook); + evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, + _e_smart_child_del_hook); } - + sd->child_obj = child; if (!child) return; @@ -122,22 +126,23 @@ { o = e_pan_add(evas_object_evas_get(obj)); sd->pan_obj = o; - evas_object_smart_callback_add(o, "changed", _e_smart_pan_changed_hook, sd); - evas_object_smart_callback_add(o, "pan_changed", _e_smart_pan_pan_changed_hook, sd); + evas_object_smart_callback_add(o, "changed", + _e_smart_pan_changed_hook, sd); + evas_object_smart_callback_add(o, "pan_changed", + _e_smart_pan_pan_changed_hook, sd); evas_object_show(o); edje_object_part_swallow(sd->edje_obj, "e.swallow.content", o); } - + sd->pan_func.set = e_pan_set; sd->pan_func.get = e_pan_get; sd->pan_func.max_get = e_pan_max_get; sd->pan_func.child_size_get = e_pan_child_size_get; - - evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, _e_smart_child_del_hook, sd); + + evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, + _e_smart_child_del_hook, sd); e_pan_child_set(sd->pan_obj, sd->child_obj); - sd->pan_func.child_size_get(sd->pan_obj, &w, &h); - sd->child.w = w; - sd->child.h = h; + sd->pan_func.child_size_get(sd->pan_obj, &sd->child.w, &sd->child.h); _e_smart_scrollbar_size_adjust(sd); _e_smart_scrollbar_reset(sd); } @@ -150,7 +155,7 @@ void (*pan_child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)) { API_ENTRY return; - + e_scrollframe_child_set(obj, NULL); if (sd->extern_pan) { @@ -180,8 +185,10 @@ sd->pan_func.max_get = pan_max_get; sd->pan_func.child_size_get = pan_child_size_get; sd->extern_pan = 1; - evas_object_smart_callback_add(sd->pan_obj, "changed", _e_smart_pan_changed_hook, sd); - evas_object_smart_callback_add(sd->pan_obj, "pan_changed", _e_smart_pan_pan_changed_hook, sd); + evas_object_smart_callback_add(sd->pan_obj, "changed", + _e_smart_pan_changed_hook, sd); + evas_object_smart_callback_add(sd->pan_obj, "pan_changed", + _e_smart_pan_pan_changed_hook, sd); edje_object_part_swallow(sd->edje_obj, "e.swallow.content", sd->pan_obj); evas_object_show(sd->pan_obj); } @@ -206,8 +213,7 @@ { API_ENTRY return 0; - if (!edje_object_file_set(sd->edje_obj, file, group)) - return 0; + if (!edje_object_file_set(sd->edje_obj, file, group)) return 0; if (sd->pan_obj) edje_object_part_swallow(sd->edje_obj, "e.swallow.content", sd->pan_obj); sd->vbar_visible = !sd->vbar_visible; @@ -221,7 +227,7 @@ { Evas_Coord mx = 0, my = 0; double vx, vy; - + API_ENTRY return; sd->pan_func.max_get(sd->pan_obj, &mx, &my); if (mx > 0) vx = (double)x / (double)mx; @@ -248,12 +254,12 @@ e_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { Evas_Coord mx = 0, my = 0, cw = 0, ch = 0, px = 0, py = 0, nx, ny; - + API_ENTRY return; sd->pan_func.max_get(sd->pan_obj, &mx, &my); sd->pan_func.child_size_get(sd->pan_obj, &cw, &ch); sd->pan_func.get(sd->pan_obj, &px, &py); - + nx = px; if (x < px) nx = x; else if ((x + w) > (px + (cw - mx))) @@ -277,7 +283,8 @@ { API_ENTRY return; edje_object_calc_force(sd->edje_obj); - edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, w, h); + edje_object_part_geometry_get(sd->edje_obj, + "e.swallow.content", NULL, NULL, w, h); } EAPI void @@ -367,7 +374,7 @@ _e_smart_edje_drag_v(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Smart_Data *sd; - + sd = data; _e_smart_scrollbar_read(sd); } @@ -376,7 +383,7 @@ _e_smart_edje_drag_h(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Smart_Data *sd; - + sd = data; _e_smart_scrollbar_read(sd); } @@ -385,7 +392,7 @@ _e_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Smart_Data *sd; - + sd = data; sd->child_obj = NULL; _e_smart_scrollbar_size_adjust(sd); @@ -397,7 +404,7 @@ { Evas_Coord w, h; E_Smart_Data *sd; - + sd = data; sd->pan_func.child_size_get(sd->pan_obj, &w, &h); if ((w != sd->child.w) || (h != sd->child.h)) @@ -413,7 +420,7 @@ { Evas_Coord x, y; E_Smart_Data *sd; - + sd = data; sd->pan_func.get(sd->pan_obj, &x, &y); e_scrollframe_child_pos_set(sd->smart_obj, x, y); @@ -432,7 +439,8 @@ if ((sd->vbar_visible) && ((ev->direction % 2 == 0) || (!sd->hbar_visible))) y += ev->z * sd->step.y; - else if ((sd->hbar_visible) && ((ev->direction % 2 == 1) || (!sd->vbar_visible))) + else if ((sd->hbar_visible) && + ((ev->direction % 2 == 1) || (!sd->vbar_visible))) x += ev->z * sd->step.x; e_scrollframe_child_pos_set(sd->smart_obj, x, y); @@ -443,7 +451,6 @@ { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; - Evas_Coord x = 0, y = 0; sd = data; ev = event_info; @@ -462,9 +469,8 @@ sd->down.dir_y = 0; sd->down.x = ev->canvas.x; sd->down.y = ev->canvas.y; - e_scrollframe_child_pos_get(sd->smart_obj, &x, &y); - sd->down.sx = x; - sd->down.sy = y; + e_scrollframe_child_pos_get(sd->smart_obj, + &sd->down.sx, &sd->down.sy); sd->down.locked = 0; memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20); sd->down.history[0].timestamp = ecore_loop_time_get(); @@ -480,7 +486,7 @@ E_Smart_Data *sd; double t, dt, p; Evas_Coord x, y, dx, dy; - + sd = data; t = ecore_loop_time_get(); dt = t - sd->down.anim_start; @@ -523,7 +529,7 @@ double t, at, dt; int i; Evas_Coord ax, ay, dx, dy, vel; - + t = ecore_loop_time_get(); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ax = ev->canvas.x; @@ -550,7 +556,8 @@ (vel > e_config->thumbscroll_momentum_threshhold)) { if (!sd->down.momentum_animator) - sd->down.momentum_animator = ecore_animator_add(_e_smart_momentum_animator, sd); + sd->down.momentum_animator = + ecore_animator_add(_e_smart_momentum_animator, sd); sd->down.dx = ((double)dx / at); sd->down.dy = ((double)dy / at); sd->down.anim_start = t; @@ -585,7 +592,7 @@ sd->down.history[0].timestamp = ecore_loop_time_get(); sd->down.history[0].x = ev->cur.canvas.x; sd->down.history[0].y = ev->cur.canvas.y; - + x = ev->cur.canvas.x - sd->down.x; if (x < 0) x = -x; y = ev->cur.canvas.y - sd->down.y; @@ -644,7 +651,7 @@ Evas_Event_Key_Down *ev; E_Smart_Data *sd; Evas_Coord x = 0, y = 0, vw = 0, vh = 0, mx = 0, my = 0; - + sd = data; ev = event_info; e_scrollframe_child_pos_get(sd->smart_obj, &x, &y); @@ -684,7 +691,7 @@ { Evas_Coord x, y, mx = 0, my = 0; double vx, vy; - + edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", NULL, &vy); edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL); sd->pan_func.max_get(sd->pan_obj, &mx, &my); @@ -714,7 +721,7 @@ { int scroll_v_vis_change = 0; Evas_Coord w, h, vw, vh; - + w = sd->child.w; h = sd->child.h; edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); @@ -778,7 +785,7 @@ { int scroll_h_vis_change = 0; Evas_Coord w, h, vw, vh; - + w = sd->child.w; h = sd->child.h; edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); @@ -841,7 +848,7 @@ _e_smart_scrollbar_bar_visibility_adjust(E_Smart_Data *sd) { int changed = 0; - + changed |= _e_smart_scrollbar_bar_h_visibility_adjust(sd); changed |= _e_smart_scrollbar_bar_v_visibility_adjust(sd); if (changed) @@ -865,50 +872,65 @@ double vx, vy, size; edje_object_calc_force(sd->edje_obj); - edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", + NULL, NULL, &vw, &vh); w = sd->child.w; if (w < 1) w = 1; size = (double)vw / (double)w; if (size > 1.0) { size = 1.0; - edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", 0.0, 0.0); + edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", + 0.0, 0.0); } - edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", size, 1.0); - + edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", + size, 1.0); + h = sd->child.h; if (h < 1) h = 1; size = (double)vh / (double)h; if (size > 1.0) { size = 1.0; - edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", 0.0, 0.0); + edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", + 0.0, 0.0); } - edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, size); + edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", + 1.0, size); - edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL); - edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", NULL, &vy); + edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", + &vx, NULL); + edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", + NULL, &vy); sd->pan_func.max_get(sd->pan_obj, &mx, &my); x = vx * mx; y = vy * my; - - edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", (double)sd->step.x / (double)w, 0.0); - edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.vbar", 0.0, (double)sd->step.y / (double)h); + + edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", + (double)sd->step.x / (double)w, 0.0); + edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.vbar", + 0.0, (double)sd->step.y / (double)h); if (sd->page.x > 0) - edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", (double)sd->page.x / (double)w, 0.0); + edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", + (double)sd->page.x / (double)w, 0.0); else - edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0); + edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", + -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0); if (sd->page.y > 0) - edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 0.0, (double)sd->page.y / (double)h); + edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", + 0.0, (double)sd->page.y / (double)h); else - edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0); - + edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", + 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0); + sd->pan_func.set(sd->pan_obj, x, y); } else { - edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, 1.0); - edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 1.0, 1.0); + edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", + 1.0, 1.0); + edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", + 1.0, 1.0); sd->pan_func.set(sd->pan_obj, 0, 0); } _e_smart_scrollbar_bar_visibility_adjust(sd); @@ -929,11 +951,11 @@ { E_Smart_Data *sd; Evas_Object *o; - - sd = calloc(1, sizeof(E_Smart_Data)); + + sd = E_NEW(E_Smart_Data, 1); if (!sd) return; evas_object_smart_data_set(obj, sd); - + sd->smart_obj = obj; sd->x = 0; sd->y = 0; @@ -947,25 +969,32 @@ sd->vbar_flags = E_SCROLLFRAME_POLICY_AUTO; sd->hbar_visible = 1; sd->vbar_visible = 1; - - evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _e_smart_event_key_down, sd); + + evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, + _e_smart_event_key_down, sd); evas_object_propagate_events_set(obj, 0); - + o = edje_object_add(evas_object_evas_get(obj)); sd->edje_obj = o; e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/scrollframe"); - edje_object_signal_callback_add(o, "drag*", "e.dragable.vbar", _e_smart_edje_drag_v, sd); - edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", _e_smart_edje_drag_h, sd); + edje_object_signal_callback_add(o, "drag*", "e.dragable.vbar", + _e_smart_edje_drag_v, sd); + edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", + _e_smart_edje_drag_h, sd); evas_object_smart_member_add(o, obj); - + o = evas_object_rectangle_add(evas_object_evas_get(obj)); sd->event_obj = o; evas_object_color_set(o, 0, 0, 0, 0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, _e_smart_event_wheel, sd); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_event_mouse_down, sd); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_smart_event_mouse_up, sd); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_event_mouse_move, sd); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, + _e_smart_event_wheel, sd); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, + _e_smart_event_mouse_down, sd); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, + _e_smart_event_mouse_up, sd); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, + _e_smart_event_mouse_move, sd); evas_object_smart_member_add(o, obj); evas_object_repeat_events_set(o, 1); @@ -973,7 +1002,7 @@ sd->pan_func.get = e_pan_get; sd->pan_func.max_get = e_pan_max_get; sd->pan_func.child_size_get = e_pan_child_size_get; - + _e_smart_scrollbar_reset(sd); } @@ -985,8 +1014,9 @@ if (!sd->extern_pan) evas_object_del(sd->pan_obj); evas_object_del(sd->edje_obj); evas_object_del(sd->event_obj); - if (sd->down.momentum_animator) ecore_animator_del(sd->down.momentum_animator); - free(sd); + if (sd->down.momentum_animator) + ecore_animator_del(sd->down.momentum_animator); + E_FREE(sd); } static void @@ -1066,12 +1096,8 @@ _e_smart_color_set, _e_smart_clip_set, _e_smart_clip_unset, - NULL, - NULL, - NULL, - NULL + NULL, NULL, NULL, NULL }; _e_smart = evas_smart_class_new(&sc); } } - |
From: Enlightenment S. <no-...@en...> - 2009-05-17 16:01:50
|
Log: Remove unneeded variables. Author: devilhorns Date: 2009-05-17 09:01:41 -0700 (Sun, 17 May 2009) New Revision: 40706 Modified: trunk/e/src/bin/e_scrollframe.c Modified: trunk/e/src/bin/e_scrollframe.c =================================================================== --- trunk/e/src/bin/e_scrollframe.c 2009-05-17 14:46:53 UTC (rev 40705) +++ trunk/e/src/bin/e_scrollframe.c 2009-05-17 16:01:41 UTC (rev 40706) @@ -720,11 +720,12 @@ _e_smart_scrollbar_bar_v_visibility_adjust(E_Smart_Data *sd) { int scroll_v_vis_change = 0; - Evas_Coord w, h, vw, vh; + Evas_Coord w, h, vh; w = sd->child.w; h = sd->child.h; - edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", + NULL, NULL, NULL, &vh); if (sd->vbar_visible) { if (sd->vbar_flags == E_SCROLLFRAME_POLICY_AUTO) @@ -784,11 +785,12 @@ _e_smart_scrollbar_bar_h_visibility_adjust(E_Smart_Data *sd) { int scroll_h_vis_change = 0; - Evas_Coord w, h, vw, vh; + Evas_Coord w, h, vw; w = sd->child.w; h = sd->child.h; - edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", + NULL, NULL, &vw, NULL); if (sd->hbar_visible) { if (sd->hbar_flags == E_SCROLLFRAME_POLICY_AUTO) |
From: Enlightenment S. <no-...@en...> - 2009-05-26 14:44:30
|
Log: Formatting. Add missing void in function declaration. Author: devilhorns Date: 2009-05-26 07:44:19 -0700 (Tue, 26 May 2009) New Revision: 40835 Modified: trunk/e/src/bin/e_dnd.c trunk/e/src/bin/e_dnd.h Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2009-05-26 13:04:28 UTC (rev 40834) +++ trunk/e/src/bin/e_dnd.c 2009-05-26 14:44:19 UTC (rev 40835) @@ -547,7 +547,7 @@ } EAPI Ecore_X_Atom -e_drop_handler_action_get() +e_drop_handler_action_get(void) { return _action; } @@ -790,6 +790,7 @@ if (_drag_current) { E_Drop_Handler *h; + EINA_LIST_FOREACH(_drop_handlers, l, h) { if (!h->active) continue; @@ -843,6 +844,7 @@ else if (_xdnd) { E_Drop_Handler *h; + EINA_LIST_FOREACH(_drop_handlers, l, h) { if (!h->active) continue; @@ -944,8 +946,7 @@ ev.x = x - dx; ev.y = y - dy; if ((_e_drag_win_matches(h, win, 0)) && - ((h->cb.drop) && - (E_INSIDE(x, y, dx, dy, dw, dh)))) + ((h->cb.drop) && (E_INSIDE(x, y, dx, dy, dw, dh)))) { if (_drag_current->cb.convert) { @@ -977,8 +978,7 @@ EINA_LIST_FOREACH(_drop_handlers, l, h) { - if (!h->active) - continue; + if (!h->active) continue; if (h->entered) { @@ -1032,8 +1032,7 @@ EINA_LIST_FOREACH(_drop_handlers, l, h) { - if (!h->active) - continue; + if (!h->active) continue; if (h->entered) { @@ -1163,7 +1162,9 @@ ev = event; if (ev->window != _drag_win) return 1; - if (!_xdnd) _e_drag_update(_drag_win_root, ev->x, ev->y, ECORE_X_ATOM_XDND_ACTION_PRIVATE); + if (!_xdnd) + _e_drag_update(_drag_win_root, ev->x, ev->y, + ECORE_X_ATOM_XDND_ACTION_PRIVATE); return 1; } @@ -1252,10 +1253,10 @@ if (_xdnd) { E_Drop_Handler *h; + EINA_LIST_FOREACH(_drop_handlers, l, h) { - if (!h->active) - continue; + if (!h->active) continue; if (h->entered) { @@ -1312,20 +1313,14 @@ } } if (!active) - { - ecore_x_dnd_send_status(0, 0, rect, ECORE_X_DND_ACTION_PRIVATE); - } + ecore_x_dnd_send_status(0, 0, rect, ECORE_X_DND_ACTION_PRIVATE); else { responsive = _e_drag_update(ev->win, ev->position.x, ev->position.y, ev->action); if (responsive) - { - ecore_x_dnd_send_status(1, 0, rect, _action); - } + ecore_x_dnd_send_status(1, 0, rect, _action); else - { - ecore_x_dnd_send_status(1, 0, rect, ECORE_X_ATOM_XDND_ACTION_PRIVATE); - } + ecore_x_dnd_send_status(1, 0, rect, ECORE_X_ATOM_XDND_ACTION_PRIVATE); } // double t2 = ecore_time_get() - t1; //// // printf("DND POS EV 2 %3.7f\n", t2); //// @@ -1339,7 +1334,6 @@ ev = event; if (ev->win != _drag_win) return 1; - return 1; } @@ -1350,8 +1344,7 @@ ev = event; - if (!ev->completed) - return 1; + if (!ev->completed) return 1; if (_drag_current) { @@ -1451,9 +1444,7 @@ eina_list_free(l); } else - { - _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y); - } + _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y); /* FIXME: When to execute this? It could be executed in ecore_x after getting * the drop property... */ ecore_x_dnd_send_finished(); Modified: trunk/e/src/bin/e_dnd.h =================================================================== --- trunk/e/src/bin/e_dnd.h 2009-05-26 13:04:28 UTC (rev 40834) +++ trunk/e/src/bin/e_dnd.h 2009-05-26 14:44:19 UTC (rev 40835) @@ -26,26 +26,27 @@ struct _E_Drag { - E_Object e_obj_inherit; + E_Object e_obj_inherit; - void *data; - int data_size; + void *data; + int data_size; - E_Drag_Type type; + E_Drag_Type type; - struct { + struct + { void *(*convert)(E_Drag *drag, const char *type); void (*finished)(E_Drag *drag, int dropped); void (*key_down)(E_Drag *drag, Ecore_Event_Key *e); void (*key_up)(E_Drag *drag, Ecore_Event_Key *e); - } cb; + } cb; - E_Container *container; - Ecore_Evas *ecore_evas; - Evas *evas; - Ecore_X_Window evas_win; + E_Container *container; + Ecore_Evas *ecore_evas; + Evas *evas; + Ecore_X_Window evas_win; E_Container_Shape *shape; - Evas_Object *object; + Evas_Object *object; int x, y, w, h; int dx, dy; @@ -53,33 +54,34 @@ int shape_rects_num; Ecore_X_Rectangle *shape_rects; - unsigned int layer; - unsigned char visible : 1; - unsigned char need_shape_export : 1; - unsigned char xy_update : 1; + unsigned int layer; + unsigned char visible : 1; + unsigned char need_shape_export : 1; + unsigned char xy_update : 1; - unsigned int num_types; - const char *types[]; + unsigned int num_types; + const char *types[]; }; struct _E_Drop_Handler { - struct { + struct + { void (*enter)(void *data, const char *type, void *event); void (*move)(void *data, const char *type, void *event); void (*leave)(void *data, const char *type, void *event); void (*drop)(void *data, const char *type, void *event); void *data; - } cb; + } cb; - E_Object *obj; + E_Object *obj; int x, y, w, h; - unsigned char active : 1; - unsigned char entered : 1; - const char *active_type; - unsigned int num_types; - const char *types[]; + unsigned char active : 1; + unsigned char entered : 1; + const char *active_type; + unsigned int num_types; + const char *types[]; }; struct _E_Event_Dnd_Enter @@ -144,12 +146,12 @@ EAPI void e_drop_handler_responsive_set(E_Drop_Handler *handler); EAPI int e_drop_handler_responsive_get(const E_Drop_Handler *handler); EAPI void e_drop_handler_action_set(Ecore_X_Atom action); -EAPI Ecore_X_Atom e_drop_handler_action_get(); +EAPI Ecore_X_Atom e_drop_handler_action_get(void); #endif #endif #ifndef MIN -#define MIN(x, y) (((x) > (y)) ? (y) : (x)) +# define MIN(x, y) (((x) > (y)) ? (y) : (x)) #endif |
From: Enlightenment S. <no-...@en...> - 2009-05-26 16:03:05
|
Log: Use E_FREE for _xdnd, created with E_NEW. Author: devilhorns Date: 2009-05-26 09:02:49 -0700 (Tue, 26 May 2009) New Revision: 40836 Modified: trunk/e/src/bin/e_dnd.c Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2009-05-26 14:44:19 UTC (rev 40835) +++ trunk/e/src/bin/e_dnd.c 2009-05-26 16:02:49 UTC (rev 40836) @@ -1267,8 +1267,7 @@ } eina_stringshare_del(_xdnd->type); - free(_xdnd); - _xdnd = NULL; + E_FREE(_xdnd); } return 1; } @@ -1394,7 +1393,7 @@ if (_type_text_uri_list == _xdnd->type) { - Ecore_X_Selection_Data_Files *files; + Ecore_X_Selection_Data_Files *files; Eina_List *l = NULL; files = ev->data; @@ -1411,7 +1410,7 @@ Eina_List *l = NULL; char file[PATH_MAX]; char *text; - int i, size; + int size; data = ev->data; text = (char *)data->data; @@ -1449,7 +1448,6 @@ * the drop property... */ ecore_x_dnd_send_finished(); eina_stringshare_del(_xdnd->type); - free(_xdnd); - _xdnd = NULL; + E_FREE(_xdnd); return 1; } |
From: Enlightenment S. <no-...@en...> - 2009-07-04 02:42:19
|
Log: Fix ticket #343 (autoscroll and resizable not being set after restart). Formatting. Whitespace Removal. Variable cleanup. Add missing 'static' declaration on private function. Move EAPI functions to be together in the source before local functions. Author: devilhorns Date: 2009-07-03 18:44:34 -0700 (Fri, 03 Jul 2009) New Revision: 41246 Modified: trunk/e/src/bin/e_gadcon.c Modified: trunk/e/src/bin/e_gadcon.c =================================================================== --- trunk/e/src/bin/e_gadcon.c 2009-07-03 16:34:33 UTC (rev 41245) +++ trunk/e/src/bin/e_gadcon.c 2009-07-04 01:44:34 UTC (rev 41246) @@ -132,9 +132,10 @@ { int pos, size, prev_pos, prev_size; - struct { - int min_seq, max_seq; - } state_info; + struct + { + int min_seq, max_seq; + } state_info; E_Smart_Data *sd; Eina_List *items; @@ -276,18 +277,18 @@ EAPI E_Gadcon * e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow_name) { - E_Gadcon *gc; - Eina_List *l; - Evas_Coord x, y, w, h; - const char *drop_types[] = { "enlightenment/gadcon_client" }; - + E_Gadcon *gc; + Eina_List *l; + Evas_Coord x, y, w, h; + const char *drop_types[] = { "enlightenment/gadcon_client" }; + gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, _e_gadcon_free); if (!gc) return NULL; - + gc->name = eina_stringshare_add(name); gc->id = id; gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL; - + gc->edje.o_parent = obj; gc->edje.swallow_name = eina_stringshare_add(swallow_name); @@ -295,11 +296,11 @@ gc->evas = evas_object_evas_get(obj); gc->o_container = e_gadcon_layout_add(gc->evas); evas_object_geometry_get(gc->o_container, &x, &y, &w, &h); - gc->drop_handler = e_drop_handler_add(E_OBJECT(gc), gc, - _e_gadcon_cb_dnd_enter, _e_gadcon_cb_dnd_move, - _e_gadcon_cb_dnd_leave, _e_gadcon_cb_drop, - drop_types, 1, - x, y, w, h); + gc->drop_handler = + e_drop_handler_add(E_OBJECT(gc), gc, + _e_gadcon_cb_dnd_enter, _e_gadcon_cb_dnd_move, + _e_gadcon_cb_dnd_leave, _e_gadcon_cb_drop, + drop_types, 1, x, y, w, h); evas_object_event_callback_add(gc->o_container, EVAS_CALLBACK_MOVE, _e_gadcon_cb_moveresize, gc); evas_object_event_callback_add(gc->o_container, EVAS_CALLBACK_RESIZE, @@ -318,8 +319,7 @@ E_Config_Gadcon *cf_gc; cf_gc = l->data; - if ((!strcmp(cf_gc->name, gc->name)) && - (cf_gc->id == gc->id)) + if ((!strcmp(cf_gc->name, gc->name)) && (cf_gc->id == gc->id)) { gc->cf = cf_gc; break; @@ -352,7 +352,6 @@ { E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); - gc->min_size_request.func = func; gc->min_size_request.data = data; } @@ -362,7 +361,6 @@ { E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); - gc->resize_request.func = func; gc->resize_request.data = data; } @@ -372,7 +370,6 @@ { E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); - gc->frame_request.func = func; gc->frame_request.data = data; } @@ -382,7 +379,6 @@ { E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); - gc->populate_class.func = func; gc->populate_class.data = data; } @@ -401,7 +397,7 @@ e_gadcon_populate(E_Gadcon *gc) { Eina_List *l; - + E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); e_gadcon_layout_freeze(gc->o_container); @@ -446,7 +442,7 @@ e_gadcon_layout_pack_options_set(gcc->o_frame, gcc); else if (gcc->o_base) e_gadcon_layout_pack_options_set(gcc->o_base, gcc); - + e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll); e_gadcon_client_resizable_set(gcc, cf_gcc->resizable); if (gcc->client_class->func.orient) @@ -466,7 +462,7 @@ e_gadcon_unpopulate(E_Gadcon *gc) { E_Gadcon_Client *gcc; - + E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); while (gc->clients) @@ -487,7 +483,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc) { Eina_List *l; - + E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); e_gadcon_layout_freeze(gc->o_container); @@ -522,6 +518,8 @@ else if (gcc->o_base) e_gadcon_layout_pack_options_set(gcc->o_base, gcc); + e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll); + e_gadcon_client_resizable_set(gcc, cf_gcc->resizable); if (gcc->client_class->func.orient) gcc->client_class->func.orient(gcc, gc->orient); @@ -540,7 +538,7 @@ { Eina_List *l; int horiz = 0; - + E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); if (gc->orient == orient) return; @@ -574,7 +572,7 @@ for (l = gc->clients; l; l = l->next) { E_Gadcon_Client *gcc; - + gcc = l->data; e_box_orientation_set(gcc->o_box, horiz); if (gcc->client_class->func.orient) @@ -587,7 +585,7 @@ e_gadcon_edit_begin(E_Gadcon *gc) { Eina_List *l; - + E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); e_gadcon_layout_freeze(gc->o_container); @@ -596,7 +594,7 @@ for (l = gc->clients; l; l = l->next) { E_Gadcon_Client *gcc; - + gcc = l->data; e_gadcon_client_edit_begin(gcc); } @@ -607,7 +605,7 @@ e_gadcon_edit_end(E_Gadcon *gc) { Eina_List *l; - + E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); e_gadcon_layout_freeze(gc->o_container); @@ -615,7 +613,7 @@ for (l = gc->clients; l; l = l->next) { E_Gadcon_Client *gcc; - + gcc = l->data; e_gadcon_client_edit_end(gcc); } @@ -627,11 +625,11 @@ e_gadcon_all_edit_begin(void) { Eina_List *l; - + for (l = gadcons; l; l = l->next) { E_Gadcon *gc; - + gc = l->data; e_gadcon_edit_begin(gc); } @@ -641,11 +639,11 @@ e_gadcon_all_edit_end(void) { Eina_List *l; - + for (l = gadcons; l; l = l->next) { E_Gadcon *gc; - + gc = l->data; e_gadcon_edit_end(gc); } @@ -703,9 +701,8 @@ } EAPI void -e_gadcon_util_lock_func_set(E_Gadcon *gc, - void (*func) (void *data, int lock), - void *data) +e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func) (void *data, int lock), + void *data) { E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); @@ -714,8 +711,7 @@ } EAPI void -e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, - void (*func) (void *data), +e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func) (void *data), void *data) { E_OBJECT_CHECK(gc); @@ -791,16 +787,16 @@ EAPI E_Config_Gadcon_Client * e_gadcon_client_config_new(E_Gadcon *gc, const char *name) { - E_Gadcon_Client_Class *cc; + E_Gadcon_Client_Class *cc; E_Config_Gadcon_Client *cf_gcc; E_OBJECT_CHECK_RETURN(gc, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); if (!name) return NULL; - cc = eina_hash_find(providers, name); if (!cc) return NULL; - if (!_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)) return NULL; + if (!_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)) + return NULL; cf_gcc = E_NEW(E_Config_Gadcon_Client, 1); if (!cf_gcc) return NULL; @@ -821,7 +817,6 @@ e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc) { if (!cf_gcc) return; - if (cf_gcc->name) eina_stringshare_del(cf_gcc->name); if (cf_gcc->id) eina_stringshare_del(cf_gcc->id); if (cf_gcc->style) eina_stringshare_del(cf_gcc->style); @@ -833,10 +828,11 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj) { E_Gadcon_Client *gcc; - + E_OBJECT_CHECK_RETURN(gc, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); - gcc = E_OBJECT_ALLOC(E_Gadcon_Client, E_GADCON_CLIENT_TYPE, _e_gadcon_client_free); + gcc = E_OBJECT_ALLOC(E_Gadcon_Client, E_GADCON_CLIENT_TYPE, + _e_gadcon_client_free); if (!gcc) return NULL; gcc->name = eina_stringshare_add(name); gcc->gadcon = gc; @@ -914,12 +910,10 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) { Evas_Coord x, y, w, h; - + E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); - if (gcc->o_control) return; - e_gadcon_locked_set(gcc->gadcon, 1); gcc->gadcon->editing = 1; gcc->o_control = edje_object_add(gcc->gadcon->evas); @@ -931,7 +925,8 @@ else return; /* make clang happy */ evas_object_move(gcc->o_control, x, y); evas_object_resize(gcc->o_control, w, h); - e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", "e/gadman/control"); + e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", + "e/gadman/control"); if ((gcc->autoscroll) || (gcc->resizable)) { @@ -946,7 +941,7 @@ edje_object_signal_emit(gcc->o_control, "e,state,vsize,off", "e"); } edje_object_signal_emit(gcc->o_control, "e,state,move,on", "e"); - + gcc->o_event = evas_object_rectangle_add(gcc->gadcon->evas); evas_object_color_set(gcc->o_event, 0, 0, 0, 0); evas_object_repeat_events_set(gcc->o_event, 1); @@ -984,23 +979,31 @@ _e_gadcon_cb_signal_resize_right_stop, gcc); edje_object_signal_callback_add(gcc->o_control, "e,action,resize,down,go", "", _e_gadcon_cb_signal_resize_right_go, gcc); - - evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_DOWN, _e_gadcon_cb_client_mouse_down, gcc); - evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_UP, _e_gadcon_cb_client_mouse_up, gcc); - evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_IN, _e_gadcon_cb_client_mouse_in, gcc); - evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_OUT, _e_gadcon_cb_client_mouse_out, gcc); + evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_DOWN, + _e_gadcon_cb_client_mouse_down, gcc); + evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_UP, + _e_gadcon_cb_client_mouse_up, gcc); + evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_IN, + _e_gadcon_cb_client_mouse_in, gcc); + evas_object_event_callback_add(gcc->o_event, EVAS_CALLBACK_MOUSE_OUT, + _e_gadcon_cb_client_mouse_out, gcc); + if (gcc->o_frame) { - evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move, gcc); - evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize, gcc); + evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOVE, + _e_gadcon_cb_client_move, gcc); + evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_RESIZE, + _e_gadcon_cb_client_resize, gcc); } else if (gcc->o_base) { - evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move, gcc); - evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize, gcc); + evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOVE, + _e_gadcon_cb_client_move, gcc); + evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_RESIZE, + _e_gadcon_cb_client_resize, gcc); } - + evas_object_show(gcc->o_event); evas_object_show(gcc->o_control); } @@ -1012,18 +1015,22 @@ E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); - + if (gcc->o_frame) { - evas_object_event_callback_del(gcc->o_frame, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move); - evas_object_event_callback_del(gcc->o_frame, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize); + evas_object_event_callback_del(gcc->o_frame, EVAS_CALLBACK_MOVE, + _e_gadcon_cb_client_move); + evas_object_event_callback_del(gcc->o_frame, EVAS_CALLBACK_RESIZE, + _e_gadcon_cb_client_resize); } else if (gcc->o_base) { - evas_object_event_callback_del(gcc->o_base, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move); - evas_object_event_callback_del(gcc->o_base, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize); + evas_object_event_callback_del(gcc->o_base, EVAS_CALLBACK_MOVE, + _e_gadcon_cb_client_move); + evas_object_event_callback_del(gcc->o_base, EVAS_CALLBACK_RESIZE, + _e_gadcon_cb_client_resize); } - + if (gcc->moving) { gcc->moving = 0; @@ -1033,13 +1040,12 @@ gcc->o_event = NULL; if (gcc->o_control) evas_object_del(gcc->o_control); gcc->o_control = NULL; - + for (l = gcc->gadcon->clients; l; l = l->next) { E_Gadcon_Client *client = NULL; - - client = l->data; - if (!client) continue; + + if (!(client = l->data)) continue; if (client->o_control) return; } gcc->gadcon->editing = 0; @@ -1131,7 +1137,8 @@ if ((!gcc->autoscroll) && (!gcc->resizable)) { if (gcc->o_frame) - e_gadcon_layout_pack_min_size_set(gcc->o_frame, w + gcc->pad.w, h + gcc->pad.h); + e_gadcon_layout_pack_min_size_set(gcc->o_frame, w + gcc->pad.w, + h + gcc->pad.h); else if (gcc->o_base) e_gadcon_layout_pack_min_size_set(gcc->o_base, w, h); } @@ -1149,7 +1156,8 @@ { if (gcc->o_frame) { - e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, gcc->pad.h); + e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, + gcc->pad.h); e_gadcon_layout_pack_aspect_set(gcc->o_frame, w, h); } else if (gcc->o_base) @@ -1163,13 +1171,14 @@ { E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); - + gcc->autoscroll = autoscroll; if (gcc->autoscroll) { if (gcc->o_frame) { - e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, gcc->pad.h); + e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, + gcc->pad.h); e_gadcon_layout_pack_aspect_set(gcc->o_frame, 0, 0); e_gadcon_layout_pack_min_size_set(gcc->o_frame, 0, 0); } @@ -1183,14 +1192,19 @@ { if (gcc->o_frame) { - e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, gcc->pad.h); - e_gadcon_layout_pack_aspect_set(gcc->o_frame, gcc->aspect.w, gcc->aspect.h); - e_gadcon_layout_pack_min_size_set(gcc->o_frame, gcc->min.w, gcc->min.h); + e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, + gcc->pad.h); + e_gadcon_layout_pack_aspect_set(gcc->o_frame, gcc->aspect.w, + gcc->aspect.h); + e_gadcon_layout_pack_min_size_set(gcc->o_frame, gcc->min.w, + gcc->min.h); } else if (gcc->o_base) { - e_gadcon_layout_pack_min_size_set(gcc->o_base, gcc->min.w, gcc->min.h); - e_gadcon_layout_pack_aspect_set(gcc->o_base, gcc->aspect.w, gcc->aspect.h); + e_gadcon_layout_pack_min_size_set(gcc->o_base, gcc->min.w, + gcc->min.h); + e_gadcon_layout_pack_aspect_set(gcc->o_base, gcc->aspect.w, + gcc->aspect.h); } } } @@ -1200,13 +1214,14 @@ { E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); - + gcc->resizable = resizable; if (gcc->resizable) { if (gcc->o_frame) { - e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, gcc->pad.h); + e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, + gcc->pad.h); e_gadcon_layout_pack_aspect_set(gcc->o_frame, 0, 0); e_gadcon_layout_pack_min_size_set(gcc->o_frame, 0, 0); } @@ -1220,14 +1235,19 @@ { if (gcc->o_frame) { - e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, gcc->pad.h); - e_gadcon_layout_pack_aspect_set(gcc->o_frame, gcc->aspect.w, gcc->aspect.h); - e_gadcon_layout_pack_min_size_set(gcc->o_frame, gcc->min.w, gcc->min.h); + e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, + gcc->pad.h); + e_gadcon_layout_pack_aspect_set(gcc->o_frame, gcc->aspect.w, + gcc->aspect.h); + e_gadcon_layout_pack_min_size_set(gcc->o_frame, gcc->min.w, + gcc->min.h); } else if (gcc->o_base) { - e_gadcon_layout_pack_min_size_set(gcc->o_base, gcc->min.w, gcc->min.h); - e_gadcon_layout_pack_aspect_set(gcc->o_base, gcc->aspect.w, gcc->aspect.h); + e_gadcon_layout_pack_min_size_set(gcc->o_base, gcc->min.w, + gcc->min.h); + e_gadcon_layout_pack_aspect_set(gcc->o_base, gcc->aspect.w, + gcc->aspect.h); } } } @@ -1240,12 +1260,9 @@ E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); if (!e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gx, &gy, NULL, NULL)) return 0; - - if (gcc->o_base) - evas_object_geometry_get(gcc->o_base, x, y, w, h); + if (gcc->o_base) evas_object_geometry_get(gcc->o_base, x, y, w, h); if (x) *x += gx; if (y) *y += gy; - return 1; } @@ -1262,7 +1279,7 @@ { E_Menu *mn; E_Menu_Item *mi; - + E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); @@ -1277,7 +1294,7 @@ if ((gcc->style) && (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_PLAIN))) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_plain, gcc); - + mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Inset")); e_util_menu_item_theme_icon_set(mi, "enlightenment/inset"); @@ -1311,7 +1328,7 @@ mi = e_menu_item_new(menu); e_menu_item_separator_set(mi, 1); - + if (!gcc->o_control) { mi = e_menu_item_new(menu); @@ -1329,7 +1346,6 @@ { mi = e_menu_item_new(menu); e_menu_item_separator_set(mi, 1); - gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, gcc, menu); } } @@ -1363,9 +1379,7 @@ e_gadcon_locked_set(E_Gadcon *gc, int lock) { if (gc->locked_set.func) - { - gc->locked_set.func(gc->locked_set.data, lock); - } + gc->locked_set.func(gc->locked_set.data, lock); } EAPI void @@ -1385,7 +1399,7 @@ { Evas_Coord w, h; double d; - + evas_object_geometry_get(gcc->o_box, NULL, NULL, &w, &h); if (e_box_orientation_get(gcc->o_box)) { @@ -1416,6 +1430,50 @@ gcc->scroll_cb.data = data; } +EAPI Eina_Bool +e_gadcon_site_is_shelf(E_Gadcon_Site site) +{ + return (site == E_GADCON_SITE_SHELF); +} + +EAPI Eina_Bool +e_gadcon_site_is_desktop(E_Gadcon_Site site) +{ + return (site == E_GADCON_SITE_DESKTOP); +} + +EAPI Eina_Bool +e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site) +{ + return (site == E_GADCON_SITE_EFM_TOOLBAR); +} + +EAPI Eina_Bool +e_gadcon_site_is_any_toolbar(E_Gadcon_Site site) +{ + switch (site) + { + // there should be all toolbar sities identifiers + case E_GADCON_SITE_TOOLBAR: + case E_GADCON_SITE_EFM_TOOLBAR: + return EINA_TRUE; + } + return EINA_FALSE; +} + +EAPI Eina_Bool +e_gadcon_site_is_not_toolbar(E_Gadcon_Site site) +{ + switch (site) + { + // there should be all toolbar sities identifiers + case E_GADCON_SITE_TOOLBAR: + case E_GADCON_SITE_EFM_TOOLBAR: + return EINA_FALSE; + } + return EINA_TRUE; +} + /* local subsystem functions */ static void _e_gadcon_free(E_Gadcon *gc) @@ -1465,9 +1523,9 @@ static void _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc) { - Evas_Coord x, y, w, h; - - evas_object_geometry_get(gcc->o_box, &x, &y, &w, &h); + Evas_Coord w, h; + + evas_object_geometry_get(gcc->o_box, NULL, NULL, &w, &h); if ((gcc->autoscroll) || (gcc->resizable)) { if (e_box_orientation_get(gcc->o_box)) @@ -1496,7 +1554,7 @@ { E_Gadcon_Client *gcc; double d, v; - + gcc = data; d = gcc->scroll_wanted - gcc->scroll_pos; if (d < 0) d = -d; @@ -1515,7 +1573,7 @@ _e_gadcon_cb_client_scroll_animator(void *data) { E_Gadcon_Client *gcc; - + gcc = data; if (e_box_orientation_get(gcc->o_box)) e_box_align_set(gcc->o_box, 1.0 - gcc->scroll_pos, 0.5); @@ -1539,7 +1597,7 @@ Evas_Event_Mouse_Move *ev; E_Gadcon_Client *gcc; Evas_Coord x, y; - + ev = event_info; gcc = data; evas_object_geometry_get(gcc->o_box, &x, &y, NULL, NULL); @@ -1551,7 +1609,7 @@ _e_gadcon_cb_client_frame_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info) { E_Gadcon_Client *gcc; - + gcc = data; _e_gadcon_moveresize_handle(gcc); } @@ -1623,9 +1681,9 @@ static void _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y) { - Eina_List *l; - Evas_Coord cx, cy, cw, ch; - int seq = 1; + Eina_List *l; + Evas_Coord cx, cy, cw, ch; + int seq = 1; /* Check if the gadcon client is in place */ if (!gcc->hidden) @@ -1691,12 +1749,12 @@ _e_gadcon_cb_min_size_request(void *data, Evas_Object *obj, void *event_info) { E_Gadcon *gc; - + gc = data; if (gc->min_size_request.func) { Evas_Coord w, h; - + e_gadcon_layout_min_size_get(gc->o_container, &w, &h); gc->min_size_request.func(gc->min_size_request.data, gc, w, h); } @@ -1705,8 +1763,8 @@ static void _e_gadcon_cb_size_request(void *data, Evas_Object *obj, void *event_info) { - E_Gadcon *gc; - + E_Gadcon *gc; + gc = data; if (gc->resize_request.func) { @@ -1724,7 +1782,6 @@ Evas_Coord x, y, w, h; gc = data; - evas_object_geometry_get(gc->o_container, &x, &y, &w, &h); if (gc->drop_handler) e_drop_handler_geometry_set(gc->drop_handler, x, y, w, h); @@ -1735,7 +1792,7 @@ { Evas_Event_Mouse_Down *ev; E_Gadcon_Client *gcc; - + gcc = data; ev = event_info; if (ev->button == 3) @@ -1763,9 +1820,10 @@ mi = e_menu_item_new(mn); e_menu_item_separator_set(mi, 1); - gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, gcc, mn); + gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, + gcc, mn); } - + if (gcc->gadcon->toolbar) ecore_x_pointer_xy_get(zone->container->win, &cx, &cy); else @@ -1787,14 +1845,18 @@ static void _e_gadcon_cb_client_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info) { - E_Gadcon_Client *gcc = data; + E_Gadcon_Client *gcc; + + gcc = data; edje_object_signal_emit(gcc->o_control, "e,state,focused", "e"); } static void _e_gadcon_cb_client_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info) { - E_Gadcon_Client *gcc = data; + E_Gadcon_Client *gcc; + + gcc = data; edje_object_signal_emit(gcc->o_control, "e,state,unfocused", "e"); } @@ -1803,7 +1865,7 @@ { E_Gadcon_Client *gcc; Evas_Coord x, y; - + gcc = data; evas_object_geometry_get(obj, &x, &y, NULL, NULL); if (gcc->o_control) evas_object_move(gcc->o_control, x, y); @@ -1815,7 +1877,7 @@ { E_Gadcon_Client *gcc; Evas_Coord w, h; - + gcc = data; evas_object_geometry_get(obj, NULL, NULL, &w, &h); if (gcc->o_control) evas_object_resize(gcc->o_control, w, h); @@ -1837,8 +1899,7 @@ static void _e_gadcon_client_move_stop(E_Gadcon_Client *gcc) { - gcc->moving = 0; - + gcc->moving = 0; gcc->state_info.state = E_LAYOUT_ITEM_STATE_NONE; gcc->state_info.resist = 0; _e_gadcon_layout_smart_sync_clients(gcc->gadcon); @@ -1848,13 +1909,13 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc) { Evas_Coord x, y, w, h; - int cx, cy; - + int cx, cy; + if (!gcc->moving) return; evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy); x = cx - gcc->dx; y = cy - gcc->dy; - + gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; _e_gadcon_client_current_position_sync(gcc); if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container)) @@ -1898,7 +1959,6 @@ } } - if (gcc->o_frame) evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h); else if (gcc->o_base) @@ -1962,7 +2022,6 @@ _e_gadconclient_resize_stop(E_Gadcon_Client *gcc) { gcc->resizing = 0; - gcc->state_info.state = E_LAYOUT_ITEM_STATE_NONE; _e_gadcon_layout_smart_sync_clients(gcc->gadcon); _e_gadcon_client_save(gcc); @@ -1985,14 +2044,15 @@ { E_Gadcon_Client *gcc; Evas_Coord x, y, w, h; - + gcc = data; if (!gcc->resizing) return; evas_pointer_canvas_xy_get(gcc->gadcon->evas, &x, &y); x = x - gcc->dx; y = y - gcc->dy; - gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; + gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | + E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; if (gcc->o_frame) evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h); @@ -2033,8 +2093,7 @@ else if (gcc->o_base) e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h - y); evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h); - gcc->config.res = h; - + gcc->config.res = h; } gcc->dx += x; gcc->dy += y; @@ -2057,14 +2116,15 @@ { E_Gadcon_Client *gcc; Evas_Coord x, y, w, h; - + gcc = data; if (!gcc->resizing) return; evas_pointer_canvas_xy_get(gcc->gadcon->evas, &x, &y); x = x - gcc->dx; y = y - gcc->dy; - gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; + gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | + E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; if (gcc->o_frame) evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h); @@ -2139,8 +2199,8 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event) { E_Event_Dnd_Enter *ev; - E_Gadcon *gc; - E_Gadcon_Client *gcc; + E_Gadcon *gc; + E_Gadcon_Client *gcc; ev = event; gc = data; @@ -2150,7 +2210,7 @@ if (gcc->gadcon == gc) { /* We have re-entered the gadcon we left, revive gadcon client */ - Evas_Coord dx, dy; + Evas_Coord dx, dy; Evas_Object *o; if (e_gadcon_layout_orientation_get(gc->o_container)) @@ -2185,11 +2245,11 @@ if (!gcc->style) { new_gcc = cc->func.init(gc, gcc->name, gcc->cf->id, - cc->default_style); + cc->default_style); } else new_gcc = cc->func.init(gc, gcc->name, gcc->cf->id, - gcc->style); + gcc->style); if (new_gcc) { @@ -2226,8 +2286,8 @@ _e_gadcon_cb_dnd_move(void *data, const char *type, void *event) { E_Event_Dnd_Move *ev; - E_Gadcon *gc; - E_Gadcon_Client *gcc = NULL; + E_Gadcon *gc; + E_Gadcon_Client *gcc = NULL; ev = event; gc = data; @@ -2238,7 +2298,7 @@ else if (new_gcc->gadcon == gc) gcc = new_gcc; if (gcc) { - Evas_Coord dx, dy; + Evas_Coord dx, dy; Evas_Object *o; if (gcc->state_info.resist > 0) @@ -2261,9 +2321,11 @@ if (o) { if (e_gadcon_layout_orientation_get(gc->o_container)) - e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size); + e_gadcon_layout_pack_request_set(o, gcc->config.pos, + gcc->config.size); else - e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size); + e_gadcon_layout_pack_request_set(o, gcc->config.pos, + gcc->config.size); } e_gadcon_layout_thaw(gc->o_container); } @@ -2272,8 +2334,9 @@ static void _e_gadcon_cb_dnd_leave(void *data, const char *type, void *event) { - E_Gadcon *gc = data; + E_Gadcon *gc; + gc = data; /* If we exit the starting container hide the gadcon visual */ if (drag_gcc->gadcon == gc) e_gadcon_client_hide(drag_gcc); @@ -2288,9 +2351,10 @@ static void _e_gadcon_cb_drop(void *data, const char *type, void *event) { - E_Gadcon *gc = data; - E_Gadcon_Client *gcc = NULL; + E_Gadcon *gc; + E_Gadcon_Client *gcc = NULL; + gc = data; if (drag_gcc->gadcon == gc) gcc = drag_gcc; else if ((new_gcc) && (new_gcc->gadcon == gc)) gcc = new_gcc; else return; /* make clang happy */ @@ -2319,10 +2383,8 @@ { E_Gadcon_Client *gcc; - gcc = data; - if (!gcc) return; - if (gcc->gadcon) - e_gadcon_locked_set(gcc->gadcon, 0); + if (!(gcc = data)) return; + if (gcc->gadcon) e_gadcon_locked_set(gcc->gadcon, 0); if (!gcc->menu) return; e_object_del(E_OBJECT(gcc->menu)); gcc->menu = NULL; @@ -2332,7 +2394,7 @@ _e_gadcon_client_cb_instant_edit_timer(void *data) { E_Gadcon_Client *gcc; - + gcc = data; e_gadcon_client_edit_begin(gcc); _e_gadcon_client_move_start(gcc); @@ -2345,10 +2407,9 @@ { Evas_Event_Mouse_Down *ev; E_Gadcon_Client *gcc; - + ev = event_info; gcc = data; - if (gcc->menu) return; if (ev->button == 3) { @@ -2363,7 +2424,6 @@ gcc->menu = mn; e_gadcon_client_util_menu_items_append(gcc, mn, 0); - e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch); zone = gcc->gadcon->zone; if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); @@ -2376,7 +2436,8 @@ { if ((!gcc->o_control) && (gcc->gadcon->instant_edit)) { - if (gcc->instant_edit_timer) ecore_timer_del(gcc->instant_edit_timer); + if (gcc->instant_edit_timer) + ecore_timer_del(gcc->instant_edit_timer); gcc->instant_edit_timer = ecore_timer_add(1.0, _e_gadcon_client_cb_instant_edit_timer, gcc); @@ -2389,10 +2450,9 @@ { Evas_Event_Mouse_Up *ev; E_Gadcon_Client *gcc; - + ev = event_info; gcc = data; - if ((ev->button == 1) && (gcc->gadcon->instant_edit)) { if (gcc->instant_edit_timer) @@ -2402,7 +2462,6 @@ } if (gcc->o_control) { - printf("EDIT END\n"); _e_gadcon_client_move_stop(gcc); e_gadcon_client_edit_end(gcc); } @@ -2412,12 +2471,12 @@ static void _e_gadcon_client_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) { - E_Gadcon_Client *gcc = data; + E_Gadcon_Client *gcc; + gcc = data; if ((gcc->gadcon->instant_edit)) { - if (gcc->o_control) - _e_gadcon_client_move_go(gcc); + if (gcc->o_control) _e_gadcon_client_move_go(gcc); } } @@ -2426,7 +2485,7 @@ { E_Gadcon_Client *gcc; E_Gadcon *gc; - + gcc = data; gc = gcc->gadcon; if (gcc->style) eina_stringshare_del(gcc->style); @@ -2441,7 +2500,7 @@ { E_Gadcon_Client *gcc; E_Gadcon *gc; - + gcc = data; gc = gcc->gadcon; if (gcc->style) eina_stringshare_del(gcc->style); @@ -2469,7 +2528,7 @@ _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi) { E_Gadcon_Client *gcc; - + gcc = data; e_gadcon_layout_freeze(gcc->gadcon->o_container); if (gcc->resizable) gcc->resizable = 0; @@ -2483,7 +2542,7 @@ _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { E_Gadcon_Client *gcc; - + gcc = data; if (gcc->o_control) e_gadcon_client_edit_end(gcc); @@ -2527,41 +2586,41 @@ struct _E_Smart_Data { - Evas_Coord x, y, w, h; - Evas_Object *obj; - Evas_Object *clip; - unsigned char horizontal : 1; - unsigned char doing_config : 1; - unsigned char redo_config : 1; - Eina_List *items; - int frozen; - Evas_Coord minw, minh, req; + Evas_Coord x, y, w, h; + Evas_Object *obj, *clip; + unsigned char horizontal : 1; + unsigned char doing_config : 1; + unsigned char redo_config : 1; + Eina_List *items; + int frozen; + Evas_Coord minw, minh, req; }; struct _E_Gadcon_Layout_Item { - E_Smart_Data *sd; - struct { - int pos, size, size2, res, prev_pos, prev_size; - } ask; - int hookp; - struct { - int w, h; - } min, aspect, aspect_pad; + E_Smart_Data *sd; + struct + { + int pos, size, size2, res, prev_pos, prev_size; + } ask; + int hookp; + struct + { + int w, h; + } min, aspect, aspect_pad; E_Gadcon_Client *gcc; - Evas_Coord x, y, w, h; - Evas_Object *obj; - unsigned char can_move : 1; + Evas_Coord x, y, w, h; + Evas_Object *obj; + unsigned char can_move : 1; }; /* local subsystem functions */ static E_Gadcon_Layout_Item *_e_gadcon_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj); -static void _e_gadcon_layout_smart_disown(Evas_Object *obj); -static void _e_gadcon_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd); - +static void _e_gadcon_layout_smart_disown(Evas_Object *obj); +static void _e_gadcon_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd); static void _e_gadcon_layout_smart_init(void); static void _e_gadcon_layout_smart_add(Evas_Object *obj); static void _e_gadcon_layout_smart_del(Evas_Object *obj); @@ -2572,10 +2631,8 @@ static void _e_gadcon_layout_smart_color_set(Evas_Object *obj, int r, int g, int b, int a); static void _e_gadcon_layout_smart_clip_set(Evas_Object *obj, Evas_Object *clip); static void _e_gadcon_layout_smart_clip_unset(Evas_Object *obj); - static void _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino, int *cur); -void _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur); - +static void _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur); static int _e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2); static int _e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2); @@ -2596,7 +2653,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; if (((sd->horizontal) && (horizontal)) || @@ -2611,7 +2667,6 @@ E_Smart_Data *sd; if (!obj) return 0; - sd = evas_object_smart_data_get(obj); if (!sd) return 0; return sd->horizontal; @@ -2623,7 +2678,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; sd->frozen++; @@ -2635,7 +2689,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; sd->frozen--; @@ -2651,10 +2704,8 @@ Evas_Coord tw = 0, th = 0; */ if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; - if (w) *w = sd->minw; if (h) *h = sd->minh; @@ -2689,10 +2740,8 @@ Evas_Coord tw = 0, th = 0; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; - if (sd->horizontal) tw = sd->req; else @@ -2725,7 +2774,6 @@ E_Smart_Data *sd; if (!obj) return 0; - sd = evas_object_smart_data_get(obj); if (!sd) return 0; _e_gadcon_layout_smart_adopt(sd, child); @@ -2746,24 +2794,27 @@ int xx; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; xx = bi->ask.pos + (bi->ask.size / 2); if (xx < (bi->ask.res / 3)) - { /* hooked to start */ + { + /* hooked to start */ bi->ask.size = size; } else if (xx > ((2 * bi->ask.res) / 3)) - { /* hooked to end */ + { + /* hooked to end */ bi->ask.pos = (bi->ask.pos + bi->ask.size) - size; bi->ask.size = size; } else - { /* hooked to middle */ + { + /* hooked to middle */ if ((bi->ask.pos <= (bi->ask.res / 2)) && ((bi->ask.pos + bi->ask.size) > (bi->ask.res / 2))) - { /* straddles middle */ + { + /* straddles middle */ if (bi->ask.res > 2) bi->ask.pos = (bi->ask.res / 2) + (((bi->ask.pos + (bi->ask.size / 2) - @@ -2796,7 +2847,6 @@ E_Gadcon_Layout_Item *bi; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; if (bi->sd->horizontal) @@ -2819,7 +2869,6 @@ E_Gadcon_Layout_Item *bi, *bi2; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; bi->ask.res = gcc->config.res; @@ -2828,15 +2877,13 @@ bi->gcc = gcc; ok = 0; - if (!gcc->state_info.seq) - ok = 1; + if (!gcc->state_info.seq) ok = 1; seq = 1; for (l = bi->sd->items; l; l = l->next) { bi2 = evas_object_data_get(l->data, "e_gadcon_layout_data"); if (bi == bi2) continue; - if (bi->gcc->state_info.seq == bi2->gcc->state_info.seq) ok = 1; @@ -2859,7 +2906,6 @@ E_Gadcon_Layout_Item *bi; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; bi->min.w = w; @@ -2873,7 +2919,6 @@ E_Gadcon_Layout_Item *bi; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; bi->aspect.w = w; @@ -2887,7 +2932,6 @@ E_Gadcon_Layout_Item *bi; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; bi->aspect_pad.w = w; @@ -2901,7 +2945,6 @@ E_Smart_Data *sd; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; sd = bi->sd; @@ -2918,7 +2961,6 @@ E_Gadcon_Layout_Item *bi; if (!obj) return NULL; - bi = calloc(1, sizeof(E_Gadcon_Layout_Item)); if (!bi) return NULL; bi->sd = sd; @@ -2941,7 +2983,6 @@ E_Gadcon_Layout_Item *bi; if (!obj) return; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) return; if (!bi->sd->items) @@ -2949,8 +2990,7 @@ if (evas_object_visible_get(bi->sd->clip)) evas_object_hide(bi->sd->clip); } - evas_object_event_callback_del(obj, - EVAS_CALLBACK_DEL, + evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _e_gadcon_layout_smart_item_del_hook); evas_object_smart_member_del(obj); evas_object_clip_unset(obj); @@ -2962,7 +3002,6 @@ _e_gadcon_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info) { if (!obj) return; - e_gadcon_layout_unpack(obj); } @@ -2975,8 +3014,7 @@ Eina_List *list = NULL; E_Gadcon_Layout_Item *bi; E_Layout_Item_Container *lc; - int i; - int set_prev_pos = 0; + int i, set_prev_pos = 0; if (sd->frozen) return; if (sd->doing_config) @@ -3026,7 +3064,8 @@ } _e_gadcon_layout_smart_gadcons_width_adjust(sd, min, cur); - if (((sd->horizontal) && (sd->w <= sd->req)) || ((!sd->horizontal) && (sd->h <= sd->req))) + if (((sd->horizontal) && (sd->w <= sd->req)) || + ((!sd->horizontal) && (sd->h <= sd->req))) { _e_gadcon_layout_smart_gadcon_position_shrinked_mode(sd); set_prev_pos = 0; @@ -3048,14 +3087,12 @@ set_prev_pos = 1; } - sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), _e_gadcon_layout_smart_sort_by_position_cb); for (l = sd->items, i = 1; l; l = l->next, i++) { bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); - if (bi->gcc->gadcon->editing) - bi->gcc->state_info.seq = i; + if (bi->gcc->gadcon->editing) bi->gcc->state_info.seq = i; if (set_prev_pos) { @@ -3091,12 +3128,12 @@ bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; } } - + for (l = sd->items; l; l = l->next) { E_Gadcon_Layout_Item *bi; Evas_Object *obj; - + obj = l->data; bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) continue; @@ -3168,10 +3205,7 @@ _e_gadcon_layout_smart_color_set, _e_gadcon_layout_smart_clip_set, _e_gadcon_layout_smart_clip_unset, - NULL, - NULL, - NULL, - NULL + NULL, NULL, NULL, NULL }; _e_smart = evas_smart_class_new(&sc); } @@ -3183,7 +3217,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = calloc(1, sizeof(E_Smart_Data)); if (!sd) return; sd->obj = obj; @@ -3206,13 +3239,12 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; while (sd->items) { Evas_Object *child; - + child = sd->items->data; e_gadcon_layout_unpack(child); } @@ -3226,20 +3258,19 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; if ((x == sd->x) && (y == sd->y)) return; { Eina_List *l; Evas_Coord dx, dy; - + dx = x - sd->x; dy = y - sd->y; for (l = sd->items; l; l = l->next) { Evas_Coord ox, oy; - + evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL); evas_object_move(l->data, ox + dx, oy + dy); } @@ -3254,7 +3285,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; if ((w == sd->w) && (h == sd->h)) return; @@ -3269,7 +3299,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; if (sd->items) evas_object_show(sd->clip); @@ -3281,7 +3310,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_hide(sd->clip); @@ -3293,7 +3321,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_color_set(sd->clip, r, g, b, a); @@ -3305,7 +3332,6 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_clip_set(sd->clip, clip); @@ -3317,13 +3343,11 @@ E_Smart_Data *sd; if (!obj) return; - sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_clip_unset(sd->clip); } - /* * @min - the minimum width required by all the gadcons * @cur - the current width required by all the gadcons @@ -3404,7 +3428,6 @@ bi = evas_object_data_get(d1, "e_gadcon_layout_data"); bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); - if (bi->sd->horizontal) { if (bi->ask.size2 > bi->min.w) @@ -3502,15 +3525,14 @@ return 0; } -void +static void _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur) { E_Gadcon_Layout_Item *bi2 = NULL; E_Gadcon_Layout_Item *bi = NULL; Eina_List *l, *l2; int need, limit, reduce_total, reduce; - int max_size; - int c; + int max_size, c; if (sd->horizontal) { @@ -3541,7 +3563,7 @@ } sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), - _e_gadcon_layout_smart_width_smart_sort_reverse_cb); + _e_gadcon_layout_smart_width_smart_sort_reverse_cb); __adjust_size_again: for (l = sd->items, c = 0; l; l = l->next) @@ -3550,7 +3572,7 @@ { bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); bi2 = evas_object_data_get(l->next->data, "e_gadcon_layout_data"); - + if (bi->ask.size2 > bi2->ask.size2) { limit = bi2->ask.size2; @@ -3561,14 +3583,13 @@ } } - if (eina_list_count(sd->items) == 1) - c = 1; - + if (eina_list_count(sd->items) == 1) c = 1; + if (l) { reduce = bi->ask.size2 - limit; reduce_total = reduce * c; - + if (reduce_total <= need) { for (l2 = l; l2; l2 = l2->prev) @@ -3583,7 +3604,7 @@ else { int reduce_by, c2; - + while (need) { reduce_by = 1; @@ -3607,7 +3628,7 @@ else { int reduce_by, c2; - + while (need) { reduce_by = 1; @@ -3640,7 +3661,6 @@ if ((!bi->gcc->state_info.seq) && (!bi2->gcc->state_info.seq)) return 0; else if (!bi->gcc->state_info.seq) return 1; else if (!bi2->gcc->state_info.seq) return -1; - return bi->gcc->state_info.seq - bi2->gcc->state_info.seq; } @@ -3651,9 +3671,7 @@ bi = evas_object_data_get(d1, "e_gadcon_layout_data"); bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); - - if (bi->sd->horizontal) - return (bi->x - bi2->x); + if (bi->sd->horizontal) return (bi->x - bi2->x); return (bi->y - bi2->y); } @@ -3664,10 +3682,8 @@ lc = d1; lc2 = d2; - if (lc->pos < lc2->pos) return -1; else if (lc->pos > lc2->pos) return 1; - return 0; } @@ -3678,7 +3694,6 @@ bi = d1; bi2 = d2; - return (bi->gcc->state_info.seq - bi2->gcc->state_info.seq); } @@ -3745,7 +3760,7 @@ tp = l->next->data; l->next->data = l->data; l->data = tp; - + bi2 = evas_object_data_get(tp, "e_gadcon_layout_data"); bi->gcc->config.pos = bi->ask.pos = bi2->ask.pos; bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; @@ -3771,10 +3786,10 @@ { E_Gadcon_Layout_Item *bi2; void *tp; + tp = l->prev->data; l->prev->data = l->data; l->data = tp; - bi2 = evas_object_data_get(tp, "e_gadcon_layout_data"); bi->gcc->config.pos = bi->ask.pos = bi2->ask.pos; bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE; @@ -3808,7 +3823,7 @@ bi->gcc->config.pos = bi->gcc->state_info.prev_pos; } } - + for (l = sd->items; l; l = l->next) { bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); @@ -3862,22 +3877,26 @@ { xx = bi->ask.pos + (bi->ask.size / 2); if (xx < (bi->ask.res / 3)) - { /* hooked to start */ + { + /* hooked to start */ bi->x = bi->ask.pos; bi->w = bi->ask.size2; bi->hookp = 0; } else if (xx > ((2 * bi->ask.res) / 3)) - { /* hooked to end */ + { + /* hooked to end */ bi->x = (bi->ask.pos - bi->ask.res) + sd->w; bi->w = bi->ask.size2; bi->hookp = bi->ask.res; } else - { /* hooked to middle */ + { + /* hooked to middle */ if ((bi->ask.pos <= (bi->ask.res / 2)) && ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2))) - { /* straddles middle */ + { + /* straddles middle */ if (bi->ask.res > 2) bi->x = (sd->w / 2) + (((bi->ask.pos + (bi->ask.size2 / 2) - @@ -3889,7 +3908,8 @@ bi->w = bi->ask.size2; } else - { /* either side of middle */ + { + /* either side of middle */ bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (sd->w / 2); bi->w = bi->ask.size2; } @@ -3900,22 +3920,26 @@ { yy = bi->ask.pos + (bi->ask.size2 / 2); if (yy < (bi->ask.res / 3)) - { /* hooked to start */ + { + /* hooked to start */ bi->y = bi->ask.pos; bi->h = bi->ask.size2; bi->hookp = 0; } else if (yy > ((2 * bi->ask.res) / 3)) - { /* hooked to end */ + { + /* hooked to end */ bi->y = (bi->ask.pos - bi->ask.res) + sd->h; bi->h = bi->ask.size2; bi->hookp = bi->ask.res; } else - { /* hooked to middle */ + { + /* hooked to middle */ if ((bi->ask.pos <= (bi->ask.res / 2)) && ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2))) - { /* straddles middle */ + { + /* straddles middle */ if (bi->ask.res > 2) bi->y = (sd->h / 2) + (((bi->ask.pos + (bi->ask.size2 / 2) - @@ -3927,7 +3951,8 @@ bi->h = bi->ask.size2; } else - { /* either side of middle */ + { + /* either side of middle */ bi->y = (bi->ask.pos - (bi->ask.res / 2)) + (sd->h / 2); bi->h = bi->ask.size2; } @@ -3984,7 +4009,7 @@ E_Layout_Item_Container *lc_moving = NULL, *lc_back, *lc, *lc3; E_Gadcon_Layout_Item *bi, *bi_moving; - if (!list || !*list) return; + if ((!list) || (!*list)) return; for (l = *list; l; l = l->next) { @@ -4068,11 +4093,10 @@ if (!ok) { int pos, prev_pos, stop; - for (l = *list; (l) && (l->data != lc_moving); l = l->next); + for (l = *list; (l) && (l->data != lc_moving); l = l->next); pos = lc_moving->pos + lc_moving->size; prev_pos = lc_moving_prev_pos; - if ((l) && (l->next)) { stop = 0; @@ -4269,7 +4293,7 @@ { if (!l2) l2 = *list; else l2 = l2->next; - + for (; l2 != l; l2 = l2->next) { lc = l2->data; @@ -4558,6 +4582,7 @@ (lc2->state_info.min_seq < lc->state_info.max_seq))) { int shift = 0; + _e_gadcon_layout_smart_containers_merge(sd, lc, lc2); for (l = lc->items; l; l = l->next) @@ -4686,6 +4711,7 @@ { int move_lc1 = 1; int move_lc2 = 1; + for (l = lc->items; l; l = l->next) { bi = l->data; @@ -4757,6 +4783,7 @@ (lc2->state_info.min_seq < lc->state_info.max_seq))) { int shift = 0; + _e_gadcon_layout_smart_containers_merge(sd, lc, lc2); for (l = lc->items; l; l = l->next) @@ -4951,7 +4978,6 @@ bi->w = (*lc_moving)->prev_size; else bi->h = (*lc_moving)->prev_size; - } _e_gadcon_layout_smart_position_items_inside_container(sd, (*lc_moving)); (*lc_moving)->state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED; @@ -5048,7 +5074,7 @@ } *lc_moving = lc_back; _e_gadcon_layout_smart_position_items_inside_container(sd, *lc_moving); - + if (((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC) && ((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC)) { @@ -5143,49 +5169,3 @@ populate_idler = NULL; } } - -EAPI Eina_Bool -e_gadcon_site_is_shelf (E_Gadcon_Site site) -{ - return site == E_GADCON_SITE_SHELF; -} - -EAPI Eina_Bool -e_gadcon_site_is_desktop (E_Gadcon_Site site) -{ - return site == E_GADCON_SITE_DESKTOP; -} - -EAPI Eina_Bool -e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site) -{ - return site == E_GADCON_SITE_EFM_TOOLBAR; -} - -EAPI Eina_Bool -e_gadcon_site_is_any_toolbar(E_Gadcon_Site site) -{ - switch (site) - { - // there should be all toolbar sities identifiers - case E_GADCON_SITE_TOOLBAR: - case E_GADCON_SITE_EFM_TOOLBAR: - return EINA_TRUE; - } - - return EINA_FALSE; -} - -EAPI Eina_Bool -e_gadcon_site_is_not_toolbar(E_Gadcon_Site site) -{ - switch (site) - { - // there should be all toolbar sities identifiers - case E_GADCON_SITE_TOOLBAR: - case E_GADCON_SITE_EFM_TOOLBAR: - return EINA_FALSE; - } - - return EINA_TRUE; -} |
From: Enlightenment S. <no-...@en...> - 2009-07-04 19:15:41
|
Log: Fix comment spelling. Author: devilhorns Date: 2009-07-04 12:15:34 -0700 (Sat, 04 Jul 2009) New Revision: 41250 Modified: trunk/e/src/bin/e_hints.c Modified: trunk/e/src/bin/e_hints.c =================================================================== --- trunk/e/src/bin/e_hints.c 2009-07-04 16:58:44 UTC (rev 41249) +++ trunk/e/src/bin/e_hints.c 2009-07-04 19:15:34 UTC (rev 41250) @@ -57,7 +57,7 @@ /*ecore_x_netwm_supported(roots[supported_num], ECORE_X_ATOM_NET_DESKTOP_LAYOUT, 1);*/ /*ecore_x_netwm_supported(roots[supported_num], ECORE_X_ATOM_NET_SHOWING_DESKTOP, 1);*/ - /* Other Root Wsupported_numndow Messages */ + /* Other Root Window Messages */ /*ecore_x_netwm_supported(roots[supported_num], ECORE_X_ATOM_NET_CLOSE_WINDOW, 1);*/ /*ecore_x_netwm_supported(roots[supported_num], ECORE_X_ATOM_NET_MOVERESIZE_WINDOW, 1);*/ supported[supported_num++] = ECORE_X_ATOM_NET_WM_MOVERESIZE; |
From: Enlightenment S. <no-...@en...> - 2009-07-18 21:10:36
|
Log: Remove annoying printf. If you are using this to debug something, please use #if 0 around it. Author: devilhorns Date: 2009-07-18 14:10:27 -0700 (Sat, 18 Jul 2009) New Revision: 41422 Modified: trunk/e/src/bin/e_manager.c Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2009-07-18 15:58:44 UTC (rev 41421) +++ trunk/e/src/bin/e_manager.c 2009-07-18 21:10:27 UTC (rev 41422) @@ -164,7 +164,6 @@ /* a manager is designated for each root. lets get all the windows in the managers root */ - printf("--------BD DO!!!\n"); windows = ecore_x_window_children_get(man->root, &wnum); if (windows) { |
From: Enlightenment S. <no-...@en...> - 2009-07-19 02:24:29
|
Log: Fix minor typo in comment. Nothing serious. Author: devilhorns Date: 2009-07-18 19:24:12 -0700 (Sat, 18 Jul 2009) New Revision: 41425 Modified: trunk/e/src/bin/e_config.c Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2009-07-18 22:43:50 UTC (rev 41424) +++ trunk/e/src/bin/e_config.c 2009-07-19 02:24:12 UTC (rev 41425) @@ -112,7 +112,7 @@ /* check symlink - if default is a symlink to another dir */ e_prefix_data_concat_static(buf, "data/config/default"); link = ecore_file_readlink(buf); - /* if so use just the filename as the priofle - must be a local link */ + /* if so use just the filename as the profile - must be a local link */ if (link) { _e_config_profile = strdup(ecore_file_file_get(link)); |
From: Enlightenment S. <no-...@en...> - 2009-07-19 08:59:27
|
Log: Add missing eina_shutdown to E's main shutdown stack. Fix formatting. Remove Whitespace. Author: devilhorns Date: 2009-07-19 01:59:20 -0700 (Sun, 19 Jul 2009) New Revision: 41428 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2009-07-19 06:27:09 UTC (rev 41427) +++ trunk/e/src/bin/e_main.c 2009-07-19 08:59:20 UTC (rev 41428) @@ -142,16 +142,16 @@ TS("begin"); #if 0 - { + { stack_t ss; - + ss.ss_sp = malloc(8 * 1024); ss.ss_size = 8 * 1024; ss.ss_flags = 0; sigaltstack(&ss, NULL); } #endif - + /* trap deadly bug signals and allow some form of sane recovery */ /* or ability to gdb attach and debug at this point - better than your */ /* wm/desktop vanishing and not knowing what happened */ @@ -182,22 +182,19 @@ sigaction(SIGABRT, &action, NULL); TS("signals done"); - + t = ecore_time_get(); s = getenv("E_START_TIME"); if ((s) && (!getenv("E_RESTART_OK"))) { tstart = atof(s); - if ((t - tstart) < 5.0) - { - safe_mode = 1; - } + if ((t - tstart) < 5.0) safe_mode = 1; } - + tstart = t; snprintf(buf, sizeof(buf), "%1.1f", tstart); e_util_env_set("E_START_TIME", buf); - + /* FIXME: this is the init code for letting e be relocatable. right now * its not used - so i want to see if it can reliably determine its exe * prefix @@ -244,28 +241,30 @@ } } TS("prefix done"); - + /* for debugging by redirecting stdout of e to a log file to tail */ setvbuf(stdout, NULL, _IONBF, 0); - + if (getenv("E_RESTART")) after_restart = 1; - - if (getenv("DESKTOP_STARTUP_ID")) e_util_env_set("DESKTOP_STARTUP_ID", NULL); - + + if (getenv("DESKTOP_STARTUP_ID")) + e_util_env_set("DESKTOP_STARTUP_ID", NULL); + e_util_env_set("E_RESTART_OK", NULL); e_util_env_set("E_RESTART", "1"); - + /* envrionment varabiles so you know E is running/launched you */ e_util_env_set("PANTS", "ON"); e_util_env_set("DESKTOP", "Enlightenment-0.17.0"); TS("eina init"); eina_init(); + _e_main_shutdown_push(eina_shutdown); TS("intl init"); e_intl_init(); _e_main_shutdown_push(e_intl_shutdown); - + TS("parse args"); /* handle some command-line parameters */ for (i = 1; i < argc; i++) @@ -273,13 +272,12 @@ if ((!strcmp(argv[i], "-display")) && (i < (argc - 1))) { i++; - e_util_env_set("DISPLAY", argv[i]); } else if ((!strcmp(argv[i], "-fake-xinerama-screen")) && (i < (argc - 1))) { int x, y, w, h; - + i++; /* WWxHH+XX+YY */ if (sscanf(argv[i], "%ix%i+%i+%i", &w, &h, &x, &y) == 4) @@ -356,7 +354,7 @@ if (s) { char *p; - + p = strrchr(s, ':'); if (!p) { @@ -378,10 +376,9 @@ /* fixes for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */ { e_user_dir_concat_static(buf, "themes/default.edj"); - if (ecore_file_exists(buf)) - ecore_file_unlink(buf); + if (ecore_file_exists(buf)) ecore_file_unlink(buf); } - + TS("ecore init"); /* basic ecore init */ if (!ecore_init()) @@ -403,11 +400,11 @@ edje_init(); edje_freeze(); _e_main_shutdown_push(edje_shutdown); - + _e_cacheburst++; /* eet_cacheburst(_e_cacheburst); */ ecore_timer_add(5.0, _e_main_cb_eet_cacheburst_end, NULL); - + TS("ecore_file init"); /* init the file system */ if (!ecore_file_init()) @@ -417,10 +414,11 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(ecore_file_shutdown); - + TS("more ecore"); /* setup my args */ ecore_app_args_set(argc, (const char **)argv); + /* setup a handler for when e is asked to exit via a system signal */ if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _e_main_cb_signal_exit, NULL)) { @@ -437,7 +435,7 @@ /* an idle enterer to be called before all others */ _e_main_idle_enterer_before = ecore_idle_enterer_before_add(_e_main_cb_idler_before, NULL); - + TS("x connect"); /* init x */ if (!ecore_x_init(NULL)) @@ -466,9 +464,10 @@ "will handle setting up environment variables, paths,\n" "and launching any other required services etc.\n" "before enlightenment itself begins running.\n"); - exit(-1); + _e_main_shutdown(-1); +// exit(-1); } - + TS("ecore_con"); /* init generic communications */ if (!ecore_con_init()) @@ -495,16 +494,16 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_xinerama_shutdown); - + /* ecore_x_grab(); */ - + ecore_x_io_error_handler_set(_e_main_cb_x_fatal, NULL); TS("x hints"); /* Init window manager hints */ e_hints_init(); TS("x hints done"); - + TS("ecore_evas init"); /* init the evas wrapper */ if (!ecore_evas_init()) @@ -532,7 +531,7 @@ // down. // _e_main_shutdown_push(ecore_evas_shutdown); TS("test done"); - + /*** Finished loading subsystems, Loading WM Specifics ***/ TS("efreet"); /* init FDO desktop */ @@ -551,10 +550,10 @@ } _e_main_shutdown_push(efreet_util_shutdown); TS("efreet done"); - + TS("configure"); e_configure_init(); - + TS("dirs"); /* setup directories we will be using for configurations storage etc. */ if (!_e_main_dirs_init()) @@ -564,7 +563,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(_e_main_dirs_shutdown); - + TS("filereg"); /* setup file registry */ if (!e_filereg_init()) @@ -573,7 +572,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_filereg_shutdown); - + TS("config"); /* init config system */ if (!e_config_init()) @@ -587,7 +586,7 @@ /* set all execced stuff to configured priority */ ecore_exe_run_priority_set(e_config->priority); - + TS("scale"); /* init config system */ if (!e_scale_init()) @@ -596,7 +595,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_scale_shutdown); - + TS("pointer"); if (!e_pointer_init()) { @@ -604,7 +603,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_pointer_shutdown); - + TS("path"); /* setup paths for finding things */ if (!_e_main_path_init()) @@ -614,12 +613,12 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(_e_main_path_shutdown); - + TS("ipc"); /* setup e ipc service */ if (e_ipc_init()) _e_main_shutdown_push(e_ipc_shutdown); - + /* setup edje to animate @ e_config->framerate frames per sec. */ edje_frametime_set(1.0 / e_config->framerate); @@ -652,7 +651,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_intl_post_shutdown); - + TS("splash"); if (!((!e_config->show_splash) || (after_restart))) { @@ -678,7 +677,7 @@ Evas_Object *im, *txt; char buf[4096]; Evas_Coord tw, th; - + ee = ecore_evas_buffer_new(1, 1); if (!ee) { @@ -688,7 +687,7 @@ } e_canvas_add(ee); im = evas_object_image_add(ecore_evas_get(ee)); - + e_prefix_data_concat_static(buf, "data/images/test.png"); evas_object_image_file_set(im, buf, NULL); if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE) @@ -697,7 +696,7 @@ "loader support.\n")); _e_main_shutdown(-1); } - + e_prefix_data_concat_static(buf, "data/images/test.jpg"); evas_object_image_file_set(im, buf, NULL); if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE) @@ -706,7 +705,7 @@ "loader support.\n")); _e_main_shutdown(-1); } - + e_prefix_data_concat_static(buf, "data/images/test.edj"); evas_object_image_file_set(im, buf, "images/0"); if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE) @@ -731,7 +730,7 @@ ecore_evas_free(ee); } } - + e_init_status_set(_("Setup Screens")); TS("screens"); /* manage the root window */ @@ -774,7 +773,7 @@ TS("efreet paths"); { Eina_List **list; - + list = efreet_icon_extra_list_get(); if (list) { @@ -796,7 +795,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_sys_shutdown); - + e_init_status_set(_("Setup Actions")); TS("actions"); /* init actions system */ @@ -815,6 +814,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_exec_shutdown); + e_init_status_set(_("Setup Remembers")); TS("remember"); /* do remember stuff */ @@ -824,10 +824,10 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_remember_shutdown); - + TS("container freeze"); e_container_all_freeze(); - + e_init_status_set(_("Setup FM")); TS("fm2"); /* init the enlightenment file manager */ @@ -837,7 +837,8 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_fm2_shutdown); -/* + + /* TS("fwin"); if (!e_fwin_init()) { @@ -845,7 +846,8 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_fwin_shutdown); -*/ + */ + e_init_status_set(_("Setup Message System")); TS("msg"); /* setup generic msg handling etc */ @@ -855,6 +857,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_msg_shutdown); + e_init_status_set(_("Setup DND")); TS("dnd"); /* setup dnd */ @@ -864,6 +867,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_dnd_shutdown); + e_init_status_set(_("Setup Grab Input Handling")); TS("grabinput"); /* setup input grabbing co-operation system */ @@ -873,6 +877,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_grabinput_shutdown); + e_init_status_set(_("Setup Modules")); TS("modules"); /* setup module loading etc */ @@ -882,6 +887,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_module_shutdown); + e_init_status_set(_("Setup Color Classes")); TS("colorclasses"); /* setup color_class */ @@ -891,6 +897,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_color_class_shutdown); + e_init_status_set(_("Setup Gadcon")); TS("gadcon"); /* setup gadcon */ @@ -937,8 +944,8 @@ e_error_message_show(_("Enlightenment cannot configure the mouse settings.")); _e_main_shutdown(-1); } + _e_main_shutdown_push(e_actions_shutdown); - _e_main_shutdown_push(e_actions_shutdown); e_init_status_set(_("Setup Bindings")); TS("bindings"); /* init bindings system */ @@ -948,6 +955,7 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_bindings_shutdown); + e_init_status_set(_("Setup Popups")); TS("popup"); /* init popup system */ @@ -989,29 +997,29 @@ TS("add idle enterers"); /* add in a handler that just before we go idle we flush x - will happen after ecore_evas's idle rendering as it's after ecore_evas_init() */ - _e_main_idle_enterer_flusher = ecore_idle_enterer_add(_e_main_cb_x_flusher, NULL); - + _e_main_idle_enterer_flusher = + ecore_idle_enterer_add(_e_main_cb_x_flusher, NULL); + e_managers_keys_grab(); - -/* ecore_x_ungrab(); */ - + + /* ecore_x_ungrab(); */ + TS("init properites"); if (!nostartup) { if (after_restart) e_startup(E_STARTUP_RESTART); else e_startup(E_STARTUP_START); } - + if (!((!e_config->show_splash) || (after_restart))) { ecore_timer_add(16.0, _e_main_cb_startup_fake_end, NULL); - if (locked) - e_desklock_show(); + if (locked) e_desklock_show(); } - + e_container_all_thaw(); - + TS("test code"); /* run any testing code now we are set up */ e_test(); @@ -1040,30 +1048,31 @@ "modules again.")); e_config_save_queue(); } - + e_init_status_set(_("Configure Shelves")); TS("shelf config init"); e_shelf_config_init(); TS("manage all windows"); _e_main_manage_all(); - + /* an idle enterer to be called after all others */ - _e_main_idle_enterer_after = ecore_idle_enterer_add(_e_main_cb_idler_after, NULL); + _e_main_idle_enterer_after = + ecore_idle_enterer_add(_e_main_cb_idler_after, NULL); e_init_status_set(_("Almost Done")); TS("MAIN LOOP AT LAST"); /* no longer starting up */ starting = 0; /* start our main loop */ - + ecore_timer_add(5.0, stdbg, NULL); - + ecore_main_loop_begin(); e_canvas_idle_flush(); stopping = 1; - + /* ask all modules to save their config and then shutdown */ /* NB: no need to do this as config shutdown will flush any saves */ /* and all changed config was already saved before */ @@ -1095,7 +1104,7 @@ e_main_idler_before_add(int (*func) (void *data), void *data, int once) { E_Before_Idler *eb; - + eb = calloc(1, sizeof(E_Before_Idler)); eb->func = func; eb->data = data; @@ -1128,7 +1137,7 @@ _e_main_shutdown(int errorcode) { int i; - + printf("E17: Begin shutdown procedure!\n"); if (_e_main_idle_enterer_before) { @@ -1156,9 +1165,7 @@ /* ecore_x_ungrab(); */ ecore_x_focus_reset(); ecore_x_events_allow_all(); - ecore_x_shutdown(); - return 1; } @@ -1225,7 +1232,7 @@ if (!e_menu_init()) return 0; TS("screens: exehist"); if (!e_exehist_init()) return 0; - + TS("screens: get roots"); num = 0; roots = ecore_x_window_root_list(&num); @@ -1246,7 +1253,7 @@ { E_Manager *man; E_Container *con; - + man = e_manager_new(roots[i], i); if (man) e_manager_show(man); @@ -1304,7 +1311,7 @@ _e_main_manage_all(void) { Eina_List *l; - + for (l = e_manager_list(); l; l = l->next) e_manager_manage_windows(l->data); } @@ -1313,7 +1320,7 @@ _e_main_path_init(void) { char buf[4096]; - + /* setup data paths */ path_data = e_path_new(); if (!path_data) @@ -1336,7 +1343,7 @@ e_prefix_data_concat_static(buf, "data/images"); e_path_default_path_append(path_images, buf); e_path_user_path_set(path_images, &(e_config->path_append_images)); - + /* setup font paths */ path_fonts = e_path_new(); if (!path_fonts) @@ -1412,7 +1419,7 @@ e_path_default_path_append(path_messages, "~/.e/e/locale"); e_path_default_path_append(path_messages, e_prefix_locale_get()); e_path_user_path_set(path_messages, &(e_config->path_append_messages)); - + return 1; } @@ -1496,7 +1503,7 @@ _e_main_cb_idler_before(void *data __UNUSED__) { Eina_List *l, *pl; - + e_menu_idler_before(); e_focus_idler_before(); e_border_idler_before(); @@ -1506,7 +1513,7 @@ for (l = _e_main_idler_before_list; l; l = l->next) { E_Before_Idler *eb; - + eb = l->data; if (!eb->delete_me) { @@ -1516,7 +1523,7 @@ for (l = _e_main_idler_before_list; l;) { E_Before_Idler *eb; - + eb = l->data; pl = l; l = l->next; @@ -1541,7 +1548,7 @@ /* eet_cacheburst(_e_cacheburst); */ { static int first_idle = 1; - + if (first_idle) { TS("SLEEP"); @@ -1571,8 +1578,7 @@ _e_main_desk_save(void) { Eina_List *ml; - char env[1024]; - char name[1024]; + char env[1024], name[1024]; for (ml = e_manager_list(); ml; ml = ml->next) { @@ -1580,20 +1586,17 @@ Eina_List *cl; man = ml->data; - for (cl = man->containers; cl; cl = cl->next) { E_Container *con; Eina_List *zl; con = cl->data; - for (zl = con->zones; zl; zl = zl->next) { E_Zone *zone; zone = zl->data; - snprintf(name, sizeof(name), "DESK_%d_%d_%d", man->num, con->num, zone->num); snprintf(env, sizeof(env), "%d,%d", zone->desk_x_current, zone->desk_y_current); e_util_env_set(name, env); @@ -1616,7 +1619,6 @@ int desk_x, desk_y; zone = zl->data; - snprintf(name, sizeof(name), "DESK_%d_%d_%d", man->num, con->num, zone->num); env = getenv(name); if (!env) continue; |
From: Enlightenment S. <no-...@en...> - 2009-07-19 09:03:55
|
Log: Oops. Use exit(-1) instead of my tested _e_main_shutdown(-1). My Bad :( Author: devilhorns Date: 2009-07-19 02:03:49 -0700 (Sun, 19 Jul 2009) New Revision: 41429 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2009-07-19 08:59:20 UTC (rev 41428) +++ trunk/e/src/bin/e_main.c 2009-07-19 09:03:49 UTC (rev 41429) @@ -464,8 +464,7 @@ "will handle setting up environment variables, paths,\n" "and launching any other required services etc.\n" "before enlightenment itself begins running.\n"); - _e_main_shutdown(-1); -// exit(-1); + exit(-1); } TS("ecore_con"); |
From: Enlightenment S. <no-...@en...> - 2009-07-19 09:13:45
|
Log: Formatting & Whitespace Cleanup (No Code Changes). Author: devilhorns Date: 2009-07-19 02:13:39 -0700 (Sun, 19 Jul 2009) New Revision: 41430 Modified: trunk/e/src/bin/e_pointer.c Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2009-07-19 09:03:49 UTC (rev 41429) +++ trunk/e/src/bin/e_pointer.c 2009-07-19 09:13:39 UTC (rev 41430) @@ -13,8 +13,8 @@ struct _E_Pointer_Stack { - void *obj; - const char *type; + void *obj; + const char *type; }; static Eina_List *_e_pointers = NULL; @@ -40,10 +40,22 @@ EAPI int e_pointer_init(void) { - handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_pointer_cb_mouse_down, NULL)); - handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _e_pointer_cb_mouse_up, NULL)); - handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_pointer_cb_mouse_move, NULL)); - handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, _e_pointer_cb_mouse_wheel, NULL)); + handlers = + eina_list_append(handlers, + ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, + _e_pointer_cb_mouse_down, NULL)); + handlers = + eina_list_append(handlers, + ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, + _e_pointer_cb_mouse_up, NULL)); + handlers = + eina_list_append(handlers, + ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, + _e_pointer_cb_mouse_move, NULL)); + handlers = + eina_list_append(handlers, + ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, + _e_pointer_cb_mouse_wheel, NULL)); return 1; } @@ -53,12 +65,11 @@ while (handlers) { Ecore_Event_Handler *h; - + h = handlers->data; handlers = eina_list_remove_list(handlers, handlers); ecore_event_handler_del(h); } - return 1; } @@ -69,7 +80,7 @@ p = E_OBJECT_ALLOC(E_Pointer, E_POINTER_TYPE, _e_pointer_free); if (!p) return NULL; - + if (e_config->use_e_cursor) { p->e_cursor = 1; @@ -95,7 +106,6 @@ Eina_List *l; if (!e_config->show_cursor) return; - for (l = _e_pointers; l; l = l->next) { E_Pointer *p; @@ -124,7 +134,7 @@ else { const char *type; - + ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4); type = p->type; if (type) @@ -150,9 +160,9 @@ E_Pointer_Stack *stack; p->e_cursor = e_config->use_e_cursor; - + _e_pointer_type_set(p, type); - + p->obj = obj; stack = E_NEW(E_Pointer_Stack, 1); @@ -162,7 +172,6 @@ stack->obj = p->obj; p->stack = eina_list_prepend(p->stack, stack); } - } EAPI void @@ -174,7 +183,6 @@ for (l = p->stack; l; l = l->next) { stack = l->data; - if ((stack->obj == obj) && ((!type) || (!strcmp(stack->type, type)))) { @@ -208,8 +216,8 @@ e_pointer_idler_before(void) { Eina_List *l; + if (!e_config->show_cursor) return; - for (l = _e_pointers; l; l = l->next) { E_Pointer *p; @@ -240,10 +248,10 @@ Evas_Engine_Info_Buffer *einfo; Evas_Object *o; int rmethod; - + p->w = e_config->cursor_size; p->h = e_config->cursor_size; - + /* create evas */ p->evas = evas_new(); if (!p->evas) @@ -280,7 +288,7 @@ einfo->info.func.new_update_region = NULL; einfo->info.func.free_update_region = NULL; evas_engine_info_set(p->evas, (Evas_Engine_Info *)einfo); - + /* set the pointer edje */ o = edje_object_add(p->evas); p->pointer_object = o; @@ -335,7 +343,7 @@ _e_pointers = eina_list_remove(_e_pointers, p); _e_pointer_canvas_del(p); - + while (p->stack) { _e_pointer_stack_free(p->stack->data); @@ -343,7 +351,6 @@ } if (p->type) eina_stringshare_del(p->type); - if (p->idle_timer) ecore_timer_del(p->idle_timer); if (p->idle_poller) ecore_poller_del(p->idle_poller); @@ -368,7 +375,7 @@ if (p->type) eina_stringshare_del(p->type); p->type = eina_stringshare_add(type); - + /* Do not set type if in "hidden mode" */ if (!e_config->show_cursor) { @@ -381,7 +388,7 @@ 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) @@ -396,7 +403,8 @@ 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_swallow(p->pointer_object, "e.swallow.hotspot", + p->hot_object); edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", &x, &y, NULL, NULL); if ((p->hot.x != x) || (p->hot.y != y)) @@ -410,7 +418,7 @@ fallback: { Ecore_X_Cursor cursor = 0; - + if (p->evas) _e_pointer_canvas_del(p); if (!strcmp(type, "move")) { @@ -537,7 +545,7 @@ Ecore_Event_Mouse_Button *ev; Eina_List *l; E_Pointer *p; - + ev = event; for (l = _e_pointers; l; l = l->next) { @@ -558,7 +566,7 @@ Ecore_Event_Mouse_Button *ev; Eina_List *l; E_Pointer *p; - + ev = event; for (l = _e_pointers; l; l = l->next) { @@ -579,7 +587,7 @@ Ecore_Event_Mouse_Move *ev; Eina_List *l; E_Pointer *p; - + ev = event; for (l = _e_pointers; l; l = l->next) { @@ -600,7 +608,7 @@ Ecore_Event_Mouse_Wheel *ev; Eina_List *l; E_Pointer *p; - + ev = event; for (l = _e_pointers; l; l = l->next) { @@ -620,7 +628,7 @@ { E_Pointer *p; int x, y; - + p = data; ecore_x_pointer_xy_get(p->win, &x, &y); p->x = x; @@ -638,8 +646,7 @@ if ((e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) || (!e_config->idle_cursor)) { - if (p->idle_poller) - ecore_poller_del(p->idle_poller); + if (p->idle_poller) ecore_poller_del(p->idle_poller); p->idle_poller = NULL; p->idle_timer = NULL; return 0; @@ -656,7 +663,7 @@ { E_Pointer *p; int x, y; - + p = data; if ((e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) || (!e_config->idle_cursor)) |
From: Enlightenment S. <no-...@en...> - 2009-07-19 09:29:57
|
Log: Remove manual eina_shutdown call as it's now popped from E's shutdown stack. Author: devilhorns Date: 2009-07-19 02:29:52 -0700 (Sun, 19 Jul 2009) New Revision: 41431 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2009-07-19 09:13:39 UTC (rev 41430) +++ trunk/e/src/bin/e_main.c 2009-07-19 09:29:52 UTC (rev 41431) @@ -1092,8 +1092,6 @@ e_prefix_shutdown(); - eina_shutdown(); - /* just return 0 to keep the compiler quiet */ return 0; } |
From: Enlightenment S. <no-...@en...> - 2009-07-19 19:59:45
|
Log: Don't need these includes here. They are already included via e.h Author: devilhorns Date: 2009-07-19 12:59:39 -0700 (Sun, 19 Jul 2009) New Revision: 41438 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2009-07-19 14:40:32 UTC (rev 41437) +++ trunk/e/src/bin/e_main.c 2009-07-19 19:59:39 UTC (rev 41438) @@ -8,8 +8,6 @@ #include <Ecore_IMF.h> #endif -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> /* |
From: Enlightenment S. <no-...@en...> - 2009-07-19 20:08:45
|
Log: Cleanup compiler warning on e_signals.c: execinfo.h (which contains the backtrace* functions is only included if OBJECT_PARANOIA_CHECK is defined so add an #ifdef around those calls. Author: devilhorns Date: 2009-07-19 13:08:38 -0700 (Sun, 19 Jul 2009) New Revision: 41439 Modified: trunk/e/src/bin/e_signals.c Modified: trunk/e/src/bin/e_signals.c =================================================================== --- trunk/e/src/bin/e_signals.c 2009-07-19 19:59:39 UTC (rev 41438) +++ trunk/e/src/bin/e_signals.c 2009-07-19 20:08:38 UTC (rev 41439) @@ -74,6 +74,7 @@ static void _e_backtrace_int(int fd, const char *msg, size_t msg_len) { +#ifdef OBJECT_PARANOIA_CHECK char attachmsg[1024]; void *array[255]; size_t size; @@ -90,6 +91,7 @@ _e_write_safe_int(fd, attachmsg, size); _e_gdb_print_backtrace(fd); +#endif } #ifdef OBJECT_PARANOIA_CHECK |
From: Enlightenment S. <no-...@en...> - 2009-07-19 20:09:45
|
Log: Add cast to char ** for wd->value to cleanup compiler warning. Author: devilhorns Date: 2009-07-19 13:09:38 -0700 (Sun, 19 Jul 2009) New Revision: 41440 Modified: trunk/e/src/bin/e_widget_ilist.c Modified: trunk/e/src/bin/e_widget_ilist.c =================================================================== --- trunk/e/src/bin/e_widget_ilist.c 2009-07-19 20:08:38 UTC (rev 41439) +++ trunk/e/src/bin/e_widget_ilist.c 2009-07-19 20:09:38 UTC (rev 41440) @@ -267,7 +267,7 @@ e_widget_focus_hook_set(obj, _e_wid_focus_hook); e_widget_data_set(obj, wd); - wd->value = value; + wd->value = (char **)value; o = e_scrollframe_add(evas); wd->o_scrollframe = o; |
From: Enlightenment S. <no-...@en...> - 2009-07-19 20:16:57
|
Log: Formatting & Whitespace Removal Author: devilhorns Date: 2009-07-19 13:16:49 -0700 (Sun, 19 Jul 2009) New Revision: 41441 Modified: trunk/e/src/bin/e_fm_shared.h Modified: trunk/e/src/bin/e_fm_shared.h =================================================================== --- trunk/e/src/bin/e_fm_shared.h 2009-07-19 20:09:38 UTC (rev 41440) +++ trunk/e/src/bin/e_fm_shared.h 2009-07-19 20:16:49 UTC (rev 41441) @@ -9,29 +9,24 @@ struct _E_Storage { int type; - char *udi; - char *bus; + char *udi, *bus; char *drive_type; - - char *model; - char *vendor; - char *serial; - - char removable; - char media_available; + + char *model, *vendor, *serial; + + char removable, media_available; unsigned long long media_size; - - char requires_eject; - char hotpluggable; + + char requires_eject, hotpluggable; char media_check_enabled; - - struct { - char *drive; - char *volume; - } icon; - + + struct + { + char *drive, *volume; + } icon; + Eina_List *volumes; - + unsigned char validated; unsigned char trackable; }; @@ -39,26 +34,23 @@ struct _E_Volume { int type; - char *udi; - char *uuid; - char *label; - char *icon; - char *fstype; + char *udi, *uuid; + char *label, *icon, *fstype; unsigned long long size; - - char partition; - int partition_number; + + char partition; + int partition_number; char *partition_label; - char mounted; + char mounted; char *mount_point; - + char *parent; E_Storage *storage; void *prop_handler; Eina_List *mounts; - + unsigned char validated; - + char auto_unmount; // unmount, when last associated fm window closed char first_time; // volume discovery in init sequence Ecore_Timer *guard; // operation guard timer @@ -67,15 +59,15 @@ struct _E_Fm2_Mount { - const char *udi; - const char *mount_point; - - void (*mount_ok) (void *data); - void (*mount_fail) (void *data); - void (*unmount_ok) (void *data); - void (*unmount_fail) (void *data); - void *data; + const char *udi; + const char *mount_point; + void (*mount_ok) (void *data); + void (*mount_fail) (void *data); + void (*unmount_ok) (void *data); + void (*unmount_fail) (void *data); + void *data; + E_Volume *volume; unsigned char mounted : 1; @@ -112,7 +104,7 @@ while (s->volumes) { E_Volume *v; - + v = s->volumes->data; _e_volume_free(v); s->volumes = eina_list_remove_list(s->volumes, s->volumes); @@ -120,7 +112,6 @@ if (s->udi) free(s->udi); if (s->bus) free(s->bus); if (s->drive_type) free(s->drive_type); - if (s->model) free(s->model); if (s->vendor) free(s->vendor); if (s->serial) free(s->serial); |
From: Enlightenment S. <no-...@en...> - 2009-07-19 20:26:19
|
Log: Use E_FREE for things created with E_NEW. Formatting & Whitespace Removal Author: devilhorns Date: 2009-07-19 13:26:10 -0700 (Sun, 19 Jul 2009) New Revision: 41442 Modified: trunk/e/src/bin/e_exec.c Modified: trunk/e/src/bin/e_exec.c =================================================================== --- trunk/e/src/bin/e_exec.c 2009-07-19 20:16:49 UTC (rev 41441) +++ trunk/e/src/bin/e_exec.c 2009-07-19 20:26:10 UTC (rev 41442) @@ -12,20 +12,20 @@ * - Launch .desktop in terminal if .desktop requires it */ -typedef struct _E_Exec_Launch E_Exec_Launch; -typedef struct _E_Exec_Search E_Exec_Search; +typedef struct _E_Exec_Launch E_Exec_Launch; +typedef struct _E_Exec_Search E_Exec_Search; struct _E_Exec_Launch { - E_Zone *zone; - const char *launch_method; + E_Zone *zone; + const char *launch_method; }; struct _E_Exec_Search { Efreet_Desktop *desktop; - int startup_id; - pid_t pid; + int startup_id; + pid_t pid; }; struct _E_Config_Dialog_Data @@ -33,35 +33,33 @@ Efreet_Desktop *desktop; char *exec; - Ecore_Exe_Event_Del event; + Ecore_Exe_Event_Del event; Ecore_Exe_Event_Data *error; Ecore_Exe_Event_Data *read; - char *label; - char *exit; - char *signal; + char *label, *exit, *signal; }; /* local subsystem functions */ static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining); -static int _e_exec_cb_expire_timer(void *data); -static int _e_exec_cb_exit(void *data, int type, void *event); +static int _e_exec_cb_expire_timer(void *data); +static int _e_exec_cb_exit(void *data, int type, void *event); static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data); -static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read); -static void _fill_data(E_Config_Dialog_Data *cfdata); -static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines); -static void _dialog_save_cb(void *data, void *data2); +static void _dialog_save_cb(void *data, void *data2); /* local subsystem globals */ -static Eina_List *e_exec_start_pending = NULL; -static Eina_Hash *e_exec_instances = NULL; -static int startup_id = 0; +static Eina_List *e_exec_start_pending = NULL; +static Eina_Hash *e_exec_instances = NULL; +static int startup_id = 0; static Ecore_Event_Handler *_e_exec_exit_handler = NULL; static Ecore_Event_Handler *_e_exec_border_add_handler = NULL; @@ -90,7 +88,8 @@ e_util_env_set("E_STARTUP_ID", buf); if (_e_exec_exit_handler) ecore_event_handler_del(_e_exec_exit_handler); - if (_e_exec_border_add_handler) ecore_event_handler_del(_e_exec_border_add_handler); + if (_e_exec_border_add_handler) + ecore_event_handler_del(_e_exec_border_add_handler); eina_hash_free(e_exec_instances); eina_list_free(e_exec_start_pending); return 1; @@ -119,7 +118,8 @@ if (exec) inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0); else - inst = efreet_desktop_command_get(desktop, files, _e_exec_cb_exec, launch); + inst = + efreet_desktop_command_get(desktop, files, _e_exec_cb_exec, launch); } else inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0); @@ -158,6 +158,7 @@ if (startup_id == 0) { const char *p; + p = getenv("E_STARTUP_ID"); if (p) startup_id = atoi(p); e_util_env_set("E_STARTUP_ID", NULL); @@ -242,7 +243,8 @@ inst->exe = exe; inst->startup_id = startup_id; inst->launch_time = ecore_time_get(); - inst->expire_timer = ecore_timer_add(10.0, _e_exec_cb_expire_timer, inst); + inst->expire_timer = ecore_timer_add(10.0, + _e_exec_cb_expire_timer, inst); l = eina_hash_find(e_exec_instances, desktop->orig_path); if (l) @@ -265,7 +267,7 @@ inst = NULL; ecore_exe_free(exe); } - + if (!remaining) { if (launch->launch_method) eina_stringshare_del(launch->launch_method); @@ -279,7 +281,7 @@ _e_exec_cb_expire_timer(void *data) { E_Exec_Instance *inst; - + inst = data; e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop); inst->expire_timer = NULL; @@ -306,13 +308,13 @@ ((ev->exit_code == 127) || (ev->exit_code == 255))) { E_Dialog *dia; - + dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_exec_run_error_dialog"); if (dia) { char buf[4096]; - + e_dialog_title_set(dia, _("Application run error")); snprintf(buf, sizeof(buf), _("Enlightenment was unable to run the application:<br>" @@ -333,8 +335,7 @@ { /* filter out common exits via signals - int/term/quit. not really * worth popping up a dialog for */ - if (! - ((ev->signalled) && + if (!((ev->signalled) && ((ev->exit_signal == SIGINT) || (ev->exit_signal == SIGQUIT) || (ev->exit_signal == SIGTERM))) @@ -375,13 +376,13 @@ search = data; EINA_LIST_FOREACH(value, l, inst) - if (((search->startup_id > 0) && (search->startup_id == inst->startup_id)) || - ((inst->exe) && (search->pid > 1) && - (search->pid == ecore_exe_pid_get(inst->exe)))) - { - search->desktop = inst->desktop; - return EINA_FALSE; - } + if (((search->startup_id > 0) && (search->startup_id == inst->startup_id)) || + ((inst->exe) && (search->pid > 1) && + (search->pid == ecore_exe_pid_get(inst->exe)))) + { + search->desktop = inst->desktop; + return EINA_FALSE; + } return EINA_TRUE; } @@ -400,7 +401,7 @@ cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) { - free(v); + E_FREE(v); return; } cfdata->desktop = desktop; @@ -435,14 +436,16 @@ if ((cfdata->event.exited) && (!cfdata->exit)) { snprintf(buf, sizeof(buf), - _("An exit code of %i was returned from %s."), cfdata->event.exit_code, cfdata->exec); + _("An exit code of %i was returned from %s."), + cfdata->event.exit_code, cfdata->exec); cfdata->exit = strdup(buf); } if ((cfdata->event.signalled) && (!cfdata->signal)) { if (cfdata->event.exit_signal == SIGINT) snprintf(buf, sizeof(buf), - _("%s was interrupted by an Interrupt Signal."), cfdata->desktop->exec); + _("%s was interrupted by an Interrupt Signal."), + cfdata->desktop->exec); else if (cfdata->event.exit_signal == SIGQUIT) snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal."), cfdata->exec); @@ -451,19 +454,23 @@ _("%s was interrupted by an Abort Signal."), cfdata->exec); else if (cfdata->event.exit_signal == SIGFPE) snprintf(buf, sizeof(buf), - _("%s was interrupted by a Floating Point Error."), cfdata->exec); + _("%s was interrupted by a Floating Point Error."), + cfdata->exec); else if (cfdata->event.exit_signal == SIGKILL) snprintf(buf, sizeof(buf), - _("%s was interrupted by an Uninterruptable Kill Signal."), cfdata->exec); + _("%s was interrupted by an Uninterruptable Kill Signal."), + cfdata->exec); else if (cfdata->event.exit_signal == SIGSEGV) snprintf(buf, sizeof(buf), - _("%s was interrupted by a Segmentation Fault."), cfdata->exec); + _("%s was interrupted by a Segmentation Fault."), + cfdata->exec); else if (cfdata->event.exit_signal == SIGPIPE) snprintf(buf, sizeof(buf), _("%s was interrupted by a Broken Pipe."), cfdata->exec); else if (cfdata->event.exit_signal == SIGTERM) snprintf(buf, sizeof(buf), - _("%s was interrupted by a Termination Signal."), cfdata->exec); + _("%s was interrupted by a Termination Signal."), + cfdata->exec); else if (cfdata->event.exit_signal == SIGBUS) snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error."), cfdata->exec); @@ -517,18 +524,16 @@ E_FREE(cfdata->signal); E_FREE(cfdata->exit); E_FREE(cfdata->label); - - free(cfdata); + E_FREE(cfdata); } static Evas_Object * _dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines) { - int i; Evas_Object *obj, *os; char *text; char *trunc_note = _("***The remaining output has been truncated. Save the output to view.***\n"); - int tlen, max_lines; + int tlen, max_lines, i; os = e_widget_framelist_add(evas, _(title), 0); @@ -561,8 +566,7 @@ } /* Append the warning about truncated output. */ - if (lines[max_lines].line != NULL) - strcat(text, trunc_note); + if (lines[max_lines].line != NULL) strcat(text, trunc_note); e_widget_textblock_plain_set(obj, text); } @@ -587,11 +591,11 @@ ob = e_widget_label_add(evas, cfdata->label); e_widget_list_object_append(o, ob, 1, 1, 0.5); - if (cfdata->error) - error_length = cfdata->error->size; + if (cfdata->error) error_length = cfdata->error->size; if (error_length) { - os = _dialog_scrolltext_create(evas, _("Error Logs"), cfdata->error->lines); + os = _dialog_scrolltext_create(evas, _("Error Logs"), + cfdata->error->lines); e_widget_list_object_append(o, os, 1, 1, 0.5); } else @@ -603,7 +607,7 @@ ob = e_widget_button_add(evas, _("Save This Message"), "system-run", _dialog_save_cb, NULL, cfdata); e_widget_list_object_append(o, ob, 0, 0, 0.5); - + snprintf(buf, sizeof(buf), _("This error log will be saved as %s/%s.log"), e_user_homedir_get(), cfdata->desktop->name); ob = e_widget_label_add(evas, buf); @@ -644,12 +648,12 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); } - if (cfdata->read) - read_length = cfdata->read->size; + if (cfdata->read) read_length = cfdata->read->size; if (read_length) { - of = _dialog_scrolltext_create(evas, _("Output Data"), cfdata->read->lines); + of = _dialog_scrolltext_create(evas, _("Output Data"), + cfdata->read->lines); /* FIXME: Add stdout "start". */ /* FIXME: Add stdout "end". */ } @@ -661,11 +665,11 @@ } e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); - if (cfdata->error) - error_length = cfdata->error->size; + if (cfdata->error) error_length = cfdata->error->size; if (error_length) { - of = _dialog_scrolltext_create(evas, _("Error Logs"), cfdata->error->lines); + of = _dialog_scrolltext_create(evas, _("Error Logs"), + cfdata->error->lines); /* FIXME: Add stderr "start". */ /* FIXME: Add stderr "end". */ } @@ -679,7 +683,8 @@ e_widget_list_object_append(o, ot, 1, 1, 0.5); - ob = e_widget_button_add(evas, _("Save This Message"), "system-run", _dialog_save_cb, NULL, cfdata); + ob = e_widget_button_add(evas, _("Save This Message"), "system-run", + _dialog_save_cb, NULL, cfdata); e_widget_list_object_append(o, ob, 0, 0, 0.5); snprintf(buf, sizeof(buf), _("This error log will be saved as %s/%s.log"), @@ -710,17 +715,18 @@ if (cfdata->exit) { - snprintf(buffer, sizeof(buffer), "Error Information:\n\t%s\n\n", cfdata->exit); + snprintf(buffer, sizeof(buffer), "Error Information:\n\t%s\n\n", + cfdata->exit); fwrite(buffer, sizeof(char), strlen(buffer), f); } if (cfdata->signal) { - snprintf(buffer, sizeof(buffer), "Error Signal Information:\n\t%s\n\n", cfdata->signal); + snprintf(buffer, sizeof(buffer), "Error Signal Information:\n\t%s\n\n", + cfdata->signal); fwrite(buffer, sizeof(char), strlen(buffer), f); } - if (cfdata->read) - read_length = cfdata->read->size; + if (cfdata->read) read_length = cfdata->read->size; if (read_length) { @@ -749,8 +755,7 @@ /* Reusing this var */ read_length = 0; - if (cfdata->error) - read_length = cfdata->error->size; + if (cfdata->error) read_length = cfdata->error->size; if (read_length) { |
From: Enlightenment S. <no-...@en...> - 2009-07-19 20:30:41
|
Log: Formatting & Whitespace Removal Author: devilhorns Date: 2009-07-19 13:30:33 -0700 (Sun, 19 Jul 2009) New Revision: 41443 Modified: trunk/e/src/bin/e_start_main.c Modified: trunk/e/src/bin/e_start_main.c =================================================================== --- trunk/e/src/bin/e_start_main.c 2009-07-19 20:26:10 UTC (rev 41442) +++ trunk/e/src/bin/e_start_main.c 2009-07-19 20:30:33 UTC (rev 41443) @@ -11,7 +11,7 @@ #include <limits.h> #include <fcntl.h> #ifdef HAVE_ALLOCA_H -#include <alloca.h> +# include <alloca.h> #endif static void env_set(const char *var, const char *val); @@ -26,7 +26,7 @@ setenv(var, val, 1); #else char *buf; - + buf = alloca(strlen(var) + 1 + strlen(val) + 1); snprintf(buf, sizeof(buf), "%s=%s", var, val); if (getenv(var)) @@ -135,7 +135,7 @@ int len; char *p, mode[5] = ""; unsigned long ptr1 = 0, ptr2 = 0; - + len = strlen(buf); if (buf[len - 1] == '\n') { @@ -180,7 +180,7 @@ #else char buf[4096], buf2[4096], buf3[4096]; #endif - + /* 1. is argv0 abs path? */ if (argv0[0] == '/') { @@ -263,7 +263,7 @@ char buf[4096], tbuf[256 * 1024]; struct stat st; int l, fd, children = 0, cret; - + home = getenv("HOME"); if (home) snprintf(buf, sizeof(buf), "%s/.e-precache", home); else snprintf(buf, sizeof(buf), "/tmp/.e-precache"); @@ -280,9 +280,7 @@ if (!fork()) { if (buf[0] == 's') - { - stat(buf + 2, &st); - } + stat(buf + 2, &st); else if (buf[0] == 'o') { fd = open(buf + 2, O_RDONLY); @@ -374,6 +372,7 @@ if (valgrind_log) { static char logparam[PATH_MAX + sizeof("--log-file=")]; + snprintf(logparam, sizeof(logparam), "--log-file=%s", valgrind_log); dst[i++] = logparam; } @@ -411,7 +410,7 @@ prefix_determine(argv[0]); env_set("E_START", argv[0]); - + p = getenv("PATH"); if (p) snprintf(buf, sizeof(buf), "%s/bin:%s", _prefix_path, p); else snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); @@ -428,6 +427,7 @@ else if (!strncmp(argv[i], "-valgrind", sizeof("-valgrind") - 1)) { const char *val = argv[i] + sizeof("-valgrind") - 1; + if (*val == '\0') valgrind_mode = 1; else if (*val == '-') @@ -472,8 +472,7 @@ "Please run:\n" "\tenlightenment %s\n" "for more options.\n", - argv[i] - ); + argv[i]); exit(0); } } @@ -499,7 +498,7 @@ if (do_precache) { void *lib, *func; - + do_precache = 0; /* sanity checks - if precache might fail - check here first */ lib = dlopen("libevas.so", RTLD_GLOBAL | RTLD_LAZY); @@ -528,7 +527,7 @@ /* try dbus-launch */ snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path); - + args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *)); if (!getenv("DBUS_SESSION_BUS_ADDRESS")) { @@ -541,7 +540,7 @@ args[i + argc - 1] = NULL; execvp("dbus-launch", args); } - + /* dbus-launch failed - run e direct */ i = valgrind_append(args, valgrind_mode, valgrind_path, valgrind_log); args[i++] = buf; |
From: Enlightenment S. <no-...@en...> - 2009-07-20 01:58:49
|
Log: Since we are not using the returned pointer from eina_hash_find here, we can remove the variable as eina_hash_find will return NULL is nothing is found. Author: devilhorns Date: 2009-07-19 18:58:43 -0700 (Sun, 19 Jul 2009) New Revision: 41444 Modified: trunk/e/src/bin/e_filereg.c Modified: trunk/e/src/bin/e_filereg.c =================================================================== --- trunk/e/src/bin/e_filereg.c 2009-07-19 20:30:33 UTC (rev 41443) +++ trunk/e/src/bin/e_filereg.c 2009-07-20 01:58:43 UTC (rev 41444) @@ -79,11 +79,8 @@ EAPI Eina_Bool e_filereg_file_protected(const char *path) { - Filereg_Item *fi = NULL; - - fi = eina_hash_find(_e_filereg, path); - if (!fi) return EINA_FALSE; - return EINA_TRUE; + if (eina_hash_find(_e_filereg, path)) return EINA_TRUE; + return EINA_FALSE; } /* Private Functions */ |
From: Enlightenment S. <no-...@en...> - 2009-07-20 14:47:46
|
Log: Use E_NEW and E_FREE for creating & deleting E_Theme_Result. Author: devilhorns Date: 2009-07-20 07:47:40 -0700 (Mon, 20 Jul 2009) New Revision: 41455 Modified: trunk/e/src/bin/e_theme.c Modified: trunk/e/src/bin/e_theme.c =================================================================== --- trunk/e/src/bin/e_theme.c 2009-07-20 13:47:12 UTC (rev 41454) +++ trunk/e/src/bin/e_theme.c 2009-07-20 14:47:40 UTC (rev 41455) @@ -302,9 +302,9 @@ eina_stringshare_del(res->file); } if (res->cache) eina_stringshare_del(res->cache); - free(res); + E_FREE(res); } - res = calloc(1, sizeof(E_Theme_Result)); + res = E_NEW(E_Theme_Result, 1); res->file = eina_stringshare_add(file); e_filereg_register(res->file); if (!mappings) |
From: Enlightenment S. <no-...@en...> - 2009-07-22 20:09:04
|
Log: Cleanup the OBJECT_PARANOIA_CHECK issue wrt execinfo.h. Now we always include execinfo.h Author: devilhorns Date: 2009-07-22 12:38:14 -0700 (Wed, 22 Jul 2009) New Revision: 41476 Modified: trunk/e/src/bin/e.h trunk/e/src/bin/e_signals.c Modified: trunk/e/src/bin/e.h =================================================================== --- trunk/e/src/bin/e.h 2009-07-22 15:33:20 UTC (rev 41475) +++ trunk/e/src/bin/e.h 2009-07-22 19:38:14 UTC (rev 41476) @@ -58,11 +58,9 @@ #endif #ifdef __GLIBC__ -#ifdef OBJECT_PARANOIA_CHECK #include <execinfo.h> #include <setjmp.h> #endif -#endif #include <Eina.h> #include <Evas.h> Modified: trunk/e/src/bin/e_signals.c =================================================================== --- trunk/e/src/bin/e_signals.c 2009-07-22 15:33:20 UTC (rev 41475) +++ trunk/e/src/bin/e_signals.c 2009-07-22 19:38:14 UTC (rev 41476) @@ -74,7 +74,6 @@ static void _e_backtrace_int(int fd, const char *msg, size_t msg_len) { -#ifdef OBJECT_PARANOIA_CHECK char attachmsg[1024]; void *array[255]; size_t size; @@ -91,11 +90,8 @@ _e_write_safe_int(fd, attachmsg, size); _e_gdb_print_backtrace(fd); -#endif } -#ifdef OBJECT_PARANOIA_CHECK - /* a tricky little devil, requires e and it's libs to be built * with the -rdynamic flag to GCC for any sort of decent output. */ @@ -119,28 +115,6 @@ "Please compile everything with -g in your CFLAGS\n"); exit(-11); } -#else -EAPI void -e_sigseg_act(int x, siginfo_t *info, void *data) -{ - _e_backtrace("**** SEGMENTATION FAULT ****"); - _e_x_composite_shutdown(); - ecore_x_pointer_ungrab(); - ecore_x_keyboard_ungrab(); - ecore_x_ungrab(); - ecore_x_sync(); - e_alert_show("This is very bad. Enlightenment SEGV'd.\n" - "\n" - "This is not meant to happen and is likely a sign of\n" - "a bug in Enlightenment or the libraries it relies\n" - "on. You can gdb attach to this process now to try\n" - "debug it or you could exit, or just hit restart to\n" - "try and get your desktop back the way it was.\n" - "\n" - "Please compile everything with -g in your CFLAGS\n"); - exit(-11); -} -#endif EAPI void e_sigill_act(int x, siginfo_t *info, void *data) |
From: Enlightenment S. <no-...@en...> - 2009-07-24 01:56:16
|
Log: Formatting. Author: devilhorns Date: 2009-07-23 18:56:00 -0700 (Thu, 23 Jul 2009) New Revision: 41485 Modified: trunk/e/src/bin/e_int_shelf_config.c Modified: trunk/e/src/bin/e_int_shelf_config.c =================================================================== --- trunk/e/src/bin/e_int_shelf_config.c 2009-07-23 15:59:43 UTC (rev 41484) +++ trunk/e/src/bin/e_int_shelf_config.c 2009-07-24 01:56:00 UTC (rev 41485) @@ -12,22 +12,23 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _cb_disable_check_list(void *data, Evas_Object *obj); -#define MODE_CUSTOM 0 -#define MODE_BOTTOM_MIDDLE 1 -#define MODE_BOTTOM_ALL 2 -#define MODE_BOTTOM_DESKTOP 3 -#define MODE_TOP_ALL 4 -#define MODE_TOP_DESKTOP 5 +#define MODE_CUSTOM 0 +#define MODE_BOTTOM_MIDDLE 1 +#define MODE_BOTTOM_ALL 2 +#define MODE_BOTTOM_DESKTOP 3 +#define MODE_TOP_ALL 4 +#define MODE_TOP_DESKTOP 5 /* Actual config data we will be playing with whil the dialog is active */ struct _E_Config_Dialog_Data { E_Shelf *es; E_Config_Shelf *escfg; + /* BASIC */ int mode; int basic_size; - + /* ADVANCED */ const char *style; int orient; @@ -57,25 +58,24 @@ E_Config_Dialog_View *v; v = E_NEW(E_Config_Dialog_View, 1); - if (v) - { - /* methods */ - v->create_cfdata = _create_data; - v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = _advanced_apply_data; - v->advanced.create_widgets = _advanced_create_widgets; + if (!v) return; + + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + v->override_auto_apply = 1; - v->override_auto_apply = 1; - - /* create config diaolg for bd object/data */ - cfd = e_config_dialog_new(es->zone->container, - _("Shelf Settings"), - "E", "_shelf_config_dialog", - "preferences-desktop-shelf", 0, v, es); - es->config_dialog = cfd; - } + /* create config diaolg for bd object/data */ + cfd = e_config_dialog_new(es->zone->container, + _("Shelf Settings"), + "E", "_shelf_config_dialog", + "preferences-desktop-shelf", 0, v, es); + es->config_dialog = cfd; } /**--CREATE--**/ @@ -84,35 +84,40 @@ { cfdata->mode = MODE_CUSTOM; if ((cfdata->escfg->orient == E_GADCON_ORIENT_BOTTOM) && - ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "default"))) && + ((cfdata->escfg->style) && + (!strcmp(cfdata->escfg->style, "default"))) && (cfdata->escfg->fit_along == 1) && (cfdata->escfg->popup) && (cfdata->escfg->layer == 200)) cfdata->mode = MODE_BOTTOM_MIDDLE; else if ((cfdata->escfg->orient == E_GADCON_ORIENT_BOTTOM) && - ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "default"))) && + ((cfdata->escfg->style) && + (!strcmp(cfdata->escfg->style, "default"))) && (cfdata->escfg->fit_along == 0) && (cfdata->escfg->popup) && (cfdata->escfg->layer == 200)) cfdata->mode = MODE_BOTTOM_ALL; else if ((cfdata->escfg->orient == E_GADCON_ORIENT_BOTTOM) && - ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "invisible"))) && + ((cfdata->escfg->style) && + (!strcmp(cfdata->escfg->style, "invisible"))) && (cfdata->escfg->fit_along == 0) && (!cfdata->escfg->popup) && (cfdata->escfg->layer == 1)) cfdata->mode = MODE_BOTTOM_DESKTOP; else if ((cfdata->escfg->orient == E_GADCON_ORIENT_TOP) && - ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "default"))) && + ((cfdata->escfg->style) && + (!strcmp(cfdata->escfg->style, "default"))) && (cfdata->escfg->fit_along == 0) && (cfdata->escfg->popup) && (cfdata->escfg->layer == 200)) cfdata->mode = MODE_TOP_ALL; else if ((cfdata->escfg->orient == E_GADCON_ORIENT_TOP) && - ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "invisible"))) && + ((cfdata->escfg->style) && + (!strcmp(cfdata->escfg->style, "invisible"))) && (cfdata->escfg->fit_along == 0) && (!cfdata->escfg->popup) && (cfdata->escfg->layer == 1)) @@ -162,7 +167,7 @@ { Evas *evas; int x, y; - + if (!cfdata->desk_sel_list) return; evas = evas_object_evas_get(cfdata->desk_sel_list); evas_event_freeze(evas); @@ -177,17 +182,18 @@ Eina_List *l = NULL; desk = e_desk_at_xy_get(cfdata->es->zone, x, y); - e_widget_ilist_append(cfdata->desk_sel_list, NULL, desk->name, NULL, NULL, NULL); + e_widget_ilist_append(cfdata->desk_sel_list, NULL, desk->name, + NULL, NULL, NULL); for (l = cfdata->desk_list; l; l = l->next) { E_Config_Shelf_Desk *sd; - sd = l->data; - if (!sd) continue; + if (!(sd = l->data)) continue; if ((sd->x != x) || (sd->y != y)) continue; - e_widget_ilist_multi_select(cfdata->desk_sel_list, e_widget_ilist_count(cfdata->desk_sel_list)); + e_widget_ilist_multi_select(cfdata->desk_sel_list, + e_widget_ilist_count(cfdata->desk_sel_list)); break; } } @@ -221,7 +227,7 @@ /* Free the cfdata */ cfdata->es->config_dialog = NULL; eina_stringshare_del(cfdata->style); - free(cfdata); + E_FREE(cfdata); } /**--APPLY--**/ @@ -377,7 +383,7 @@ } else if (cfdata->layering == 1) { - if ((cfdata->escfg->popup != 1) || (cfdata->escfg->layer != 0)) + if ((cfdata->escfg->popup != 0) || (cfdata->escfg->layer != 1)) { restart = 1; cfdata->escfg->popup = 1; @@ -400,13 +406,14 @@ cfdata->escfg->autohide_show_action = cfdata->autohiding_show_action; cfdata->escfg->hide_timeout = cfdata->hide_timeout; cfdata->escfg->hide_duration = cfdata->hide_duration; - + cfdata->escfg->desk_show_mode = cfdata->desk_show_mode; cfdata->escfg->desk_list = NULL; if (cfdata->desk_show_mode) { - Eina_List *l; + Eina_List *l = NULL; Eina_List *desk_list = NULL; + for (idx = 0, l = e_widget_ilist_items_get(cfdata->desk_sel_list); l; l = l->next, idx++) { E_Ilist_Item *item; @@ -455,6 +462,7 @@ for (l = cfdata->escfg->desk_list; l; l = l->next) { E_Config_Shelf_Desk *sd; + sd = l->data; if ((desk->x == sd->x) && (desk->y == sd->y)) { @@ -505,17 +513,23 @@ of = e_widget_framelist_add(evas, _("Layout"), 0); rg = e_widget_radio_group_new(&(cfdata->mode)); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-dock", 64, 24, MODE_BOTTOM_MIDDLE, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-dock", + 64, 24, MODE_BOTTOM_MIDDLE, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-panel", 64, 24, MODE_BOTTOM_ALL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-panel", + 64, 24, MODE_BOTTOM_ALL, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-bottom-desk", 64, 24, MODE_BOTTOM_DESKTOP, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-bottom-desk", + 64, 24, MODE_BOTTOM_DESKTOP, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-menu-bar", 64, 24, MODE_TOP_ALL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-menu-bar", + 64, 24, MODE_TOP_ALL, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-top-desk", 64, 24, MODE_TOP_DESKTOP, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-top-desk", + 64, 24, MODE_TOP_DESKTOP, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-custom", 64, 24, MODE_CUSTOM, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-custom", + 64, 24, MODE_CUSTOM, rg); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(ol, of, 1, 1, 0.5); @@ -534,8 +548,9 @@ e_widget_list_object_append(ol, of, 1, 1, 0.5); e_widget_list_object_append(o, ol, 0, 0, 0.5); - - ob = e_widget_button_add(evas, _("Set Contents..."), "configure", _cb_configure, cfdata, NULL); + + ob = e_widget_button_add(evas, _("Set Contents..."), "configure", + _cb_configure, cfdata, NULL); e_widget_list_object_append(o, ob, 0, 0, 0.5); return o; @@ -565,44 +580,57 @@ e_widget_framelist_object_append(of, ob); ob = e_widget_radio_add(evas, _("Below Everything"), 0, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Allow windows to overlap the shelf"), &(cfdata->overlapping)); + ob = e_widget_check_add(evas, _("Allow windows to overlap the shelf"), + &(cfdata->overlapping)); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o2, of, 1, 1, 0.5); - + of = e_widget_framelist_add(evas, _("Layout"), 0); oi = e_widget_table_add(evas, 1); rg = e_widget_radio_group_new(&(cfdata->orient)); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left", 24, 24, E_GADCON_ORIENT_LEFT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left", + 24, 24, E_GADCON_ORIENT_LEFT, rg); e_widget_table_object_append(oi, ob, 0, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right", 24, 24, E_GADCON_ORIENT_RIGHT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right", + 24, 24, E_GADCON_ORIENT_RIGHT, rg); e_widget_table_object_append(oi, ob, 2, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top", 24, 24, E_GADCON_ORIENT_TOP, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top", + 24, 24, E_GADCON_ORIENT_TOP, rg); e_widget_table_object_append(oi, ob, 1, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom", 24, 24, E_GADCON_ORIENT_BOTTOM, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom", + 24, 24, E_GADCON_ORIENT_BOTTOM, rg); e_widget_table_object_append(oi, ob, 1, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-left", 24, 24, E_GADCON_ORIENT_CORNER_TL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-left", + 24, 24, E_GADCON_ORIENT_CORNER_TL, rg); e_widget_table_object_append(oi, ob, 0, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-right", 24, 24, E_GADCON_ORIENT_CORNER_TR, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-right", + 24, 24, E_GADCON_ORIENT_CORNER_TR, rg); e_widget_table_object_append(oi, ob, 2, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-left", 24, 24, E_GADCON_ORIENT_CORNER_BL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-left", + 24, 24, E_GADCON_ORIENT_CORNER_BL, rg); e_widget_table_object_append(oi, ob, 0, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-right", 24, 24, E_GADCON_ORIENT_CORNER_BR, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-right", + 24, 24, E_GADCON_ORIENT_CORNER_BR, rg); e_widget_table_object_append(oi, ob, 2, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-top", 24, 24, E_GADCON_ORIENT_CORNER_LT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-top", + 24, 24, E_GADCON_ORIENT_CORNER_LT, rg); e_widget_table_object_append(oi, ob, 0, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-top", 24, 24, E_GADCON_ORIENT_CORNER_RT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-top", + 24, 24, E_GADCON_ORIENT_CORNER_RT, rg); e_widget_table_object_append(oi, ob, 2, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-bottom", 24, 24, E_GADCON_ORIENT_CORNER_LB, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-bottom", + 24, 24, E_GADCON_ORIENT_CORNER_LB, rg); e_widget_table_object_append(oi, ob, 0, 3, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-bottom", 24, 24, E_GADCON_ORIENT_CORNER_RB, rg); + ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-bottom", + 24, 24, E_GADCON_ORIENT_CORNER_RB, rg); e_widget_table_object_append(oi, ob, 2, 3, 1, 1, 1, 1, 1, 1); e_widget_framelist_object_append(of, oi); - ob = e_widget_check_add(evas, _("Shrink to Content Size"), &(cfdata->fit_along)); + ob = e_widget_check_add(evas, _("Shrink to Content Size"), + &(cfdata->fit_along)); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o2, of, 1, 1, 0.5); e_widget_list_object_append(o, o2, 1, 1, 0.5); @@ -610,7 +638,8 @@ o2 = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Size"), 0); - ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL, &(cfdata->size), 100); + ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, + NULL, &(cfdata->size), 100); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o2, of, 1, 1, 0.5); @@ -632,8 +661,7 @@ e_theme_edje_object_set(oj, "base/theme/shelf", buf); e_livethumb_thumb_set(ob, oj); e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data); - if (!strcmp(cfdata->es->style, (char *)l->data)) - sel = n; + if (!strcmp(cfdata->es->style, (char *)l->data)) sel = n; } e_widget_min_size_get(oi, &wmw, &wmh); e_widget_min_size_set(oi, wmw, 160); @@ -645,15 +673,17 @@ e_widget_list_object_append(o2, of, 1, 1, 0.5); - ob = e_widget_button_add(evas, _("Set Contents..."), "configure", _cb_configure, cfdata, NULL); + ob = e_widget_button_add(evas, _("Set Contents..."), "configure", + _cb_configure, cfdata, NULL); e_widget_list_object_append(o2, ob, 0, 0, 0.5); - + e_widget_list_object_append(o, o2, 0, 0, 0.0); o2 = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Auto Hide"), 0); - autohide_check = e_widget_check_add(evas, _("Auto-hide the shelf"), &(cfdata->autohiding)); + autohide_check = e_widget_check_add(evas, _("Auto-hide the shelf"), + &(cfdata->autohiding)); e_widget_framelist_object_append(of, autohide_check); rg = e_widget_radio_group_new(&(cfdata->autohiding_show_action)); ob = e_widget_radio_add(evas, _("Show on mouse in"), 0, rg); @@ -668,7 +698,8 @@ cfdata->autohide_list = eina_list_append (cfdata->autohide_list, ob); e_widget_disabled_set(ob, !cfdata->autohiding); // set state from saved config e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.2, 6.0, 0.2, 0, &(cfdata->hide_timeout), NULL, 60); + ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.2, 6.0, 0.2, 0, + &(cfdata->hide_timeout), NULL, 60); cfdata->autohide_list = eina_list_append (cfdata->autohide_list, ob); e_widget_disabled_set(ob, !cfdata->autohiding); // set state from saved config e_widget_framelist_object_append(of, ob); @@ -676,13 +707,15 @@ cfdata->autohide_list = eina_list_append (cfdata->autohide_list, ob); e_widget_disabled_set(ob, !cfdata->autohiding); // set state from saved config e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.1, 2.0, 0.1, 0, &(cfdata->hide_duration), NULL, 60); + ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.1, 2.0, 0.1, 0, + &(cfdata->hide_duration), NULL, 60); cfdata->autohide_list = eina_list_append (cfdata->autohide_list, ob); e_widget_disabled_set(ob, !cfdata->autohiding); // set state from saved config e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o2, of, 1, 1, 0.5); // handler for enable/disable widget array - e_widget_on_change_hook_set(autohide_check, _cb_disable_check_list, cfdata->autohide_list); + e_widget_on_change_hook_set(autohide_check, _cb_disable_check_list, + cfdata->autohide_list); of = e_widget_framelist_add(evas, _("Desktop"), 0); rg = e_widget_radio_group_new(&(cfdata->desk_show_mode)); @@ -701,9 +734,8 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o2, of, 1, 1, 0.5); + e_widget_list_object_append(o, o2, 0, 0, 0.0); - e_widget_list_object_append(o, o2, 0, 0, 0.0); - return o; } @@ -719,5 +751,5 @@ Evas_Object *o; EINA_LIST_FOREACH(list, l, o) - e_widget_disabled_set(o, !e_widget_check_checked_get(obj)); + e_widget_disabled_set(o, !e_widget_check_checked_get(obj)); } |
From: Enlightenment S. <no-...@en...> - 2009-07-24 18:31:24
|
Log: Remove useless printf. Author: devilhorns Date: 2009-07-24 11:31:05 -0700 (Fri, 24 Jul 2009) New Revision: 41491 Modified: trunk/e/src/bin/e_prefix.c Modified: trunk/e/src/bin/e_prefix.c =================================================================== --- trunk/e/src/bin/e_prefix.c 2009-07-24 14:59:52 UTC (rev 41490) +++ trunk/e/src/bin/e_prefix.c 2009-07-24 18:31:05 UTC (rev 41491) @@ -31,7 +31,6 @@ { char *p, buf[4096]; - printf("e_prefix_determine()\n"); e_prefix_shutdown(); /* if user provides E_PREFIX - then use that or also more specific sub |
From: Enlightenment S. <no-...@en...> - 2009-07-25 04:59:50
|
Log: Give the Send To Desktop submenu the same bg previews that the main menu has for Virtual Desktops. Author: devilhorns Date: 2009-07-24 21:59:35 -0700 (Fri, 24 Jul 2009) New Revision: 41494 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-07-25 04:52:34 UTC (rev 41493) +++ trunk/e/src/bin/e_int_border_menu.c 2009-07-25 04:59:35 UTC (rev 41494) @@ -29,6 +29,7 @@ static void _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_border_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_pin(void *data, E_Menu *m, E_Menu_Item *mi); @@ -704,6 +705,28 @@ if (bd->remember) e_remember_update(bd->remember, bd); } +static void +_e_border_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Desk *desk = NULL; + Evas_Object *o = NULL; + const char *bgfile = NULL; + int tw = 0, th = 0; + + desk = data; + E_OBJECT_CHECK(desk); + + tw = 50; + th = (tw * desk->zone->h) / desk->zone->w; + bgfile = e_bg_file_get(desk->zone->container->num, desk->zone->num, + desk->x, desk->y); + o = e_thumb_icon_add(m->evas); + e_thumb_icon_file_set(o, bgfile, "e/desktop/background"); + e_thumb_icon_size_set(o, tw, th); + e_thumb_icon_begin(o); + mi->icon_object = o; +} + static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -731,6 +754,7 @@ e_menu_item_radio_group_set(submi, 2); e_menu_item_toggle_set(submi, (desk_cur == desk ? 1 : 0)); e_menu_item_callback_set(submi, _e_border_menu_cb_sendto, desk); + e_menu_item_realize_callback_set(submi, _e_border_menu_cb_sendto_icon_pre, desk); } } |