[EGIT] [apps/terminology] master 01/01: Revert "do not crash when the scrollback mempool is OOM"
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=15b55d5eb7a9fd3862fda3713dfb0ddc538964e2
commit 15b55d5eb7a9fd3862fda3713dfb0ddc538964e2
Author: Carsten Haitzler (Rasterman)
Date: Wed Sep 10 16:57:32 2014 +0900
Revert "do not crash when the scrollback mempool is OOM"
This reverts commit 815a357ad9a13772a8dcaaf0f8a26c358f559359.
this patch breaks paging and backscroll completely. just try less or
more - eg
man ls
then resize the window. :)
---
src/bin/termpty.c| 57 +---
src/bin/termptyops.c | 2 --
2 files changed, 14 insertions(+), 45 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index c16f6f9..186cde8 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -613,7 +613,7 @@ termpty_line_length(const Termcell *cells, ssize_t nb_cells)
}
static int
-termpty_line_find_top(Termpty *ty, int y_end, int *top)
+termpty_line_find_top(Termpty *ty, int y_end)
{
int y_start = y_end;
Termsave *ts;
@@ -623,34 +623,25 @@ termpty_line_find_top(Termpty *ty, int y_end, int *top)
if (TERMPTY_SCREEN(ty, ty->w - 1, y_start - 1).att.autowrapped)
y_start--;
else
- {
- *top = y_start;
- return 0;
- }
+ return y_start;
}
while (-y_start < ty->backscroll_num)
{
ts = termpty_save_extract(ty->back[(y_start + ty->backpos - 1 +
ty->backmax) % ty->backmax]);
-if (!ts)
- return -1;
ty->back[(y_start + ty->backpos - 1 + ty->backmax) % ty->backmax] = ts;
if (ts->cell[ts->w - 1].att.autowrapped)
y_start--;
else
- {
- *top = y_start;
- return 0;
- }
+ return y_start;
}
- *top = y_start;
- return 0;
+ return y_start;
}
static int
termpty_line_rewrap(Termpty *ty, int y_start, int y_end,
Termcell *screen2, Termsave **back2,
-int w2, int y2_end, int *new_y_start)
+int w2, int y2_end)
{
int x, x2, y, y2, y2_start;
int len, len_last, len_remaining, copy_width, ts2_width;
@@ -665,8 +656,6 @@ termpty_line_rewrap(Termpty *ty, int y_start, int y_end,
{
ts = termpty_save_extract(ty->back[(y_end + ty->backpos +
ty->backmax) % ty->backmax]);
-if (!ts)
- return -1;
ty->back[(y_end + ty->backpos + ty->backmax) % ty->backmax] = ts;
len_last = ts->w;
}
@@ -679,11 +668,7 @@ termpty_line_rewrap(Termpty *ty, int y_start, int y_end,
else
{
if (y2_start < 0)
- {
- back2[y2_start + ty->backmax] = termpty_save_new(0);
- if (!back2[y2_start + ty->backmax])
- return -1;
- }
+ back2[y2_start + ty->backmax] = termpty_save_new(0);
return y2_start;
}
if (-y2_start > ty->backmax)
@@ -711,8 +696,6 @@ termpty_line_rewrap(Termpty *ty, int y_start, int y_end,
{
ts = termpty_save_extract(ty->back[(y + ty->backpos +
ty->backmax) % ty->backmax]);
- if (!ts)
- return -1;
ty->back[(y + ty->backpos + ty->backmax) % ty->backmax] = ts;
line = ts->cell;
}
@@ -734,8 +717,6 @@ termpty_line_rewrap(Termpty *ty, int y_start, int y_end,
{
ts2_width = MIN(len_remaining, w2);
ts2 = termpty_save_new(ts2_width);
- if (!ts2)
- return -1;
line2 = ts2->cell;
back2[y2 + ty->backmax] = ts2;
}
@@ -757,16 +738,15 @@ termpty_line_rewrap(Termpty *ty, int y_start, int y_end,
x = 0;
y++;
}
- *new_y_start = y2_start;
- return 0;
+ return y2_start;
}
void
termpty_resize(Termpty *ty, int new_w, int new_h)
{
- Termcell *new_screen = NULL;
- Termsave **new_back = NULL;
+ Termcell *new_screen;
+ Termsave **new_back;
int y_start, y_end, new_y_start = 0, new_y_end;
int i, altbuf = 0;
@@ -793,7 +773,8 @@ termpty_resize(Termpty *ty, int new_w, int new_h)
if (!ty->screen2)
{
ERR("memerr");
-goto bad;
+free(new_screen);
+return;
}
new_back = calloc(sizeof(Termsave *), ty->backmax);
@@ -801,14 +782,9 @@ termpty_resize(Termpty *ty, int new_w, int new_h)
new_y_end = new_h - 1;
while ((y_end >= -ty->backscroll_num) && (new_y_end >= -ty->backmax))
{
-if (termpty_line_find_top(ty, y_end, &y_start) < 0)
- goto bad;
-if (termpty_line_rewrap(ty, y_start, y_end, new_screen,
-new_back, new_w, new_y_end,
Re: [E-devel] [EGIT] [apps/rage] master 01/01: dnd: Recurse into directories
Maybe we should deprecate the ecore_file_*() functions which are
replaced by eina_file_*() functions? ecore_file_ls f.ex.
Sebastian
On 09/09/2014 10:17 PM, Eduardo Lima (Etrunko) wrote:
> etrunko pushed a commit to branch master.
>
> http://git.enlightenment.org/apps/rage.git/commit/?id=7c80b9a131b729bd244b40c194dc36bf24dde661
>
> commit 7c80b9a131b729bd244b40c194dc36bf24dde661
> Author: Eduardo Lima (Etrunko)
> Date: Mon Aug 25 15:36:44 2014 -0300
>
> dnd: Recurse into directories
>
> Signed-off-by: Eduardo Lima (Etrunko)
> ---
> AUTHORS | 1 +
> src/bin/dnd.c | 66
> +--
> 2 files changed, 61 insertions(+), 6 deletions(-)
>
> diff --git a/AUTHORS b/AUTHORS
> index b9a9404..230cb46 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -1 +1,2 @@
> Carsten Haitzler
> +Eduardo Lima (Etrunko)
> diff --git a/src/bin/dnd.c b/src/bin/dnd.c
> index f8faba4..1a8b9d2 100644
> --- a/src/bin/dnd.c
> +++ b/src/bin/dnd.c
> @@ -60,6 +60,39 @@ _escape_parse(const char *str)
> return dest;
> }
>
> +static Eina_Bool
> +_recurse_dir(Evas_Object *win, const char *path)
> +{
> + Eina_Bool ret = EINA_FALSE;
> + Eina_List *ls, *l;
> + char *p, *escape;
> + const char *full;
> +
> + ls = ecore_file_ls(path);
> + EINA_LIST_FOREACH(ls, l, p)
> + {
> +escape = _escape_parse(p);
> +full = eina_stringshare_printf("%s/%s", path, escape);
> +free(escape);
> +if (ecore_file_is_dir(full))
> + {
> + ret = _recurse_dir(win, full);
> + eina_stringshare_del(full);
> + continue;
> + }
> +
> +printf("inserting '%s'\n", full);
> +win_video_insert(win, full);
> +eina_stringshare_del(full);
> +ret = EINA_TRUE;
> + }
> +
> + EINA_LIST_FREE(ls, p)
> + free(p);
> +
> + return ret;
> +}
> +
> Eina_Bool
> _cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data *ev)
> {
> @@ -94,8 +127,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
> Elm_Selection_Data *ev)
> tt = _escape_parse(tb);
> if (tt)
> {
> - win_video_insert(win, tt);
> - inserted = EINA_TRUE;
> + if (ecore_file_is_dir(tt))
> + {
> + inserted = _recurse_dir(win, tt);
> + }
> + else
> + {
> + win_video_insert(win, tt);
> + inserted = EINA_TRUE;
> + }
>free(tt);
> }
>}
> @@ -108,8 +148,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
> Elm_Selection_Data *ev)
> tt = _escape_parse(tb);
> if (tt)
> {
> - win_video_insert(win, tt);
> - inserted = EINA_TRUE;
> + if (ecore_file_is_dir(tt))
> + {
> + inserted = _recurse_dir(win, tt);
> + }
> + else
> + {
> + win_video_insert(win, tt);
> + inserted = EINA_TRUE;
> + }
>free(tt);
> }
>}
> @@ -124,8 +171,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
> Elm_Selection_Data *ev)
> char *tt = _escape_parse(ev->data);
> if (tt)
> {
> - win_video_insert(win, tt);
> - inserted = EINA_TRUE;
> + if (ecore_file_is_dir(tt))
> + {
> + inserted = _recurse_dir(win, tt);
> + }
> + else
> + {
> + win_video_insert(win, tt);
> + inserted = EINA_TRUE;
> + }
>free(tt);
> }
>}
>
--
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [apps/rage] master 01/01: dnd: Recurse into directories
On Wed, Sep 10, 2014 at 10:13 AM, Sebastian Dransfeld
wrote:
> Maybe we should deprecate the ecore_file_*() functions which are
> replaced by eina_file_*() functions? ecore_file_ls f.ex.
Yes and depending on the use case, eio. Usually eina file operation do
consume less memory and do more efficient syscall.
Cedric
> On 09/09/2014 10:17 PM, Eduardo Lima (Etrunko) wrote:
>> etrunko pushed a commit to branch master.
>>
>> http://git.enlightenment.org/apps/rage.git/commit/?id=7c80b9a131b729bd244b40c194dc36bf24dde661
>>
>> commit 7c80b9a131b729bd244b40c194dc36bf24dde661
>> Author: Eduardo Lima (Etrunko)
>> Date: Mon Aug 25 15:36:44 2014 -0300
>>
>> dnd: Recurse into directories
>>
>> Signed-off-by: Eduardo Lima (Etrunko)
>> ---
>> AUTHORS | 1 +
>> src/bin/dnd.c | 66
>> +--
>> 2 files changed, 61 insertions(+), 6 deletions(-)
>>
>> diff --git a/AUTHORS b/AUTHORS
>> index b9a9404..230cb46 100644
>> --- a/AUTHORS
>> +++ b/AUTHORS
>> @@ -1 +1,2 @@
>> Carsten Haitzler
>> +Eduardo Lima (Etrunko)
>> diff --git a/src/bin/dnd.c b/src/bin/dnd.c
>> index f8faba4..1a8b9d2 100644
>> --- a/src/bin/dnd.c
>> +++ b/src/bin/dnd.c
>> @@ -60,6 +60,39 @@ _escape_parse(const char *str)
>> return dest;
>> }
>>
>> +static Eina_Bool
>> +_recurse_dir(Evas_Object *win, const char *path)
>> +{
>> + Eina_Bool ret = EINA_FALSE;
>> + Eina_List *ls, *l;
>> + char *p, *escape;
>> + const char *full;
>> +
>> + ls = ecore_file_ls(path);
>> + EINA_LIST_FOREACH(ls, l, p)
>> + {
>> +escape = _escape_parse(p);
>> +full = eina_stringshare_printf("%s/%s", path, escape);
>> +free(escape);
>> +if (ecore_file_is_dir(full))
>> + {
>> + ret = _recurse_dir(win, full);
>> + eina_stringshare_del(full);
>> + continue;
>> + }
>> +
>> +printf("inserting '%s'\n", full);
>> +win_video_insert(win, full);
>> +eina_stringshare_del(full);
>> +ret = EINA_TRUE;
>> + }
>> +
>> + EINA_LIST_FREE(ls, p)
>> + free(p);
>> +
>> + return ret;
>> +}
>> +
>> Eina_Bool
>> _cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data *ev)
>> {
>> @@ -94,8 +127,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
>> Elm_Selection_Data *ev)
>> tt = _escape_parse(tb);
>> if (tt)
>> {
>> - win_video_insert(win, tt);
>> - inserted = EINA_TRUE;
>> + if (ecore_file_is_dir(tt))
>> + {
>> + inserted = _recurse_dir(win, tt);
>> + }
>> + else
>> + {
>> + win_video_insert(win, tt);
>> + inserted = EINA_TRUE;
>> + }
>>free(tt);
>> }
>>}
>> @@ -108,8 +148,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
>> Elm_Selection_Data *ev)
>> tt = _escape_parse(tb);
>> if (tt)
>> {
>> - win_video_insert(win, tt);
>> - inserted = EINA_TRUE;
>> + if (ecore_file_is_dir(tt))
>> + {
>> + inserted = _recurse_dir(win, tt);
>> + }
>> + else
>> + {
>> + win_video_insert(win, tt);
>> + inserted = EINA_TRUE;
>> + }
>>free(tt);
>> }
>>}
>> @@ -124,8 +171,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
>> Elm_Selection_Data *ev)
>> char *tt = _escape_parse(ev->data);
>> if (tt)
>> {
>> - win_video_insert(win, tt);
>> - inserted = EINA_TRUE;
>> + if (ecore_file_is_dir(tt))
>> + {
>> + inserted = _recurse_dir(win, tt);
>> + }
>> + else
>> + {
>> + win_video_insert(win, tt);
>> + inserted = EINA_TRUE;
>> + }
>>free(tt);
>> }
>>}
>>
>
>
> --
> Want excitement?
> Manually upgrade your production database.
> When you want reliability, choose Perforce
> Perf
[EGIT] [core/efl] efl-1.11 01/01: release: Update NEWS and bump version for 1.11.2 release
stefan pushed a commit to branch efl-1.11. http://git.enlightenment.org/core/efl.git/commit/?id=f317298fc2d0fbb4c156a7d1b7caebc8d4aecb23 commit f317298fc2d0fbb4c156a7d1b7caebc8d4aecb23 Author: Stefan Schmidt Date: Wed Sep 10 11:14:23 2014 +0200 release: Update NEWS and bump version for 1.11.2 release --- NEWS | 15 ++- configure.ac | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cb654e0..ecd89bc 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,20 @@ == -EFL 1.11.1 +EFL 1.11.2 == +Changes since 1.11.1: +- + +Fixes: + + * shutup ecore-x vsync stupid log domain failures + * emotion - fix calling pos update cb for gst1 module in frame new + * emotion - audio volume - leave as-is on file open/init + * edje_cc now throws an error during link combination when the current part has no name + * evas: fix build on armv7l. (T1620) + * edje embryo stop_program() should stop pending actions + * evas: let's freeze the canvas, shall we ? + Changes since 1.11.0: - diff --git a/configure.ac b/configure.ac index 1f7b96b..b616f8b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [11], [1], [release]) +EFL_VERSION([1], [11], [2], [release]) AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.60]) --
[EGIT] [core/elementary] elementary-1.11 01/01: release: Update NEWS and bump version for 1.11.2 release
stefan pushed a commit to branch elementary-1.11. http://git.enlightenment.org/core/elementary.git/commit/?id=597d4fdddc1aa32bdfb9d47923a7a76618dbfe9a commit 597d4fdddc1aa32bdfb9d47923a7a76618dbfe9a Author: Stefan Schmidt Date: Wed Sep 10 11:37:07 2014 +0200 release: Update NEWS and bump version for 1.11.2 release --- NEWS | 11 ++- configure.ac | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5291cbe..3a0a783 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,16 @@ = -Elementary 1.11.1 +Elementary 1.11.2 = +Changes since 1.11.1: +- + +Fixes: + + * label: Fix size calculation for wrapped label + * elm examples - missing -lm link - fix + * elm_map: the widget use efreet cache home to save image files to, so efreet should be initialized. + Changes since 1.10.0: - diff --git a/configure.ac b/configure.ac index c803013..0951456 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [11], [1], [release]) +EFL_VERSION([1], [11], [2], [release]) AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ(2.60) --
[EGIT] [core/evas_generic_loaders] evas_generic_loaders-1.11 01/01: release: Update NEWS and bump version for 1.11.2 release
stefan pushed a commit to branch evas_generic_loaders-1.11. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=00bcf16ef4f8acb63a683d0c7fbee3e7d41cfafe commit 00bcf16ef4f8acb63a683d0c7fbee3e7d41cfafe Author: Stefan Schmidt Date: Wed Sep 10 11:54:13 2014 +0200 release: Update NEWS and bump version for 1.11.2 release --- NEWS | 9 - configure.ac | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a46f4c1..aae3bfd 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,11 @@ -Evas Generic Loaders 1.11.0 +Evas Generic Loaders 1.11.2 + +Changes since 1.11.0: +- + +Fixes: + + * Improve LibreOffice binary detection Changes since Evas Generic Loaders 1.10.0: -- diff --git a/configure.ac b/configure.ac index cd0257c..9c0b494 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [11]) -m4_define([v_mic], [0]) +m4_define([v_mic], [2]) dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n'])) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) --
[EGIT] [core/efl] master 01/01: eina: resolved TODO in eina tests - added delete array list
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d13f16b0e2534571ff3a8c4dc2a8cd34ae3e60a8
commit d13f16b0e2534571ff3a8c4dc2a8cd34ae3e60a8
Author: kabeer khan
Date: Wed Sep 10 12:45:50 2014 +0200
eina: resolved TODO in eina tests - added delete array list
Summary: Signed-off-by: kabeer khan
Reviewers: devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D1428
Signed-off-by: Cedric BAIL
---
src/tests/eina/eina_suite.c| 10 --
src/tests/eina/eina_test_mempool.c | 10 +-
src/tests/eina/eina_test_module.c | 9 +++--
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/tests/eina/eina_suite.c b/src/tests/eina/eina_suite.c
index a386ae1..8ed038a 100644
--- a/src/tests/eina/eina_suite.c
+++ b/src/tests/eina/eina_suite.c
@@ -142,10 +142,16 @@ static void _mempool_init(void)
static void _mempool_shutdown(void)
{
+ unsigned int i;
+ Eina_Array_Iterator it;
+ Eina_Module *module;
eina_module_list_free(_modules);
if (_modules)
- eina_array_free(_modules);
- /* TODO delete the list */
+ {
+EINA_ARRAY_ITER_NEXT(_modules, i, module, it)
+ free(module);
+eina_array_free(_modules);
+ }
eina_shutdown();
}
diff --git a/src/tests/eina/eina_test_mempool.c
b/src/tests/eina/eina_test_mempool.c
index 7106afa..bdcd295 100644
--- a/src/tests/eina/eina_test_mempool.c
+++ b/src/tests/eina/eina_test_mempool.c
@@ -41,8 +41,16 @@ _mempool_init(void)
static void
_mempool_shutdown(void)
{
+ unsigned int i;
+ Eina_Array_Iterator it;
+ Eina_Module *module;
eina_module_list_free(_modules);
- /* TODO delete the list */
+ if (_modules)
+ {
+EINA_ARRAY_ITER_NEXT(_modules, i, module, it)
+ free(module);
+eina_array_free(_modules);
+ }
eina_shutdown();
}
diff --git a/src/tests/eina/eina_test_module.c
b/src/tests/eina/eina_test_module.c
index 7dd14b0..018e062 100644
--- a/src/tests/eina/eina_test_module.c
+++ b/src/tests/eina/eina_test_module.c
@@ -47,7 +47,10 @@ static Eina_Bool list_cb(Eina_Module *m, void *data
EINA_UNUSED)
START_TEST(eina_module_load_unload)
{
Eina_Array *_modules;
-
+ unsigned int i;
+ Eina_Array_Iterator it;
+ Eina_Module *module;
+
eina_init();
_modules = eina_module_list_get(NULL,
PACKAGE_BUILD_DIR "/src/tests/",
@@ -58,7 +61,9 @@ START_TEST(eina_module_load_unload)
eina_module_list_load(_modules);
eina_module_list_unload(_modules);
eina_module_list_free(_modules);
- /* TODO delete the list */
+ EINA_ARRAY_ITER_NEXT(_modules, i, module, it)
+ free(module);
+ eina_array_free(_modules);
eina_shutdown();
}
END_TEST
--
[EGIT] [core/elementary] elementary-1.11 01/01: rename all pager theme groups to match the module that uses it
discomfitor pushed a commit to branch elementary-1.11.
http://git.enlightenment.org/core/elementary.git/commit/?id=e0445e2150c109c0b88a55d964e08cddd0adb342
commit e0445e2150c109c0b88a55d964e08cddd0adb342
Author: Mike Blumenkrantz
Date: Wed Sep 10 09:04:14 2014 -0400
rename all pager theme groups to match the module that uses it
this should have been done with the module rename, and this release is the
last chance to get it fixed before it has to be permanently maintained with
wrong names
---
data/themes/Makefile.am | 2 +-
data/themes/default.edc | 2 +-
data/themes/edc/pager.edc| 154 +-
data/themes/edc/{pager16.edc => pager_plain.edc} | 158 +--
4 files changed, 158 insertions(+), 158 deletions(-)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 562c56e..6ddef37 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -68,7 +68,7 @@ edc/music_control.edc \
edc/notification.edc \
edc/packagekit.edc \
edc/pager.edc \
-edc/pager16.edc \
+edc/pager_plain.edc \
edc/pointer.edc \
edc/preview.edc \
edc/radio.edc \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 953de8b..578ceec 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -117,7 +117,7 @@ collections {
// modules
#include "edc/start.edc"
#include "edc/pager.edc"
-#include "edc/pager16.edc"
+#include "edc/pager_plain.edc"
#include "edc/xkbswitch.edc"
#include "edc/tasks.edc"
#include "edc/connman.edc"
diff --git a/data/themes/edc/pager.edc b/data/themes/edc/pager.edc
index 4596db8..5466ab4 100644
--- a/data/themes/edc/pager.edc
+++ b/data/themes/edc/pager.edc
@@ -16,8 +16,8 @@ group { name: "e/modules/pager/popup";
image.border: 1 1 1 1;
image.middle: 0;
fill.smooth: 0;
- }
- }
+ }
+}
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to_y: "e.text.label";
@@ -25,8 +25,8 @@ group { name: "e/modules/pager/popup";
rel1.offset: 2 0;
rel2.relative: 1.0 1.0;
rel2.offset: -3 -2;
- }
- }
+ }
+}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
@@ -70,34 +70,12 @@ group { name: "e/modules/pager/desk";
images.image: "mini_blue_glow_arrow_2.png" COMP;
images.image: "mini_blue_glow_arrow_3.png" COMP;
parts {
- part { name: "base";
+ part { name: "base"; type: SPACER;
description { state: "default" 0.0;
-image.normal: "vgrad_med_darker.png";
rel1.to: "inset";
rel1.offset: 1 1;
rel2.to: "inset";
rel2.offset: -2 -2;
-fill.smooth: 0;
-TILED_HORIZ(32)
- }
- }
- part { name: "pat"; mouse_events: 0;
- description { state: "default" 0.0;
-image.normal: "dot_pattern.png";
-rel1.to: "base";
-rel2.to: "base";
-TILED_PATTERN(256, 256)
- }
- }
- part { name: "e.background"; type: SWALLOW;
- clip_to: "clip";
- description { state: "default" 0.0;
-rel1.to: "base";
-rel2.to: "base";
- }
- description { state: "hidden" 0.0;
-inherit: "default" 0.0;
-visible: 0;
}
}
part { name: "bevel"; mouse_events: 0;
@@ -121,6 +99,7 @@ group { name: "e/modules/pager/desk";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
+rel2.offset: -2 -1;
}
}
part { name: "shadow"; mouse_events: 0;
@@ -154,7 +133,7 @@ group { name: "e/modules/pager/desk";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255;
-text { font: FN; size: 10;
+text { font: "Sans"; size: 10;
text_class: "module_small";
align: 0.5 0.5;
}
@@ -306,16 +285,6 @@ group { name: "e/modules/pager/desk";
transition: DECELERATE 0.2;
target: "glow";
}
- program {
- signal: "e,preview,on"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "e.background";
- }
- program {
- signal: "e,preview,off"; source: "e";
- action: STATE_SET "hidden" 0.0;
- target: "e.background";
- }
program { name: "drop1";
signal: "e,action,drag,in"; source: "e";
action: STATE_SET "active" 0.0;
@@ -354,112 +323,3 @@ group { name: "e/modules/pager/desk";
}
}
}
-
-group { name: "e/modules/pager/window";
- images.image: "mini_box_bevel_shadow.png" COMP;
- images.image: "mini_box_glow.pn
[EGIT] [core/enlightenment] master 01/02: require efl 1.11.2
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=64a601aed80c99ed31e90d5865aa16027dc22b41 commit 64a601aed80c99ed31e90d5865aa16027dc22b41 Author: Mike Blumenkrantz Date: Wed Sep 10 08:50:16 2014 -0400 require efl 1.11.2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8937090..d760eec 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ extern char **environ; AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var]) ]) -efl_version="1.11" +efl_version="1.11.2" AC_SUBST(efl_version) AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) --
[EGIT] [core/enlightenment] master 02/02: redo pager modules to use more accurately named edje groups
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9488fddc59f4588984fa466b547b0522831da07e
commit 9488fddc59f4588984fa466b547b0522831da07e
Author: Mike Blumenkrantz
Date: Wed Sep 10 09:02:03 2014 -0400
redo pager modules to use more accurately named edje groups
---
src/modules/pager/e_mod_main.c | 6 +++---
src/modules/pager_plain/e_mod_main.c | 26 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 5433f85..0ee0b99 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -466,7 +466,7 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos,
Eina_Bool invert)
o = edje_object_add(e);
pd->o_desk = o;
e_theme_edje_object_set(o, "base/theme/modules/pager",
- "e/modules/pager16/desk");
+ "e/modules/pager/desk");
edje_object_part_text_set(o, "e.text.label", desk->name);
if (pager_config->show_desk_names)
edje_object_signal_emit(o, "e,name,show", "e");
@@ -690,7 +690,7 @@ _pager_window_new(Pager_Desk *pd, Evas_Object *mirror,
E_Client *client)
//o = edje_object_add(evas_object_evas_get(pd->pager->o_table));
//pw->o_window = o;
//e_theme_edje_object_set(o, "base/theme/modules/pager",
- //"e/modules/pager16/window");
+ //"e/modules/pager/window");
//if (visible) evas_object_show(o);
@@ -783,7 +783,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
pp->o_bg = edje_object_add(zone->comp->evas);
evas_object_name_set(pp->o_bg, "pager_popup");
e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
- "e/modules/pager16/popup");
+ "e/modules/pager/popup");
desk = e_desk_current_get(zone);
if (desk)
edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name);
diff --git a/src/modules/pager_plain/e_mod_main.c
b/src/modules/pager_plain/e_mod_main.c
index d559c41..caaed7d 100644
--- a/src/modules/pager_plain/e_mod_main.c
+++ b/src/modules/pager_plain/e_mod_main.c
@@ -441,8 +441,8 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos,
Eina_Bool invert)
e = evas_object_evas_get(p->o_table);
o = edje_object_add(e);
pd->o_desk = o;
- e_theme_edje_object_set(o, "base/theme/modules/pager",
- "e/modules/pager/desk");
+ e_theme_edje_object_set(o, "base/theme/modules/pager_plain",
+ "e/modules/pager_plain/desk");
edje_object_part_text_set(o, "e.text.label", desk->name);
if (pager_config->show_desk_names)
edje_object_signal_emit(o, "e,name,show", "e");
@@ -674,8 +674,8 @@ _pager_window_new(Pager_Desk *pd, E_Client *client)
o = edje_object_add(evas_object_evas_get(pd->pager->o_table));
pw->o_window = o;
- e_theme_edje_object_set(o, "base/theme/modules/pager",
- "e/modules/pager/window");
+ e_theme_edje_object_set(o, "base/theme/modules/pager_plain",
+ "e/modules/pager_plain/window");
if (visible) evas_object_show(o);
e_layout_pack(pd->o_layout, pw->o_window);
@@ -797,8 +797,8 @@ _pager_popup_new(E_Zone *zone, int keyaction)
pp->o_bg = edje_object_add(zone->comp->evas);
evas_object_name_set(pp->o_bg, "pager_popup");
- e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
- "e/modules/pager/popup");
+ e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager_plain",
+ "e/modules/pager_plain/popup");
desk = e_desk_current_get(zone);
if (desk)
edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name);
@@ -1934,8 +1934,8 @@ _pager_window_cb_mouse_move(void *data, Evas *e
__UNUSED__, Evas_Object *obj __U
_pager_window_cb_drag_finished);
o = edje_object_add(drag->evas);
- e_theme_edje_object_set(o, "base/theme/modules/pager",
- "e/modules/pager/window");
+ e_theme_edje_object_set(o, "base/theme/modules/pager_plain",
+ "e/modules/pager_plain/window");
evas_object_show(o);
oo = e_client_icon_add(pw->client, drag->evas);
@@ -2138,7 +2138,7 @@ _pager_drop_cb_drop(void *data, const char *type, void
*event_info)
pd = _pager_desk_at_coord(p, ev->x, ev->y);
if (pd)
{
-if (!strcmp(type, "enlightenment/pager_win"))
+if (!strcmp(type, "enlightenment/pager_plain_win"))
{
pw = (Pager_Win *)(ev->data);
if (pw)
@@ -2313,8 +2313,8 @@ _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNU
/* redraw the desktop theme above */
o = edje_object_add(drag->evas);
-
[EGIT] [core/elementary] master 01/01: rename all pager theme groups to match the module that uses it
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e3e158b3887a93097d954a75d2d74eff3f4ec24f
commit e3e158b3887a93097d954a75d2d74eff3f4ec24f
Author: Mike Blumenkrantz
Date: Wed Sep 10 09:04:14 2014 -0400
rename all pager theme groups to match the module that uses it
this should have been done with the module rename, and this release is the
last chance to get it fixed before it has to be permanently maintained with
wrong names
---
data/themes/Makefile.am | 2 +-
data/themes/default.edc | 2 +-
data/themes/edc/pager.edc| 154 +-
data/themes/edc/{pager16.edc => pager_plain.edc} | 158 +--
4 files changed, 158 insertions(+), 158 deletions(-)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2de990b..f2e3a78 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -68,7 +68,7 @@ edc/music_control.edc \
edc/notification.edc \
edc/packagekit.edc \
edc/pager.edc \
-edc/pager16.edc \
+edc/pager_plain.edc \
edc/pointer.edc \
edc/preview.edc \
edc/radio.edc \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 953de8b..578ceec 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -117,7 +117,7 @@ collections {
// modules
#include "edc/start.edc"
#include "edc/pager.edc"
-#include "edc/pager16.edc"
+#include "edc/pager_plain.edc"
#include "edc/xkbswitch.edc"
#include "edc/tasks.edc"
#include "edc/connman.edc"
diff --git a/data/themes/edc/pager.edc b/data/themes/edc/pager.edc
index 4596db8..5466ab4 100644
--- a/data/themes/edc/pager.edc
+++ b/data/themes/edc/pager.edc
@@ -16,8 +16,8 @@ group { name: "e/modules/pager/popup";
image.border: 1 1 1 1;
image.middle: 0;
fill.smooth: 0;
- }
- }
+ }
+}
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to_y: "e.text.label";
@@ -25,8 +25,8 @@ group { name: "e/modules/pager/popup";
rel1.offset: 2 0;
rel2.relative: 1.0 1.0;
rel2.offset: -3 -2;
- }
- }
+ }
+}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
@@ -70,34 +70,12 @@ group { name: "e/modules/pager/desk";
images.image: "mini_blue_glow_arrow_2.png" COMP;
images.image: "mini_blue_glow_arrow_3.png" COMP;
parts {
- part { name: "base";
+ part { name: "base"; type: SPACER;
description { state: "default" 0.0;
-image.normal: "vgrad_med_darker.png";
rel1.to: "inset";
rel1.offset: 1 1;
rel2.to: "inset";
rel2.offset: -2 -2;
-fill.smooth: 0;
-TILED_HORIZ(32)
- }
- }
- part { name: "pat"; mouse_events: 0;
- description { state: "default" 0.0;
-image.normal: "dot_pattern.png";
-rel1.to: "base";
-rel2.to: "base";
-TILED_PATTERN(256, 256)
- }
- }
- part { name: "e.background"; type: SWALLOW;
- clip_to: "clip";
- description { state: "default" 0.0;
-rel1.to: "base";
-rel2.to: "base";
- }
- description { state: "hidden" 0.0;
-inherit: "default" 0.0;
-visible: 0;
}
}
part { name: "bevel"; mouse_events: 0;
@@ -121,6 +99,7 @@ group { name: "e/modules/pager/desk";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
+rel2.offset: -2 -1;
}
}
part { name: "shadow"; mouse_events: 0;
@@ -154,7 +133,7 @@ group { name: "e/modules/pager/desk";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255;
-text { font: FN; size: 10;
+text { font: "Sans"; size: 10;
text_class: "module_small";
align: 0.5 0.5;
}
@@ -306,16 +285,6 @@ group { name: "e/modules/pager/desk";
transition: DECELERATE 0.2;
target: "glow";
}
- program {
- signal: "e,preview,on"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "e.background";
- }
- program {
- signal: "e,preview,off"; source: "e";
- action: STATE_SET "hidden" 0.0;
- target: "e.background";
- }
program { name: "drop1";
signal: "e,action,drag,in"; source: "e";
action: STATE_SET "active" 0.0;
@@ -354,112 +323,3 @@ group { name: "e/modules/pager/desk";
}
}
}
-
-group { name: "e/modules/pager/window";
- images.image: "mini_box_bevel_shadow.png" COMP;
- images.image: "mini_box_glow.png" COMP;
[EGIT] [core/efl] master 01/01: eolian: remove Eo_Param_Def, reduce allocations, simplify code
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9aff32445717f6e4732a3bde2bf38816a06e6385
commit 9aff32445717f6e4732a3bde2bf38816a06e6385
Author: Daniel Kolesa
Date: Wed Sep 10 14:24:41 2014 +0100
eolian: remove Eo_Param_Def, reduce allocations, simplify code
---
src/lib/eolian/database_fill.c | 34 +++---
src/lib/eolian/eo_definitions.c | 26 --
src/lib/eolian/eo_definitions.h | 15 +--
src/lib/eolian/eo_parser.c | 16
4 files changed, 20 insertions(+), 71 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index e972fd8..02fd52e 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -1,33 +1,5 @@
#include "eo_parser.h"
-static void
-_db_fill_param(Eina_List **plist, Eo_Param_Def *param)
-{
- Eolian_Function_Parameter *p = database_parameter_add(param->type,
- param->value,
- param->name,
- param->comment);
- p->param_dir = param->way;
- *plist = eina_list_append(*plist, p);
- p->nonull = param->nonull;
- param->type = NULL;
-
- p->base = param->base;
- param->base.file = NULL;
-}
-
-static Eina_Bool
-_db_fill_params(Eina_List *oplist, Eina_List **plist)
-{
- Eo_Param_Def *param;
- Eina_List *l;
-
- EINA_LIST_FOREACH(oplist, l, param)
- _db_fill_param(plist, param);
-
- return EINA_TRUE;
-}
-
static Eina_Bool
_db_fill_accessor(Eolian_Function *foo_id, Eo_Class_Def *kls,
Eo_Property_Def *prop, Eo_Accessor_Def *accessor)
@@ -138,8 +110,8 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Property_Def *prop)
foo_id->scope = prop->scope;
foo_id->is_class = prop->is_class;
- if (!_db_fill_params (prop->keys , &(foo_id->keys ))) goto failure;
- if (!_db_fill_params (prop->values, &(foo_id->params))) goto failure;
+ foo_id->keys = prop->keys ; prop->keys = NULL;
+ foo_id->params = prop->values; prop->values = NULL;
if (!_db_fill_accessors(foo_id, kls, prop)) goto failure;
if (!prop->accessors)
@@ -199,7 +171,7 @@ _db_fill_method(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Method_Def *meth)
if (meth->only_legacy)
foo_id->get_only_legacy = EINA_TRUE;
- _db_fill_params(meth->params, &(foo_id->params));
+ foo_id->params = meth->params; meth->params = NULL;
if (kls->type == EOLIAN_CLASS_INTERFACE)
foo_id->get_virtual_pure = EINA_TRUE;
diff --git a/src/lib/eolian/eo_definitions.c b/src/lib/eolian/eo_definitions.c
index facd883..29a2b1b 100644
--- a/src/lib/eolian/eo_definitions.c
+++ b/src/lib/eolian/eo_definitions.c
@@ -13,16 +13,6 @@ eo_definitions_ret_free(Eo_Ret_Def *ret)
}
static void
-eo_definitions_param_free(Eo_Param_Def *param)
-{
- if (param->base.file) eina_stringshare_del(param->base.file);
- if (param->type) database_type_del(param->type);
- if (param->name) eina_stringshare_del(param->name);
- if (param->comment) eina_stringshare_del(param->comment);
- free(param);
-}
-
-static void
eo_definitions_accessor_param_free(Eo_Accessor_Param *param)
{
if (param->name) eina_stringshare_del(param->name);
@@ -54,7 +44,7 @@ eo_definitions_accessor_free(Eo_Accessor_Def *accessor)
static void
eo_definitions_property_def_free(Eo_Property_Def *prop)
{
- Eo_Param_Def *param;
+ Eolian_Function_Parameter *param;
Eo_Accessor_Def *accessor;
if (prop->base.file)
@@ -64,10 +54,10 @@ eo_definitions_property_def_free(Eo_Property_Def *prop)
eina_stringshare_del(prop->name);
EINA_LIST_FREE(prop->keys, param)
- eo_definitions_param_free(param);
+ database_parameter_del(param);
EINA_LIST_FREE(prop->values, param)
- eo_definitions_param_free(param);
+ database_parameter_del(param);
EINA_LIST_FREE(prop->accessors, accessor)
eo_definitions_accessor_free(accessor);
@@ -78,7 +68,7 @@ eo_definitions_property_def_free(Eo_Property_Def *prop)
static void
eo_definitions_method_def_free(Eo_Method_Def *meth)
{
- Eo_Param_Def *param;
+ Eolian_Function_Parameter *param;
if (meth->base.file)
eina_stringshare_del(meth->base.file);
@@ -94,7 +84,7 @@ eo_definitions_method_def_free(Eo_Method_Def *meth)
eina_stringshare_del(meth->legacy);
EINA_LIST_FREE(meth->params, param)
- eo_definitions_param_free(param);
+ database_parameter_del(param);
free(meth);
}
@@ -148,7 +138,7 @@ void
eo_definitions_temps_free(Eo_Lexer_Temps *tmp)
{
Eina_Strbuf *buf;
- Eo_Param_Def *par;
+ Eolian_Function_Parameter *par;
Eolian_Type *tp;
Eolian_Variable *var;
const char *s;
@@ -157,7 +147,7 @@ eo_definitions_temps_free(Eo_Lexer_Temps *tmp)
eina_strbuf_free(buf);
EINA_LIST_FREE(tmp->params, par)
- eo_definitions_param_
[EGIT] [core/enlightenment] enlightenment-0.18 01/02: rename pager theme stuff to pager_plain to match current elm
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4bca1ed0efcf489b684399c72c8b6a984d61f936 commit 4bca1ed0efcf489b684399c72c8b6a984d61f936 Author: Mike Blumenkrantz Date: Wed Sep 10 09:26:56 2014 -0400 rename pager theme stuff to pager_plain to match current elm --- src/modules/pager/e_mod_main.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index f69b11e..719ab46 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -432,7 +432,7 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, Eina_Bool invert) o = edje_object_add(e); pd->o_desk = o; e_theme_edje_object_set(o, "base/theme/modules/pager", - "e/modules/pager/desk"); + "e/modules/pager_plain/desk"); edje_object_part_text_set(o, "e.text.label", desk->name); if (pager_config->show_desk_names) edje_object_signal_emit(o, "e,name,show", "e"); @@ -664,7 +664,7 @@ _pager_window_new(Pager_Desk *pd, E_Border *border) o = edje_object_add(evas_object_evas_get(pd->pager->o_table)); pw->o_window = o; e_theme_edje_object_set(o, "base/theme/modules/pager", - "e/modules/pager/window"); + "e/modules/pager_plain/window"); if (visible) evas_object_show(o); e_layout_pack(pd->o_layout, pw->o_window); @@ -795,7 +795,7 @@ _pager_popup_new(E_Zone *zone, int keyaction) pp->o_bg = edje_object_add(pp->popup->evas); e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager", - "e/modules/pager/popup"); + "e/modules/pager_plain/popup"); desk = e_desk_current_get(zone); if (desk) edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name); @@ -1930,7 +1930,7 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U o = edje_object_add(drag->evas); e_theme_edje_object_set(o, "base/theme/modules/pager", - "e/modules/pager/window"); + "e/modules/pager_plain/window"); evas_object_show(o); oo = e_border_icon_add(pw->border, drag->evas); @@ -2311,7 +2311,7 @@ _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU /* redraw the desktop theme above */ o = edje_object_add(drag->evas); e_theme_edje_object_set(o, "base/theme/modules/pager", -"e/modules/pager/desk"); +"e/modules/pager_plain/desk"); evas_object_show(o); e_drag_object_set(drag, o); @@ -2332,7 +2332,7 @@ _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU o = edje_object_add(drag->evas); e_theme_edje_object_set(o, "base/theme/modules/pager", - "e/modules/pager/window"); + "e/modules/pager_plain/window"); e_layout_pack(oo, o); e_layout_child_raise(o); e_zone_useful_geometry_get(pw->desk->desk->zone, --
[EGIT] [core/enlightenment] enlightenment-0.18 02/02: 18.9 release
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=be2a592feacf7cfbaac6d917f8769e36feab31b8 commit be2a592feacf7cfbaac6d917f8769e36feab31b8 Author: Mike Blumenkrantz Date: Wed Sep 10 09:27:18 2014 -0400 18.9 release --- NEWS | 7 +++ configure.ac | 8 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 30ddce0..ee23356 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Changes since 0.18.8: +- + +* xdg menu implementation improvements +* buffer overflow fixed in desk flip animation +* editing a .desktop file no longer sets mime type for .desktop files + Changes since 0.18.7: - diff --git a/configure.ac b/configure.ac index 1c946c7..3136976 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [18]) -m4_define([v_mic], [8]) +m4_define([v_mic], [9]) dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) -m4_define([relname], [0.18.8]) +m4_define([relname], [0.18.9]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-00]) dnl m4_define([v_rel], [-release relname]) @@ -94,10 +94,10 @@ extern char **environ; AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var]) ]) -efl_version="1.8.3" +efl_version="1.11.2" AC_SUBST(efl_version) -elm_version="1.8.2" +elm_version="1.11.2" AC_SUBST(elm_version) AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) --
[EGIT] [core/enlightenment] annotated tag v0.18.9 created (now ae88931)
This is an automated email from the git hooks/post-receive script. discomfitor pushed a change to annotated tag v0.18.9 in repository core/enlightenment. at ae88931 (tag) tagging be2a592feacf7cfbaac6d917f8769e36feab31b8 (commit) replaces v0.18.8 tagged by Mike Blumenkrantz on Wed Sep 10 09:27:31 2014 -0400 - Log - 0.18.9 Carlos Rafael Giani (1): bugfix: Fix buffer overflow in desk_show. Mike Blumenkrantz (3): bugfix: don't save mime info when opening .desktop files rename pager theme stuff to pager_plain to match current elm 18.9 release Samuel F. Baggen (1): Esperanto: missing entry on wizard from Intl emodule Sebastian Dransfeld (3): e: set XDG_MENU_PREFIX so menus get merged e: rename applications menu to fit xdg menu spec e-xdg: augment XDG_CONFIG_DIRS as well Stefan Schmidt (2): po: Set initial values for Language and Language-Team po: Fix copy and paste error in Esperanto po file Wonguk Jeong (1): bugfix: desktop_editor: selecting exe bug fix maxerba (4): Updating translations Updating galician, lithuanian and turkish translations Updating catalan translation Updating esperanto and french translation --- No new revisions were added by this update. --
Re: [E-devel] [EGIT] [core/enlightenment] enlightenment-0.18 01/02: rename pager theme stuff to pager_plain to match current elm
I didn't make much noise when you broke theme API for e19 (for no real reason) because I didn't feel like arguing. But back-porting a breaking change is too much. You essentially screwed over anyone who's tracking stable e18 and efl-1.11.0 (or lower). They'll update only to find out their pager is completely broken, although it's meant to be stable. Same goes with custom made themes. An example of a distro you just broke: Arch. You should have probably just added a configure dependency to e18 saying it only works with efl < 1.11.2 (retarded, but better than what you did). You shouldn't have changed that in e19, you definitely shouldn't have backported it, and you definitely shouldn't have released an e18 "stable" (but broken) version just like that. This again proves how annoying moving the e theme to elm is, but even if the e theme was in tree, this is just a stupid theme-api breaking change. -- Tom. On 10/09/14 14:29, Mike Blumenkrantz wrote: > discomfitor pushed a commit to branch enlightenment-0.18. > > http://git.enlightenment.org/core/enlightenment.git/commit/?id=4bca1ed0efcf489b684399c72c8b6a984d61f936 > > commit 4bca1ed0efcf489b684399c72c8b6a984d61f936 > Author: Mike Blumenkrantz > Date: Wed Sep 10 09:26:56 2014 -0400 > > rename pager theme stuff to pager_plain to match current elm > --- > src/modules/pager/e_mod_main.c | 12 ++-- > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c > index f69b11e..719ab46 100644 > --- a/src/modules/pager/e_mod_main.c > +++ b/src/modules/pager/e_mod_main.c > @@ -432,7 +432,7 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int > ypos, Eina_Bool invert) > o = edje_object_add(e); > pd->o_desk = o; > e_theme_edje_object_set(o, "base/theme/modules/pager", > - "e/modules/pager/desk"); > + "e/modules/pager_plain/desk"); > edje_object_part_text_set(o, "e.text.label", desk->name); > if (pager_config->show_desk_names) >edje_object_signal_emit(o, "e,name,show", "e"); > @@ -664,7 +664,7 @@ _pager_window_new(Pager_Desk *pd, E_Border *border) > o = edje_object_add(evas_object_evas_get(pd->pager->o_table)); > pw->o_window = o; > e_theme_edje_object_set(o, "base/theme/modules/pager", > - "e/modules/pager/window"); > + "e/modules/pager_plain/window"); > if (visible) evas_object_show(o); > > e_layout_pack(pd->o_layout, pw->o_window); > @@ -795,7 +795,7 @@ _pager_popup_new(E_Zone *zone, int keyaction) > > pp->o_bg = edje_object_add(pp->popup->evas); > e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager", > - "e/modules/pager/popup"); > + "e/modules/pager_plain/popup"); > desk = e_desk_current_get(zone); > if (desk) >edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name); > @@ -1930,7 +1930,7 @@ _pager_window_cb_mouse_move(void *data, Evas *e > __UNUSED__, Evas_Object *obj __U > >o = edje_object_add(drag->evas); >e_theme_edje_object_set(o, "base/theme/modules/pager", > - "e/modules/pager/window"); > + "e/modules/pager_plain/window"); >evas_object_show(o); > >oo = e_border_icon_add(pw->border, drag->evas); > @@ -2311,7 +2311,7 @@ _pager_desk_cb_mouse_move(void *data, Evas *e > __UNUSED__, Evas_Object *obj __UNU > /* redraw the desktop theme above */ > o = edje_object_add(drag->evas); > e_theme_edje_object_set(o, "base/theme/modules/pager", > -"e/modules/pager/desk"); > +"e/modules/pager_plain/desk"); > evas_object_show(o); > e_drag_object_set(drag, o); > > @@ -2332,7 +2332,7 @@ _pager_desk_cb_mouse_move(void *data, Evas *e > __UNUSED__, Evas_Object *obj __UNU > >o = edje_object_add(drag->evas); >e_theme_edje_object_set(o, "base/theme/modules/pager", > - "e/modules/pager/window"); > + "e/modules/pager_plain/window"); >e_layout_pack(oo, o); >e_layout_child_raise(o); >e_zone_useful_geometry_get(pw->desk->desk->zone, > -- Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/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: When we free the pixmap, clear any user data set on the resource
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b41dbbe9cf52e1807eda078c6d898085c73ecff7 commit b41dbbe9cf52e1807eda078c6d898085c73ecff7 Author: Chris Michael Date: Wed Sep 10 09:48:17 2014 -0400 bugfix: When we free the pixmap, clear any user data set on the resource This was a cause of some memleaks/crashes in the wayland compositor because the compositor was trying to access properties of the E_Pixmap after it had already been freed. By setting the user_data to NULL, the functions in the compositor which were failing will now stop trying to access the pixmap after it's been freed. Signed-off-by: Chris Michael --- src/bin/e_pixmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index ed8552e..1ae2421 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -97,7 +97,7 @@ _e_pixmap_free(E_Pixmap *cp) break; case E_PIXMAP_TYPE_WL: #if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) -/* NB: No-Op. Nothing to free. image data no longer memcpy'd */ +if (cp->resource) wl_resource_set_user_data(cp->resource, NULL); #endif break; default: --
[EGIT] [apps/ecrire] master 02/02: Add a log as was in the Fixme in cfg.c
tasn pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=fad91b5badf7b433601878f774dd66f8573c6231
commit fad91b5badf7b433601878f774dd66f8573c6231
Author: Srivardhan Hebbar
Date: Wed Sep 10 14:58:35 2014 +0100
Add a log as was in the Fixme in cfg.c
Summary:
Was going through the ecraire to understand so that I can contribute.
Saw the Fixme and added this log.
Signed-off-by: Srivardhan Hebbar
Reviewers: tasn
Differential Revision: https://phab.enlightenment.org/D1423
---
src/bin/cfg.c | 4 ++--
src/bin/file_utils.c | 6 --
src/bin/main.c| 27 +++
src/bin/mess_header.h | 9 +
4 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/bin/cfg.c b/src/bin/cfg.c
index a4c6dd1..1c2204e 100644
--- a/src/bin/cfg.c
+++ b/src/bin/cfg.c
@@ -97,7 +97,7 @@ ecrire_cfg_load(void)
ef = eet_open(config_file, EET_FILE_MODE_READ);
if (!ef)
{
-/* FIXME Info message? create new config? */
+INF("Failed to read the config file. Creating a new one.");
goto end;
}
@@ -127,7 +127,7 @@ ecrire_cfg_save(void)
ef = eet_open(config_file, EET_FILE_MODE_WRITE);
if (!ef)
{
-EINA_LOG_ERR("could not open '%s' for writing.", config_file);
+ERR("could not open '%s' for writing.", config_file);
return EINA_FALSE;
}
diff --git a/src/bin/file_utils.c b/src/bin/file_utils.c
index ef60669..cbf05e1 100644
--- a/src/bin/file_utils.c
+++ b/src/bin/file_utils.c
@@ -3,6 +3,8 @@
#include
#include
+#include "mess_header.h"
+
static char *
_buf_append(char *buf, const char *str, int *len, int *alloc)
{
@@ -66,14 +68,14 @@ _save_markup_utf8(const char *file, const char *text)
f = fopen(file, "wb");
if (!f)
{
-EINA_LOG_ERR("could not open '%s' for writing.", file);
+ERR("could not open '%s' for writing.", file);
return EINA_FALSE;
}
if (text)
{
if (fputs(text, f) == EOF)
{
- EINA_LOG_ERR("Error in writing to '%s'.", file);
+ ERR("Error in writing to '%s'.", file);
return EINA_FALSE;
}
}
diff --git a/src/bin/main.c b/src/bin/main.c
index c6de252..26cab09 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -22,6 +22,9 @@ static Ecrire_Entry *main_ec_ent;
static void print_usage(const char *bin);
static void editor_font_set(Ecrire_Entry *ent, const char *font, int
font_size);
+/* specific log domain to help debug only ecrire */
+int _ecrire_log_dom = -1;
+
static void
_init_entry(Ecrire_Entry *ent)
{
@@ -213,7 +216,7 @@ _undo_stack_add(Ecrire_Entry *ent, Elm_Entry_Change_Info
*_info)
static void
_undo_redo_do(Ecrire_Entry *ent, Elm_Entry_Change_Info *inf, Eina_Bool undo)
{
- EINA_LOG_DBG("%s: %s", (undo) ? "Undo" : "Redo",
+ DBG("%s: %s", (undo) ? "Undo" : "Redo",
inf->change.insert.content);
if ((inf->insert && undo) || (!inf->insert && !undo))
@@ -594,6 +597,19 @@ main(int argc, char *argv[])
opterr = 0;
+ if (!eina_init())
+ {
+printf("Failed to initialize Eina_log module\n");
+return EXIT_FAILURE;
+ }
+
+ _ecrire_log_dom = eina_log_domain_register("ecrire",
ECRIRE_DEFAULT_LOG_COLOR);
+ if (_ecrire_log_dom < 0)
+ {
+EINA_LOG_ERR("Unable to create a log domain.");
+exit(-1);
+ }
+
while ((c = getopt (argc, argv, "")) != -1)
{
switch (c)
@@ -602,12 +618,12 @@ main(int argc, char *argv[])
print_usage(argv[0]);
if (isprint (optopt))
{
- EINA_LOG_ERR("Unknown option or requires an argument
`-%c'.",
+ ERR("Unknown option or requires an argument `-%c'.",
optopt);
}
else
{
- EINA_LOG_ERR("Unknown option character `\\x%x'.", optopt);
+ ERR("Unknown option character `\\x%x'.", optopt);
}
return 1;
break;
@@ -636,7 +652,7 @@ main(int argc, char *argv[])
main_ec_ent->filename = eina_stringshare_add(argv[optind]);
}
- EINA_LOG_DBG("Opening filename: '%s'", main_ec_ent->filename);
+ DBG("Opening filename: '%s'", main_ec_ent->filename);
main_ec_ent->win = elm_win_add(NULL, "editor", ELM_WIN_BASIC);
elm_win_autodel_set(main_ec_ent->win, EINA_FALSE);
@@ -746,6 +762,9 @@ main(int argc, char *argv[])
ecrire_cfg_shutdown();
elm_shutdown();
+ eina_log_domain_unregister(_ecrire_log_dom);
+ _ecrire_log_dom = -1;
+ eina_shutdown();
return 0;
}
diff --git a/src/bin/mess_header.h b/src/bin/mess_header.h
index 355e67f..5976f4d 100644
--- a/src/bin/mess_header.h
+++ b/src/bin/mess_header.h
@@ -3,6 +3,15 @@
#include
+extern int _ecrire_log_dom;
+#define ECRIRE_DEFAULT_LOG_COLOR EINA_COLOR_CYA
[EGIT] [apps/ecrire] master 01/02: Create arc config.
tasn pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=827fea7c9f0fee44dda863a854b0070ef89e0702
commit 827fea7c9f0fee44dda863a854b0070ef89e0702
Author: Tom Hacohen
Date: Wed Sep 10 14:58:28 2014 +0100
Create arc config.
---
.arcconfig | 4
1 file changed, 4 insertions(+)
diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 000..3c13b03
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,4 @@
+{
+ "project_id" : "ecrire",
+ "conduit_uri" : "https://phab.enlightenment.org/";
+}
--
[EGIT] [apps/ecrire] master 01/01: Fix .arcconfig to point to the correct repo.
tasn pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=c87ced38cf2ed630d64dbae4be5c7775af673ac3
commit c87ced38cf2ed630d64dbae4be5c7775af673ac3
Author: Tom Hacohen
Date: Wed Sep 10 15:04:20 2014 +0100
Fix .arcconfig to point to the correct repo.
Repo name on phab is confusing...
---
.arcconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.arcconfig b/.arcconfig
index 3c13b03..b975fec 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,4 +1,4 @@
{
- "project_id" : "ecrire",
+ "project_id" : "apps/ecrire",
"conduit_uri" : "https://phab.enlightenment.org/";
}
--
[EGIT] [core/elementary] master 01/01: update according to latest eolian changes
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=78f657b4bd45f88b54a0f6f1f957f08cc0700de2
commit 78f657b4bd45f88b54a0f6f1f957f08cc0700de2
Author: Daniel Kolesa
Date: Wed Sep 10 15:09:08 2014 +0100
update according to latest eolian changes
---
src/lib/elm_widget.eo | 3 +--
src/lib/elm_win.eo| 9 +++--
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 42aa496..9df00f8 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -143,10 +143,9 @@ abstract Elm_Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Widget)
}
get {
/*@ No description supplied by the EAPI. */
-objs: const;
}
values {
-list *objs;
+list *objs @const_get;
}
}
can_focus {
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 9235531..54cc537 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -118,7 +118,6 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window,
ingroup Win
@since 1.9 */
legacy: elm_win_wm_rotation_available_rotations_set;
-rotations: const;
}
get {
/*@
@@ -134,7 +133,7 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window,
return: bool;
}
values {
-int *rotations; /*@ The array of rotation value. */
+int *rotations @const_set; /*@ The array of rotation value. */
uint count; /*@ The number of array of rotations */
}
}
@@ -361,7 +360,6 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window,
@ingroup Win
@since 1.8 */
-profiles: const;
}
get {
/*@
@@ -374,7 +372,7 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window,
return: bool;
}
values {
-char **profiles; /*@ The string array of available profiles */
+char **profiles @const_set; /*@ The string array of available
profiles */
uint count; /*@ The number of members in profiles */
}
}
@@ -534,10 +532,9 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window,
@return The icon object set
@ingroup Win */
-icon: const;
}
values {
-Evas_Object *icon; /*@ The Evas image object to use for an icon */
+Evas_Object *icon @const_get; /*@ The Evas image object to use for
an icon */
}
}
quickpanel_priority_minor {
--
[EGIT] [core/efl] master 01/01: eolian: remove accessor params feature
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f86c2d4e5a8f39e4532437a9992c059ad9af1ae1
commit f86c2d4e5a8f39e4532437a9992c059ad9af1ae1
Author: Daniel Kolesa
Date: Wed Sep 10 15:06:12 2014 +0100
eolian: remove accessor params feature
Temporarily replace it with @const_get and @const_set tags in values
section.
---
src/lib/edje/edje_object.eo | 3 +-
src/lib/eolian/database_fill.c | 27 ++---
src/lib/eolian/eo_definitions.c | 14 -
src/lib/eolian/eo_definitions.h | 8 -
src/lib/eolian/eo_lexer.h| 6 ++--
src/lib/eolian/eo_parser.c | 59 +---
src/lib/evas/canvas/evas_image.eo| 6 ++--
src/tests/eolian/data/consts.eo | 3 +-
src/tests/eolian/data/object_impl.eo | 3 +-
9 files changed, 25 insertions(+), 104 deletions(-)
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 618d5fd..b265495 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -128,10 +128,9 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
if there was none, and on errors.
@see edje_object_perspective_set() */
-ps: const;
}
values {
-Edje_Perspective *ps; /*@ The perspective object that will be
used. */
+Edje_Perspective *ps @const_get; /*@ The perspective object that
will be used. */
}
}
scale {
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 02fd52e..00074ee 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -2,11 +2,8 @@
static Eina_Bool
_db_fill_accessor(Eolian_Function *foo_id, Eo_Class_Def *kls,
- Eo_Property_Def *prop, Eo_Accessor_Def *accessor)
+ Eo_Accessor_Def *accessor)
{
- Eo_Accessor_Param *acc_param;
- Eina_List *l;
-
if (accessor->type == SETTER)
foo_id->type = (foo_id->type == EOLIAN_PROP_GET) ? EOLIAN_PROPERTY
: EOLIAN_PROP_SET;
@@ -49,26 +46,6 @@ _db_fill_accessor(Eolian_Function *foo_id, Eo_Class_Def *kls,
foo_id->get_only_legacy = accessor->only_legacy;
}
- EINA_LIST_FOREACH(accessor->params, l, acc_param)
- {
-Eolian_Function_Parameter *desc = (Eolian_Function_Parameter*)
-eolian_function_parameter_get_by_name(foo_id, acc_param->name);
-
-if (!desc)
- {
- ERR("Error - %s not known as parameter of property %s\n",
- acc_param->name, prop->name);
- return EINA_FALSE;
- }
-else if (acc_param->is_const)
- {
- if (accessor->type == GETTER)
- desc->is_const_on_get = EINA_TRUE;
- else
- desc->is_const_on_set = EINA_TRUE;
- }
- }
-
if (kls->type == EOLIAN_CLASS_INTERFACE)
{
if (accessor->type == SETTER)
@@ -95,7 +72,7 @@ _db_fill_accessors(Eolian_Function *foo_id, Eo_Class_Def *kls,
Eina_List *l;
EINA_LIST_FOREACH(prop->accessors, l, accessor)
- if (!_db_fill_accessor(foo_id, kls, prop, accessor)) return EINA_FALSE;
+ if (!_db_fill_accessor(foo_id, kls, accessor)) return EINA_FALSE;
return EINA_TRUE;
}
diff --git a/src/lib/eolian/eo_definitions.c b/src/lib/eolian/eo_definitions.c
index 29a2b1b..9548fa5 100644
--- a/src/lib/eolian/eo_definitions.c
+++ b/src/lib/eolian/eo_definitions.c
@@ -13,13 +13,6 @@ eo_definitions_ret_free(Eo_Ret_Def *ret)
}
static void
-eo_definitions_accessor_param_free(Eo_Accessor_Param *param)
-{
- if (param->name) eina_stringshare_del(param->name);
- free(param);
-}
-
-static void
eo_definitions_accessor_free(Eo_Accessor_Def *accessor)
{
if (accessor->base.file)
@@ -31,10 +24,6 @@ eo_definitions_accessor_free(Eo_Accessor_Def *accessor)
if (accessor->legacy)
eina_stringshare_del(accessor->legacy);
- Eo_Accessor_Param *param;
- EINA_LIST_FREE(accessor->params, param)
- eo_definitions_accessor_param_free(param);
-
if (accessor->ret)
eo_definitions_ret_free(accessor->ret);
@@ -176,9 +165,6 @@ eo_definitions_temps_free(Eo_Lexer_Temps *tmp)
if (tmp->accessor)
eo_definitions_accessor_free(tmp->accessor);
- if (tmp->accessor_param)
- eo_definitions_accessor_param_free(tmp->accessor_param);
-
EINA_LIST_FREE(tmp->str_items, s)
if (s) eina_stringshare_del(s);
diff --git a/src/lib/eolian/eo_definitions.h b/src/lib/eolian/eo_definitions.h
index 6c3ce3e..4050bb8 100644
--- a/src/lib/eolian/eo_definitions.h
+++ b/src/lib/eolian/eo_definitions.h
@@ -24,12 +24,6 @@ typedef enum _Eo_Accessor_Type
GETTER
} Eo_Accessor_Type;
-typedef struct _Eo_Accessor_Param
-{
- Eina_Stringshare *name;
- Eina_Bool is_const:1;
-} Eo_Accessor_Param;
-
typedef struct _Eo_Accessor_Def
{
Eolian_Object base;
@@ -37,
Re: [E-devel] [EGIT] [apps/rage] master 01/01: dnd: Recurse into directories
Yes, I have plans to change this function to use eio, but I still did not
have the time to fix the issue of ordering the list of files to produce the
same results as this first patch. If anyone interested, there is a work in
progress in my eio branch.
Cheers, Etrunko
On Wed, Sep 10, 2014 at 6:12 AM, Cedric BAIL wrote:
> On Wed, Sep 10, 2014 at 10:13 AM, Sebastian Dransfeld
> wrote:
> > Maybe we should deprecate the ecore_file_*() functions which are
> > replaced by eina_file_*() functions? ecore_file_ls f.ex.
>
> Yes and depending on the use case, eio. Usually eina file operation do
> consume less memory and do more efficient syscall.
>
> Cedric
>
> > On 09/09/2014 10:17 PM, Eduardo Lima (Etrunko) wrote:
> >> etrunko pushed a commit to branch master.
> >>
> >>
> http://git.enlightenment.org/apps/rage.git/commit/?id=7c80b9a131b729bd244b40c194dc36bf24dde661
> >>
> >> commit 7c80b9a131b729bd244b40c194dc36bf24dde661
> >> Author: Eduardo Lima (Etrunko)
> >> Date: Mon Aug 25 15:36:44 2014 -0300
> >>
> >> dnd: Recurse into directories
> >>
> >> Signed-off-by: Eduardo Lima (Etrunko)
> >> ---
> >> AUTHORS | 1 +
> >> src/bin/dnd.c | 66
> +--
> >> 2 files changed, 61 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/AUTHORS b/AUTHORS
> >> index b9a9404..230cb46 100644
> >> --- a/AUTHORS
> >> +++ b/AUTHORS
> >> @@ -1 +1,2 @@
> >> Carsten Haitzler
> >> +Eduardo Lima (Etrunko)
> >> diff --git a/src/bin/dnd.c b/src/bin/dnd.c
> >> index f8faba4..1a8b9d2 100644
> >> --- a/src/bin/dnd.c
> >> +++ b/src/bin/dnd.c
> >> @@ -60,6 +60,39 @@ _escape_parse(const char *str)
> >> return dest;
> >> }
> >>
> >> +static Eina_Bool
> >> +_recurse_dir(Evas_Object *win, const char *path)
> >> +{
> >> + Eina_Bool ret = EINA_FALSE;
> >> + Eina_List *ls, *l;
> >> + char *p, *escape;
> >> + const char *full;
> >> +
> >> + ls = ecore_file_ls(path);
> >> + EINA_LIST_FOREACH(ls, l, p)
> >> + {
> >> +escape = _escape_parse(p);
> >> +full = eina_stringshare_printf("%s/%s", path, escape);
> >> +free(escape);
> >> +if (ecore_file_is_dir(full))
> >> + {
> >> + ret = _recurse_dir(win, full);
> >> + eina_stringshare_del(full);
> >> + continue;
> >> + }
> >> +
> >> +printf("inserting '%s'\n", full);
> >> +win_video_insert(win, full);
> >> +eina_stringshare_del(full);
> >> +ret = EINA_TRUE;
> >> + }
> >> +
> >> + EINA_LIST_FREE(ls, p)
> >> + free(p);
> >> +
> >> + return ret;
> >> +}
> >> +
> >> Eina_Bool
> >> _cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data
> *ev)
> >> {
> >> @@ -94,8 +127,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
> Elm_Selection_Data *ev)
> >> tt = _escape_parse(tb);
> >> if (tt)
> >> {
> >> - win_video_insert(win, tt);
> >> - inserted = EINA_TRUE;
> >> + if (ecore_file_is_dir(tt))
> >> + {
> >> + inserted = _recurse_dir(win, tt);
> >> + }
> >> + else
> >> + {
> >> + win_video_insert(win, tt);
> >> + inserted = EINA_TRUE;
> >> + }
> >>free(tt);
> >> }
> >>}
> >> @@ -108,8 +148,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
> Elm_Selection_Data *ev)
> >> tt = _escape_parse(tb);
> >> if (tt)
> >> {
> >> - win_video_insert(win, tt);
> >> - inserted = EINA_TRUE;
> >> + if (ecore_file_is_dir(tt))
> >> + {
> >> + inserted = _recurse_dir(win, tt);
> >> + }
> >> + else
> >> + {
> >> + win_video_insert(win, tt);
> >> + inserted = EINA_TRUE;
> >> + }
> >>free(tt);
> >> }
> >>}
> >> @@ -124,8 +171,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
> Elm_Selection_Data *ev)
> >> char *tt = _escape_parse(ev->data);
> >> if (tt)
> >> {
> >> - win_video_insert(win, tt);
> >> - inserted = EINA_TRUE;
>
[EGIT] [core/efl] master 01/01: eolian: we can only have 2 accessors
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=faa24705c8148806e33753a90e2130cd0afcf5f1
commit faa24705c8148806e33753a90e2130cd0afcf5f1
Author: Daniel Kolesa
Date: Wed Sep 10 15:22:04 2014 +0100
eolian: we can only have 2 accessors
---
src/lib/eolian/database_fill.c | 11 +--
src/lib/eolian/eo_definitions.c | 7 ---
src/lib/eolian/eo_definitions.h | 3 ++-
src/lib/eolian/eo_parser.c | 14 +-
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 00074ee..79b2178 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -68,11 +68,10 @@ static Eina_Bool
_db_fill_accessors(Eolian_Function *foo_id, Eo_Class_Def *kls,
Eo_Property_Def *prop)
{
- Eo_Accessor_Def *accessor;
- Eina_List *l;
-
- EINA_LIST_FOREACH(prop->accessors, l, accessor)
- if (!_db_fill_accessor(foo_id, kls, accessor)) return EINA_FALSE;
+ if (prop->get_accessor && !_db_fill_accessor(foo_id, kls,
prop->get_accessor))
+ return EINA_FALSE;
+ if (prop->set_accessor && !_db_fill_accessor(foo_id, kls,
prop->set_accessor))
+ return EINA_FALSE;
return EINA_TRUE;
}
@@ -91,7 +90,7 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Property_Def *prop)
foo_id->params = prop->values; prop->values = NULL;
if (!_db_fill_accessors(foo_id, kls, prop)) goto failure;
- if (!prop->accessors)
+ if (!prop->get_accessor && !prop->set_accessor)
{
foo_id->type = EOLIAN_PROPERTY;
if (kls->type == EOLIAN_CLASS_INTERFACE)
diff --git a/src/lib/eolian/eo_definitions.c b/src/lib/eolian/eo_definitions.c
index 9548fa5..c8958b7 100644
--- a/src/lib/eolian/eo_definitions.c
+++ b/src/lib/eolian/eo_definitions.c
@@ -34,7 +34,6 @@ static void
eo_definitions_property_def_free(Eo_Property_Def *prop)
{
Eolian_Function_Parameter *param;
- Eo_Accessor_Def *accessor;
if (prop->base.file)
eina_stringshare_del(prop->base.file);
@@ -48,8 +47,10 @@ eo_definitions_property_def_free(Eo_Property_Def *prop)
EINA_LIST_FREE(prop->values, param)
database_parameter_del(param);
- EINA_LIST_FREE(prop->accessors, accessor)
- eo_definitions_accessor_free(accessor);
+ if (prop->get_accessor)
+ eo_definitions_accessor_free(prop->get_accessor);
+ if (prop->set_accessor)
+ eo_definitions_accessor_free(prop->set_accessor);
free(prop);
}
diff --git a/src/lib/eolian/eo_definitions.h b/src/lib/eolian/eo_definitions.h
index 4050bb8..b2f3e11 100644
--- a/src/lib/eolian/eo_definitions.h
+++ b/src/lib/eolian/eo_definitions.h
@@ -42,7 +42,8 @@ typedef struct _Eo_Property_Def
Eina_Stringshare *name;
Eina_List *keys;
Eina_List *values;
- Eina_List *accessors;
+ Eo_Accessor_Def *get_accessor;
+ Eo_Accessor_Def *set_accessor;
int scope;
Eina_Bool is_class:1;
} Eo_Property_Def;
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index a4c3883..1e3f056 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1215,7 +1215,7 @@ parse_legacy(Eo_Lexer *ls)
check_next(ls, ';');
}
-static void
+static Eo_Accessor_Def *
parse_accessor(Eo_Lexer *ls)
{
int line, col;
@@ -1264,6 +1264,8 @@ parse_accessor(Eo_Lexer *ls)
}
end:
check_match(ls, '}', '{', line, col);
+ ls->tmp.accessor = NULL;
+ return acc;
}
static void
@@ -1322,17 +1324,11 @@ body:
{
case KW_get:
CASE_LOCK(ls, get, "get definition")
-parse_accessor(ls);
-prop->accessors = eina_list_append(prop->accessors,
- ls->tmp.accessor);
-ls->tmp.accessor = NULL;
+prop->get_accessor = parse_accessor(ls);
break;
case KW_set:
CASE_LOCK(ls, set, "set definition")
-parse_accessor(ls);
-prop->accessors = eina_list_append(prop->accessors,
- ls->tmp.accessor);
-ls->tmp.accessor = NULL;
+prop->set_accessor = parse_accessor(ls);
break;
case KW_keys:
CASE_LOCK(ls, keys, "keys definition")
--
[EGIT] [core/enlightenment] master 01/01: Revert "bugfix: When we free the pixmap, clear any user data set on the resource"
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1cd25a1595ef75eda9ddfb11ab0131255eb0effc commit 1cd25a1595ef75eda9ddfb11ab0131255eb0effc Author: Chris Michael Date: Wed Sep 10 10:24:07 2014 -0400 Revert "bugfix: When we free the pixmap, clear any user data set on the resource" This reverts commit b41dbbe9cf52e1807eda078c6d898085c73ecff7. Revert this ... it works, but it's not the "proper" fix as it just causes the crash(s) to happen elsewhere ... time to dig deeper --- src/bin/e_pixmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index 1ae2421..ed8552e 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -97,7 +97,7 @@ _e_pixmap_free(E_Pixmap *cp) break; case E_PIXMAP_TYPE_WL: #if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) -if (cp->resource) wl_resource_set_user_data(cp->resource, NULL); +/* NB: No-Op. Nothing to free. image data no longer memcpy'd */ #endif break; default: --
[EGIT] [core/efl] master 03/04: edje_cc_parse: Use eina_file_mkstemp() to avoid problems with umask
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cbc6cdda89102022ac02034692fe55a23ac6c0a9
commit cbc6cdda89102022ac02034692fe55a23ac6c0a9
Author: Stefan Schmidt
Date: Wed Sep 10 16:27:34 2014 +0200
edje_cc_parse: Use eina_file_mkstemp() to avoid problems with umask
CID 1039618
---
src/bin/edje/edje_cc_parse.c | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index b8286e9..cfefb45 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -851,11 +851,15 @@ parse(char *data, off_t size)
DBG("Parsing done");
}
-static char *clean_file = NULL;
+Eina_Tmpstr *clean_file = NULL;
static void
clean_tmp_file(void)
{
- if (clean_file) unlink(clean_file);
+ if (clean_file)
+ {
+unlink(clean_file);
+eina_tmpstr_del(clean_file);
+ }
}
int
@@ -901,27 +905,19 @@ compile(void)
{
char buf[4096], buf2[4096];
char inc[4096];
- static char tmpn[4096];
+ Eina_Tmpstr *tmpn;
int fd;
off_t size;
char *data, *p;
Eina_List *l;
Edje_Style *stl;
- if (!tmp_dir)
-#ifdef HAVE_EVIL
- tmp_dir = (char *)evil_tmpdir_get();
-#else
- tmp_dir = "/tmp";
-#endif
-
strncpy(inc, file_in, 4000);
inc[4001] = 0;
p = strrchr(inc, '/');
if (!p) strcpy(inc, "./");
else *p = 0;
- snprintf(tmpn, PATH_MAX, "%s/edje_cc.edc-tmp-XX", tmp_dir);
- fd = mkstemp(tmpn);
+ fd = eina_file_mkstemp("edje_cc.edc-tmp-XX", &tmpn);
if (fd < 0)
{
CRI("Unable to open temp file \"%s\" for pre-processor.", tmpn);
@@ -995,7 +991,7 @@ compile(void)
exit(-1);
}
if (ret == EXIT_SUCCESS)
- file_in = tmpn;
+ file_in = (char *)tmpn;
else
{
ERR("Exit code of epp not clean: %i", ret);
--
[EGIT] [core/efl] master 02/04: edje_cc: Use eina_file_mkstemp() to avoid problems with umask
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=693e9095eb519005662bcedc766c60a3165f7ef0
commit 693e9095eb519005662bcedc766c60a3165f7ef0
Author: Stefan Schmidt
Date: Wed Sep 10 15:41:59 2014 +0200
edje_cc: Use eina_file_mkstemp() to avoid problems with umask
In this case it also clears up the setup of temp dir.
CID 1039619
---
src/bin/edje/edje_cc_out.c | 20 +++-
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 0dab938..90d3dca 100755
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -127,8 +127,8 @@ struct _Script_Write
int i;
Ecore_Exe *exe;
int tmpn_fd, tmpo_fd;
- char tmpn[PATH_MAX];
- char tmpo[PATH_MAX];
+ Eina_Tmpstr *tmpn;
+ Eina_Tmpstr *tmpo;
char *errstr;
};
@@ -1441,6 +1441,8 @@ data_thread_script(void *data, Ecore_Thread *thread
EINA_UNUSED)
unlink(sc->tmpn);
unlink(sc->tmpo);
+ eina_tmpstr_del(sc->tmpn);
+ eina_tmpstr_del(sc->tmpo);
close(sc->tmpn_fd);
close(sc->tmpo_fd);
}
@@ -1493,13 +1495,6 @@ data_write_scripts(Eet_File *ef)
char inc_path[PATH_MAX] = "";
int i;
- if (!tmp_dir)
-#ifdef HAVE_EVIL
- tmp_dir = (char *)evil_tmpdir_get();
-#else
- tmp_dir = "/tmp";
-#endif
-
#ifdef _WIN32
# define BIN_EXT ".exe"
#else
@@ -1541,16 +1536,15 @@ data_write_scripts(Eet_File *ef)
sc->ef = ef;
sc->cd = cd;
sc->i = i;
-snprintf(sc->tmpn, PATH_MAX, "%s/edje_cc.sma-tmp-XX", tmp_dir);
-sc->tmpn_fd = mkstemp(sc->tmpn);
+sc->tmpn_fd = eina_file_mkstemp("edje_cc.sma-tmp-XX", &sc->tmpn);
if (sc->tmpn_fd < 0)
error_and_abort(ef, "Unable to open temp file \"%s\" for script "
"compilation.", sc->tmpn);
-snprintf(sc->tmpo, PATH_MAX, "%s/edje_cc.amx-tmp-XX", tmp_dir);
-sc->tmpo_fd = mkstemp(sc->tmpo);
+sc->tmpo_fd = eina_file_mkstemp("edje_cc.amx-tmp-XX", &sc->tmpo);
if (sc->tmpo_fd < 0)
{
unlink(sc->tmpn);
+ eina_tmpstr_del(sc->tmpn);
error_and_abort(ef, "Unable to open temp file \"%s\" for script "
"compilation.", sc->tmpo);
}
--
[EGIT] [core/efl] master 01/04: edje_cc: Print out the right file name on the error message.
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6d67f69061dc0075cef14b26a72aeed1208e15e4
commit 6d67f69061dc0075cef14b26a72aeed1208e15e4
Author: Stefan Schmidt
Date: Wed Sep 10 15:27:35 2014 +0200
edje_cc: Print out the right file name on the error message.
We failed to create sc->tmpo not tmpn here. Looks like a classical C&P error
---
src/bin/edje/edje_cc_out.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index d8a26c4..0dab938 100755
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -1552,7 +1552,7 @@ data_write_scripts(Eet_File *ef)
{
unlink(sc->tmpn);
error_and_abort(ef, "Unable to open temp file \"%s\" for script "
- "compilation.", sc->tmpn);
+ "compilation.", sc->tmpo);
}
create_script_file(ef, sc->tmpn, cd, sc->tmpn_fd);
snprintf(buf, sizeof(buf),
--
[EGIT] [core/efl] master 04/04: edje_cc: Remove no longer needed extern tmp_dir.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d55ab5e5cfe21c7563b582365a111faf2f427192 commit d55ab5e5cfe21c7563b582365a111faf2f427192 Author: Stefan Schmidt Date: Wed Sep 10 16:29:22 2014 +0200 edje_cc: Remove no longer needed extern tmp_dir. The last two user have been switched to eina_file_mkstemp so we don't need to setup tmp_dir anymore. --- src/bin/edje/edje_cc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/edje/edje_cc.h b/src/bin/edje/edje_cc.h index da7e9d5..6a6d79f 100644 --- a/src/bin/edje/edje_cc.h +++ b/src/bin/edje/edje_cc.h @@ -253,7 +253,6 @@ extern Eina_List *snd_dirs; extern Eina_List *vibration_dirs; extern Eina_List *data_dirs; extern char *file_in; -extern char *tmp_dir; extern char *file_out; extern char *watchfile; extern char *license; --
[EGIT] [core/efl] master 01/01: eolian: remove accessor structures
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ffb8e7903425b1d618484bffd0a483963c9b008b
commit ffb8e7903425b1d618484bffd0a483963c9b008b
Author: Daniel Kolesa
Date: Wed Sep 10 15:53:20 2014 +0100
eolian: remove accessor structures
---
src/lib/eolian/database_fill.c | 161 ++--
src/lib/eolian/eo_definitions.c | 42 +--
src/lib/eolian/eo_definitions.h | 32 +++-
src/lib/eolian/eo_parser.c | 54 +-
4 files changed, 136 insertions(+), 153 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 79b2178..f38b914 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -1,95 +1,86 @@
#include "eo_parser.h"
-static Eina_Bool
-_db_fill_accessor(Eolian_Function *foo_id, Eo_Class_Def *kls,
- Eo_Accessor_Def *accessor)
+static void
+_db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls, Eo_Property_Def *prop)
{
- if (accessor->type == SETTER)
- foo_id->type = (foo_id->type == EOLIAN_PROP_GET) ? EOLIAN_PROPERTY
- : EOLIAN_PROP_SET;
- else
- foo_id->type = (foo_id->type == EOLIAN_PROP_SET) ? EOLIAN_PROPERTY
- : EOLIAN_PROP_GET;
+ Eolian_Function *foo_id = database_function_new(prop->name,
+ EOLIAN_UNRESOLVED);
+
+ foo_id->scope = prop->scope;
+ foo_id->is_class = prop->is_class;
- if (accessor->ret && accessor->ret->type)
+ foo_id->keys = prop->keys ; prop->keys = NULL;
+ foo_id->params = prop->values; prop->values = NULL;
+
+ if (prop->get_ret)
{
-if (accessor->type == SETTER)
- {
- foo_id->set_ret_type = accessor->ret->type;
- foo_id->set_ret_val = accessor->ret->default_ret_val;
- foo_id->set_return_comment =
eina_stringshare_ref(accessor->ret->comment);
- foo_id->set_return_warn_unused = accessor->ret->warn_unused;
- }
-else
- {
- foo_id->get_ret_type = accessor->ret->type;
- foo_id->get_ret_val = accessor->ret->default_ret_val;
- foo_id->get_return_comment =
eina_stringshare_ref(accessor->ret->comment);
- foo_id->get_return_warn_unused = accessor->ret->warn_unused;
- }
-accessor->ret->type = NULL;
-accessor->ret->default_ret_val = NULL;
+foo_id->get_ret_type = prop->get_ret->type;
+prop->get_ret->type = NULL;
+foo_id->get_ret_val = prop->get_ret->default_ret_val;
+prop->get_ret->default_ret_val = NULL;
+foo_id->get_return_comment = prop->get_ret->comment;
+prop->get_ret->comment = NULL;
+foo_id->get_return_warn_unused = prop->get_ret->warn_unused;
}
-
- if (accessor->type == SETTER)
+ if (prop->set_ret)
{
-foo_id->set_description = eina_stringshare_ref(accessor->comment);
-if (accessor->legacy)
- foo_id->set_legacy = eina_stringshare_ref(accessor->legacy);
-foo_id->set_only_legacy = accessor->only_legacy;
+foo_id->set_ret_type = prop->set_ret->type;
+prop->set_ret->type = NULL;
+foo_id->set_ret_val = prop->set_ret->default_ret_val;
+prop->set_ret->default_ret_val = NULL;
+foo_id->set_return_comment = prop->set_ret->comment;
+prop->set_ret->comment = NULL;
+foo_id->set_return_warn_unused = prop->set_ret->warn_unused;
}
- else
+
+ if (prop->get_legacy)
+ {
+foo_id->get_legacy = prop->get_legacy;
+prop->get_legacy = NULL;
+}
+ if (prop->set_legacy)
+ {
+foo_id->set_legacy = prop->set_legacy;
+prop->set_legacy = NULL;
+}
+ foo_id->get_only_legacy = prop->get_only_legacy;
+ foo_id->set_only_legacy = prop->set_only_legacy;
+
+ if (prop->get_comment)
{
-foo_id->get_description = eina_stringshare_ref(accessor->comment);
-if (accessor->legacy)
- foo_id->get_legacy = eina_stringshare_ref(accessor->legacy);
-foo_id->get_only_legacy = accessor->only_legacy;
+foo_id->get_description = prop->get_comment;
+prop->get_comment = NULL;
+}
+ if (prop->set_comment)
+ {
+foo_id->set_description = prop->set_comment;
+prop->set_comment = NULL;
+}
+
+ if (prop->get_accessor)
+ {
+if (kls->type == EOLIAN_CLASS_INTERFACE)
+ foo_id->get_virtual_pure = EINA_TRUE;
+if (foo_id->type == EOLIAN_PROP_SET)
+ foo_id->type = EOLIAN_PROPERTY;
+else
+ foo_id->type = EOLIAN_PROP_GET;
+foo_id->base = prop->base;
+prop->base.file = NULL;
}
- if (kls->type == EOLIAN_CLASS_INTERFACE)
+ if (prop->set_accessor)
{
-if (accessor->type == SETTER)
+if (kls->type == EOLIAN_CLASS_INTERFACE)
[EGIT] [core/efl] master 01/01: eolian: remove Eo_Ret_Def
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=10843dc0e232367e89e1bd721d301d1930a47fc0
commit 10843dc0e232367e89e1bd721d301d1930a47fc0
Author: Daniel Kolesa
Date: Wed Sep 10 16:17:47 2014 +0100
eolian: remove Eo_Ret_Def
---
src/lib/eolian/database_fill.c | 71 +++--
src/lib/eolian/eo_definitions.c | 48 +++-
src/lib/eolian/eo_definitions.h | 35 ++--
src/lib/eolian/eo_parser.c | 62 ++-
4 files changed, 122 insertions(+), 94 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index f38b914..d0081cd 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -10,27 +10,27 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Property_Def *prop)
foo_id->is_class = prop->is_class;
foo_id->keys = prop->keys ; prop->keys = NULL;
- foo_id->params = prop->values; prop->values = NULL;
+ foo_id->params = prop->params; prop->params = NULL;
- if (prop->get_ret)
+ if (prop->get_ret_type)
{
-foo_id->get_ret_type = prop->get_ret->type;
-prop->get_ret->type = NULL;
-foo_id->get_ret_val = prop->get_ret->default_ret_val;
-prop->get_ret->default_ret_val = NULL;
-foo_id->get_return_comment = prop->get_ret->comment;
-prop->get_ret->comment = NULL;
-foo_id->get_return_warn_unused = prop->get_ret->warn_unused;
+foo_id->get_ret_type = prop->get_ret_type;
+prop->get_ret_type = NULL;
+foo_id->get_ret_val = prop->get_ret_val;
+prop->get_ret_val = NULL;
+foo_id->get_return_comment = prop->get_return_comment;
+prop->get_return_comment = NULL;
+foo_id->get_return_warn_unused = prop->get_return_warn_unused;
}
- if (prop->set_ret)
+ if (prop->set_ret_type)
{
-foo_id->set_ret_type = prop->set_ret->type;
-prop->set_ret->type = NULL;
-foo_id->set_ret_val = prop->set_ret->default_ret_val;
-prop->set_ret->default_ret_val = NULL;
-foo_id->set_return_comment = prop->set_ret->comment;
-prop->set_ret->comment = NULL;
-foo_id->set_return_warn_unused = prop->set_ret->warn_unused;
+foo_id->set_ret_type = prop->set_ret_type;
+prop->set_ret_type = NULL;
+foo_id->set_ret_val = prop->set_ret_val;
+prop->set_ret_val = NULL;
+foo_id->set_return_comment = prop->set_return_comment;
+prop->set_return_comment = NULL;
+foo_id->set_return_warn_unused = prop->set_return_warn_unused;
}
if (prop->get_legacy)
@@ -46,25 +46,23 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Property_Def *prop)
foo_id->get_only_legacy = prop->get_only_legacy;
foo_id->set_only_legacy = prop->set_only_legacy;
- if (prop->get_comment)
+ if (prop->get_description)
{
-foo_id->get_description = prop->get_comment;
-prop->get_comment = NULL;
+foo_id->get_description = prop->get_description;
+prop->get_description = NULL;
}
- if (prop->set_comment)
+ if (prop->set_description)
{
-foo_id->set_description = prop->set_comment;
-prop->set_comment = NULL;
+foo_id->set_description = prop->set_description;
+prop->set_description = NULL;
}
+ foo_id->type = prop->type;
+
if (prop->get_accessor)
{
if (kls->type == EOLIAN_CLASS_INTERFACE)
foo_id->get_virtual_pure = EINA_TRUE;
-if (foo_id->type == EOLIAN_PROP_SET)
- foo_id->type = EOLIAN_PROPERTY;
-else
- foo_id->type = EOLIAN_PROP_GET;
foo_id->base = prop->base;
prop->base.file = NULL;
}
@@ -73,10 +71,6 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Property_Def *prop)
{
if (kls->type == EOLIAN_CLASS_INTERFACE)
foo_id->set_virtual_pure = EINA_TRUE;
-if (foo_id->type == EOLIAN_PROP_GET)
- foo_id->type = EOLIAN_PROPERTY;
-else
- foo_id->type = EOLIAN_PROP_SET;
foo_id->set_base = prop->set_base;
prop->set_base.file = NULL;
}
@@ -112,14 +106,15 @@ _db_fill_method(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Method_Def *meth)
cl->methods = eina_list_append(cl->methods, foo_id);
- if (meth->ret)
+ if (meth->ret_type)
{
-foo_id->get_ret_type = meth->ret->type;
-foo_id->get_return_comment = eina_stringshare_ref(meth->ret->comment);
-foo_id->get_return_warn_unused = meth->ret->warn_unused;
-foo_id->get_ret_val = meth->ret->default_ret_val;
-meth->ret->type = NULL;
-meth->ret->default_ret_val = NULL;
+foo_id->get_ret_type = meth->ret_type;
+meth->ret_type = NULL;
+foo_id->get_return_comment = meth->ret_comment;
+meth->ret_comment = NULL;
+foo_id
[EGIT] [core/efl] master 01/01: eolian: property cleanup
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=588f2dd9db091978f9041b5030608e026c10f492
commit 588f2dd9db091978f9041b5030608e026c10f492
Author: Daniel Kolesa
Date: Wed Sep 10 16:46:34 2014 +0100
eolian: property cleanup
---
src/lib/eolian/database_fill.c | 20 +++-
src/lib/eolian/eo_parser.c | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index d0081cd..33ef6ec 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -61,29 +61,31 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls,
Eo_Property_Def *prop)
if (prop->get_accessor)
{
-if (kls->type == EOLIAN_CLASS_INTERFACE)
- foo_id->get_virtual_pure = EINA_TRUE;
foo_id->base = prop->base;
prop->base.file = NULL;
}
if (prop->set_accessor)
{
-if (kls->type == EOLIAN_CLASS_INTERFACE)
- foo_id->set_virtual_pure = EINA_TRUE;
foo_id->set_base = prop->set_base;
prop->set_base.file = NULL;
}
-
- if (!prop->get_accessor && !prop->set_accessor)
+ else
{
-foo_id->type = EOLIAN_PROPERTY;
-if (kls->type == EOLIAN_CLASS_INTERFACE)
- foo_id->get_virtual_pure = foo_id->set_virtual_pure = EINA_TRUE;
foo_id->base = prop->base;
prop->base.file = NULL;
}
+ if (kls->type == EOLIAN_CLASS_INTERFACE)
+ {
+if (foo_id->type == EOLIAN_PROP_GET)
+ foo_id->get_virtual_pure = EINA_TRUE;
+else if (foo_id->type == EOLIAN_PROP_SET)
+ foo_id->set_virtual_pure = EINA_TRUE;
+if (foo_id->type == EOLIAN_PROPERTY)
+ foo_id->get_virtual_pure = foo_id->set_virtual_pure = EINA_TRUE;
+ }
+
cl->properties = eina_list_append(cl->properties, foo_id);
}
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 37d1b5c..baf6d7c 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1392,6 +1392,8 @@ body:
}
end:
check_match(ls, '}', '{', line, col);
+ if (!has_get && !has_set)
+ prop->type = EOLIAN_PROPERTY;
}
static void
--
Re: [E-devel] [EGIT] [apps/ecrire] master 01/01: Fix .arcconfig to point to the correct repo.
Hi, which phab page does this change affect?
Thanks in advance.
Daniel Juyung Seo (SeoZ)
On Wed, Sep 10, 2014 at 11:05 PM, Tom Hacohen wrote:
> tasn pushed a commit to branch master.
>
>
> http://git.enlightenment.org/apps/ecrire.git/commit/?id=c87ced38cf2ed630d64dbae4be5c7775af673ac3
>
> commit c87ced38cf2ed630d64dbae4be5c7775af673ac3
> Author: Tom Hacohen
> Date: Wed Sep 10 15:04:20 2014 +0100
>
> Fix .arcconfig to point to the correct repo.
>
> Repo name on phab is confusing...
> ---
> .arcconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.arcconfig b/.arcconfig
> index 3c13b03..b975fec 100644
> --- a/.arcconfig
> +++ b/.arcconfig
> @@ -1,4 +1,4 @@
> {
> - "project_id" : "ecrire",
> + "project_id" : "apps/ecrire",
>"conduit_uri" : "https://phab.enlightenment.org/";
> }
>
> --
>
>
>
--
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/elm-theme-viewer] master 01/01: arcconfig: added .arcconfig file
seoz pushed a commit to branch master.
http://git.enlightenment.org/tools/elm-theme-viewer.git/commit/?id=69d44015b97494a54cd4cf8208902bdb3e90553a
commit 69d44015b97494a54cd4cf8208902bdb3e90553a
Author: Daniel Juyung Seo
Date: Thu Sep 11 01:07:39 2014 +0900
arcconfig: added .arcconfig file
---
.arcconfig | 4
1 file changed, 4 insertions(+)
diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 000..0e2c30f
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,4 @@
+{
+ "project_id" : "tools/elm-theme-viewer",
+ "conduit_uri" : "https://phab.enlightenment.org/";
+}
--
Re: [E-devel] [EGIT] [apps/ecrire] master 01/01: Fix .arcconfig to point to the correct repo.
Huh? It's ecrire...
On 10/09/14 17:07, Daniel Juyung Seo wrote:
> Hi, which phab page does this change affect?
>
> Thanks in advance.
>
> Daniel Juyung Seo (SeoZ)
>
> On Wed, Sep 10, 2014 at 11:05 PM, Tom Hacohen wrote:
>
>> tasn pushed a commit to branch master.
>>
>>
>> http://git.enlightenment.org/apps/ecrire.git/commit/?id=c87ced38cf2ed630d64dbae4be5c7775af673ac3
>>
>> commit c87ced38cf2ed630d64dbae4be5c7775af673ac3
>> Author: Tom Hacohen
>> Date: Wed Sep 10 15:04:20 2014 +0100
>>
>> Fix .arcconfig to point to the correct repo.
>>
>> Repo name on phab is confusing...
>> ---
>> .arcconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/.arcconfig b/.arcconfig
>> index 3c13b03..b975fec 100644
>> --- a/.arcconfig
>> +++ b/.arcconfig
>> @@ -1,4 +1,4 @@
>> {
>> - "project_id" : "ecrire",
>> + "project_id" : "apps/ecrire",
>> "conduit_uri" : "https://phab.enlightenment.org/";
>> }
>>
>> --
>>
>>
>>
> --
> Want excitement?
> Manually upgrade your production database.
> When you want reliability, choose Perforce
> Perforce version control. Predictably reliable.
> http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/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: eolian: remove Eo_Property_Def
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2219c0329d7ee5ea177e12a6bf736f0b084f7fbb
commit 2219c0329d7ee5ea177e12a6bf736f0b084f7fbb
Author: Daniel Kolesa
Date: Wed Sep 10 16:58:29 2014 +0100
eolian: remove Eo_Property_Def
---
src/lib/eolian/database_fill.c | 101 +---
src/lib/eolian/eo_definitions.c | 53 ++---
src/lib/eolian/eo_definitions.h | 32 +
src/lib/eolian/eo_parser.c | 25 --
4 files changed, 25 insertions(+), 186 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 33ef6ec..46be5fb 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -1,104 +1,5 @@
#include "eo_parser.h"
-static void
-_db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls, Eo_Property_Def *prop)
-{
- Eolian_Function *foo_id = database_function_new(prop->name,
- EOLIAN_UNRESOLVED);
-
- foo_id->scope = prop->scope;
- foo_id->is_class = prop->is_class;
-
- foo_id->keys = prop->keys ; prop->keys = NULL;
- foo_id->params = prop->params; prop->params = NULL;
-
- if (prop->get_ret_type)
- {
-foo_id->get_ret_type = prop->get_ret_type;
-prop->get_ret_type = NULL;
-foo_id->get_ret_val = prop->get_ret_val;
-prop->get_ret_val = NULL;
-foo_id->get_return_comment = prop->get_return_comment;
-prop->get_return_comment = NULL;
-foo_id->get_return_warn_unused = prop->get_return_warn_unused;
- }
- if (prop->set_ret_type)
- {
-foo_id->set_ret_type = prop->set_ret_type;
-prop->set_ret_type = NULL;
-foo_id->set_ret_val = prop->set_ret_val;
-prop->set_ret_val = NULL;
-foo_id->set_return_comment = prop->set_return_comment;
-prop->set_return_comment = NULL;
-foo_id->set_return_warn_unused = prop->set_return_warn_unused;
- }
-
- if (prop->get_legacy)
- {
-foo_id->get_legacy = prop->get_legacy;
-prop->get_legacy = NULL;
-}
- if (prop->set_legacy)
- {
-foo_id->set_legacy = prop->set_legacy;
-prop->set_legacy = NULL;
-}
- foo_id->get_only_legacy = prop->get_only_legacy;
- foo_id->set_only_legacy = prop->set_only_legacy;
-
- if (prop->get_description)
- {
-foo_id->get_description = prop->get_description;
-prop->get_description = NULL;
-}
- if (prop->set_description)
- {
-foo_id->set_description = prop->set_description;
-prop->set_description = NULL;
-}
-
- foo_id->type = prop->type;
-
- if (prop->get_accessor)
- {
-foo_id->base = prop->base;
-prop->base.file = NULL;
- }
-
- if (prop->set_accessor)
- {
-foo_id->set_base = prop->set_base;
-prop->set_base.file = NULL;
- }
- else
- {
-foo_id->base = prop->base;
-prop->base.file = NULL;
- }
-
- if (kls->type == EOLIAN_CLASS_INTERFACE)
- {
-if (foo_id->type == EOLIAN_PROP_GET)
- foo_id->get_virtual_pure = EINA_TRUE;
-else if (foo_id->type == EOLIAN_PROP_SET)
- foo_id->set_virtual_pure = EINA_TRUE;
-if (foo_id->type == EOLIAN_PROPERTY)
- foo_id->get_virtual_pure = foo_id->set_virtual_pure = EINA_TRUE;
- }
-
- cl->properties = eina_list_append(cl->properties, foo_id);
-}
-
-static void
-_db_fill_properties(Eolian_Class *cl, Eo_Class_Def *kls)
-{
- Eo_Property_Def *prop;
- Eina_List *l;
-
- EINA_LIST_FOREACH(kls->properties, l, prop)
- _db_fill_property(cl, kls, prop);
-}
-
static Eina_Bool
_db_fill_method(Eolian_Class *cl, Eo_Class_Def *kls, Eo_Method_Def *meth)
{
@@ -422,7 +323,7 @@ _db_fill_class(Eo_Class_Def *kls)
if (kls->data_type)
cl->data_type = eina_stringshare_ref(kls->data_type);
- _db_fill_properties(cl, kls);
+ cl->properties = kls->properties; kls->properties = NULL;
if (!_db_fill_methods (cl, kls)) return EINA_FALSE;
if (!_db_fill_implements (cl, kls)) return EINA_FALSE;
diff --git a/src/lib/eolian/eo_definitions.c b/src/lib/eolian/eo_definitions.c
index 4511e39..ca4580c 100644
--- a/src/lib/eolian/eo_definitions.c
+++ b/src/lib/eolian/eo_definitions.c
@@ -4,53 +4,6 @@
#include "eo_definitions.h"
static void
-eo_definitions_property_def_free(Eo_Property_Def *prop)
-{
- Eolian_Function_Parameter *param;
-
- if (prop->base.file)
- eina_stringshare_del(prop->base.file);
-
- if (prop->name)
- eina_stringshare_del(prop->name);
-
- EINA_LIST_FREE(prop->keys, param)
- database_parameter_del(param);
-
- EINA_LIST_FREE(prop->params, param)
- database_parameter_del(param);
-
- if (prop->get_description)
- eina_stringshare_del(prop->get_description);
-
- if (prop->set_description)
- eina_stringshare_del(prop->set_description);
-
- if (prop->get_legacy)
- eina_stringshare
[EGIT] [bindings/python/python-efl] master 02/02: setup.py: Fix check for Cython when building from git source
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=cf358655c079fb13ecf0f28e212f1ba20d443f61 commit cf358655c079fb13ecf0f28e212f1ba20d443f61 Author: Kai Huuhko Date: Wed Sep 10 20:04:18 2014 +0300 setup.py: Fix check for Cython when building from git source --- setup.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/setup.py b/setup.py index 864ce8a..8624512 100755 --- a/setup.py +++ b/setup.py @@ -113,6 +113,12 @@ else: from Cython.Build import cythonize import Cython.Compiler.Options except ImportError: +if not os.path.exists(os.path.join(script_path, "efl/eo/efl.eo.c")): +raise SystemExit( +"Requires Cython >= %s (http://cython.org/)" % ( +CYTHON_MIN_VERSION +) +) module_suffix = ".c" from distutils.command.build_ext import build_ext --
[EGIT] [bindings/python/python-efl] master 01/02: api_coverage.py: py3k compatibility fix
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=2d3784e8cb0487de35ee8988f092cac80a877a33 commit 2d3784e8cb0487de35ee8988f092cac80a877a33 Author: Kai Huuhko Date: Sun Aug 31 17:26:19 2014 +0300 api_coverage.py: py3k compatibility fix --- api_coverage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api_coverage.py b/api_coverage.py index 9c713a9..e51624f 100755 --- a/api_coverage.py +++ b/api_coverage.py @@ -74,7 +74,7 @@ api_group.add_argument( parser.add_argument( "libs", nargs="*", -choices=(params.keys() + ["all"]), +choices=(list(params.keys()) + ["all"]), default="all" ) args = parser.parse_args() --
[EGIT] [core/enlightenment] master 01/01: conf_paths: Fix 'user directory' frame to resize better and adjust size of Default & Paths lists.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=284e2641e6fc78a0c2a603241d44985ddd65e0c1
commit 284e2641e6fc78a0c2a603241d44985ddd65e0c1
Author: Chris Michael
Date: Wed Sep 10 14:34:50 2014 -0400
conf_paths: Fix 'user directory' frame to resize better and adjust
size of Default & Paths lists.
Signed-off-by: Chris Michael
---
src/modules/conf_paths/e_int_config_paths.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/conf_paths/e_int_config_paths.c
b/src/modules/conf_paths/e_int_config_paths.c
index 4aa9f06..076ec4f 100644
--- a/src/modules/conf_paths/e_int_config_paths.c
+++ b/src/modules/conf_paths/e_int_config_paths.c
@@ -163,7 +163,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
Evas *evas, E_Config_Dia
of = e_widget_framelist_add(evas, _("Enlightenment Paths"), 0);
ob = e_widget_ilist_add(evas, 0, 0, NULL);
cfdata->gui.path_list = ob;
- e_widget_size_min_set(ob, 170, 100);
+ e_widget_size_min_set(ob, 220, 100);
evas_event_freeze(evas_object_evas_get(cfdata->gui.path_list));
edje_freeze();
@@ -187,16 +187,16 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
Evas *evas, E_Config_Dia
e_widget_ilist_thaw(cfdata->gui.path_list);
edje_thaw();
evas_event_thaw(evas_object_evas_get(cfdata->gui.path_list));
-
+
e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
+ e_widget_table_object_append(o, of, 0, 0, 1, 1, 0, 1, 0, 1);
of = e_widget_framelist_add(evas, _("Default Directories"), 0);
ob = e_widget_ilist_add(evas, 0, 0, NULL);
cfdata->gui.default_list = ob;
- e_widget_size_min_set(ob, 100, 100);
+ e_widget_size_min_set(ob, 220, 100);
e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1);
+ e_widget_table_object_append(o, of, 0, 1, 1, 1, 0, 1, 0, 1);
of = e_widget_framelist_add(evas, _("User Defined Directories"), 0);
ob = e_widget_config_list_add(evas, e_widget_entry_add,
@@ -204,7 +204,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
Evas *evas, E_Config_Dia
e_widget_disabled_set(ob, 1);
cfdata->gui.user_list = ob;
e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(o, of, 1, 0, 1, 2, 0, 1, 0, 1);
+ e_widget_table_object_append(o, of, 1, 0, 1, 2, 1, 1, 1, 1);
return o;
}
--
Re: [E-devel] Blog about EO
Very nice!! :D
On 9/8/14, Tom Hacohen wrote:
> On 08/09/14 14:50, Daniel Zaoui wrote:
>> ReHi,
>>
>> On 09/08/14 16:42, Daniel Zaoui wrote:
>>> Hi,
>>>
>>> On 09/08/14 16:16, Jean Rene Dawin wrote:
On Sat, Aug 16, 2014 at 02:36:10PM +0900, Carsten Haitzler wrote:
> About time i got back to blogging about EFL etc.
>
> https://phab.enlightenment.org/phame/live/1//post/yet_another_c_object_model_but_better/
>
Hi,
thanks for the explanations. Trying to reproduce the steps, the result
of my tst.c
differd a bit, though. I didn't get
EOLIAN static void
_tst_eo_base_constructor(Eo *obj, Tst_Data *pd)
{
eo_do_super(obj, TST_CLASS, eo_constructor());
}
EOLIAN static void
_tst_eo_base_destructor(Eo *obj, Tst_Data *pd)
{
eo_do_super(obj, TST_CLASS, eo_destructor());
}
but instead
EOLIAN static void
_tst_class_constructor(Eo_Class *klass)
{
}
EOLIAN static void
_tst_class_destructor(Eo_Class *klass)
{
}
Is there a more detailed documentation of the Eo-Syntax and API
somewhere?
Becuase the one on docs.enlightenment.org is not so verbose or maybe
outdated.
Is this because there will be more changes to Eo and things are not
fixed yet?
Thanks for your help,
Jean Rene Dawin
--
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>>> You should try with Base.constructor instead of class.constructor (same
>>> for the destructor).
>>
>> I meant Eo.Base.constructor.
>
> One important thing to mention is that while we try not to, we change
> the Eolian syntax every now and then. Same goes with some of the class
> names and hierarchy, so the blog post may not be a 1-1 to what's
> currently in.
>
> --
> Tom.
>
>
>
> --
> Want excitement?
> Manually upgrade your production database.
> When you want reliability, choose Perforce
> Perforce version control. Predictably reliable.
> http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
--
Amitesh
--
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [misc/entrance] master 03/04: entrance: fix autologin
yoz pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1872433afa1f0ff4e684828444881913e140eb22
commit 1872433afa1f0ff4e684828444881913e140eb22
Author: Michael Bouchaud
Date: Wed Sep 10 21:01:51 2014 +
entrance: fix autologin
---
src/daemon/entrance.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/daemon/entrance.c b/src/daemon/entrance.c
index 92f39d3..3250567 100644
--- a/src/daemon/entrance.c
+++ b/src/daemon/entrance.c
@@ -403,6 +403,7 @@ main (int argc, char ** argv)
ecore_main_loop_begin();
PT("auth user\n");
#ifdef HAVE_PAM
+entrance_pam_init(PACKAGE, dname, NULL);
entrance_pam_item_set(ENTRANCE_PAM_ITEM_USER,
entrance_config->userlogin);
#endif
PT("login user\n");
--
[EGIT] [misc/entrance] master 01/04: Revert "entrance: delete the Evas_Object later."
yoz pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=f86244db338866a99585328eea06fde9bbfffa4a
commit f86244db338866a99585328eea06fde9bbfffa4a
Author: Michael Bouchaud
Date: Sun Jul 20 21:12:48 2014 +
Revert "entrance: delete the Evas_Object later."
This reverts commit 989e78eb40634da27d2083919f78d54d5be0f8d6.
---
src/bin/entrance_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index bd709c8..f7e2b5e 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -72,10 +72,10 @@ _entrance_conf_end(Evas_Object *win)
Eina_List *l;
PT("Delete config panel\n");
+ evas_object_del(win);
EINA_LIST_FOREACH(_entrance_conf->modules, l, conf)
conf->end();
_entrance_conf->current = NULL;
- evas_object_del(win);
}
void
--
[EGIT] [misc/entrance] master 04/04: entrance: autologin use the session saved in your profil
yoz pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=46c7cc4214ab10cf105c5e5f111e41e7998e0158
commit 46c7cc4214ab10cf105c5e5f111e41e7998e0158
Author: Michael Bouchaud
Date: Wed Sep 10 21:13:32 2014 +
entrance: autologin use the session saved in your profil
---
src/daemon/entrance.c | 9 ++---
src/daemon/entrance_history.c | 14 ++
src/daemon/entrance_history.h | 1 +
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/daemon/entrance.c b/src/daemon/entrance.c
index 3250567..de43162 100644
--- a/src/daemon/entrance.c
+++ b/src/daemon/entrance.c
@@ -394,7 +394,7 @@ main (int argc, char ** argv)
_entrance_main(dname);
PT("history init\n");
entrance_history_init();
- if (entrance_config->autologin && !entrance_user)
+ if (entrance_config->autologin)
{
PT("autologin init\n");
xcb_connection_t *disp = NULL;
@@ -404,10 +404,13 @@ main (int argc, char ** argv)
PT("auth user\n");
#ifdef HAVE_PAM
entrance_pam_init(PACKAGE, dname, NULL);
-entrance_pam_item_set(ENTRANCE_PAM_ITEM_USER,
entrance_config->userlogin);
+entrance_pam_item_set(ENTRANCE_PAM_ITEM_USER,
+ entrance_config->userlogin);
#endif
PT("login user\n");
-entrance_session_login(NULL, EINA_FALSE);
+entrance_session_login(
+ entrance_history_user_session_get(entrance_config->userlogin),
+ EINA_FALSE);
sleep(30);
xcb_disconnect(disp);
}
diff --git a/src/daemon/entrance_history.c b/src/daemon/entrance_history.c
index b958121..42770ba 100644
--- a/src/daemon/entrance_history.c
+++ b/src/daemon/entrance_history.c
@@ -98,6 +98,20 @@ _entrance_history_write(void)
}
}
+const char *
+entrance_history_user_session_get(const char *login)
+{
+ Eina_List *l;
+ Entrance_Login *el;
+
+ EINA_LIST_FOREACH(_entrance_history->history, l, el)
+ {
+if (!strcmp(login, el->login))
+ return el->lsess;
+ }
+ return NULL;
+}
+
void
entrance_history_push(const char *login, const char *session)
{
diff --git a/src/daemon/entrance_history.h b/src/daemon/entrance_history.h
index 8ebbc62..90d4584 100644
--- a/src/daemon/entrance_history.h
+++ b/src/daemon/entrance_history.h
@@ -6,6 +6,7 @@ void entrance_history_shutdown(void);
void entrance_history_push(const char *login, const char *session);
Eina_List *entrance_history_get(void);
void entrance_history_user_update(const Entrance_Login *el);
+const char *entrance_history_user_session_get(const char *user);
typedef struct _Entrance_History Entrance_History;
--
[EGIT] [misc/entrance] master 02/04: Revert "entrance: delete the preview here."
yoz pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=44e1a9c8928cf26db66e420362604b17165b7afd
commit 44e1a9c8928cf26db66e420362604b17165b7afd
Author: Michael Bouchaud
Date: Sun Jul 20 21:14:10 2014 +
Revert "entrance: delete the preview here."
This reverts commit f626cb0a233e18c50b0ea9e76370802bbc48aeba.
---
src/bin/entrance_conf_theme.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/bin/entrance_conf_theme.c b/src/bin/entrance_conf_theme.c
index ace7450..8c59a66 100644
--- a/src/bin/entrance_conf_theme.c
+++ b/src/bin/entrance_conf_theme.c
@@ -79,11 +79,8 @@ _entrance_conf_theme_update_preview(const char *name)
static void
_entrance_conf_theme_end(void)
{
- Evas_Object *o;
- o = elm_object_part_content_get(_entrance_int_conf_theme->preview,
"default");
- if (o)
- _entrance_tp_del(o);
free(_entrance_int_conf_theme);
+ evas_object_del(_entrance_int_conf_theme->preview);
}
static Eina_Bool
--
[EGIT] [core/enlightenment] master 01/01: Updating catalan translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f5802a63cc14a6ea903aeed74813f48b900f78f0 commit f5802a63cc14a6ea903aeed74813f48b900f78f0 Author: maxerba Date: Wed Sep 10 22:25:49 2014 +0200 Updating catalan translation --- po/ca.po | 1590 +- 1 file changed, 843 insertions(+), 747 deletions(-) diff --git a/po/ca.po b/po/ca.po index 6af83d0..523f870 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,30 +9,47 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n" -"POT-Creation-Date: 2014-07-01 11:30+0200\n" -"PO-Revision-Date: 2014-07-04 06:09+\n" -"Last-Translator: JoanColl \n" +"POT-Creation-Date: 2014-09-06 11:30+0200\n" +"PO-Revision-Date: 2014-09-07 17:24+\n" +"Last-Translator: marcfp \n" "Language-Team: Català \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2014-07-05 04:54+\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2014-09-10 18:34+\n" +"X-Generator: Launchpad (build 17196)\n" "Language: ca\n" "X-Poedit-Bookmarks: -1,-1,1139,-1,-1,-1,-1,-1,-1,-1\n" +#: src/bin/e_actions.c:3365 +msgid "Log Out" +msgstr "Finalitza sessió" + +#: src/bin/e_int_client_locks.c:319 src/bin/e_int_client_locks.c:338 +#: src/bin/e_int_client_remember.c:768 +msgid "Shaded state" +msgstr "Estat d'ombrejat" + +#: src/bin/e_int_config_comp_match.c:526 +msgid "Flags" +msgstr "Indicadors" + +#: src/modules/fileman/e_mod_config.c:484 +msgid "Tooltips" +msgstr "Consells d'eines" + #: src/bin/e_about.c:17 msgid "About Enlightenment" msgstr "Quant a Enlightenment" -#: src/bin/e_about.c:20 src/bin/e_actions.c:2958 src/bin/e_config_dialog.c:287 -#: src/bin/e_fm.c:1089 src/bin/e_int_client_menu.c:219 +#: src/bin/e_about.c:20 src/bin/e_actions.c:2958 src/bin/e_config_dialog.c:288 +#: src/bin/e_fm.c:1072 src/bin/e_int_client_menu.c:230 #: src/bin/e_int_client_prop.c:81 src/bin/e_theme_about.c:24 #: src/modules/conf/e_conf.c:169 #: src/modules/conf_bindings/e_int_config_edgebindings.c:876 #: src/modules/everything/evry_plug_windows.c:455 -#: src/modules/fileman/e_fwin.c:2576 src/modules/mixer/app_mixer.c:505 +#: src/modules/fileman/e_fwin.c:2575 src/modules/mixer/app_mixer.c:505 msgid "Close" msgstr "Tanca" @@ -76,16 +93,16 @@ msgid "Are you sure you want to kill this window?" msgstr "Esteu segur que voleu matar aquesta finestra?" #: src/bin/e_actions.c:373 src/bin/e_actions.c:2963 -#: src/bin/e_int_client_menu.c:789 +#: src/bin/e_int_client_menu.c:800 msgid "Kill" msgstr "Mata" #: src/bin/e_actions.c:375 src/bin/e_actions.c:2084 src/bin/e_actions.c:2178 #: src/bin/e_actions.c:2238 src/bin/e_actions.c:2298 src/bin/e_actions.c:2363 #: src/bin/e_actions.c:2428 src/bin/e_confirm_dialog.c:53 -#: src/bin/e_desklock.c:543 src/bin/e_fm.c:10595 src/bin/e_fm.c:10948 -#: src/bin/e_screensaver.c:197 -#: src/modules/quickaccess/e_mod_quickaccess.c:1302 +#: src/bin/e_desklock.c:543 src/bin/e_fm.c:10582 src/bin/e_fm.c:10935 +#: src/bin/e_screensaver.c:196 +#: src/modules/quickaccess/e_mod_quickaccess.c:1308 msgid "No" msgstr "No" @@ -99,21 +116,21 @@ msgstr "Segur que voleu sortir?" #: src/bin/e_actions.c:2082 src/bin/e_actions.c:2176 src/bin/e_actions.c:2236 #: src/bin/e_actions.c:2296 src/bin/e_actions.c:2361 src/bin/e_actions.c:2426 -#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:541 src/bin/e_fm.c:10598 -#: src/bin/e_screensaver.c:195 -#: src/modules/quickaccess/e_mod_quickaccess.c:1302 +#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:541 src/bin/e_fm.c:10585 +#: src/bin/e_screensaver.c:194 +#: src/modules/quickaccess/e_mod_quickaccess.c:1308 msgid "Yes" msgstr "Sí" #: src/bin/e_actions.c:2173 msgid "Logout" -msgstr "Tanca sessió" +msgstr "Surt" #: src/bin/e_actions.c:2174 msgid "Are you sure you want to logout?" msgstr "Segur que voleu tancar la sessió?" -#: src/bin/e_actions.c:2232 src/bin/e_sys.c:970 +#: src/bin/e_actions.c:2232 src/bin/e_sys.c:971 msgid "Power off" msgstr "Apaga" @@ -154,12 +171,12 @@ msgstr "Segur que voleu hibernar l'ordinador?" msgid "Window : Actions" msgstr "Finestra : Accions" -#: src/bin/e_actions.c:2918 src/bin/e_fm.c:11724 -#: src/bin/e_int_client_menu.c:709 +#: src/bin/e_actions.c:2918 src/bin/e_fm.c:11711 +#: src/bin/e_int_client_menu.c:720 msgid "Move" msgstr "Mou" -#: src/bin/e_actions.c:2929 src/bin/e_int_client_menu.c:723 +#: src/bin/e_actions.c:2929 src/bin/e_int_client_menu.c:734 msgid "Resize" msgstr "Redimensiona" @@ -174,12 +191,12 @@ msgstr "Menú" msgid "Window Menu" msgstr "Menú de finestra" -#: src/bin/e_actions.c:2948 src/bin/e_int_client_menu.c:1103 +#: src/bin/e_actions.c:2948 src/bin/e_int_client_menu.c:1114 #: src/modules/winlist/e_int_config_winlist.c:207 msgid "Rais
Re: [E-devel] Pen support in EFL?
I love this thread. B-]
I'd like to add newly defined events for the Joystick. It needs information
such as Id, Index, Buttons, Axises, Connection(Disconnection) and so on.
You could find such information from the W3C(http://www.w3.org/TR/gamepad/)
also.
This thread would be a good reference before adding the events.
It have taken much of time to be here. So I'm sorry and frustrated already.
Anyway, thank you. :-P
Sincerely
Shinwoo Kim.
On Wed, Sep 10, 2014 at 3:50 AM, Jason Gerecke wrote:
> I've finished making the requested updates, but forgot to check to see
> what your thoughts are about the coordinate system used in the events.
> Right now data is being passed through pretty much as-is, but this
> might not be appropriate if a window has been rotated. I assume we
> want to adjust the reported AZIMUTH and TWIST values so that the
> application doesn't have to worry about it, but where can I find the
> necessary information? Also, is there any sense in adjusting the other
> axes (e.g. X, Y, {TOUCH,TOOL}_WIDTH_{MAJOR,MINOR}) to account for e.g.
> scaling?
>
> Jason
> ---
> Now instead of four in the eights place /
> you’ve got three, ‘Cause you added one /
> (That is to say, eight) to the two, /
> But you can’t take seven from three,/
> So you look at the sixty-fours
>
>
>
> On Sat, Aug 30, 2014 at 7:32 PM, Carsten Haitzler
> wrote:
> > On Sat, 30 Aug 2014 18:37:13 -0700 Jason Gerecke
> said:
> >
> >> On Fri, Aug 29, 2014 at 7:25 PM, Carsten Haitzler >
> >> wrote:
> >> > On Fri, 29 Aug 2014 13:18:37 -0700 Jason Gerecke <
> killert...@gmail.com>
> >> > said:
> >> >
> >> > review below. btw. it'd be really awesome if you could use arc to
> land these
> >> > patches for review. this is part of our "getting organized" and using
> tools
> >> > to make sure patches don't vanish in an inbox. :) there is a special
> >> > limited sized review list for patches which allows inline code
> comments
> >> > etc. etc. see http://phab.enlightenment.org
> >> > http://phab.enlightenment.org/w/arcanist/
> >> >
> >> > 0001-Break-_ecore_x_input_handler-into-task-specific-sub-.patch:
> >> >
> >> > it'd be nice if it didn't have so many whitespace changes. it'd be
> REALLY
> >> > nice if you could "fix" the whitespace to match what was there
> before. i'm
> >> > sifting through it and almost all of this patch is whitespace changes
> (that
> >> > are not needed as no extra if, whole, for etc. clauses).
> >> >
> >> My editor seems to have gotten a little indent happy... I'll work on
> >> cleaning up that mess up :)
> >>
> >> > 0002-Select-XI2-events-whenever-possible.patch:
> >> >
> >> > i am not sure here, but this may break multitouch support mpx-style
> that
> >> > checks for floating slaves vs slaves. (reading the diff is not fun :)
> it is
> >> > removing all the detection code and that is worrying, especially as
> it's
> >> > hard to test this support (but has been tested in the past when
> written).
> >> >
> >> Basically this patch has the X server send Button, Motion, and Touch
> >> events without regard to if the device is floating. A driver with MPX
> >> multitouch that uses a floating device per finger shouldn't be sending
> >> XI2 touch events, so I doubt adding them to the mask would break
> >> anything. On the flip side, a driver with XI2 multitouch devices
> >> *will* send button/motion events (for the first finger) along with
> >> touch events, but the '_ecore_x_input_multi_handler' function only
> >> responds to touch events, so requesting more events from the server
> >> shouldn't break anything in this case either.
> >
> > hmmm - for now, ok.
> >
> >> > 0003-Define-and-implement-new-Ecore_Event_Axis_Update-eve.patch:
> >> >
> >> > you have some ome todo's and fixme's... :)). one thing - the #include
> of
> >> > xserver-properties.h ... that literally is not an existing installed
> file
> >> > anywhere on my xorg installation. so this is going to be a problem...
> it
> >> > won't compile. and it likely isn't going to compile for anyone else.
> what
> >> > is this doing there and why? (oh .. and we don;'t use egyptian
> brackets in
> >> > count_bits ()) also @since 1.12 in the doxy comments so we know what
> >> > version of efl this was introduced from :) oh and typedef enum
> >> > _Ecore_Axis_Label like Ecore_Event_Axis_Update was. and in fact like
> 0004
> >> > below - flatten out Ecore_Axis that isnt even typedeffed. :)
> >> >
> >> The xserver-properties.h file contains the names that drivers are
> >> expected to use when naming their axes. It defines the constants I use
> >> later in that file (e.g. AXIS_LABEL_PROP_ABS_X). It looks like GTK at
> >> least just hard-codes the strings instead of depending on the header
> >> (which is part of the xorg server devel package).
> >
> > i'd recommend hardcoding them here ala gtk. :) there is nothing in these
> > patches to check for this header, and since it's part of server devel 'd
> > probably avoid relying on it. :)
> >
> >> I'll see what I c
[EGIT] [tools/enventor] master 01/01: tools: improve tools gui.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f238cb5a4e4c4ff3ee0bd58fb0853e05e0db3288
commit f238cb5a4e4c4ff3ee0bd58fb0853e05e0db3288
Author: ChunEon Park
Date: Thu Sep 11 11:28:30 2014 +0900
tools: improve tools gui.
---
data/themes/default/layout_common.edc | 8 +-
data/themes/default/theme_ext.edc | 312 ++
src/bin/tools.c | 2 +-
3 files changed, 317 insertions(+), 5 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 837b752..07b7caf 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -10,7 +10,7 @@ images {
image: "live_rel1_dragable.png" COMP;
image: "live_rel2_dragable.png" COMP;
image: "live_bg_glow_in.png" COMP;
- image: "bevel_in.png" COMP;
+ image: "bevel_out.png" COMP;
}
styles {
@@ -2165,7 +2165,7 @@ group { name: "main_layout";
description { state: "default" 0.0;
rel1.relative: 0 0;
rel2.relative: 1 0;
-min: 0 26;
+min: 0 23;
fixed: 0 1;
align: 0.5 1;
}
@@ -2191,8 +2191,8 @@ group { name: "main_layout";
description { state: "default" 0.0;
rel1 { to: "tools_base"; }
rel2 { to: "tools_base"; }
-image.normal: "bevel_in.png";
-image.border: 3 3 3 3;
+image.normal: "bevel_out.png";
+image.border: 1 1 1 1;
image.border_scale: 1;
}
}
diff --git a/data/themes/default/theme_ext.edc
b/data/themes/default/theme_ext.edc
index f45437d..7b75eae 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -1117,3 +1117,315 @@ group { name: "elm/panes/vertical/enventor";
}
}
}
+
+group { name: "elm/button/base/enventor";
+#define ICON 1
+#define LABEL2
+#define MASK 3
+#define DISABLE 4
+ script {
+ public btmode;
+ public eval_mode(m) {
+ new m1 = m & MASK;
+ new d = m & DISABLE;
+ if (m1 == (ICON | LABEL)) {
+if (!d) {
+ set_state(PART:"elm.swallow.content", "visible", 0.0);
+ set_state(PART:"sizer.content", "visible", 0.0);
+ set_state(PART:"elm.text", "visible", 0.0);
+ set_state(PART:"icon_clip", "default", 0.0);
+ set_state(PART:"event", "default", 0.0);
+} else {
+ set_state(PART:"elm.swallow.content", "visible", 0.0);
+ set_state(PART:"sizer.content", "visible", 0.0);
+ set_state(PART:"elm.text", "disabled_visible", 0.0);
+ set_state(PART:"icon_clip", "disabled", 0.0);
+ set_state(PART:"event", "disabled", 0.0);
+}
+ } else if (m1 == (ICON)) {
+if (!d) {
+ set_state(PART:"elm.swallow.content", "icononly", 0.0);
+ set_state(PART:"sizer.content", "icononly", 0.0);
+ set_state(PART:"elm.text", "default", 0.0);
+ set_state(PART:"icon_clip", "default", 0.0);
+ set_state(PART:"event", "default", 0.0);
+} else {
+ set_state(PART:"elm.swallow.content", "icononly", 0.0);
+ set_state(PART:"sizer.content", "icononly", 0.0);
+ set_state(PART:"elm.text", "default", 0.0);
+ set_state(PART:"icon_clip", "disabled", 0.0);
+ set_state(PART:"event", "disabled", 0.0);
+}
+ } else if (m1 == (LABEL)) {
+if (!d) {
+ set_state(PART:"elm.swallow.content", "default", 0.0);
+ set_state(PART:"sizer.content", "default", 0.0);
+ set_state(PART:"elm.text", "textonly", 0.0);
+ set_state(PART:"icon_clip", "default", 0.0);
+ set_state(PART:"event", "default", 0.0);
+} else {
+ set_state(PART:"elm.swallow.content", "default", 0.0);
+ set_state(PART:"sizer.content", "default", 0.0);
+ set_state(PART:"elm.text", "disabled_textonly", 0.0);
+ set_state(PART:"icon_clip", "disabled", 0.0);
+ set_state(PART:"event", "disabled", 0.0);
+}
+ } else {
+if (!d) {
+ set_state(PART:"elm.swallow.content", "default", 0.0);
+ set_state(PART:"sizer.content", "default", 0.0);
+ set_state(PART:"elm.text", "icononly", 0.0);
+ set_state(PART:"icon_clip", "default", 0.0);
+ set_state(PART:"event", "default", 0.0);
+} else {
+ set_state(PART:"elm.swallow.content", "default", 0.0);
+ set_state(PART:"sizer.content", "default", 0.0);
+ set_state(PART:"elm.text", "icononly", 0.0);
+ set_state(PART:"icon_clip", "disabled", 0.0);
[EGIT] [core/efl] master 01/01: evas: updated native surface documentation.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=17f75c962798170b31f40341baac2205fbbc3ae7
commit 17f75c962798170b31f40341baac2205fbbc3ae7
Author: ChunEon Park
Date: Thu Sep 11 12:17:56 2014 +0900
evas: updated native surface documentation.
---
src/lib/evas/Evas_Common.h | 33 -
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index adafbdd..3fc0da5 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -419,17 +419,40 @@ struct _Evas_Pixel_Import_Source
/* magic version number to know what the native surf struct looks like */
#define EVAS_NATIVE_SURFACE_VERSION 2
+/**
+ * Native surface types that image object supports
+ *
+ * @see Evas_Native_Surface
+ * @see evas_object_image_native_surface_set()
+ */
typedef enum _Evas_Native_Surface_Type
{
- EVAS_NATIVE_SURFACE_NONE,
- EVAS_NATIVE_SURFACE_X11,
- EVAS_NATIVE_SURFACE_OPENGL
+ EVAS_NATIVE_SURFACE_NONE, /**< No surface type */
+ EVAS_NATIVE_SURFACE_X11, /**< X Window system based type. pixmap id or
visual of the pixmap */
+ EVAS_NATIVE_SURFACE_OPENGL /**< OpenGL system based type. texture or
framebuffer id*/
} Evas_Native_Surface_Type;
+/**
+ * @brief A generic datatype for engine specific native surface information.
+ *
+ * Please fill up Evas_Native_Surface fields that regarded with current surface
+ * type. If you want to set the native surface type to
+ * EVAS_NATIVE_SURFACE_X11, you need to set union data with x11.visual or
+ * x11.pixmap. If you need to set the native surface as
+ * EVAS_NATIVE_SURFACE_OPENGL, on the other hand, you need to set union data
+ * with opengl.texture_id or opengl.framebuffer_id and so on. The version field
+ * should be set with EVAS_NATIVE_SURFACE_VERSION in order to check abi
+ * break in your application on the different efl library versions.
+ *
+ * @warning Native surface types totally depend on the system. Please
+ * be aware that the types are supported on your system before using
+ * them.
+ * @see evas_object_image_native_surface_set()
+ */
struct _Evas_Native_Surface
{
- int version;
- Evas_Native_Surface_Type type;
+ int version; /**< Current Native Surface Version. Use
EVAS_NATIVE_SURFACE_VERSION */
+ Evas_Native_Surface_Type type; /**< Surface type. @see
Evas_Native_Surface_Type */
union {
struct
{
--
[EGIT] [core/efl] master 01/01: Warning--
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cabdbb2f3c79f1c8b1f116be27ff0ab339415e4f
commit cabdbb2f3c79f1c8b1f116be27ff0ab339415e4f
Author: Daniel Zaoui
Date: Thu Sep 11 08:35:15 2014 +0300
Warning--
---
src/modules/evas/engines/gl_common/evas_gl_texture.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c
b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 07f463c..cee054a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -109,6 +109,8 @@ static const struct {
#define MATCH(_r, _v) ((_r == MATCH_ANY) || (_v == MATCH_ANY) || (_r == _v))
+#ifdef GL_TEXTURE_INTERNAL_FORMAT
+# ifndef GL_GLES
static Eina_Bool
_evas_gl_texture_match(GLenum intfmt, GLenum intfmtret)
{
@@ -129,6 +131,8 @@ _evas_gl_texture_match(GLenum intfmt, GLenum intfmtret)
return EINA_FALSE;
}
+# endif
+#endif
static int
_evas_gl_texture_search_format(Eina_Bool alpha, Eina_Bool bgra,
Evas_Colorspace cspace)
--
[EGIT] [core/efl] master 01/01: evas: remove white trailing.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5407414d2cd485610bbf029fe116589244ab1f3e commit 5407414d2cd485610bbf029fe116589244ab1f3e Author: ChunEon Park Date: Thu Sep 11 14:46:37 2014 +0900 evas: remove white trailing. --- src/lib/evas/Evas_Common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 3fc0da5..72fbcb2 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -445,7 +445,7 @@ typedef enum _Evas_Native_Surface_Type * break in your application on the different efl library versions. * * @warning Native surface types totally depend on the system. Please - * be aware that the types are supported on your system before using + * be aware that the types are supported on your system before using * them. * @see evas_object_image_native_surface_set() */ --
[EGIT] [tools/enventor] master 01/02: fix grammatic fault.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=4ab0c5609c65e4186578f2717c28407d64b439f0 commit 4ab0c5609c65e4186578f2717c28407d64b439f0 Author: ChunEon Park Date: Thu Sep 11 11:30:14 2014 +0900 fix grammatic fault. --- README | 2 +- data/about/ABOUT | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index fd57682..3c5859e 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ it does a lot. elementary (>= 1.9.0) Please note that some features may not quite function correctly or completely -under EFL 1.10. Newer would be better. +less EFL 1.10. Newer would be better. Please see http://www.enlightenment.org for information on these. diff --git a/data/about/ABOUT b/data/about/ABOUT index 5b2398a..d1197b4 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -4,7 +4,7 @@ This is an EDC editor with some convenient functions. It's band new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. Please note that some features may not quite function correctly or completely -under EFL 1.10. Newer would be better. +less EFL 1.10. Newer would be better. Please see http://www.enlightenment.org for information on these. --
[EGIT] [tools/enventor] master 02/02: edc_editor: Fix T1602 to update syntax color after deleting a line
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=0447a026cc9fcd8f5588ef323dac167f8015b134 commit 0447a026cc9fcd8f5588ef323dac167f8015b134 Author: Jaehyun Cho Date: Thu Sep 11 15:19:30 2014 +0900 edc_editor: Fix T1602 to update syntax color after deleting a line Summary: Fix T1602 to update syntax color after deleting a line Reviewers: Hermet Reviewed By: Hermet Maniphest Tasks: T1602 Differential Revision: https://phab.enlightenment.org/D1431 --- src/bin/edc_editor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index b97f26e..5a9cd13 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -721,6 +721,8 @@ edit_line_delete(edit_data *ed) cur_line_pos_set(ed, EINA_TRUE); edit_changed_set(ed, EINA_TRUE); + + syntax_color_partial_update(ed, SYNTAX_COLOR_DEFAULT_TIME); } int --
