[EGIT] [core/efl] master 01/01: evil: remove executable bit from memcpy assembler file.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ccc823e7370ff9afad30b70385f09bddcff9521c commit ccc823e7370ff9afad30b70385f09bddcff9521c Author: Stefan SchmidtDate: Mon Sep 7 11:23:53 2015 +0200 evil: remove executable bit from memcpy assembler file. Hopefully the last offender we have in tree with this. --- src/bin/evil/memcpy_glibc_i686.S | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/bin/evil/memcpy_glibc_i686.S b/src/bin/evil/memcpy_glibc_i686.S old mode 100755 new mode 100644 --
[EGIT] [core/efl] master 01/01: ecore_example: Fixing memory leak.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e08a7d7c9d934b023c461b31e5942800174bd2a6 commit e08a7d7c9d934b023c461b31e5942800174bd2a6 Author: Srivardhan HebbarDate: Mon Sep 7 11:36:18 2015 +0200 ecore_example: Fixing memory leak. Summary: Fixed a memory leak in this example. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, stefan_schmidt Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3010 --- src/examples/ecore/ecore_compose_get_example.c | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/examples/ecore/ecore_compose_get_example.c b/src/examples/ecore/ecore_compose_get_example.c index 4359cb0..d33140b 100644 --- a/src/examples/ecore/ecore_compose_get_example.c +++ b/src/examples/ecore/ecore_compose_get_example.c @@ -155,16 +155,21 @@ int main() d = calloc(1, sizeof(Data)); if (!ecore_event_init()) -return 0; +goto ecore_event_init_fail; /*** end 3 : Ecore compose stuff ***/ if (!ecore_evas_init()) -return 0; +goto ecore_evas_init_fail; ee = ecore_evas_new(NULL, 10, 10, 0, 0, NULL); if (!ee) -return -1; +{ + ecore_evas_shutdown(); + ecore_event_shutdown(); + free(d); + return -1; +} ecore_evas_callback_delete_request_set(ee, _del); evas = ecore_evas_get(ee); @@ -185,8 +190,13 @@ int main() ecore_main_loop_begin(); - ecore_event_shutdown(); + ecore_evas_free(ee); ecore_evas_shutdown(); +ecore_evas_init_fail: + ecore_event_shutdown(); + +ecore_event_init_fail: + free(d); return 0; } --
[EGIT] [core/efl] master 01/01: build: add efl as internal dep for eio
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=99c0c1cb620fa9de87b6efb39077c5507df4fbdb commit 99c0c1cb620fa9de87b6efb39077c5507df4fbdb Author: Stefan SchmidtDate: Mon Sep 7 10:43:35 2015 +0200 build: add efl as internal dep for eio Thanks to Adrien Nader for the report and fix. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 01c7850..2d43a72 100644 --- a/configure.ac +++ b/configure.ac @@ -4055,6 +4055,7 @@ EFL_INTERNAL_DEPEND_PKG([EIO], [ecore]) EFL_INTERNAL_DEPEND_PKG([EIO], [eet]) EFL_INTERNAL_DEPEND_PKG([EIO], [eo]) EFL_INTERNAL_DEPEND_PKG([EIO], [eina]) +EFL_INTERNAL_DEPEND_PKG([EIO], [efl]) EFL_INTERNAL_DEPEND_PKG([EIO], [emile]) EFL_ADD_LIBS([EIO], [-lm]) --
[EGIT] [core/efl] master 01/01: ecore_example: Fixing NULL dereference.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f69f34c5382c686b418097a8a972aebce46cdb08 commit f69f34c5382c686b418097a8a972aebce46cdb08 Author: Srivardhan HebbarDate: Mon Sep 7 11:13:48 2015 +0200 ecore_example: Fixing NULL dereference. Summary: cd was dereferenced and then was checked for NULL. If cd is NULL, it would crash before itself. So checking for NULL before dereferencing cd. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, stefan_schmidt Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3009 --- src/examples/ecore/ecore_buffer_consumer_example.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/examples/ecore/ecore_buffer_consumer_example.c b/src/examples/ecore/ecore_buffer_consumer_example.c index e24a3e2..1363aa0 100644 --- a/src/examples/ecore/ecore_buffer_consumer_example.c +++ b/src/examples/ecore/ecore_buffer_consumer_example.c @@ -146,7 +146,7 @@ main(void) cd = (Consumer_Data *)calloc(sizeof(Consumer_Data), 1); - if (!(cd->consumer = ecore_buffer_consumer_new(name, queue_size, WIDTH, HEIGHT))) + if (!cd || !(cd->consumer = ecore_buffer_consumer_new(name, queue_size, WIDTH, HEIGHT))) { LOG("Failed to create consumer"); goto shutdown; @@ -185,7 +185,7 @@ shutdown: if (cd->win.ee) ecore_evas_free(cd->win.ee); if (cd->buffer) ecore_buffer_consumer_buffer_release(cd->consumer, cd->buffer); if (cd->consumer) ecore_buffer_consumer_free(cd->consumer); - if (cd) free(cd); + free(cd); shutdown_all(); return 0; --
[EGIT] [core/efl] master 01/01: ecore_example: Cleanup of ecore_compose_get_example.c
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=240a275be0d81cd692169bd9b549f8248afb6f13 commit 240a275be0d81cd692169bd9b549f8248afb6f13 Author: Srivardhan HebbarDate: Mon Sep 7 11:00:20 2015 +0200 ecore_example: Cleanup of ecore_compose_get_example.c Summary: Relating to D3010. This patch is code cleanup. Have done dos2unix. After this will update D3010 bug. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, stefan_schmidt Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3025 --- src/examples/ecore/ecore_compose_get_example.c | 384 - 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/src/examples/ecore/ecore_compose_get_example.c b/src/examples/ecore/ecore_compose_get_example.c index f9b45cf..4359cb0 100644 --- a/src/examples/ecore/ecore_compose_get_example.c +++ b/src/examples/ecore/ecore_compose_get_example.c @@ -1,192 +1,192 @@ -/* gcc -g -Wall -o test_keys2 test_keys2.c `pkg-config --cflags --libs ecore-input ecore-evas ecore evas eina` */ - -#include - -#include -#include -#include -#include - -/*** begin 1 : Ecore compose stuff ***/ - -#include - -typedef struct -{ - Eina_List *seq; - Eina_Bool composing; -} Data; - -static void -_data_reset(Data *d) -{ - char *str; - - EINA_LIST_FREE(d->seq, str) eina_stringshare_del(str); - d->composing = EINA_FALSE; -} - -static Eina_Bool -_is_modifier(const char *key) -{ - if ((!strncmp(key, "Shift", 5)) || - (!strncmp(key, "Control", 7)) || - (!strncmp(key, "Alt", 3)) || - (!strncmp(key, "Meta", 4)) || - (!strncmp(key, "Super", 5)) || - (!strncmp(key, "Hyper", 5)) || - (!strcmp(key, "Scroll_Lock")) || - (!strcmp(key, "Num_Lock")) || - (!strcmp(key, "Caps_Lock"))) - return EINA_TRUE; - return EINA_FALSE; -} - -/*** end 1 : Ecore compose stuff ***/ - -static void -_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) -{ -Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event; -int alt; -int shift; -int ctrl; - -alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); -shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); -ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); - -printf("down : keyname: %s key: %s compose: **%s** string: **%s** [%zu] %d (%d:%d:%d)\n", - ev->keyname, ev->key, ev->string, ev->compose, (ev->compose) ? strlen(ev->compose) : (size_t)-1, (ev->compose) ? *(ev->compose) : -1, - alt, shift, ctrl); -} - -static void -_key_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) -{ -Evas_Event_Key_Up *ev; -int alt; -int shift; -int ctrl; - -ev = (Evas_Event_Key_Up *)event; - -alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); -shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); -ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); - -printf("up : keyname: %s key: %s string: %s %d (%d:%d:%d)\n", - ev->keyname, ev->key, ev->compose, (ev->compose) ? *(ev->compose) : -1, - alt, shift, ctrl); - -if (!alt && !shift) -{ -if (!strcmp(ev->key, "q")) - ecore_main_loop_quit(); -} - -/*** begin 2 : Ecore compose stuff ***/ - -{ -Data *d; -char *compres = NULL; -char *string = NULL; - Ecore_Compose_State state; - Eina_Bool free_string = EINA_FALSE; - - d = (Data *)data; -if (!d->composing) - { - _data_reset(d); - d->seq = eina_list_append(d->seq, eina_stringshare_add(ev->key)); - state = ecore_compose_get(d->seq, ); - if (state == ECORE_COMPOSE_MIDDLE) d->composing = EINA_TRUE; - else d->composing = EINA_FALSE; - if (!d->composing) _data_reset(d); - else goto end; - } - else - { - if (_is_modifier(ev->key)) goto end; - d->seq = eina_list_append(d->seq, eina_stringshare_add(ev->key)); - state = ecore_compose_get(d->seq, ); - if (state == ECORE_COMPOSE_NONE) _data_reset(d); - else if (state == ECORE_COMPOSE_DONE) - { - _data_reset(d); - if (compres) - { - string = compres; - free_string = EINA_TRUE; - } - } - else goto end; - } - - if (string) - { - printf(" ** string : %s %zu 0x%hhx%hhX\n", string, strlen(string), string[1], string[0]); - if (free_string) - free(string); - } -} - -/*** end 2 : Ecore compose stuff ***/ - - end: -return; -} - -static void -_del(Ecore_Evas *ee EINA_UNUSED) -{ - ecore_main_loop_quit();
[EGIT] [core/efl] master 02/02: evas: gl_generic: fix leak if we return dst and not newdst
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7c36761e6299beff74ae9d4e203e73fecae30e7b commit 7c36761e6299beff74ae9d4e203e73fecae30e7b Author: Stefan SchmidtDate: Mon Sep 7 13:41:47 2015 +0200 evas: gl_generic: fix leak if we return dst and not newdst In case we still retrun dst we should make sure we free up the newly allocated newdst. CID: 1323090 --- src/modules/evas/engines/gl_generic/evas_engine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index 0153c80..04a26ec 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -1278,6 +1278,7 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image, dst->w = dst_w; dst->h = dst_h; dst->scaled.smooth = smooth; + free(newdst); return dst; } src->references++; --
[EGIT] [core/efl] master 01/02: ecore_example: Fixing NULL deference.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=342db1ee38eca08fdc0d7cadd7ee3692d538afeb commit 342db1ee38eca08fdc0d7cadd7ee3692d538afeb Author: Srivardhan HebbarDate: Mon Sep 7 13:30:48 2015 +0200 ecore_example: Fixing NULL deference. Summary: pd was dereferenced and then checked for NULL. If it was NULL, the program would crash much before. So fixed that. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, stefan_schmidt Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3031 --- src/examples/ecore/ecore_buffer_provider_example.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/examples/ecore/ecore_buffer_provider_example.c b/src/examples/ecore/ecore_buffer_provider_example.c index 112854b..5d1d5b0 100644 --- a/src/examples/ecore/ecore_buffer_provider_example.c +++ b/src/examples/ecore/ecore_buffer_provider_example.c @@ -246,7 +246,7 @@ main(void) pd = (Provider_Data *)calloc(sizeof(Provider_Data), 1); - if (!(pd->provider = ecore_buffer_provider_new(name))) + if (!pd || !(pd->provider = ecore_buffer_provider_new(name))) { LOG("Failed to create provider"); goto shutdown; @@ -267,7 +267,7 @@ shutdown: ecore_buffer_free(b); } if (pd->provider) ecore_buffer_provider_free(pd->provider); - if (pd) free(pd); + free(pd); shutdown_all(); return 0; --
[EGIT] [core/enlightenment] enlightenment-0.19 01/01: fix x11 compositor to use damage events
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=258680e60c572ffa5fced996509a5ee5c1bc4689 commit 258680e60c572ffa5fced996509a5ee5c1bc4689 Author: Mike BlumenkrantzDate: Mon Sep 7 11:10:54 2015 -0400 fix x11 compositor to use damage events it seems that since the first version of the enlightenment compositor in e17, damage events in x11 have never been used correctly. using the event struct members will only give the bounding box/area instead of the damaged regions; the real regions must be explicitly fetched from the server this removes the need for a lot of hacks which were added over the years to make override windows render correctly, and also probably reduces rendering overhead slightly --- src/bin/e_comp_x.c | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 835bd80..60bc35c 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -1461,11 +1461,6 @@ _e_comp_x_configure(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_ { e_pixmap_dirty(ec->pixmap); evas_object_resize(ec->frame, ev->w, ev->h); -if (ec->override && (!ec->input_only)) - { - e_comp_object_damage(ec->frame, 0, 0, ev->w, ev->h); - e_comp_object_render_update_del(ec->frame); - } } return ECORE_CALLBACK_RENEW; } @@ -2683,27 +2678,33 @@ static Eina_Bool _e_comp_x_damage(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Damage *ev) { E_Client *ec; + Ecore_X_Rectangle *rects; + int n = 0; ec = _e_comp_x_client_find_by_damage(ev->damage); if (!ec) return ECORE_CALLBACK_PASS_ON; if (ec->comp_data->damage) { Ecore_X_Region parts; +Ecore_X_Rectangle bounds; parts = ecore_x_region_new(NULL, 0); ecore_x_damage_subtract(ec->comp_data->damage, 0, parts); +rects = ecore_x_region_fetch(parts, , ); ecore_x_region_free(parts); } //WRN("DAMAGE %p: %dx%d", ec, ev->area.width, ev->area.height); + if (!n) return ECORE_CALLBACK_RENEW; if (ec->comp->nocomp) e_pixmap_dirty(ec->pixmap); - /* discard unwanted xy position of first damage -* to avoid wrong composition for override redirect window */ - else if ((ec->override) && (!ec->comp_data->first_damage)) - e_comp_object_damage(ec->frame, 0, 0, ev->area.width, ev->area.height); else - e_comp_object_damage(ec->frame, ev->area.x, ev->area.y, ev->area.width, ev->area.height); + { +int i; + +for (i = 0; i < n; i++) + e_comp_object_damage(ec->frame, rects[i].x, rects[i].y, rects[i].width, rects[i].height); + } if ((!ec->re_manage) && (!ec->override) && (!ec->comp_data->first_damage)) e_comp_object_render_update_del(ec->frame); else --
[EGIT] [core/enlightenment] enlightenment-0.19 01/01: explicitly show the client object of internal window during show
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c2b9008f117925b549923d5f516c13e8f2c21df6 commit c2b9008f117925b549923d5f516c13e8f2c21df6 Author: Mike BlumenkrantzDate: Mon Sep 7 12:06:53 2015 -0400 explicitly show the client object of internal window during show fix T2690 --- src/bin/e_win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 258e4d3..982e58f 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -397,6 +397,7 @@ e_win_show(E_Win *win) ecore_x_icccm_transient_for_unset(ecore_evas_window_get(win->ecore_evas)); } #endif + evas_object_show(win->client->frame); _e_win_prop_update(win); if (win->state.centered) e_comp_object_util_center(win->client->frame); --
[EGIT] [core/efl] master 01/01: evas examples: avoid shadowing a global variable in a function
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0f20a790180e1a5e80a8e90892c4c5c8750c53a4 commit 0f20a790180e1a5e80a8e90892c4c5c8750c53a4 Author: Stefan SchmidtDate: Mon Sep 7 15:52:35 2015 +0200 evas examples: avoid shadowing a global variable in a function --- src/examples/evas/evas-3d-frustum.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index e6a54f6..465160b 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -95,7 +95,7 @@ static Eina_Bool _redraw_bounding_object(void *data) { Evas_Real px, py, pz, sx, sy, sz; - Evas_Real x0, y0, z0, x1, y1, z1, radius; + Evas_Real x0, y0, z0, x1, y1, z1, rad; Scene_Data *scene = (Scene_Data *)data; Eo *current_mesh; Eina_List *meshes = NULL, *l; @@ -111,12 +111,12 @@ _redraw_bounding_object(void *data) case EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE: { eo_do(scene->mesh_node_model, - evas_canvas3d_node_bounding_sphere_get(, , , )); + evas_canvas3d_node_bounding_sphere_get(, , , )); current_mesh = scene->mesh_sphere; px = x0; py = y0; pz = z0; - sx = sy = sz = 2.0 * radius; + sx = sy = sz = 2.0 * rad; break; } case EVAS_CANVAS3D_FRUSTUM_MODE_AABB: @@ -136,12 +136,12 @@ _redraw_bounding_object(void *data) case EVAS_CANVAS3D_FRUSTUM_MODE_CENTRAL_POINT: { eo_do(scene->mesh_node_model, - evas_canvas3d_node_bounding_sphere_get(, , , )); + evas_canvas3d_node_bounding_sphere_get(, , , )); current_mesh = scene->mesh_sphere; px = x0; py = y0; pz = z0; - sx = sy = sz = 0.1 * radius; + sx = sy = sz = 0.1 * rad; break; } default: --
[EGIT] [enlightenment/modules/desksanity] master 01/01: reorder ds client iterator filter to catch override clients before ec->desk deref
discomfitor pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=568ee43e6f4e8a1873f3820593dc9c71b72fd15d commit 568ee43e6f4e8a1873f3820593dc9c71b72fd15d Author: Mike BlumenkrantzDate: Mon Sep 7 10:19:30 2015 -0400 reorder ds client iterator filter to catch override clients before ec->desk deref ref D3024 and @Samis2001 --- src/desksanity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/desksanity.c b/src/desksanity.c index 6c61566..ca60fef 100644 --- a/src/desksanity.c +++ b/src/desksanity.c @@ -72,7 +72,7 @@ _ds_show(E_Desk *desk, int dx, int dy) E_CLIENT_FOREACH(ec) { /* skip clients from other screens, iconic clients, and ignorable clients */ -if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; +if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; /* always keep user-moving clients visible */ if (ec->moving) { @@ -397,7 +397,7 @@ _ds_hide(E_Desk *desk) E_CLIENT_FOREACH(ec) { /* same as above */ -if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; +if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; if (ec->moving) continue; if ((ec->desk != desk) || (ec->sticky)) continue; /* comp hide clients */ --
[EGIT] [core/enlightenment] master 01/01: fix x11 compositor to use damage events
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=92d1c36be7c944c702d050cbd6912b969535a7f6 commit 92d1c36be7c944c702d050cbd6912b969535a7f6 Author: Mike BlumenkrantzDate: Mon Sep 7 11:10:54 2015 -0400 fix x11 compositor to use damage events it seems that since the first version of the enlightenment compositor in e17, damage events in x11 have never been used correctly. using the event struct members will only give the bounding box/area instead of the damaged regions; the real regions must be explicitly fetched from the server this removes the need for a lot of hacks which were added over the years to make override windows render correctly, and also probably reduces rendering overhead slightly --- src/bin/e_comp_x.c | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 67c9d89..599090a 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -1484,11 +1484,6 @@ _e_comp_x_configure(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_ { e_pixmap_dirty(ec->pixmap); evas_object_resize(ec->frame, ev->w, ev->h); -if (ec->override && (!ec->input_only)) - { - e_comp_object_damage(ec->frame, 0, 0, ev->w, ev->h); - e_comp_object_render_update_del(ec->frame); - } } return ECORE_CALLBACK_RENEW; } @@ -2785,27 +2780,33 @@ static Eina_Bool _e_comp_x_damage(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Damage *ev) { E_Client *ec; + Ecore_X_Rectangle *rects; + int n = 0; ec = _e_comp_x_client_find_by_damage(ev->damage); if ((!ec) || e_object_is_del(E_OBJECT(ec))) return ECORE_CALLBACK_PASS_ON; if (_e_comp_x_client_data_get(ec)->damage) { Ecore_X_Region parts; +Ecore_X_Rectangle bounds; parts = ecore_x_region_new(NULL, 0); ecore_x_damage_subtract(_e_comp_x_client_data_get(ec)->damage, 0, parts); +rects = ecore_x_region_fetch(parts, , ); ecore_x_region_free(parts); } //WRN("DAMAGE %p: %dx%d", ec, ev->area.width, ev->area.height); + if (!n) return ECORE_CALLBACK_RENEW; if (e_comp->nocomp) e_pixmap_dirty(ec->pixmap); - /* discard unwanted xy position of first damage -* to avoid wrong composition for override redirect window */ - else if ((ec->override) && (!_e_comp_x_client_data_get(ec)->first_damage)) - e_comp_object_damage(ec->frame, 0, 0, ev->area.width, ev->area.height); else - e_comp_object_damage(ec->frame, ev->area.x, ev->area.y, ev->area.width, ev->area.height); + { +int i; + +for (i = 0; i < n; i++) + e_comp_object_damage(ec->frame, rects[i].x, rects[i].y, rects[i].width, rects[i].height); + } if ((!ec->re_manage) && (!ec->override) && (!_e_comp_x_client_data_get(ec)->first_damage)) e_comp_object_render_update_del(ec->frame); else --
[EGIT] [core/enlightenment] master 01/01: block forced mirror render for clients with native surfaces
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=69a29357cb35d15ba3f6ba1852eafd3c756bacfe commit 69a29357cb35d15ba3f6ba1852eafd3c756bacfe Author: Mike BlumenkrantzDate: Mon Sep 7 13:15:25 2015 -0400 block forced mirror render for clients with native surfaces --- src/bin/e_comp_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 1bf7a28..268f61d 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3395,7 +3395,7 @@ e_comp_object_dirty(Evas_Object *obj) } cw->update_count = cw->updates_full = cw->updates_exist = 0; evas_object_smart_callback_call(obj, "dirty", NULL); - if (cw->visible || (!visible) || (!cw->pending_updates)) return; + if (cw->visible || (!visible) || (!cw->pending_updates) || cw->native) return; /* force render if main object is hidden but mirrors are visible */ e_comp_object_render(obj); } --
[EGIT] [enlightenment/modules/desksanity] desksanity-1.0 01/01: reorder ds client iterator filter to catch override clients before ec->desk deref
discomfitor pushed a commit to branch desksanity-1.0. http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=dc35b11619b023b5d4c3376aaef8e59fffcfbbd9 commit dc35b11619b023b5d4c3376aaef8e59fffcfbbd9 Author: Mike BlumenkrantzDate: Mon Sep 7 10:19:30 2015 -0400 reorder ds client iterator filter to catch override clients before ec->desk deref ref D3024 and @Samis2001 --- src/desksanity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/desksanity.c b/src/desksanity.c index 90612f3..59f20e7 100644 --- a/src/desksanity.c +++ b/src/desksanity.c @@ -72,7 +72,7 @@ _ds_show(E_Desk *desk, int dx, int dy) E_CLIENT_FOREACH(desk->zone->comp, ec) { /* skip clients from other screens, iconic clients, and ignorable clients */ -if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; +if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; /* always keep user-moving clients visible */ if (ec->moving) { @@ -397,7 +397,7 @@ _ds_hide(E_Desk *desk) E_CLIENT_FOREACH(desk->zone->comp, ec) { /* same as above */ -if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; +if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; if (ec->moving) continue; if ((ec->desk != desk) || (ec->sticky)) continue; /* comp hide clients */ --
[EGIT] [core/elementary] master 01/01: win: fix FAKE window geometry updating + resize object adding
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c7a33b33f659256768b3f70295c1f67a994b59e8 commit c7a33b33f659256768b3f70295c1f67a994b59e8 Author: Mike BlumenkrantzDate: Mon Sep 7 13:05:08 2015 -0400 win: fix FAKE window geometry updating + resize object adding users of this will want the win to automatically match the geometry of the ee in all cases fix T2692 --- src/lib/elm_win.c | 102 ++ 1 file changed, 56 insertions(+), 46 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 225ce6d..e75ee1d 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -3751,12 +3751,10 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_ ecore_evas_callback_state_change_set(sd->ee, _elm_win_state_change); ecore_evas_callback_focus_in_set(sd->ee, _elm_win_focus_in); ecore_evas_callback_focus_out_set(sd->ee, _elm_win_focus_out); + ecore_evas_callback_resize_set(sd->ee, _elm_win_resize); + ecore_evas_callback_move_set(sd->ee, _elm_win_move); if (type != ELM_WIN_FAKE) - { -ecore_evas_callback_resize_set(sd->ee, _elm_win_resize); -ecore_evas_callback_mouse_in_set(sd->ee, _elm_win_mouse_in); -ecore_evas_callback_move_set(sd->ee, _elm_win_move); - } + ecore_evas_callback_mouse_in_set(sd->ee, _elm_win_mouse_in); evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _elm_win_cb_hide, NULL); evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _elm_win_cb_show, NULL); @@ -3781,24 +3779,26 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_ #endif /* do not append to list; all windows render as black rects */ - if (type == ELM_WIN_FAKE) return obj; - _elm_win_list = eina_list_append(_elm_win_list, obj); - _elm_win_count++; - - if ((engine) && ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM + if (type != ELM_WIN_FAKE) { -TRAP(sd, fullscreen_set, 1); - } - else if ((type != ELM_WIN_INLINED_IMAGE) && -((engine) && - ((!strcmp(engine, ELM_WAYLAND_SHM) || - (!strcmp(engine, ELM_WAYLAND_EGL)) - _elm_win_frame_add(sd, "default"); +_elm_win_list = eina_list_append(_elm_win_list, obj); +_elm_win_count++; + +if ((engine) && ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM + { + TRAP(sd, fullscreen_set, 1); + } +else if ((type != ELM_WIN_INLINED_IMAGE) && + ((engine) && + ((!strcmp(engine, ELM_WAYLAND_SHM) || + (!strcmp(engine, ELM_WAYLAND_EGL)) + _elm_win_frame_add(sd, "default"); - if (_elm_config->focus_highlight_enable) - elm_win_focus_highlight_enabled_set(obj, EINA_TRUE); - if (_elm_config->focus_highlight_animate) - elm_win_focus_highlight_animate_set(obj, EINA_TRUE); +if (_elm_config->focus_highlight_enable) + elm_win_focus_highlight_enabled_set(obj, EINA_TRUE); +if (_elm_config->focus_highlight_animate) + elm_win_focus_highlight_animate_set(obj, EINA_TRUE); + } #ifdef ELM_DEBUG Evas_Modifier_Mask mask = evas_key_modifier_mask_get(sd->evas, "Control"); @@ -3811,28 +3811,31 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_ ERR("failed to grab F12 key to elm widgets (dot) tree generation"); #endif - if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) || - ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) && -((engine) && - ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM)) - { -Evas_Object *o; -Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0; - -sd->pointer.obj = o = edje_object_add(ecore_evas_get(tmp_sd.ee)); -_elm_theme_object_set(obj, o, "pointer", "base", "default"); -edje_object_size_min_calc(o, , ); -evas_object_resize(o, mw, mh); -edje_object_part_geometry_get(o, "elm.swallow.hotspot", - , , NULL, NULL); -sd->pointer.hot_x = hx; -sd->pointer.hot_y = hy; -evas_object_show(o); -ecore_evas_object_cursor_set(tmp_sd.ee, o, EVAS_LAYER_MAX, hx, hy); - } - else if (_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_OFF) + if (type != ELM_WIN_FAKE) { -// do nothing +if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) || +((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) && + ((engine) && + ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM)) + { + Evas_Object *o; + Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0; + + sd->pointer.obj = o =
[EGIT] [core/enlightenment] master 04/04: wl_text_input: initializes input_method's context when destroy context.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bbc1802701a3b6676502009283a2f1b105cb5c92 commit bbc1802701a3b6676502009283a2f1b105cb5c92 Author: Seunghun LeeDate: Mon Sep 7 13:13:52 2015 -0400 wl_text_input: initializes input_method's context when destroy context. Summary: input_method's context set to NULL when context is freed. Test Plan: N/A Reviewers: zmike, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3015 --- src/modules/wl_text_input/e_mod_main.c | 4 1 file changed, 4 insertions(+) diff --git a/src/modules/wl_text_input/e_mod_main.c b/src/modules/wl_text_input/e_mod_main.c index c5332e8..67d0459 100644 --- a/src/modules/wl_text_input/e_mod_main.c +++ b/src/modules/wl_text_input/e_mod_main.c @@ -414,6 +414,10 @@ _e_text_input_method_context_cb_resource_destroy(struct wl_resource *resource) if (context->kbd.resource) wl_resource_destroy(context->kbd.resource); + if ((context->input_method) && + (context->input_method->context == context)) + context->input_method->context = NULL; + free(context); } --
[EGIT] [core/enlightenment] master 03/04: wl_text_input: remove duplicated code.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=543d924669c83ee59834038218078b422da9145b commit 543d924669c83ee59834038218078b422da9145b Author: Seunghun LeeDate: Mon Sep 7 13:13:27 2015 -0400 wl_text_input: remove duplicated code. Summary: remove redundant code. Test Plan: N/A Reviewers: zmike, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3014 --- src/modules/wl_text_input/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wl_text_input/e_mod_main.c b/src/modules/wl_text_input/e_mod_main.c index fdfdbcf..c5332e8 100644 --- a/src/modules/wl_text_input/e_mod_main.c +++ b/src/modules/wl_text_input/e_mod_main.c @@ -824,7 +824,7 @@ _e_text_cb_bind_text_input_manager(struct wl_client *client, void *data EINA_UNU static void _e_text_input_method_cb_unbind(struct wl_resource *resource) { - E_Input_Method *input_method = wl_resource_get_user_data(resource); + E_Input_Method *input_method; e_comp->wl_comp_data->seat.im.resource = NULL; --
[EGIT] [core/enlightenment] master 01/04: Binding input method will be allowed to wl_client that is created by enlightenment.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a6a0332f45fc591603cb4d3115e16d057287de37 commit a6a0332f45fc591603cb4d3115e16d057287de37 Author: Seunghun LeeDate: Mon Sep 7 13:12:53 2015 -0400 Binding input method will be allowed to wl_client that is created by enlightenment. Summary: Added code to check whether wl_client's pid is equal to enlightenment's. this means, only enlightenment modules can bind wl_text_input interface. Reviewers: zmike, devilhorns, ManMower Reviewed By: devilhorns, ManMower Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2981 --- src/modules/wl_text_input/e_mod_main.c | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/modules/wl_text_input/e_mod_main.c b/src/modules/wl_text_input/e_mod_main.c index 718aaeb..473d479 100644 --- a/src/modules/wl_text_input/e_mod_main.c +++ b/src/modules/wl_text_input/e_mod_main.c @@ -853,6 +853,7 @@ _e_text_cb_bind_input_method(struct wl_client *client, void *data EINA_UNUSED, u { E_Input_Method *input_method; struct wl_resource *resource; + pid_t pid; resource = wl_resource_create(client, _input_method_interface, 1, id); if (!resource) @@ -869,9 +870,17 @@ _e_text_cb_bind_input_method(struct wl_client *client, void *data EINA_UNUSED, u wl_resource_destroy(resource); return; } -#warning FIXME SECURITY - /* FIXME: we need to make sure the client attempting to bind - this interface really provides vkbd. */ + + wl_client_get_credentials(client, , NULL, NULL); + if (pid != getpid()) + { +ERR("Permission to bind input method denied"); +wl_resource_post_error(resource, + WL_DISPLAY_ERROR_INVALID_OBJECT, + "permission to bind input_method denied"); +wl_resource_destroy(resource); +return; + } input_method = E_NEW(E_Input_Method, 1); if (!input_method) @@ -900,7 +909,6 @@ EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Text_Input" }; EAPI void * e_modapi_init(E_Module *m) { - return NULL; // FIXME: create only one input method object per seat. e_comp->wl_comp_data->seat.im.global = wl_global_create(e_comp->wl_comp_data->wl.disp, _input_method_interface, 1, --
[EGIT] [core/enlightenment] master 02/04: wl_text_input: initializes global handle after destroying.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=cfc78dfdae9f67206da1924ce03dcb57247d70bf commit cfc78dfdae9f67206da1924ce03dcb57247d70bf Author: Seunghun LeeDate: Mon Sep 7 13:13:10 2015 -0400 wl_text_input: initializes global handle after destroying. Summary: variable for handle should be initialized. Test Plan: N/A Reviewers: zmike, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3013 --- src/modules/wl_text_input/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wl_text_input/e_mod_main.c b/src/modules/wl_text_input/e_mod_main.c index 473d479..fdfdbcf 100644 --- a/src/modules/wl_text_input/e_mod_main.c +++ b/src/modules/wl_text_input/e_mod_main.c @@ -925,7 +925,7 @@ e_modapi_init(E_Module *m) if (!text_input_manager_global) { ERR("failed to create wl_global for text input manager"); -wl_global_destroy(e_comp->wl_comp_data->seat.im.global); +E_FREE_FUNC(e_comp->wl_comp_data->seat.im.global, wl_global_destroy); return NULL; } --
[EGIT] [tools/edi] master 02/02: Update to latest eolian spec
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=ce381c4eef04a682dc56d2f204baf98d50d9bd02 commit ce381c4eef04a682dc56d2f204baf98d50d9bd02 Author: Andy WilliamsDate: Mon Sep 7 23:12:08 2015 +0100 Update to latest eolian spec Documents updated though not quite as feature-ful --- configure.ac | 2 +- elm_code/src/lib/widget/elm_code_widget.eo | 166 + 2 files changed, 54 insertions(+), 114 deletions(-) diff --git a/configure.ac b/configure.ac index c7cbd16..e4af39a 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ PKG_CHECK_MODULES([EFL], evas >= 1.8.0 ecore >= 1.8.0 edje >= 1.8.0 - eo >= 1.15.0 + eo >= 1.15.99 elementary >= 1.8.0 eio >= 1.8.0 ]) diff --git a/elm_code/src/lib/widget/elm_code_widget.eo b/elm_code/src/lib/widget/elm_code_widget.eo index 294d860..1bbcc18 100644 --- a/elm_code/src/lib/widget/elm_code_widget.eo +++ b/elm_code/src/lib/widget/elm_code_widget.eo @@ -5,224 +5,164 @@ class Elm.Code_Widget (Elm.Layout, Elm_Interface_Atspi_Text) methods { @property code { set { -/*@ -Set the underlying code object that this widget renders. +[[Set the underlying code object that this widget renders. This can only be set during construction, once the widget is created the -backing code object cannot be changed. - -@ingroup Data */ +backing code object cannot be changed.]] } get { -/*@ -Get the underlying code object we are rendering - -@ingroup Data */ +[[Get the underlying code object we are rendering]] } values { -code: Elm_Code *; /*@ Our underlying Elm_Code object */ +code: Elm_Code *; [[Our underlying Elm_Code object]] } } @property font { set { -/*@ -Set the font that this widget uses, the font should be a monospaced scalable font. -Passing NULL will load the default system monospaced font. - -@ingroup Style */ +[[Set the font that this widget uses, the font should be a monospaced scalable font. +Passing NULL will load the default system monospaced font.]] } get { -/*@ -Get the font currently in use. -The font name is a copy ad should be freed once it is no longer needed - -@ingroup Style */ +[[Get the font currently in use. +The font name is a copy ad should be freed once it is no longer needed]] } values { -name: const(char) *; /*@ The name of the font to load */ -size: Evas_Font_Size; /*@ The font size for the widget */ +name: const(char) *; [[The name of the font to load]] +size: Evas_Font_Size; [[The font size for the widget]] } } @property gravity { set { -/*@ -Set how this widget's scroller should respond to new lines being added. +[[Set how this widget's scroller should respond to new lines being added. An x value of 0.0 will maintain the distance from the left edge, 1.0 will ensure the rightmost edge (of the longest line) is respected -With 0.0 for y the view will keep it's position relative to the top whereas 1.0 will scroll downward as lines are added. - -@ingroup Layout */ +With 0.0 for y the view will keep it's position relative to the top whereas 1.0 will scroll downward as lines are added.]] } get { -/*@ -Get the current x and y gravity of the widget's scroller - -@ingroup Layout */ +[[Get the current x and y gravity of the widget's scroller]] } values { -x: double; /*@ The horizontal value of the scroller gravity - valid values are 0.0 and 1.0 */ -y: double; /*@ The vertical gravity of the widget's scroller - valid values are 0.0 and 1.0 */ +x: double; [[The horizontal value of the scroller gravity - valid values are 0.0 and 1.0]] +y: double; [[The vertical gravity of the widget's scroller - valid values are 0.0 and 1.0]] } } @property policy { set { - /*@ - Set the policy for scrollbar visibility. - - @ingroup Layout */ + [[Set the policy for scrollbar visibility.]] } get { - /*@ - Get the widget's policy for scrollbar visibility. - - @ingroup Layout */ + [[Get the widget's policy for scrollbar visibility.]] } values { -policy_h: Elm_Scroller_Policy; /*@ The horizontal scrollbar visibility policy */ -
[EGIT] [tools/edi] master 01/02: Update version requirements for release
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=c5adda87f1c25abc5bd4825d3192b4186cbf408b commit c5adda87f1c25abc5bd4825d3192b4186cbf408b Author: Andy WilliamsDate: Mon Sep 7 23:07:53 2015 +0100 Update version requirements for release --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 218b6a5..c7cbd16 100644 --- a/configure.ac +++ b/configure.ac @@ -60,11 +60,11 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) PKG_CHECK_MODULES([EFL], [ - eina >= 1.14.99 + eina >= 1.15.0 evas >= 1.8.0 ecore >= 1.8.0 edje >= 1.8.0 - eo >= 1.14.99 + eo >= 1.15.0 elementary >= 1.8.0 eio >= 1.8.0 ]) --
[EGIT] [apps/terminology] master 01/01: solarized: fix bright foreground colors
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=137af722cebf3a767a1a7f6fb7f29d0ba5103f99 commit 137af722cebf3a767a1a7f6fb7f29d0ba5103f99 Author: Boris FaureDate: Mon Sep 7 23:49:41 2015 +0200 solarized: fix bright foreground colors --- data/themes/solarized.edc | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc index 0dde17e..0eaa00e 100644 --- a/data/themes/solarized.edc +++ b/data/themes/solarized.edc @@ -49,7 +49,14 @@ color_classes { color_class { name: "c31"; color: S_base1; } color_class { name: "c32"; color: S_base3; } - color_class { name: "c38"; color: S_magenta; } + color_class { name: "c37"; color: S_base03; } + color_class { name: "c38"; color: S_orange; } + color_class { name: "c39"; color: S_base01; } + color_class { name: "c40"; color: S_base00; } + color_class { name: "c41"; color: S_base0; } + color_class { name: "c42"; color: S_violet; } + color_class { name: "c43"; color: S_base1; } + color_class { name: "c44"; color: S_base3; } color_class { name: "C0"; color: S_base02; } // COL_BLACK color_class { name: "C1"; color: S_red; } // COL_RED --
[EGIT] [core/elementary] master 01/01: index: rename elm_index_priority_set to elm_index_standard_priority_set
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=291b9ad97cf4619dffd9ffb7f92d2e8bf67d8249 commit 291b9ad97cf4619dffd9ffb7f92d2e8bf67d8249 Author: ChunEon ParkDate: Tue Sep 8 14:50:53 2015 +0900 index: rename elm_index_priority_set to elm_index_standard_priority_set this change is also for consistency with elm_toolbar_standard_priority_set conceptually the priority meaning here is same. --- src/bin/test_index.c | 8 src/lib/elm_index.c | 4 ++-- src/lib/elm_index.eo | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/test_index.c b/src/bin/test_index.c index cd05954..085f849 100644 --- a/src/bin/test_index.c +++ b/src/bin/test_index.c @@ -443,14 +443,14 @@ _index_priority_change_cb(void *data, Evas_Object *obj EINA_UNUSED, Evas_Object *index = data; int priority; - priority = elm_index_priority_get(index); + priority = elm_index_standard_priority_get(index); if (priority == 0) - elm_index_priority_set(index, 1); + elm_index_standard_priority_set(index, 1); else - elm_index_priority_set(index, 0); + elm_index_standard_priority_set(index, 0); - printf("Priority changed to : %d\n", elm_index_priority_get(index)); + printf("Priority changed to : %d\n", elm_index_standard_priority_get(index)); } void diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index ac6dea2..ed736bd 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -1613,7 +1613,7 @@ _elm_index_item_priority_set(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *it, int } EOLIAN static void -_elm_index_priority_set(Eo *obj, Elm_Index_Data *sd, int priority) +_elm_index_standard_priority_set(Eo *obj, Elm_Index_Data *sd, int priority) { if (priority < -1) { @@ -1631,7 +1631,7 @@ _elm_index_priority_set(Eo *obj, Elm_Index_Data *sd, int priority) } EOLIAN static int -_elm_index_priority_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd) +_elm_index_standard_priority_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd) { return sd->show_group; } diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo index 1c08930..e51f779 100644 --- a/src/lib/elm_index.eo +++ b/src/lib/elm_index.eo @@ -24,8 +24,8 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, Evas.Selectable_Interface enabled: bool; [[$true to enable omit feature, $false to disable]] } } - @property priority { - [[Control priority group of index. Priority group will be shown as many items as it can, and other group will be shown one character only. + @property standard_priority { + [[Control standard_priority group of index. Priority group will be shown as many items as it can, and other group will be shown one character only. @since 1.16]] set { --
[EGIT] [tools/edi] edi-0.1 01/01: oops, update versions for release
ajwillia-ms pushed a commit to branch edi-0.1. http://git.enlightenment.org/tools/edi.git/commit/?id=43a811e24f05d79e4ce0f5660b9732ef32ac03c1 commit 43a811e24f05d79e4ce0f5660b9732ef32ac03c1 Author: Andy WilliamsDate: Sun Aug 30 12:37:36 2015 +0100 oops, update versions for release --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 218b6a5..c7cbd16 100644 --- a/configure.ac +++ b/configure.ac @@ -60,11 +60,11 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) PKG_CHECK_MODULES([EFL], [ - eina >= 1.14.99 + eina >= 1.15.0 evas >= 1.8.0 ecore >= 1.8.0 edje >= 1.8.0 - eo >= 1.14.99 + eo >= 1.15.0 elementary >= 1.8.0 eio >= 1.8.0 ]) --
[EGIT] [core/efl] master 01/01: ecore_evas_extn: Fix server rendering after restart
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e97d5973e5fad88c52323a3c3e2f1b957816136e commit e97d5973e5fad88c52323a3c3e2f1b957816136e Author: Shinwoo KimDate: Tue Sep 8 13:41:23 2015 +0900 ecore_evas_extn: Fix server rendering after restart Summary: The server can render, only after the server get the OP_SHOW from the client. However, if the server relaunches while client is running, the server cannot get the OP_SHOW. In this case, the client should send the OP_SHOW, when the server is added. Test Plan: Relaunch a server especially the indicator, while client is running. Reviewers: raster, cedric, Hermet, woohyun, jaehwan, jypark, jpeg Subscribers: cedric, seoz Differential Revision: https://phab.enlightenment.org/D3028 Signed-off-by: Jean-Philippe Andre --- src/modules/ecore_evas/engines/extn/ecore_evas_extn.c | 4 1 file changed, 4 insertions(+) diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c index 6dd16ba..c8ef291 100644 --- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c +++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c @@ -920,6 +920,10 @@ _ipc_server_add(void *data, int type EINA_UNUSED, void *event) return ECORE_CALLBACK_PASS_ON; extn = bdata->data; if (!extn) return ECORE_CALLBACK_PASS_ON; + /* If a server relaunches while a client is running, the server cannot get the OP_SHOW. + In this case, the client should send the OP_SHOW, when the server is added. */ + if (ee->visible && extn->ipc.server) + ecore_ipc_server_send(extn->ipc.server, MAJOR, OP_SHOW, 0, 0, 0, NULL, 0); //FIXME: find a way to let app know server there return ECORE_CALLBACK_PASS_ON; } --
[EGIT] [core/elementary] master 01/01: hoversel: rename api scroll_enabled_set to scrollable_set
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=d73ff4601193218e92867052d533ee4b686ae8fb commit d73ff4601193218e92867052d533ee4b686ae8fb Author: ChunEon ParkDate: Mon Sep 7 20:41:34 2015 +0900 hoversel: rename api scroll_enabled_set to scrollable_set modify api for consistency. scrollable_set is more closed to other similar apis. --- src/bin/test_hoversel.c | 2 +- src/lib/elc_hoversel.c | 6 +++--- src/lib/elm_hoversel.eo | 9 ++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c index 26977dd..8fd2346 100644 --- a/src/bin/test_hoversel.c +++ b/src/bin/test_hoversel.c @@ -181,7 +181,7 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(hoversel); hoversel = elm_hoversel_add(win); - elm_hoversel_scroll_enabled_set(hoversel, EINA_TRUE); + elm_hoversel_scrollable_set(hoversel, EINA_TRUE); elm_hoversel_hover_parent_set(hoversel, win); elm_object_text_set(hoversel, "Some Icons"); elm_hoversel_item_add(hoversel, "Item 1", NULL, ELM_ICON_NONE, NULL, NULL); diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index a8bb528..c25fb6a 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -777,13 +777,13 @@ _elm_hoversel_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU } EOLIAN void -_elm_hoversel_scroll_enabled_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd, Eina_Bool scroll_enabled) +_elm_hoversel_scrollable_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd, Eina_Bool scroll) { - sd->scroll_enabled = !!scroll_enabled; + sd->scroll_enabled = !!scroll; } EOLIAN Eina_Bool -_elm_hoversel_scroll_enabled_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) +_elm_hoversel_scrollable_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { return sd->scroll_enabled; } diff --git a/src/lib/elm_hoversel.eo b/src/lib/elm_hoversel.eo index 36f4e76..878b454 100644 --- a/src/lib/elm_hoversel.eo +++ b/src/lib/elm_hoversel.eo @@ -42,16 +42,19 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface, return: const(list)*; } } - @property scroll_enabled { + @property scrollable { [[Control wether scrolling is enabled. - This Limit the size of contents and make them scrollable.]] + This Limit the size of contents and make them scrollable. + + @since 1.16 + ]] get { } set { } values { -scroll_enabled: bool; [[$true if scrollable $false otherwise.]] +scrollable: bool; [[$true if scrollable $false otherwise.]] } } hover_begin { --