[E-devel] crashdump 0.17.99.17108
Thread 1 (Thread 0x7f1153626880 (LWP 4433)):
#0 0x7f1151d80b8d in pause () at ../sysdeps/unix/syscall-template.S:81
No locals.
#1 signal handler called
No locals.
#2 eina_list_data_get (list=optimized out) at
/usr/local/include/eina-1/eina/eina_inline_list.x:47
No locals.
#3 _e_exe_instance_watchers_call (inst=0x260a3f0,
type=E_EXEC_WATCH_STOPPED) at e_exec.c:321
iw = optimized out
l = optimized out
#4 0x00499809 in _e_exec_cb_exit (event=optimized out,
type=optimized out, data=optimized out) at e_exec.c:773
inst = 0x260a3f0
#5 0x0049a0e8 in _e_exec_cb_exit (data=optimized out,
type=optimized out, event=0x22aa490) at e_exec.c:703
ev = 0x22aa490
inst = 0x21
#6 0x7f11515ac630 in _ecore_call_handler_cb (event=optimized out,
type=optimized out, data=optimized out, func=optimized out) at
lib/ecore/ecore_private.h:357
r = optimized out
#7 _ecore_event_call () at lib/ecore/ecore_events.c:562
ret = 33 '!'
e = 0x2849610
handle_count = 4
l = optimized out
eh = 0xb14c90
#8 0x7f11515b25b5 in _ecore_main_loop_iterate_internal
(once_only=0) at lib/ecore/ecore_main.c:2013
next_time = optimized out
#9 0x7f11515b27b7 in ecore_main_loop_begin () at
lib/ecore/ecore_main.c:1035
No locals.
#10 0x00439821 in main (argc=optimized out, argv=optimized
out) at e_main.c:1076
safe_mode = 0 '\000'
after_restart = 0 '\000'
waslocked = optimized out
t = 1379751149.3183601
tstart = 1379751149.3183601
s = optimized out
buff = 1379751149.3, '\000' repeats 12 times,
\357\003C\000\000\000\000
action = {__sigaction_handler = {sa_handler = 0x502a30
e_sigabrt_act, sa_sigaction = 0x502a30 e_sigabrt_act}, sa_mask =
{__val = {0 repeats 16 times}}, sa_flags = -1073741820, sa_restorer =
0x7f114f17c120}
__FUNCTION__ = main
Detaching from program: /usr/local/bin/enlightenment, process 4433
--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
http://pubads.g.doubleclick.net/gampad/clk?id=64545871iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [admin/devs] master 01/01: Update my info and remove work key
asdfuser pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=5a0a1aaa2dccc91baad8c940bcab97fc63ec7745 commit 5a0a1aaa2dccc91baad8c940bcab97fc63ec7745 Author: Daniel Willmann dan...@totalueberwachung.de Date: Thu Aug 15 18:37:25 2013 +0200 Update my info and remove work key --- asdfuser/id_rsa.pub | 1 - asdfuser/info.txt | 10 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/asdfuser/id_rsa.pub b/asdfuser/id_rsa.pub deleted file mode 100644 index b8f51f1..000 --- a/asdfuser/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EDAQABAAABAQDh0yGWlPkQ15Lsz59Y5rYcFuMZ3z021lrYM1YuYfOAGaI1J7pxO1bwuZqvvTIkypg55AshGU26a6+8koBg7NxQXmB0xtVBDrmB/AqTMH/xm7TvRmOmpluCMSYqnW7UBK4uU6cp9wy7sFITTwTAhsj03V13zTZaWpdyAh9xAzXxPq0krAyo7oFRLweQN+Njz3sWg3aRaw6+09CdMgaSHXTD4FzimqJ4Lu46hzKEGRC5IYurkco2RSWXiEI2HFSQ9a8LUv69Kjl+8u5xAxEvE5B2wrJ1DNOms/NvbPL8NXVR7eCS0N4d1ecQzShNZTpv1xlUlPZk39+rc9qO5uXnw6VJ d.willm...@samsung.com diff --git a/asdfuser/info.txt b/asdfuser/info.txt index c61447f..409304a 100644 --- a/asdfuser/info.txt +++ b/asdfuser/info.txt @@ -1,9 +1,9 @@ Login:asdfuser IRC Nick: asdfuser, asdfuser_w Name: Daniel Willmann -Location: Staines, United Kingdom -E-Mail: dan...@totalueberwachung.de, d.willm...@samsung.com +Location: In Progress +E-Mail: dan...@totalueberwachung.de WWW: http://totalueberwachung.de -Contributing: elev8, ecore -Platform: Gentoo (Linux), Ubuntu (Linux) -GeoData: 51.431901, -0.51067 +Contributing: elev8, efl +Platform: Gentoo (Linux) +GeoData: 52.46733, 13.19075 --
Re: [E-devel] Migration of Enlightenment GIT Commits Mailing List
On Wed, Sep 18, 2013 at 6:03 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 13/09/13 01:20, Bertrand Jacquin wrote: Hi, Tommorrow at 13:00 UTC, the Enlightenment GIT Commits Mailing List will be moved from Sourceforge to own servers. This to avoid the moderation madness. All subscribed people will be moved to the new list and unsubscribed from the old one. This means no user action will be required. Then, you will be notified about your subscription and get info on how to use it. This only concern the list enlightenment-...@lists.sourceforge.net. Other lists will stay on SF for the moment. The new list will be g...@lists.enlightenment.org, and List-Id git.lists.enlightenment.org. FYI: We changed the ML (now that we have more control over it) to spoof the From field to be as if the mail was sent from the git committer email. This means, that now if you reply to all, you also reply to the committer, not just the ML, among other advantages. This is awesome! Btw is it working well? I just tested with http://git.enlightenment.org/admin/devs.git/commit/?id=5a0a1aaa2dccc91baad8c940bcab97fc63ec7745 but I have only two mailing list recipients not the committer. 1. Enlightenment developer list enlightenment-devel@lists.sourceforge.net 2. g...@lists.enlightenment.org Thanks. Daniel Juyung Seo (SeoZ) -- Tom. -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13. http://pubads.g.doubleclick.net/gampad/clk?id=64545871iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/13: elm_map_common.h: fixed header indentation.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=73516097fc4e23fc1be9f418b534c99ecf8b61b9 commit 73516097fc4e23fc1be9f418b534c99ecf8b61b9 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Sep 21 18:28:32 2013 +0900 elm_map_common.h: fixed header indentation. --- src/lib/elm_map_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h index 71e87a6..74cec96 100644 --- a/src/lib/elm_map_common.h +++ b/src/lib/elm_map_common.h @@ -599,7 +599,7 @@ EAPI int elm_map_overlay_class_zoom_max_get(const Elm_Map_Over * * @ingroup Map */ -EAPI Eina_List * elm_map_overlay_group_members_get(const Elm_Map_Overlay *grp); +EAPI Eina_List * elm_map_overlay_group_members_get(const Elm_Map_Overlay *grp); /** * Follow a other overlay. @@ -658,7 +658,7 @@ EAPI void elm_map_overlay_bubble_content_clear(Elm_Map_Overlay * * @ingroup Map */ -EAPI void elm_map_overlay_polygon_region_add(Elm_Map_Overlay *overlay, double lon, double lat); +EAPI void elm_map_overlay_polygon_region_add(Elm_Map_Overlay *overlay, double lon, double lat); /** * Remove a route from the map. --
[EGIT] [core/elementary] master 09/13: elm_menu.h: added @c for signal, content part, and text part names.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0766e7b9fddf76e2b7abac255e8230af70d0baa1 commit 0766e7b9fddf76e2b7abac255e8230af70d0baa1 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Sep 21 19:39:11 2013 +0900 elm_menu.h: added @c for signal, content part, and text part names. --- src/lib/elm_menu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_menu.h b/src/lib/elm_menu.h index 2790a61..13ba589 100644 --- a/src/lib/elm_menu.h +++ b/src/lib/elm_menu.h @@ -14,13 +14,13 @@ * anywhere. * * Signals that you can add callbacks for are: - * @li clicked - the user clicked the empty space in the menu to dismiss. + * @li @c clicked - the user clicked the empty space in the menu to dismiss. * * Default content parts of the menu items that you can use for are: - * @li default - A main content of the menu item + * @li @c default - A main content of the menu item * * Default text parts of the menu items that you can use for are: - * @li default - label in the menu item + * @li @c default - label in the menu item * * Supported elm_object_item common APIs. * @li @ref elm_object_item_del --
[EGIT] [core/elementary] master 13/13: test_map.c: show longitude/latitude information about the current mouse position.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8f6c7b84a6e6af909b29d06352dee4be89629e83
commit 8f6c7b84a6e6af909b29d06352dee4be89629e83
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 20:24:21 2013 +0900
test_map.c: show longitude/latitude information about the current mouse
position.
---
src/bin/test_map.c | 28 +++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index 5fc4602..e2eff36 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -820,10 +820,30 @@ _submenu_ovl_add(void *data, Elm_Object_Item *parent)
}
static void
+_submenu_info_add(Evas_Object *map, Elm_Object_Item *parent)
+{
+ if (!map || !parent) return;
+ char buf[PATH_MAX] = { 0 };
+ double lon = 0.0, lat = 0.0;
+
+ elm_map_canvas_to_region_convert(map,
+down_x, down_y,
+lon, lat);
+
+ snprintf(buf, PATH_MAX, Longitude : %f, lon);
+ elm_menu_item_add(menu, parent, NULL, buf, NULL, NULL);
+
+ snprintf(buf, PATH_MAX, Latitude : %f, lat);
+ elm_menu_item_add(menu, parent, NULL, buf, NULL, NULL);
+}
+
+static void
_map_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void
*event_info)
{
Evas_Event_Mouse_Down *ev = event_info;
Elm_Object_Item *menu_it;
+ static Elm_Object_Item *info_it = NULL;
+
if (!ev) return;
if (ev-button == 2)
@@ -852,8 +872,14 @@ _map_mouse_down(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj, void *even
_submenu_track_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, , Overlay, NULL,
NULL);
_submenu_ovl_add(data, menu_it);
+
+ info_it = elm_menu_item_add(menu, NULL, , Info, NULL, NULL);
}
- elm_menu_move(menu, ev-canvas.x, ev-canvas.y);
+
+elm_menu_item_subitems_clear(info_it);
+_submenu_info_add(obj, info_it);
+
+elm_menu_move(menu, ev-canvas.x, ev-canvas.y);
evas_object_show(menu);
}
}
--
[EGIT] [admin/devs] master 01/01: Updated SeoZ's information.
seoz pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=7a1aa46a4762753d128f6d6547867730c46f33ef commit 7a1aa46a4762753d128f6d6547867730c46f33ef Author: Daniel Juyung Seo juyung@samsung.com Date: Sat Sep 21 20:25:41 2013 +0900 Updated SeoZ's information. --- seoz/info.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/seoz/info.txt b/seoz/info.txt index 6278c37..e3045a7 100644 --- a/seoz/info.txt +++ b/seoz/info.txt @@ -2,10 +2,10 @@ Login:seoz IRC Nick: SeoZ Cloak:developer/seoz Name: Daniel Juyung Seo -Location: Yongin, Korea +Location: Suwon, Korea E-Mail: seojuyu...@gmail.com, juyung@samsung.com WWW: http://www.seoz.com -Managing: elementary -Contributing: e, ecore, BINDINGS and some others +Managing: elementary, elm theme viewer +Contributing: efl, enlightenment, BINDINGS and some others Platform: Ubuntu (Linux), Mac OS X, Windows XP/7 -GeoData: 37.286 127.152 +GeoData: 37.272626 127.038205 --
[EGIT] [core/elementary] master 12/13: elm_menu: added elm_menu_item_subitems_clear.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f8b9adae538f4f7d6f3fd44328ee967b08e2f33d
commit f8b9adae538f4f7d6f3fd44328ee967b08e2f33d
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 20:22:10 2013 +0900
elm_menu: added elm_menu_item_subitems_clear.
---
ChangeLog | 4
NEWS | 1 +
src/lib/elm_menu.c| 16 +---
src/lib/elm_menu_common.h | 15 +++
4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 42f9639..947f1be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1644,3 +1644,7 @@
2013-09-21 Daniel Juyung Seo (SeoZ)
* menu: added dismissed callback.
+
+2013-09-21 Daniel Juyung Seo (SeoZ)
+
+* menu: added elm_menu_item_subitems_clear.
diff --git a/NEWS b/NEWS
index 2295473..e7747ed 100644
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,7 @@ Additions:
* Add elm_widget_item_part_text_custom_set(),
elm_widget_item_part_text_custom_get(),
elm_widget_item_part_text_custom_update().
* Add dismissed smart callback for hover.
* Add dismissed smart callback for menu.
+ * Add elm_menu_item_subitems_clear().
Improvements:
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 7572473..0d02169 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -897,12 +897,10 @@ static Eina_Bool
_item_del_pre_hook(Elm_Object_Item *it)
{
Elm_Menu_Item *item = (Elm_Menu_Item *)it;
- Elm_Object_Item *_item;
ELM_MENU_DATA_GET(WIDGET(item), sd);
- EINA_LIST_FREE(item-submenu.items, _item)
- elm_object_item_del(_item);
+ elm_menu_item_subitems_clear(it);
if (item-label) eina_stringshare_del(item-label);
if (item-content) evas_object_del(item-content);
if (item-submenu.hv) evas_object_del(item-submenu.hv);
@@ -1114,6 +1112,18 @@ elm_menu_item_subitems_get(const Elm_Object_Item *it)
return ((Elm_Menu_Item *)it)-submenu.items;
}
+EAPI void
+elm_menu_item_subitems_clear(Elm_Object_Item *it)
+{
+ Elm_Object_Item *sub_it;
+ Eina_List *l, *l_next;
+
+ ELM_MENU_ITEM_CHECK_OR_RETURN(it);
+ EINA_LIST_FOREACH_SAFE(((Elm_Menu_Item *)it)-submenu.items,
+ l, l_next, sub_it)
+ elm_object_item_del(sub_it);
+}
+
EAPI const Eina_List *
elm_menu_items_get(const Evas_Object *obj)
{
diff --git a/src/lib/elm_menu_common.h b/src/lib/elm_menu_common.h
index c912124..e00793e 100644
--- a/src/lib/elm_menu_common.h
+++ b/src/lib/elm_menu_common.h
@@ -83,6 +83,21 @@ EAPI Eina_Bool
elm_menu_item_is_separator(Elm_Object_Item *it
EAPI const Eina_List *elm_menu_item_subitems_get(const
Elm_Object_Item *it);
/**
+ * Remove all sub-items (children) of the given item
+ * @since 1.8
+ *
+ * @param it The item
+ *
+ * This removes all items that are children (and their descendants) of the
+ * given item @p it.
+ *
+ * @see elm_object_item_del()
+ *
+ * @ingroup Menu
+ */
+EAPI void elm_menu_item_subitems_clear(Elm_Object_Item
*it);
+
+/**
* @brief Get the position of a menu item
*
* @param it The menu item
--
[EGIT] [core/elementary] master 07/13: elm_hover: added dismissed smart callback for dismiss action.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d2028f692b4a61a93a07e5af9ca24b562c46af0d
commit d2028f692b4a61a93a07e5af9ca24b562c46af0d
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:28:04 2013 +0900
elm_hover: added dismissed smart callback for dismiss action.
- clicked smart callback was used for dismiss action.
- clicked should be removed in EFL 2.0. Updated EFL 2.0 TODO wiki page.
- Updated ChangeLog and NEWS.
- Added sample code to elementary_test.
- Updated documentation.
---
ChangeLog| 3 +++
NEWS | 1 +
src/bin/test_hover.c | 9 +
src/lib/elm_hover.c | 7 ++-
src/lib/elm_hover.h | 1 +
5 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 30c6ce5..989ee94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1637,3 +1637,6 @@
elm_widget_item_part_text_custom_get(),
elm_widget_item_part_text_custom_update()
+2013-09-21 Daniel Juyung Seo (SeoZ)
+
+* hover: added dismissed callback.
diff --git a/NEWS b/NEWS
index e448406..061bae4 100644
--- a/NEWS
+++ b/NEWS
@@ -91,6 +91,7 @@ Additions:
* Add selected,invalid smart callback for fileselector.
* elm_object_item : Introduces new APIs, elm_object_item_track(),
elm_object_item_untrack(), elm_object_item_track_get().
* Add elm_widget_item_part_text_custom_set(),
elm_widget_item_part_text_custom_get(),
elm_widget_item_part_text_custom_update().
+ * Add dismissed smart callback for hover.
Improvements:
diff --git a/src/bin/test_hover.c b/src/bin/test_hover.c
index c7e76c3..61d4f52 100644
--- a/src/bin/test_hover.c
+++ b/src/bin/test_hover.c
@@ -1,6 +1,14 @@
#include elementary_config.h
#include Elementary.h
#ifndef ELM_LIB_QUICKLAUNCH
+
+static void
+_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ printf(hover dismissed callback is called!\n);
+}
+
static void
my_hover_bt(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
@@ -34,6 +42,7 @@ test_hover(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
evas_object_show(bx);
hv = elm_hover_add(win);
+ evas_object_smart_callback_add(hv, dismissed, _dismissed_cb, NULL);
bt = elm_button_add(win);
elm_object_text_set(bt, Button);
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 0e4c49c..1e9fd14 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -46,6 +46,7 @@ const Elm_Layout_Part_Alias_Description _content_aliases[] =
#define ELM_PRIV_HOVER_SIGNALS(cmd) \
cmd(SIG_CLICKED, clicked, ) \
+ cmd(SIG_DISMISSED, dismissed, ) \
cmd(SIG_SMART_LOCATION_CHANGED, smart,changed, )
ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
@@ -533,6 +534,7 @@ _hov_dismiss_cb(void *data,
{
evas_object_hide(data);
evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
}
static void
@@ -577,7 +579,10 @@ _elm_hover_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
sd-on_del = EINA_TRUE;
if (evas_object_visible_get(obj))
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ {
+evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+evas_object_smart_callback_call(obj, SIG_DISMISSED, NULL);
+ }
elm_hover_target_set(obj, NULL);
diff --git a/src/lib/elm_hover.h b/src/lib/elm_hover.h
index db37590..7d6ea0a 100644
--- a/src/lib/elm_hover.h
+++ b/src/lib/elm_hover.h
@@ -33,6 +33,7 @@
* This widget emits the following signals, besides the ones sent from
* @ref Layout:
* @li @c clicked - the user clicked the empty space in the hover to dismiss
+ * @li @c dismissed - the user clicked the empty space in the hover to
dismiss (since 1.8)
* @li @c smart,changed - a content object placed under the smart
* policy was replaced to a new slot direction.
* @li @c focused - When the hover has received focus. (since 1.8)
--
[EGIT] [core/elementary] master 03/13: elm_menu.c: use local variable for code readability.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=05c65bc8c02ed866154bbaf110e3bdf42bdbcefb
commit 05c65bc8c02ed866154bbaf110e3bdf42bdbcefb
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:00:56 2013 +0900
elm_menu.c: use local variable for code readability.
---
src/lib/elm_menu.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index bdb0024..9ccaafe 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -522,30 +522,30 @@ static void
_item_submenu_obj_create(Elm_Menu_Item *item)
{
ELM_MENU_DATA_GET(WIDGET(item), sd);
+ Evas_Object *hv, *bx;
item-submenu.location = elm_icon_add(sd-bx);
- item-submenu.hv = elm_hover_add(sd-bx);
- elm_widget_mirrored_set(item-submenu.hv, EINA_FALSE);
- elm_hover_target_set(item-submenu.hv, item-submenu.location);
- elm_hover_parent_set(item-submenu.hv, sd-parent);
+ item-submenu.hv = hv = elm_hover_add(sd-bx);
+ elm_widget_mirrored_set(hv, EINA_FALSE);
+ elm_hover_target_set(hv, item-submenu.location);
+ elm_hover_parent_set(hv, sd-parent);
if (sd-menu_bar !item-parent)
{
-elm_object_style_set(item-submenu.hv, main_menu_submenu);
-evas_object_smart_callback_add(item-submenu.hv, clicked,
+elm_object_style_set(hv, main_menu_submenu);
+evas_object_smart_callback_add(hv, clicked,
_hover_clicked_cb, WIDGET(item));
}
else
- elm_object_style_set(item-submenu.hv, submenu);
+ elm_object_style_set(hv, submenu);
- item-submenu.bx = elm_box_add(sd-bx);
- elm_widget_mirrored_set(item-submenu.bx, EINA_FALSE);
- evas_object_size_hint_weight_set
- (item-submenu.bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(item-submenu.bx);
+ item-submenu.bx = bx = elm_box_add(sd-bx);
+ elm_widget_mirrored_set(bx, EINA_FALSE);
+ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_show(bx);
elm_object_part_content_set
- (item-submenu.hv, elm_hover_best_content_location_get
- (item-submenu.hv, ELM_HOVER_AXIS_VERTICAL), item-submenu.bx);
+ (hv, elm_hover_best_content_location_get
+ (hv, ELM_HOVER_AXIS_VERTICAL), bx);
if (sd-menu_bar !item-parent)
{
@@ -574,8 +574,8 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
evas_object_event_callback_add
(VIEW(item), EVAS_CALLBACK_RESIZE, _item_move_resize_cb, item);
- evas_object_event_callback_add
- (item-submenu.bx, EVAS_CALLBACK_RESIZE, _menu_resize_cb, WIDGET(item));
+ evas_object_event_callback_add(bx, EVAS_CALLBACK_RESIZE,
+ _menu_resize_cb, WIDGET(item));
}
static void
--
[EGIT] [core/elementary] master 10/13: elm_menu.c: adopted new signal macro for menu.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=af1b76f4ef5d069a8f38db2ea7386c3e35a786dd
commit af1b76f4ef5d069a8f38db2ea7386c3e35a786dd
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:42:52 2013 +0900
elm_menu.c: adopted new signal macro for menu.
---
src/lib/elm_menu.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index f340180..44b4a74 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -13,9 +13,13 @@ EAPI Eo_Op ELM_OBJ_MENU_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME elm_menu
-static const char SIG_CLICKED[] = clicked;
+#define ELM_PRIV_MENU_SIGNALS(cmd) \
+ cmd(SIG_CLICKED, clicked, )
+
+ELM_PRIV_MENU_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
+
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
- {SIG_CLICKED, },
+ ELM_PRIV_MENU_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
{NULL, NULL}
};
--
[EGIT] [core/elementary] master 06/13: ChangeLog: fixed a typo.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=54ed83e08cb7880e26e1ae67f030253af339e8da commit 54ed83e08cb7880e26e1ae67f030253af339e8da Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Sep 21 19:26:44 2013 +0900 ChangeLog: fixed a typo. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c5464bf..30c6ce5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1630,7 +1630,7 @@ * Gesture layer: Fix gesture layer with pointer events. -2012-09-18 Michael Bouchaud (yoz) +2013-09-18 Michael Bouchaud (yoz) * Elm_Widget_Item: Introduces new widget APIs, elm_widget_item_part_text_custom_set(), --
[EGIT] [core/elementary] master 08/13: elm_menu.c: use hover's dismissed callback instead of clicked callback for menu dismiss.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=966a48eca89bbd184e2915a190e5f6a090fe9950
commit 966a48eca89bbd184e2915a190e5f6a090fe9950
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:32:34 2013 +0900
elm_menu.c: use hover's dismissed callback instead of clicked callback for
menu dismiss.
---
src/lib/elm_menu.c | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 9ccaafe..f340180 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -381,9 +381,9 @@ _menu_hide(void *data,
}
static void
-_hover_clicked_cb(void *data,
- Evas_Object *obj,
- void *event_info)
+_hover_dismissed_cb(void *data,
+Evas_Object *obj,
+void *event_info)
{
_menu_hide(data, obj, event_info);
evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
@@ -533,8 +533,8 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
if (sd-menu_bar !item-parent)
{
elm_object_style_set(hv, main_menu_submenu);
-evas_object_smart_callback_add(hv, clicked,
- _hover_clicked_cb, WIDGET(item));
+evas_object_smart_callback_add(hv, dismissed,
+ _hover_dismissed_cb, WIDGET(item));
}
else
elm_object_style_set(hv, submenu);
@@ -595,7 +595,8 @@ _elm_menu_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
elm_widget_mirrored_set(priv-hv, EINA_FALSE);
elm_object_style_set(priv-hv, menu);
- evas_object_smart_callback_add(priv-hv, clicked, _hover_clicked_cb, obj);
+ evas_object_smart_callback_add(priv-hv, dismissed,
+ _hover_dismissed_cb, obj);
priv-bx = elm_box_add(obj);
elm_widget_mirrored_set(priv-bx, EINA_FALSE);
@@ -667,13 +668,14 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
if (menu_bar)
{
evas_object_smart_callback_add(item-submenu.hv, clicked,
-_hover_clicked_cb, WIDGET(item));
+_hover_dismissed_cb, WIDGET(item));
elm_object_style_set(item-submenu.hv, main_menu_submenu);
}
else
{
evas_object_smart_callback_del_full(item-submenu.hv, clicked,
- _hover_clicked_cb,
WIDGET(item));
+ _hover_dismissed_cb,
+ WIDGET(item));
elm_object_style_set(item-submenu.hv, submenu);
}
}
--
[EGIT] [core/elementary] master 04/13: test_hover.c: use elm_win_util_standard_add API and remove unnecessary bg min/max set.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e82a431c62f60883081b7ae5558a2918901d8950
commit e82a431c62f60883081b7ae5558a2918901d8950
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:13:32 2013 +0900
test_hover.c: use elm_win_util_standard_add API and remove unnecessary bg
min/max set.
---
src/bin/test_hover.c | 34 --
1 file changed, 8 insertions(+), 26 deletions(-)
diff --git a/src/bin/test_hover.c b/src/bin/test_hover.c
index ccc97b4..c7e76c3 100644
--- a/src/bin/test_hover.c
+++ b/src/bin/test_hover.c
@@ -20,17 +20,13 @@ _top_bt_clicked(void *data, Evas_Object *obj EINA_UNUSED,
void
test_hover(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
- Evas_Object *win, *bg, *bx, *bt, *hv, *ic;
+ Evas_Object *win, *bx, *bt, *hv, *ic;
char buf[PATH_MAX];
- win = elm_win_add(NULL, hover, ELM_WIN_BASIC);
- elm_win_title_set(win, Hover);
+ win = elm_win_util_standard_add(hover, Hover);
elm_win_autodel_set(win, EINA_TRUE);
-
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ evas_object_resize(win, 440, 440);
+ evas_object_show(win);
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -92,27 +88,18 @@ test_hover(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
elm_object_text_set(bt, Right);
elm_object_part_content_set(hv, right, bt);
evas_object_show(bt);
-
- evas_object_size_hint_min_set(bg, 160, 160);
- evas_object_size_hint_max_set(bg, 640, 640);
- evas_object_resize(win, 440, 440);
- evas_object_show(win);
}
void
test_hover2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
- Evas_Object *win, *bg, *bx, *bt, *hv, *ic;
+ Evas_Object *win, *bx, *bt, *hv, *ic;
char buf[PATH_MAX];
- win = elm_win_add(NULL, hover2, ELM_WIN_BASIC);
- elm_win_title_set(win, Hover 2);
+ win = elm_win_util_standard_add(hover2, Hover 2);
elm_win_autodel_set(win, EINA_TRUE);
-
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ evas_object_resize(win, 440, 440);
+ evas_object_show(win);
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -172,10 +159,5 @@ test_hover2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
elm_object_text_set(bt, Right);
elm_object_part_content_set(hv, right, bt);
evas_object_show(bt);
-
- evas_object_size_hint_min_set(bg, 160, 160);
- evas_object_size_hint_max_set(bg, 640, 640);
- evas_object_resize(win, 440, 440);
- evas_object_show(win);
}
#endif
--
[EGIT] [core/elementary] master 02/13: test_map.c: changed mouse down event local variable name down - ev for consistency.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5a4c17e114c19656cd59e36dfd6878f64f7b48a7
commit 5a4c17e114c19656cd59e36dfd6878f64f7b48a7
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 18:39:35 2013 +0900
test_map.c: changed mouse down event local variable name down - ev for
consistency.
---
src/bin/test_map.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index 12ff210..5fc4602 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -248,12 +248,12 @@ _map_clicked_double(void *data EINA_UNUSED, Evas_Object
*obj, void *event_info)
{
printf(clicked,double\n);
double lon, lat;
- Evas_Event_Mouse_Down *down = event_info;
- if (!down) return;
+ Evas_Event_Mouse_Down *ev = event_info;
+ if (!ev) return;
if (elm_map_zoom_get(obj) 5) return;
- elm_map_canvas_to_region_convert(obj, down-canvas.x, down-canvas.y, lon,
lat);
- printf(x:%d, y:%d, lon:%lf, lat:%lf\n, down-canvas.x, down-canvas.y,
lon, lat);
+ elm_map_canvas_to_region_convert(obj, ev-canvas.x, ev-canvas.y, lon,
lat);
+ printf(x:%d, y:%d, lon:%lf, lat:%lf\n, ev-canvas.x, ev-canvas.y, lon,
lat);
if (!route_clas)
{
@@ -300,9 +300,9 @@ _map_longpressed(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
if (!event_info) return;
double lon, lat;
- Evas_Event_Mouse_Down *down = (Evas_Event_Mouse_Down *)event_info;
- elm_map_canvas_to_region_convert(obj, down-canvas.x, down-canvas.y, lon,
lat);
- printf(longpressed, x:%d, y:%d, lon:%lf, lat:%lf\n, down-canvas.x,
down-canvas.y, lon, lat);
+ Evas_Event_Mouse_Down *ev = event_info;
+ elm_map_canvas_to_region_convert(obj, ev-canvas.x, ev-canvas.y, lon,
lat);
+ printf(longpressed, x:%d, y:%d, lon:%lf, lat:%lf\n, ev-canvas.x,
ev-canvas.y, lon, lat);
if (elm_map_zoom_get(obj) 8) return;
if (name) elm_map_name_del(name);
@@ -822,20 +822,20 @@ _submenu_ovl_add(void *data, Elm_Object_Item *parent)
static void
_map_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void
*event_info)
{
- Evas_Event_Mouse_Down *down = event_info;
+ Evas_Event_Mouse_Down *ev = event_info;
Elm_Object_Item *menu_it;
- if (!down) return;
+ if (!ev) return;
- if (down-button == 2)
+ if (ev-button == 2)
{
-old_x = down-canvas.x;
-old_y = down-canvas.y;
+old_x = ev-canvas.x;
+old_y = ev-canvas.y;
old_d = 0.0;
}
- else if (down-button == 3)
+ else if (ev-button == 3)
{
-down_x = down-canvas.x;
-down_y = down-canvas.y;
+down_x = ev-canvas.x;
+down_y = ev-canvas.y;
if (!menu)
{
menu = elm_menu_add(obj);
@@ -853,7 +853,7 @@ _map_mouse_down(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj, void *even
menu_it = elm_menu_item_add(menu, NULL, , Overlay, NULL,
NULL);
_submenu_ovl_add(data, menu_it);
}
- elm_menu_move(menu, down-canvas.x, down-canvas.y);
+ elm_menu_move(menu, ev-canvas.x, ev-canvas.y);
evas_object_show(menu);
}
}
--
[EGIT] [core/elementary] master 05/13: elm_hover.c: adopted new signal macro before adding a new callback.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8a5a0ad20b582c03f62a24435f22e3ada38fef9c
commit 8a5a0ad20b582c03f62a24435f22e3ada38fef9c
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:20:52 2013 +0900
elm_hover.c: adopted new signal macro before adding a new callback.
---
src/lib/elm_hover.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 55453c0..0e4c49c 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -44,11 +44,14 @@ const Elm_Layout_Part_Alias_Description _content_aliases[] =
{NULL, NULL}
};
-static const char SIG_CLICKED[] = clicked;
-static const char SIG_SMART_LOCATION_CHANGED[] = smart,changed;
+#define ELM_PRIV_HOVER_SIGNALS(cmd) \
+ cmd(SIG_CLICKED, clicked, ) \
+ cmd(SIG_SMART_LOCATION_CHANGED, smart,changed, )
+
+ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
+
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
- {SIG_CLICKED, },
- {SIG_SMART_LOCATION_CHANGED, },
+ ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
{focused, }, /** handled by elm_widget */
{unfocused, }, /** handled by elm_widget */
{NULL, NULL}
--
[EGIT] [core/elementary] master 11/13: elm_menu: added dismissed smart callback for dismiss action.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a52d8389c7a249b81b7233fde13a9bceae96245b
commit a52d8389c7a249b81b7233fde13a9bceae96245b
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Sep 21 19:45:12 2013 +0900
elm_menu: added dismissed smart callback for dismiss action.
- clicked smart callback was used for dismiss action.
- clicked should be removed in EFL 2.0. Updated EFL 2.0 TODO wiki page.
- Updated ChangeLog and NEWS.
- Added sample code to elementary_test.
- Updated documentation.
---
ChangeLog | 4
NEWS| 1 +
src/bin/test_menu.c | 9 +
src/lib/elm_menu.c | 4 +++-
src/lib/elm_menu.h | 1 +
5 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 989ee94..42f9639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1640,3 +1640,7 @@
2013-09-21 Daniel Juyung Seo (SeoZ)
* hover: added dismissed callback.
+
+2013-09-21 Daniel Juyung Seo (SeoZ)
+
+* menu: added dismissed callback.
diff --git a/NEWS b/NEWS
index 061bae4..2295473 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,7 @@ Additions:
* elm_object_item : Introduces new APIs, elm_object_item_track(),
elm_object_item_untrack(), elm_object_item_track_get().
* Add elm_widget_item_part_text_custom_set(),
elm_widget_item_part_text_custom_get(),
elm_widget_item_part_text_custom_update().
* Add dismissed smart callback for hover.
+ * Add dismissed smart callback for menu.
Improvements:
diff --git a/src/bin/test_menu.c b/src/bin/test_menu.c
index 65a2244..9f9fb10 100644
--- a/src/bin/test_menu.c
+++ b/src/bin/test_menu.c
@@ -5,6 +5,13 @@
#ifndef ELM_LIB_QUICKLAUNCH
static void
+_menu_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ printf(menu dismissed callback is called!\n);
+}
+
+static void
_menu_show_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
@@ -118,6 +125,8 @@ test_menu(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
evas_object_show(rect);
menu = elm_menu_add(win);
+ evas_object_smart_callback_add(menu, dismissed, _menu_dismissed_cb, NULL);
+
elm_menu_item_add(menu, NULL, NULL, first item, NULL, NULL);
menu_it = elm_menu_item_add(menu, NULL, mail-reply-all, second item,
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 44b4a74..7572473 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -14,7 +14,8 @@ EAPI Eo_Op ELM_OBJ_MENU_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME elm_menu
#define ELM_PRIV_MENU_SIGNALS(cmd) \
- cmd(SIG_CLICKED, clicked, )
+ cmd(SIG_CLICKED, clicked, ) \
+ cmd(SIG_DISMISSED, dismissed, )
ELM_PRIV_MENU_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
@@ -391,6 +392,7 @@ _hover_dismissed_cb(void *data,
{
_menu_hide(data, obj, event_info);
evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
}
static void
diff --git a/src/lib/elm_menu.h b/src/lib/elm_menu.h
index 13ba589..10cddde 100644
--- a/src/lib/elm_menu.h
+++ b/src/lib/elm_menu.h
@@ -15,6 +15,7 @@
*
* Signals that you can add callbacks for are:
* @li @c clicked - the user clicked the empty space in the menu to dismiss.
+ * @li @c dismissed - the user clicked the empty space in the menu to
dismiss (since 1.8)
*
* Default content parts of the menu items that you can use for are:
* @li @c default - A main content of the menu item
--
[EGIT] [core/elementary] master 01/01: test_map.c: fixed indentation. it was wrong even before my last commit.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=efcd1cb58bf290fc6358b50f329e4aca7ed35f05 commit efcd1cb58bf290fc6358b50f329e4aca7ed35f05 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Sep 21 20:28:37 2013 +0900 test_map.c: fixed indentation. it was wrong even before my last commit. --- src/bin/test_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/test_map.c b/src/bin/test_map.c index e2eff36..b100417 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -880,7 +880,7 @@ _map_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *even _submenu_info_add(obj, info_it); elm_menu_move(menu, ev-canvas.x, ev-canvas.y); - evas_object_show(menu); +evas_object_show(menu); } } --
[EGIT] [apps/terminology] master 01/01: cleanup app-server code…
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=6430b0c494009bf421b97f0293838836f4fbfe18
commit 6430b0c494009bf421b97f0293838836f4fbfe18
Author: Boris Faure bill...@gmail.com
Date: Sat Sep 21 15:41:23 2013 +0200
cleanup app-server code…
* should make terminology compile with efl 1.7
* add header guards
* fix prototypes
* remove unused variables
* add some EINA_UNUSED
* prefix global variables with _ and some shadow potential issues
* functions starting with _ should be static
I didn't have a look at the meaning of the code.
---
src/bin/app_server.c | 61 +---
src/bin/app_server.h | 11 ++
src/bin/main.c | 1 +
src/bin/win.c| 2 +-
4 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/src/bin/app_server.c b/src/bin/app_server.c
index d96b08b..17bba43 100644
--- a/src/bin/app_server.c
+++ b/src/bin/app_server.c
@@ -6,7 +6,9 @@
#include termio.h
#include app_server_eet.h
-static Elm_App_Server *server = NULL;
+#if (ELM_VERSION_MAJOR 1) || (ELM_VERSION_MINOR = 8)
+
+static Elm_App_Server *_server = NULL;
static Eina_Bool _ignore_term_add = EINA_FALSE;
static Terminology_Item *views_eet = NULL;
@@ -48,7 +50,6 @@ _view_closed_cb(void *data, Eo *view,
{
Term *term = data;
const char *id;
- char eet_dir[PATH_MAX];
if (term)
{
@@ -84,11 +85,11 @@ _term_icon_changed_cb(void *data, Evas_Object *obj,
}
static Eina_Bool
-_view_save_cb(void *data, Eo *view,
+_view_save_cb(void *data EINA_UNUSED,
+ Eo *view,
const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Term *term = data;
char dir[PATH_MAX];
Evas_Object *term_object;
const char *id;
@@ -137,7 +138,7 @@ _view_resumed_cb(void *data, Eo *view,
return EINA_TRUE;
}
- eo_do(server, eo_base_data_get(wins, (void **)wins));
+ eo_do(_server, eo_base_data_get(wins, (void **)wins));
wn = eina_list_data_get(*wins);
if (!wn)
{
@@ -198,7 +199,7 @@ _view_resumed_cb(void *data, Eo *view,
}
static Eina_Bool
-_server_terminate_cb(void *data, Eo *obj,
+_server_terminate_cb(void *data, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
@@ -216,13 +217,13 @@ app_server_shutdown(void)
{
char lock_file[PATH_MAX];
- if (!server)
+ if (!_server)
return;
_user_config_file_path_build(lock_file, sizeof(lock_file), .lock);
ecore_file_remove(lock_file);
- eo_do(server, elm_app_server_save());
+ eo_do(_server, elm_app_server_save());
if (views_eet)
{
@@ -235,19 +236,21 @@ app_server_shutdown(void)
}
app_server_eet_shutdown();
- eo_unref(server);
- server = NULL;
+ eo_unref(_server);
+ _server = NULL;
}
void
-_app_server_win_del_request_cb(void *data, Evas_Object *obj, void *event_info)
+app_server_win_del_request_cb(void *data EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
Eina_List **wins;
- if (!server)
+ if (!_server)
return;
- eo_do(server, eo_base_data_get(wins, (void **)wins));
+ eo_do(_server, eo_base_data_get(wins, (void **)wins));
if (eina_list_count(*wins) 1)
return;
@@ -269,7 +272,7 @@ _app_server_term_add(Term *term)
if (_ignore_term_add)
return NULL;
- view = eo_add_custom(ELM_APP_SERVER_VIEW_CLASS, server,
+ view = eo_add_custom(ELM_APP_SERVER_VIEW_CLASS, _server,
elm_app_server_view_constructor(NULL));
term_object = main_term_evas_object_get(term);
@@ -301,13 +304,14 @@ app_server_term_add(Term *term)
{
Elm_App_Server_View *view;
- if (!server)
+ if (!_server)
return;
view = _app_server_term_add(term);
if (!view)
return;
- eo_do(server, elm_app_server_view_add(view));
+
+ eo_do(_server, elm_app_server_view_add(view));
}
static Elm_App_Server_View *
@@ -317,7 +321,6 @@ _app_server_create_view_cb(Elm_App_Server *server, const
Eina_Value *args EINA_U
{
Win *wn;
Term *term;
- Elm_App_Server_View *view;
Eina_List **wins;
eo_do(server, eo_base_data_get(wins, (void **)wins));
@@ -383,12 +386,12 @@ app_server_init(Eina_List **wins, Eina_Bool restore_views)
title = elm_win_title_get(main_win_evas_object_get(wn));
- server = eo_add_custom(ELM_APP_SERVER_CLASS, NULL,
- elm_app_server_constructor(
- org.enlightenment.Terminology,
- _app_server_create_view_cb));
+ _server = eo_add_custom(ELM_APP_SERVER_CLASS, NULL,
+ elm_app_server_constructor(
+ org.enlightenment.Terminology,
+
[EGIT] [apps/terminology] master 01/01: fix segv when closing terms in splits
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=ac76c0fae2dd85af3c84ce82240374c10f7b5f56
commit ac76c0fae2dd85af3c84ce82240374c10f7b5f56
Author: Boris Faure bill...@gmail.com
Date: Sat Sep 21 17:20:19 2013 +0200
fix segv when closing terms in splits
---
src/bin/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index b530cdf..5e3fa02 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -531,10 +531,10 @@ _split_merge(Split *spp, Split *sp, const char *slot)
spp-s2-parent = spp;
spp-horizontal = sp-horizontal;
o = sp-panes;
-/* slot is the empty part. the part that needs to be unset is the
- * other one */
+elm_object_part_content_unset(sp-parent-panes, slot);
elm_object_part_content_unset(sp-parent-panes,
- (!strcmp(slot, PANES_TOP)) ? PANES_BOTTOM : PANES_TOP);
+ (!strcmp(slot, PANES_TOP)) ?
+ PANES_BOTTOM : PANES_TOP);
if (spp-parent)
{
elm_object_part_content_unset(spp-parent-panes, slot);
--
[EGIT] [bindings/python/python-efl] master 01/01: Elementary: Add new thumb functions
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=ac9b1bf001cc958fc79b674dff0b2c125400ba44 commit ac9b1bf001cc958fc79b674dff0b2c125400ba44 Author: Kai Huuhko kai.huu...@gmail.com Date: Fri Sep 20 14:49:56 2013 +0300 Elementary: Add new thumb functions --- efl/elementary/enums.pxd | 25 ++ efl/elementary/thumb.pxd | 22 - efl/elementary/thumb.pyx | 229 ++- 3 files changed, 271 insertions(+), 5 deletions(-) diff --git a/efl/elementary/enums.pxd b/efl/elementary/enums.pxd index 2e4cd91..0c61c9f 100644 --- a/efl/elementary/enums.pxd +++ b/efl/elementary/enums.pxd @@ -394,6 +394,31 @@ cdef extern from Elementary.h: ELM_THUMB_ANIMATION_STOP ELM_THUMB_ANIMATION_LAST +ctypedef enum Ethumb_Thumb_FDO_Size: +ETHUMB_THUMB_NORMAL # 128x128 as defined by FreeDesktop.Org standard +ETHUMB_THUMB_LARGE # 256x256 as defined by FreeDesktop.Org standard + +ctypedef enum Ethumb_Thumb_Format: +ETHUMB_THUMB_FDO # PNG as defined by FreeDesktop.Org standard +ETHUMB_THUMB_JPEG # JPEGs are often smaller and faster to read/write +ETHUMB_THUMB_EET # EFL's own storage system, supports key parameter + +ctypedef enum Ethumb_Thumb_Aspect: +ETHUMB_THUMB_KEEP_ASPECT # keep original proportion between width and height +ETHUMB_THUMB_IGNORE_ASPECT # ignore aspect and foce it to match thumbnail's width and height +ETHUMB_THUMB_CROP # keep aspect but crop (cut) the largest dimension + +ctypedef enum Ethumb_Thumb_Orientation: +ETHUMB_THUMB_ORIENT_NONE # keep orientation as pixel data is +ETHUMB_THUMB_ROTATE_90_CW # rotate 90° clockwise +ETHUMB_THUMB_ROTATE_180 # rotate 180° +ETHUMB_THUMB_ROTATE_90_CCW # rotate 90° counter-clockwise +ETHUMB_THUMB_FLIP_HORIZONTAL # flip horizontally +ETHUMB_THUMB_FLIP_VERTICAL # flip vertically +ETHUMB_THUMB_FLIP_TRANSPOSE # transpose +ETHUMB_THUMB_FLIP_TRANSVERSE # transverse +ETHUMB_THUMB_ORIENT_ORIGINAL # use orientation from metadata (EXIF-only currently) + ctypedef enum Elm_Toolbar_Item_Scrollto_Type: ELM_TOOLBAR_ITEM_SCROLLTO_NONE ELM_TOOLBAR_ITEM_SCROLLTO_IN diff --git a/efl/elementary/thumb.pxd b/efl/elementary/thumb.pxd index 871f4fb..72ca8e9 100644 --- a/efl/elementary/thumb.pxd +++ b/efl/elementary/thumb.pxd @@ -1,5 +1,7 @@ -from efl.evas cimport Eina_Bool, Evas_Object -from enums cimport Elm_Thumb_Animation_Setting +from efl.evas cimport Eina_Bool, Evas_Object, const_Evas_Object +from enums cimport Elm_Thumb_Animation_Setting, Ethumb_Thumb_Aspect, \ +Ethumb_Thumb_Format, Ethumb_Thumb_Orientation, \ +Ethumb_Thumb_FDO_Size from libc.string cimport const_char cdef extern from Elementary.h: @@ -8,6 +10,22 @@ cdef extern from Elementary.h: void elm_thumb_file_set(Evas_Object *obj, const_char *file, const_char *key) void elm_thumb_file_get(Evas_Object *obj, const_char **file, const_char **key) void elm_thumb_path_get(Evas_Object *obj, const_char **file, const_char **key) +void elm_thumb_aspect_set(Evas_Object *obj, Ethumb_Thumb_Aspect aspect) +Ethumb_Thumb_Aspect elm_thumb_aspect_get(const_Evas_Object *obj) +void elm_thumb_fdo_size_set(Evas_Object *obj, Ethumb_Thumb_FDO_Size size) +Ethumb_Thumb_FDO_Sizeelm_thumb_fdo_size_get(const_Evas_Object *obj) +void elm_thumb_format_set(Evas_Object *obj, Ethumb_Thumb_Format format) +Ethumb_Thumb_Format elm_thumb_format_get(const_Evas_Object *obj) +void elm_thumb_orientation_set(Evas_Object *obj, Ethumb_Thumb_Orientation orient) +Ethumb_Thumb_Orientation elm_thumb_orientation_get(const_Evas_Object *obj) +void elm_thumb_size_set(Evas_Object *obj, int tw, int th) +void elm_thumb_size_get(const_Evas_Object *obj, int *tw, int *th) +void elm_thumb_crop_align_set(Evas_Object *obj, double cropx, double cropy) +void elm_thumb_crop_align_get(const_Evas_Object *obj, double *cropx, double *cropy) +void elm_thumb_compress_set(Evas_Object *obj, int compress) +void elm_thumb_compress_get(const_Evas_Object *obj, int *compress) +void elm_thumb_quality_set(Evas_Object *obj, int quality) +void elm_thumb_quality_get(const_Evas_Object *obj, int *quality) void elm_thumb_animate_set(Evas_Object *obj, Elm_Thumb_Animation_Setting s) Elm_Thumb_Animation_Setting elm_thumb_animate_get(Evas_Object *obj) void*elm_thumb_ethumb_client_get() diff --git a/efl/elementary/thumb.pyx b/efl/elementary/thumb.pyx index
[E-devel] crashdump 0.17.99.17100
Thread 3 (Thread 0xb5d94b40 (LWP 2312)):
#0 0xb7724424 in __kernel_vsyscall ()
No symbol table info available.
#1 0xb73d57ab in pthread_cond_wait@@GLIBC_2.3.2 () at
../nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:187
No locals.
#2 0xb731c0bd in eina_condition_wait (cond=0xb73a6880
evas_thread_queue_condition) at
../src/lib/eina/eina_inline_lock_posix.x:338
No locals.
#3 evas_thread_worker_func (data=0x0, thread=3050916672) at
lib/evas/common/evas_thread_render.c:88
cmd = optimized out
len = optimized out
max = optimized out
__FUNCTION__ = evas_thread_worker_func
__PRETTY_FUNCTION__ = evas_thread_worker_func
#4 0xb741a493 in _eina_internal_call (context=0x92e9ca8) at
lib/eina/eina_thread.c:280
c = 0x92e9ca8
r = optimized out
#5 0xb73d1cf1 in start_thread (arg=0xb5d94b40) at pthread_create.c:311
__res = optimized out
pd = 0xb5d94b40
now = optimized out
unwind_buf = {cancel_jmp_buf = {{jmp_buf = {-1220661248, 0,
4001536, -1244052632, -1247094978, 2098637627}, mask_was_saved = 0}},
priv = {pad = {0x0, 0x0, 0x0, 0x0}, data = {prev = 0x0, cleanup = 0x0,
canceltype = 0}}}
not_first_call = 0
pagesize_m1 = optimized out
sp = optimized out
freesize = optimized out
__PRETTY_FUNCTION__ = start_thread
#6 0xb6f4ffee in clone () at ../sysdeps/unix/sysv/linux/i386/clone.S:131
No locals.
Thread 2 (Thread 0xae569b40 (LWP 2329)):
#0 0xb7724424 in __kernel_vsyscall ()
No symbol table info available.
#1 0xb73d57ab in pthread_cond_wait@@GLIBC_2.3.2 () at
../nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/pthread_cond_wait.S:187
No locals.
#2 0xb3d374e0 in eina_condition_wait (cond=0xb3d5f740
async_loader_cond) at ../src/lib/eina/eina_inline_lock_posix.x:338
No locals.
#3 _evas_gl_preload_tile_async (data=0x0, t=2924911424) at
modules/evas/engines/gl_common/evas_gl_preload.c:157
fmt = optimized out
__FUNCTION__ = _evas_gl_preload_tile_async
#4 0xb741a493 in _eina_internal_call (context=0x9e68e68) at
lib/eina/eina_thread.c:280
c = 0x9e68e68
r = optimized out
#5 0xb73d1cf1 in start_thread (arg=0xae569b40) at pthread_create.c:311
__res = optimized out
pd = 0xae569b40
now = optimized out
unwind_buf = {cancel_jmp_buf = {{jmp_buf = {-1220661248, 0,
4001536, -1370057880, -1442130167, 2098637627}, mask_was_saved = 0}},
priv = {pad = {0x0, 0x0, 0x0, 0x0}, data = {prev = 0x0, cleanup = 0x0,
canceltype = 0}}}
not_first_call = 0
pagesize_m1 = optimized out
sp = optimized out
freesize = optimized out
__PRETTY_FUNCTION__ = start_thread
#6 0xb6f4ffee in clone () at ../sysdeps/unix/sysv/linux/i386/clone.S:131
No locals.
Thread 1 (Thread 0xb5f1f7c0 (LWP 2311)):
#0 0xb7724424 in __kernel_vsyscall ()
No symbol table info available.
#1 0xb6f5d561 in __lll_lock_wait_private () at
../nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/lowlevellock.S:97
No locals.
#2 0xb6edc8fb in _L_lock_10900 () at malloc.c:5104
No symbol table info available.
#3 0xb6eda3c6 in __GI___libc_malloc (bytes=12) at malloc.c:2856
ar_ptr = 0xb700c440 main_arena
victim = optimized out
hook = 0xfe00
__func__ = __libc_malloc
#4 0xb6d54ff2 in ?? () from /usr/lib/i386-linux-gnu/libX11.so.6
No symbol table info available.
#5 0xb6d55c6e in _XReply () from /usr/lib/i386-linux-gnu/libX11.so.6
No symbol table info available.
#6 0xb6d5147b in XSync () from /usr/lib/i386-linux-gnu/libX11.so.6
No symbol table info available.
#7 0xb76d7b75 in ecore_x_sync () at lib/ecore_x/xlib/ecore_x.c:949
No locals.
#8 0x0814f79a in e_sigseg_act (x=11, info=0xbffdf98c, data=0xbffdfa0c)
at e_signals.c:70
No locals.
#9 signal handler called
No symbol table info available.
#10 0xb6ed792e in _int_free (av=0xb700c440 main_arena, p=0xa2a9eb8,
have_lock=0) at malloc.c:3912
size = 240
fb = optimized out
nextchunk = 0xa2a9fa8
nextsize = optimized out
nextinuse = 0
prevsize = optimized out
bck = 0x0
fwd = 0x0
errstr = 0x0
locked = 1
__func__ = _int_free
#11 0xb70f8a11 in _eo_free (obj=optimized out) at lib/eo/eo_private.h:214
No locals.
#12 eo_manual_free (obj_id=obj_id@entry=0x3d1d1b) at lib/eo/eo.c:1573
__FUNCTION__ = eo_manual_free
#13 0xb727b347 in evas_object_free (eo_obj=0x3d1d1b,
clean_layer=clean_layer@entry=1) at lib/evas/canvas/evas_object_main.c:199
obj = 0xa2a9ef8
was_smart_child = optimized out
#14 0xb72d45cf in evas_render_updates_internal (eo_e=eo_e@entry=0x701d,
make_updates=make_updates@entry=1 '\001', do_draw=do_draw@entry=1
'\001', done_func=done_func@entry=0x0, done_data=done_data@entry=0x0,
do_async=do_async@entry=0 '\000') at lib/evas/canvas/evas_render.c:1930
eo_obj = optimized out
e
