[EGIT] [core/efl] master 02/02: efreet: Create stack at start of recursion
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=70474a4bc52b46f36d55c9dd343ff4758a6b030b
commit 70474a4bc52b46f36d55c9dd343ff4758a6b030b
Author: Sebastian Dransfeld s...@tango.flipp.net
Date: Wed Dec 4 09:03:56 2013 +0100
efreet: Create stack at start of recursion
No need to check for NULL stack, we know where we start our recursive
scan, so create the stack there.
Also fixes CID1132751 and CID1132752
---
src/bin/efreet/efreetd_cache.c | 83 --
1 file changed, 40 insertions(+), 43 deletions(-)
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index 6ca556a..94e48f1 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -248,29 +248,26 @@ desktop_changes_monitor_add(const char *path)
eina_hash_add(desktop_change_monitors, path, mon);
}
+static int
+stat_cmp(const void *a, const void *b)
+{
+ const struct stat *st1 = a;
+ const struct stat *st2 = b;
+
+ if ((st2-st_dev == st1-st_dev) (st2-st_ino == st1-st_ino))
+ return 0;
+ return 1;
+}
+
static void
icon_changes_listen_recursive(Eina_Inarray *stack, const char *path, Eina_Bool
base)
{
Eina_Iterator *it;
Eina_File_Direct_Info *info;
- Eina_Bool free_stack = EINA_FALSE;
struct stat st;
- unsigned int i;
- if (!stack)
- {
-free_stack = EINA_TRUE;
-stack = eina_inarray_new(sizeof(struct stat), 16);
-if (!stack) return;
- }
if (stat(path, st) == -1) return;
- for (i = 0; i eina_inarray_count(stack); i++)
- {
-struct stat *st2 = eina_inarray_nth(stack, i);
-
-if ((st2-st_dev == st.st_dev) (st2-st_ino == st.st_ino))
- return;
- }
+ if (eina_inarray_search(stack, st, stat_cmp) = 0) return;
eina_inarray_push(stack, st);
if ((!ecore_file_is_dir(path)) (base))
@@ -285,7 +282,7 @@ icon_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Bool b
}
if (ecore_file_is_dir(path)) icon_changes_monitor_add(path);
it = eina_file_stat_ls(path);
- if (!it) goto end;
+ if (!it) return;
EINA_ITERATOR_FOREACH(it, info)
{
if (info-path[info-name_start] == '.') continue;
@@ -294,8 +291,6 @@ icon_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Bool b
icon_changes_listen_recursive(stack, info-path, EINA_FALSE);
}
eina_iterator_free(it);
-end:
- if (free_stack) eina_inarray_free(stack);
}
static void
@@ -303,24 +298,10 @@ desktop_changes_listen_recursive(Eina_Inarray *stack,
const char *path, Eina_Boo
{
Eina_Iterator *it;
Eina_File_Direct_Info *info;
- Eina_Bool free_stack = EINA_FALSE;
struct stat st;
- unsigned int i;
- if (!stack)
- {
-free_stack = EINA_TRUE;
-stack = eina_inarray_new(sizeof(struct stat), 16);
-if (!stack) return;
- }
if (stat(path, st) == -1) return;
- for (i = 0; i eina_inarray_count(stack); i++)
- {
-struct stat *st2 = eina_inarray_nth(stack, i);
-
-if ((st2-st_dev == st.st_dev) (st2-st_ino == st.st_ino))
- return;
- }
+ if (eina_inarray_search(stack, st, stat_cmp) = 0) return;
eina_inarray_push(stack, st);
if ((!ecore_file_is_dir(path)) (base))
{
@@ -334,7 +315,7 @@ desktop_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Boo
}
if (ecore_file_is_dir(path)) desktop_changes_monitor_add(path);
it = eina_file_stat_ls(path);
- if (!it) goto end;
+ if (!it) return;
EINA_ITERATOR_FOREACH(it, info)
{
if (info-path[info-name_start] == '.') continue;
@@ -343,8 +324,6 @@ desktop_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Boo
desktop_changes_listen_recursive(stack, info-path, EINA_FALSE);
}
eina_iterator_free(it);
-end:
- if (free_stack) eina_inarray_free(stack);
}
static void
@@ -354,29 +333,37 @@ icon_changes_listen(void)
Eina_List *xdg_dirs;
char buf[PATH_MAX];
const char *dir;
+ Eina_Inarray *stack;
- icon_changes_listen_recursive(NULL, efreet_icon_deprecated_user_dir_get(),
EINA_TRUE);
- icon_changes_listen_recursive(NULL, efreet_icon_user_dir_get(), EINA_TRUE);
+ stack = eina_inarray_new(sizeof(struct stat), 16);
+ if (!stack) return;
+ icon_changes_listen_recursive(stack, efreet_icon_deprecated_user_dir_get(),
EINA_TRUE);
+ eina_inarray_flush(stack);
+ icon_changes_listen_recursive(stack, efreet_icon_user_dir_get(), EINA_TRUE);
EINA_LIST_FOREACH(icon_extra_dirs, l, dir)
{
-icon_changes_listen_recursive(NULL, dir, EINA_TRUE);
+eina_inarray_flush(stack);
+icon_changes_listen_recursive(stack, dir, EINA_TRUE);
}
xdg_dirs = efreet_data_dirs_get();
EINA_LIST_FOREACH(xdg_dirs, l, dir)
{
snprintf(buf, sizeof(buf), %s/icons, dir);
-
[EGIT] [core/efl] master 01/02: efreet: Create stack at start of recursion
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8bc17db6fa8d347b0420a142707fe5837190e41a
commit 8bc17db6fa8d347b0420a142707fe5837190e41a
Author: Sebastian Dransfeld s...@tango.flipp.net
Date: Wed Dec 4 08:36:46 2013 +0100
efreet: Create stack at start of recursion
No need to check for NULL stack, we know where we start our recursive
scan, so create the stack there.
---
src/bin/efreet/efreet_desktop_cache_create.c | 52 ++--
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/bin/efreet/efreet_desktop_cache_create.c
b/src/bin/efreet/efreet_desktop_cache_create.c
index fd8c613..9ddf26d 100644
--- a/src/bin/efreet/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -126,6 +126,16 @@ cache_add(const char *path, const char *file_id, int
priority EINA_UNUSED, int *
return 1;
}
+static int
+stat_cmp(const void *a, const void *b)
+{
+ const struct stat *st1 = a;
+ const struct stat *st2 = b;
+
+ if ((st2-st_dev == st1-st_dev) (st2-st_ino == st1-st_ino))
+ return 0;
+ return 1;
+}
static int
cache_scan(Eina_Inarray *stack, const char *path, const char *base_id,
@@ -135,31 +145,15 @@ cache_scan(Eina_Inarray *stack, const char *path, const
char *base_id,
char id[PATH_MAX];
Eina_Iterator *it;
Eina_File_Direct_Info *info;
-Eina_Bool free_stack = EINA_FALSE;
struct stat st;
-unsigned int i;
-int ret = 1;
if (!ecore_file_is_dir(path)) return 1;
-
-if (!stack)
-{
-free_stack = EINA_TRUE;
-stack = eina_inarray_new(sizeof(struct stat), 16);
-if (!stack) goto end;
-}
-if (stat(path, st) == -1) goto end;
-for (i = 0; i eina_inarray_count(stack); i++)
-{
-struct stat *st2 = eina_inarray_nth(stack, i);
-
-if ((st2-st_dev == st.st_dev) (st2-st_ino == st.st_ino))
-goto end;
-}
+if (stat(path, st) == -1) return 1;
+if (eina_inarray_search(stack, st, stat_cmp) = 0) return 1;
eina_inarray_push(stack, st);
it = eina_file_stat_ls(path);
-if (!it) goto end;
+if (!it) return 1;
id[0] = '\0';
EINA_ITERATOR_FOREACH(it, info)
{
@@ -188,15 +182,12 @@ cache_scan(Eina_Inarray *stack, const char *path, const
char *base_id,
if (!cache_add(info-path, file_id, priority, changed))
{
eina_iterator_free(it);
-ret = 0;
-goto end;
+return 0;
}
}
}
eina_iterator_free(it);
-end:
-if (free_stack) eina_inarray_free(stack);
-return ret;
+return 1;
}
static int
@@ -238,6 +229,7 @@ main(int argc, char **argv)
Eina_List *systemdirs = NULL;
Eina_List *extra_dirs = NULL;
Eina_List *l = NULL;
+Eina_Inarray *stack = NULL;
int priority = 0;
char *dir = NULL;
char *path;
@@ -361,18 +353,24 @@ main(int argc, char **argv)
dirs = efreet_default_dirs_get(efreet_data_home_get(),
efreet_data_dirs_get(),
applications);
if (!dirs) goto error;
+stack = eina_inarray_new(sizeof(struct stat), 16);
+if (!stack) goto error;
EINA_LIST_FREE(dirs, path)
{
char file_id[PATH_MAX] = { '\0' };
-if (!cache_scan(NULL, path, file_id, priority++, 1, changed))
+eina_inarray_flush(stack);
+if (!cache_scan(stack, path, file_id, priority++, 1, changed))
goto error;
systemdirs = eina_list_append(systemdirs, path);
}
EINA_LIST_FOREACH(extra_dirs, l, path)
- if (!cache_scan(NULL, path, NULL, priority, 0, changed)) goto error;
+{
+eina_inarray_flush(stack);
+if (!cache_scan(stack, path, NULL, priority, 0, changed)) goto error;
+}
/* store util */
#define STORE_HASH_ARRAY(_hash) \
@@ -475,6 +473,7 @@ main(int argc, char **argv)
EINA_LIST_FREE(systemdirs, dir)
eina_stringshare_del(dir);
eina_list_free(extra_dirs);
+eina_inarray_free(stack);
efreet_shutdown();
ecore_shutdown();
eet_shutdown();
@@ -483,6 +482,7 @@ main(int argc, char **argv)
close(lockfd);
return 0;
error:
+if (stack) eina_inarray_free(stack);
IF_FREE(dir);
edd_error:
if (old_file_ids)
--
Re: [E-devel] [EGIT] [core/efl] master 01/03: evas - fix gl egl textrue from pixmap support y invert query extension
On Tue, 3 Dec 2013 23:32:13 -0200 Iván Briano sachi...@gmail.com said:
Building with EGL and GL-ES, Mesa 9.2.4 on Intel video,
I’m getting windows vertically inverted. Works if I revert
this commit or go back to software compositing.
and did you look at the commit? it's right. if you don't have the yinverted
extension it's the same behavior as before. it assume yinverted in gles/egl by
default (yinvert = 1 ... same as before ... m-native.yinvert = 1).
but IF you have the extension - it queries. it checks for the extensions string
and if you have it - sets a flag. if this flag is true AND the get config attr
succeeds - it sets yinvert to the queried invert value.
now.. i can only conclude here that either the interpretation of the extension
is wrong and that the invert value when 0/false == invertad and when 1/true is
NOT inverted... (odd and doesn't make sense)... or that your driver has a bug.
it implements this extn but gets it wrong.
the only solutions here would be (assuming the driver is wrong), is to ignore
this and just wait for the driver to be fixed, or to add blacklist code into
evas to detect the specific broken driver + version and ignore that extension
if that driver is found. i don't know what specific driver strings you have
there so i can't write a blacklist for you, but i suspect you want to file a
bug with mesa/driver/xorg devs :)
On Nov 29, 2013, at 8:08, Stanislav Vorobiov s.vorob...@samsung.com wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e3b778acb851671c2f24454b80bdeafc20d1c65
commit 9e3b778acb851671c2f24454b80bdeafc20d1c65
Author: Stanislav Vorobiov s.vorob...@samsung.com
Date: Thu Nov 28 18:18:16 2013 +0900
evas - fix gl egl textrue from pixmap support y invert query extension
Instead of hardcoding yinvert=1 we should query for
EGL_NOK_texture_from_pixmap extension and if it's present
use EGL_Y_INVERTED_NOK value
---
src/modules/evas/engines/gl_x11/evas_engine.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c index d25610f..4e5c22c
100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -71,6 +71,7 @@ struct _Render_Engine
static int initted = 0;
static int gl_wins = 0;
static int extn_have_buffer_age = 1;
+static int extn_have_y_inverted = 0;
typedef void(*_eng_fn) (void);
typedef _eng_fn (*glsym_func_eng_fn) ();
@@ -90,6 +91,9 @@ static Eina_Bool eng_preload_make_current(void *data,
void *doit);
#ifndef EGL_BUFFER_AGE_EXT
# define EGL_BUFFER_AGE_EXT 0x313d
#endif
+#ifndef EGL_Y_INVERTED_NOK
+# define EGL_Y_INVERTED_NOK 0x307F
+#endif
_eng_fn (*glsym_eglGetProcAddress)(const char *a) = NULL;
void*(*glsym_eglCreateImage) (EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const int *e) = NULL; @@ -711,6 +715,10 @@
gl_extn_veto(Render_Engine *re) {
extn_have_buffer_age = 0;
}
+if (strstr(str, EGL_NOK_texture_from_pixmap))
+ {
+ extn_have_y_inverted = 1;
+ }
}
else
{
@@ -2225,6 +2233,7 @@ eng_image_native_set(void *data, void *image, void
*native) EGLConfig egl_config;
int config_attrs[20];
int num_config, i = 0;
+ int yinvert = 1;
eina_hash_add(re-win-gl_context-shared-native_pm_hash,
pmid, im);
@@ -2250,6 +2259,15 @@ eng_image_native_set(void *data, void *image, void
*native) if (!eglChooseConfig(re-win-egl_disp, config_attrs,
egl_config, 1, num_config))
ERR(eglChooseConfig() failed for pixmap 0x%x, num_config =
%i, (unsigned int)pm, num_config);
+ else
+{
+ int val;
+ if (extn_have_y_inverted
+ eglGetConfigAttrib(re-win-egl_disp, egl_config,
+ EGL_Y_INVERTED_NOK, val))
+yinvert = val;
+}
+
memcpy((n-ns), ns, sizeof(Evas_Native_Surface));
n-pixmap = pm;
n-visual = vis;
@@ -2263,7 +2281,7 @@ eng_image_native_set(void *data, void *image, void
*native) ERR(Try eglCreateImage on EGL with no support);
if (!n-egl_surface)
ERR(eglCreatePixmapSurface() for 0x%x failed, (unsigned
int)pm);
- im-native.yinvert = 1;
+ im-native.yinvert = yinvert;
im-native.loose = 0;
im-native.data= n;
im-native.func.data = re;
--
Re: [E-devel] [Enlightenment-intl] EFL 1.8.1
On Wed, 4 Dec 2013 05:39:27 +0100 dieter roelants diete...@bsdusr.net said: On Wed, 4 Dec 2013 09:04:43 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: Yeah, you tag what you've committed, but if you rebase afterwards, your tag is still on the original commit, not on the rebased one. Normally the original commit stays in your tree until it gets g/c'd, but if you tag it, it keeps referenced. sure - but i'd expect teh tag to move forward to the conflict resolved commit as it is impossible to push without that resolve. either that or break Ah, you expect git to do the userfriendly thing. You obviously haven't used it enough. :) make an unfriendly tool - then expect shit to happen. especially when you cant undo stuff... the resolve commit out after the tag and shove the tagged commit in before commits that required the rebase to begin with. it just behaves really oddly. i blame cedric for this! oh i wasn't implying cedric isn't to blame in some way you haven't spend enough time around here... he certainly is to blame! :) -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] efl-1.8 02/03: evas: fix loader to properly define _XOPEN_SOURCE for Solaris.
cedric pushed a commit to branch efl-1.8. http://git.enlightenment.org/core/efl.git/commit/?id=62ff602d4b820e6c1ab27aa8558219300b5e4af1 commit 62ff602d4b820e6c1ab27aa8558219300b5e4af1 Author: Cedric Bail cedric.b...@samsung.com Date: Wed Dec 4 17:10:47 2013 +0900 evas: fix loader to properly define _XOPEN_SOURCE for Solaris. --- src/modules/evas/loaders/psd/evas_image_load_psd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/loaders/psd/evas_image_load_psd.c b/src/modules/evas/loaders/psd/evas_image_load_psd.c index c183b52..1554e18 100644 --- a/src/modules/evas/loaders/psd/evas_image_load_psd.c +++ b/src/modules/evas/loaders/psd/evas_image_load_psd.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE +#define _XOPEN_SOURCE 600 #ifdef HAVE_CONFIG_H # include config.h --
[EGIT] [core/efl] efl-1.8 03/03: eina: increase hash matching inside of Eina_Hash.
cedric pushed a commit to branch efl-1.8. http://git.enlightenment.org/core/efl.git/commit/?id=3e711ba6353f53df51460e7ed25475ade0ab573a commit 3e711ba6353f53df51460e7ed25475ade0ab573a Author: Cedric Bail cedric.b...@samsung.com Date: Wed Dec 4 18:29:07 2013 +0900 eina: increase hash matching inside of Eina_Hash. This is the correct implementation of the idea developped in Lucas De Marchi's blog : http://www.politreco.com/2013/09/optimizing-hash-table-with-kmod-as-testbed/ This give an interesting +15% for all Eina_Hash user whatever hash function they use. The inlined djb2 is still the fastest one and all other give very close result. It does increase memory foot print, but as much as the previous way of doing it. --- src/lib/eina/eina_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c index dab865e..274d3e8 100644 --- a/src/lib/eina/eina_hash.c +++ b/src/lib/eina/eina_hash.c @@ -64,7 +64,7 @@ #define EINA_HASH_BUCKET_SIZE 8 #define EINA_HASH_SMALL_BUCKET_SIZE 5 -#define EINA_HASH_RBTREE_MASK 0xFFF +#define EINA_HASH_RBTREE_MASK 0xFF typedef struct _Eina_Hash_Head Eina_Hash_Head; typedef struct _Eina_Hash_Element Eina_Hash_Element; --
[EGIT] [core/efl] master 06/07: eina: increase hash matching inside of Eina_Hash.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=df909605c557035c845cc5f9cfbc2007537e9ef1 commit df909605c557035c845cc5f9cfbc2007537e9ef1 Author: Cedric Bail cedric.b...@samsung.com Date: Wed Dec 4 18:29:07 2013 +0900 eina: increase hash matching inside of Eina_Hash. This is the correct implementation of the idea developped in Lucas De Marchi's blog : http://www.politreco.com/2013/09/optimizing-hash-table-with-kmod-as-testbed/ This give an interesting +15% for all Eina_Hash user whatever hash function they use. The inlined djb2 is still the fastest one and all other give very close result. It does increase memory foot print, but as much as the previous way of doing it. --- src/lib/eina/eina_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c index dab865e..274d3e8 100644 --- a/src/lib/eina/eina_hash.c +++ b/src/lib/eina/eina_hash.c @@ -64,7 +64,7 @@ #define EINA_HASH_BUCKET_SIZE 8 #define EINA_HASH_SMALL_BUCKET_SIZE 5 -#define EINA_HASH_RBTREE_MASK 0xFFF +#define EINA_HASH_RBTREE_MASK 0xFF typedef struct _Eina_Hash_Head Eina_Hash_Head; typedef struct _Eina_Hash_Element Eina_Hash_Element; --
[EGIT] [core/efl] master 07/07: eina: ignore benchmark binary.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=029087d0047efdd52dc3bcfae5a4e96e893d1323 commit 029087d0047efdd52dc3bcfae5a4e96e893d1323 Author: Cedric Bail cedric.b...@samsung.com Date: Wed Dec 4 18:32:29 2013 +0900 eina: ignore benchmark binary. --- src/benchmarks/eina/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/src/benchmarks/eina/.gitignore b/src/benchmarks/eina/.gitignore new file mode 100644 index 000..ddf21c1 --- /dev/null +++ b/src/benchmarks/eina/.gitignore @@ -0,0 +1 @@ +/eina_bench --
[EGIT] [core/efl] master 05/07: Revert eina: work around current strange behavior seen in eina_cow.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3a15c5bbb3ef0a49616b15cf7ba601eaa53c3034
commit 3a15c5bbb3ef0a49616b15cf7ba601eaa53c3034
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 17:53:34 2013 +0900
Revert eina: work around current strange behavior seen in eina_cow.
This reverts commit e4107b2936e2a11e5966bbdc591f110156191af0.
---
src/lib/eina/eina_cow.c | 10 --
1 file changed, 10 deletions(-)
diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index 2dd8807..73a65e5 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -261,16 +261,6 @@ _eina_cow_gc(Eina_Cow *cow, Eina_Cow_GC *gc)
data = EINA_COW_DATA_GET(gc-ref);
- /*
- THIS IS A TEMPORARY WORK AROUND THAT SHOULD LIMIT PROBLEM
- UNTIL WE KNOW WHY THERE IS A PROBLEM IN EINA_HASH.
- */
- if (gc-ref-refcount == 0)
- {
-eina_hash_del(cow-togc, gc-ref, gc);
-return ;
- }
-
current_cow_size = cow-struct_size;
match = eina_hash_find(cow-match, data);
if (match)
--
[EGIT] [core/efl] efl-1.8 01/03: Revert eina: check if the complete hash match before checking if the key match during children walk.
cedric pushed a commit to branch efl-1.8.
http://git.enlightenment.org/core/efl.git/commit/?id=72681319d43a301f5fa6325516ff395f6895c8e5
commit 72681319d43a301f5fa6325516ff395f6895c8e5
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 17:24:30 2013 +0900
Revert eina: check if the complete hash match before checking if the key
match during children walk.
This reverts commit 295babadb1675d1160b18c639dd6dcbe20b02cfb.
The implementation of that said optimization is actually wrong.
---
src/lib/eina/eina_hash.c | 31 +--
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 0989f68..dab865e 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -101,7 +101,6 @@ struct _Eina_Hash_Element
{
EINA_RBTREE;
Eina_Hash_Tuple tuple;
- int hash;
};
struct _Eina_Hash_Foreach_Data
@@ -172,21 +171,18 @@ _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head
*left,
static inline int
_eina_hash_key_rbtree_cmp_key_data(const Eina_Hash_Element *hash_element,
- const Eina_Hash_Element *tuple,
+ const Eina_Hash_Tuple *tuple,
EINA_UNUSED unsigned int key_length,
Eina_Key_Cmp cmp)
{
int result;
- result = hash_element-hash - tuple-hash;
- if (!result)
- result = cmp(hash_element-tuple.key,
- hash_element-tuple.key_length,
- tuple-tuple.key,
- tuple-tuple.key_length);
+ result = cmp(hash_element-tuple.key,
+hash_element-tuple.key_length,
+tuple-key,
+tuple-key_length);
- if (result == 0 tuple-tuple.data
- tuple-tuple.data != hash_element-tuple.data)
+ if (result == 0 tuple-data tuple-data != hash_element-tuple.data)
return 1;
return result;
@@ -199,10 +195,8 @@ _eina_hash_key_rbtree_cmp_node(const Eina_Hash_Element
*left,
{
int result;
- result = left-hash - right-hash;
- if (result == 0)
- result = cmp(left-tuple.key, left-tuple.key_length,
- right-tuple.key, right-tuple.key_length);
+ result = cmp(left-tuple.key, left-tuple.key_length,
+right-tuple.key, right-tuple.key_length);
if (result 0)
return EINA_RBTREE_LEFT;
@@ -218,7 +212,6 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
{
Eina_Hash_Element *new_hash_element = NULL;
Eina_Hash_Head *hash_head;
- int original_key;
int hash_num;
EINA_SAFETY_ON_NULL_RETURN_VAL(hash, EINA_FALSE);
@@ -227,7 +220,6 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
EINA_MAGIC_CHECK_HASH(hash);
/* Apply eina mask to hash. */
- original_key = key_hash;
hash_num = key_hash hash-mask;
key_hash = EINA_HASH_RBTREE_MASK;
@@ -276,7 +268,6 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
/* Setup the element */
new_hash_element-tuple.key_length = key_length;
new_hash_element-tuple.data = (void *)data;
- new_hash_element-hash = original_key;
if (alloc_length 0)
{
new_hash_element-tuple.key = (char *)(new_hash_element + 1);
@@ -330,10 +321,8 @@ _eina_hash_find_by_hash(const Eina_Hash *hash,
Eina_Hash_Head **hash_head)
{
Eina_Hash_Element *hash_element;
- Eina_Hash_Element tmp;
int rb_hash = key_hash EINA_HASH_RBTREE_MASK;
- tmp.hash = key_hash;
key_hash = hash-mask;
if (!hash-buckets)
@@ -348,11 +337,9 @@ _eina_hash_find_by_hash(const Eina_Hash *hash,
if (!*hash_head)
return NULL;
- tmp.tuple = *tuple;
-
hash_element = (Eina_Hash_Element *)
eina_rbtree_inline_lookup((*hash_head)-head,
- tmp, 0,
+ tuple, 0,
EINA_RBTREE_CMP_KEY_CB(
_eina_hash_key_rbtree_cmp_key_data),
(const void *)hash-key_cmp_cb);
--
[EGIT] [core/efl] master 01/07: evas: fix loader to properly define _XOPEN_SOURCE for Solaris.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=885222f22d9ca5cb0b2a031d2a72f3045954b1dd commit 885222f22d9ca5cb0b2a031d2a72f3045954b1dd Author: Cedric Bail cedric.b...@samsung.com Date: Wed Dec 4 17:10:47 2013 +0900 evas: fix loader to properly define _XOPEN_SOURCE for Solaris. --- src/modules/evas/loaders/psd/evas_image_load_psd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/loaders/psd/evas_image_load_psd.c b/src/modules/evas/loaders/psd/evas_image_load_psd.c index c183b52..1554e18 100644 --- a/src/modules/evas/loaders/psd/evas_image_load_psd.c +++ b/src/modules/evas/loaders/psd/evas_image_load_psd.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE +#define _XOPEN_SOURCE 600 #ifdef HAVE_CONFIG_H # include config.h --
[EGIT] [core/efl] master 03/07: Revert eina: check if the complete hash match before checking if the key match during children walk.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3c7185e8806575f948fc4acca2f48443a1173f45
commit 3c7185e8806575f948fc4acca2f48443a1173f45
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 17:24:30 2013 +0900
Revert eina: check if the complete hash match before checking if the key
match during children walk.
This reverts commit 295babadb1675d1160b18c639dd6dcbe20b02cfb.
The implementation of that said optimization is actually wrong.
---
src/lib/eina/eina_hash.c | 31 +--
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 0989f68..dab865e 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -101,7 +101,6 @@ struct _Eina_Hash_Element
{
EINA_RBTREE;
Eina_Hash_Tuple tuple;
- int hash;
};
struct _Eina_Hash_Foreach_Data
@@ -172,21 +171,18 @@ _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head
*left,
static inline int
_eina_hash_key_rbtree_cmp_key_data(const Eina_Hash_Element *hash_element,
- const Eina_Hash_Element *tuple,
+ const Eina_Hash_Tuple *tuple,
EINA_UNUSED unsigned int key_length,
Eina_Key_Cmp cmp)
{
int result;
- result = hash_element-hash - tuple-hash;
- if (!result)
- result = cmp(hash_element-tuple.key,
- hash_element-tuple.key_length,
- tuple-tuple.key,
- tuple-tuple.key_length);
+ result = cmp(hash_element-tuple.key,
+hash_element-tuple.key_length,
+tuple-key,
+tuple-key_length);
- if (result == 0 tuple-tuple.data
- tuple-tuple.data != hash_element-tuple.data)
+ if (result == 0 tuple-data tuple-data != hash_element-tuple.data)
return 1;
return result;
@@ -199,10 +195,8 @@ _eina_hash_key_rbtree_cmp_node(const Eina_Hash_Element
*left,
{
int result;
- result = left-hash - right-hash;
- if (result == 0)
- result = cmp(left-tuple.key, left-tuple.key_length,
- right-tuple.key, right-tuple.key_length);
+ result = cmp(left-tuple.key, left-tuple.key_length,
+right-tuple.key, right-tuple.key_length);
if (result 0)
return EINA_RBTREE_LEFT;
@@ -218,7 +212,6 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
{
Eina_Hash_Element *new_hash_element = NULL;
Eina_Hash_Head *hash_head;
- int original_key;
int hash_num;
EINA_SAFETY_ON_NULL_RETURN_VAL(hash, EINA_FALSE);
@@ -227,7 +220,6 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
EINA_MAGIC_CHECK_HASH(hash);
/* Apply eina mask to hash. */
- original_key = key_hash;
hash_num = key_hash hash-mask;
key_hash = EINA_HASH_RBTREE_MASK;
@@ -276,7 +268,6 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
/* Setup the element */
new_hash_element-tuple.key_length = key_length;
new_hash_element-tuple.data = (void *)data;
- new_hash_element-hash = original_key;
if (alloc_length 0)
{
new_hash_element-tuple.key = (char *)(new_hash_element + 1);
@@ -330,10 +321,8 @@ _eina_hash_find_by_hash(const Eina_Hash *hash,
Eina_Hash_Head **hash_head)
{
Eina_Hash_Element *hash_element;
- Eina_Hash_Element tmp;
int rb_hash = key_hash EINA_HASH_RBTREE_MASK;
- tmp.hash = key_hash;
key_hash = hash-mask;
if (!hash-buckets)
@@ -348,11 +337,9 @@ _eina_hash_find_by_hash(const Eina_Hash *hash,
if (!*hash_head)
return NULL;
- tmp.tuple = *tuple;
-
hash_element = (Eina_Hash_Element *)
eina_rbtree_inline_lookup((*hash_head)-head,
- tmp, 0,
+ tuple, 0,
EINA_RBTREE_CMP_KEY_CB(
_eina_hash_key_rbtree_cmp_key_data),
(const void *)hash-key_cmp_cb);
--
[EGIT] [core/efl] master 04/07: Revert eina: more work around to limit problem.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4f161f0c8da10c2e090b096774b2d5f3325e537b
commit 4f161f0c8da10c2e090b096774b2d5f3325e537b
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 17:53:28 2013 +0900
Revert eina: more work around to limit problem.
This reverts commit c5db264e0a98234d32553ec1b43e612e0da1eeb3.
---
src/lib/eina/eina_cow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index 8600475..2dd8807 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -265,7 +265,7 @@ _eina_cow_gc(Eina_Cow *cow, Eina_Cow_GC *gc)
THIS IS A TEMPORARY WORK AROUND THAT SHOULD LIMIT PROBLEM
UNTIL WE KNOW WHY THERE IS A PROBLEM IN EINA_HASH.
*/
- if (gc-ref-refcount == 0 || !gc-ref-togc)
+ if (gc-ref-refcount == 0)
{
eina_hash_del(cow-togc, gc-ref, gc);
return ;
--
[EGIT] [core/efl] master 02/07: eina: add fuzzy test of eina_hash.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=517f339fd0cbcece6c796062290659cf501889be
commit 517f339fd0cbcece6c796062290659cf501889be
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 17:21:47 2013 +0900
eina: add fuzzy test of eina_hash.
---
src/tests/eina/eina_test_hash.c | 64 +
1 file changed, 64 insertions(+)
diff --git a/src/tests/eina/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
index 564625e..78526b9 100644
--- a/src/tests/eina/eina_test_hash.c
+++ b/src/tests/eina/eina_test_hash.c
@@ -197,6 +197,69 @@ START_TEST(eina_hash_all_int)
}
END_TEST
+START_TEST(eina_hash_int32_fuzze)
+{
+ Eina_Hash *hash;
+ Eina_List *added = NULL;
+ unsigned int *r;
+ unsigned int i;
+ unsigned int j;
+ unsigned int seed;
+
+ eina_init();
+
+ seed = time(NULL);
+ srand(seed);
+
+ hash = eina_hash_int32_new(free);
+
+ for (i = 0; i 1; ++i)
+ {
+r = malloc(sizeof (unsigned int));
+*r = rand();
+eina_hash_direct_add(hash, r, r);
+ }
+
+ for (j = 0; j 100; ++j)
+ {
+for (i = 0; i 1000; ++i)
+ {
+ do
+ {
+ unsigned int tr;
+
+ tr = rand();
+ r = eina_hash_find(hash, tr);
+ if (r)
+{
+ r = NULL;
+ continue;
+}
+
+ r = malloc(sizeof (unsigned int));
+ *r = tr;
+ eina_hash_direct_add(hash, r, r);
+ added = eina_list_append(added, r);
+ }
+ while (r == NULL);
+ }
+
+EINA_LIST_FREE(added, r)
+ {
+ unsigned int *s;
+
+ s = eina_hash_find(hash, r);
+fail_if(s != r);
+ eina_hash_del(hash, r, r);
+ }
+ }
+
+ eina_hash_free(hash);
+
+ eina_shutdown();
+}
+END_TEST
+
START_TEST(eina_hash_seed)
{
eina_init();
@@ -214,4 +277,5 @@ void eina_test_hash(TCase *tc)
tcase_add_test(tc, eina_hash_double_item);
tcase_add_test(tc, eina_hash_all_int);
tcase_add_test(tc, eina_hash_seed);
+ tcase_add_test(tc, eina_hash_int32_fuzze);
}
--
Re: [E-devel] [Enlightenment-intl] EFL 1.8.1
On Wed, Dec 4, 2013 at 6:02 PM, Carsten Haitzler ras...@rasterman.com wrote: On Wed, 4 Dec 2013 05:39:27 +0100 dieter roelants diete...@bsdusr.net said: On Wed, 4 Dec 2013 09:04:43 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: Yeah, you tag what you've committed, but if you rebase afterwards, your tag is still on the original commit, not on the rebased one. Normally the original commit stays in your tree until it gets g/c'd, but if you tag it, it keeps referenced. sure - but i'd expect teh tag to move forward to the conflict resolved commit as it is impossible to push without that resolve. either that or break Ah, you expect git to do the userfriendly thing. You obviously haven't used it enough. :) make an unfriendly tool - then expect shit to happen. especially when you cant undo stuff... the resolve commit out after the tag and shove the tagged commit in before commits that required the rebase to begin with. it just behaves really oddly. i blame cedric for this! oh i wasn't implying cedric isn't to blame in some way you haven't spend enough time around here... he certainly is to blame! :) Yup, fair. :-) -- Cedric BAIL -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 02/02: eina: improve cmp function of eina_hash string related hash.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff845b0a7c9bb6de48f5786a6a8a092d8819debf
commit ff845b0a7c9bb6de48f5786a6a8a092d8819debf
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 19:05:03 2013 +0900
eina: improve cmp function of eina_hash string related hash.
For strings, we already know the length, so let's just not call the
heavy strcmp if the length is not already the same. Get some easy
speedup here.
---
src/lib/eina/eina_hash.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 274d3e8..4b06064 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -489,9 +489,13 @@ _eina_string_key_length(const char *key)
}
static int
-_eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length,
- const char *key2, EINA_UNUSED int key2_length)
+_eina_string_key_cmp(const char *key1, int key1_length,
+ const char *key2, int key2_length)
{
+ int delta;
+
+ delta = key1_length - key2_length;
+ if (delta) return delta;
return strcmp(key1, key2);
}
--
[EGIT] [core/efl] master 01/02: eina: fuzze test the eina_hash_string_superfast to.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=41c28c3deb33cce2b728c11f6a9f85ed62922f21
commit 41c28c3deb33cce2b728c11f6a9f85ed62922f21
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Dec 4 19:04:24 2013 +0900
eina: fuzze test the eina_hash_string_superfast to.
---
src/tests/eina/eina_test_hash.c | 65 +
1 file changed, 65 insertions(+)
diff --git a/src/tests/eina/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
index 78526b9..0471d5e 100644
--- a/src/tests/eina/eina_test_hash.c
+++ b/src/tests/eina/eina_test_hash.c
@@ -260,6 +260,70 @@ START_TEST(eina_hash_int32_fuzze)
}
END_TEST
+START_TEST(eina_hash_string_fuzze)
+{
+ Eina_Hash *hash;
+ Eina_List *added = NULL;
+ char *r;
+ unsigned int i;
+ unsigned int j;
+ unsigned int seed;
+
+ eina_init();
+
+ seed = time(NULL);
+ srand(seed);
+
+ hash = eina_hash_string_superfast_new(free);
+
+ for (i = 0; i 1; ++i)
+ {
+char convert[128];
+
+eina_convert_itoa(rand(), convert);
+r = strdup(convert);
+eina_hash_direct_add(hash, r, r);
+ }
+
+ for (j = 0; j 50; ++j)
+ {
+for (i = 0; i 1000; ++i)
+ {
+ do
+ {
+ char convert[128];
+
+ eina_convert_itoa(rand(), convert);
+ r = eina_hash_find(hash, convert);
+ if (r)
+{
+ r = NULL;
+ continue;
+}
+
+ r = strdup(convert);
+ eina_hash_direct_add(hash, r, r);
+ added = eina_list_append(added, r);
+ }
+ while (r == NULL);
+ }
+
+EINA_LIST_FREE(added, r)
+ {
+ char *s;
+
+ s = eina_hash_find(hash, r);
+fail_if(s != r);
+ eina_hash_del(hash, r, r);
+ }
+ }
+
+ eina_hash_free(hash);
+
+ eina_shutdown();
+}
+END_TEST
+
START_TEST(eina_hash_seed)
{
eina_init();
@@ -278,4 +342,5 @@ void eina_test_hash(TCase *tc)
tcase_add_test(tc, eina_hash_all_int);
tcase_add_test(tc, eina_hash_seed);
tcase_add_test(tc, eina_hash_int32_fuzze);
+ tcase_add_test(tc, eina_hash_string_fuzze);
}
--
[EGIT] [core/efl] master 01/01: ecore ecore_glib.c: fixed documentation about glib integration always configure option.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=998c543ae26df23d06a5d5389be1d13116eb9038 commit 998c543ae26df23d06a5d5389be1d13116eb9038 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Dec 4 19:43:26 2013 +0900 ecore ecore_glib.c: fixed documentation about glib integration always configure option. --enable-glib-integration-always was changed to --with-glib=always in efl 1.8. --- src/lib/ecore/ecore_glib.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c index 813f998..465317d 100644 --- a/src/lib/ecore/ecore_glib.c +++ b/src/lib/ecore/ecore_glib.c @@ -314,7 +314,7 @@ _ecore_glib_shutdown(void) * * @note This is only available if Ecore was compiled with GLib support. * @note You don't need to call this function if Ecore was compiled with - * --enable-glib-integration-always. + * --with-glib=always. * * @return @c EINA_TRUE on success of @c EINA_FALSE if it failed, * likely no GLib support in Ecore. @@ -343,9 +343,9 @@ Eina_Bool _ecore_glib_always_integrate = 1; /** * Disable always integrating glib * - * If ecore is compiled with --enable-glib-integration-always (to always - * call ecore_main_loop_glib_integrate() when ecore_init() is called), then - * calling this before calling ecore_init() will disable the integration. + * If ecore is compiled with --with-glib=always (to always call + * ecore_main_loop_glib_integrate() when ecore_init() is called), then calling + * this before calling ecore_init() will disable the integration. * This is for apps that explicitly do not want this to happen for whatever * reasons they may have. */ --
[EGIT] [core/efl] efl-1.8 01/01: ecore ecore_glib.c: fixed documentation about glib integration always configure option.
seoz pushed a commit to branch efl-1.8. http://git.enlightenment.org/core/efl.git/commit/?id=8e6df617bb976536ab82d0c802ba918e40cf0fd8 commit 8e6df617bb976536ab82d0c802ba918e40cf0fd8 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Dec 4 19:43:26 2013 +0900 ecore ecore_glib.c: fixed documentation about glib integration always configure option. --enable-glib-integration-always was changed to --with-glib=always in efl 1.8. I backport this from master to efl-1.8 branch because this is critical to some users. It's an apparant documentation bug! --- src/lib/ecore/ecore_glib.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c index 813f998..465317d 100644 --- a/src/lib/ecore/ecore_glib.c +++ b/src/lib/ecore/ecore_glib.c @@ -314,7 +314,7 @@ _ecore_glib_shutdown(void) * * @note This is only available if Ecore was compiled with GLib support. * @note You don't need to call this function if Ecore was compiled with - * --enable-glib-integration-always. + * --with-glib=always. * * @return @c EINA_TRUE on success of @c EINA_FALSE if it failed, * likely no GLib support in Ecore. @@ -343,9 +343,9 @@ Eina_Bool _ecore_glib_always_integrate = 1; /** * Disable always integrating glib * - * If ecore is compiled with --enable-glib-integration-always (to always - * call ecore_main_loop_glib_integrate() when ecore_init() is called), then - * calling this before calling ecore_init() will disable the integration. + * If ecore is compiled with --with-glib=always (to always call + * ecore_main_loop_glib_integrate() when ecore_init() is called), then calling + * this before calling ecore_init() will disable the integration. * This is for apps that explicitly do not want this to happen for whatever * reasons they may have. */ --
[EGIT] [bindings/python/python-efl] master 01/04: Documentation: Fix more invalid references.
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=647e0523e437420e3d9953227b180891fa7fecee commit 647e0523e437420e3d9953227b180891fa7fecee Author: Kai Huuhko kai.huu...@gmail.com Date: Wed Dec 4 01:24:31 2013 +0200 Documentation: Fix more invalid references. --- efl/elementary/configuration.pyx | 6 --- efl/elementary/fileselector_entry.pyx | 8 ++-- efl/elementary/flipselector.pyx | 13 +++ efl/elementary/frame.pyx | 2 +- efl/elementary/gengrid.pyx| 6 +-- efl/elementary/gengrid_item.pxi | 5 +++ efl/elementary/gengrid_widget.pxi | 8 ++-- efl/elementary/genlist.pyx| 4 +- efl/elementary/hoversel.pyx | 8 ++-- efl/elementary/icon.pyx | 8 ++-- efl/elementary/image.pyx | 4 +- efl/elementary/index.pyx | 13 --- efl/elementary/label.pyx | 2 +- efl/elementary/list.pyx | 58 ++-- efl/elementary/menu.pyx | 18 + efl/elementary/naviframe.pyx | 24 ++-- efl/elementary/notify.pyx | 19 +- efl/elementary/object.pyx | 4 +- efl/elementary/object_item.pyx| 6 +-- efl/elementary/panes.pyx | 2 +- efl/elementary/photo.pyx | 6 +-- efl/elementary/photocam.pyx | 25 +++- efl/elementary/progressbar.pyx| 12 +++--- efl/elementary/radio.pyx | 16 efl/elementary/segment_control.pyx| 71 ++- efl/elementary/separator.pyx | 2 +- efl/elementary/slider.pyx | 6 +-- efl/elementary/slideshow.pyx | 10 ++--- efl/elementary/toolbar.pyx| 17 - efl/elementary/video.pyx | 4 +- efl/elementary/window.pyx | 12 +++--- 31 files changed, 194 insertions(+), 205 deletions(-) diff --git a/efl/elementary/configuration.pyx b/efl/elementary/configuration.pyx index 1f0a3ed..fb207b3 100644 --- a/efl/elementary/configuration.pyx +++ b/efl/elementary/configuration.pyx @@ -326,8 +326,6 @@ cdef class Configuration(object): :type: int -:see: elm_config_thumbscroll_flick_distance_tolerance_get() - def __get__(self): return elm_config_scroll_thumbscroll_flick_distance_tolerance_get() @@ -354,8 +352,6 @@ cdef class Configuration(object): :type: float -:see: elm_config_thumbscroll_min_friction_get() - def __get__(self): return elm_config_scroll_thumbscroll_min_friction_get() @@ -371,8 +367,6 @@ cdef class Configuration(object): :type: float -:see: elm_config_thumbscroll_friction_standard_get() - def __get__(self): return elm_config_scroll_thumbscroll_friction_standard_get() diff --git a/efl/elementary/fileselector_entry.pyx b/efl/elementary/fileselector_entry.pyx index 9056af2..0c2ab66 100644 --- a/efl/elementary/fileselector_entry.pyx +++ b/efl/elementary/fileselector_entry.pyx @@ -26,9 +26,11 @@ Widget description This is an entry made to be filled with or display a file system path string. -Besides the entry itself, the widget has a :py:class:`FileselectorButton` -on its side, which will raise an internal :py:class:`Fileselector`, -when clicked, for path selection aided by file system navigation. +Besides the entry itself, the widget has a +:py:class:`~efl.elementary.fileselector_button.FileselectorButton` on its side, +which will raise an internal +:py:class:`~efl.elementary.fileselector.Fileselector`, when clicked, for path +selection aided by file system navigation. This file selector may appear in an Elementary window or in an inner window. When a file is chosen from it, the (inner) window diff --git a/efl/elementary/flipselector.pyx b/efl/elementary/flipselector.pyx index a266b14..ec358a5 100644 --- a/efl/elementary/flipselector.pyx +++ b/efl/elementary/flipselector.pyx @@ -24,10 +24,10 @@ Widget description .. image:: /images/flipselector-preview.png :align: left -A flip selector is a widget to show a set of *text* items, one -at a time, with the same sheet switching style as the :py:class:`Clock` -widget, when one changes the current displaying sheet -(thus, the flip in the name). +A flip selector is a widget to show a set of *text* items, one at a time, with +the same sheet switching style as the :py:class:`~efl.elementary.clock.Clock` +widget, when one changes the current displaying sheet (thus, the flip in the +name). User clicks to flip sheets which are *held* for some time will make the flip selector to flip continuously and automatically for @@ -35,11 +35,8 @@ the user. The interval between flips will keep growing in time, so that it helps the user to reach an item which is distant from the current selection. -This widget inherits from the
[EGIT] [bindings/python/python-efl] master 04/04: Evas: Use _set_properties_from_keyword_args
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=bb5307ea203689928216f20f798a4e2606b9ebc2 commit bb5307ea203689928216f20f798a4e2606b9ebc2 Author: Kai Huuhko kai.huu...@gmail.com Date: Wed Dec 4 13:12:48 2013 +0200 Evas: Use _set_properties_from_keyword_args --- efl/evas/efl.evas_object.pxi | 13 +++-- efl/evas/efl.evas_object_box.pxi | 4 ++-- efl/evas/efl.evas_object_grid.pxi | 3 ++- efl/evas/efl.evas_object_image.pxi | 11 +-- efl/evas/efl.evas_object_line.pxi | 18 -- efl/evas/efl.evas_object_polygon.pxi | 7 ++- efl/evas/efl.evas_object_rectangle.pxi | 4 ++-- efl/evas/efl.evas_object_smart.pxi | 5 +++-- efl/evas/efl.evas_object_table.pxi | 3 ++- efl/evas/efl.evas_object_text.pxi | 18 +- efl/evas/efl.evas_object_textblock.pxi | 12 ++-- efl/evas/efl.evas_object_textgrid.pxi | 3 ++- include/efl.evas.pxd | 2 +- 13 files changed, 43 insertions(+), 60 deletions(-) diff --git a/efl/evas/efl.evas_object.pxi b/efl/evas/efl.evas_object.pxi index 68fb02a..476034b 100644 --- a/efl/evas/efl.evas_object.pxi +++ b/efl/evas/efl.evas_object.pxi @@ -200,18 +200,11 @@ cdef class Object(Eo): return 1 -def _set_common_params(self, size=None, pos=None, geometry=None, - color=None, name=None): -if size is not None: -self.size_set(*size) -if pos is not None: -self.pos_set(*pos) -if geometry is not None: -self.geometry_set(*geometry) +cdef int _set_properties_from_keyword_args(self, dict kwargs) except 0: +color = kwargs.pop(color, None) if color is not None: self.color_set(*color_parse(color)) -if name is not None: -self.name_set(name) +return Eo._set_properties_from_keyword_args(self, kwargs) def delete(self): delete() diff --git a/efl/evas/efl.evas_object_box.pxi b/efl/evas/efl.evas_object_box.pxi index dbf84e9..bdbb78e 100644 --- a/efl/evas/efl.evas_object_box.pxi +++ b/efl/evas/efl.evas_object_box.pxi @@ -42,9 +42,9 @@ cdef class Box(Object): :type name: string -def __init__(self, Canvas canvas not None, **kargs): +def __init__(self, Canvas canvas not None, **kwargs): self._set_obj(evas_object_box_add(canvas.obj)) -self._set_common_params(**kargs) +self._set_properties_from_keyword_args(kwargs) property align: Alignment of the whole bounding box of contents diff --git a/efl/evas/efl.evas_object_grid.pxi b/efl/evas/efl.evas_object_grid.pxi index d597609..ece9e20 100644 --- a/efl/evas/efl.evas_object_grid.pxi +++ b/efl/evas/efl.evas_object_grid.pxi @@ -18,8 +18,9 @@ cdef class Grid(Object): -def __init__(self, Canvas canvas not None): +def __init__(self, Canvas canvas not None, **kwargs): self._set_obj(evas_object_grid_add(canvas.obj)) +self._set_properties_from_keyword_args(kwargs) @classmethod def add_to(cls, Object parent): diff --git a/efl/evas/efl.evas_object_image.pxi b/efl/evas/efl.evas_object_image.pxi index 0a7a90c..55f6199 100644 --- a/efl/evas/efl.evas_object_image.pxi +++ b/efl/evas/efl.evas_object_image.pxi @@ -140,16 +140,15 @@ cdef class Image(Object): :type file: string -def __init__(self, Canvas canvas not None, **kargs): +def __init__(self, Canvas canvas not None, file=None, **kwargs): self._set_obj(evas_object_image_add(canvas.obj)) -self._set_common_params(**kargs) -def _set_common_params(self, file=None, **kargs): -if file: -if isinstance(file, str): +if file is not None: +if not isinstance(file, (list, tuple)): file = (file, None) self.file_set(*file) -Object._set_common_params(self, **kargs) + +self._set_properties_from_keyword_args(kwargs) # TODO: # def memfile_set(self, data, size=None, format=None, key=None): diff --git a/efl/evas/efl.evas_object_line.pxi b/efl/evas/efl.evas_object_line.pxi index f834aca..8be1df3 100644 --- a/efl/evas/efl.evas_object_line.pxi +++ b/efl/evas/efl.evas_object_line.pxi @@ -39,12 +39,11 @@ cdef class Line(Object): :type end: tuple of ints -def __init__(self, Canvas canvas not None, **kargs): +def __init__(self, Canvas canvas not None, start=None, end=None, +geometry=None, size=None, pos=None, **kwargs): + self._set_obj(evas_object_line_add(canvas.obj)) -self._set_common_params(**kargs) -def _set_common_params(self, start=None, end=None, geometry=None, - size=None, pos=None, **kargs): if start and end: x1 = start[0] y1 = start[1] @@ -77,8 +76,15 @@ cdef class Line(Object): self.start_set(*start) elif end:
[EGIT] [bindings/python/python-efl] master 02/04: Emotion: Use _set_properties_from_keyword_args
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=8cc7cc74de38ef92f95ec890d8bf5010777ad2b8
commit 8cc7cc74de38ef92f95ec890d8bf5010777ad2b8
Author: Kai Huuhko kai.huu...@gmail.com
Date: Wed Dec 4 08:16:39 2013 +0200
Emotion: Use _set_properties_from_keyword_args
---
efl/emotion/efl.emotion.pyx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/efl/emotion/efl.emotion.pyx b/efl/emotion/efl.emotion.pyx
index 85abd6b..88abdb0 100644
--- a/efl/emotion/efl.emotion.pyx
+++ b/efl/emotion/efl.emotion.pyx
@@ -184,16 +184,12 @@ cdef class Emotion(evasObject):
def __cinit__(self, *a, **ka):
self._emotion_callbacks = {}
-def __init__(self, Canvas canvas not None, **kargs):
+def __init__(self, Canvas canvas not None, module_name=gstreamer,
+module_params=None, **kwargs):
+
self._set_obj(emotion_object_add(canvas.obj))
_register_decorated_callbacks(self)
-self._set_common_params(**kargs)
-def _set_common_params(self, module_name=gstreamer,
- module_params=None, size=None, pos=None,
- geometry=None, color=None, name=None):
-evasObject._set_common_params(self, size=size, pos=pos, name=name,
- geometry=geometry, color=color)
if isinstance(module_name, unicode):
module_name = PyUnicode_AsUTF8String(module_name)
if emotion_object_init(self.obj,
@@ -207,6 +203,8 @@ cdef class Emotion(evasObject):
for opt, val in module_params.iteritems():
emotion_object_module_option_set(self.obj, opt, val)
+self._set_properties_from_keyword_args(kwargs)
+
def __str__(self):
x, y, w, h = self.geometry_get()
r, g, b, a = self.color_get()
--
[EGIT] [bindings/python/python-efl] master 03/04: Edje: Use _set_properties_from_keyword_args
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=1e43cb98f453583017522fe825202189bc99265f
commit 1e43cb98f453583017522fe825202189bc99265f
Author: Kai Huuhko kai.huu...@gmail.com
Date: Wed Dec 4 13:12:23 2013 +0200
Edje: Use _set_properties_from_keyword_args
---
efl/edje/efl.edje_object.pxi | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/efl/edje/efl.edje_object.pxi b/efl/edje/efl.edje_object.pxi
index 372e581..b36e172 100644
--- a/efl/edje/efl.edje_object.pxi
+++ b/efl/edje/efl.edje_object.pxi
@@ -127,26 +127,26 @@ cdef class Edje(Object):
def __cinit__(self, *a, **ka):
self._signal_callbacks = {}
-def __init__(self, Canvas canvas not None, **kargs):
+def __init__(self, Canvas canvas not None, file=None, group=None,
size=None,
+geometry=None, **kwargs):
+
self._set_obj(edje_object_add(canvas.obj))
_register_decorated_callbacks(self)
-self._set_common_params(**kargs)
-def __free_wrapper_resources(self, ed):
-self._signal_callbacks.clear()
-self._text_change_cb = None
-self._message_handler_cb = None
-
-def _set_common_params(self, file=None, group=None, size=None, pos=None,
- geometry=None, color=None, name=None):
if file:
self.file_set(file, group)
-Object._set_common_params(self, size=size, pos=pos, geometry=geometry,
- color=color, name=name)
+
+self._set_properties_from_keyword_args(kwargs)
+
if not size and not geometry:
w, h = self.size_min_get()
self.size_set(w, h)
+def __free_wrapper_resources(self, ed):
+self._signal_callbacks.clear()
+self._text_change_cb = None
+self._message_handler_cb = None
+
def __str__(self):
x, y, w, h = self.geometry_get()
r, g, b, a = self.color_get()
--
Re: [E-devel] [EGIT] [core/efl] master 01/03: evas - fix gl egl textrue from pixmap support y invert query extension
now.. i can only conclude here that either the interpretation of the extension
is wrong and that the invert value when 0/false == invertad and when 1/true is
NOT inverted... (odd and doesn't make sense)... or that your driver has a bug.
it implements this extn but gets it wrong.
It looks like a bug in mesa. They support EGL_Y_INVERTED_NOK, but always return
0.
Look at mesa/src/egl/main/eglconfig.h:struct _egl_config, YInvertedNOK field is
always 0 and
it's returned in eglGetConfigAttrib via eglOffsetOfConfig.
On 12/04/2013 01:13 PM, Carsten Haitzler (The Rasterman) wrote:
On Tue, 3 Dec 2013 23:32:13 -0200 Iván Briano sachi...@gmail.com said:
Building with EGL and GL-ES, Mesa 9.2.4 on Intel video,
I’m getting windows vertically inverted. Works if I revert
this commit or go back to software compositing.
and did you look at the commit? it's right. if you don't have the yinverted
extension it's the same behavior as before. it assume yinverted in gles/egl by
default (yinvert = 1 ... same as before ... m-native.yinvert = 1).
but IF you have the extension - it queries. it checks for the extensions
string
and if you have it - sets a flag. if this flag is true AND the get config attr
succeeds - it sets yinvert to the queried invert value.
now.. i can only conclude here that either the interpretation of the extension
is wrong and that the invert value when 0/false == invertad and when 1/true is
NOT inverted... (odd and doesn't make sense)... or that your driver has a bug.
it implements this extn but gets it wrong.
the only solutions here would be (assuming the driver is wrong), is to ignore
this and just wait for the driver to be fixed, or to add blacklist code into
evas to detect the specific broken driver + version and ignore that extension
if that driver is found. i don't know what specific driver strings you have
there so i can't write a blacklist for you, but i suspect you want to file a
bug with mesa/driver/xorg devs :)
On Nov 29, 2013, at 8:08, Stanislav Vorobiov s.vorob...@samsung.com wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e3b778acb851671c2f24454b80bdeafc20d1c65
commit 9e3b778acb851671c2f24454b80bdeafc20d1c65
Author: Stanislav Vorobiov s.vorob...@samsung.com
Date: Thu Nov 28 18:18:16 2013 +0900
evas - fix gl egl textrue from pixmap support y invert query extension
Instead of hardcoding yinvert=1 we should query for
EGL_NOK_texture_from_pixmap extension and if it's present
use EGL_Y_INVERTED_NOK value
---
src/modules/evas/engines/gl_x11/evas_engine.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c index d25610f..4e5c22c
100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -71,6 +71,7 @@ struct _Render_Engine
static int initted = 0;
static int gl_wins = 0;
static int extn_have_buffer_age = 1;
+static int extn_have_y_inverted = 0;
typedef void(*_eng_fn) (void);
typedef _eng_fn (*glsym_func_eng_fn) ();
@@ -90,6 +91,9 @@ static Eina_Bool eng_preload_make_current(void *data,
void *doit);
#ifndef EGL_BUFFER_AGE_EXT
# define EGL_BUFFER_AGE_EXT 0x313d
#endif
+#ifndef EGL_Y_INVERTED_NOK
+# define EGL_Y_INVERTED_NOK 0x307F
+#endif
_eng_fn (*glsym_eglGetProcAddress)(const char *a) = NULL;
void*(*glsym_eglCreateImage) (EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const int *e) = NULL; @@ -711,6 +715,10 @@
gl_extn_veto(Render_Engine *re) {
extn_have_buffer_age = 0;
}
+if (strstr(str, EGL_NOK_texture_from_pixmap))
+ {
+ extn_have_y_inverted = 1;
+ }
}
else
{
@@ -2225,6 +2233,7 @@ eng_image_native_set(void *data, void *image, void
*native) EGLConfig egl_config;
int config_attrs[20];
int num_config, i = 0;
+ int yinvert = 1;
eina_hash_add(re-win-gl_context-shared-native_pm_hash,
pmid, im);
@@ -2250,6 +2259,15 @@ eng_image_native_set(void *data, void *image, void
*native) if (!eglChooseConfig(re-win-egl_disp, config_attrs,
egl_config, 1, num_config))
ERR(eglChooseConfig() failed for pixmap 0x%x, num_config =
%i, (unsigned int)pm, num_config);
+ else
+{
+ int val;
+ if (extn_have_y_inverted
+ eglGetConfigAttrib(re-win-egl_disp, egl_config,
+ EGL_Y_INVERTED_NOK, val))
+yinvert = val;
+}
+
memcpy((n-ns), ns, sizeof(Evas_Native_Surface));
n-pixmap = pm;
n-visual = vis;
@@ -2263,7 +2281,7 @@
[EGIT] [core/efl] master 02/02: efreet - protect efreetd from recursing too far to save overhead and mem
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f6f28bf75a65db419ba2dd46f70245afe9d26ba2
commit f6f28bf75a65db419ba2dd46f70245afe9d26ba2
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Wed Dec 4 20:22:26 2013 +0900
efreet - protect efreetd from recursing too far to save overhead and mem
an errant path made its way into my efreet cache. this had a
side-effect of causing efreetd to scan my entire $HOME recursively
to monitor everything. while the original cause was $HOME getting in,
we shouldn't have efreetd sit and consume scan all of $HOME when this
is far from a normal situation. the recursive scanning is there ot
handle some minimal levels of subdirs in app directories, but not an
entire filesystem, so this mitigates the effects of errant cache data
by limiting the amount of recursion allows for icon dirs and desktop
dirs to 8 and 3 levels respectively.
---
src/bin/efreet/efreetd_cache.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index 94e48f1..5b45487 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -268,6 +268,8 @@ icon_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Bool b
if (stat(path, st) == -1) return;
if (eina_inarray_search(stack, st, stat_cmp) = 0) return;
+ // protect against too deep recursion even if it's valid.
+ if (eina_inarray_count(stack) = 8) return;
eina_inarray_push(stack, st);
if ((!ecore_file_is_dir(path)) (base))
@@ -302,6 +304,8 @@ desktop_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Boo
if (stat(path, st) == -1) return;
if (eina_inarray_search(stack, st, stat_cmp) = 0) return;
+ // protect against too deep recursion even if it's valid.
+ if (eina_inarray_count(stack) = 3) return;
eina_inarray_push(stack, st);
if ((!ecore_file_is_dir(path)) (base))
{
--
[EGIT] [core/efl] master 01/02: yet another useless images.mk change...
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a1b57d353672af762af9433310b64833828cf978 commit a1b57d353672af762af9433310b64833828cf978 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Dec 4 20:20:20 2013 +0900 yet another useless images.mk change... --- doc/images.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/images.mk b/doc/images.mk index b2d8045..20d8d63 100644 --- a/doc/images.mk +++ b/doc/images.mk @@ -1,2 +1,2 @@ EXTRA_DIST += \ -img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/b1.png img/b2.png img/b3.png img/b4.png img/b5.png img/b6.png img/b7.png img/b8.png img/b9.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/b [...] +img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/b1.png img/b2.png img/b3.png img/b4.png img/b5.png img/b6.png img/b7.png img/b8.png img/b9.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/b [...] --
[EGIT] [core/efl] efl-1.8 01/01: efreet - protect efreetd from recursing too far to save overhead and mem
raster pushed a commit to branch efl-1.8.
http://git.enlightenment.org/core/efl.git/commit/?id=d757addd64d0e29232b417a3cf9686335eed621c
commit d757addd64d0e29232b417a3cf9686335eed621c
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Wed Dec 4 20:22:26 2013 +0900
efreet - protect efreetd from recursing too far to save overhead and mem
an errant path made its way into my efreet cache. this had a
side-effect of causing efreetd to scan my entire $HOME recursively
to monitor everything. while the original cause was $HOME getting in,
we shouldn't have efreetd sit and consume scan all of $HOME when this
is far from a normal situation. the recursive scanning is there ot
handle some minimal levels of subdirs in app directories, but not an
entire filesystem, so this mitigates the effects of errant cache data
by limiting the amount of recursion allows for icon dirs and desktop
dirs to 8 and 3 levels respectively.
Conflicts:
src/bin/efreet/efreetd_cache.c
---
src/bin/efreet/efreetd_cache.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index 6ca556a..107f697 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -271,6 +271,8 @@ icon_changes_listen_recursive(Eina_Inarray *stack, const
char *path, Eina_Bool b
if ((st2-st_dev == st.st_dev) (st2-st_ino == st.st_ino))
return;
}
+ // protect against too deep recursion even if it's valid.
+ if (eina_inarray_count(stack) = 8) return;
eina_inarray_push(stack, st);
if ((!ecore_file_is_dir(path)) (base))
@@ -321,7 +323,10 @@ desktop_changes_listen_recursive(Eina_Inarray *stack,
const char *path, Eina_Boo
if ((st2-st_dev == st.st_dev) (st2-st_ino == st.st_ino))
return;
}
+ // protect against too deep recursion even if it's valid.
+ if (eina_inarray_count(stack) = 3) return;
eina_inarray_push(stack, st);
+
if ((!ecore_file_is_dir(path)) (base))
{
// XXX: if it doesn't exist... walk the parent dirs back down
--
[EGIT] [core/efl] master 02/02: Fix raster bug report about elm window resize issue (content drawing outside the window).
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ae7fd6fac07d294de476bee7f9df465b27712914
commit ae7fd6fac07d294de476bee7f9df465b27712914
Author: Chris Michael cp.mich...@samsung.com
Date: Wed Dec 4 11:30:36 2013 +
Fix raster bug report about elm window resize issue (content drawing
outside the window).
Be sure that the EEs requested geometry gets updated in our
common_resize function After min/max have been taken into account.
Elm is using ecore_evas_request_geometry_get in it's resize_job code
(Why...I have no clue lol. Does not seem like a good thing to check).
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 2fcad77..fc3083b 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -544,6 +544,8 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
{
ee-w = orig_w;
ee-h = orig_h;
+ee-req.w = orig_w;
+ee-req.h = orig_h;
if ((ee-rotation == 90) || (ee-rotation == 270))
{
--
[EGIT] [core/efl] master 01/02: Update the engine resize edge before we call ecore_wl_window_resize
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=231790c7cb84f6e1c98d96c97c3579f207f1646a
commit 231790c7cb84f6e1c98d96c97c3579f207f1646a
Author: Chris Michael cp.mich...@samsung.com
Date: Wed Dec 4 11:29:32 2013 +
Update the engine resize edge before we call ecore_wl_window_resize
Ecore_wl_window_resize essentially tells the shell to start the resize
process. We should have the evas engine info's resize_edge updated
Before we start that process so that Evas knows where the resize is
occuring from
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 4 ++--
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index a9a1776..9b9aa26 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -443,14 +443,14 @@ _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int
location)
{
int fw, fh;
+_ecore_evas_wayland_egl_resize_edge_set(ee, location);
+
evas_output_framespace_get(ee-evas, NULL, NULL, fw, fh);
if ((ee-rotation == 0) || (ee-rotation == 180))
ecore_wl_window_resize(wdata-win, ee-w + fw, ee-h + fh, location);
else
ecore_wl_window_resize(wdata-win, ee-w + fh, ee-h + fw, location);
-
-_ecore_evas_wayland_egl_resize_edge_set(ee, location);
}
}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index e091830..d418344 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -440,14 +440,14 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int
location)
{
int fw, fh;
+_ecore_evas_wayland_shm_resize_edge_set(ee, location);
+
evas_output_framespace_get(ee-evas, NULL, NULL, fw, fh);
if ((ee-rotation == 90) || (ee-rotation == 270))
ecore_wl_window_resize(wdata-win, ee-w + fh, ee-h + fw, location);
else
ecore_wl_window_resize(wdata-win, ee-w + fw, ee-h + fh, location);
-
-_ecore_evas_wayland_shm_resize_edge_set(ee, location);
}
}
--
Re: [E-devel] [EGIT] [core/efl] master 01/03: evas - fix gl egl textrue from pixmap support y invert query extension
On Wed, 04 Dec 2013 15:20:09 +0400 Stanislav Vorobiov s.vorob...@samsung.com
said:
now.. i can only conclude here that either the interpretation of the
extension is wrong and that the invert value when 0/false == invertad and
when 1/true is NOT inverted... (odd and doesn't make sense)... or that your
driver has a bug. it implements this extn but gets it wrong.
It looks like a bug in mesa. They support EGL_Y_INVERTED_NOK, but always
return 0. Look at mesa/src/egl/main/eglconfig.h:struct _egl_config,
YInvertedNOK field is always 0 and it's returned in eglGetConfigAttrib via
eglOffsetOfConfig.
that was my guess. it smelled of a mesa bug. the code in that patch is totally
correct as best i read it (and there isn't much to read) so as i said.. beyond
blacklisting things in buggy drivers... i'm of the opinion of don't bother.
file a bug with driver maintainers and let them fix it rather than hiding their
bug for them :)
On 12/04/2013 01:13 PM, Carsten Haitzler (The Rasterman) wrote:
On Tue, 3 Dec 2013 23:32:13 -0200 Iván Briano sachi...@gmail.com said:
Building with EGL and GL-ES, Mesa 9.2.4 on Intel video,
I’m getting windows vertically inverted. Works if I revert
this commit or go back to software compositing.
and did you look at the commit? it's right. if you don't have the yinverted
extension it's the same behavior as before. it assume yinverted in gles/egl
by default (yinvert = 1 ... same as before ... m-native.yinvert = 1).
but IF you have the extension - it queries. it checks for the extensions
string and if you have it - sets a flag. if this flag is true AND the get
config attr succeeds - it sets yinvert to the queried invert value.
now.. i can only conclude here that either the interpretation of the
extension is wrong and that the invert value when 0/false == invertad and
when 1/true is NOT inverted... (odd and doesn't make sense)... or that your
driver has a bug. it implements this extn but gets it wrong.
the only solutions here would be (assuming the driver is wrong), is to
ignore this and just wait for the driver to be fixed, or to add blacklist
code into evas to detect the specific broken driver + version and ignore
that extension if that driver is found. i don't know what specific driver
strings you have there so i can't write a blacklist for you, but i suspect
you want to file a bug with mesa/driver/xorg devs :)
On Nov 29, 2013, at 8:08, Stanislav Vorobiov s.vorob...@samsung.com
wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e3b778acb851671c2f24454b80bdeafc20d1c65
commit 9e3b778acb851671c2f24454b80bdeafc20d1c65
Author: Stanislav Vorobiov s.vorob...@samsung.com
Date: Thu Nov 28 18:18:16 2013 +0900
evas - fix gl egl textrue from pixmap support y invert query extension
Instead of hardcoding yinvert=1 we should query for
EGL_NOK_texture_from_pixmap extension and if it's present
use EGL_Y_INVERTED_NOK value
---
src/modules/evas/engines/gl_x11/evas_engine.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c index d25610f..4e5c22c
100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -71,6 +71,7 @@ struct _Render_Engine
static int initted = 0;
static int gl_wins = 0;
static int extn_have_buffer_age = 1;
+static int extn_have_y_inverted = 0;
typedef void(*_eng_fn) (void);
typedef _eng_fn (*glsym_func_eng_fn) ();
@@ -90,6 +91,9 @@ static Eina_Bool eng_preload_make_current(void *data,
void *doit);
#ifndef EGL_BUFFER_AGE_EXT
# define EGL_BUFFER_AGE_EXT 0x313d
#endif
+#ifndef EGL_Y_INVERTED_NOK
+# define EGL_Y_INVERTED_NOK 0x307F
+#endif
_eng_fn (*glsym_eglGetProcAddress)(const char *a) = NULL;
void*(*glsym_eglCreateImage) (EGLDisplay a, EGLContext
b, EGLenum c, EGLClientBuffer d, const int *e) = NULL; @@ -711,6 +715,10
@@ gl_extn_veto(Render_Engine *re) {
extn_have_buffer_age = 0;
}
+if (strstr(str, EGL_NOK_texture_from_pixmap))
+ {
+ extn_have_y_inverted = 1;
+ }
}
else
{
@@ -2225,6 +2233,7 @@ eng_image_native_set(void *data, void *image, void
*native) EGLConfig egl_config;
int config_attrs[20];
int num_config, i = 0;
+ int yinvert = 1;
eina_hash_add(re-win-gl_context-shared-native_pm_hash,
pmid, im);
@@ -2250,6 +2259,15 @@ eng_image_native_set(void *data, void *image, void
*native) if (!eglChooseConfig(re-win-egl_disp, config_attrs,
egl_config, 1, num_config))
ERR(eglChooseConfig() failed for pixmap 0x%x,
Re: [E-devel] Eolian meta-data parsing, episode 2
any news ?? On Thursday 28 November 2013 14:56, Jérémy Zurcher wrote : Hi Daniel, clone my repo and test it, ask anything anytime ;) ragel doc is very good http://www.complang.org/ragel/ragel-guide-6.8.pdf about the functions definitions. do you want to have them in the .eo file too, and always regenerate the .c file ? or do you want to add empty definitions to .c file corresponding to the new prototypes found in .eo ? if so what if a prototype changes ? On Thursday 28 November 2013 15:21, daniel.za...@samsung.com wrote : Hi Jeremy, Thank you for your comments. We will take a look about ragel and the format you proposed. Daniel --- Hell'O from Yverdoom Jérémy (jeyzu) -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349351iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel --- Hell'O from Yverdoom Jérémy (jeyzu) -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Weekly news from the automated build and QA front
Hello. Summary: o Coverity scan builds are now running on every nightly build (dropped the fixed and added since last build because they are meaningless now) o The new defects reports are automatically send to the e-b0rk mailing list o Terminology is now also running every night (mostly to align it with other builds and do the coverity run) This should give everyone an overview over what has happened in the last week on the QA front. The numbers in parentheses reflect the values from last week to give you a trend. CI: o Overall build statistic: 4.18% (6.11%) failed. https://build.enlightenment.org/ clang scan-build: o EFL scan-build reports 493 (504) issues. https://build.enlightenment.org/job/nightly_efl_clang_x86_64/lastSuccessfu lBuild/artifact/scan-build/build/ Exactness: o The edje exactness builds are working now. Elm exactness still failing. o Problems with icons and paths (file selector widget) o Still waiting for the first successful run on jenkins Unit tests: o 279 (278) unit tests for efl and none failing Coverage: o EFL total coverage is at 26.1% (26.2%) lines and 28.9% (28.9%) functions https://build.enlightenment.org/view/Test%20Coverage/ Coverity: o EFL: Outstanding defects 416 (411) with a density of 0.71 (0.76) o Elm: Outstanding defects 26 (23) with a density of 0.12 (0.10) o E: Outstanding defects 205 (192) with a density of 0.74 (0.68) o Terminology: Outstanding defects 10 (11) with a density of 0.15 (0.17) Phab: o Total bug count: 154 (192) o Pending patch reviews: 15 (18) If anybody wants to see something added here let me know and be my guest. regards Stefan Schmidt -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Eolian meta-data parsing, episode 2
Hi Jeremy, Sorry, I didn't have time this week, I hope to look at it until the end of the week or next week. Daniel On 12/04/2013 03:44 PM, Jérémy Zurcher wrote: any news ?? On Thursday 28 November 2013 14:56, Jérémy Zurcher wrote : Hi Daniel, clone my repo and test it, ask anything anytime ;) ragel doc is very good http://www.complang.org/ragel/ragel-guide-6.8.pdf about the functions definitions. do you want to have them in the .eo file too, and always regenerate the .c file ? or do you want to add empty definitions to .c file corresponding to the new prototypes found in .eo ? if so what if a prototype changes ? On Thursday 28 November 2013 15:21, daniel.za...@samsung.com wrote : Hi Jeremy, Thank you for your comments. We will take a look about ragel and the format you proposed. Daniel --- Hell'O from Yverdoom Jérémy (jeyzu) -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349351iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel --- Hell'O from Yverdoom Jérémy (jeyzu) -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Upcoming 1.8.x releases on Friday
Hello. Apparently I'm not only the whip cracker for 1.9 but also the release monkey for 1.8.x :) Raster did the emergency efl 1.8.1 but from now on I will take over. Lets see how that goes. ;) It seems all 1.8 branches have accumulated enough fixes already to allow for a 1.8.x release on Friday. If you have backported your _tested_ important fixes to the stable branch consider yourself a good person. If know anything else that needs backporting please do so by Thursday evening. I don't want last minutes commits just a second before the release. To be totally honest with you folks this is my first release in the e world so it seems very likely that I screw something up. To avoid this as much as possible I put together what I heard about doing a release here on a new wiki page: https://phab.enlightenment.org/w/release_procedure/ This is what I gathered from others and completed by my own thoughts. Everyone who did a release here before please look over it and fix it as needed or reply here with suggestions. If we have other resources describing the procedure do not hesitate to point them out to me! regards Stefan Schmidt -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/03: evas - fix gl egl textrue from pixmap support y invert query extension
On Wed, Dec 4, 2013 at 9:43 AM, Carsten Haitzler ras...@rasterman.com wrote:
On Wed, 04 Dec 2013 15:20:09 +0400 Stanislav Vorobiov s.vorob...@samsung.com
said:
now.. i can only conclude here that either the interpretation of the
extension is wrong and that the invert value when 0/false == invertad and
when 1/true is NOT inverted... (odd and doesn't make sense)... or that your
driver has a bug. it implements this extn but gets it wrong.
It looks like a bug in mesa. They support EGL_Y_INVERTED_NOK, but always
return 0. Look at mesa/src/egl/main/eglconfig.h:struct _egl_config,
YInvertedNOK field is always 0 and it's returned in eglGetConfigAttrib via
eglOffsetOfConfig.
that was my guess. it smelled of a mesa bug. the code in that patch is totally
correct as best i read it (and there isn't much to read) so as i said.. beyond
blacklisting things in buggy drivers... i'm of the opinion of don't bother.
file a bug with driver maintainers and let them fix it rather than hiding
their
bug for them :)
Figured, I checked the patch and didn't see anything wrong, so pinged
here to see
if someone more experienced would check the driver for me. It worked,
I'm awesome.
On 12/04/2013 01:13 PM, Carsten Haitzler (The Rasterman) wrote:
On Tue, 3 Dec 2013 23:32:13 -0200 Iván Briano sachi...@gmail.com said:
Building with EGL and GL-ES, Mesa 9.2.4 on Intel video,
I’m getting windows vertically inverted. Works if I revert
this commit or go back to software compositing.
and did you look at the commit? it's right. if you don't have the yinverted
extension it's the same behavior as before. it assume yinverted in gles/egl
by default (yinvert = 1 ... same as before ... m-native.yinvert = 1).
but IF you have the extension - it queries. it checks for the extensions
string and if you have it - sets a flag. if this flag is true AND the get
config attr succeeds - it sets yinvert to the queried invert value.
now.. i can only conclude here that either the interpretation of the
extension is wrong and that the invert value when 0/false == invertad and
when 1/true is NOT inverted... (odd and doesn't make sense)... or that your
driver has a bug. it implements this extn but gets it wrong.
the only solutions here would be (assuming the driver is wrong), is to
ignore this and just wait for the driver to be fixed, or to add blacklist
code into evas to detect the specific broken driver + version and ignore
that extension if that driver is found. i don't know what specific driver
strings you have there so i can't write a blacklist for you, but i suspect
you want to file a bug with mesa/driver/xorg devs :)
On Nov 29, 2013, at 8:08, Stanislav Vorobiov s.vorob...@samsung.com
wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e3b778acb851671c2f24454b80bdeafc20d1c65
commit 9e3b778acb851671c2f24454b80bdeafc20d1c65
Author: Stanislav Vorobiov s.vorob...@samsung.com
Date: Thu Nov 28 18:18:16 2013 +0900
evas - fix gl egl textrue from pixmap support y invert query extension
Instead of hardcoding yinvert=1 we should query for
EGL_NOK_texture_from_pixmap extension and if it's present
use EGL_Y_INVERTED_NOK value
---
src/modules/evas/engines/gl_x11/evas_engine.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c index d25610f..4e5c22c
100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -71,6 +71,7 @@ struct _Render_Engine
static int initted = 0;
static int gl_wins = 0;
static int extn_have_buffer_age = 1;
+static int extn_have_y_inverted = 0;
typedef void(*_eng_fn) (void);
typedef _eng_fn (*glsym_func_eng_fn) ();
@@ -90,6 +91,9 @@ static Eina_Bool eng_preload_make_current(void *data,
void *doit);
#ifndef EGL_BUFFER_AGE_EXT
# define EGL_BUFFER_AGE_EXT 0x313d
#endif
+#ifndef EGL_Y_INVERTED_NOK
+# define EGL_Y_INVERTED_NOK 0x307F
+#endif
_eng_fn (*glsym_eglGetProcAddress)(const char *a) = NULL;
void*(*glsym_eglCreateImage) (EGLDisplay a, EGLContext
b, EGLenum c, EGLClientBuffer d, const int *e) = NULL; @@ -711,6 +715,10
@@ gl_extn_veto(Render_Engine *re) {
extn_have_buffer_age = 0;
}
+if (strstr(str, EGL_NOK_texture_from_pixmap))
+ {
+ extn_have_y_inverted = 1;
+ }
}
else
{
@@ -2225,6 +2233,7 @@ eng_image_native_set(void *data, void *image, void
*native) EGLConfig egl_config;
int config_attrs[20];
int num_config, i = 0;
+ int yinvert = 1;
eina_hash_add(re-win-gl_context-shared-native_pm_hash,
pmid, im);
@@ -2250,6 +2259,15 @@
Re: [E-devel] Upcoming 1.8.x releases on Friday
From: s.schm...@samsung.com To: enlightenment-devel@lists.sourceforge.net Date: Wed, 4 Dec 2013 14:44:04 + Subject: [E-devel] Upcoming 1.8.x releases on Friday Hello. Apparently I'm not only the whip cracker for 1.9 but also the release monkey for 1.8.x :) Raster did the emergency efl 1.8.1 but from now on I will take over. Lets see how that goes. ;) It seems all 1.8 branches have accumulated enough fixes already to allow for a 1.8.x release on Friday. If you have backported your _tested_ important fixes to the stable branch consider yourself a good person. If know anything else that needs backporting please do so by Thursday evening. I don't want last minutes commits just a second before the release. To be totally honest with you folks this is my first release in the e world so it seems very likely that I screw something up. To avoid this as much as possible I put together what I heard about doing a release here on a new wiki page: https://phab.enlightenment.org/w/release_procedure/ This is what I gathered from others and completed by my own thoughts. Everyone who did a release here before please look over it and fix it as needed or reply here with suggestions. If we have other resources describing the procedure do not hesitate to point them out to me! regards Stefan Schmidt How about along with 11, bump micro version in configure.ac in master to 99? Still doing this going forward? -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: bugfix: don't add NoDisplay .desktop files to evry apps view
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b8af219a7759e5eea8cad7fccb496334df00bd1c
commit b8af219a7759e5eea8cad7fccb496334df00bd1c
Author: Mike Blumenkrantz zm...@samsung.com
Date: Wed Dec 4 12:02:05 2013 -0500
bugfix: don't add NoDisplay .desktop files to evry apps view
T598
---
src/modules/everything/evry_plug_apps.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/everything/evry_plug_apps.c
b/src/modules/everything/evry_plug_apps.c
index a589b70..06b0f10 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -383,6 +383,7 @@ _item_desktop_add(Plugin *p, Efreet_Desktop *desktop, int
match)
{
Evry_Item_App *app = NULL;
+ if (desktop-no_display) return;
if ((app = eina_hash_find(p-added, desktop-exec)))
{
if (eina_list_data_find_list(p-base.items, app))
--
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: bugfix: don't add NoDisplay .desktop files to evry apps view
discomfitor pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=70bcba845153653dff6ca03034bc610fb2fe9ac1
commit 70bcba845153653dff6ca03034bc610fb2fe9ac1
Author: Mike Blumenkrantz zm...@samsung.com
Date: Wed Dec 4 12:02:05 2013 -0500
bugfix: don't add NoDisplay .desktop files to evry apps view
T598
---
src/modules/everything/evry_plug_apps.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/everything/evry_plug_apps.c
b/src/modules/everything/evry_plug_apps.c
index 62ec632..2b0d452 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -383,6 +383,7 @@ _item_desktop_add(Plugin *p, Efreet_Desktop *desktop, int
match)
{
Evry_Item_App *app = NULL;
+ if (desktop-no_display) return;
if ((app = eina_hash_find(p-added, desktop-exec)))
{
if (eina_list_data_find_list(p-base.items, app))
--
[EGIT] [core/enlightenment] master 01/01: remove ability to alter gadgets in EFM toolbars
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=842d830c39bb785ef5426fb4349f74839a37ab97
commit 842d830c39bb785ef5426fb4349f74839a37ab97
Author: Mike Blumenkrantz zm...@samsung.com
Date: Wed Dec 4 12:21:22 2013 -0500
remove ability to alter gadgets in EFM toolbars
this whole site as a fully functioning gadcon is pretty broken (by
design), and it's not worthwhile to fix it at this point
---
ChangeLog | 5 +
NEWS| 2 ++
src/bin/e_gadcon.c | 8
src/bin/e_toolbar.c | 32 +---
4 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ce0aa19..1bbdc28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-04 Mike Blumenkrantz
+
+* Fixed NoDisplay entries in Everything launcher
+* Removed capabilities to alter gadgets in EFM toolbars
+
2013-11-25 Tom Hacohen
* Entry: Fixed issues with entry not scrolling to cursor.
diff --git a/NEWS b/NEWS
index ad36bc9..8658611 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,7 @@ Removed:
* e_manager_comp namespace
* HAL support for filemanager
* raise on focus config option
+* ability to alter gadgets in EFM toolbars
Improvements:
* mixer shows more channels when using alsa subsystem and correctly
disable controls
@@ -236,3 +237,4 @@ Fixes:
* fixed catching XWindow closes during DND operations on those windows
* wsod: Fixed gdb hangs when generating backtraces.
* Entry: Fixed issues with entry not scrolling to cursor.
+* Fixed NoDisplay entries in Everything launcher
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 6e5cfff..4e07a29 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1661,8 +1661,8 @@ _e_gadcon_gadget_move_to_pre_cb(void *data, E_Menu *m)
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_DESKTOP, n);
if (!gcc-client_class-func.is_site ||
gcc-client_class-func.is_site(E_GADCON_SITE_TOOLBAR))
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_TOOLBAR, n);
- if (!gcc-client_class-func.is_site ||
gcc-client_class-func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
- _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR,
n);
+ //if (!gcc-client_class-func.is_site ||
gcc-client_class-func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
+ //_e_gadcon_add_locations_menu_for_site(m, gcc,
E_GADCON_SITE_EFM_TOOLBAR, n);
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, n);
}
@@ -1722,7 +1722,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client
*gcc, E_Menu *menu_gadget
e_menu_post_deactivate_callback_set(menu_main,
_e_gadcon_client_cb_menu_post, gcc);
gcc-menu = menu_main;
- if ((gcc-gadcon-shelf) || (gcc-gadcon-toolbar))
+ if (gcc-gadcon-shelf)
{
if (e_menu_item_nth(menu_gadget, 0))
{
@@ -1803,7 +1803,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client
*gcc, E_Menu *menu_gadget
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc);
}
- if (!e_config-menu_gadcon_client_toplevel)
+ if ((!e_config-menu_gadcon_client_toplevel) (!gcc-gadcon-toolbar))
{
mi = e_menu_item_new(menu_main);
if (gcc-client_class-func.label)
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index 0a76337..b5b5792 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -6,9 +6,9 @@ static void_e_toolbar_cb_mouse_down(void *data, Evas
*evas, Evas_Object
static void_e_toolbar_menu_cb_post(void *data, E_Menu *mn);
static void_e_toolbar_menu_cb_pre(void *data, E_Menu *mn);
static void_e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn);
-static void_e_toolbar_menu_cb_edit(void *data, E_Menu *mn, E_Menu_Item
*mi);
+//static void_e_toolbar_menu_cb_edit(void *data, E_Menu *mn,
E_Menu_Item *mi);
static void_e_toolbar_menu_cb_config(void *data, E_Menu *mn,
E_Menu_Item *mi);
-static void_e_toolbar_menu_cb_contents(void *data, E_Menu *mn,
E_Menu_Item *mi);
+//static void_e_toolbar_menu_cb_contents(void *data, E_Menu *mn,
E_Menu_Item *mi);
static void_e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc,
Evas_Coord w, Evas_Coord h);
static const char *_e_toolbar_orient_string_get(E_Toolbar *tbar);
static void_e_toolbar_fm2_changed(void *data, Evas_Object *obj, void
*event_info);
@@ -31,7 +31,7 @@ _tb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj,
void *info __UNUSED
evas_object_geometry_get(obj, NULL, NULL, w, h);
if (tbar-gadcon) e_gadcon_swallowed_min_size_set(tbar-gadcon, w, h);
}
-
+/*
static void
_e_toolbar_gadget_remove(void *data EINA_UNUSED, E_Gadcon_Client *gcc)
{
@@ -121,13 +121,14 @@ _e_toolbar_gadget_add(void *data EINA_UNUSED,
E_Gadcon_Client *gcc, const E_Gadc
e_config_save_queue();
return
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: Randr: Update config epoch
etrunko pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=83c1ddab460fc299ba38f6f0d8b141a520182aca commit 83c1ddab460fc299ba38f6f0d8b141a520182aca Author: Eduardo Lima (Etrunko) eduardo.l...@intel.com Date: Fri Nov 8 15:04:14 2013 -0200 Randr: Update config epoch Previous commit didn't fix the issue, so we update the epoch to cause the configuration for randr to be reset and fix the problem for good. Also the config version now matches E18. Signed-off-by: Eduardo Lima (Etrunko) eduardo.l...@intel.com --- src/bin/e_randr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_randr.h b/src/bin/e_randr.h index 170a29a..86dd213 100644 --- a/src/bin/e_randr.h +++ b/src/bin/e_randr.h @@ -13,8 +13,8 @@ typedef struct _E_Randr_Config E_Randr_Config; #define E_RANDR_VERSION_1_3 ((1 16) | 3) #define E_RANDR_VERSION_1_4 ((1 16) | 4) -#define E_RANDR_CONFIG_FILE_EPOCH 1 -#define E_RANDR_CONFIG_FILE_GENERATION 4 +#define E_RANDR_CONFIG_FILE_EPOCH 2 +#define E_RANDR_CONFIG_FILE_GENERATION 3 #define E_RANDR_CONFIG_FILE_VERSION \ ((E_RANDR_CONFIG_FILE_EPOCH * 100) + E_RANDR_CONFIG_FILE_GENERATION) --
[E-devel] pkgbuild
this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
Date: Wed, 4 Dec 2013 12:43:31 -0500 From: michael.blumenkra...@gmail.com To: lists.sourceforge.net enlightenment-devel@lists.sourceforge.net Subject: [E-devel] pkgbuild this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. There's a spec file already, what's the difference? I sent the PKGBUILD in because everything else under core had one, so why not E? -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
On Wed, 4 Dec 2013 11:54:07 -0600 Doug Newgard scimmi...@outlook.com wrote: Date: Wed, 4 Dec 2013 12:43:31 -0500 From: michael.blumenkra...@gmail.com To: lists.sourceforge.net enlightenment-devel@lists.sourceforge.net Subject: [E-devel] pkgbuild this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. There's a spec file already, what's the difference? in theory, spec files and rpms can be used on any distro. or at least, that was the argument given at the time. I don't necessarily agree with keeping those either, but that was the decision made. I sent the PKGBUILD in because everything else under core had one, so why not E? I'm not pointing out any specific instance of it, this is something that occurred across the board. -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: tons of cl/news updates :(
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5002c63e47194ff1d08fb807e4dd474832cc8dd5 commit 5002c63e47194ff1d08fb807e4dd474832cc8dd5 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Dec 4 12:59:36 2013 -0500 tons of cl/news updates :( --- ChangeLog | 80 +++ NEWS | 29 +++ 2 files changed, 109 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1bbdc28..45cab25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,23 +3,103 @@ * Fixed NoDisplay entries in Everything launcher * Removed capabilities to alter gadgets in EFM toolbars +2013-12-02 Mike Blumenkrantz + +* Shrink filemanager icon event area to allow easier selections +* Remember view mode for desktop icons +* Fixed evry crash when switching views + +2013-11-30 Mike Blumenkrantz + +* Correctly start pulseaudio from mixer + +2013-11-29 Mike Blumenkrantz + +* Fix winlist case where activation would have no effect + +2013-11-26 Mike Blumenkrantz + +* Select previously-renaming filemanager icon when rename ends +* Improve reliability of new file/directory creation +* Clicking Settings-All in menu now opens settings panel +* Open Terminal Here now available when clicking regular files + +2013-11-25 Mike Blumenkrantz + +* Reapply default filemanager view after changing settings + 2013-11-25 Tom Hacohen * Entry: Fixed issues with entry not scrolling to cursor. +2013-11-22 Carsten Haitzler + +* Add more filetypes to thumbnailer + +2013-11-21 Mike Blumenkrantz + +* Fix flickering in advanced wallpaper settings + +2013-11-21 Sebastian Dransfeld + +* Improve focus handling with external desktop filemanagers + +2013-11-20 Mike Blumenkrantz + +* Add back/forward button support for filemanager when toolbar is present +* Fix focus/stacking of windows on restart +* More accurately set current desk in Move to... submenu +* Disable resizing of buttons in window remember dialog + +2013-11-20 Carsten Haitzler + +* Add $XDG_DESKTOP_DIR support for file link paths + +2013-11-18 Carsten Haitzler + +* Increase text file preview size +* Improve text file preview layout + 2013-11-05 Tom Hacohen * wsod: Fixed gdb hangs when generating backtraces. +2013-10-31 Carsten Haitzler + +* e now uses and looks for elementary themes +* elementary + emotion now hard dependencies + +2013-10-26 Mike Blumenkrantz + +* Fix unfocusing of disabled widgets + +2013-10-25 Iván Briano + +* Improve battery gadget text sizing + +2013-10-15 Mike Blumenkrantz + +* Fix crash when activating e's restart from start gadget triggered menu + 2013-10-07 Mike Blumenkrantz * removed raise on focus config option +* clock gadgets now default to digital mode when added + +2013-10-06 Yossi Kantor + +* Greatly improve filemanager icon selection 2013-10-03 Mike Blumenkrantz * Fix filemanager spring window closing when dragging from desktop * Catch XWindow closes during DND operations on those windows +2013-09-26 Mike Blumenkrantz + +* Further improve initial window placement coordinates +* ignore netwm activate during startup + 2013-09-19 Mike Blumenkrantz * Fix bug where new files could not be created repeatedly diff --git a/NEWS b/NEWS index 8658611..9b1aca9 100644 --- a/NEWS +++ b/NEWS @@ -57,6 +57,8 @@ Additions: * new winlist config option for moving selected window to current desk Changes: +* e now uses and looks for elementary themes +* elementary + emotion now hard dependencies Modules: * modules no longer require shutdown or save functions * merged all binding config dialogs into conf_bindings module @@ -152,6 +154,21 @@ Improvements: * udisks2 support * Navigate menu item now opens $HOME * Clicking in the filemanager when renaming cancels the rename +* Shrink filemanager icon event area to allow easier selections +* Select previously-renaming filemanager icon when rename ends +* Improve reliability of new file/directory creation +* Clicking Settings-All in menu now opens settings panel +* Open Terminal Here now available when clicking regular files +* Add more filetypes to thumbnailer +* Improve focus handling with external desktop filemanagers +* Add back/forward button support for filemanager when toolbar is present +* Increase text file preview size +* Improve text file preview layout +* e now uses and looks for elementary themes +* Improve battery gadget text sizing +* Greatly improve filemanager icon selection +* clock gadgets now default to digital mode when added +* ignore netwm activate during
Re: [E-devel] pkgbuild
Date: Wed, 4 Dec 2013 12:56:04 -0500 From: michael.blumenkra...@gmail.com To: enlightenment-devel@lists.sourceforge.net CC: scimmi...@outlook.com Subject: Re: [E-devel] pkgbuild On Wed, 4 Dec 2013 11:54:07 -0600 Doug Newgard scimmi...@outlook.com wrote: Date: Wed, 4 Dec 2013 12:43:31 -0500 From: michael.blumenkra...@gmail.com To: lists.sourceforge.net enlightenment-devel@lists.sourceforge.net Subject: [E-devel] pkgbuild this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. There's a spec file already, what's the difference? in theory, spec files and rpms can be used on any distro. or at least, that was the argument given at the time. I don't necessarily agree with keeping those either, but that was the decision made. I sent the PKGBUILD in because everything else under core had one, so why not E? I'm not pointing out any specific instance of it, this is something that occurred across the board. The rest came originally from Raster. I believe his intent is to eventually make a self-contained distro based on Arch for Enlightenment, hence the need for PKGBUILD files. -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 01/01: Python-EFL: unify all the 3 map tests in one
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=0a03a272e77c4d69dde42e6eab59d81cad40f97f commit 0a03a272e77c4d69dde42e6eab59d81cad40f97f Author: davemds d...@gurumeditation.it Date: Wed Dec 4 21:31:43 2013 +0100 Python-EFL: unify all the 3 map tests in one --- examples/elementary/test.py | 2 - examples/elementary/test_map.py | 382 ++- examples/elementary/test_map2.py | 215 -- examples/elementary/test_map3.py | 248 - 4 files changed, 337 insertions(+), 510 deletions(-) diff --git a/examples/elementary/test.py b/examples/elementary/test.py index e5b9394..1306b69 100755 --- a/examples/elementary/test.py +++ b/examples/elementary/test.py @@ -113,8 +113,6 @@ items = [ ]), (Geographic, [ (Map, test_map, map_clicked), -(Map Overlay, test_map2, map_overlays_clicked), -(Map Route, test_map3, map_route_clicked), ]), (Images, [ (Icon, test_icon, icon_clicked), diff --git a/examples/elementary/test_map.py b/examples/elementary/test_map.py index 56030a0..a5faed8 100644 --- a/examples/elementary/test_map.py +++ b/examples/elementary/test_map.py @@ -1,14 +1,24 @@ #!/usr/bin/env python # encoding: utf-8 -from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL +import os +from random import randint + +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EVAS_CALLBACK_MOUSE_DOWN from efl import elementary from efl.elementary.window import StandardWindow from efl.elementary.box import Box from efl.elementary.button import Button from efl.elementary.check import Check +from efl.elementary.entry import Entry from efl.elementary.hoversel import Hoversel -from efl.elementary.map import Map, ELM_MAP_SOURCE_TYPE_TILE +from efl.elementary.icon import Icon +from efl.elementary.label import Label +from efl.elementary.separator import Separator +from efl.elementary.map import Map, MapOverlayClass, ELM_MAP_OVERLAY_TYPE_CLASS, \ +ELM_MAP_SOURCE_TYPE_TILE, ELM_MAP_ROUTE_TYPE_MOTOCAR, ELM_MAP_ROUTE_METHOD_FASTEST, \ +ELM_MAP_SOURCE_TYPE_ROUTE, ELM_MAP_SOURCE_TYPE_NAME +from efl.elementary.menu import Menu from efl.elementary.slider import Slider EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND @@ -18,6 +28,12 @@ FILL_HORIZ = EVAS_HINT_FILL, 0.5 elementary.need_efreet() +script_path = os.path.dirname(os.path.abspath(__file__)) +img_path = os.path.join(script_path, images) + +route_start_point = None +route_end_point = None + def print_map_info(Map): print(---Map info---) # print(user_agent: %s % (Map.user_agent)) @@ -36,11 +52,11 @@ def cb_btn_zoom(bt, Map, zoom): Map.zoom += zoom print_map_info(Map) -def cb_btn_show(bt, Map, lon, lat): +def cb_menu_show(menu, item, Map, lon, lat): Map.region_show(lon, lat) print_map_info(Map) -def cb_btn_bringin(bt, Map, lon, lat): +def cb_menu_bringin(menu, item, Map, lon, lat): Map.region_bring_in(lon, lat) print_map_info(Map) @@ -49,31 +65,256 @@ def cb_slider_rot(sl, Map): Map.rotate_set(sl.value, cx, cy) print(New rotate: %f %d %d % Map.rotate) -def cb_hovsel_selected(hov, item, Map, src_type): +def cb_hovsel_selected(hov, item, Map, src_type, name): Map.source_set(src_type, item.text) -hov.text = Tiles: %s % (item.text) +hov.text = %s: %s % (name, item.text) + +def cb_chk_overlays_hidden(ck, Map): +for ov in Map.overlays: +ov.hide = ck.state + +def cb_chk_overlays_paused(ck, m): +for ov in m.overlays: +ov.paused = ck.state + + +def cb_menu_overlay_normal(menu, item, Map, lon, lat): +ov = Map.overlay_add(lon, lat) +ov.callback_clicked_set(lambda m,o: o.delete()) + +def cb_menu_overlay_icon(menu, item, Map, lon, lat): +ov = Map.overlay_add(lon, lat) +ov.icon = Icon(Map, file=os.path.join(img_path, logo.png)) + +def cb_menu_overlay_custom(menu, item, Map, lon, lat): +ov = Map.overlay_add(lon, lat) +cont = Icon(Map, file=os.path.join(img_path, sky_01.jpg)) +cont.size_hint_min = 50, 50 +ov.content = cont + +def cb_menu_overlay_random_color(menu, item, Map, lon, lat): +ov = Map.overlay_add(lon, lat) +ov.color = (randint(0, 255), randint(0, 255), randint(0, 255), 255) +ov.callback_clicked_set(lambda m,o: o.delete()) + +def cb_menu_overlay_min_zoom(menu, item, Map, lon, lat): +ov = Map.overlay_add(lon, lat) +ov.displayed_zoom_min = 4 +ov.callback_clicked_set(lambda m,o: o.delete()) + +def cb_menu_overlay_grouped(menu, item, Map, lon, lat): +cls = Map.overlay_class_add() +for x in range(4): +for y in range(4): +ov = Map.overlay_add(lon + x, lat + y) +ov.callback_clicked_set(lambda m,o: o.delete()) +cls.append(ov) + +def cb_menu_overlay_bubble(menu, item, Map, lon, lat): +ov = Map.overlay_add(lon, lat) +bub =
[EGIT] [apps/terminology] master 03/03: have a list with the keybindings
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c93c431279a0aeba45413fd9d8b74378b4b25854
commit c93c431279a0aeba45413fd9d8b74378b4b25854
Author: Boris Faure bill...@gmail.com
Date: Wed Dec 4 22:50:21 2013 +0100
have a list with the keybindings
This is ugly, makes evas complain… but it's better than nothing and users
might discover the bindings about the tab switcher…
And we're in feature-freeze.
---
src/bin/options_keys.c | 50 ++
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c
index 56d6683..e8fef8c 100644
--- a/src/bin/options_keys.c
+++ b/src/bin/options_keys.c
@@ -9,12 +9,54 @@
void
options_keys(Evas_Object *opbox, Evas_Object *term EINA_UNUSED)
{
- Evas_Object *o;
+ Evas_Object *o, *fr, *li, *lbl;
- o = elm_label_add(opbox);
+ fr = o = elm_frame_add(opbox);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_text_set(o, Not Implemented Yet.);
- evas_object_show(o);
+ elm_object_text_set(o, Key Bindings);
elm_box_pack_end(opbox, o);
+ evas_object_show(o);
+
+ li = elm_list_add(o);
+ elm_list_mode_set(li, ELM_LIST_LIMIT);
+ evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_content_set(fr, li);
+
+#define KB(_action, _keys) do { \
+ lbl = elm_label_add(li); \
+ elm_object_text_set(lbl, _keys); \
+ elm_list_item_append(li, _action, NULL, lbl, NULL, NULL); \
+} while (0)
+
+ KB(Scroll one page up, Shift + PgUp);
+ KB(Scroll one page down, Shift + PgDn);
+ KB(Paste Clipboard (ctrl+v/c) selection, Shift + Insert);
+ KB(Paste Clipboard (ctrl+v/c) selection, Ctrl + Shift + v);
+ KB(Paste Primary (highlight) selection, Shift + Ctrl + Insert);
+ KB(Paste Primary (highlight) selection, Alt + Return);
+ KB(Copy current selection to clipboard, Ctrl + Shift + c);
+ KB(Copy current selection to clipboard, Shift+Keypad-Divide);
+ KB(Font size up 1, Shift+Keypad-Plus);
+ KB(Font size down 1, Shift+Keypad-Minus);
+ KB(Reset font size to 10, Shift+Keypad-Multiply);
+ KB(Split horizontally (new below), Ctrl + Shift + PgUp);
+ KB(Split vertically (new on right), Ctrl + Shift + PgDn);
+ KB(Focus to previous terminal, Ctrl + PgUp);
+ KB(Focus to next terminal, Ctrl + PgDn);
+ KB(Create new \tab\, Ctrl + Shift + t);
+ KB(Bring up \tab\ switcher, Ctrl + Shift + Home);
+ KB(Switch to terminal tab 1, Ctrl + 1);
+ KB(Switch to terminal tab 2, Ctrl + 2);
+ KB(Switch to terminal tab 3, Ctrl + 3);
+ KB(Switch to terminal tab 4, Ctrl + 4);
+ KB(Switch to terminal tab 5, Ctrl + 5);
+ KB(Switch to terminal tab 6, Ctrl + 6);
+ KB(Switch to terminal tab 7, Ctrl + 7);
+ KB(Switch to terminal tab 8, Ctrl + 8);
+ KB(Switch to terminal tab 9, Ctrl + 9);
+ KB(Switch to terminal tab 10, Ctrl + 0);
+ KB(Enter command mode, Alt + Home);
+#undef KB
}
--
[EGIT] [apps/terminology] master 02/03: add dummy option about key bindings
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=2ae7fada132b36991722487bed26a30fb54afe43
commit 2ae7fada132b36991722487bed26a30fb54afe43
Author: Boris Faure bill...@gmail.com
Date: Wed Dec 4 22:07:13 2013 +0100
add dummy option about key bindings
---
src/bin/Makefile.am| 9 +
src/bin/options.c | 10 +++---
src/bin/options_keys.c | 20
src/bin/options_keys.h | 1 +
4 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 5516b82..fca4b3c 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -19,14 +19,15 @@ keyin.c keyin.h \
main.c main.h \
media.c media.h \
options.c options.h \
-options_behavior.c options_behavior.h \
-options_colors.c options_colors.h \
options_font.c options_font.h \
-options_helpers.c options_helpers.h \
-options_video.c options_video.h \
options_theme.c options_theme.h \
options_themepv.c options_themepv.h \
options_wallpaper.c options_wallpaper.h \
+options_colors.c options_colors.h \
+options_behavior.c options_behavior.h \
+options_keys.c options_keys.h \
+options_helpers.c options_helpers.h \
+options_video.c options_video.h \
sel.c sel.h \
termio.c termio.h \
termcmd.c termcmd.h \
diff --git a/src/bin/options.c b/src/bin/options.c
index a75b6a5..fb9ab5d 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -3,12 +3,13 @@
#include Elementary.h
#include options.h
#include options_font.h
-#include options_helpers.h
-#include options_behavior.h
-#include options_video.h
#include options_theme.h
#include options_wallpaper.h
#include options_colors.h
+#include options_video.h
+#include options_behavior.h
+#include options_keys.h
+#include options_helpers.h
#include config.h
#include termio.h
@@ -30,6 +31,7 @@ static enum option_mode {
OPTION_COLORS,
OPTION_VIDEO,
OPTION_BEHAVIOR,
+ OPTION_KEYS,
OPTION_HELPERS
} _mode = 0;
@@ -83,6 +85,7 @@ _cb_opdt_hide_done(void *data, Evas_Object *obj EINA_UNUSED,
const char *sig EIN
case OPTION_COLORS:options_colors(op_opbox, data); break;
case OPTION_VIDEO: options_video(op_opbox, data); break;
case OPTION_BEHAVIOR: options_behavior(op_opbox, data); break;
+ case OPTION_KEYS: options_keys(op_opbox, data); break;
case OPTION_HELPERS: options_helpers(op_opbox, data); break;
}
edje_object_signal_emit(saved_bg, optdetails,show, terminology);
@@ -148,6 +151,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg,
Evas_Object *term,
ITEM_APPEND(preferences-color, Colors, COLORS);
ITEM_APPEND(preferences-desktop-multimedia, Video, VIDEO);
ITEM_APPEND(system-run, Behavior, BEHAVIOR);
+ITEM_APPEND(preferences-desktop-keyboard-shortcuts, Keys, KEYS);
ITEM_APPEND(document-open, Helpers, HELPERS);
#undef ITEM_APPEND
diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c
new file mode 100644
index 000..56d6683
--- /dev/null
+++ b/src/bin/options_keys.c
@@ -0,0 +1,20 @@
+#include private.h
+
+#include Elementary.h
+#include config.h
+#include termio.h
+#include options.h
+#include options_wallpaper.h
+
+void
+options_keys(Evas_Object *opbox, Evas_Object *term EINA_UNUSED)
+{
+ Evas_Object *o;
+
+ o = elm_label_add(opbox);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_text_set(o, Not Implemented Yet.);
+ evas_object_show(o);
+ elm_box_pack_end(opbox, o);
+}
diff --git a/src/bin/options_keys.h b/src/bin/options_keys.h
new file mode 100644
index 000..0ab2a32
--- /dev/null
+++ b/src/bin/options_keys.h
@@ -0,0 +1 @@
+void options_keys(Evas_Object *opbox, Evas_Object *term);
--
[EGIT] [apps/terminology] master 01/03: cleanup options code
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=bb86f4b07bee78a388072371ebbe268263f29ad7
commit bb86f4b07bee78a388072371ebbe268263f29ad7
Author: Boris Faure bill...@gmail.com
Date: Wed Dec 4 21:42:16 2013 +0100
cleanup options code
---
src/bin/options.c | 105 +++---
1 file changed, 37 insertions(+), 68 deletions(-)
diff --git a/src/bin/options.c b/src/bin/options.c
index 1081c62..a75b6a5 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -21,61 +21,25 @@ static Evas_Object *saved_win = NULL;
static Evas_Object *saved_bg = NULL;
static void (*op_donecb) (void *data) = NULL;
static void *op_donedata = NULL;
-static int mode = -1;
-static void
-_cb_op_font(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
EINA_UNUSED)
-{
- if (mode == 1) return;
- mode = 1;
- edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
-}
-
-static void
-_cb_op_theme(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
EINA_UNUSED)
-{
- if (mode == 2) return;
- mode = 2;
- edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
-}
-
-static void
-_cb_op_wallpaper(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
-{
- if (mode == 3) return;
- mode = 3;
- edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
-}
+static enum option_mode {
+ OPTION_NONE = 0,
+ OPTION_FONT,
+ OPTION_THEME,
+ OPTION_WALLPAPER,
+ OPTION_COLORS,
+ OPTION_VIDEO,
+ OPTION_BEHAVIOR,
+ OPTION_HELPERS
+} _mode = 0;
static void
-_cb_op_colors(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
+_cb_op(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
{
- if (mode == 4) return;
- mode = 4;
- edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
-}
-
-static void
-_cb_op_video(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
EINA_UNUSED)
-{
- if (mode == 5) return;
- mode = 5;
- edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
-}
+ enum option_mode mode = (intptr_t) data;
-static void
-_cb_op_behavior(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
-{
- if (mode == 6) return;
- mode = 6;
- edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
-}
-
-static void
-_cb_op_helpers(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
-{
- if (mode == 7) return;
- mode = 7;
+ if (_mode == mode) return;
+ _mode = mode;
edje_object_signal_emit(saved_bg, optdetails,hide, terminology);
}
@@ -110,16 +74,16 @@ static void
_cb_opdt_hide_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig
EINA_UNUSED, const char *src EINA_UNUSED)
{
elm_box_clear(op_opbox);
- switch (mode)
+ switch (_mode)
{
- case 1: options_font(op_opbox, data); break;
- case 2: options_theme(op_opbox, data); break;
- case 3: options_wallpaper(op_opbox, data); break;
- case 4: options_colors(op_opbox, data); break;
- case 5: options_video(op_opbox, data); break;
- case 6: options_behavior(op_opbox, data); break;
- case 7: options_helpers(op_opbox, data); break;
- default: break;
+ case OPTION_NONE: break;
+ case OPTION_FONT: options_font(op_opbox, data); break;
+ case OPTION_THEME: options_theme(op_opbox, data); break;
+ case OPTION_WALLPAPER: options_wallpaper(op_opbox, data); break;
+ case OPTION_COLORS:options_colors(op_opbox, data); break;
+ case OPTION_VIDEO: options_video(op_opbox, data); break;
+ case OPTION_BEHAVIOR: options_behavior(op_opbox, data); break;
+ case OPTION_HELPERS: options_helpers(op_opbox, data); break;
}
edje_object_signal_emit(saved_bg, optdetails,show, terminology);
}
@@ -130,7 +94,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg,
Evas_Object *term,
{
Evas_Object *o;
- mode = -1;
+ _mode = OPTION_NONE;
if (!op_frame)
{
Elm_Object_Item *it_fn;
@@ -173,14 +137,19 @@ options_toggle(Evas_Object *win, Evas_Object *bg,
Evas_Object *term,
elm_toolbar_menu_parent_set(o, win);
elm_toolbar_homogeneous_set(o, EINA_FALSE);
-it_fn =
-elm_toolbar_item_append(o, preferences-desktop-font, Font,
_cb_op_font, term);
-elm_toolbar_item_append(o, preferences-desktop-theme, Theme,
_cb_op_theme, term);
-elm_toolbar_item_append(o, preferences-desktop-wallpaper,
Wallpaper, _cb_op_wallpaper, term);
-elm_toolbar_item_append(o, preferences-color, Colors,
_cb_op_colors,term);
-elm_toolbar_item_append(o, preferences-desktop-multimedia, Video,
_cb_op_video, term);
-elm_toolbar_item_append(o, system-run,
Behavior,
Re: [E-devel] pkgbuild
On Wed, 4 Dec 2013 12:43:31 -0500 Michael Blumenkrantz michael.blumenkra...@gmail.com said: this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. there's a big difference. debian has a POLICY of you are not allowed to have debian build stuff in a source tree. they continually complain that we had such stuff. we have had .spec files for much longer than even debian build stuff. there's enlightenment.spec right there. you've never complained. so leave it there. the removal of debian stuff is due to debian policies. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
On Wed, 4 Dec 2013 12:56:04 -0500 Michael Blumenkrantz michael.blumenkra...@gmail.com said: On Wed, 4 Dec 2013 11:54:07 -0600 Doug Newgard scimmi...@outlook.com wrote: Date: Wed, 4 Dec 2013 12:43:31 -0500 From: michael.blumenkra...@gmail.com To: lists.sourceforge.net enlightenment-devel@lists.sourceforge.net Subject: [E-devel] pkgbuild this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. There's a spec file already, what's the difference? in theory, spec files and rpms can be used on any distro. or at least, that was the argument given at the time. I don't necessarily agree with keeping those either, but that was the decision made. just as much as debian files can be used on any distro too. there is more than 1 distro that uses dpkg... heard of ubuntu? :) I sent the PKGBUILD in because everything else under core had one, so why not E? I'm not pointing out any specific instance of it, this is something that occurred across the board. 2 distros i know of use pacman. arch and manjaro. so there's more than 1. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
On Thu, 5 Dec 2013 08:54:37 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Wed, 4 Dec 2013 12:56:04 -0500 Michael Blumenkrantz michael.blumenkra...@gmail.com said: On Wed, 4 Dec 2013 11:54:07 -0600 Doug Newgard scimmi...@outlook.com wrote: Date: Wed, 4 Dec 2013 12:43:31 -0500 From: michael.blumenkra...@gmail.com To: lists.sourceforge.net enlightenment-devel@lists.sourceforge.net Subject: [E-devel] pkgbuild this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. There's a spec file already, what's the difference? in theory, spec files and rpms can be used on any distro. or at least, that was the argument given at the time. I don't necessarily agree with keeping those either, but that was the decision made. just as much as debian files can be used on any distro too. there is more than 1 distro that uses dpkg... heard of ubuntu? :) Plus a few more. I sent the PKGBUILD in because everything else under core had one, so why not E? I'm not pointing out any specific instance of it, this is something that occurred across the board. 2 distros i know of use pacman. arch and manjaro. so there's more than 1. And then there is alien. B-) -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
On 12/05/2013 10:22 AM, Carsten Haitzler (The Rasterman) wrote: On Wed, 4 Dec 2013 12:43:31 -0500 Michael Blumenkrantz michael.blumenkra...@gmail.com said: this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. there's a big difference. debian has a POLICY of you are not allowed to have debian build stuff in a source tree. they continually complain that we had such stuff. we have had .spec files for much longer than even debian build stuff. there's enlightenment.spec right there. you've never complained. so leave it there. the removal of debian stuff is due to debian policies. The .spec files should probably be removed based off the fact as far as i know no one has been maintaining them, i don't think any of the major rpm based distro's are using them, we also all use them sightly differently. If someone is going to use them and keep them updated then keep them otherwise they should probably go. Cheers Simon --- Enlightenment maintainer for openSUSE -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/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/01: elementary/elm_button.c : Change the timing of signal_emitting.
woohyun pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=bb782234cd121c2aae1cdeb374335f26e76e9ef4 commit bb782234cd121c2aae1cdeb374335f26e76e9ef4 Author: WooHyun Jung wh0705.j...@samsung.com Date: Thu Dec 5 10:01:43 2013 +0900 elementary/elm_button.c : Change the timing of signal_emitting. Application can delete button itsefl(or its parent) inside the smart callback function. So the signal_emitting with button object should be done in advance. --- src/lib/elm_button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index e1f3da8..42f337f 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -184,8 +184,8 @@ _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) (strcmp(ev-key, space))) return; - _activate(obj); elm_layout_signal_emit(obj, elm,anim,activate, elm); + _activate(obj); ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; --
[EGIT] [core/enlightenment] master 03/04: remove more calls to useless gadcon function
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c49d5eea961bc227b53c061392f98f605ebb9453
commit c49d5eea961bc227b53c061392f98f605ebb9453
Author: Mike Blumenkrantz zm...@samsung.com
Date: Wed Dec 4 23:08:50 2013 -0500
remove more calls to useless gadcon function
---
src/bin/e_gadcon.c | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 9aa74c5..67cb34e 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -2561,7 +2561,6 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
Evas_Coord x, y, w, h;
int cx, cy;
int gx, gy, gw, gh;
- int gcx = 0, gcy = 0;
int changes = 0;
if (!gcc-moving) return;
@@ -2572,15 +2571,12 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
if (gcc-gadcon-toolbar)
evas_pointer_canvas_xy_get(gcc-gadcon-evas, cx, cy);
else
- {
-ecore_x_pointer_xy_get(gcc-gadcon-zone-container-win, cx, cy);
-e_gadcon_canvas_zone_geometry_get(gcc-gadcon, gcx, gcy, NULL, NULL);
- }
+ ecore_x_pointer_xy_get(gcc-gadcon-zone-container-win, cx, cy);
evas_object_geometry_get(gcc-gadcon-o_container, gx, gy, gw, gh);
- cx -= (gx + gcx);
- cy -= (gy + gcy);
+ cx -= gx;
+ cy -= gy;
x = cx - gcc-dx;
y = cy - gcc-dy;
--
[EGIT] [core/enlightenment] master 01/04: remove call to useless gadcon function
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=84cb16cf8f2fdb970257b428be8255a5b14f7dc6
commit 84cb16cf8f2fdb970257b428be8255a5b14f7dc6
Author: Mike Blumenkrantz zm...@samsung.com
Date: Wed Dec 4 23:05:50 2013 -0500
remove call to useless gadcon function
---
src/bin/e_gadcon.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 4e07a29..defb59d 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -2517,7 +2517,7 @@ _e_gadcon_cb_client_resize(void *data, Evas *evas
__UNUSED__, Evas_Object *obj,
static void
_e_gadcon_client_move_start(E_Gadcon_Client *gcc)
{
- int x, y, gcx, gcy, gy, gx;
+ int x, y, gy, gx;
evas_object_raise(gcc-o_event);
evas_object_stack_below(gcc-o_control, gcc-o_event);
@@ -2527,10 +2527,9 @@ _e_gadcon_client_move_start(E_Gadcon_Client *gcc)
else
{
ecore_x_pointer_xy_get(e_comp_get(gcc)-ee_win, gcc-dx, gcc-dy);
-e_gadcon_canvas_zone_geometry_get(gcc-gadcon, gcx, gcy, NULL, NULL);
evas_object_geometry_get(gcc-gadcon-o_container, gx, gy, NULL,
NULL);
-gcc-dx -= (gcx + gx);
-gcc-dy -= (gcy + gy);
+gcc-dx -= gx;
+gcc-dy -= gy;
}
if (gcc-o_frame)
--
[EGIT] [core/enlightenment] master 02/04: move and unify a gadcon drag block
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0b6ec2d07a099c03466163c3acc9cead45f6bd4b
commit 0b6ec2d07a099c03466163c3acc9cead45f6bd4b
Author: Mike Blumenkrantz zm...@samsung.com
Date: Wed Dec 4 23:06:57 2013 -0500
move and unify a gadcon drag block
---
src/bin/e_gadcon.c | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index defb59d..9aa74c5 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -2588,6 +2588,13 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
gcc-state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION |
E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
_e_gadcon_client_current_position_sync(gcc);
+ if ((cy + e_config-drag_resist 0 || cy - e_config-drag_resist = gh) ||
+ (cx + e_config-drag_resist 0 || cx - e_config-drag_resist gw))
+ {
+_e_gadcon_client_drag_begin(gcc, cx, cy);
+return;
+ }
+
if (gcc-o_frame)
evas_object_geometry_get(gcc-o_frame, NULL, NULL, w, h);
else if (gcc-o_base)
@@ -2597,13 +2604,6 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
if (e_gadcon_layout_orientation_get(gcc-gadcon-o_container))
{
-if ((cy + e_config-drag_resist 0 || cy - e_config-drag_resist =
gh) ||
-(cx + e_config-drag_resist 0 || cx - e_config-drag_resist
gw))
- {
- _e_gadcon_client_drag_begin(gcc, cx, cy);
- return;
- }
-
/* DRAG RIGHT */
if (x 0 (cx + gcc-drag.x gcc-config.pos))
{
@@ -2635,13 +2635,6 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
}
else
{
-if ((cy + e_config-drag_resist 0 || cy - e_config-drag_resist =
gh) ||
-(cx + e_config-drag_resist 0 || cx - e_config-drag_resist
gw))
- {
- _e_gadcon_client_drag_begin(gcc, cx, cy);
- return;
- }
-
/* DRAG DOWN */
if (y 0 (cy + gcc-drag.y gcc-config.pos))
{
--
[EGIT] [core/enlightenment] master 04/04: subtract zone position from initial gadcon client drag coordinates
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ed6bfb1955874b5e7d4893af4265242e82b87e0b commit ed6bfb1955874b5e7d4893af4265242e82b87e0b Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Dec 4 23:09:12 2013 -0500 subtract zone position from initial gadcon client drag coordinates T369 --- src/bin/e_gadcon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 67cb34e..8e6b44e 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -2540,8 +2540,8 @@ _e_gadcon_client_move_start(E_Gadcon_Client *gcc) return; /* using drag pos to calc offset between pointer and gcc pos */ - gcc-drag.x = (x - gcc-dx); - gcc-drag.y = (y - gcc-dy); + gcc-drag.x = x - (gcc-dx + gx); + gcc-drag.y = y - (gcc-dy + gy); gcc-state_info.resist = 0; } --
Re: [E-devel] pkgbuild
2013/12/5 Carsten Haitzler ras...@rasterman.com: there's a big difference. debian has a POLICY of you are not allowed to have debian build stuff in a source tree. they continually complain that we had such stuff. we have had .spec files for much longer than even debian build stuff. there's enlightenment.spec right there. you've never complained. so leave it there. the removal of debian stuff is due to debian policies. Best way to have dist build stuff - create special branches. For example for debian and ubuntu exists git-buildpackage, in git tree you need to have branch debian.. May be the best way to create separate branches for spec/debian/pkgbuild stuff and hold this stuff only in corresponding branch? And all source code lives in master whatever branches? -- Vasiliy Tolstov, e-mail: v.tols...@selfip.ru jabber: v...@selfip.ru -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
On Thu, 5 Dec 2013 08:12:54 +0400 Vasiliy Tolstov v.tols...@selfip.ru said: 2013/12/5 Carsten Haitzler ras...@rasterman.com: there's a big difference. debian has a POLICY of you are not allowed to have debian build stuff in a source tree. they continually complain that we had such stuff. we have had .spec files for much longer than even debian build stuff. there's enlightenment.spec right there. you've never complained. so leave it there. the removal of debian stuff is due to debian policies. Best way to have dist build stuff - create special branches. For example for debian and ubuntu exists git-buildpackage, in git tree you need to have branch debian.. May be the best way to create separate branches for spec/debian/pkgbuild stuff and hold this stuff only in corresponding branch? And all source code lives in master whatever branches? why? that makes no sense. it just complicates things. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
2013/12/5 Carsten Haitzler ras...@rasterman.com: why? that makes no sense. it just complicates things. Why? Source code in master/devel branches. Spec in spec branch and updated only then needed, debian dir in debian branch... -- Vasiliy Tolstov, e-mail: v.tols...@selfip.ru jabber: v...@selfip.ru -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
From: v.tols...@selfip.ru Date: Thu, 5 Dec 2013 09:21:26 +0400 To: ras...@rasterman.com CC: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] pkgbuild 2013/12/5 Carsten Haitzler ras...@rasterman.com: why? that makes no sense. it just complicates things. Why? Source code in master/devel branches. Spec in spec branch and updated only then needed, debian dir in debian branch... Git doesn't work that way. Branches are for branching code, not totally different files. -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
2013/12/5 Doug Newgard scimmi...@outlook.com: Git doesn't work that way. Branches are for branching code, not totally different files. git checkout --orphan NEWBRANCH why git authors create this ability? -- Vasiliy Tolstov, e-mail: v.tols...@selfip.ru jabber: v...@selfip.ru -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
From: v.tols...@selfip.ru Date: Thu, 5 Dec 2013 09:54:30 +0400 To: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] pkgbuild 2013/12/5 Doug Newgard scimmi...@outlook.com: Git doesn't work that way. Branches are for branching code, not totally different files. git checkout --orphan NEWBRANCH why git authors create this ability? From the documentation: This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is clean, but whose full history contains proprietary or otherwise encumbered bits of code. -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] pkgbuild
2013/12/5 Doug Newgard scimmi...@outlook.com: From the documentation: This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is clean, but whose full history contains proprietary or otherwise encumbered bits of code. Thanks.. -- Vasiliy Tolstov, e-mail: v.tols...@selfip.ru jabber: v...@selfip.ru -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 04/05: Elementary.plug: Use object_from_instance in image_object property.
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=559a2a2c56b69bacd90e0aa923ef55c89984cfc1 commit 559a2a2c56b69bacd90e0aa923ef55c89984cfc1 Author: Kai Huuhko kai.huu...@gmail.com Date: Thu Dec 5 08:35:31 2013 +0200 Elementary.plug: Use object_from_instance in image_object property. --- efl/elementary/plug.pyx | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/efl/elementary/plug.pyx b/efl/elementary/plug.pyx index cb73d6e..a9aab48 100644 --- a/efl/elementary/plug.pyx +++ b/efl/elementary/plug.pyx @@ -41,7 +41,7 @@ This widget emits the following signals: from cpython cimport PyUnicode_AsUTF8String -from efl.eo cimport _object_mapping_register +from efl.eo cimport _object_mapping_register, object_from_instance from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject from object cimport Object @@ -96,10 +96,7 @@ cdef class Plug(Object): def __get__(self): -cdef evasImage img = evasImage() -cdef Evas_Object *obj = elm_plug_image_object_get(self.obj) -img.obj = obj -return img +return object_from_instance(elm_plug_image_object_get(self.obj)) def callback_clicked_add(self, func, *args, **kwargs): --
[EGIT] [bindings/python/python-efl] master 03/05: Elementary.object: Add few missing methods related to translatable text.
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=16891cf2b417ec7575fa8e60c8377c6dcd05ecac commit 16891cf2b417ec7575fa8e60c8377c6dcd05ecac Author: Kai Huuhko kai.huu...@gmail.com Date: Thu Dec 5 08:33:13 2013 +0200 Elementary.object: Add few missing methods related to translatable text. --- efl/elementary/object.pxd | 3 +++ efl/elementary/object.pyx | 31 +++ 2 files changed, 34 insertions(+) diff --git a/efl/elementary/object.pxd b/efl/elementary/object.pxd index 508bad3..e5f5c1d 100644 --- a/efl/elementary/object.pxd +++ b/efl/elementary/object.pxd @@ -148,9 +148,12 @@ cdef extern from Elementary.h: void elm_object_domain_translatable_part_text_set(Evas_Object *obj, const_char *part, const_char *domain, const_char *text) void elm_object_domain_translatable_text_set(Evas_Object *obj, const_char *domain, const_char *text) voidelm_object_translatable_text_set(Evas_Object *obj, const_char *text) +voidelm_object_translatable_part_text_set(Evas_Object *obj, const_char *part, const_char *text) const_char * elm_object_translatable_part_text_get(const_Evas_Object *obj, const_char *part) const_char *elm_object_translatable_text_get(Evas_Object *obj) void elm_object_domain_part_text_translatable_set(Evas_Object *obj, const_char *part, const_char *domain, Eina_Bool translatable) +voidelm_object_part_text_translatable_set(Evas_Object *obj, const_char *part, Eina_Bool translatable) +void elm_object_domain_text_translatable_set(Evas_Object *obj, const_char *domain, Eina_Bool translatable) # Access (elm_access.h) #TODO: Evas_Object * elm_access_object_get(const_Evas_Object *obj) diff --git a/efl/elementary/object.pyx b/efl/elementary/object.pyx index 62cce55..a8f78b9 100644 --- a/efl/elementary/object.pyx +++ b/efl/elementary/object.pyx @@ -1518,6 +1518,18 @@ cdef class Object(evasObject): const_char *domain if domain is not None else NULL, const_char *text if text is not None else NULL) +def translatable_part_text_set(self, part, text): +translatable_part_text_set(part, text) + +A convenience function. + + +if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) +if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text) +elm_object_translatable_part_text_set(self.obj, +const_char *part if part is not None else NULL, +const_char *text if text is not None else NULL) + @DEPRECATED(1.8, Use :py:func:`translatable_part_text_get` instead.) def translatable_text_part_get(self, part): translatable_text_part_get(part) - unicode @@ -1579,6 +1591,25 @@ cdef class Object(evasObject): const_char *domain, translatable) +def part_text_translatable_set(self, part, bint translatable): +part_text_translatable_set(part, bool translatable) + +A convenience function. + + +if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) +elm_object_part_text_translatable_set(self.obj, +part, translatable) + +def domain_text_translatable_set(self, domain, bint translatable): +domain_text_translatable_set(domain, bool translatable) + +A convenience function. + + +if isinstance(domain, unicode): domain = PyUnicode_AsUTF8String(domain) +elm_object_domain_text_translatable_set(self.obj, domain, translatable) + property translatable_text: Translatable text for the main text part of the widget. def __get__(self): --
[EGIT] [bindings/python/python-efl] master 05/05: Elementary.slideshow: Correct the string representation functions.
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=3f647112425fb5ef4b58fc8048cfa672e671c378 commit 3f647112425fb5ef4b58fc8048cfa672e671c378 Author: Kai Huuhko kai.huu...@gmail.com Date: Thu Dec 5 08:47:40 2013 +0200 Elementary.slideshow: Correct the string representation functions. --- efl/elementary/slideshow.pyx | 38 +- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/efl/elementary/slideshow.pyx b/efl/elementary/slideshow.pyx index 55ba69c..51c0dfc 100644 --- a/efl/elementary/slideshow.pyx +++ b/efl/elementary/slideshow.pyx @@ -207,16 +207,10 @@ cdef class SlideshowItemClass (object): except AttributeError: pass -def __str__(self): -return (%s(get_func=%s, del_func=%s)) % \ - (self.__class__.__name__, -self._get_func, -self._del_func) - def __repr__(self): -return (%s(%#x, refcount=%d, Elm_Slideshow_Item_Class=%#x, -get_func=%s, del_func=%s)) % \ - (self.__class__.__name__, +return (%s(%#x, refcount=%d, Elm_Slideshow_Item_Class=%#x, +get_func=%s, del_func=%s)) % \ + (type(self).__name__, unsigned longvoid *self, PY_REFCOUNT(self), unsigned longself.obj, @@ -257,6 +251,16 @@ cdef class SlideshowItem(ObjectItem): self.args = args self.kwargs = kwargs +def __repr__(self): +return (%s(%#x, refcount=%d, Elm_Object_Item=%#x, +item_class=%s, item_data=%r)) % \ + (type(self).__name__, +unsigned longvoid*self, +PY_REFCOUNT(self), +unsigned longself.obj, +type(self.cls).__name__, +self.args) + def add_to(self, Slideshow slideshow not None): add_to(Slideshow slideshow) - SlideshowItem @@ -336,22 +340,6 @@ cdef class SlideshowItem(ObjectItem): else: Py_DECREF(self) -def __str__(self): -return %s(item_class=%s, item_data=%s) % \ - (type(self).__name__, -type(self.cls).__name__, -self.args) - -def __repr__(self): -return (%s(%#x, refcount=%d, Elm_Object_Item=%#x, -item_class=%s, item_data=%r)) % \ - (type(self).__name__, -unsigned longvoid*self, -PY_REFCOUNT(self), -unsigned longself.obj, -type(self.cls).__name__, -self.args) - property object: Get the real Evas object created to implement the view of a given slideshow item. --
[EGIT] [bindings/python/python-efl] master 01/05: Documentation: Fix invalid references and minor issues.
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=4e4b8e2fea7724f76924434d7a3543e820fe17c6
commit 4e4b8e2fea7724f76924434d7a3543e820fe17c6
Author: Kai Huuhko kai.huu...@gmail.com
Date: Thu Dec 5 08:29:55 2013 +0200
Documentation: Fix invalid references and minor issues.
---
doc/conf.py| 23 +++
efl/elementary/calendar_elm.pyx| 5 +++--
efl/elementary/ctxpopup.pyx| 2 +-
efl/elementary/diskselector.pyx| 6 ++---
efl/elementary/flipselector.pyx| 30 +
efl/elementary/general.pyx | 33 +---
efl/elementary/gengrid_item.pxi| 7 +++---
efl/elementary/gengrid_widget.pxi | 2 +-
efl/elementary/genlist_item.pxi| 8 +++
efl/elementary/genlist_widget.pxi | 4 ++--
efl/elementary/gesture_layer.pyx | 4 ++--
efl/elementary/hover.pyx | 2 +-
efl/elementary/hoversel.pyx| 4 ++--
efl/elementary/index.pyx | 22 ++-
efl/elementary/innerwindow.pyx | 7 +++---
efl/elementary/layout.pyx | 8 +++
efl/elementary/layout_class.pyx| 15 +++--
efl/elementary/list.pyx| 7 +++---
efl/elementary/map.pyx | 2 +-
efl/elementary/notify.pyx | 6 ++---
efl/elementary/object.pyx | 6 +++--
efl/elementary/plug.pyx| 8 +++
efl/elementary/popup.pyx | 4 ++--
efl/elementary/radio.pyx | 2 +-
efl/elementary/slideshow.pyx | 28 ++--
efl/elementary/table.pyx | 8 +++
efl/elementary/toolbar.pyx | 16 +++---
efl/elementary/web.pyx | 2 +-
efl/emotion/efl.emotion.pyx| 2 +-
efl/evas/efl.evas_canvas.pxi | 6 ++---
efl/evas/efl.evas_object.pxi | 27 +++
efl/evas/efl.evas_object_image.pxi | 40 ++
efl/evas/efl.evas_object_smart.pxi | 8 +++
efl/evas/efl.evas_object_textblock.pxi | 2 +-
34 files changed, 211 insertions(+), 145 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index 010aeb2..dc025fa 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -125,6 +125,29 @@ pygments_style = 'sphinx'
# Setting this True will show missing references as warnings.
#nitpicky = True
+# nitpick_ignore = [
+# ('py:obj', 'int'),
+# ('py:obj', 'float'),
+# ('py:obj', 'double'),
+# ('py:obj', 'callable'),
+# ('py:obj', 'function'),
+# ('py:obj', 'str'),
+# ('py:exc', 'RuntimeError'),
+# ('py:exc', 'RuntimeWarning'),
+# ('py:exc', 'ValueError'),
+# ('py:exc', 'TypeError'),
+# ('py:obj', 'Evas_Coord (int)'),
+# ('py:obj', 'string'),
+# ('py:obj', 'list'),
+# ('py:class', 'object'),
+# ('py:obj', 'unicode'),
+# ('py:obj', 'bool'),
+# ('py:obj', 'tuple of ints'),
+# ('py:class', 'efl.eo.Eo'),
+# ('py:attr', 'efl.eo.Eo.data'),
+# ('py:obj', 'datetime.date'),
+# ]
+
# -- Options for HTML output
---
# The theme to use for HTML and HTML Help pages. See the documentation for
diff --git a/efl/elementary/calendar_elm.pyx b/efl/elementary/calendar_elm.pyx
index 06d9f6a..fe03bd5 100644
--- a/efl/elementary/calendar_elm.pyx
+++ b/efl/elementary/calendar_elm.pyx
@@ -274,8 +274,9 @@ cdef class CalendarMark(object):
Delete a mark from the calendar.
-If deleting all calendar marks is required, ``del`` :py:attr:`marks`
-should be used instead of getting marks list and deleting each one.
+If deleting all calendar marks is required, ``del``
+:py:attr:`Calendar.marks` should be used instead of getting marks list
+and deleting each one.
.. seealso:: :py:meth:`Calendar.mark_add`
diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx
index 5acb2ad..647996b 100644
--- a/efl/elementary/ctxpopup.pyx
+++ b/efl/elementary/ctxpopup.pyx
@@ -122,7 +122,7 @@ cdef class CtxpopupItem(ObjectItem):
removed.
:param icon: Icon to be set on new item
-:type icon: :py:class:`evas.object.Object`
+:type icon: :py:class:`~efl.evas.Object`
:param label: The Label of the new item
:type label: string
:param func: Convenience function called when item selected
diff --git a/efl/elementary/diskselector.pyx b/efl/elementary/diskselector.pyx
index 511da11..e51a1bd 100644
--- a/efl/elementary/diskselector.pyx
+++ b/efl/elementary/diskselector.pyx
@@ -116,9 +116,9 @@ cdef class DiskselectorItem(ObjectItem):
disk.item_append(label, ic)
.. seealso::
-:py:func:`elementary.object_item.ObjectItem.delete()`
-:py:func:`clear()`
-:py:class:`elementary.image.Image`
+
[EGIT] [bindings/python/python-efl] master 02/05: Elementary.index: Deprecate broken item_find for now.
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=be6d0dfc55bf70a65ae4ced7070e65f13381fb49 commit be6d0dfc55bf70a65ae4ced7070e65f13381fb49 Author: Kai Huuhko kai.huu...@gmail.com Date: Thu Dec 5 08:31:51 2013 +0200 Elementary.index: Deprecate broken item_find for now. --- efl/elementary/index.pyx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/efl/elementary/index.pyx b/efl/elementary/index.pyx index 088cbb4..d43b0d9 100644 --- a/efl/elementary/index.pyx +++ b/efl/elementary/index.pyx @@ -71,6 +71,7 @@ from cpython cimport PyUnicode_AsUTF8String, Py_DECREF from efl.eo cimport _object_mapping_register from efl.utils.conversions cimport _ctouni +from efl.utils.deprecated cimport DEPRECATED from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass from object_item cimport _object_item_callback, _object_item_to_python, \ @@ -467,6 +468,7 @@ cdef class Index(LayoutClass): # return IndexItem(ELM_INDEX_ITEM_INSERT_SORTED, self, letter, # None, callback, *args, **kargs) +@DEPRECATED(1.8, Broken, don't use.) def item_find(self, data): item_find(data) - IndexItem --
[EGIT] [core/elementary] master 01/01: elm_spinner.c: fix mouse spin never stop issue with mouse wheel with spinner widget.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=25b72b51bc4b8b18134f14765836be622e52a27c
commit 25b72b51bc4b8b18134f14765836be622e52a27c
Author: Daniel Juyung Seo juyung@samsung.com
Date: Thu Dec 5 15:53:32 2013 +0900
elm_spinner.c: fix mouse spin never stop issue with mouse wheel with
spinner widget.
Do not use a timer when the wheel is used to spin the spinner.
This fixes T604.
Special thanks JP for reporting.
---
src/lib/elm_spinner.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index e7c881b..79b924b 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -297,7 +297,10 @@ _spin_value(void *data)
}
sd-interval = sd-interval / 1.05;
- ecore_timer_interval_set(sd-spin_timer, sd-interval);
+
+ // spin_timer does not exist when _spin_value() is called from wheel event
+ if (sd-spin_timer)
+ ecore_timer_interval_set(sd-spin_timer, sd-interval);
if (_value_set(data, sd-val + real_speed)) _label_write(data);
return ECORE_CALLBACK_RENEW;
@@ -428,13 +431,13 @@ _elm_spinner_smart_sizing_eval(Eo *obj, void *_pd
EINA_UNUSED, va_list *list EIN
static void
_elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
-
Evas_Object *src = va_arg(*list, Evas_Object *);
Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
void *event_info = va_arg(*list, void *);
Evas_Event_Key_Down *ev = event_info;
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Evas_Event_Mouse_Wheel *mev;
+ ELM_SPINNER_DATA_GET(obj, sd);
if (ret) *ret = EINA_FALSE;
(void) src;
@@ -495,16 +498,18 @@ _elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
else if (type == EVAS_CALLBACK_MOUSE_WHEEL)
{
mev = event_info;
+sd-interval = sd-first_interval;
if (mev-z 0)
{
- _val_inc_start(obj);
+ sd-spin_speed = sd-step;
elm_layout_signal_emit(obj, elm,right,anim,activate, elm);
}
else
{
- _val_dec_start(obj);
+ sd-spin_speed = -sd-step;
elm_layout_signal_emit(obj, elm,left,anim,activate, elm);
}
+_spin_value(obj);
}
return;
--
[EGIT] [core/efl] master 01/01: ximimmodule: remove useless code in preedit_string_get
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0eb5cfaa308fc4501838f9aeb58a92aa0ae476e8
commit 0eb5cfaa308fc4501838f9aeb58a92aa0ae476e8
Author: Jihoon Kim jihoon48@samsung.com
Date: Thu Dec 5 16:00:39 2013 +0900
ximimmodule: remove useless code in preedit_string_get
'cursor_pos' variable will be set in the below code, so 'cursor_pos = 0' is
useless.
---
src/modules/ecore_imf/xim/ecore_imf_xim.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c
b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index da33e3c..5cc763d 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -227,8 +227,6 @@ _ecore_imf_context_xim_preedit_string_get(Ecore_IMF_Context
*ctx,
{
if (str)
*str = NULL;
-if (cursor_pos)
- *cursor_pos = 0;
}
if (cursor_pos)
--
[EGIT] [core/efl] master 01/01: ximmodule: fix issue the cursor of preedit shows the in front of preedit string
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3dfc3dcd2c75cb09391d85b70889070b66644935
commit 3dfc3dcd2c75cb09391d85b70889070b66644935
Author: Jihoon Kim jihoon48@samsung.com
Date: Thu Dec 5 16:06:39 2013 +0900
ximmodule: fix issue the cursor of preedit shows the in front of preedit
string
Before fixing this issue, the cursor of preedit appears the in front of
preedit string.
The cursor of preedit string will appear in the proper position.
---
src/modules/ecore_imf/xim/ecore_imf_xim.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c
b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index 5cc763d..6b0374c 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -960,6 +960,8 @@ _ecore_imf_xim_preedit_draw_call(XIC xic EINA_UNUSED,
DBG(ctx=%p, imf_context_data=%p, ctx, imf_context_data);
EINA_SAFETY_ON_NULL_RETURN(imf_context_data);
+ imf_context_data-preedit_cursor = call_data-caret;
+
preedit_bufs = eina_ustrbuf_new();
if (imf_context_data-preedit_chars)
{
--
Re: [E-devel] pkgbuild
On Thu, 5 Dec 2013 09:21:26 +0400 Vasiliy Tolstov v.tols...@selfip.ru said: 2013/12/5 Carsten Haitzler ras...@rasterman.com: why? that makes no sense. it just complicates things. Why? Source code in master/devel branches. Spec in spec branch and updated only then needed, debian dir in debian branch... first - it's using a branch entirely for what branches are not intended for. it's being used to HIDE files. if pkg fiiles (spec, pkgbuild or otherwise) offend someone in existing... then they'll offend being in a branch too. it also requires the branch keep merging from master all the time which was entirely NOT the intent of being able to build pkgs right from git. it adds more steps to do anything to the branch and thus adds points of failure... ALL because someone doesn't like the look of a pkg file there. just ignore the files if they don't concern you (to anyone). they hurt no one and simply HELP in doing other things - like sharing packaging for certain package formats, providing as suggested packaging methods to packagers and saving time. hiding them in a branch still has them in the tree - it just adds more failures and overhead. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eina: this is actually a better way of improving Eina_Hash performance.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2e9f96cc24f99452bdaf2a4592ea881fe259b86a
commit 2e9f96cc24f99452bdaf2a4592ea881fe259b86a
Author: Cedric Bail cedric.b...@samsung.com
Date: Thu Dec 5 16:25:01 2013 +0900
eina: this is actually a better way of improving Eina_Hash performance.
This reduce the size of the rbtree part dedicated to the hash key match,
but reuse only bit that weren't matched by the bucket.
---
src/lib/eina/eina_hash.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 4b06064..716a1d8 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -64,7 +64,7 @@
#define EINA_HASH_BUCKET_SIZE 8
#define EINA_HASH_SMALL_BUCKET_SIZE 5
-#define EINA_HASH_RBTREE_MASK 0xFF
+#define EINA_HASH_RBTREE_MASK 0x
typedef struct _Eina_Hash_Head Eina_Hash_Head;
typedef struct _Eina_Hash_Element Eina_Hash_Element;
@@ -85,6 +85,8 @@ struct _Eina_Hash
int population;
+ int buckets_power_size;
+
EINA_MAGIC
};
@@ -221,6 +223,7 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
/* Apply eina mask to hash. */
hash_num = key_hash hash-mask;
+ key_hash = hash-buckets_power_size;
key_hash = EINA_HASH_RBTREE_MASK;
if (!hash-buckets)
@@ -321,7 +324,8 @@ _eina_hash_find_by_hash(const Eina_Hash *hash,
Eina_Hash_Head **hash_head)
{
Eina_Hash_Element *hash_element;
- int rb_hash = key_hash EINA_HASH_RBTREE_MASK;
+ int rb_hash = (key_hash hash-buckets_power_size)
+ EINA_HASH_RBTREE_MASK;
key_hash = hash-mask;
@@ -735,6 +739,7 @@ eina_hash_new(Eina_Key_Length key_length_cb,
new-size = 1 buckets_power_size;
new-mask = new-size - 1;
+ new-buckets_power_size = buckets_power_size;
return new;
--
Re: [E-devel] pkgbuild
Hello. On Thu, 2013-12-05 at 11:30, Simon wrote: On 12/05/2013 10:22 AM, Carsten Haitzler (The Rasterman) wrote: On Wed, 4 Dec 2013 12:43:31 -0500 Michael Blumenkrantz michael.blumenkra...@gmail.com said: this seems to have snuck in to all the repos while I was away, and I strongly disagree with the premise based on previous decisions. if people remember, we previously removed debian/ directories from our distribution directories for being too distro-specific. isn't adding the arch-only pkgbuild stuff the exact same thing? I think if we're going to keep these, then it makes sense to allow ALL packaging-related files, and not just cater to whatever distro is hot at the time. there's a big difference. debian has a POLICY of you are not allowed to have debian build stuff in a source tree. they continually complain that we had such stuff. we have had .spec files for much longer than even debian build stuff. there's enlightenment.spec right there. you've never complained. so leave it there. the removal of debian stuff is due to debian policies. The .spec files should probably be removed based off the fact as far as i know no one has been maintaining them, i don't think any of the major rpm based distro's are using them, we also all use them sightly differently. If someone is going to use them and keep them updated then keep them otherwise they should probably go. I think this is the key point everybody looks away from. Non of the package maintainers use these things its only some dev that at some point thought it would be cool to have package for his current distro. As Simon just pointed he is not using the spec files for openSuSe. I bet Fedora is not using them either. The same would go for raster arch files. The key is distros are not using them only some devs here are. Its easy to see why they are not doing it, too. Packagers have access to distro infrastructure and not to the upstream project. They might be able to get commit access but not all projects are as easy with it as we are. You have a distro specific addition to an upstream package thus you are doing the work in the distro. Totally makes sense to me. My personal problem with packaging files in our repos are twofold a) it gives the impression they are the official files from the distro which they are not and b) they bitrot easily because only very few people use them. regards Stefan Schmidt -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] elementary-1.8 02/05: gengrid: refactoring of commit 7187a3124fc6c169fcfec2c249a1fd483481fbba.
seoz pushed a commit to branch elementary-1.8.
http://git.enlightenment.org/core/elementary.git/commit/?id=d67f5ee94175fa1c12beecb3555bc03d0afb05fd
commit d67f5ee94175fa1c12beecb3555bc03d0afb05fd
Author: Daniel Juyung Seo juyung@samsung.com
Date: Mon Dec 2 20:32:14 2013 +0900
gengrid: refactoring of commit 7187a3124fc6c169fcfec2c249a1fd483481fbba.
- follow the convention for structure name
- removed unnecessary callback
- removed wrong api usage
- removed unnecessary variables
- removed unnecessary parameter passing
- fixed ugly ui
- added 'static' to local function
- changed frame description more descriptive
- fixed formatting
Conflicts:
src/bin/test_gengrid.c
---
src/bin/test_gengrid.c | 148 +
src/lib/elm_gengrid.c | 4 +-
2 files changed, 78 insertions(+), 74 deletions(-)
diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index b9dbe8c..f92fdcb 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -36,12 +36,12 @@ struct _api_data
};
typedef struct _api_data api_data;
-struct _show_data
+struct _Show_Data
{
int winmode;
int scrollto;
};
-typedef struct _show_data show_data;
+typedef struct _Show_Data Show_Data;
enum _api_state
{
@@ -1001,15 +1001,15 @@ test_gengrid_item_styles(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
static void
_rd1_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
- show_data *s_data = data;
- s_data-winmode = elm_radio_state_value_get(obj);
+ Show_Data *sd = data;
+ sd-winmode = elm_radio_state_value_get(obj);
}
static void
_rd2_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
- show_data *s_data = data;
- s_data-scrollto = elm_radio_state_value_get(obj);
+ Show_Data *sd = data;
+ sd-scrollto = elm_radio_state_value_get(obj);
}
static void
@@ -1022,9 +1022,9 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj
__UNUSED__, void *event_info _
if(!data) return;
- show_data *s_data = data;
+ Show_Data *sd = data;
- if (s_data-winmode == 0)
+ if (sd-winmode == 0)
win = elm_win_util_standard_add(horz bring_in, Horz Bring_in);
else
win = elm_win_util_standard_add(vertical bring_in, Vertical Bring_in);
@@ -1033,11 +1033,12 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj
__UNUSED__, void *event_info _
grid = elm_gengrid_add(win);
elm_gengrid_item_size_set(grid, 150, 150);
elm_gengrid_group_item_size_set(grid, 31, 31);
- if (s_data-winmode == 0)
+ if (sd-winmode == 0)
elm_gengrid_horizontal_set(grid, EINA_TRUE);
- else if (s_data-winmode == 1)
+ else if (sd-winmode == 1)
elm_gengrid_horizontal_set(grid, EINA_FALSE);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, grid);
elm_gengrid_align_set(grid, 0.1, 0.1);
gic = elm_gengrid_item_class_new();
@@ -1060,12 +1061,12 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj
__UNUSED__, void *event_info _
}
elm_gengrid_item_class_free(gic);
- elm_gengrid_item_bring_in(ti[1430].item, s_data-scrollto);
+ elm_gengrid_item_bring_in(ti[1430].item, sd-scrollto);
evas_object_show(grid);
- elm_win_resize_object_add(win, grid);
- if (s_data-winmode == 0)
+
+ if (sd-winmode == 0)
evas_object_resize(win, 600, 200);
- if (s_data-winmode == 1)
+ if (sd-winmode == 1)
evas_object_resize(win, 600, 400);
evas_object_show(win);
}
@@ -1077,25 +1078,27 @@ _show_clicked_cb(void *data, Evas_Object *obj
__UNUSED__, void *event_info __UNU
static Item_Data ti[1];
int i, n;
char buf[PATH_MAX];
+ double scale = elm_config_scale_get();
+
+ if (!data) return;
- if(!data) return;
-
- show_data *s_data = data;
+ Show_Data *sd = data;
- if (s_data-winmode == 0)
+ if (sd-winmode == 0)
win = elm_win_util_standard_add(horz show, Horz Show);
else
win = elm_win_util_standard_add(vertical show, Vertical Show);
elm_win_autodel_set(win, EINA_TRUE);
grid = elm_gengrid_add(win);
- elm_gengrid_item_size_set(grid, 150, 150);
- elm_gengrid_group_item_size_set(grid, 31, 31);
- if (s_data-winmode == 0)
+ elm_gengrid_item_size_set(grid, 150 * scale, 150 * scale);
+ elm_gengrid_group_item_size_set(grid, 31 * scale, 31 * scale);
+ if (sd-winmode == 0)
elm_gengrid_horizontal_set(grid, EINA_TRUE);
- else if (s_data-winmode == 1)
+ else if (sd-winmode == 1)
elm_gengrid_horizontal_set(grid, EINA_FALSE);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, grid);
elm_gengrid_align_set(grid, 0.1, 0.1);
gic = elm_gengrid_item_class_new();
@@ -1119,25 +1122,25 @@ _show_clicked_cb(void *data, Evas_Object *obj
__UNUSED__, void *event_info __UNU
[EGIT] [core/elementary] elementary-1.8 01/05: [Gengrid] Enable Scroll To Type when item bring in or show region.
seoz pushed a commit to branch elementary-1.8.
http://git.enlightenment.org/core/elementary.git/commit/?id=6ad064cfe2b20f3ca7e8333d73c836a4024e
commit 6ad064cfe2b20f3ca7e8333d73c836a4024e
Author: Sanghyeon Lee sh10233@samsung.com
Date: Mon Dec 2 15:52:35 2013 +0900
[Gengrid] Enable Scroll To Type when item bring in or show region.
Scrollto positions are divided 4 type
NONE : do not scrollto.
TOP : scrollto position is always top viewport.
MIDDLE : scrollto position is always middle of viewport.
IN : scrollto position to fully visible in viewport.
---
src/bin/test_gengrid.c | 345 ---
src/lib/elm_gengrid.c| 42 --
src/lib/elm_widget_gengrid.h | 1 +
3 files changed, 221 insertions(+), 167 deletions(-)
diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index cfe0e78..b9dbe8c 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -36,6 +36,13 @@ struct _api_data
};
typedef struct _api_data api_data;
+struct _show_data
+{
+ int winmode;
+ int scrollto;
+};
+typedef struct _show_data show_data;
+
enum _api_state
{
GRID_ALIGN_SET,
@@ -992,211 +999,238 @@ test_gengrid_item_styles(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
}
static void
-_bring_in2_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
+_rd1_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
- Evas_Object *win, *grid;
- static Item_Data id[5000];
- int i, n;
- char buf[PATH_MAX];
-
- win = elm_win_util_standard_add(horz bring_in, Horz Bring_in);
- elm_win_autodel_set(win, EINA_TRUE);
- evas_object_resize(win, 600, 200);
- evas_object_show(win);
-
- grid = elm_gengrid_add(win);
- evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, grid);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
- elm_gengrid_group_item_size_set(grid,
- elm_config_scale_get() * 31,
- elm_config_scale_get() * 31);
- elm_gengrid_horizontal_set(grid, EINA_TRUE);
- elm_gengrid_align_set(grid, 0.4, 0.8);
-
- gic = elm_gengrid_item_class_new();
- gic-item_style = default;
- gic-func.text_get = grid_text_get;
- gic-func.content_get = grid_content_get;
- gic-func.state_get = grid_state_get;
- gic-func.del = NULL;
-
- n = 0;
- for (i = 0; i 5000; i++)
- {
-snprintf(buf, sizeof(buf), %s/images/%s, elm_app_data_dir_get(),
img[n]);
-n = (n + 1) % 9;
-id[i].mode = i;
-id[i].path = eina_stringshare_add(buf);
-id[i].item = elm_gengrid_item_append(grid, gic, (id[i]), grid_sel,
NULL);
-if (i == 2400)
- elm_gengrid_item_selected_set(id[i].item, EINA_TRUE);
- }
+ show_data *s_data = data;
+ s_data-winmode = elm_radio_state_value_get(obj);
+}
- elm_gengrid_item_class_free(gic);
- evas_object_show(grid);
- elm_gengrid_item_bring_in(id[2400].item, ELM_GENGRID_ITEM_SCROLLTO_IN);
+static void
+_rd2_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+ show_data *s_data = data;
+ s_data-scrollto = elm_radio_state_value_get(obj);
}
static void
-_bring_in1_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
+_bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info
__UNUSED__)
{
Evas_Object *win, *grid;
- static Item_Data id[5000];
+ static Item_Data ti[5000];
int i, n;
char buf[PATH_MAX];
-
- win = elm_win_util_standard_add(vertical bring_in, Vertical Bring_in);
+
+ if(!data) return;
+
+ show_data *s_data = data;
+
+ if (s_data-winmode == 0)
+ win = elm_win_util_standard_add(horz bring_in, Horz Bring_in);
+ else
+ win = elm_win_util_standard_add(vertical bring_in, Vertical Bring_in);
elm_win_autodel_set(win, EINA_TRUE);
- evas_object_resize(win, 600, 400);
- evas_object_show(win);
-
+
grid = elm_gengrid_add(win);
+ elm_gengrid_item_size_set(grid, 150, 150);
+ elm_gengrid_group_item_size_set(grid, 31, 31);
+ if (s_data-winmode == 0)
+ elm_gengrid_horizontal_set(grid, EINA_TRUE);
+ else if (s_data-winmode == 1)
+ elm_gengrid_horizontal_set(grid, EINA_FALSE);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, grid);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
- elm_gengrid_group_item_size_set(grid,
- elm_config_scale_get() * 31,
- elm_config_scale_get() * 31);
- elm_gengrid_align_set(grid, 0.1, 1.0);
-
+
[EGIT] [core/elementary] elementary-1.8 03/05: elm_interface_scrollable.c: reset momentum_animator to null when return cancel from the animator.
seoz pushed a commit to branch elementary-1.8.
http://git.enlightenment.org/core/elementary.git/commit/?id=ba1381c427275cb6cee97ec9d2e7e5a829f4ffa9
commit ba1381c427275cb6cee97ec9d2e7e5a829f4ffa9
Author: Daniel Juyung Seo juyung@samsung.com
Date: Tue Dec 3 21:40:09 2013 +0900
elm_interface_scrollable.c: reset momentum_animator to null when return
cancel from the animator.
---
src/lib/elm_interface_scrollable.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 6252556..8667347 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -2023,7 +2023,11 @@ _elm_scroll_momentum_animator(void *data)
Evas_Coord x, y, dx, dy, px, py, maxx, maxy, minx, miny;
Eina_Bool no_bounce_x_end = EINA_FALSE, no_bounce_y_end = EINA_FALSE;
- if (!sid-pan_obj) return ECORE_CALLBACK_CANCEL;
+ if (!sid-pan_obj)
+ {
+sid-down.momentum_animator = NULL;
+return ECORE_CALLBACK_CANCEL;
+ }
t = ecore_loop_time_get();
dt = t - sid-down.anim_start;
--
[EGIT] [core/elementary] elementary-1.8 05/05: elementary/elm_button.c : Change the timing of signal_emitting.
seoz pushed a commit to branch elementary-1.8. http://git.enlightenment.org/core/elementary.git/commit/?id=a69abd4d9279d4c2c7e4d2dc44faba38db09e10d commit a69abd4d9279d4c2c7e4d2dc44faba38db09e10d Author: WooHyun Jung wh0705.j...@samsung.com Date: Thu Dec 5 10:01:43 2013 +0900 elementary/elm_button.c : Change the timing of signal_emitting. Application can delete button itsefl(or its parent) inside the smart callback function. So the signal_emitting with button object should be done in advance. --- src/lib/elm_button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index e1f3da8..42f337f 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -184,8 +184,8 @@ _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) (strcmp(ev-key, space))) return; - _activate(obj); elm_layout_signal_emit(obj, elm,anim,activate, elm); + _activate(obj); ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; --
[EGIT] [core/elementary] elementary-1.8 04/05: elm_interface_scrollable.c: fix scroller page flick calculation roundup routine.
seoz pushed a commit to branch elementary-1.8. http://git.enlightenment.org/core/elementary.git/commit/?id=f87ad6c9b81402b02563b93e7fe78d621419ed3f commit f87ad6c9b81402b02563b93e7fe78d621419ed3f Author: Daniel Juyung Seo juyung@samsung.com Date: Tue Dec 3 23:49:30 2013 +0900 elm_interface_scrollable.c: fix scroller page flick calculation roundup routine. When the offset is not bigger than 0 abs(offset) is not smaller than dx(or dy), round up routine could have mis-calculation bug. It should substract one value more to get a proper round up result. For example, when x = 1440, offset = -2160, dx = 360, x should become 720 but round up routine made it 1440. Because it was rounded up from 1080 to 1440. It should be rounded down from 1079 to 720. Special thanks to Hosang Kim for the help. Signed-off-by: Daniel Juyung Seo juyung@samsung.com Signed-off-by: Hosang Kim hosang12@samsung.com --- src/lib/elm_interface_scrollable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c index 8667347..9d31eb4 100644 --- a/src/lib/elm_interface_scrollable.c +++ b/src/lib/elm_interface_scrollable.c @@ -2127,7 +2127,7 @@ _elm_scroll_page_x_get(Elm_Scrollable_Smart_Interface_Data *sid, if (offset 0) x += (abs(offset) dx ? offset : dx); else - x += (abs(offset) dx ? offset : -dx); + x += (abs(offset) dx ? offset : -(dx + 1)); } if (sid-pagesize_h 0) @@ -2167,7 +2167,7 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid, if (offset 0) y += (abs(offset) dy ? offset : dy); else - y += (abs(offset) dy ? offset : -dy); + y += (abs(offset) dy ? offset : -(dy + 1)); } if (sid-pagesize_v 0) --
Re: [E-devel] Upcoming 1.8.x releases on Friday
Hello. On Wed, 2013-12-04 at 10:32, Doug Newgard wrote: How about along with 11, bump micro version in configure.ac in master to 99? Still doing this going forward? I don't get what you mean with along with 11! but bumping master to 1.8.99 in preparation for 1.9 sounds like something we just forgot. Thanks for reminding us. regards Stefan Schmidt -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Upcoming 1.8.x releases on Friday
Hello. [Now CC'ed to enlightenment-release] On Wed, 2013-12-04 at 14:44, Stefan Schmidt wrote: It seems all 1.8 branches have accumulated enough fixes already to allow for a 1.8.x release on Friday. If you have backported your _tested_ important fixes to the stable branch consider yourself a good person. If know anything else that needs backporting please do so by Thursday evening. I don't want last minutes commits just a second before the release. This needs to be adapted slightly. As Mike pointed out we have a policy for having the tarballs around for 24h to allow testing before doing the final announce. This is a really good thing so I plan to stick with it. Adaption to my current plan would be that I prepare the tarballs and everythign on Friday evening European time and allow for testing until Sunday (I'm off Saturday) and if the tarball have been fine do the announcement on Sunday. regards Stefan Schmidt -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Upcoming 1.8.x releases on Friday
On Thu, 2013-12-05 at 08:53, Stefan Schmidt wrote: Hello. [Now CC'ed to enlightenment-release] Everybody could see that this was a lie but is true now... On Wed, 2013-12-04 at 14:44, Stefan Schmidt wrote: It seems all 1.8 branches have accumulated enough fixes already to allow for a 1.8.x release on Friday. If you have backported your _tested_ important fixes to the stable branch consider yourself a good person. If know anything else that needs backporting please do so by Thursday evening. I don't want last minutes commits just a second before the release. This needs to be adapted slightly. As Mike pointed out we have a policy for having the tarballs around for 24h to allow testing before doing the final announce. This is a really good thing so I plan to stick with it. Adaption to my current plan would be that I prepare the tarballs and everythign on Friday evening European time and allow for testing until Sunday (I'm off Saturday) and if the tarball have been fine do the announcement on Sunday. regards Stefan Schmidt -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
