[EGIT] [core/elementary] master 01/01: fix my theme version fix to not version extns/overlays
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=fda28bfcfd1ab4b56f75173a926256934eed3942 commit fda28bfcfd1ab4b56f75173a926256934eed3942 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Mar 28 16:17:38 2014 +0900 fix my theme version fix to not version extns/overlays --- src/lib/elm_theme.c | 36 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c index 9ba16f5..bf77c3f 100644 --- a/src/lib/elm_theme.c +++ b/src/lib/elm_theme.c @@ -29,18 +29,22 @@ static inline void _elm_theme_item_finalize(Elm_Theme_Files *files, const char *item, Eina_File *f, - Eina_Bool prepend) + Eina_Bool prepend, + Eina_Bool istheme) { - char *version; - if (!f) return; - if (!(version = edje_mmap_data_get(f, version))) return; - if (atoi(version) 110) // bump this version number when we need to + if (istheme) { +char *version; + +if (!(version = edje_mmap_data_get(f, version))) return; +if (atoi(version) 110) // bump this version number when we need to + { + free(version); + return; + } free(version); -return; } - free(version); if (prepend) { files-items = eina_list_prepend(files-items, @@ -56,7 +60,7 @@ _elm_theme_item_finalize(Elm_Theme_Files *files, } static void -_elm_theme_file_item_add(Elm_Theme_Files *files, const char *item, Eina_Bool prepend) +_elm_theme_file_item_add(Elm_Theme_Files *files, const char *item, Eina_Bool prepend, Eina_Bool istheme) { Eina_Strbuf *buf = NULL; Eina_File *f = NULL; @@ -86,7 +90,7 @@ _elm_theme_file_item_add(Elm_Theme_Files *files, const char *item, Eina_Bool pre %s/ELEMENTARY_BASE_DIR/themes/%s.edj, home, item); f = eina_file_open(eina_strbuf_string_get(buf), EINA_FALSE); -_elm_theme_item_finalize(files, item, f, prepend); +_elm_theme_item_finalize(files, item, f, prepend, istheme); eina_strbuf_reset(buf); eina_strbuf_append_printf(buf, @@ -96,7 +100,7 @@ _elm_theme_file_item_add(Elm_Theme_Files *files, const char *item, Eina_Bool pre /* Finalize will be done by the common one */ } - _elm_theme_item_finalize(files, item, f, prepend); + _elm_theme_item_finalize(files, item, f, prepend, istheme); on_error: if (buf) eina_strbuf_free(buf); @@ -469,7 +473,7 @@ _elm_theme_parse(Elm_Theme *th, const char *theme) EINA_LIST_FREE(th-themes.handles, f) eina_file_close(f); EINA_LIST_FREE(names, p) - _elm_theme_file_item_add(th-themes, p, EINA_FALSE); + _elm_theme_file_item_add(th-themes, p, EINA_FALSE, EINA_TRUE); return EINA_TRUE; } @@ -491,7 +495,7 @@ elm_theme_new(void) Elm_Theme *th = calloc(1, sizeof(Elm_Theme)); if (!th) return NULL; th-ref = 1; - _elm_theme_file_item_add(th-themes, default, EINA_FALSE); + _elm_theme_file_item_add(th-themes, default, EINA_FALSE, EINA_TRUE); themes = eina_list_append(themes, th); return th; } @@ -579,7 +583,7 @@ elm_theme_overlay_add(Elm_Theme *th, const char *item) { if (!item) return; if (!th) th = (theme_default); - _elm_theme_file_item_add(th-overlay, item, EINA_TRUE); + _elm_theme_file_item_add(th-overlay, item, EINA_TRUE, EINA_FALSE); elm_theme_flush(th); } @@ -598,7 +602,7 @@ elm_theme_overlay_mmap_add(Elm_Theme *th, const Eina_File *f) Eina_File *file = eina_file_dup(f); if (!th) th = (theme_default); - _elm_theme_item_finalize(th-overlay, eina_file_filename_get(file), file, EINA_TRUE); + _elm_theme_item_finalize(th-overlay, eina_file_filename_get(file), file, EINA_TRUE, EINA_FALSE); elm_theme_flush(th); } @@ -623,7 +627,7 @@ elm_theme_extension_add(Elm_Theme *th, const char *item) { if (!item) return; if (!th) th = (theme_default); - _elm_theme_file_item_add(th-extension, item, EINA_FALSE); + _elm_theme_file_item_add(th-extension, item, EINA_FALSE, EINA_FALSE); elm_theme_flush(th); } @@ -643,7 +647,7 @@ elm_theme_extension_mmap_add(Elm_Theme *th, const Eina_File *f) if (!f) return; if (!th) th = (theme_default); - _elm_theme_item_finalize(th-overlay, eina_file_filename_get(file), file, EINA_FALSE); + _elm_theme_item_finalize(th-overlay, eina_file_filename_get(file), file, EINA_FALSE, EINA_FALSE); elm_theme_flush(th); } --
[EGIT] [core/elementary] master 01/01: win - reduce code duplication and move accel prefernce into single func
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0992d05e77d8a6184621f0baebbae705d3ff6e99 commit 0992d05e77d8a6184621f0baebbae705d3ff6e99 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Mar 28 16:28:31 2014 +0900 win - reduce code duplication and move accel prefernce into single func --- src/lib/elm_win.c | 56 --- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 6c0bf7b..45682f0 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -2842,6 +2842,22 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) evas_object_smart_changed(sd-layout); } +static Eina_Bool +_accel_is_gl(void) +{ + if ((_elm_accel_preference) + ((!strcasecmp(_elm_accel_preference, gl)) || + (!strcasecmp(_elm_accel_preference, opengl)) || + (!strcasecmp(_elm_accel_preference, 3d)) || + (!strcasecmp(_elm_accel_preference, hw)) || + (!strcasecmp(_elm_accel_preference, accel)) || + (!strcasecmp(_elm_accel_preference, hardware)) || + (!strcasecmp(_elm_accel_preference, accel)) + )) + return EINA_TRUE; + return EINA_FALSE; +} + static void _win_constructor(Eo *obj, void *_pd, va_list *list) { @@ -2895,15 +2911,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list) disp = getenv(ELM_DISPLAY); if ((disp) (!strcmp(disp, x11))) { - if ((_elm_accel_preference) - ((!strcasecmp(_elm_accel_preference, gl)) || - (!strcasecmp(_elm_accel_preference, opengl)) || - (!strcasecmp(_elm_accel_preference, 3d)) || - (!strcasecmp(_elm_accel_preference, hw)) || - (!strcasecmp(_elm_accel_preference, accel)) || - (!strcasecmp(_elm_accel_preference, hardware)) || - (!strcasecmp(_elm_accel_preference, accel)) - )) + if (_accel_is_gl()) { enginelist[0] = ELM_OPENGL_X11; enginelist[1] = ELM_SOFTWARE_X11; @@ -2919,15 +2927,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list) } else if ((disp) (!strcmp(disp, wl))) { - if ((_elm_accel_preference) - ((!strcasecmp(_elm_accel_preference, gl)) || - (!strcasecmp(_elm_accel_preference, opengl)) || - (!strcasecmp(_elm_accel_preference, 3d)) || - (!strcasecmp(_elm_accel_preference, hw)) || - (!strcasecmp(_elm_accel_preference, accel)) || - (!strcasecmp(_elm_accel_preference, hardware)) || - (!strcasecmp(_elm_accel_preference, accel)) - )) + if (_accel_is_gl()) { enginelist[0] = ELM_WAYLAND_EGL; enginelist[1] = ELM_WAYLAND_SHM; @@ -2949,15 +2949,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list) } else if ((disp) (!strcmp(disp, sdl))) { - if ((_elm_accel_preference) - ((!strcasecmp(_elm_accel_preference, gl)) || - (!strcasecmp(_elm_accel_preference, opengl)) || - (!strcasecmp(_elm_accel_preference, 3d)) || - (!strcasecmp(_elm_accel_preference, hw)) || - (!strcasecmp(_elm_accel_preference, accel)) || - (!strcasecmp(_elm_accel_preference, hardware)) || - (!strcasecmp(_elm_accel_preference, accel)) - )) + if (_accel_is_gl()) { enginelist[0] = ELM_OPENGL_SDL; enginelist[1] = ELM_SOFTWARE_SDL; @@ -3008,15 +3000,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list) } else { - if ((_elm_accel_preference) - ((!strcasecmp(_elm_accel_preference, gl)) || - (!strcasecmp(_elm_accel_preference, opengl)) || - (!strcasecmp(_elm_accel_preference, 3d)) || - (!strcasecmp(_elm_accel_preference, hw)) || - (!strcasecmp(_elm_accel_preference, accel)) || - (!strcasecmp(_elm_accel_preference, hardware)) || - (!strcasecmp(_elm_accel_preference, accel)) - )) + if (_accel_is_gl()) { enginelist[0] = ELM_OPENGL_X11; enginelist[1] = ELM_WAYLAND_EGL; --
[EGIT] [core/elementary] master 01/01: remove duplicate strcmp
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=691250b1df45ef6015fc0bdeeaedad503a6e9290 commit 691250b1df45ef6015fc0bdeeaedad503a6e9290 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Mar 28 16:35:52 2014 +0900 remove duplicate strcmp --- src/lib/elm_win.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 45682f0..9794ab9 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -2847,12 +2847,11 @@ _accel_is_gl(void) { if ((_elm_accel_preference) ((!strcasecmp(_elm_accel_preference, gl)) || - (!strcasecmp(_elm_accel_preference, opengl)) || - (!strcasecmp(_elm_accel_preference, 3d)) || - (!strcasecmp(_elm_accel_preference, hw)) || - (!strcasecmp(_elm_accel_preference, accel)) || - (!strcasecmp(_elm_accel_preference, hardware)) || - (!strcasecmp(_elm_accel_preference, accel)) +(!strcasecmp(_elm_accel_preference, opengl)) || +(!strcasecmp(_elm_accel_preference, 3d)) || +(!strcasecmp(_elm_accel_preference, hw)) || +(!strcasecmp(_elm_accel_preference, accel)) || +(!strcasecmp(_elm_accel_preference, hardware)) )) return EINA_TRUE; return EINA_FALSE; --
[EGIT] [core/efl] master 01/01: fix ecore_fb handling of escape and alt
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=71a9b7f5e9f5cca64d94cbf419687131f47c2984 commit 71a9b7f5e9f5cca64d94cbf419687131f47c2984 Author: John Magolske listm...@b79.net Date: Fri Mar 28 17:16:24 2014 +0900 fix ecore_fb handling of escape and alt as per mail to enlightenment-us...@lists.sourceforge.net by: John Magolske listm...@b79.net Date: Fri, 28 Mar 2014 01:03:40 -0700 --- src/lib/ecore_fb/ecore_fb_li.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/ecore_fb/ecore_fb_li.c b/src/lib/ecore_fb/ecore_fb_li.c index 4d6ec34..43e876d 100644 --- a/src/lib/ecore_fb/ecore_fb_li.c +++ b/src/lib/ecore_fb/ecore_fb_li.c @@ -123,10 +123,9 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie strcpy((char *)e-compose, compose); e-modifiers = 0; -if (dev-keyboard.shift) - e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; +if (dev-keyboard.shift) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev-keyboard.ctrl) e-modifiers |= ECORE_EVENT_MODIFIER_CTRL; -if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; +if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev-keyboard.lock) e-modifiers |= ECORE_EVENT_LOCK_CAPS; e-timestamp = ecore_loop_time_get() * 1000.0; @@ -187,10 +186,9 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie e-same_screen = 1; e-modifiers = 0; -if (dev-keyboard.shift) - e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; +if (dev-keyboard.shift) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev-keyboard.ctrl) e-modifiers |= ECORE_EVENT_MODIFIER_CTRL; -if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; +if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev-keyboard.lock) e-modifiers |= ECORE_EVENT_LOCK_CAPS; e-x = dev-mouse.x; @@ -251,7 +249,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie e-modifiers = 0; if (dev-keyboard.shift) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev-keyboard.ctrl) e-modifiers |= ECORE_EVENT_MODIFIER_CTRL; - if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev-keyboard.lock) e-modifiers |= ECORE_EVENT_LOCK_CAPS; e-x = dev-mouse.x; @@ -289,7 +287,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie e-modifiers = 0; if (dev-keyboard.shift) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev-keyboard.ctrl) e-modifiers |= ECORE_EVENT_MODIFIER_CTRL; - if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev-keyboard.alt) e-modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev-keyboard.lock) e-modifiers |= ECORE_EVENT_LOCK_CAPS; e-timestamp = ecore_loop_time_get() * 1000.0; --
[EGIT] [core/efl] master 01/01: ecore-fb - also actually make escape work
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cc645d1edb5d3956f4ba332059ab97e1896f8941 commit cc645d1edb5d3956f4ba332059ab97e1896f8941 Author: John Magolske listm...@b79.net Date: Fri Mar 28 17:19:11 2014 +0900 ecore-fb - also actually make escape work --- src/lib/ecore_fb/ecore_fb_keytable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_fb/ecore_fb_keytable.h b/src/lib/ecore_fb/ecore_fb_keytable.h index 70bf6b9..a871870 100644 --- a/src/lib/ecore_fb/ecore_fb_keytable.h +++ b/src/lib/ecore_fb/ecore_fb_keytable.h @@ -1,6 +1,6 @@ /* this table was taken from ecore_fb, is the default en layout */ 0x00, 0x00, 0x00, /**/,,, NULL,/***/ - Escape,Escape,Escape, /**/,,, \x1b,/***/ + Escape,Escape,Escape, /**/\033,\033,\033,\033,/***/ 1,exclam, 1, /**/1, !, 1, NULL,/***/ 2,at, 2, /**/2, @, 2, ,/***/ 3,numbersign, 3, /**/3, #, 3, \x1b,/***/ --
[E-devel] (no subject)
Hello, I have been testing the new E18 on my notebook, which has an Intel GMA 3150 graphics chip, and it is terribly slow. I have been searching for a solution on Google but all I found was this: On Sun, 1 Dec 2013 19:29:49 -0600 Jeff Hoogland JeffHoogland@... said: It is in fact the 3150 THAT would be your problem then. that gpu is the black sheep of the intel gpu family. it's half accelerated. it has a hw fragment shader but NOT a hw vertex shader. it is the ONLY gpu i know of that does this. they either have both, or none. in the case of none - evas gl engine fails to init. :) what you see if intel's driver using a software fallback vertex shader emulation. there isn't much to be done here. the difference between e17 and e18 is that e18 exposes more geometry to the gpu. in all cases except the 3150, this is in fact highly efficient and saves memory and overhead. the whole reason you can now do shaped borders with no extra major cost in e18 is because we do this. even keith packard advises to ignore that gpu and pretend it never existed. :) and he works at intel. :) Basically, I am wondering if there is some way of limiting the geometry, and not completely disabling OpenGL, maybe some intel patch, I am not very savvy in OpenGL or E so basically I wouldn't know where to start looking to make such a patch. As I saw E is a window manager that tries to be light and well, it is basically for older/less powerfull computers (as I understand, and the reason I started using it), and a lot of notebooks are using this GMA 3150 chipset, so I think it would be a shame if this problem is simply ignored. Regards -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: silence complaints getting top widget if object is not an elm widget
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4baf67cb28eb1796d80f045787cc8843e256f50c commit 4baf67cb28eb1796d80f045787cc8843e256f50c Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Mar 28 18:22:49 2014 +0900 silence complaints getting top widget if object is not an elm widget --- src/lib/elm_cnp.c| 31 --- src/lib/elm_widget.c | 1 + 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index d261d93..0d08c01 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -1784,13 +1784,16 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj) Evas_Object *top, *par; Ecore_X_Window xwin = 0; - top = elm_widget_top_get(obj); - if (!top) + if (elm_widget_is(obj)) { -par = elm_widget_parent_widget_get(obj); -if (par) top = elm_widget_top_get(par); +top = elm_widget_top_get(obj); +if (!top) + { + par = elm_widget_parent_widget_get(obj); + if (par) top = elm_widget_top_get(par); + } +if (top) xwin = elm_win_xwindow_get(top); } - if (top) xwin = elm_win_xwindow_get(top); if (!xwin) { Ecore_Evas *ee; @@ -2188,9 +2191,12 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, elm_win_override_set(dragwin, EINA_TRUE); /* dragwin has to be rotated as the main window is */ - Evas_Object *win = elm_widget_top_get(obj); - if (win eo_isa(win, ELM_OBJ_WIN_CLASS)) - elm_win_rotation_set(dragwin, elm_win_rotation_get(win)); + if (elm_widget_is(obj)) + { +Evas_Object *win = elm_widget_top_get(obj); +if (win eo_isa(win, ELM_OBJ_WIN_CLASS)) + elm_win_rotation_set(dragwin, elm_win_rotation_get(win)); + } if (createicon) { @@ -3379,9 +3385,12 @@ _wl_elm_widget_window_get(Evas_Object *obj) Evas_Object *top; Ecore_Wl_Window *win = NULL; - top = elm_widget_top_get(obj); - if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj)); - if (top) win = elm_win_wl_window_get(top); + if (elm_widget_is(obj)) + { +top = elm_widget_top_get(obj); +if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj)); +if (top) win = elm_win_wl_window_get(top); + } if (!win) { Ecore_Evas *ee; diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 2ad01bd..aac52d4 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -1422,6 +1422,7 @@ _elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd) if (sd-parent_obj) { Evas_Object *int_ret = NULL; +if (!eo_isa(sd-parent_obj, ELM_OBJ_WIDGET_CLASS)) return NULL; eo_do((Eo *) sd-parent_obj, elm_obj_widget_top_get(int_ret)); return int_ret; } --
[EGIT] [core/enlightenment] master 02/02: music-control: Do not leak the allocated metadata strings
stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ff874b128a43e428f8acbb3869551b130fd44cee commit ff874b128a43e428f8acbb3869551b130fd44cee Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Mar 28 10:51:29 2014 +0100 music-control: Do not leak the allocated metadata strings Fix for ca07e7d505274377635fda2a79d8ac8c61877ea6 Thanks are going to Davide Andreoli for spotting it. --- src/modules/music-control/e_mod_main.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/music-control/e_mod_main.c b/src/modules/music-control/e_mod_main.c index b8e7244..367 100644 --- a/src/modules/music-control/e_mod_main.c +++ b/src/modules/music-control/e_mod_main.c @@ -224,7 +224,8 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) for (i = 0; i eina_value_array_count(array); i++) { -const char *key, *str_val, *str_markup; +const char *key, *str_val; +char *str_markup; Eina_Value st, subst; Efreet_Uri *uri; @@ -236,6 +237,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) eina_value_struct_get(subst, arg0, str_val); str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); ctxt-meta_title = eina_stringshare_add(str_markup); + free(str_markup); eina_value_flush(subst); } else if (!strcmp(key, xesam:album)) @@ -244,6 +246,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) eina_value_struct_get(subst, arg0, str_val); str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); ctxt-meta_album = eina_stringshare_add(str_markup); + free(str_markup); eina_value_flush(subst); } else if (!strcmp(key, xesam:artist)) @@ -254,6 +257,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) eina_value_array_get(arr, 0, str_val); str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); ctxt-meta_artist = eina_stringshare_add(str_markup); + free(str_markup); eina_value_flush(arr); eina_value_flush(subst); } --
[EGIT] [core/enlightenment] master 01/02: modules/ibar: Fix condition check for edje emits
stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4edf57320ef9468a750a61b0b156a8306cd950ef commit 4edf57320ef9468a750a61b0b156a8306cd950ef Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Mar 28 10:14:37 2014 +0100 modules/ibar: Fix condition check for edje emits This fixes a copy and paste error which sneaked into daa98e867d5340fac9ee087e637be38f653b01fe CID 1194780 --- src/modules/ibar/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 78e380c..6baa076 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -1007,7 +1007,7 @@ _ibar_icon_signal_emit(IBar_Icon *ic, char *sig, char *src) edje_object_signal_emit(e_icon_edje_get(ic-o_icon), sig, src); if (ic-o_holder2) edje_object_signal_emit(ic-o_holder2, sig, src); - if (ic-o_icon2 e_icon_edje_get(ic-o_icon)) + if (ic-o_icon2 e_icon_edje_get(ic-o_icon2)) edje_object_signal_emit(e_icon_edje_get(ic-o_icon2), sig, src); } --
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: bugfix: music_control: Use correct markup for metadata text.
Hello. On Thu, 2014-03-27 at 20:38, Davide Andreoli wrote: 2014-03-27 12:52 GMT+01:00 Stefan Schmidt ste...@datenfreihafen.org: stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ca07e7d505274377635fda2a79d8ac8c61877ea6 commit ca07e7d505274377635fda2a79d8ac8c61877ea6 Author: Stefan Schmidt s.schm...@samsung.com Date: Thu Mar 27 12:47:21 2014 +0100 bugfix: music_control: Use correct markup for metadata text. We piped the plain metadata text to edje TEXTBLOCK which might interpret some of the characters as markup. Better convert it to the correct markup first. The actual bug case was a in the metadata cut off the rest of the text. Now we get the correct amp before sending it of to edje. Fixes T1061 --- src/modules/music-control/e_mod_main.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/music-control/e_mod_main.c b/src/modules/music-control/e_mod_main.c index 58bf32f..b8e7244 100644 --- a/src/modules/music-control/e_mod_main.c +++ b/src/modules/music-control/e_mod_main.c @@ -224,7 +224,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) for (i = 0; i eina_value_array_count(array); i++) { -const char *key, *str_val; +const char *key, *str_val, *str_markup; Eina_Value st, subst; Efreet_Uri *uri; @@ -234,14 +234,16 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) { eina_value_struct_value_get(st, arg1, subst); eina_value_struct_get(subst, arg0, str_val); - ctxt-meta_title = eina_stringshare_add(str_val); + str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); + ctxt-meta_title = eina_stringshare_add(str_markup); eina_value_flush(subst); I think that the string returned by evas_textblock_text_utf8_to_markup() must be freed after usage. Aren't you leaking 3 times in this case? Nicely spotted. I do indeed. Was to focused on getting the markup right that I ignored that the returned string comes from a eina_strbuf_string_steal in the end and we need to handle the free'ing. Thanks for having an eye on it. Fixed now in master and also the e18 branch. regards Stefan Schmidt -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: music-control: Do not leak the allocated metadata strings
stefan pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c4b4d2ed587b71dbf01e85043a93c545882234bf commit c4b4d2ed587b71dbf01e85043a93c545882234bf Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Mar 28 10:51:29 2014 +0100 music-control: Do not leak the allocated metadata strings Fix for ca07e7d505274377635fda2a79d8ac8c61877ea6 Thanks are going to Davide Andreoli for spotting it. --- src/modules/music-control/e_mod_main.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/music-control/e_mod_main.c b/src/modules/music-control/e_mod_main.c index b8e7244..367 100644 --- a/src/modules/music-control/e_mod_main.c +++ b/src/modules/music-control/e_mod_main.c @@ -224,7 +224,8 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) for (i = 0; i eina_value_array_count(array); i++) { -const char *key, *str_val, *str_markup; +const char *key, *str_val; +char *str_markup; Eina_Value st, subst; Efreet_Uri *uri; @@ -236,6 +237,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) eina_value_struct_get(subst, arg0, str_val); str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); ctxt-meta_title = eina_stringshare_add(str_markup); + free(str_markup); eina_value_flush(subst); } else if (!strcmp(key, xesam:album)) @@ -244,6 +246,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) eina_value_struct_get(subst, arg0, str_val); str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); ctxt-meta_album = eina_stringshare_add(str_markup); + free(str_markup); eina_value_flush(subst); } else if (!strcmp(key, xesam:artist)) @@ -254,6 +257,7 @@ parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) eina_value_array_get(arr, 0, str_val); str_markup = evas_textblock_text_utf8_to_markup(NULL, str_val); ctxt-meta_artist = eina_stringshare_add(str_markup); + free(str_markup); eina_value_flush(arr); eina_value_flush(subst); } --
[EGIT] [core/elementary] master 01/01: win - fix reset to 0 0 geom when window resizes. should stay at cur pos
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=aa1964d5ab1ebe10cc6ffc8f22622551e75561f4 commit aa1964d5ab1ebe10cc6ffc8f22622551e75561f4 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Mar 28 20:08:19 2014 +0900 win - fix reset to 0 0 geom when window resizes. should stay at cur pos this is a side-effect of the fix to track actual position properly --- src/lib/elm_win.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 9794ab9..31e215a 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1998,7 +1998,6 @@ _elm_win_resize_objects_eval(Evas_Object *obj) if (h minh) h = minh; if (w maxw) w = maxw; if (h maxh) h = maxh; - evas_object_move(obj, 0, 0); evas_object_resize(obj, w, h); } --
[EGIT] [core/elementary] master 01/01: label: Remove unused setting of foundflag before return.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=5ce7f0e233a3db8b34af35655e15127e79dbda1f commit 5ce7f0e233a3db8b34af35655e15127e79dbda1f Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Mar 28 15:46:12 2014 +0100 label: Remove unused setting of foundflag before return. We are never going to check on foundflag here because we return right after setting it. Clear the code up a bit by not setting it at all. Found by Clang scan-build --- src/lib/elm_label.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c index 3ad10ed..071ccaa 100644 --- a/src/lib/elm_label.c +++ b/src/lib/elm_label.c @@ -232,10 +232,8 @@ _get_value_in_key_string(const char *oldstring, const char *key, char **value) int key_len = strlen(key); endtag = curlocater + key_len; if ((!endtag) || (*endtag != '=')) - { - foundflag = 0; return -1; - } + firstindex = abs(oldstring - curlocater); firstindex += key_len + 1; // strlen(key) + strlen(=) *value = (char *)oldstring + firstindex; --
[EGIT] [core/enlightenment] enlightenment-0.18 01/04: bugfix: ibar now scrolls correctly during drags
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5b82aa30b8cb18e338c8380621c38b3a5663dc5c commit 5b82aa30b8cb18e338c8380621c38b3a5663dc5c Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 09:32:51 2014 -0400 bugfix: ibar now scrolls correctly during drags fix T794 --- src/modules/ibar/e_mod_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 381bda3..0c1a951 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -1668,11 +1668,13 @@ _ibar_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) { E_Event_Dnd_Move *ev; Instance *inst; + int x, y; ev = event_info; inst = data; _ibar_drop_position_update(inst, ev-x, ev-y); - e_gadcon_client_autoscroll_update(inst-gcc, ev-x, ev-y); + evas_object_geometry_get(inst-ibar-o_outerbox, x, y, NULL, NULL); + e_gadcon_client_autoscroll_update(inst-gcc, ev-x - x, ev-y - y); } static void --
[EGIT] [core/enlightenment] master 04/04: bugfix: efm current .desktop fetching now returns the right .desktop
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a291211b1355befc2febfdac844f4bc9e9fc3e1b commit a291211b1355befc2febfdac844f4bc9e9fc3e1b Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 12:17:35 2014 -0400 bugfix: efm current .desktop fetching now returns the right .desktop fix T792 --- src/bin/e_fm.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index bc6bec0..225cad2 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -10085,11 +10085,16 @@ _e_fm2_desktop_open(E_Fm2_Smart_Data *sd) Eina_Bool ret; snprintf(buf, sizeof(buf), %s/.directory.desktop, sd-realpath); + if (sd-desktop) + { +if (!e_util_strcmp(buf, sd-desktop-orig_path)) return 1; + } ret = ecore_file_exists(buf) ? ecore_file_can_write(buf) : ecore_file_can_write(sd-realpath); if (!ret) return -1; ef = efreet_desktop_new(buf); if (!ef) return 0; + efreet_desktop_free(sd-desktop); sd-desktop = ef; return 1; } @@ -11625,6 +11630,7 @@ EAPI Efreet_Desktop * e_fm2_desktop_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); + if (_e_fm2_desktop_open(sd) != 1) return NULL; return sd-desktop; } --
[EGIT] [core/enlightenment] enlightenment-0.18 02/04: stringshare_replace in fwin: it exists for a reason, stop using macros ffs
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=95f99123b45b7926d172de039fcc8a6150154ac1 commit 95f99123b45b7926d172de039fcc8a6150154ac1 Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 09:43:05 2014 -0400 stringshare_replace in fwin: it exists for a reason, stop using macros ffs --- src/modules/fileman/e_fwin.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index ca7bf16..49e1fca 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1709,12 +1709,10 @@ _e_fwin_changed(void *data, } else { -#define RELEASE_STR(x) if (x) {eina_stringshare_del(x); (x) = NULL; } -RELEASE_STR(fwin-wallpaper_file); -RELEASE_STR(fwin-overlay_file); -RELEASE_STR(fwin-scrollframe_file); -RELEASE_STR(fwin-theme_file); -#undef RELEASE_STR +eina_stringshare_replace(fwin-wallpaper_file, NULL); +eina_stringshare_replace(fwin-overlay_file, NULL); +eina_stringshare_replace(fwin-scrollframe_file, NULL); +eina_stringshare_replace(fwin-theme_file, NULL); } if (fwin-under_obj) evas_object_hide(fwin-under_obj); if (fwin-wallpaper_file) --
[EGIT] [core/enlightenment] enlightenment-0.18 03/04: bugfix: swallow efm background objects after applying theme
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=926ebca4bbbef27a10da50188b30c4e2b0c1adca commit 926ebca4bbbef27a10da50188b30c4e2b0c1adca Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 12:17:00 2014 -0400 bugfix: swallow efm background objects after applying theme fix T792 --- src/modules/fileman/e_fwin.c | 58 +++- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 49e1fca..7c2f92b 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1714,7 +1714,31 @@ _e_fwin_changed(void *data, eina_stringshare_replace(fwin-scrollframe_file, NULL); eina_stringshare_replace(fwin-theme_file, NULL); } - if (fwin-under_obj) evas_object_hide(fwin-under_obj); + if (page-scrollframe_obj) + { +if ((fwin-scrollframe_file) +(e_util_edje_collection_exists(fwin-scrollframe_file, + e/fileman/default/scrollframe))) + e_scrollframe_custom_edje_file_set(page-scr, + (char *)fwin-scrollframe_file, + e/fileman/default/scrollframe); +else + { + if (fwin-zone) + e_scrollframe_custom_theme_set(page-scr, + base/theme/fileman, + e/fileman/desktop/scrollframe); + else + e_scrollframe_custom_theme_set(page-scr, + base/theme/fileman, + e/fileman/default/scrollframe); + } +e_scrollframe_child_pos_set(page-scr, 0, 0); + } + if ((fwin-theme_file) (ecore_file_exists(fwin-theme_file))) + e_fm2_custom_theme_set(obj, fwin-theme_file); + else + e_fm2_custom_theme_set(obj, NULL); if (fwin-wallpaper_file) { if (eina_str_has_extension(fwin-wallpaper_file, edj)) @@ -1738,15 +1762,18 @@ _e_fwin_changed(void *data, } if (fwin-under_obj) { - edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), + edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), e.swallow.bg, fwin-under_obj); evas_object_pass_events_set(fwin-under_obj, 1); evas_object_show(fwin-under_obj); } } else - edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), + { +edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), e.swallow.bg, NULL); +if (fwin-under_obj) evas_object_hide(fwin-under_obj); + } if (fwin-over_obj) { //printf(over obj\n); @@ -1765,31 +1792,6 @@ _e_fwin_changed(void *data, // e_icon_file_edje_set(fwin-over_obj, NULL, NULL); evas_object_show(fwin-over_obj); } - if (page-scrollframe_obj) - { -if ((fwin-scrollframe_file) -(e_util_edje_collection_exists(fwin-scrollframe_file, - e/fileman/default/scrollframe))) - e_scrollframe_custom_edje_file_set(page-scr, - (char *)fwin-scrollframe_file, - e/fileman/default/scrollframe); -else - { - if (fwin-zone) - e_scrollframe_custom_theme_set(page-scr, - base/theme/fileman, - e/fileman/desktop/scrollframe); - else - e_scrollframe_custom_theme_set(page-scr, - base/theme/fileman, - e/fileman/default/scrollframe); - } -e_scrollframe_child_pos_set(page-scr, 0, 0); - } - if ((fwin-theme_file) (ecore_file_exists(fwin-theme_file))) - e_fm2_custom_theme_set(obj, fwin-theme_file); - else - e_fm2_custom_theme_set(obj, NULL); _e_fwin_icon_mouse_out(fwin, NULL, NULL); if (fwin-zone) --
[EGIT] [core/elementary] master 01/01: efm theme bg swallow now stacks correctly
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=34590d005d85eb6db5c444e156c03206c59b80aa commit 34590d005d85eb6db5c444e156c03206c59b80aa Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 12:03:14 2014 -0400 efm theme bg swallow now stacks correctly fix T792 --- data/themes/edc/fileman.edc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc index 8b01850..0a05006 100644 --- a/data/themes/edc/fileman.edc +++ b/data/themes/edc/fileman.edc @@ -941,8 +941,7 @@ group { name: e/fileman/default/scrollframe; color_class: fileman_base; } } - part { name: e.swallow.bg; type: SWALLOW; - insert_before: clipper; + part { name: e.swallow.bg; type: SWALLOW; insert_before: e.swallow.content; clip_to: clipper; description { state: default 0.0; rel1.to: bg; --
[EGIT] [core/enlightenment] master 03/04: bugfix: swallow efm background objects after applying theme
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=96806eb425a833c43d8910da2e3bb4ae52bbe81e commit 96806eb425a833c43d8910da2e3bb4ae52bbe81e Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 12:17:00 2014 -0400 bugfix: swallow efm background objects after applying theme fix T792 --- src/modules/fileman/e_fwin.c | 58 +++- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 4e5cf01..8c79151 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1735,7 +1735,31 @@ _e_fwin_changed(void *data, eina_stringshare_replace(fwin-scrollframe_file, NULL); eina_stringshare_replace(fwin-theme_file, NULL); } - if (fwin-under_obj) evas_object_hide(fwin-under_obj); + if (page-scrollframe_obj) + { +if ((fwin-scrollframe_file) +(e_util_edje_collection_exists(fwin-scrollframe_file, + e/fileman/default/scrollframe))) + e_scrollframe_custom_edje_file_set(page-scr, + (char *)fwin-scrollframe_file, + e/fileman/default/scrollframe); +else + { + if (fwin-zone) + e_scrollframe_custom_theme_set(page-scr, + base/theme/fileman, + e/fileman/desktop/scrollframe); + else + e_scrollframe_custom_theme_set(page-scr, + base/theme/fileman, + e/fileman/default/scrollframe); + } +e_scrollframe_child_pos_set(page-scr, 0, 0); + } + if ((fwin-theme_file) (ecore_file_exists(fwin-theme_file))) + e_fm2_custom_theme_set(obj, fwin-theme_file); + else + e_fm2_custom_theme_set(obj, NULL); if (fwin-wallpaper_file) { if (eina_str_has_extension(fwin-wallpaper_file, edj)) @@ -1759,15 +1783,18 @@ _e_fwin_changed(void *data, } if (fwin-under_obj) { - edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), + edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), e.swallow.bg, fwin-under_obj); evas_object_pass_events_set(fwin-under_obj, 1); evas_object_show(fwin-under_obj); } } else - edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), + { +edje_object_part_swallow(e_scrollframe_edje_object_get(page-scr), e.swallow.bg, NULL); +if (fwin-under_obj) evas_object_hide(fwin-under_obj); + } if (fwin-over_obj) { //printf(over obj\n); @@ -1786,31 +1813,6 @@ _e_fwin_changed(void *data, // e_icon_file_edje_set(fwin-over_obj, NULL, NULL); evas_object_show(fwin-over_obj); } - if (page-scrollframe_obj) - { -if ((fwin-scrollframe_file) -(e_util_edje_collection_exists(fwin-scrollframe_file, - e/fileman/default/scrollframe))) - e_scrollframe_custom_edje_file_set(page-scr, - (char *)fwin-scrollframe_file, - e/fileman/default/scrollframe); -else - { - if (fwin-zone) - e_scrollframe_custom_theme_set(page-scr, - base/theme/fileman, - e/fileman/desktop/scrollframe); - else - e_scrollframe_custom_theme_set(page-scr, - base/theme/fileman, - e/fileman/default/scrollframe); - } -e_scrollframe_child_pos_set(page-scr, 0, 0); - } - if ((fwin-theme_file) (ecore_file_exists(fwin-theme_file))) - e_fm2_custom_theme_set(obj, fwin-theme_file); - else - e_fm2_custom_theme_set(obj, NULL); _e_fwin_icon_mouse_out(fwin, NULL, NULL); if (fwin-zone) --
[EGIT] [core/enlightenment] enlightenment-0.18 04/04: bugfix: efm current .desktop fetching now returns the right .desktop
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=570651635a8b9a71f1948488552885aedc76c8e6 commit 570651635a8b9a71f1948488552885aedc76c8e6 Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 12:17:35 2014 -0400 bugfix: efm current .desktop fetching now returns the right .desktop fix T792 --- src/bin/e_fm.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index fb662d5..8356366 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -10132,11 +10132,16 @@ _e_fm2_desktop_open(E_Fm2_Smart_Data *sd) Eina_Bool ret; snprintf(buf, sizeof(buf), %s/.directory.desktop, sd-realpath); + if (sd-desktop) + { +if (!e_util_strcmp(buf, sd-desktop-orig_path)) return 1; + } ret = ecore_file_exists(buf) ? ecore_file_can_write(buf) : ecore_file_can_write(sd-realpath); if (!ret) return -1; ef = efreet_desktop_new(buf); if (!ef) return 0; + efreet_desktop_free(sd-desktop); sd-desktop = ef; return 1; } @@ -11668,6 +11673,7 @@ EAPI Efreet_Desktop * e_fm2_desktop_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); + if (_e_fm2_desktop_open(sd) != 1) return NULL; return sd-desktop; } --
[EGIT] [core/enlightenment] master 02/04: stringshare_replace in fwin: it exists for a reason, stop using macros ffs
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5503e29169ea99f01651511ae13336c0ae51a300 commit 5503e29169ea99f01651511ae13336c0ae51a300 Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 09:43:05 2014 -0400 stringshare_replace in fwin: it exists for a reason, stop using macros ffs --- src/modules/fileman/e_fwin.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 6115d5c..4e5cf01 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1730,12 +1730,10 @@ _e_fwin_changed(void *data, } else { -#define RELEASE_STR(x) if (x) {eina_stringshare_del(x); (x) = NULL; } -RELEASE_STR(fwin-wallpaper_file); -RELEASE_STR(fwin-overlay_file); -RELEASE_STR(fwin-scrollframe_file); -RELEASE_STR(fwin-theme_file); -#undef RELEASE_STR +eina_stringshare_replace(fwin-wallpaper_file, NULL); +eina_stringshare_replace(fwin-overlay_file, NULL); +eina_stringshare_replace(fwin-scrollframe_file, NULL); +eina_stringshare_replace(fwin-theme_file, NULL); } if (fwin-under_obj) evas_object_hide(fwin-under_obj); if (fwin-wallpaper_file) --
[EGIT] [core/elementary] elementary-1.9 01/01: efm theme bg swallow now stacks correctly
discomfitor pushed a commit to branch elementary-1.9. http://git.enlightenment.org/core/elementary.git/commit/?id=3c6dab6467eb3cf7720d274cde04859d33aaf04e commit 3c6dab6467eb3cf7720d274cde04859d33aaf04e Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 12:21:53 2014 -0400 efm theme bg swallow now stacks correctly fix T792 --- data/themes/edc/fileman.edc | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc index cea767a..d3c76bd 100644 --- a/data/themes/edc/fileman.edc +++ b/data/themes/edc/fileman.edc @@ -940,8 +940,12 @@ group { name: e/fileman/desktop/icon/fixed; group { name: e/fileman/default/scrollframe; inherit: e/widgets/scrollframe; parts { - part { name: e.swallow.bg; type: SWALLOW; - insert_before: clipper; + part { name: bg; + description { state: default 0.0; +color_class: fileman_base; + } + } + part { name: e.swallow.bg; type: SWALLOW; insert_before: e.swallow.content; clip_to: clipper; description { state: default 0.0; rel1.to: bg; --
[EGIT] [core/efl] master 01/01: ecore-fb - fix mouse wheel to not be inverted
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=76aa21ac0c07b71c4a52cd8d6e8fa5f280e2a0c2 commit 76aa21ac0c07b71c4a52cd8d6e8fa5f280e2a0c2 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Mar 28 23:03:02 2014 +0900 ecore-fb - fix mouse wheel to not be inverted --- src/lib/ecore_fb/ecore_fb_li.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_fb/ecore_fb_li.c b/src/lib/ecore_fb/ecore_fb_li.c index 43e876d..f332959 100644 --- a/src/lib/ecore_fb/ecore_fb_li.c +++ b/src/lib/ecore_fb/ecore_fb_li.c @@ -275,7 +275,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie e-x = dev-mouse.x; e-y = dev-mouse.y; if (iev-code == REL_HWHEEL) e-direction = 1; - e-z = iev-value; + e-z = -iev-value; e-root.x = dev-mouse.x; e-root.y = dev-mouse.y; --
[EGIT] [core/enlightenment] master 01/04: bugfix: ibar now scrolls correctly during drags
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=32e928b55b54bd15afb6167c226496c4b7dbfa81 commit 32e928b55b54bd15afb6167c226496c4b7dbfa81 Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 09:32:51 2014 -0400 bugfix: ibar now scrolls correctly during drags fix T794 --- src/modules/ibar/e_mod_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 6baa076..d9d4c25 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -1935,11 +1935,13 @@ _ibar_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) { E_Event_Dnd_Move *ev; Instance *inst; + int x, y; ev = event_info; inst = data; _ibar_drop_position_update(inst, ev-x, ev-y); - e_gadcon_client_autoscroll_update(inst-gcc, ev-x, ev-y); + evas_object_geometry_get(inst-ibar-o_outerbox, x, y, NULL, NULL); + e_gadcon_client_autoscroll_update(inst-gcc, ev-x - x, ev-y - y); } static void --
[EGIT] [enlightenment/modules/net] master 01/01: Updated to build with e19. For older versions of E checkout the enlightenment-0.18 branch.
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/net.git/commit/?id=622dd495a1fb0ed880e842483f2270222042758d commit 622dd495a1fb0ed880e842483f2270222042758d Author: maxerba maiur...@gmail.com Date: Fri Mar 28 21:19:19 2014 +0100 Updated to build with e19. For older versions of E checkout the enlightenment-0.18 branch. --- src/e_mod_configure.c | 5 ++--- src/e_mod_net.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/e_mod_configure.c b/src/e_mod_configure.c index 059b62a..abbe361 100644 --- a/src/e_mod_configure.c +++ b/src/e_mod_configure.c @@ -25,7 +25,7 @@ _configure_net_module(void *data) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - E_Container *con; + E_Comp *comp; Config_Item *ci; char buf[PATH_MAX]; @@ -40,8 +40,7 @@ _configure_net_module(void *data) snprintf(buf, sizeof(buf), %s/e-module-net.edj, e_module_dir_get(net_cfg-mod)); - con = e_container_current_get(e_manager_current_get()); - cfd = e_config_dialog_new(con, D_(Net Module Settings), Net, + cfd = e_config_dialog_new(NULL, D_(Net Module Settings), Net, _e_modules_netmod_config_dialog, buf, 0, v, ci); net_cfg-cfd = cfd; } diff --git a/src/e_mod_net.c b/src/e_mod_net.c index f50978a..318c996 100644 --- a/src/e_mod_net.c +++ b/src/e_mod_net.c @@ -185,10 +185,10 @@ _net_cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char if (inst-popup) return; if (!inst-ci-show_popup) return; - inst-popup = e_gadcon_popup_new(inst-gcc); + inst-popup = e_gadcon_popup_new(inst-gcc, EINA_FALSE); snprintf(buf, sizeof(buf), %s/net.edj, e_module_dir_get(net_cfg-mod)); - bg = edje_object_add(inst-popup-win-evas); + bg = edje_object_add(e_comp_get(inst-popup)-evas); if (!e_theme_edje_object_set(bg, base/theme/modules, modules/net/popup)) edje_object_file_set(bg, buf, modules/net/popup); --
[EGIT] [core/efl] master 01/01: eolian should use wb for file opening to not break windows use
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7c018bba0d7b7c60140af32474ae7bf0979c998c commit 7c018bba0d7b7c60140af32474ae7bf0979c998c Author: Mike Blumenkrantz zm...@samsung.com Date: Fri Mar 28 16:39:52 2014 -0400 eolian should use wb for file opening to not break windows use --- src/bin/eolian/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c index 8e09133..3a989fd 100644 --- a/src/bin/eolian/main.c +++ b/src/bin/eolian/main.c @@ -57,7 +57,7 @@ _generate_eo_h_file(char *filename, const char *classname) const char *htext = eina_strbuf_string_get(hfile); - FILE* fd = fopen(filename, w); + FILE* fd = fopen(filename, wb); if (!fd) { const char *err = strerror(errno); @@ -102,7 +102,7 @@ _generate_c_file(char *filename, const char *classname) goto end; } - FILE* fd = fopen(filename, w); + FILE* fd = fopen(filename, wb); if (!fd) { ERR(Couldnt open file %s for writing, filename); @@ -137,7 +137,7 @@ _generate_legacy_header_file(char *filename, const char *classname) goto end; } - FILE* fd = fopen(filename, w); + FILE* fd = fopen(filename, wb); if (!fd) { ERR (Couldnt open file %s for writing, filename); --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: panel: Update the panel test to layout over some content - a more realistic demonstration of the capabilities
Welcome, it confused me too! Andrew - Andy Williams blog: http://ajwillia.ms web:http://andywilliams.me On 18 Mar 2014, at 00:32, Daniel Juyung Seo seojuyu...@gmail.com wrote: Thanks for the patch. Now it looks sane :) Daniel Juyung Seo (SeoZ) On Sun, Mar 16, 2014 at 11:22 PM, Andy Williams a...@andywillias.me wrote: ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1d12ae7486bcbe38431c899b288bae1c5aa6f874 commit 1d12ae7486bcbe38431c899b288bae1c5aa6f874 Author: Andy Williams a...@andywillias.me Date: Fri Mar 14 07:49:59 2014 + panel: Update the panel test to layout over some content - a more realistic demonstration of the capabilities --- src/bin/test_panel.c | 36 ++-- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c index c836881..6656cc0 100644 --- a/src/bin/test_panel.c +++ b/src/bin/test_panel.c @@ -5,6 +5,8 @@ #define LIST_ITEM_MAX 20 +static const char *img1 = PACKAGE_DATA_DIR /images/plant_01.jpg; + static Elm_Genlist_Item_Class itc; static void _bstatus(void *data, Evas_Object *obj, void *event_info); @@ -156,7 +158,7 @@ _dir_has_subs(const char *path) void test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Evas_Object *win, *panel, *bx, *vbx, *toolbar; + Evas_Object *win, *panel, *tb, *vbx, *toolbar, *photo; Evas_Object *list; win = elm_win_util_standard_add(panel, Panel); @@ -167,11 +169,10 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_win_resize_object_add(win, vbx); evas_object_show(vbx); - bx = elm_box_add(win); - elm_box_horizontal_set(bx, EINA_TRUE); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(bx); + tb = elm_table_add(win); + evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(tb); panel = elm_panel_add(vbx); elm_panel_orient_set(panel, ELM_PANEL_ORIENT_TOP); @@ -191,7 +192,16 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_box_pack_end(vbx, panel); evas_object_show(panel); - panel = elm_panel_add(bx); + photo = elm_photo_add(tb); + elm_photo_file_set(photo, img1); + elm_photo_fill_inside_set(photo, EINA_TRUE); + elm_object_style_set(photo, shadow); + evas_object_size_hint_weight_set(photo, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(photo, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_table_pack(tb, photo, 0, 0, 4, 5); + evas_object_show(photo); + + panel = elm_panel_add(tb); elm_panel_orient_set(panel, ELM_PANEL_ORIENT_LEFT); evas_object_size_hint_weight_set(panel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); // evas_object_size_hint_align_set(panel, 0, EVAS_HINT_FILL); @@ -210,13 +220,12 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_show(list); elm_object_content_set(panel, list); - - elm_box_pack_end(bx, panel); + elm_table_pack(tb, panel, 0, 0, 2, 4); evas_object_show(panel); _fill_list(list); - panel = elm_panel_add(bx); + panel = elm_panel_add(tb); elm_panel_orient_set(panel, ELM_PANEL_ORIENT_RIGHT); evas_object_size_hint_weight_set(panel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); // evas_object_size_hint_align_set(panel, 1, EVAS_HINT_FILL); @@ -230,8 +239,7 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_show(list); elm_object_content_set(panel, list); - - elm_box_pack_end(bx, panel); + elm_table_pack(tb, panel, 2, 0, 2, 4); evas_object_show(panel); _fill_list(list); @@ -241,7 +249,7 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf free(dir); } - elm_box_pack_end(vbx, bx); + elm_box_pack_end(vbx, tb); panel = elm_panel_add(vbx); elm_panel_orient_set(panel, ELM_PANEL_ORIENT_BOTTOM); @@ -259,7 +267,7 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_toolbar_item_append(toolbar, home, Hello, _bstatus, panel); elm_object_content_set(panel, toolbar); - elm_box_pack_end(vbx, panel); + elm_table_pack(tb, panel, 0, 4, 4, 1); evas_object_show(panel); evas_object_resize(win, 320, 400); -- -- Learn Graph Databases - Download FREE O'Reilly Book Graph Databases is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first
[EGIT] [core/efl] master 01/01: edje_cc: Fix the crash when compiled wrong edc file containing empty part
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c2077f48539257dfb06df13a7758eacc7318b5ca commit c2077f48539257dfb06df13a7758eacc7318b5ca Author: Ryuan Choi ryuan.c...@gmail.com Date: Sat Mar 29 12:52:16 2014 +0900 edje_cc: Fix the crash when compiled wrong edc file containing empty part It's regression since cff3ec04b. @fix --- src/bin/edje/edje_cc_out.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index 4b303a5..b89dd45 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -2534,6 +2534,7 @@ _data_image_id_update(Eina_List *images_unused_list) if (part-type == EDJE_PART_TYPE_IMAGE) { part_desc_image = (Edje_Part_Description_Image *)part-default_desc; + if (!part_desc_image) continue; PART_DESC_IMAGE_ID_UPDATE for (j = 0; j part-other.desc_count; j++) { --