From be94e531268c5532dce7e531e37613ffaf62587d Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 5 Mar 2013 09:20:33 +0000 Subject: [PATCH 01/11] Fix formatting. Signed-off-by: Christopher Michael --- src/lib/ecore_wayland/ecore_wl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index f2957b0ee6..eded10b162 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -122,8 +122,7 @@ ecore_wl_init(const char *name) _ecore_wl_disp->fd = wl_display_get_fd(_ecore_wl_disp->wl.display); _ecore_wl_disp->fd_hdl = - ecore_main_fd_handler_add(_ecore_wl_disp->fd, - ECORE_FD_READ, + ecore_main_fd_handler_add(_ecore_wl_disp->fd, ECORE_FD_READ, _ecore_wl_cb_handle_data, _ecore_wl_disp, NULL, NULL); From a37443ad879815fb1c327a7a1b6669a84e8cf622 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 5 Mar 2013 09:24:48 +0000 Subject: [PATCH 02/11] Remove display_dispatch call (not needed here). Signed-off-by: Christopher Michael --- src/lib/ecore_wayland/ecore_wl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index eded10b162..003898de96 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -138,8 +138,6 @@ ecore_wl_init(const char *name) wl_registry_add_listener(_ecore_wl_disp->wl.registry, &_ecore_wl_registry_listener, _ecore_wl_disp); - wl_display_dispatch(_ecore_wl_disp->wl.display); - if (!_ecore_wl_xkb_init(_ecore_wl_disp)) { ERR("Could not initialize XKB"); From fc4846fbc6ea0c1a7baa3605a24a92aa6cd5e836 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 5 Mar 2013 09:25:45 +0000 Subject: [PATCH 03/11] Eo: Changed EO_DBG_INFO_LIST_APPEND to be an inline function. It's cleaner. Should have never been a macro. This is part of the effort of reducing the usage of ({ which is apparently a non standard extension. We can get rid of most of it and ifdef the rest. --- src/lib/eo/Eo.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 0dc6490abf..c596a270e2 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -151,24 +151,23 @@ EAPI extern const Eina_Value_Type *EO_DBG_INFO_TYPE; typedef struct _Eo_Dbg_Info Eo_Dbg_Info; /** - * @def EO_DBG_INFO_LIST_APPEND * Creates a list inside debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the list + * @param[in] list list where to append + * @param[in] name name of the list * @return the new list */ -#define EO_DBG_INFO_LIST_APPEND(LIST, NAME) \ -({ \ - Eo_Dbg_Info *List = LIST; \ - Eo_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \ - Tmp->name = eina_stringshare_add(NAME); \ - eina_value_list_setup(&(Tmp->value), EO_DBG_INFO_TYPE); \ - if (List) \ - { \ - eina_value_list_pappend(&(List->value), Tmp); \ - } \ - Tmp; \ -}) +static inline Eo_Dbg_Info * +EO_DBG_INFO_LIST_APPEND(Eo_Dbg_Info *list, const char *name) +{ + Eo_Dbg_Info *tmp = calloc(1, sizeof(*tmp)); + tmp->name = eina_stringshare_add(name); + eina_value_list_setup(&(tmp->value), EO_DBG_INFO_TYPE); + if (list) + { + eina_value_list_pappend(&(list->value), tmp); + } + return tmp; +} /** * @def EO_DBG_INFO_APPEND From fb8842bc249a8f3cea86f53cef6bad76a7ae209f Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 5 Mar 2013 11:53:23 +0000 Subject: [PATCH 04/11] Formatting fix. Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index 003898de96..f5f1a5924c 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -333,10 +333,8 @@ _ecore_wl_cb_idle_enterer(void *data) ret = wl_display_flush(ewd->wl.display); if ((ret < 0) && (errno == EAGAIN)) - { - ecore_main_fd_handler_active_set(ewd->fd_hdl, - (ECORE_FD_READ | ECORE_FD_WRITE)); - } + ecore_main_fd_handler_active_set(ewd->fd_hdl, + (ECORE_FD_READ | ECORE_FD_WRITE)); else if (ret < 0) { /* FIXME: need do error processing? */ From 63802e5b84405f94ff8ce00bf997159af0c45cfd Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 5 Mar 2013 23:00:38 +0900 Subject: [PATCH 05/11] since Eo.h is inclued in c++ stuff... how about we cast from the void * return from calloc to Eo_Dbg_Info * since c++ is really unhappy with this stuff without a cast (silly c++). --- src/lib/eo/Eo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index c596a270e2..867d26a13f 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -159,7 +159,7 @@ typedef struct _Eo_Dbg_Info Eo_Dbg_Info; static inline Eo_Dbg_Info * EO_DBG_INFO_LIST_APPEND(Eo_Dbg_Info *list, const char *name) { - Eo_Dbg_Info *tmp = calloc(1, sizeof(*tmp)); + Eo_Dbg_Info *tmp = (Eo_Dbg_Info *)calloc(1, sizeof(*tmp)); tmp->name = eina_stringshare_add(name); eina_value_list_setup(&(tmp->value), EO_DBG_INFO_TYPE); if (list) From 2ee27ec6d56d7a1b52f345721c3b95a75f460141 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Wed, 6 Mar 2013 09:26:44 +0900 Subject: [PATCH 06/11] fix bug scroll works when PgDn, PgUp, Home, End key in entry is pressed in preedit state --- ChangeLog | 5 +++++ NEWS | 1 + src/lib/edje/edje_entry.c | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e936fe595d..ac722ed80a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-06 Jihoon Kim (jihoon) + + * Edje entry: fix bug scroll works when PgDn, PgUp, Home, End key in entry is pressed in preedit state + + 2013-03-05 Jiyoun Park (Jypark) * Ecore_x: Add atom related with indicator type. diff --git a/NEWS b/NEWS index 45b0ef49e6..365c199f89 100644 --- a/NEWS +++ b/NEWS @@ -187,3 +187,4 @@ Fixes: * fix custom states for edje SPACER parts * fix edje program filters * fix dangling pointer problem related with shmget fail + * fix bug scroll works when PgDn, PgUp, Home, End key in entry is pressed in preedit state diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 083b997dce..01682ff4b7 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -1230,12 +1230,20 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ECORE_IMF_EVENT_KEY_DOWN, (Ecore_IMF_Event *)&ecore_ev); - if (!strcmp(ev->keyname, "Down") || - (!strcmp(ev->keyname, "KP_Down") && !ev->string) || - !strcmp(ev->keyname, "Up") || - (!strcmp(ev->keyname, "KP_Up") && !ev->string)) + if (en->have_preedit) { - if (en->have_preedit) + if (!strcmp(ev->keyname, "Down") || + (!strcmp(ev->keyname, "KP_Down") && !ev->string) || + !strcmp(ev->keyname, "Up") || + (!strcmp(ev->keyname, "KP_Up") && !ev->string) || + !strcmp(ev->keyname, "Next") || + (!strcmp(ev->keyname, "KP_Next") && !ev->string) || + !strcmp(ev->keyname, "Prior") || + (!strcmp(ev->keyname, "KP_Prior") && !ev->string) || + !strcmp(ev->keyname, "Home") || + (!strcmp(ev->keyname, "KP_Home") && !ev->string) || + !strcmp(ev->keyname, "End") || + (!strcmp(ev->keyname, "KP_End") && !ev->string)) ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } From 238e5951bbbd8aaed33908b7822bd1f4b63ee08c Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 6 Mar 2013 23:07:39 +0900 Subject: [PATCH 07/11] eeze: handle all version back as we did in 1.7. hopefuly. --- configure.ac | 23 +++++++++++++++++++---- src/Makefile_Eeze.am | 10 ++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index e1c90cda9e..c1776a85cc 100644 --- a/configure.ac +++ b/configure.ac @@ -3134,18 +3134,33 @@ EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_libmount}], [EEZE_MOUNT], [mount >= 2.18.0]) EFL_ADD_FEATURE([EEZE], [libmount], [${have_eeze_mount}]) +PKG_CHECK_EXISTS([mount < 2.19.0], + [have_libmount_old="yes"], + [have_libmount_old="no"]) +AC_MSG_CHECKING([Use old libmount API (before 2.19.0)]) +AC_MSG_RESULT([${have_libmount_old}]) + +PKG_CHECK_EXISTS([mount == 2.19.0], + [have_libmount_219="yes"], + [have_libmount_219="no"]) +AC_MSG_CHECKING([Use libmount 2.19.0 API]) +AC_MSG_RESULT([${have_libmount_219}]) + PKG_CHECK_EXISTS([mount > 2.19.0], [have_libmount_new="yes"], [have_libmount_new="no"]) -AC_MSG_CHECKING([Use new libmount API (older that 2.19.0)]) +AC_MSG_CHECKING([Use new libmount API (older than 2.19.0)]) AC_MSG_RESULT([${have_libmount_new}]) -AM_CONDITIONAL([EEZE_LIBMOUNT_NEW], [test "x${have_libmount_new}" = "xyes"]) -if test "x${have_libmount_new}" = "xno"; then +AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219], + [test "x${have_libmount_new}" = "xyes"]) +if test "x${have_libmount_old}" = "xyes"; then AC_DEFINE_UNQUOTED([OLD_LIBMOUNT], [1], [using first version of libmount]) fi -AM_CONDITIONAL([EEZE_NOLIBMOUNT], [test "x${have_eeze_mount}" = "xno"]) +AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219], + [test "x${have_libmount_old}" = "xyes"]) +AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xno"]) ## modules if test "${want_tizen}" = "yes"; then diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am index 48080877f2..5601a3377a 100644 --- a/src/Makefile_Eeze.am +++ b/src/Makefile_Eeze.am @@ -30,13 +30,15 @@ lib/eeze/eeze_udev_syspath.c \ lib/eeze/eeze_udev_walk.c \ lib/eeze/eeze_udev_watch.c -if EEZE_NOLIBMOUNT -lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount.c +if HAVE_EEZE_MOUNT +if EEZE_LIBMOUNT_BEFORE_219 +lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c else -if EEZE_LIBMOUNT_NEW +if EEZE_LIBMOUNT_AFTER_219 lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_new.c else -lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c +lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount.c +endif endif endif From fcf0f02ac3a56cac20b452fa8b2dbaad20cf2431 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 6 Mar 2013 23:22:29 +0900 Subject: [PATCH 08/11] eeze: correct a typo to enable the correct build. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c1776a85cc..79d562b4f1 100644 --- a/configure.ac +++ b/configure.ac @@ -3160,7 +3160,7 @@ fi AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219], [test "x${have_libmount_old}" = "xyes"]) -AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xno"]) +AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xyes"]) ## modules if test "${want_tizen}" = "yes"; then From bec45fe120fbeb2fa5adf7cf298888f14d810640 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 6 Mar 2013 23:40:21 +0900 Subject: [PATCH 09/11] eeze: disable build of libmount related code completely for the moment. --- src/Makefile_Eeze.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am index 5601a3377a..e6294abba4 100644 --- a/src/Makefile_Eeze.am +++ b/src/Makefile_Eeze.am @@ -9,15 +9,10 @@ installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@ dist_installed_eezemainheaders_DATA = \ lib/eeze/Eeze.h \ lib/eeze/Eeze_Net.h \ -lib/eeze/Eeze_Sensor.h \ -lib/eeze/Eeze_Disk.h +lib/eeze/Eeze_Sensor.h # libeeze.la lib_eeze_libeeze_la_SOURCES = \ -lib/eeze/eeze_disk.c \ -lib/eeze/eeze_disk_mount.c \ -lib/eeze/eeze_disk_private.h \ -lib/eeze/eeze_disk_udev.c \ lib/eeze/eeze_main.c \ lib/eeze/eeze_net.c \ lib/eeze/eeze_net_private.h \ @@ -31,6 +26,8 @@ lib/eeze/eeze_udev_walk.c \ lib/eeze/eeze_udev_watch.c if HAVE_EEZE_MOUNT +lib_eeze_libeeze_la_SOURCES += eeze_disk.c eeze_disk_udev.c eeze_disk_mount.c eeze_disk_private.h +dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h if EEZE_LIBMOUNT_BEFORE_219 lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c else From 49c0bea4aacf1a857d8a7ec00f95d3d7c661c23b Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 6 Mar 2013 23:42:04 +0900 Subject: [PATCH 10/11] eeze: fix typo. --- src/Makefile_Eeze.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am index e6294abba4..49df4a565e 100644 --- a/src/Makefile_Eeze.am +++ b/src/Makefile_Eeze.am @@ -26,7 +26,11 @@ lib/eeze/eeze_udev_walk.c \ lib/eeze/eeze_udev_watch.c if HAVE_EEZE_MOUNT -lib_eeze_libeeze_la_SOURCES += eeze_disk.c eeze_disk_udev.c eeze_disk_mount.c eeze_disk_private.h +lib_eeze_libeeze_la_SOURCES += \ +lib/eeze/eeze_disk.c \ +lib/eeze/eeze_disk_udev.c \ +lib/eeze/eeze_disk_mount.c \ +lib/eeze/eeze_disk_private.h dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h if EEZE_LIBMOUNT_BEFORE_219 lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c From fd701b710b088b195b624c29b4a4a49ac55415e2 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 6 Mar 2013 16:57:01 +0000 Subject: [PATCH 11/11] Edbus: Include config.h --- src/lib/edbus/edbus_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/edbus/edbus_core.c b/src/lib/edbus/edbus_core.c index 6f8daf8d7f..b7a77ea695 100644 --- a/src/lib/edbus/edbus_core.c +++ b/src/lib/edbus/edbus_core.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "edbus_private.h" #include "edbus_private_types.h" #include