Re: [E-devel] ANN: Welcome ERuler
On Wed, 13 Nov 2013 19:02:55 -0200 Gustavo Sverzut Barbieri barbi...@gmail.com wrote: Hi all, Just committed to git apps/eruler.git, the EFL on-screen ruler and measurement tools. It does the same as some other tools such as xmag, kruler and so on, but in a different (and hopefully better!) way :-) It should work in all desktop environments but requires a composite manager. It was developed and tested with Enlightenment 0.18 (git), so please report if it fails elsewhere. Although it only works with X11 at the moment I tried to isolate the X bits into platform-x.c, hopefuly someone will write a Wayland port for it :-) Please check README with more information: https://git.enlightenment.org/apps/eruler.git/tree/README?id=3e5e849e3047583ef438d0c1df3f927a4d289d3b I, for one, welcome our new ERuler. B-) -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/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/02: Add function prototype for _ecore_evas_wl_common_resize
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bc6711b229bc1e49353eb4badc60c66a1b2c4198 commit bc6711b229bc1e49353eb4badc60c66a1b2c4198 Author: Chris Michael cp.mich...@samsung.com Date: Fri Nov 15 08:10:15 2013 + Add function prototype for _ecore_evas_wl_common_resize Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h index 8de0887..11c405e 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h @@ -53,6 +53,7 @@ void _ecore_evas_wl_common_callback_focus_out_set(Ecore_Evas *ee, void (*func)(E void _ecore_evas_wl_common_callback_mouse_in_set(Ecore_Evas *ee, void (*func)(Ecore_Evas *ee)); void _ecore_evas_wl_common_callback_mouse_out_set(Ecore_Evas *ee, void (*func)(Ecore_Evas *ee)); void _ecore_evas_wl_common_move(Ecore_Evas *ee, int x, int y); +void _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h); void _ecore_evas_wl_common_raise(Ecore_Evas *ee); void _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title); void _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char *c); --
[EGIT] [core/efl] master 02/02: Unify ecore_evas resize code across both shm and egl engines.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e28d54d3e46b434334e316fe27c341f454cfca21
commit e28d54d3e46b434334e316fe27c341f454cfca21
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Nov 15 08:11:09 2013 +
Unify ecore_evas resize code across both shm and egl engines.
This reduces code duplication for ecore_evas resize routines inside
wayland engines by using a common _ecore_evas_wl_common_resize
function as the resize code for both engines was the same anyway.
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
.../engines/wayland/ecore_evas_wayland_common.c| 109 +
.../engines/wayland/ecore_evas_wayland_egl.c | 85 +---
.../engines/wayland/ecore_evas_wayland_shm.c | 86 +---
3 files changed, 52 insertions(+), 228 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index d4fac80..53bc074 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -204,30 +204,6 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
ee-prop.maximized = ecore_wl_window_maximized_get(wdata-win);
ee-prop.fullscreen = ecore_wl_window_fullscreen_get(wdata-win);
- if ((prev_max != ee-prop.maximized) ||
- (prev_full != ee-prop.fullscreen))
- {
-_ecore_evas_wl_common_state_update(ee);
-
-if (prev_full != ee-prop.fullscreen)
- _ecore_evas_wl_common_border_update(ee);
- }
-
- if (ee-prop.fullscreen)
- {
-_ecore_evas_wl_common_move(ee, ev-x, ev-y);
-ee-engine.func-fn_resize(ee, ev-w, ev-h);
-
-return ECORE_CALLBACK_PASS_ON;
- }
-
- if ((ee-x != ev-x) || (ee-y != ev-y))
- {
-ee-req.x = ev-x;
-ee-req.y = ev-y;
-if (ee-func.fn_move) ee-func.fn_move(ee);
- }
-
nw = ev-w;
nh = ev-h;
@@ -238,50 +214,40 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
evas_output_framespace_get(ee-evas, NULL, NULL, fw, fh);
if ((ee-rotation == 90) || (ee-rotation == 270))
{
- if (!ee-prop.maximized) nw = ev-w - fh;
+ nw = ev-w - fh;
nh = ev-h - fw;
}
else
{
- if (!ee-prop.maximized) nw = ev-w - fw;
+ nw = ev-w - fw;
nh = ev-h - fh;
}
}
- if (ee-prop.min.w nw) nw = ee-prop.min.w;
- else if (nw ee-prop.max.w) nw = ee-prop.max.w;
- if (ee-prop.min.h nh) nh = ee-prop.min.h;
- else if (nh ee-prop.max.h) nh = ee-prop.max.h;
+ if (prev_full != ee-prop.fullscreen)
+ _ecore_evas_wl_common_border_update(ee);
- if ((ee-w != nw) || (ee-h != nh))
+ if (ee-prop.fullscreen)
{
-ee-req.w = nw;
-ee-req.h = nh;
-ee-w = nw;
-ee-h = nh;
-if (ee-func.fn_resize) ee-func.fn_resize(ee);
-
-if ((ee-rotation == 90) || (ee-rotation == 270))
- {
- evas_output_size_set(ee-evas, ev-h, ev-w);
- evas_output_viewport_set(ee-evas, 0, 0, ev-h, ev-w);
- }
-else
- {
- evas_output_size_set(ee-evas, ev-w, ev-h);
- evas_output_viewport_set(ee-evas, 0, 0, ev-w, ev-h);
- }
+_ecore_evas_wl_common_move(ee, ev-x, ev-y);
+_ecore_evas_wl_common_resize(ee, nw, nh);
-if (wdata-frame)
- evas_object_resize(wdata-frame, ev-w, ev-h);
+if (prev_full != ee-prop.fullscreen)
+ _ecore_evas_wl_common_state_update(ee);
-if (wdata-win)
- {
- _ecore_evas_wayland_resize_edge_set(ee, ev-edges);
- ecore_wl_window_update_size(wdata-win, ev-w, ev-h);
- }
+return ECORE_CALLBACK_PASS_ON;
}
+ if ((ee-x != ev-x) || (ee-y != ev-y))
+ _ecore_evas_wl_common_move(ee, ev-x, ev-y);
+
+ if ((ee-w != ev-w) || (ee-h != ev-h))
+ _ecore_evas_wl_common_resize(ee, nw, nh);
+
+ if ((prev_max != ee-prop.maximized) ||
+ (prev_full != ee-prop.fullscreen))
+ _ecore_evas_wl_common_state_update(ee);
+
return ECORE_CALLBACK_PASS_ON;
}
@@ -533,6 +499,8 @@ void
_ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
{
Ecore_Evas_Engine_Wl_Data *wdata = ee-engine.data;
+ int orig_w, orig_h;
+ int ow, oh;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -541,6 +509,8 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
ee-req.w = w;
ee-req.h = h;
+ orig_w = w;
+ orig_h = h;
if (!ee-prop.fullscreen)
{
@@ -551,15 +521,27 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
if (ee-prop.min.h h) h = ee-prop.min.h;
else if (h ee-prop.max.h) h =
Re: [E-devel] Enlightenment Korean Dinner
On Thu, Nov 14, 2013 at 10:39 PM, Daniel Juyung Seo seojuyu...@gmail.com wrote: On Thu, Nov 14, 2013 at 12:56 PM, Christophe Sadoine ch...@indefini.orgwrote: On 11 November 2013 18:25, Cedric BAIL cedric.b...@free.fr wrote: Hello everyone, As this Saturday we will see our beloved president of the Enlightenment foundation in Korea, Philippe Caseiro (Not bad for an introduction, I think I should be doing marketing !). I think it will be a good idea to plan a little diner in Seoul. So who is in on Saturday night ? And also maybe it would be nice to find a good Korean restaurant, so if anyone as a recommendation, do not be shy ! As it will be Saturday, we might need to book in advance, so please raise your hand if you are planning to come. Enjoy the party, I think I can come. Where is it going to be? It will be a Gangnam. We're planning to have Korean barbecue. There will be announcement soon. See you there. We have indeed a good korean barbecue place in mind, hopefully it will have place at 8pm for us. We should be there, or a good amount of us at least, at that time. So let's meet at 7.30 at exit 11. -- Cedric BAIL -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Enlightenment Korean Dinner
On 11/15/2013 08:26 AM, Cedric BAIL wrote: On Thu, Nov 14, 2013 at 10:39 PM, Daniel Juyung Seo seojuyu...@gmail.com wrote: On Thu, Nov 14, 2013 at 12:56 PM, Christophe Sadoine ch...@indefini.orgwrote: On 11 November 2013 18:25, Cedric BAIL cedric.b...@free.fr wrote: Hello everyone, As this Saturday we will see our beloved president of the Enlightenment foundation in Korea, Philippe Caseiro (Not bad for an introduction, I think I should be doing marketing !). I think it will be a good idea to plan a little diner in Seoul. So who is in on Saturday night ? And also maybe it would be nice to find a good Korean restaurant, so if anyone as a recommendation, do not be shy ! As it will be Saturday, we might need to book in advance, so please raise your hand if you are planning to come. Enjoy the party, I think I can come. Where is it going to be? It will be a Gangnam. We're planning to have Korean barbecue. There will be announcement soon. See you there. We have indeed a good korean barbecue place in mind, hopefully it will have place at 8pm for us. Damn, I am going to miss it ! :( Please ship some Korean barbecue over here ;) dh We should be there, or a good amount of us at least, at that time. So let's meet at 7.30 at exit 11. -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 02/02: Don't call input panel show/hide methods unless input_panel_enabled is true.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0e4b25747f8b86e2a923d078c6124fbeb9590c11
commit 0e4b25747f8b86e2a923d078c6124fbeb9590c11
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Nov 15 08:44:19 2013 +
Don't call input panel show/hide methods unless input_panel_enabled is
true.
Fixes Phab Ticket T501
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/modules/ecore_imf/wayland/wayland_imcontext.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c
b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 7a418f3..6e301c9 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -635,7 +635,8 @@ wayland_im_context_focus_in(Ecore_IMF_Context *ctx)
imcontext-input = input;
- if (imcontext-text_input)
+ if ((imcontext-text_input)
+ (ecore_imf_context_input_panel_enabled_get(ctx)))
{
wl_text_input_show_input_panel(imcontext-text_input);
wl_text_input_activate(imcontext-text_input, seat,
@@ -759,7 +760,8 @@ wayland_im_context_show(Ecore_IMF_Context *ctx)
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, context_show);
- if (imcontext-text_input)
+ if ((imcontext-text_input)
+ (ecore_imf_context_input_panel_enabled_get(ctx)))
wl_text_input_show_input_panel(imcontext-text_input);
}
@@ -770,7 +772,8 @@ wayland_im_context_hide(Ecore_IMF_Context *ctx)
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, context_hide);
- if (imcontext-text_input)
+ if ((imcontext-text_input)
+ (ecore_imf_context_input_panel_enabled_get(ctx)))
wl_text_input_hide_input_panel(imcontext-text_input);
}
--
[EGIT] [core/efl] master 01/02: Do not call the contexts' input_panel_show/hide methods unless input_panel_enabled is True.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d00b7b2fe6a21dacb330da602e88a4b8941a38af
commit d00b7b2fe6a21dacb330da602e88a4b8941a38af
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Nov 15 08:43:23 2013 +
Do not call the contexts' input_panel_show/hide methods unless
input_panel_enabled is True.
Part of Fix for Phab Ticket T501
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_imf/ecore_imf_context.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_imf/ecore_imf_context.c
b/src/lib/ecore_imf/ecore_imf_context.c
index 41f6bc5..63c41c8 100644
--- a/src/lib/ecore_imf/ecore_imf_context.c
+++ b/src/lib/ecore_imf/ecore_imf_context.c
@@ -789,7 +789,10 @@ ecore_imf_context_input_panel_show(Ecore_IMF_Context *ctx)
}
show_req_ctx = ctx;
- if (ctx-klass-show) ctx-klass-show(ctx);
+ if (ctx-input_panel_enabled)
+ {
+if (ctx-klass-show) ctx-klass-show(ctx);
+ }
}
EAPI void
@@ -802,7 +805,10 @@ ecore_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
return;
}
- if (ctx-klass-hide) ctx-klass-hide(ctx);
+ if (ctx-input_panel_enabled)
+ {
+if (ctx-klass-hide) ctx-klass-hide(ctx);
+ }
}
EAPI void
--
[EGIT] [core/efl] master 01/01: evas - fix neon blend code used for text rendering to not leave dirty end
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=deec62c9b66c45705918bf659ce1d2107dbc6831
commit deec62c9b66c45705918bf659ce1d2107dbc6831
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Fri Nov 15 19:16:03 2013 +0900
evas - fix neon blend code used for text rendering to not leave dirty end
---
.../evas_op_blend/op_blend_mask_color_neon.c | 279 -
1 file changed, 105 insertions(+), 174 deletions(-)
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
index da7cd3e..252f276 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
@@ -19,180 +19,111 @@
#ifdef BUILD_NEON
static void
_op_blend_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d,
int l) {
- DATA32 *e;
-
- DEBUG_FNCOUNT();
-
-#define AP blend_mas_c_dp_
- asm volatile (
- .fpu neon \n\t
- vdup.i32q15, %[c] \n\t
- vmov.i8 q14,#1 \n\t
-
- // If aligned already - straight to quads
- andS%[tmp], %[d],$0xf \n\t
- beq APquadloops \n\t
-
- andS%[tmp], %[d],$0x4 \n\t
- beq APdualloop\n\t
-
- APsingleloop: \n\t
- vld1.8 d0[0], [%[m]]! \n\t
- vld1.32 d4[0], [%[d]] \n\t
- vdup.u8 d0, d0[0] \n\t
- vmull.u8q4, d0, d30 \n\t
- vqrshrn.u16 d12,q4, #8 \n\t
- vmvn.u16d14,d12 \n\t
- vshr.u32d16,d14, #24\n\t
- vmul.u32d16,d16, d28\n\t
- vmull.u8q7, d16, d4 \n\t
- vqrshrn.u16 d0, q7, #8 \n\t
- vqadd.u8d0, d0, d12 \n\t
- vst1.32 d0[0], [%[d]]! \n\t
-
- // Can we go the fast path?
- andS%[tmp], %[d],$0xf \n\t
- beq APquadloops \n\t
-
- APdualloop:\n\t
- sub %[tmp], %[e], %[d] \n\t
- cmp %[tmp], #16 \n\t
- blt APloopout \n\t
-
- vld1.16 d0[0], [%[m]]! \n\t
- vldm%[d], {d4}\n\t
- vmovl.u8q0, d0 \n\t
- vmovl.u8q0, d0 \n\t
- vmul.u32q0, q14 \n\t
- vmull.u8q4, d0, d30 \n\t
- vqrshrn.u16 d12,q4, #8 \n\t
- vmvn.u16d14,d12 \n\t
- vshr.u32d16,d14, #24\n\t
- vmul.u32d16,d16, d28\n\t
- vmull.u8q7, d16, d4 \n\t
- vqrshrn.u16 d0, q7, #8 \n\t
- vqadd.u8q0, q0, q6 \n\t
- vstm%[d]!, {d0}\n\t
-
- APquadloops: \n\t
- sub %[tmp], %[e], %[d] \n\t
- cmp %[tmp], #16 \n\t
- blt APloopout \n\t
-
-
- sub %[tmp], %[e], #15 \n\t
-
- sub %[d], #16 \n\t
- APfastloop:
- add %[d], #16 \n\t
- cmp %[tmp], %[d]\n\t
- ble APloopout \n\t
- APquadloopint: \n\t
- ldr %[x], [%[m]] \n\t
- add %[m], #4\n\t
- cmp %[x], #0 \n\t
- beq APfastloop\n\t
- vmov.32 d0[0], %[x]\n\t
- vldm%[d], {d4,d5} \n\t
-
- // Expand M: Fixme:
[EGIT] [core/elementary] master 01/02: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0d70f195a29458569455d5f3bf6ead59b85ea9d9
commit 0d70f195a29458569455d5f3bf6ead59b85ea9d9
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Nov 15 08:47:54 2013 +
Fix formatting
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/elm_win.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index dead988..25925d8 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2799,25 +2799,25 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
{
case ELM_WIN_INLINED_IMAGE:
if (!parent) break;
-{
- e = evas_object_evas_get(parent);
- Ecore_Evas *ee;
+ {
+ e = evas_object_evas_get(parent);
+ Ecore_Evas *ee;
- if (!e) break;
+ if (!e) break;
- ee = ecore_evas_ecore_evas_get(e);
- if (!ee) break;
+ ee = ecore_evas_ecore_evas_get(e);
+ if (!ee) break;
- tmp_sd.img_obj = ecore_evas_object_image_new(ee);
- if (!tmp_sd.img_obj) break;
+ tmp_sd.img_obj = ecore_evas_object_image_new(ee);
+ if (!tmp_sd.img_obj) break;
- tmp_sd.ee = ecore_evas_object_ecore_evas_get(tmp_sd.img_obj);
- if (!tmp_sd.ee)
- {
-evas_object_del(tmp_sd.img_obj);
-tmp_sd.img_obj = NULL;
- }
-}
+ tmp_sd.ee = ecore_evas_object_ecore_evas_get(tmp_sd.img_obj);
+ if (!tmp_sd.ee)
+ {
+ evas_object_del(tmp_sd.img_obj);
+ tmp_sd.img_obj = NULL;
+ }
+ }
break;
case ELM_WIN_SOCKET_IMAGE:
--
[EGIT] [core/elementary] master 02/02: Make routines to get the wayland window from an ecore_evas be more inline with their X counterparts. Also, remove some EINA_UNUSED where parameters were being us
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c4cf7da2ad210550a92a62c8399ec38cb1816aaf
commit c4cf7da2ad210550a92a62c8399ec38cb1816aaf
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Nov 15 10:14:08 2013 +
Make routines to get the wayland window from an ecore_evas be more
inline with their X counterparts. Also, remove some EINA_UNUSED where
parameters were being used.
The previous code to get the Ecore_Wl_Window from an Ecore_Evas did
not check to make sure the Ecore_Evas Engine was a wayland engine, and
thus elm_tests like Window Inline would spew CRIT ERR messages from
ecore_evas about the interface.
This fixes Phab Ticket T502
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/elm_win.c | 34 ++
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 25925d8..d401eae 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1691,6 +1691,32 @@ _elm_win_xwindow_get(Elm_Win_Smart_Data *sd)
}
#endif
+Ecore_Wl_Window *
+_elm_ee_wlwin_get(const Ecore_Evas *ee)
+{
+#ifdef HAVE_ELEMENTARY_WAYLAND
+ Ecore_Wl_Window *win = NULL;
+
+ if (!ee) return NULL;
+ if ((EE_ENGINE_COMPARE(ee, ELM_WAYLAND_SHM)) ||
+ (EE_ENGINE_COMPARE(ee, ELM_WAYLAND_EGL)))
+ {
+if (ee) win = ecore_evas_wayland_window_get(ee);
+ }
+ return win;
+
+#endif
+ return NULL;
+}
+
+#ifdef HAVE_ELEMENTARY_WAYLAND
+static void
+_elm_win_wlwindow_get(Elm_Win_Smart_Data *sd)
+{
+ sd-wl.win = _elm_ee_wlwin_get(sd-ee);
+}
+#endif
+
#ifdef HAVE_ELEMENTARY_X
static void
_elm_win_xwin_update(Elm_Win_Smart_Data *sd)
@@ -3028,7 +3054,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
#ifdef HAVE_ELEMENTARY_WAYLAND
if ((ENGINE_COMPARE(ELM_WAYLAND_SHM)) || (ENGINE_COMPARE(ELM_WAYLAND_EGL)))
- sd-wl.win = ecore_evas_wayland_window_get(sd-ee);
+ _elm_win_wlwindow_get(sd);
#endif
if ((_elm_config-bgpixmap)
@@ -5383,7 +5409,7 @@ elm_win_wl_window_get(const Evas_Object *obj)
if (!evas_object_smart_type_check_ptr(obj, MY_CLASS_NAME_LEGACY))
{
Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
-return ecore_evas_wayland_window_get(ee);
+return _elm_ee_wlwin_get(ee);
}
ELM_WIN_CHECK(obj) NULL;
@@ -5393,7 +5419,7 @@ elm_win_wl_window_get(const Evas_Object *obj)
}
static void
-_wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
+_wl_window_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
Ecore_Wl_Window **ret = va_arg(*list, Ecore_Wl_Window **);
#if HAVE_ELEMENTARY_WAYLAND
@@ -5460,7 +5486,7 @@ elm_win_floating_mode_get(const Evas_Object *obj)
}
static void
-_window_id_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
+_window_id_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
Ecore_Window *ret = va_arg(*list, Ecore_Window *);
Elm_Win_Smart_Data *sd = _pd;
--
[EGIT] [core/enlightenment] master 01/01: e_widget_data_get Can return NULL so we should check that else we could potentially crash the entire window manager (for a potentially bad module).
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=31eda6e249af6d37e6af1c5bb47306a5fd62ed45 commit 31eda6e249af6d37e6af1c5bb47306a5fd62ed45 Author: Chris Michael cp.mich...@samsung.com Date: Fri Nov 15 10:42:33 2013 + e_widget_data_get Can return NULL so we should check that else we could potentially crash the entire window manager (for a potentially bad module). Fixes Phab Ticket T491 Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/bin/e_widget_fsel.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index e92a388..a4fe5eb 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -499,7 +499,7 @@ e_widget_fsel_path_get(Evas_Object *obj, const char **dev, const char **path) E_Widget_Data *wd; if (!obj) return; - wd = e_widget_data_get(obj); + if (!(wd = e_widget_data_get(obj))) return; e_fm2_path_get(wd-o_files_fm, dev, path); } @@ -511,7 +511,7 @@ e_widget_fsel_selection_path_get(Evas_Object *obj) char buf[PATH_MAX]; if (!obj) return NULL; - wd = e_widget_data_get(obj); + if (!(wd = e_widget_data_get(obj))) return NULL; if (wd-fprev) return wd-path; s = e_widget_entry_text_get(wd-o_entry); dir = e_fm2_real_path_get(wd-o_files_fm); @@ -537,7 +537,7 @@ e_widget_fsel_window_object_set(Evas_Object *obj, E_Object *eobj) E_Widget_Data *wd; if (!obj) return; - wd = e_widget_data_get(obj); + if (!(wd = e_widget_data_get(obj))) return; e_fm2_window_object_set(wd-o_favorites_fm, eobj); e_fm2_window_object_set(wd-o_files_fm, eobj); } @@ -564,4 +564,3 @@ _e_wid_del_hook(Evas_Object *obj) free(wd); } - --
[EGIT] [core/efl] master 01/01: m4: remove saving of CFLAGS
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d606437f65d3b22d91a0e94a5e1e74eaba459aec
commit d606437f65d3b22d91a0e94a5e1e74eaba459aec
Author: Sebastian Dransfeld s...@tango.flipp.net
Date: Fri Nov 15 13:19:58 2013 +0100
m4: remove saving of CFLAGS
Since we don't modify cflags, no need to save them.
---
m4/efl_threads.m4 | 4
1 file changed, 4 deletions(-)
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
index 29277f6..04b3e64 100644
--- a/m4/efl_threads.m4
+++ b/m4/efl_threads.m4
@@ -50,7 +50,6 @@ dnl check if the compiler supports POSIX threads
if test x${_efl_have_posix_threads} = xyes ; then
SAVE_LIBS=${LIBS}
- SAVE_CFLAGS=${CFLAGS}
LIBS=${LIBS} ${LIBMULTITHREAD}
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
@@ -73,7 +72,6 @@ pthread_attr_setaffinity_np(NULL, 0, NULL);
]])],
[efl_have_setaffinity=yes],
[efl_have_setaffinity=no])
- CFLAGS=${SAVE_CFLAGS}
LIBS=${SAVE_LIBS}
fi
@@ -102,7 +100,6 @@ efl_have_posix_threads_spinlock=no
if test x${_efl_have_posix_threads} = xyes ; then
SAVE_LIBS=${LIBS}
- SAVE_CFLAGS=${CFLAGS}
LIBS=${LIBS} ${LIBMULTITHREAD}
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
@@ -117,7 +114,6 @@ sched_yield();
]])],
[efl_have_posix_threads_spinlock=yes],
[efl_have_posix_threads_spinlock=no])
- CFLAGS=${SAVE_CFLAGS}
LIBS=${SAVE_LIBS}
fi
--
[EGIT] [core/elementary] master 03/05: elm_index.c: internal refactoring as a code cleanup.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c727459c108c744571cb4ccf2efcf627784bbe14
commit c727459c108c744571cb4ccf2efcf627784bbe14
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Nov 15 21:48:46 2013 +0900
elm_index.c: internal refactoring as a code cleanup.
- removed unnecessary duplicated parameter passing.
- moved smart callback add to a proper place not to be confused with other
object's smart callback addition.
- removed unnecessary sub object add. it's done automatically in
elm_layout_content_set.
---
src/lib/elm_index.c | 24 ++--
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 3a4a5c8..7dd9041 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -871,19 +871,19 @@ _on_mouse_out_access(void *data,
}
static void
-_index_resize_cb(void *data,
+_index_resize_cb(void *data __UNUSED__,
Evas *e __UNUSED__,
- Evas_Object *obj __UNUSED__,
+ Evas_Object *obj,
void *event_info __UNUSED__)
{
- ELM_INDEX_DATA_GET_OR_RETURN(data, sd);
+ ELM_INDEX_DATA_GET_OR_RETURN(obj, sd);
if (!sd-omit_enabled) return;
Elm_Index_Item *it;
- _index_box_clear(data, 0);
- _index_box_auto_fill(data, 0);
+ _index_box_clear(obj, 0);
+ _index_box_auto_fill(obj, 0);
it = (Elm_Index_Item *)elm_index_selected_item_get(obj, sd-level);
if (it)
@@ -899,7 +899,7 @@ static void
_elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Evas_Object *o;
- Evas_Coord minw, minh;
+ Evas_Coord minw = 0, minh = 0;
Elm_Index_Smart_Data *priv = _pd;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -911,18 +911,16 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
(obj, index, base/vertical, elm_widget_style_get(obj)))
CRITICAL(Failed to set layout!);
- o = evas_object_rectangle_add(evas_object_evas_get(obj));
- priv-event[0] = o;
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL);
+
+ priv-event[0] = o = evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_color_set(o, 0, 0, 0, 0);
- minw = minh = 0;
elm_coords_finger_size_adjust(1, minw, 1, minh);
evas_object_size_hint_min_set(o, minw, minh);
elm_layout_content_set(obj, elm.swallow.event.0, o);
- elm_widget_sub_object_add(obj, o);
evas_object_event_callback_add
- (obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, obj);
- evas_object_event_callback_add
(o, EVAS_CALLBACK_MOUSE_WHEEL, _on_mouse_wheel, obj);
evas_object_event_callback_add
(o, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, obj);
@@ -950,12 +948,10 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_size_hint_min_set(o, minw, minh);
elm_layout_content_set(obj, elm.swallow.event.1, o);
-elm_widget_sub_object_add(obj, o);
}
priv-bx[0] = evas_object_box_add(evas_object_evas_get(obj));
evas_object_box_layout_set(priv-bx[0], _box_custom_layout, priv, NULL);
- elm_widget_sub_object_add(obj, priv-bx[0]);
elm_layout_content_set(obj, elm.swallow.index.0, priv-bx[0]);
evas_object_show(priv-bx[0]);
--
[EGIT] [core/elementary] master 05/05: elm_main.c: use a direct variable check instead of unnecessary additional function call like other lines of code.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=15295a5ee4630dba9ccd900e563adfb44fdd0d23 commit 15295a5ee4630dba9ccd900e563adfb44fdd0d23 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Fri Nov 15 21:53:39 2013 +0900 elm_main.c: use a direct variable check instead of unnecessary additional function call like other lines of code. --- src/lib/elm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index afcfc1e..3614c46 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -643,7 +643,7 @@ elm_quicklaunch_init(intargc, EINA_LOG_STATE_STOP, EINA_LOG_STATE_INIT); - if (elm_quicklaunch_mode_get()) + if (quicklaunch_on) _elm_init_count++; return _elm_ql_init_count; } --
[EGIT] [core/elementary] master 02/05: test_index.c: added index clear example and use activated callback for entry.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=075048c2300b69e111dafa63cbbd6f40f114ad83
commit 075048c2300b69e111dafa63cbbd6f40f114ad83
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Nov 15 21:18:04 2013 +0900
test_index.c: added index clear example and use activated callback for
entry.
---
src/bin/test_index.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index 3cb7be9..2fea084 100644
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -323,6 +323,16 @@ _test_index2_it_add(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info E
}
static void
+_test_index2_clear(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Test_Index2_Elements *gui = data;
+
+ elm_list_clear(gui-lst);
+ elm_index_item_clear(gui-id);
+}
+
+static void
_test_index2_it_del(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Test_Index2_Elements *gui = data;
@@ -391,6 +401,7 @@ test_index2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
elm_entry_single_line_set(gui-entry, EINA_TRUE);
evas_object_size_hint_weight_set(gui-entry, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_fill_set(gui-entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_smart_callback_add(gui-entry, activated,
_test_index2_it_add, gui);
elm_box_pack_end(box, gui-entry);
evas_object_show(gui-entry);
@@ -402,6 +413,14 @@ test_index2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
evas_object_smart_callback_add(bt, clicked, _test_index2_it_add, gui);
evas_object_show(bt);
+ bt = elm_button_add(win);
+ elm_object_text_set(bt, Clear);
+ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(box, bt);
+ evas_object_smart_callback_add(bt, clicked, _test_index2_clear, gui);
+ evas_object_show(bt);
+
gui-lst = elm_list_add(win);
elm_box_pack_end(box, gui-lst);
evas_object_size_hint_weight_set(gui-lst, EVAS_HINT_EXPAND,
--
[EGIT] [core/elementary] master 01/05: test_index.c: internal refactoring of test code.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9e0ce05d0cdbc86e6ad3af88424d2bee1b837b82
commit 9e0ce05d0cdbc86e6ad3af88424d2bee1b837b82
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Nov 15 18:35:07 2013 +0900
test_index.c: internal refactoring of test code.
1. Set internal function as static.
2. Put prefix '_' for internal functions.
3. Moved window resize/show code.
---
src/bin/test_index.c | 66 ++--
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index 70a2d11..3cb7be9 100644
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -117,7 +117,8 @@ _api_bt_clicked(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
}
static Elm_Genlist_Item_Class itci;
-char *gli_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part
EINA_UNUSED)
+static char *
+_gli_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part
EINA_UNUSED)
{
char buf[256];
int j = (uintptr_t)data;
@@ -128,7 +129,7 @@ char *gli_text_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *part EI
return strdup(buf);
}
-void
+static void
_index_delay_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
// called on a change but delayed in case multiple changes happen in a
@@ -137,14 +138,14 @@ _index_delay_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, vo
ELM_GENLIST_ITEM_SCROLLTO_TOP);
}
-void
+static void
_index_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
// this is called on every change, no matter how often
// elm_genlist_item_bring_in(event_info);
}
-void
+static void
_index_selected_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info)
{
// called on final select
@@ -159,7 +160,7 @@ _cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void
}
static void
-id_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+_id_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
printf(Current Index : %s\n, elm_index_item_letter_get((const
Elm_Object_Item *)event_info));
}
@@ -231,7 +232,7 @@ test_index(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
evas_object_show(id);
itci.item_style = default;
- itci.func.text_get = gli_text_get;
+ itci.func.text_get = _gli_text_get;
itci.func.content_get = NULL;
itci.func.state_get = NULL;
itci.func.del = NULL;
@@ -249,7 +250,7 @@ test_index(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
char buf[32];
snprintf(buf, sizeof(buf), %c, 'A' + ((j 4) 0xf));
- elm_index_item_append(id, buf, id_cb, glit);
+ elm_index_item_append(id, buf, _id_cb, glit);
if (*buf == 'G') /* Just init dt-item later used in API test */
api-dt.item = glit;
}
@@ -268,15 +269,15 @@ typedef struct _Test_Index2_Elements
Evas_Object *entry, *lst, *id;
} Test_Index2_Elements;
-void
-test_index2_del(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+_test_index2_del(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
/* FIXME it won't be called if elm_test main window is closed */
free(data);
}
-int
-test_index2_cmp(const void *data1, const void *data2)
+static int
+_test_index2_cmp(const void *data1, const void *data2)
{
const char *label1, *label2;
const Elm_Object_Item *li_it1 = data1;
@@ -288,8 +289,8 @@ test_index2_cmp(const void *data1, const void *data2)
return strcasecmp(label1, label2);
}
-int
-test_index2_icmp(const void *data1, const void *data2)
+static int
+_test_index2_icmp(const void *data1, const void *data2)
{
const char *label1, *label2;
const Elm_Object_Item *index_it1 = data1;
@@ -301,8 +302,8 @@ test_index2_icmp(const void *data1, const void *data2)
return strcasecmp(label1, label2);
}
-void
-test_index2_it_add(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+_test_index2_it_add(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Test_Index2_Elements *gui = data;
Elm_Object_Item *list_it;
@@ -312,17 +313,17 @@ test_index2_it_add(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info EI
label = elm_object_text_get(gui-entry);
snprintf(letter, sizeof(letter), %c, label[0]);
list_it = elm_list_item_sorted_insert(gui-lst, label, NULL, NULL, NULL,
- NULL, test_index2_cmp);
- elm_index_item_sorted_insert(gui-id, letter, NULL, list_it,
test_index2_icmp,
-test_index2_cmp);
+
[EGIT] [core/elementary] master 01/01: elm_index.c: changed internal smart data variable name more descriptive.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=1588e4503d9a3dc909c1385e596ee2a6c3725435
commit 1588e4503d9a3dc909c1385e596ee2a6c3725435
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Nov 15 22:32:56 2013 +0900
elm_index.c: changed internal smart data variable name more descriptive.
- event - event_rect
- and added a comment for that variable.
---
src/lib/elm_index.c| 36 ++--
src/lib/elm_widget_index.h | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 7dd9041..a61242f 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -352,7 +352,7 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
if (!int_ret) return;
elm_coords_finger_size_adjust(1, minw, 1, minh);
- evas_object_size_hint_min_set(sd-event[0], minw, minh);
+ evas_object_size_hint_min_set(sd-event_rect[0], minw, minh);
if (edje_object_part_exists
(wd-resize_obj, elm.swallow.index.1))
@@ -374,20 +374,20 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
if (edje_object_part_exists
(wd-resize_obj, elm.swallow.event.1))
{
-if (!sd-event[1])
+if (!sd-event_rect[1])
{
- sd-event[1] =
+ sd-event_rect[1] =
evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_color_set(sd-event[1], 0, 0, 0, 0);
- elm_widget_sub_object_add(obj, sd-event[1]);
+ evas_object_color_set(sd-event_rect[1], 0, 0, 0, 0);
+ elm_widget_sub_object_add(obj, sd-event_rect[1]);
}
-elm_layout_content_set(obj, elm.swallow.event.1, sd-event[1]);
-evas_object_size_hint_min_set(sd-event[1], minw, minh);
+elm_layout_content_set(obj, elm.swallow.event.1, sd-event_rect[1]);
+evas_object_size_hint_min_set(sd-event_rect[1], minw, minh);
}
- else if (sd-event[1])
+ else if (sd-event_rect[1])
{
-evas_object_del(sd-event[1]);
-sd-event[1] = NULL;
+evas_object_del(sd-event_rect[1]);
+sd-event_rect[1] = NULL;
}
edje_object_message_signal_process(wd-resize_obj);
@@ -914,7 +914,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
evas_object_event_callback_add
(obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL);
- priv-event[0] = o = evas_object_rectangle_add(evas_object_evas_get(obj));
+ priv-event_rect[0] = o =
evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_color_set(o, 0, 0, 0, 0);
elm_coords_finger_size_adjust(1, minw, 1, minh);
evas_object_size_hint_min_set(o, minw, minh);
@@ -944,7 +944,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
(wd-resize_obj, elm.swallow.event.1))
{
o = evas_object_rectangle_add(evas_object_evas_get(obj));
-priv-event[1] = o;
+priv-event_rect[1] = o;
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_size_hint_min_set(o, minw, minh);
elm_layout_content_set(obj, elm.swallow.event.1, o);
@@ -1071,11 +1071,11 @@ _access_obj_process(Evas_Object *obj, Eina_Bool
is_access)
_access_index_register(obj);
evas_object_event_callback_add
- (sd-event[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj);
+ (sd-event_rect[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access,
obj);
evas_object_event_callback_add
- (sd-event[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj);
+ (sd-event_rect[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access,
obj);
evas_object_event_callback_add
- (sd-event[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj);
+ (sd-event_rect[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access,
obj);
}
else
{
@@ -1085,11 +1085,11 @@ _access_obj_process(Evas_Object *obj, Eina_Bool
is_access)
(obj, elm_layout_edje_get(obj), access);
evas_object_event_callback_del_full
- (sd-event[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj);
+ (sd-event_rect[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access,
obj);
evas_object_event_callback_del_full
- (sd-event[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj);
+ (sd-event_rect[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access,
obj);
evas_object_event_callback_del_full
- (sd-event[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj);
+ (sd-event_rect[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access,
obj);
}
}
diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index eca4fb2..288a610 100644
--- a/src/lib/elm_widget_index.h
+++ b/src/lib/elm_widget_index.h
@@ -20,7 +20,7 @@
typedef struct _Elm_Index_Smart_Data
Re: [E-devel] [EGIT] [core/elementary] master 02/03: button, inwin, radio, scroller, slider: Do not call smart_activate when the widget is disabled.
Hello.
On Fri, 2013-11-08 at 04:53, Daniel Juyung Seo wrote:
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6a683df1598a4c3293a33765cc60dde89b616f2f
commit 6a683df1598a4c3293a33765cc60dde89b616f2f
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Nov 8 21:49:52 2013 +0900
button,inwin,radio,scroller,slider: Do not call smart_activate when the
widget is disabled.
---
src/lib/elm_button.c | 10 --
src/lib/elm_inwin.c| 2 ++
src/lib/elm_radio.c| 1 +
src/lib/elm_scroller.c | 4 ++--
src/lib/elm_slider.c | 4 ++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 835ba32..d89916f 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -82,14 +82,12 @@ _elm_button_smart_activate(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
+ if (elm_widget_disabled_get(obj)) return;
if (act != ELM_ACTIVATE_DEFAULT) return;
+ if (evas_object_freeze_events_get(obj)) return;
- if (!elm_widget_disabled_get(obj)
- !evas_object_freeze_events_get(obj))
- {
-evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
-elm_layout_signal_emit(obj, elm,anim,activate, elm);
- }
+ evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ elm_layout_signal_emit(obj, elm,anim,activate, elm);
if (ret) *ret = EINA_TRUE;
}
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 8d7ed11..16696bc 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -140,6 +140,8 @@ _elm_inwin_smart_activate(Eo *obj, void *_pd EINA_UNUSED,
va_list *list EINA_UNU
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+ if (elm_widget_disabled_get(obj)) return;
+
evas_object_raise(obj);
evas_object_show(obj);
edje_object_signal_emit
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 6883784..d30d6cc 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -526,6 +526,7 @@ _elm_radio_smart_activate(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
+ if (elm_widget_disabled_get(obj)) return;
if (act != ELM_ACTIVATE_DEFAULT) return;
_activate(obj);
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 0107121..48ffa5c 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -270,8 +270,8 @@ _elm_scroller_smart_activate(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
Evas_Coord page_x = 0;
Evas_Coord page_y = 0;
- if ((elm_widget_disabled_get(obj)) ||
- (act == ELM_ACTIVATE_DEFAULT)) return;
+ if (elm_widget_disabled_get(obj)) return;
+ if (act != ELM_ACTIVATE_DEFAULT) return;
At least this part destroys the logic of the code following in this
function.
With your change we return directly for everything but
ELM_ACTIVATE_RIGHT. Which means that act can not be anything else from
now on but we check for various other values of act later on.
Coverity identifies this as dead code while I think this check might
be wrong. You can also have a look at 1128353.
The same could be true for the other funtions you changed here. I have
not reviewed them.
regards
Stefan Schmidt
--
DreamFactory - Open Source REST JSON Services for HTML5 Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: scroller, slider: fixed wrong changed I made by 6a683df1598a4c3293a33765cc60dd
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=95794e0810d8de70d0cb98d68a04aa473f1e6c02 commit 95794e0810d8de70d0cb98d68a04aa473f1e6c02 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Fri Nov 15 22:51:10 2013 +0900 scroller, slider: fixed wrong changed I made by 6a683df1598a4c3293a33765cc60dd I caused by cp bug. Special thanks to stefan and coverity. This fixes coverity CID 1128353 and 1128354. --- src/lib/elm_scroller.c | 2 +- src/lib/elm_slider.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index 48ffa5c..67ae134 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -271,7 +271,7 @@ _elm_scroller_smart_activate(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Evas_Coord page_y = 0; if (elm_widget_disabled_get(obj)) return; - if (act != ELM_ACTIVATE_DEFAULT) return; + if (act == ELM_ACTIVATE_DEFAULT) return; eo_do(obj, elm_scrollable_interface_content_pos_get(x, y), diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 8ae88e4..86617d7 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -458,7 +458,7 @@ _elm_slider_smart_activate(Eo *obj, void *_pd, va_list *list) Elm_Slider_Smart_Data *sd = _pd; if (elm_widget_disabled_get(obj)) return; - if (act != ELM_ACTIVATE_DEFAULT) return; + if (act == ELM_ACTIVATE_DEFAULT) return; if ((act == ELM_ACTIVATE_UP) || (act == ELM_ACTIVATE_RIGHT)) --
Re: [E-devel] [EGIT] [core/elementary] master 02/03: button, inwin, radio, scroller, slider: Do not call smart_activate when the widget is disabled.
On Fri, Nov 15, 2013 at 10:33 PM, Stefan Schmidt
ste...@datenfreihafen.orgwrote:
Hello.
On Fri, 2013-11-08 at 04:53, Daniel Juyung Seo wrote:
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6a683df1598a4c3293a33765cc60dde89b616f2f
commit 6a683df1598a4c3293a33765cc60dde89b616f2f
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Nov 8 21:49:52 2013 +0900
button,inwin,radio,scroller,slider: Do not call smart_activate when
the widget is disabled.
---
src/lib/elm_button.c | 10 --
src/lib/elm_inwin.c| 2 ++
src/lib/elm_radio.c| 1 +
src/lib/elm_scroller.c | 4 ++--
src/lib/elm_slider.c | 4 ++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 835ba32..d89916f 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -82,14 +82,12 @@ _elm_button_smart_activate(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
+ if (elm_widget_disabled_get(obj)) return;
if (act != ELM_ACTIVATE_DEFAULT) return;
+ if (evas_object_freeze_events_get(obj)) return;
- if (!elm_widget_disabled_get(obj)
- !evas_object_freeze_events_get(obj))
- {
-evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
-elm_layout_signal_emit(obj, elm,anim,activate, elm);
- }
+ evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ elm_layout_signal_emit(obj, elm,anim,activate, elm);
if (ret) *ret = EINA_TRUE;
}
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 8d7ed11..16696bc 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -140,6 +140,8 @@ _elm_inwin_smart_activate(Eo *obj, void *_pd
EINA_UNUSED, va_list *list EINA_UNU
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+ if (elm_widget_disabled_get(obj)) return;
+
evas_object_raise(obj);
evas_object_show(obj);
edje_object_signal_emit
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 6883784..d30d6cc 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -526,6 +526,7 @@ _elm_radio_smart_activate(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
+ if (elm_widget_disabled_get(obj)) return;
if (act != ELM_ACTIVATE_DEFAULT) return;
_activate(obj);
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 0107121..48ffa5c 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -270,8 +270,8 @@ _elm_scroller_smart_activate(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
Evas_Coord page_x = 0;
Evas_Coord page_y = 0;
- if ((elm_widget_disabled_get(obj)) ||
- (act == ELM_ACTIVATE_DEFAULT)) return;
+ if (elm_widget_disabled_get(obj)) return;
+ if (act != ELM_ACTIVATE_DEFAULT) return;
At least this part destroys the logic of the code following in this
function.
With your change we return directly for everything but
ELM_ACTIVATE_RIGHT. Which means that act can not be anything else from
now on but we check for various other values of act later on.
Coverity identifies this as dead code while I think this check might
be wrong. You can also have a look at 1128353.
The same could be true for the other funtions you changed here. I have
not reviewed them.
Great catch! It was a copy and paste bug from me.
Sorry but thanks a lot to Stefan and coverity.
Just fixed that.
Thanks.
Daniel Juyung Seo (SeoZ)
regards
Stefan Schmidt
--
DreamFactory - Open Source REST JSON Services for HTML5 Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
--
DreamFactory - Open Source REST JSON Services for HTML5 Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] e_widget_list: removing items?
Fantastic, is there a target release date for e18? Also, while I know that Documentation sucks to write, but have you thought about making it a priority for e18. Great documentation that really focuses on teaching, will bring new programers to e18 and help to get the code based used in more projects. After all, you guys are putting a lot of work into this why not go all the way and make a complete tool with complete documentation. Not just primarily examples. On Fri, Nov 15, 2013 at 6:41 AM, Cedric BAIL cedric.b...@free.fr wrote: On Fri, Nov 15, 2013 at 3:14 PM, Andrew F andrewfriedman...@gmail.com wrote: Is elm being designed as a full featured took kit? Yes, that's the goal. There is still feature missing as always, but it is growing to fill the need for any kind of applications. We are improving it as we write real world applications. -- Cedric BAIL -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 02/03: conf_randr: Compare mode against correct smart data.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=56fe7e4e5b6879541fd3109ca2f99bfcde2b6388 commit 56fe7e4e5b6879541fd3109ca2f99bfcde2b6388 Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Nov 15 15:55:45 2013 +0100 conf_randr: Compare mode against correct smart data. This copy and paste bug compared the sd mode against the parent sd mode. Classical cp bug when having two blocks of code so similar. CID: 1039954 --- src/modules/conf_randr/e_smart_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/conf_randr/e_smart_monitor.c b/src/modules/conf_randr/e_smart_monitor.c index 977608b..4ab07ee 100644 --- a/src/modules/conf_randr/e_smart_monitor.c +++ b/src/modules/conf_randr/e_smart_monitor.c @@ -734,7 +734,7 @@ e_smart_monitor_clone_set(Evas_Object *obj, Evas_Object *parent) else psd-changes = ~(E_SMART_MONITOR_CHANGED_POSITION); - if (psd-crtc.mode != sd-current.mode) + if (psd-crtc.mode != psd-current.mode) psd-changes |= E_SMART_MONITOR_CHANGED_MODE; else psd-changes = ~(E_SMART_MONITOR_CHANGED_MODE); --
[EGIT] [core/enlightenment] master 03/03: Avoid umask problem with mkstemp by using eina_file_mkstemp
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0afd8e8910fcffb73cfc77f6f18c90ae85a6d47e
commit 0afd8e8910fcffb73cfc77f6f18c90ae85a6d47e
Author: Stefan Schmidt s.schm...@samsung.com
Date: Fri Nov 15 16:34:55 2013 +0100
Avoid umask problem with mkstemp by using eina_file_mkstemp
Instead of handling umask in every mkstemp case we can simply use
eina_file_mkstemp for this.
CID: 1039806
---
src/bin/e_import_config_dialog.c | 4 ++--
src/modules/wl_screenshot/e_mod_main.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c
index 66679f0..3159685 100644
--- a/src/bin/e_import_config_dialog.c
+++ b/src/bin/e_import_config_dialog.c
@@ -50,8 +50,8 @@ _import_edj_gen(E_Import_Config_Dialog *import)
return;
}
- strcpy(tmpn, /tmp/e_bgdlg_new.edc-tmp-XX);
- fd = mkstemp(tmpn);
+ strcpy(tmpn, e_bgdlg_new.edc-tmp-XX);
+ fd = eina_file_mkstemp(tmpn, NULL);
if (fd 0)
{
printf(Error Creating tmp file: %s\n, strerror(errno));
diff --git a/src/modules/wl_screenshot/e_mod_main.c
b/src/modules/wl_screenshot/e_mod_main.c
index b328e3e..a4a3c9a 100644
--- a/src/modules/wl_screenshot/e_mod_main.c
+++ b/src/modules/wl_screenshot/e_mod_main.c
@@ -218,13 +218,13 @@ _cb_handle_global_remove(void *data __UNUSED__, struct
wl_registry *registry __U
static struct wl_buffer *
_create_shm_buffer(struct wl_shm *_shm, int width, int height, void **data_out)
{
- char filename[] = /tmp/wayland-shm-XX;
+ char filename[] = wayland-shm-XX;
struct wl_shm_pool *pool;
struct wl_buffer *buffer;
int fd, size, stride;
void *data;
- fd = mkstemp(filename);
+ fd = eina_file_mkstemp(filename, NULL);
if (fd 0)
{
fprintf(stderr, open %s failed: %m\n, filename);
--
[EGIT] [core/enlightenment] master 01/03: e_fm/udisk: Delete the correct storage handle.
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5d6960c2ced5cac15dbf1dd5a1778ad91072df45
commit 5d6960c2ced5cac15dbf1dd5a1778ad91072df45
Author: Stefan Schmidt s.schm...@samsung.com
Date: Fri Nov 15 15:47:54 2013 +0100
e_fm/udisk: Delete the correct storage handle.
Copy and paste bug introduced in the initial port to edbus.
This could be a cause of problems when using e_fm with removable media and
udisk.
CID: 1039955
---
src/bin/e_fm/e_fm_main_udisks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_fm/e_fm_main_udisks.c b/src/bin/e_fm/e_fm_main_udisks.c
index 96fd871..5d5717f 100644
--- a/src/bin/e_fm/e_fm_main_udisks.c
+++ b/src/bin/e_fm/e_fm_main_udisks.c
@@ -417,7 +417,7 @@ _e_fm_main_udisks_cb_store_prop(void *data, const
Eldbus_Message *msg,
if (s-system_internal)
{
DBG(removing storage internal %s, s-udi);
-ecore_idler_add(_storage_del, s-dbus_path);
+ecore_idler_add(_storage_del, s-udi);
return;
}
/* force it to be removable if it passed the above tests */
--
Re: [E-devel] [EGIT] [core/enlightenment] master 02/03: conf_randr: Compare mode against correct smart data.
Doh, damn fat-finger copy/paste ;) Thanks Stefan ! :) Cheers, dh On 11/15/13 15:39, Stefan Schmidt wrote: stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=56fe7e4e5b6879541fd3109ca2f99bfcde2b6388 commit 56fe7e4e5b6879541fd3109ca2f99bfcde2b6388 Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Nov 15 15:55:45 2013 +0100 conf_randr: Compare mode against correct smart data. This copy and paste bug compared the sd mode against the parent sd mode. Classical cp bug when having two blocks of code so similar. CID: 1039954 --- src/modules/conf_randr/e_smart_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/conf_randr/e_smart_monitor.c b/src/modules/conf_randr/e_smart_monitor.c index 977608b..4ab07ee 100644 --- a/src/modules/conf_randr/e_smart_monitor.c +++ b/src/modules/conf_randr/e_smart_monitor.c @@ -734,7 +734,7 @@ e_smart_monitor_clone_set(Evas_Object *obj, Evas_Object *parent) else psd-changes = ~(E_SMART_MONITOR_CHANGED_POSITION); - if (psd-crtc.mode != sd-current.mode) + if (psd-crtc.mode != psd-current.mode) psd-changes |= E_SMART_MONITOR_CHANGED_MODE; else psd-changes = ~(E_SMART_MONITOR_CHANGED_MODE); -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: simple click doesn't create one-char selection
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=03802df2a95fb2391c0508c5e47d3563ec4cb4f2
commit 03802df2a95fb2391c0508c5e47d3563ec4cb4f2
Author: Boris Faure bill...@gmail.com
Date: Fri Nov 15 22:21:11 2013 +0100
simple click doesn't create one-char selection
(for real…)
---
src/bin/termio.c | 33 ++---
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 466c254..3895d61 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -3083,7 +3083,6 @@ _smart_cb_mouse_down(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUS
start_y = sd-pty-selection.start.y;
end_x = sd-pty-selection.end.x;
end_y = sd-pty-selection.end.y;
- _sel_set(data, EINA_TRUE);
sd-pty-selection.makesel = EINA_TRUE;
if (sd-pty-selection.is_box)
{
@@ -3140,29 +3139,16 @@ _smart_cb_mouse_down(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUS
else
{
sd-moved = EINA_FALSE;
- _sel_set(data, EINA_TRUE);
- if (evas_key_modifier_is_set(ev-modifiers, Shift) ||
+ sd-pty-selection.is_box =
+ (evas_key_modifier_is_set(ev-modifiers, Shift) ||
evas_key_modifier_is_set(ev-modifiers, Control)
||
- evas_key_modifier_is_set(ev-modifiers, Alt))
- {
-sd-pty-selection.start.x = cx;
-sd-pty-selection.start.y = cy - sd-scroll;
-sd-pty-selection.end.x = cx;
-sd-pty-selection.end.y = cy - sd-scroll;
-sd-pty-selection.makesel = EINA_TRUE;
-sd-pty-selection.is_box = EINA_TRUE;
-_selection_dbl_fix(data);
- }
- else
- {
-sd-pty-selection.makesel = EINA_TRUE;
-sd-pty-selection.start.x = cx;
-sd-pty-selection.start.y = cy - sd-scroll;
-sd-pty-selection.end.x = cx;
-sd-pty-selection.end.y = cy - sd-scroll;
-sd-pty-selection.is_box = EINA_FALSE;
-_selection_dbl_fix(data);
- }
+ evas_key_modifier_is_set(ev-modifiers, Alt));
+ sd-pty-selection.start.x = cx;
+ sd-pty-selection.start.y = cy - sd-scroll;
+ sd-pty-selection.end.x = cx;
+ sd-pty-selection.end.y = cy - sd-scroll;
+ sd-pty-selection.makesel = EINA_TRUE;
+ _selection_dbl_fix(data);
}
}
}
@@ -3329,6 +3315,7 @@ _smart_cb_mouse_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUS
if (sd-pty-selection.makesel)
{
int start_x, start_y, end_x, end_y;
+_sel_set(data, EINA_TRUE);
if (!sd-pty-selection.is_active)
{
--
[EGIT] [apps/terminology] master 01/02: remove useless code
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=35627a93952d020b94e9a585e5c611129888216c
commit 35627a93952d020b94e9a585e5c611129888216c
Author: Boris Faure bill...@gmail.com
Date: Fri Nov 15 22:52:12 2013 +0100
remove useless code
---
src/bin/termio.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 3895d61..57b7623 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -3335,11 +3335,6 @@ _smart_cb_mouse_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUS
cy -= sd-scroll;
sd-top_left = EINA_FALSE;
sd-bottom_right = EINA_FALSE;
-if (cy start_y || (cy == start_y cx = start_x)) {
- sd-top_left = EINA_TRUE;
-} else if (cy end_y || (cy == end_y cx end_x)) {
- sd-bottom_right = EINA_TRUE;
-}
sd-pty-selection.end.x = cx;
sd-pty-selection.end.y = cy;
--
[EGIT] [apps/terminology] master 02/02: tabs are implemented
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4f05397bd59442b0dc4c3473b80165cd123732b1 commit 4f05397bd59442b0dc4c3473b80165cd123732b1 Author: Boris Faure bill...@gmail.com Date: Sat Nov 16 00:07:30 2013 +0100 tabs are implemented --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 7dd4efb..eb46145 100644 --- a/README +++ b/README @@ -58,7 +58,7 @@ Shift+Keypad-Multiply = Reset font size to 10 Shift+Keypad-Divide = Copy highlight to Clipboard (same as ctrl+c in gui apps) Ctrl+PgUp = switch focus to previous terminal inside a window Ctrl+PgDn = switch focus to next terminal inside a window -Ctrl+Shift+t = create new terminal on top of current inside window (tabs) (not implemented) +Ctrl+Shift+t = create new terminal on top of current inside window (tabs) Ctrl+Shift+Home = bring up tab switcher Ctrl+Shift+PgUp = split terminal horizontally (1 term above the other) Ctrl+Shift+PgDn = split terminal vertically (1 term to the left of the other) --
[EGIT] [misc/entrance] master 01/02: entrance: remove a warning
yoz pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1f54faeb13a886a6bae23e898036b97acf21d528
commit 1f54faeb13a886a6bae23e898036b97acf21d528
Author: Michael Bouchaud y...@efl.so
Date: Sat Nov 16 00:49:57 2013 +0100
entrance: remove a warning
---
src/daemon/entrance_session.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/daemon/entrance_session.c b/src/daemon/entrance_session.c
index db97edd..01086c3 100644
--- a/src/daemon/entrance_session.c
+++ b/src/daemon/entrance_session.c
@@ -357,7 +357,7 @@ static const char *
_entrance_session_find_command(const char *path, const char *session)
{
Eina_List *l;
- Entrance_Xsession *xsession;
+ Entrance_Xsession *xsession = NULL;
char buf[PATH_MAX];
if (session)
{
--
[EGIT] [misc/entrance] master 02/02: entrance: efl 1.8 compliant
yoz pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=bb8301501f7ef77080621f54c47b0a4d3be9cd32
commit bb8301501f7ef77080621f54c47b0a4d3be9cd32
Author: Michael Bouchaud y...@efl.so
Date: Sat Nov 16 00:51:21 2013 +0100
entrance: efl 1.8 compliant
---
src/bin/entrance_fill.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/entrance_fill.c b/src/bin/entrance_fill.c
index 95827c4..f6593e4 100644
--- a/src/bin/entrance_fill.c
+++ b/src/bin/entrance_fill.c
@@ -179,13 +179,13 @@ entrance_fill(Evas_Object *obj, Entrance_Fill *ef,
Eina_List *contents, Entrance
if (!obj) return;
if ((type = elm_object_widget_type_get(obj)))
{
-if (!strcmp(type, elm_list))
+if (!strcasecmp(type, elm_list))
_entrance_fill_list(obj, ef, contents, fill_cb, func, data);
-else if (!strcmp(type, elm_genlist))
+else if (!strcasecmp(type, elm_genlist))
_entrance_fill_genlist(obj, ef, contents, fill_cb, func, data);
-else if (!strcmp(type, elm_gengrid))
+else if (!strcasecmp(type, elm_gengrid))
_entrance_fill_gengrid(obj, ef, contents, fill_cb, func, data);
-else if (!strcmp(type, elm_hoversel))
+else if (!strcasecmp(type, elm_hoversel))
_entrance_fill_hoversell(obj, ef, contents, fill_cb, func, data);
else
{
--
[EGIT] [core/efl] master 02/02: doc - update images.mk
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=03969c98227195cf8e475f606026a50f0d92c419 commit 03969c98227195cf8e475f606026a50f0d92c419 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Nov 16 09:46:19 2013 +0900 doc - update images.mk --- doc/images.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/images.mk b/doc/images.mk index a34a365..094053d 100644 --- a/doc/images.mk +++ b/doc/images.mk @@ -1 +1,2 @@ -EXTRA_DIST += img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/b1.png img/b2.png img/b3.png img/b4.png img/b5.png img/b6.png img/b7.png img/b8.png img/b9.png img/basic2final.eps img/basic2final.png img/border-ef [...] +EXTRA_DIST += \\ +img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/b1.png img/b2.png img/b3.png img/b4.png img/b5.png img/b6.png img/b7.png img/b8.png img/b9.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/b [...] --
[EGIT] [core/efl] master 01/02: Fix build issues on Mac OS X due to sh differences.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f126afbba21af39c493f21424b653bb5c2e0d58f
commit f126afbba21af39c493f21424b653bb5c2e0d58f
Author: Jean Guyomarc'h jean.guyoma...@gmail.com
Date: Sat Nov 16 09:43:23 2013 +0900
Fix build issues on Mac OS X due to sh differences.
Summary:
* efl.m4: add support for xterm-256color and fix display for the bsd
echo. Fix autotools issue (present on Ubuntu also, but better handled).
* doc/Makefile.am: bsd echo may not handle -n option in sh
Reviewers: cedric
CC: cedric, seoz
Differential Revision: https://phab.enlightenment.org/D329
---
.gitignore | 1 +
doc/Makefile.am | 2 +-
m4/efl.m4 | 19 +--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index d1d2d49..f98ec62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
Makefile
Makefile.in
tags
+.DS_Store
.deps
.libs
*.trs
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7c94bce..c20d167 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -54,7 +54,7 @@ include images.mk
all-local:
@rm -f images.tmp; \
- echo $(ECHO_N) 'EXTRA_DIST += ' images.tmp; \
+ echo 'EXTRA_DIST += \\' images.tmp; \
(cd $(srcdir) find ./img -type f -print | cut -d/ -f2- | grep -v '~'
| sort | tr '\n' ' ') images.tmp \
echo images.tmp \
if ! cmp $(srcdir)/images.mk images.tmp /dev/null; then \
diff --git a/m4/efl.m4 b/m4/efl.m4
index 5cf6054..7e27700 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -49,7 +49,7 @@ dnl want_color: yes or no
AC_DEFUN([EFL_COLOR],
[dnl
case $TERM in
- xterm|xterm-color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
+
xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
want_color=${WANT_COLOR:-yes}
;;
*)
@@ -58,10 +58,17 @@ case $TERM in
esac
if test ${want_color} = yes; then
- COLOR_YES=`echo -e \033@:@1;32m`
- COLOR_NO=`echo -e \033@:@1;31m`
- COLOR_OTHER=`echo -e \033@:@1;36m`
- COLOR_RESET=`echo -e \033@:@0m`
+ if test `echo -e` = -e; then
+ echoopt=
+ else
+ echoopt=-e
+ fi
+
+ COLOR_YES=`echo $echoopt \033@:@1;32m`
+ COLOR_NO=`echo $echoopt \033@:@1;31m`
+ COLOR_OTHER=`echo $echoopt \033@:@1;36m`
+ COLOR_RESET=`echo $echoopt \033@:@0m`
+
else
COLOR_YES=
COLOR_NO=
@@ -358,7 +365,7 @@ m4_defn([UP])_LDFLAGS=${EFL_COV_LDFLAGS} ${EFL_LDFLAGS}
${m4_defn([UP])_LDFLAGS
m4_defn([UP])_LIBS= ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS}
${m4_defn([UP])_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}
${requirements_internal_deps_libs_[]m4_defn([DOWN])}
${requirements_public_libs_[]m4_defn([DOWN])}
${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl}
m4_defn([UP])_INTERNAL_LIBS=${m4_defn([UP])_INTERNAL_LIBS}
${requirements_internal_libs_[]m4_defn([DOWN])}
USE_[]m4_defn([UP])_LIBS=${m4_defn([UP])_LIBS}
lib/${libdirname}/lib${libname}.la
-USE_[]m4_defn([UP])_INTERNAL_LIBS=${m4_defn([UP])_INTERNAL_LIBS}
lib/${libdirname}/lib${libname}.la
${requirements_internal_deps_libs_[]m4_defn([DOWN])}
+USE_[]m4_defn([UP])_INTERNAL_LIBS=${m4_defn([UP])_INTERNAL_LIBS}
lib/${libdirname}/lib${libname}.la
m4_defn([UP])_CFLAGS=${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS}
-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname}
${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl}
-DEFL_[]m4_defn([UP])_BUILD=1
requirements_pc_[]m4_defn([DOWN])=${requirements_pc_[]m4_defn([DOWN])}
${requirements_pc_efl}
requirements_pc_deps_[]m4_defn([DOWN])=${requirements_pc_deps_[]m4_defn([DOWN])}
${requirements_pc_deps_efl}
--
[EGIT] [core/elementary] master 01/01: Elm_menu: fixed item disable hook for elm_dbus_menu
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e89f620324750aae8de9b4d968ee706df5fb4144
commit e89f620324750aae8de9b4d968ee706df5fb4144
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Sat Nov 16 09:50:32 2013 +0900
Elm_menu: fixed item disable hook for elm_dbus_menu
Summary:
Menu items in dbus-mode (in Ubunut/Unity) were not updated on
disabled/enabled state changes. They were applied only after
adding/removing an item.
Reviewers: cedric, seoz, raster
Reviewed By: raster
CC: reutskiy.v.v
Differential Revision: https://phab.enlightenment.org/D333
---
src/bin/test_main_menu.c | 9 +
src/lib/elm_dbus_menu.c | 1 +
src/lib/elm_menu.c| 5 -
src/lib/elm_priv.h| 1 +
src/lib/elm_widget_menu.h | 1 +
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/bin/test_main_menu.c b/src/bin/test_main_menu.c
index e21f4cb..846cc71 100644
--- a/src/bin/test_main_menu.c
+++ b/src/bin/test_main_menu.c
@@ -2,13 +2,14 @@
# include elementary_config.h
#endif
#include Elementary.h
-
-
static void
-_click_me(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+_click_me(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
+ Elm_Object_Item *it = (Elm_Object_Item *)data;
fputs(:-)\n, stderr);
+ int disabled = elm_object_item_disabled_get(it);
+ elm_object_item_disabled_set(it, !disabled);
}
void
@@ -68,7 +69,7 @@ test_main_menu(void *data EINA_UNUSED,
menu_it1 = elm_menu_item_add(menu, menu_it, NULL, disabled item, NULL,
NULL);
elm_object_item_disabled_set(menu_it1, EINA_TRUE);
elm_menu_item_separator_add(menu, menu_it);
- elm_menu_item_add(menu, menu_it, NULL, click me :-), _click_me, NULL);
+ elm_menu_item_add(menu, menu_it, NULL, click me :-), _click_me, menu_it1);
elm_menu_item_add(menu, menu_it, applications-email-panel, third item,
NULL, NULL);
menu_it1 = elm_menu_item_add(menu, menu_it, NULL, sub menu, NULL, NULL);
elm_menu_item_add(menu, menu_it1, NULL, first item, NULL, NULL);
diff --git a/src/lib/elm_dbus_menu.c b/src/lib/elm_dbus_menu.c
index 9c2287b..798ff13 100644
--- a/src/lib/elm_dbus_menu.c
+++ b/src/lib/elm_dbus_menu.c
@@ -1032,5 +1032,6 @@ _elm_dbus_menu_item_delete(Elm_DBus_Menu *dbus_menu, int
id)
void
_elm_dbus_menu_update(Elm_DBus_Menu *dbus_menu)
{
+ dbus_menu-timestamp++;
_layout_signal(dbus_menu);
}
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 9741188..d0e31de 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -84,6 +84,7 @@ _item_disable_hook(Elm_Object_Item *it)
else
elm_layout_signal_emit(VIEW(item), elm,state,enabled, elm);
+ if (item-dbus_menu) _elm_dbus_menu_update(item-dbus_menu);
edje_object_message_signal_process(elm_layout_edje_get(VIEW(item)));
}
@@ -985,8 +986,10 @@ _item_add(Eo *obj, void *_pd, va_list *list)
_elm_menu_item_add_helper(obj, (Elm_Menu_Item *)parent, subitem, sd);
if (sd-dbus_menu)
+ {
subitem-dbus_idx = _elm_dbus_menu_item_add(sd-dbus_menu,
(Elm_Object_Item *)subitem);
-
+ subitem-dbus_menu = sd-dbus_menu;
+ }
*ret = (Elm_Object_Item *)subitem;
}
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 8b58466..110b615 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -437,6 +437,7 @@ const char *_elm_dbus_menu_register(Eo *obj);
void _elm_dbus_menu_unregister(Eo *obj);
int _elm_dbus_menu_item_add(Elm_DBus_Menu *dbus_menu,
Elm_Object_Item *item);
+void _elm_dbus_menu_update(Elm_DBus_Menu *dbus_menu);
void _elm_dbus_menu_item_delete(Elm_DBus_Menu *dbus_menu,
int id);
diff --git a/src/lib/elm_widget_menu.h b/src/lib/elm_widget_menu.h
index 03e3ef0..2bde15b 100644
--- a/src/lib/elm_widget_menu.h
+++ b/src/lib/elm_widget_menu.h
@@ -40,6 +40,7 @@ struct _Elm_Menu_Item
const char*label;
Evas_Smart_Cb func;
unsigned int idx;
+ Elm_DBus_Menu *dbus_menu;
intdbus_idx;
struct
--
[EGIT] [core/efl] master 01/01: edje_edit: fixed SEGFAULT in _edje_real_part_free
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a4c16c221efdf592404b397d3c472414794df01d
commit a4c16c221efdf592404b397d3c472414794df01d
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Sat Nov 16 09:55:42 2013 +0900
edje_edit: fixed SEGFAULT in _edje_real_part_free
Reviewers: cedric, seoz, raster
Reviewed By: raster
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D336
---
src/lib/edje/edje_edit.c | 51 ++--
1 file changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index c0584f2..b97f03f 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -311,39 +311,44 @@ _edje_real_part_free(Edje *ed, Edje_Real_Part *rp)
if (rp-object)
{
- _edje_callbacks_del(rp-object, ed);
- evas_object_del(rp-object);
+ _edje_callbacks_del(rp-object, ed);
+ evas_object_del(rp-object);
}
- if ((rp-typedata.swallow) (rp-typedata.swallow-swallowed_object))
+ if ((rp-type == EDJE_RP_TYPE_SWALLOW) (rp-typedata.swallow)
+ (rp-typedata.swallow-swallowed_object))
{
- evas_object_smart_member_del(rp-typedata.swallow-swallowed_object);
- evas_object_event_callback_del(rp-typedata.swallow-swallowed_object,
- EVAS_CALLBACK_FREE,
- _edje_object_part_swallow_free_cb);
- evas_object_clip_unset(rp-typedata.swallow-swallowed_object);
- evas_object_data_del(rp-typedata.swallow-swallowed_object, \377
edje.swallowing_part);
- if (rp-part-mouse_events)
- _edje_callbacks_del(rp-typedata.swallow-swallowed_object, ed);
+ evas_object_smart_member_del(rp-typedata.swallow-swallowed_object);
+ evas_object_event_callback_del(rp-typedata.swallow-swallowed_object,
+EVAS_CALLBACK_FREE, _edje_object_part_swallow_free_cb);
+ evas_object_clip_unset(rp-typedata.swallow-swallowed_object);
+ evas_object_data_del(rp-typedata.swallow-swallowed_object,
+\377 edje.swallowing_part);
+ if (rp-part-mouse_events)
+_edje_callbacks_del(rp-typedata.swallow-swallowed_object, ed);
- if (rp-part-type == EDJE_PART_TYPE_GROUP ||
- rp-part-type == EDJE_PART_TYPE_EXTERNAL)
- evas_object_del(rp-typedata.swallow-swallowed_object);
+ if (rp-part-type == EDJE_PART_TYPE_GROUP ||
+ rp-part-type == EDJE_PART_TYPE_EXTERNAL)
+evas_object_del(rp-typedata.swallow-swallowed_object);
- rp-typedata.swallow-swallowed_object = NULL;
+ rp-typedata.swallow-swallowed_object = NULL;
}
- if ((rp-typedata.text) (rp-typedata.text-text))
eina_stringshare_del(rp-typedata.text-text);
- if ((rp-typedata.text) (rp-typedata.text-font))
eina_stringshare_del(rp-typedata.text-font);
- if ((rp-typedata.text) (rp-typedata.text-cache.in_str))
eina_stringshare_del(rp-typedata.text-cache.in_str);
- if ((rp-typedata.text) (rp-typedata.text-cache.out_str))
eina_stringshare_del(rp-typedata.text-cache.out_str);
+ if ((rp-type == EDJE_RP_TYPE_TEXT) (rp-typedata.text)
+(rp-typedata.text-text)) eina_stringshare_del(rp-typedata.text-text);
+ if ((rp-type == EDJE_RP_TYPE_TEXT) (rp-typedata.text)
+(rp-typedata.text-font)) eina_stringshare_del(rp-typedata.text-font);
+ if ((rp-type == EDJE_RP_TYPE_TEXT) (rp-typedata.text)
+(rp-typedata.text-cache.in_str))
eina_stringshare_del(rp-typedata.text-cache.in_str);
+ if ((rp-type == EDJE_RP_TYPE_TEXT) (rp-typedata.text)
+(rp-typedata.text-cache.out_str))
eina_stringshare_del(rp-typedata.text-cache.out_str);
if (rp-custom)
{
- _edje_collection_free_part_description_clean(rp-part-type,
rp-custom-description, 0);
-if (rp-custom) free(rp-custom-set);
-eina_mempool_free(_edje_real_part_state_mp, rp-custom);
- rp-custom = NULL;
+ _edje_collection_free_part_description_clean(rp-part-type,
rp-custom-description, 0);
+ if (rp-custom) free(rp-custom-set);
+ eina_mempool_free(_edje_real_part_state_mp, rp-custom);
+ rp-custom = NULL;
}
free(rp-drag);
--
[EGIT] [core/elementary] master 01/01: fix color premul complaints in examples
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d71c5af33b9b62475987f44ff3fae0eeacff6437
commit d71c5af33b9b62475987f44ff3fae0eeacff6437
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Nov 16 10:21:03 2013 +0900
fix color premul complaints in examples
this should fix T498
---
src/bin/test_colorselector.c| 7 +--
src/examples/colorselector_example_01.c | 4
src/examples/transit_example_03.c | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c
index 6fb4d6e..32fb4dc 100644
--- a/src/bin/test_colorselector.c
+++ b/src/bin/test_colorselector.c
@@ -13,12 +13,7 @@ _colorselector_changed_cb(void *data, Evas_Object *obj,
elm_colorselector_color_get(obj, r, g, b, a);
printf(Changed Color [r=%d g=%d b=%d a=%d]\n, r, g, b, a);
-
- /* Fix Alpha pre multiplication by edje */
- r = (r * a) / 255;
- g = (g * a) / 255;
- b = (b * a) / 255;
-
+ evas_color_argb_premul(a, r, g, b);
evas_object_color_set(re, r, g, b, a);
}
diff --git a/src/examples/colorselector_example_01.c
b/src/examples/colorselector_example_01.c
index 2afa8b6..f1ade43 100644
--- a/src/examples/colorselector_example_01.c
+++ b/src/examples/colorselector_example_01.c
@@ -67,6 +67,8 @@ _change_color(void *data, Evas_Object *obj, void *event_info)
{
int r, g, b, a;
elm_colorselector_color_get(obj, r, g, b, a);
+ // ensure colors are pre-multiplied by alpha
+ evas_color_argb_premul(a, r, g, b);
evas_object_color_set(data, r, g, b, a);
}
@@ -76,6 +78,8 @@ _colorpalette_clicked_cb(void *data, Evas_Object *obj, void
*event_info)
int r = 0, g = 0, b = 0 ,a = 0;
Elm_Object_Item *color_it = (Elm_Object_Item *) event_info;
elm_colorselector_palette_item_color_get(color_it, r, g, b, a);
+ // ensure colors are pre-multiplied by alpha
+ evas_color_argb_premul(a, r, g, b);
evas_object_color_set(data, r, g, b, a);
}
diff --git a/src/examples/transit_example_03.c
b/src/examples/transit_example_03.c
index 79d6094..f0a9a01 100644
--- a/src/examples/transit_example_03.c
+++ b/src/examples/transit_example_03.c
@@ -27,8 +27,8 @@ static void
_transit_color(Elm_Transit *trans)
{
/* changes the object color from 100, 255, 100, 255 to
-* 200, 50, 200, 50 */
- elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50);
+* 40, 10, 40, 50 */
+ elm_transit_effect_color_add(trans, 100, 255, 100, 255, 40, 10, 40, 50);
}
static void
--
[EGIT] [core/enlightenment] master 01/01: enlightenment: remove e_border_free
yoz pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=423f65d114065941a722fd32bb8a88cfecc7641b commit 423f65d114065941a722fd32bb8a88cfecc7641b Author: Michael Bouchaud y...@efl.so Date: Sat Nov 16 02:24:11 2013 +0100 enlightenment: remove e_border_free e_border_free isn't defined in c code. --- src/bin/e_border.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/e_border.h b/src/bin/e_border.h index 183d6e1..33babaf 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -719,7 +719,6 @@ EINTERN int e_border_init(void); EINTERN int e_border_shutdown(void); EAPI E_Border *e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal); -EAPI void e_border_free(E_Border *bd); EAPI void e_border_ref(E_Border *bd); EAPI void e_border_unref(E_Border *bd); EAPI void e_border_res_change_geometry_save(E_Border *bd); --
[EGIT] [core/elementary] master 01/01: elementary: fix image counts in slideshow exemple
yoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ee4f86f2db89c90fbf8564cb9bee86a84d4e08f1 commit ee4f86f2db89c90fbf8564cb9bee86a84d4e08f1 Author: Michael Bouchaud y...@efl.so Date: Sat Nov 16 02:48:29 2013 +0100 elementary: fix image counts in slideshow exemple --- src/examples/slideshow_example.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/examples/slideshow_example.c b/src/examples/slideshow_example.c index 5b7c93c..102a0ed 100644 --- a/src/examples/slideshow_example.c +++ b/src/examples/slideshow_example.c @@ -11,7 +11,7 @@ #include Elementary.h -#define IMG_NUM 9 +#define IMG_NUM 8 static Evas_Object *slideshow, *bt_start, *bt_stop; static Elm_Slideshow_Item_Class itc; --
[EGIT] [core/elementary] master 01/01: theme - add more usability hints for ranr dialog like power button
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4f299d700f2a2f0a504f4bf68f3e22e2686e45f0
commit 4f299d700f2a2f0a504f4bf68f3e22e2686e45f0
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Nov 16 12:42:55 2013 +0900
theme - add more usability hints for ranr dialog like power button
---
data/themes/edc/randr.edc | 47 +--
1 file changed, 41 insertions(+), 6 deletions(-)
diff --git a/data/themes/edc/randr.edc b/data/themes/edc/randr.edc
index 372350a..59972a7 100644
--- a/data/themes/edc/randr.edc
+++ b/data/themes/edc/randr.edc
@@ -74,6 +74,8 @@ group { name: e/conf/randr/main/frame;
images.image: sym_down_light_selected.png COMP;
images.image: sym_up_light_normal.png COMP;
images.image: sym_up_light_selected.png COMP;
+ images.image: icon_system-shutdown.png COMP;
+ images.image: icon_arrow_up.png COMP;
styles {
style { name: randr_name_style;
base: font=FN font_size=10 text_class=randr_monitor align=center
color=# style=shadow,bottom shadow_color=#0080 wrap=word;
@@ -128,8 +130,7 @@ group { name: e/conf/randr/main/frame;
}
description { state: off 0.0;
inherit: default 0.0;
-color: 255 255 255 64;
-//color: 64 64 64 255;
+color: 255 255 255 16;
}
}
part { name: e.box.clone; type: BOX;
@@ -163,7 +164,7 @@ group { name: e/conf/randr/main/frame;
}
description { state: active 0.0;
inherit: default 0.0;
-color: 51 153 255 64;
+color: 51 153 255 128;
visible: 1;
}
}
@@ -205,7 +206,6 @@ group { name: e/conf/randr/main/frame;
}
}
part { name: e.text.name; type: TEXTBLOCK; mouse_events: 0;
- clip_to: clip;
scale: 1;
description { state: default 0.0;
rel1.relative: 0.5 0.5;
@@ -219,7 +219,6 @@ group { name: e/conf/randr/main/frame;
}
}
part { name: e.text.resolution; type: TEXTBLOCK; mouse_events: 0;
- clip_to: clip;
scale: 1;
description { state: default 0.0;
rel1.relative: 0.5 0.5;
@@ -231,6 +230,10 @@ group { name: e/conf/randr/main/frame;
min: 1.0 1.0;
}
}
+ description { state: off 0.0;
+inherit: default 0.0;
+visible: 0;
+ }
}
part { name: e.text.position; type: TEXTBLOCK; mouse_events: 0;
clip_to: clip;
@@ -246,6 +249,10 @@ group { name: e/conf/randr/main/frame;
min: 1.0 1.0;
}
}
+ description { state: off 0.0;
+inherit: default 0.0;
+visible: 0;
+ }
}
part { name: scr_shine; mouse_events: 0;
description { state: default 0.0;
@@ -258,6 +265,31 @@ group { name: e/conf/randr/main/frame;
FIXED_SIZE(69, 5)
}
}
+ part { name: pwrhint; mouse_events: 0;
+ description { state: default 0.0;
+rel1.to: hole;
+rel1.relative: 0.0 1.0;
+rel1.offset: 0 3;
+rel2.to: hole;
+rel2.offset: -1 3;
+align: 0.5 0.0;
+FIXED_SIZE(10, 10)
+image.normal: icon_arrow_up.png;
+fixed: 1 1;
+ }
+ }
+ part { name: pwrhint2; mouse_events: 0;
+ scale: 1;
+ description { state: default 0.0;
+rel1.to: pwrhint;
+rel1.relative: 1.0 0.0;
+rel2.to: pwrhint;
+align: 0.0 0.0;
+FIXED_SIZE(16, 16)
+image.normal: icon_system-shutdown.png;
+fixed: 1 1;
+ }
+ }
part { name: rsz1; mouse_events: 0;
description { state: default 0.0;
align: 0.0 0.0;
@@ -422,7 +454,6 @@ group { name: e/conf/randr/main/frame;
part { name: e.event.indicator; type: RECT;
description { state: default 0.0;
color: 0 0 0 0;
-max: 15 15;
max: 21 21;
align: 0.0 1.0;
}
@@ -515,6 +546,8 @@ group { name: e/conf/randr/main/frame;
signal: e,state,enabled; source: e;
action: STATE_SET default 0.0;
target: clip;
+ target: e.text.resolution;
+ target: e.text.position;
target: led;
after: pulse1;
}
@@ -530,6 +563,8 @@ group { name: e/conf/randr/main/frame;
action: STATE_SET off 0.0;
target: led;
target: clip;
+ target: e.text.resolution;
+ target: e.text.position;
}
program {
signal: e,state,drop,on; source: e;
--
[EGIT] [core/elementary] master 03/03: po - update
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2c0e217542df5d65eb145ae553101ab71250a4c5 commit 2c0e217542df5d65eb145ae553101ab71250a4c5 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Nov 16 12:50:25 2013 +0900 po - update --- po/ar.po| 26 +- po/az_IR.po | 26 +- po/ca.po| 26 +- po/cs.po| 26 +- po/de.po| 26 +- po/el.po| 26 +- po/eo.po| 26 +- po/es.po| 26 +- po/fa.po| 26 +- po/fr.po| 26 +- po/gl.po| 26 +- po/he.po| 26 +- po/it.po| 26 +- po/ko_KR.po | 26 +- po/nl.po| 26 +- po/ps.po| 26 +- po/pt.po| 26 +- po/ru.po| 26 +- po/sr.po| 26 +- po/ur.po| 26 +- po/yi.po| 26 +- po/zh_CN.po | 26 +- 22 files changed, 286 insertions(+), 286 deletions(-) diff --git a/po/ar.po b/po/ar.po index 629f1a2..2f156a5 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: elementary\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2013-11-12 22:51+0900\n +POT-Creation-Date: 2013-11-16 12:46+0900\n PO-Revision-Date: 2010-12-26 10:05+0200\n Last-Translator: Tom Hacohen tom.haco...@samsung.com\n Language-Team: General\n @@ -77,8 +77,8 @@ msgstr #: src/lib/elm_button.c:279 src/lib/elm_check.c:218 src/lib/elm_gengrid.c:681 #: src/lib/elm_genlist.c:1463 src/lib/elm_list.c:1539 src/lib/elm_radio.c:261 -#: src/lib/elm_segment_control.c:537 src/lib/elm_spinner.c:539 -#: src/lib/elm_toolbar.c:1996 +#: src/lib/elm_segment_control.c:537 src/lib/elm_spinner.c:540 +#: src/lib/elm_toolbar.c:1980 msgid State: Disabled msgstr @@ -191,7 +191,7 @@ msgstr msgid Paste msgstr -#: src/lib/elm_entry.c:3291 +#: src/lib/elm_entry.c:3301 msgid Entry msgstr @@ -231,7 +231,7 @@ msgstr msgid Radio msgstr -#: src/lib/elm_segment_control.c:540 src/lib/elm_toolbar.c:1998 +#: src/lib/elm_segment_control.c:540 src/lib/elm_toolbar.c:1982 msgid State: Selected msgstr @@ -247,34 +247,34 @@ msgstr msgid slider msgstr -#: src/lib/elm_spinner.c:628 +#: src/lib/elm_spinner.c:629 msgid spinner increment button msgstr -#: src/lib/elm_spinner.c:637 +#: src/lib/elm_spinner.c:638 msgid spinner decrement button msgstr -#: src/lib/elm_spinner.c:645 +#: src/lib/elm_spinner.c:646 msgid spinner msgstr -#: src/lib/elm_toolbar.c:1467 src/lib/elm_toolbar.c:2057 +#: src/lib/elm_toolbar.c:1451 src/lib/elm_toolbar.c:2041 msgid Selected msgstr -#: src/lib/elm_toolbar.c:1994 +#: src/lib/elm_toolbar.c:1978 msgid Separator msgstr -#: src/lib/elm_toolbar.c:2000 +#: src/lib/elm_toolbar.c:1984 msgid Has menu msgstr -#: src/lib/elm_toolbar.c:2052 +#: src/lib/elm_toolbar.c:2036 msgid Unselected msgstr -#: src/lib/elm_toolbar.c:2069 +#: src/lib/elm_toolbar.c:2053 msgid Toolbar Item msgstr diff --git a/po/az_IR.po b/po/az_IR.po index 9f8b898..49490b7 100644 --- a/po/az_IR.po +++ b/po/az_IR.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: elementary\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2013-11-12 22:51+0900\n +POT-Creation-Date: 2013-11-16 12:46+0900\n PO-Revision-Date: 2010-12-26 10:05+0200\n Last-Translator: Tom Hacohen tom.haco...@samsung.com\n Language-Team: General\n @@ -76,8 +76,8 @@ msgstr #: src/lib/elm_button.c:279 src/lib/elm_check.c:218 src/lib/elm_gengrid.c:681 #: src/lib/elm_genlist.c:1463 src/lib/elm_list.c:1539 src/lib/elm_radio.c:261 -#: src/lib/elm_segment_control.c:537 src/lib/elm_spinner.c:539 -#: src/lib/elm_toolbar.c:1996 +#: src/lib/elm_segment_control.c:537 src/lib/elm_spinner.c:540 +#: src/lib/elm_toolbar.c:1980 msgid State: Disabled msgstr @@ -190,7 +190,7 @@ msgstr msgid Paste msgstr -#: src/lib/elm_entry.c:3291 +#: src/lib/elm_entry.c:3301 msgid Entry msgstr @@ -230,7 +230,7 @@ msgstr msgid Radio msgstr -#: src/lib/elm_segment_control.c:540 src/lib/elm_toolbar.c:1998 +#: src/lib/elm_segment_control.c:540 src/lib/elm_toolbar.c:1982 msgid State: Selected msgstr @@ -246,34 +246,34 @@ msgstr msgid slider msgstr -#: src/lib/elm_spinner.c:628 +#: src/lib/elm_spinner.c:629 msgid spinner increment button msgstr -#: src/lib/elm_spinner.c:637 +#: src/lib/elm_spinner.c:638 msgid spinner decrement button msgstr -#: src/lib/elm_spinner.c:645 +#: src/lib/elm_spinner.c:646 msgid spinner msgstr -#: src/lib/elm_toolbar.c:1467
[EGIT] [core/elementary] master 02/03: theme - remove unused images
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=20ec73ea07845e8e1b7883bc3de452f9a9b97cfd commit 20ec73ea07845e8e1b7883bc3de452f9a9b97cfd Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Nov 16 12:50:07 2013 +0900 theme - remove unused images --- data/themes/Makefile.am | 4 1 file changed, 4 deletions(-) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 5bf66ee..8b65e7f 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -211,10 +211,6 @@ img/col_sel_end_bottom.png \ img/col_sel_end_left.png \ img/col_sel_end_right.png \ img/col_sel_end_top.png \ -img/ctxpopup_arrow_down.png \ -img/ctxpopup_arrow_left.png \ -img/ctxpopup_arrow_right.png \ -img/ctxpopup_arrow_up.png \ img/darken_rounded_square_half_h.png \ img/darken_rounded_square_half.png \ img/darken_rounded_square.png \ --
[EGIT] [core/elementary] master 01/03: elm-test - oops - fix colorsel premul
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=e421f6aaa1c4d503dd79e8ec3d55f3565e5c6524 commit e421f6aaa1c4d503dd79e8ec3d55f3565e5c6524 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Nov 16 12:49:26 2013 +0900 elm-test - oops - fix colorsel premul --- data/themes/img/ctxpopup_arrow_down.png | Bin 560 - 0 bytes data/themes/img/ctxpopup_arrow_left.png | Bin 588 - 0 bytes data/themes/img/ctxpopup_arrow_right.png | Bin 580 - 0 bytes data/themes/img/ctxpopup_arrow_up.png| Bin 453 - 0 bytes src/bin/test_colorselector.c | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/themes/img/ctxpopup_arrow_down.png b/data/themes/img/ctxpopup_arrow_down.png deleted file mode 100644 index 11e5988..000 Binary files a/data/themes/img/ctxpopup_arrow_down.png and /dev/null differ diff --git a/data/themes/img/ctxpopup_arrow_left.png b/data/themes/img/ctxpopup_arrow_left.png deleted file mode 100644 index e6c464f..000 Binary files a/data/themes/img/ctxpopup_arrow_left.png and /dev/null differ diff --git a/data/themes/img/ctxpopup_arrow_right.png b/data/themes/img/ctxpopup_arrow_right.png deleted file mode 100644 index b78c8ab..000 Binary files a/data/themes/img/ctxpopup_arrow_right.png and /dev/null differ diff --git a/data/themes/img/ctxpopup_arrow_up.png b/data/themes/img/ctxpopup_arrow_up.png deleted file mode 100644 index fcc9cdd..000 Binary files a/data/themes/img/ctxpopup_arrow_up.png and /dev/null differ diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c index 32fb4dc..883021b 100644 --- a/src/bin/test_colorselector.c +++ b/src/bin/test_colorselector.c @@ -13,7 +13,7 @@ _colorselector_changed_cb(void *data, Evas_Object *obj, elm_colorselector_color_get(obj, r, g, b, a); printf(Changed Color [r=%d g=%d b=%d a=%d]\n, r, g, b, a); - evas_color_argb_premul(a, r, g, b); + evas_color_argb_premul(a, r, g, b); evas_object_color_set(re, r, g, b, a); } --
[E-devel] bugs for 1.8 release
please - everyone take a look here: https://phab.enlightenment.org/maniphest/ there are a lot of open bugs. i know some people have other priority tasks for various reasons, but please make an effort to go through these - REGARDLESS of who is assigned. i've handled the current incoming queue and made an effort to prioritize bugs. right now i haven't put any on showstopper level, but i have put them into either high, low, waiting on input or wishlist levels. pick a bug and lets reduce the list for release :) note: efl/elm bugs are higher priority - BUT it may be a bug for e that is a result of an efl/elm bug, so be aware. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: entry - fix autosave timer del on shutdown
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a407689372b2cd085c4220cdc3b82fb811b87307
commit a407689372b2cd085c4220cdc3b82fb811b87307
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Nov 16 13:21:36 2013 +0900
entry - fix autosave timer del on shutdown
this fixes T509
---
src/lib/elm_entry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 0203bd2..143a5d0 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3340,7 +3340,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
if (sd-delay_write)
{
-if (sd-delay_write) ecore_timer_del(sd-delay_write);
+ELM_SAFE_FREE(sd-delay_write, ecore_timer_del);
if (sd-auto_save) _save_do(obj);
}
@@ -3393,7 +3393,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
{
_filter_free(tf);
}
- if (sd-delay_write) ecore_timer_del(sd-delay_write);
+ ELM_SAFE_FREE(sd-delay_write, ecore_timer_del);
if (sd-input_panel_imdata) free(sd-input_panel_imdata);
if (sd-anchor_hover.hover_style)
eina_stringshare_del(sd-anchor_hover.hover_style);
--
Re: [E-devel] e_widget_list: removing items?
On Fri, 15 Nov 2013 14:40:24 + Andrew F andrewfriedman...@gmail.com said: Fantastic, is there a target release date for e18? december. Also, while I know that Documentation sucks to write, but have you thought about making it a priority for e18. Great documentation that really focuses on teaching, will bring new programers to e18 and help to get the code based used in more projects. After all, you guys are putting a lot of work into this why not go all the way and make a complete tool with complete documentation. Not just primarily examples. as long as our bug list is as long as it is - documentation is a far lower priority. sorry. code not behaving correctly is far more important that documenting the internals of a window manager where at MOSt maybe 10 people work on it (at any time). elementary does have documentation. lots of it. LOTs of examples WITH documentation. elementary is meant for broader consumption for writing apps. :) On Fri, Nov 15, 2013 at 6:41 AM, Cedric BAIL cedric.b...@free.fr wrote: On Fri, Nov 15, 2013 at 3:14 PM, Andrew F andrewfriedman...@gmail.com wrote: Is elm being designed as a full featured took kit? Yes, that's the goal. There is still feature missing as always, but it is growing to fill the need for any kind of applications. We are improving it as we write real world applications. -- Cedric BAIL -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] bugs for 1.8 release
Great. Of course I am in :) Daniel Juyung Seo (SeoZ) On Nov 16, 2013 1:14 PM, Carsten Haitzler ras...@rasterman.com wrote: please - everyone take a look here: https://phab.enlightenment.org/maniphest/ there are a lot of open bugs. i know some people have other priority tasks for various reasons, but please make an effort to go through these - REGARDLESS of who is assigned. i've handled the current incoming queue and made an effort to prioritize bugs. right now i haven't put any on showstopper level, but i have put them into either high, low, waiting on input or wishlist levels. pick a bug and lets reduce the list for release :) note: efl/elm bugs are higher priority - BUT it may be a bug for e that is a result of an efl/elm bug, so be aware. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: entry - fix autosave timer del on shutdown
Is there any reason that you want to set it to null? As far as I know some
people avoid setting variables to null on smart del.
Daniel Juyung Seo (SeoZ)
On Nov 16, 2013 1:23 PM, Carsten Haitzler ras...@rasterman.com wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a407689372b2cd085c4220cdc3b82fb811b87307
commit a407689372b2cd085c4220cdc3b82fb811b87307
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Nov 16 13:21:36 2013 +0900
entry - fix autosave timer del on shutdown
this fixes T509
---
src/lib/elm_entry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 0203bd2..143a5d0 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3340,7 +3340,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
if (sd-delay_write)
{
-if (sd-delay_write) ecore_timer_del(sd-delay_write);
+ELM_SAFE_FREE(sd-delay_write, ecore_timer_del);
if (sd-auto_save) _save_do(obj);
}
@@ -3393,7 +3393,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
{
_filter_free(tf);
}
- if (sd-delay_write) ecore_timer_del(sd-delay_write);
+ ELM_SAFE_FREE(sd-delay_write, ecore_timer_del);
if (sd-input_panel_imdata) free(sd-input_panel_imdata);
if (sd-anchor_hover.hover_style)
eina_stringshare_del(sd-anchor_hover.hover_style);
--
--
DreamFactory - Open Source REST JSON Services for HTML5 Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Enlightenment Korean Dinner
On 11/11/13 10:25, Cedric BAIL wrote: Hello everyone, As this Saturday we will see our beloved president of the Enlightenment foundation in Korea, Philippe Caseiro (Not bad for an introduction, I think I should be doing marketing !). I think it will be a good idea to plan a little diner in Seoul. So who is in on Saturday night ? And also maybe it would be nice to find a good Korean restaurant, so if anyone as a recommendation, do not be shy ! As it will be Saturday, we might need to book in advance, so please raise your hand if you are planning to come. Enjoy the party, -- Cedric BAIL Unfortunately, I'm not going to make it this evening. I'll be busy all day tomorrow and I just got my Internet connection back 15 minutes ago, thanks to a KT technician who fixed up the line. Running out of time... -- Jérôme Pinot http://ngc891.blogdns.net/ signature.asc Description: Digital signature -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 02/02: cmake: Add EDJE_CC_EXECUTABLE variable in EdjeConfig.cmake
ryuan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=79e87c1e09091bf740acf8957800dbebf1521a57
commit 79e87c1e09091bf740acf8957800dbebf1521a57
Author: Ryuan Choi ryuan.c...@samsung.com
Date: Sat Nov 16 15:19:44 2013 +0900
cmake: Add EDJE_CC_EXECUTABLE variable in EdjeConfig.cmake
---
cmakeconfig/EdjeConfig.cmake.in | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmakeconfig/EdjeConfig.cmake.in b/cmakeconfig/EdjeConfig.cmake.in
index 895b61d..ea98d1f 100644
--- a/cmakeconfig/EdjeConfig.cmake.in
+++ b/cmakeconfig/EdjeConfig.cmake.in
@@ -4,6 +4,7 @@
# EDJE_INCLUDE_DIRS - The edje include directories
# EDJE_LIBRARIES - The libraries needed to use edje
# EDJE_DEFINITIONS - Compiler switches required for using edje
+# EDJE_CC_EXECUTABLE - full path to the `edje_cc' program.
set(MY_PKG edje)
@@ -16,7 +17,10 @@ pkg_check_modules(PC_LIBEDJE ${_QUIET} ${MY_PKG})
find_library(EDJE_LIBRARY
NAMES ${PC_LIBEDJE_LIBRARIES}
- HINTS ${PC_LIBEDJE_LIBDIR} ${PC_LIBEDJE_LIBRARY_DIRS} )
+ HINTS ${PC_LIBEDJE_LIBDIR} ${PC_LIBEDJE_LIBRARY_DIRS})
+
+find_program(EDJE_CC_EXECUTABLE
+ NAMES edje_cc)
set(EDJE_DEFINITIONS ${PC_LIBEDJE_CFLAGS_OTHER})
set(EDJE_LIBRARIES ${EDJE_LIBRARY})
@@ -28,5 +32,5 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG
EDJE_LIBRARIES EDJE_INCLUDE_DIRS)
-mark_as_advanced(EDJE_INCLUDE_DIRS EDJE_LIBRARY EDJE_LIBRARIES
EDJE_DEFINITIONS)
+mark_as_advanced(EDJE_INCLUDE_DIRS EDJE_LIBRARY EDJE_LIBRARIES
EDJE_DEFINITIONS EDJE_CC_EXECUTABLE)
--
[EGIT] [core/efl] master 01/02: Add EezeConfig.cmake.in
ryuan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8c0d7d8e5ee23381dd6cf98355ac4522d944055e
commit 8c0d7d8e5ee23381dd6cf98355ac4522d944055e
Author: Ryuan Choi ryuan.c...@samsung.com
Date: Sat Nov 16 15:17:58 2013 +0900
Add EezeConfig.cmake.in
Other components already install XXXConfig.cmake and XXConfigVersion.cmake,
but Eeze was missing.
---
Makefile.am | 5 +
cmakeconfig/EezeConfig.cmake.in | 32
configure.ac| 2 ++
3 files changed, 39 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 85c1fa0..148be7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -236,6 +236,11 @@ eina_cmakeconfig_DATA = \
cmakeconfig/EinaConfig.cmake \
cmakeconfig/EinaConfigVersion.cmake
+eeze_cmakeconfigdir = $(libdir)/cmake/Eeze/
+eeze_cmakeconfig_DATA = \
+cmakeconfig/EezeConfig.cmake \
+cmakeconfig/EezeConfigVersion.cmake
+
eo_cmakeconfigdir = $(libdir)/cmake/Eo/
eo_cmakeconfig_DATA = \
cmakeconfig/EoConfig.cmake \
diff --git a/cmakeconfig/EezeConfig.cmake.in b/cmakeconfig/EezeConfig.cmake.in
new file mode 100644
index 000..3f211eb
--- /dev/null
+++ b/cmakeconfig/EezeConfig.cmake.in
@@ -0,0 +1,32 @@
+# - Try to find eeze
+# Once done this will define
+# EEZE_FOUND - System has eeze
+# EEZE_INCLUDE_DIRS - The eeze include directories
+# EEZE_LIBRARIES - The libraries needed to use eeze
+# EEZE_DEFINITIONS - Compiler switches required for using eeze
+
+set(MY_PKG eeze)
+
+find_package(PkgConfig)
+if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
VERSION_GREATER 2.8.1)
+ # QUIET was introduced in 2.8.2
+ set(_QUIET QUIET)
+endif ()
+pkg_check_modules(PC_LIBEEZE ${_QUIET} ${MY_PKG})
+
+find_library(EEZE_LIBRARY
+ NAMES ${PC_LIBEEZE_LIBRARIES}
+ HINTS ${PC_LIBEEZE_LIBDIR} ${PC_LIBEEZE_LIBRARY_DIRS} )
+
+set(EEZE_DEFINITIONS ${PC_LIBEEZE_CFLAGS_OTHER})
+set(EEZE_LIBRARIES ${EEZE_LIBRARY})
+set(EEZE_INCLUDE_DIRS ${PC_LIBEEZE_INCLUDE_DIRS})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set EEZE_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG
+ EEZE_LIBRARIES EEZE_INCLUDE_DIRS)
+
+mark_as_advanced(EEZE_INCLUDE_DIRS EEZE_LIBRARY EEZE_LIBRARIES
EEZE_DEFINITIONS)
+
diff --git a/configure.ac b/configure.ac
index 7671dcc..9acbf44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3806,6 +3806,8 @@ dbus-services/org.enlightenment.Ethumb.service
$po_makefile_in
cmakeconfig/EinaConfig.cmake
cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EezeConfig.cmake
+cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
cmakeconfig/EoConfig.cmake
cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
cmakeconfig/EetConfig.cmake
--
Re: [E-devel] [EGIT] [core/elementary] master 01/01: entry - fix autosave timer del on shutdown
On Sat, 16 Nov 2013 13:44:41 +0900 Daniel Juyung Seo seojuyu...@gmail.com
said:
Is there any reason that you want to set it to null? As far as I know some
people avoid setting variables to null on smart del.
just in case a function during del calls something that calls a callback that
tries to do something that accesses the timer. only if the functions called
wouldnt release control from the del code would it be fine to assume its not
accessed. :) being paranoid.
Daniel Juyung Seo (SeoZ)
On Nov 16, 2013 1:23 PM, Carsten Haitzler ras...@rasterman.com wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a407689372b2cd085c4220cdc3b82fb811b87307
commit a407689372b2cd085c4220cdc3b82fb811b87307
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Nov 16 13:21:36 2013 +0900
entry - fix autosave timer del on shutdown
this fixes T509
---
src/lib/elm_entry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 0203bd2..143a5d0 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3340,7 +3340,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
if (sd-delay_write)
{
-if (sd-delay_write) ecore_timer_del(sd-delay_write);
+ELM_SAFE_FREE(sd-delay_write, ecore_timer_del);
if (sd-auto_save) _save_do(obj);
}
@@ -3393,7 +3393,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
{
_filter_free(tf);
}
- if (sd-delay_write) ecore_timer_del(sd-delay_write);
+ ELM_SAFE_FREE(sd-delay_write, ecore_timer_del);
if (sd-input_panel_imdata) free(sd-input_panel_imdata);
if (sd-anchor_hover.hover_style)
eina_stringshare_del(sd-anchor_hover.hover_style);
--
--
DreamFactory - Open Source REST JSON Services for HTML5 Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
--
- Codito, ergo sum - I code, therefore I am --
The Rasterman (Carsten Haitzler)ras...@rasterman.com
--
DreamFactory - Open Source REST JSON Services for HTML5 Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
