[EGIT] [tools/enventor] master 01/01: edc_parser: support action slider for color2, color3 keywords.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=48bff461680fd25f2daff68be27062fc8309eeb2 commit 48bff461680fd25f2daff68be27062fc8309eeb2 Author: ChunEon Park Date: Thu Aug 7 16:01:59 2014 +0900 edc_parser: support action slider for color2, color3 keywords. --- src/bin/edc_parser.c | 14 ++ 1 file changed, 14 insertions(+) diff --git a/src/bin/edc_parser.c b/src/bin/edc_parser.c index a40e7da..659c5fc 100644 --- a/src/bin/edc_parser.c +++ b/src/bin/edc_parser.c @@ -422,6 +422,20 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) eina_inarray_push(td->attrs, &attr); memset(&attr, 0x00, sizeof(parser_attr)); + attr.keyword = eina_stringshare_add("color2:"); + attr.value.min = 0; + attr.value.max = 255; + attr.value.type = ATTR_VALUE_INTEGER; + eina_inarray_push(td->attrs, &attr); + + memset(&attr, 0x00, sizeof(parser_attr)); + attr.keyword = eina_stringshare_add("color3:"); + attr.value.min = 0; + attr.value.max = 255; + attr.value.type = ATTR_VALUE_INTEGER; + eina_inarray_push(td->attrs, &attr); + + memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("scale:"); attr.value.min = 0; attr.value.max = 1; --
Re: [E-devel] [EGIT] [core/elementary] master 01/02: elm - add apis to deal with accel perference
Hello. On Tue, 2014-08-05 at 17:24, Stefan Schmidt wrote: > > On Tue, 2014-08-05 at 08:09, Carsten Haitzler wrote: > > raster pushed a commit to branch master. > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=e7dbe063c9c044f072bacafd31ab872f6210788b > > > > commit e7dbe063c9c044f072bacafd31ab872f6210788b > > Author: Carsten Haitzler (Rasterman) > > Date: Wed Aug 6 00:04:11 2014 +0900 > > > > elm - add apis to deal with accel perference > > > > this deals with an issue brought up today on irc - seemingly rage > > asking for accel is causing segvs in vbox with its gl accel subsystem > > - the only way to disable this is an env var, and this is unfriendly, > > so make config gui and stuff to mess with accel preference to fix this. Lets put the rest of this thread aside for now. I just got this commit from git bisect when trying to find out what broke make doc in elm. It worked fine in alpha1 but is not working right now. It simply hangs in the widget preview generation. Which means the elm shot engine hangs as we use that one to generate the screenshots for the documentation. I reverted this one locally (and fixed up some small conflict with another patch touching this code) and the generation works again. Would be good if you could have a look. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/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: elm win - only auto choose x11/wl based on envvar if ELM_ENGINE unset
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f5871b196891bb4151cc72d5c4f343ac278546ba commit f5871b196891bb4151cc72d5c4f343ac278546ba Author: Carsten Haitzler (Rasterman) Date: Thu Aug 7 16:21:30 2014 +0900 elm win - only auto choose x11/wl based on envvar if ELM_ENGINE unset --- src/lib/elm_win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 4020269..68f5365 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -3080,7 +3080,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t enginelist[0] = ENGINE_GET(); enginelist[1] = NULL; } -else if (getenv("DISPLAY")) +else if ((getenv("DISPLAY")) && (!getenv("ELM_ENGINE"))) { if (_accel_is_gl()) { @@ -3095,7 +3095,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t enginelist[2] = NULL; } } -else if (getenv("WAYLAND_DISPLAY")) +else if ((getenv("WAYLAND_DISPLAY")) && (!getenv("ELM_ENGINE"))) { if (_accel_is_gl()) { --
[EGIT] [core/elementary] master 01/01: shot.sh: Set ELM_DISPLAY to bring the elm shot engine back to life
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=13f72ed7efe35f7ba2e8e61da4ec74d51f319959 commit 13f72ed7efe35f7ba2e8e61da4ec74d51f319959 Author: Stefan Schmidt Date: Thu Aug 7 09:18:50 2014 +0200 shot.sh: Set ELM_DISPLAY to bring the elm shot engine back to life As a small fallout from e7dbe063c9c044f072bacafd31ab872f6210788b we now need to set ELM_DISPLAY with our system has something like $DISPLAY or $WAYLAND_DISPLAY set. Elm uses that now to find out which window system to use. In the case of daing make doc we want it forced to shot even if we run under X. With ELM_DISPLAY we do that. Thanks goes to raster for the explanantion and git bisect for pinning it down. --- doc/shot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/shot.sh b/doc/shot.sh index 1ac6da9..b67be70 100755 --- a/doc/shot.sh +++ b/doc/shot.sh @@ -8,6 +8,7 @@ shift export ELM_THEME=default export ELM_SCALE=1.0 export ELM_ENGINE=shot:delay=3:file=$DIR/$FILE +export ELM_DISPLAY=shot export ILLUME_KBD=0,0,240,123 export ILLUME_IND=0,0,240,32 export ILLUME_STK=0,288,240,32 --
Re: [E-devel] [EGIT] [core/elementary] master 01/02: elm - add apis to deal with accel perference
Hello. On Thu, 2014-08-07 at 09:07, Stefan Schmidt wrote: > Hello. > > On Tue, 2014-08-05 at 17:24, Stefan Schmidt wrote: > > > > On Tue, 2014-08-05 at 08:09, Carsten Haitzler wrote: > > > raster pushed a commit to branch master. > > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=e7dbe063c9c044f072bacafd31ab872f6210788b > > > > > > commit e7dbe063c9c044f072bacafd31ab872f6210788b > > > Author: Carsten Haitzler (Rasterman) > > > Date: Wed Aug 6 00:04:11 2014 +0900 > > > > > > elm - add apis to deal with accel perference > > > > > > this deals with an issue brought up today on irc - seemingly rage > > > asking for accel is causing segvs in vbox with its gl accel subsystem > > > - the only way to disable this is an env var, and this is unfriendly, > > > so make config gui and stuff to mess with accel preference to fix > > > this. > > Lets put the rest of this thread aside for now. > > I just got this commit from git bisect when trying to find out what > broke make doc in elm. It worked fine in alpha1 but is not working > right now. > > It simply hangs in the widget preview generation. Which means the elm > shot engine hangs as we use that one to generate the screenshots for > the documentation. > > I reverted this one locally (and fixed up some small conflict with > another patch touching this code) and the generation works again. Discussed on IRC and fixed now. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: configure: don't depend on eo yet.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=0b12af70ccf52639cc268d37b3289a694d78998f commit 0b12af70ccf52639cc268d37b3289a694d78998f Author: ChunEon Park Date: Thu Aug 7 17:05:44 2014 +0900 configure: don't depend on eo yet. --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index f7e7016..5543829 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,6 @@ PKG_CHECK_MODULES([ENVENTOR], evas >= ${efl_version} ecore >= ${efl_version} edje >= ${efl_version} - eo >= ${efl_version} eio >= ${efl_version} efreet >= ${efl_version} ] --
[EGIT] [tools/enventor] master 01/01: fix indenation.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=9fb9eafb32042f3a262e90b9e4db075039c4a540 commit 9fb9eafb32042f3a262e90b9e4db075039c4a540 Author: ChunEon Park Date: Thu Aug 7 17:25:35 2014 +0900 fix indenation. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5543829..d85b050 100644 --- a/configure.ac +++ b/configure.ac @@ -64,8 +64,8 @@ PKG_CHECK_MODULES([ENVENTOR], edje >= ${efl_version} eio >= ${efl_version} efreet >= ${efl_version} - ] - ) + ] +) ### Checks for linker characteristics lt_enable_auto_import="" --
Re: [E-devel] [EGIT] [core/elementary] master 01/02: elm - add apis to deal with accel perference
On Thu, 7 Aug 2014 09:07:10 +0200 Stefan Schmidt said: > Hello. > > On Tue, 2014-08-05 at 17:24, Stefan Schmidt wrote: > > > > On Tue, 2014-08-05 at 08:09, Carsten Haitzler wrote: > > > raster pushed a commit to branch master. > > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=e7dbe063c9c044f072bacafd31ab872f6210788b > > > > > > commit e7dbe063c9c044f072bacafd31ab872f6210788b > > > Author: Carsten Haitzler (Rasterman) > > > Date: Wed Aug 6 00:04:11 2014 +0900 > > > > > > elm - add apis to deal with accel perference > > > > > > this deals with an issue brought up today on irc - seemingly rage > > > asking for accel is causing segvs in vbox with its gl accel subsystem > > > - the only way to disable this is an env var, and this is unfriendly, > > > so make config gui and stuff to mess with accel preference to fix > > > this. > > Lets put the rest of this thread aside for now. > > I just got this commit from git bisect when trying to find out what > broke make doc in elm. It worked fine in alpha1 but is not working > right now. > > It simply hangs in the widget preview generation. Which means the elm > shot engine hangs as we use that one to generate the screenshots for > the documentation. > > I reverted this one locally (and fixed up some small conflict with > another patch touching this code) and the generation works again. > > Would be good if you could have a look. done. -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: edcref: small typo in doc
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4e5d70511a9faba9805096005ecb9dd0ffe19329 commit 4e5d70511a9faba9805096005ecb9dd0ffe19329 Author: davemds Date: Thu Aug 7 11:01:23 2014 +0200 edcref: small typo in doc --- src/bin/edje/edje_cc_handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index c46da33..d43350e 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -1855,7 +1855,7 @@ st_images_set_image_image(void) @property size @parameters -[minw minh maxw mawh] +[minw minh maxw maxh] @effect Define the minimal and maximal size that will select the specified image. @endproperty --
[EGIT] [apps/rage] master 01/01: Fix some emotion calls to be called on the emotion object.
tasn pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=e69594024065aeb68344ab11094b57f8f5510cbe commit e69594024065aeb68344ab11094b57f8f5510cbe Author: Tom Hacohen Date: Thu Aug 7 10:18:04 2014 +0100 Fix some emotion calls to be called on the emotion object. They were being called on the wrong object (the video smart instead of the emotion object), now all the functions get called on the emotion object as they should. --- src/bin/video.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/video.c b/src/bin/video.c index 6282b92..c2b624b 100644 --- a/src/bin/video.c +++ b/src/bin/video.c @@ -643,7 +643,7 @@ video_chapter_name_get(Evas_Object *obj, int chapter) { Video *sd = evas_object_smart_data_get(obj); if (!sd) return NULL; - return emotion_object_chapter_name_get(obj, chapter); + return emotion_object_chapter_name_get(sd->o_vid, chapter); } void @@ -683,7 +683,7 @@ video_title_get(Evas_Object *obj) { Video *sd = evas_object_smart_data_get(obj); if (!sd) return NULL; - return emotion_object_title_get(obj); + return emotion_object_title_get(sd->o_vid); } int @@ -715,7 +715,7 @@ video_audio_channel_name_get(Evas_Object *obj, int chan) { Video *sd = evas_object_smart_data_get(obj); if (!sd) return NULL; - return emotion_object_audio_channel_name_get(obj, chan); + return emotion_object_audio_channel_name_get(sd->o_vid, chan); } int @@ -747,7 +747,7 @@ video_video_channel_name_get(Evas_Object *obj, int chan) { Video *sd = evas_object_smart_data_get(obj); if (!sd) return NULL; - return emotion_object_video_channel_name_get(obj, chan); + return emotion_object_video_channel_name_get(sd->o_vid, chan); } int @@ -779,7 +779,7 @@ video_spu_channel_name_get(Evas_Object *obj, int chan) { Video *sd = evas_object_smart_data_get(obj); if (!sd) return NULL; - return emotion_object_spu_channel_name_get(obj, chan); + return emotion_object_spu_channel_name_get(sd->o_vid, chan); } int --
[EGIT] [core/efl] master 01/02: evas gl - fixz minor leak on exit of rectangles
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8b796edce75b037df1c2fafe7e94f4e4dde417be commit 8b796edce75b037df1c2fafe7e94f4e4dde417be Author: Carsten Haitzler (Rasterman) Date: Thu Aug 7 18:13:07 2014 +0900 evas gl - fixz minor leak on exit of rectangles these were static rect cutouts, so they stayed around on exit and thus we "lost" them. this nukes them on context free and each new frame. fixes the "leak" --- src/modules/evas/engines/gl_common/evas_gl_context.c | 12 +++- src/modules/evas/engines/gl_common/evas_gl_font.c | 8 src/modules/evas/engines/gl_common/evas_gl_image.c | 8 src/modules/evas/engines/gl_common/evas_gl_polygon.c | 8 src/modules/evas/engines/gl_common/evas_gl_private.h | 2 ++ src/modules/evas/engines/gl_common/evas_gl_rectangle.c | 8 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c index a48a6d0..11e5c6d 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -11,6 +11,7 @@ static int sym_done = 0; int _evas_engine_GL_common_log_dom = -1; +Cutout_Rects *_evas_gl_common_cutout_rects = NULL; typedef void (*glsym_func_void) (); typedef void *(*glsym_func_void_ptr) (); @@ -934,6 +935,11 @@ evas_gl_common_context_free(Evas_Engine_GL_Context *gc) } if (gc == _evas_gl_common_context) _evas_gl_common_context = NULL; free(gc); + if (_evas_gl_common_cutout_rects) + { + evas_common_draw_context_apply_clear_cutouts(_evas_gl_common_cutout_rects); +_evas_gl_common_cutout_rects = NULL; + } } EAPI void @@ -949,6 +955,11 @@ evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc) { int i; + if (_evas_gl_common_cutout_rects) + { + evas_common_draw_context_apply_clear_cutouts(_evas_gl_common_cutout_rects); +_evas_gl_common_cutout_rects = NULL; + } if (dbgflushnum < 0) { dbgflushnum = 0; @@ -3332,7 +3343,6 @@ finish: else return 0; } - Eina_Bool evas_gl_common_module_open(void) { diff --git a/src/modules/evas/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c index 70ee3b2..33c1f58 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_font.c +++ b/src/modules/evas/engines/gl_common/evas_gl_font.c @@ -62,7 +62,6 @@ evas_gl_font_texture_draw(void *context, void *surface EINA_UNUSED, void *draw_c Evas_Engine_GL_Context *gc = context; RGBA_Draw_Context *dc = draw_context; Evas_GL_Texture *tex; - static Cutout_Rects *rects = NULL; Cutout_Rect *rct; int r, g, b, a; double ssx, ssy, ssw, ssh; @@ -130,12 +129,12 @@ evas_gl_font_texture_draw(void *context, void *surface EINA_UNUSED, void *draw_c gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch; return; } - rects = evas_common_draw_context_apply_cutouts(dc, rects); - for (i = 0; i < rects->active; ++i) + _evas_gl_common_cutout_rects = evas_common_draw_context_apply_cutouts(dc, _evas_gl_common_cutout_rects); + for (i = 0; i < _evas_gl_common_cutout_rects->active; ++i) { int nx, ny, nw, nh; -rct = rects->rects + i; +rct = _evas_gl_common_cutout_rects->rects + i; nx = x; ny = y; nw = tex->w; nh = tex->h; RECTS_CLIP_TO_RECT(nx, ny, nw, nh, rct->x, rct->y, rct->w, rct->h); if ((nw < 1) || (nh < 1)) continue; @@ -157,6 +156,7 @@ evas_gl_font_texture_draw(void *context, void *surface EINA_UNUSED, void *draw_c nx, ny, nw, nh, r, g, b, a); } + evas_common_draw_context_cutouts_free(_evas_gl_common_cutout_rects); /* restore clip info */ gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch; } diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c index dfe4f1e..21b9498 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_image.c +++ b/src/modules/evas/engines/gl_common/evas_gl_image.c @@ -1074,7 +1074,6 @@ _evas_gl_common_image_push(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, void evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int smooth) { - static Cutout_Rects *rects = NULL; RGBA_Draw_Context *dc; int r, g, b, a; Cutout_Rect *rct; @@ -1165,10 +1164,10 @@ evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, int sx, gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch; return; } -
[EGIT] [core/efl] master 02/02: evas gl - did not free all atlas formats - fix
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f5cff9490e04cea98d8f22530c0098f8475a685f commit f5cff9490e04cea98d8f22530c0098f8475a685f Author: Carsten Haitzler (Rasterman) Date: Thu Aug 7 18:25:20 2014 +0900 evas gl - did not free all atlas formats - fix we have expanded atlas formats long since - so use #define to free correct amount instead of 6 --- src/modules/evas/engines/gl_common/evas_gl_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c index 11e5c6d..c330f37 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -918,7 +918,7 @@ evas_gl_common_context_free(Evas_Engine_GL_Context *gc) evas_gl_common_image_free(gc->shared->images->data); } -for (j = 0; j < 6; j++) +for (j = 0; j < ATLAS_FORMATS_COUNT; j++) { EINA_LIST_FOREACH(gc->shared->tex.atlas[j], l, pt) evas_gl_texture_pool_empty(pt); --
[EGIT] [core/efl] master 01/01: eina-cxx: Added test for inheriting constructors in the C++11 compiler
felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97cf6d0efb1a8a8c7cef5d984f6d23c1470af4cf commit 97cf6d0efb1a8a8c7cef5d984f6d23c1470af4cf Author: Felipe Magno de Almeida Date: Thu Aug 7 11:31:08 2014 +0200 eina-cxx: Added test for inheriting constructors in the C++11 compiler This adds the inheriting constructor feature test to the m4 macros to avoid compilation of the C++11 binding in constructors without this features, where they would unavoidably fail compilation. This eliminates GCC 4.7.x since inheriting constructors were available only from GCC 4.8 and forward. --- m4/efl_stdcxx_11.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/efl_stdcxx_11.m4 b/m4/efl_stdcxx_11.m4 index cdd3934..f606bc0 100644 --- a/m4/efl_stdcxx_11.m4 +++ b/m4/efl_stdcxx_11.m4 @@ -51,6 +51,9 @@ m4_define([_EFL_CXX_COMPILE_STDCXX_11_testbody], [ check_type c; check_type&& cr = static_cast(c); +struct A { A(int); }; +struct B : A { using A::A; }; // inheriting constructors + auto d = a; ]) --
Re: [E-devel] [EGIT] [core/efl] master 02/07: eina: make it possible to load module symbol into the global namespace.
Hello. On Fri, 2014-07-11 at 06:33, Cedric BAIL wrote: > cedric pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=8062d5d7e9bedaa178072ad795e30b9c217a2371 > > commit 8062d5d7e9bedaa178072ad795e30b9c217a2371 > Author: Cedric BAIL > Date: Fri Jul 11 12:13:02 2014 +0200 > > eina: make it possible to load module symbol into the global namespace. > --- [snip] > +/** > + * @brief Define if on module load we should expose all symbol > + * > + * @param module The module to turn off/on symbol to be exposed > + * @since 1.11 > + */ > +EAPI void eina_module_global_set(Eina_Module *module, Eina_Bool global) > EINA_ARG_NONNULL(1); I'm going through the ABI/API reports Tom generated from 1.10 to 1.11 to see what we added, removed, etc. >From a first look at the funtion I would never thought it was meant to have the symbols exposed or not. Just looking at the function name I thought it was more about globally allowing modules or not. Maybe something like eina_module_symbol_global_set(...) would be better? Would also be inline with other symbol relevant functions like _symbol_get and _symbol_path_get What do you think? regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 03/03: ecore_x: Add missing since to various new ecore_x_screensaver* functions
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ee330fbaed510bfd09df752d853043360af2 commit ee330fbaed510bfd09df752d853043360af2 Author: Stefan Schmidt Date: Thu Aug 7 11:41:06 2014 +0200 ecore_x: Add missing since to various new ecore_x_screensaver* functions --- src/lib/ecore_x/Ecore_X.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index c0a0d01..2db94da 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -1972,10 +1972,10 @@ EAPI int ecore_x_screensaver_interval_get(void); EAPI void ecore_x_screensaver_event_listen_set(Eina_Bool on); EAPI Eina_Bool ecore_x_screensaver_custom_blanking_enable(void); /** @since 1.7 */ EAPI Eina_Bool ecore_x_screensaver_custom_blanking_disable(void); /** @since 1.7 */ -EAPI voidecore_x_screensaver_supend(void); -EAPI voidecore_x_screensaver_resume(void); -EAPI voidecore_x_screensaver_reset(void); -EAPI voidecore_x_screensaver_activate(void); +EAPI voidecore_x_screensaver_supend(void); /** @since 1.11 */ +EAPI voidecore_x_screensaver_resume(void); /** @since 1.11 */ +EAPI voidecore_x_screensaver_reset(void); /** @since 1.11 */ +EAPI voidecore_x_screensaver_activate(void); /** @since 1.11 */ /* FIXME: these funcs need categorising */ --
[EGIT] [core/efl] master 02/03: ecore_evas: Add missing since for new ecore_evas_cursor_unset()
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7da7c8be3a2aa70d5817a2281a2df6f01a46ec32 commit 7da7c8be3a2aa70d5817a2281a2df6f01a46ec32 Author: Stefan Schmidt Date: Thu Aug 7 11:34:41 2014 +0200 ecore_evas: Add missing since for new ecore_evas_cursor_unset() Added this cycle. Also with a typo and some trailing whitespaces while looking at it. --- src/lib/ecore_evas/Ecore_Evas.h | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index 55eaae7..c70dff3 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h @@ -1966,15 +1966,16 @@ EAPI void ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, /** * @brief Unset the Ecore_Evas cursor * - * @param ee The Ecore_Evas to uset the cursor. + * @param ee The Ecore_Evas to unset the cursor. * - * This function unsets the cursor from the Ecore_Evas, and returns the cursor - * object. If the cursor was set from ecore_evas_cursor_set(), this function - * returns the image. In this case, the image should be deleted when it is + * This function unsets the cursor from the Ecore_Evas, and returns the cursor + * object. If the cursor was set from ecore_evas_cursor_set(), this function + * returns the image. In this case, the image should be deleted when it is * no longer needed. * * @see ecore_evas_cursor_set() * @see ecore_evas_object_cursor_set() + * @since 1.11 */ EAPI Evas_Object*ecore_evas_cursor_unset(Ecore_Evas *ee); --
[EGIT] [core/efl] master 01/03: ecore: Add missing since version for new ecore_loop_time_set()
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9412a409a2e6901685485b885fba0560a4359b34 commit 9412a409a2e6901685485b885fba0560a4359b34 Author: Stefan Schmidt Date: Thu Aug 7 11:25:03 2014 +0200 ecore: Add missing since version for new ecore_loop_time_set() Introuduced during this cycle. Note it down in doxy. --- src/lib/ecore/Ecore_Common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h index 06b35e5..ffd2ff4 100644 --- a/src/lib/ecore/Ecore_Common.h +++ b/src/lib/ecore/Ecore_Common.h @@ -1473,6 +1473,7 @@ EAPI double ecore_loop_time_get(void); * * @see ecore_animator_custom_tick() * @see ecore_loop_time_get() + * @since 1.11 */ EAPI void ecore_loop_time_set(double t); --
[EGIT] [core/efl] master 01/01: eina_tile: Add missing since version tags for union, substract, etc
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f70c750cfc443fe1646874b5dc70a783847929d7 commit f70c750cfc443fe1646874b5dc70a783847929d7 Author: Stefan Schmidt Date: Thu Aug 7 12:16:57 2014 +0200 eina_tile: Add missing since version tags for union, substract, etc Merged directly after 1.10 release so mark it as since 1.11 --- src/lib/eina/eina_tiler.h | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/eina/eina_tiler.h b/src/lib/eina/eina_tiler.h index e82922c..8006cca 100644 --- a/src/lib/eina/eina_tiler.h +++ b/src/lib/eina/eina_tiler.h @@ -318,6 +318,7 @@ EAPI Eina_Iterator *eina_tile_grid_slicer_iterator_new(int x, int y, int w, * * This fuction get the union of tilers @p dst and @p src. * The result is stored in @p dst. It returns #EINA_TRUE if it succeeds. + * @since 1.11 */ EAPI Eina_Bool eina_tiler_union(Eina_Tiler *dst, Eina_Tiler *src); @@ -330,6 +331,7 @@ EAPI Eina_Bool eina_tiler_union(Eina_Tiler *dst, Eina_Tiler *src); * * This fuction subtracts two tilers @p dst and @p src. * The result is stored in @p dst. It returns #EINA_TRUE if it succeeds. + * @since 1.11 */ EAPI Eina_Bool eina_tiler_subtract(Eina_Tiler *dst, Eina_Tiler *src); @@ -342,6 +344,7 @@ EAPI Eina_Bool eina_tiler_subtract(Eina_Tiler *dst, Eina_Tiler *src); * * This fuction gest intersection of two tilers @p t1 and @p t2. * It returns a pointer of result if intersection of two tilers exists., otherwise returns NULL. + * @since 1.11 */ EAPI Eina_Tiler*eina_tiler_intersection(Eina_Tiler *t1, Eina_Tiler *t2); @@ -354,6 +357,7 @@ EAPI Eina_Tiler*eina_tiler_intersection(Eina_Tiler *t1, Eina_Tiler *t2); * * This fuction gets result of comparison for @p t1 and @p t2. * It returns #EINA_TRUE if tilers are equal. + * @since 1.11 */ EAPI Eina_Bool eina_tiler_equal(Eina_Tiler *t1, Eina_Tiler *t2); --
[EGIT] [core/efl] master 01/01: edcref: unbreak formatting of the page
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=657d97385816bb309c97db6f96dd73874d92c98e commit 657d97385816bb309c97db6f96dd73874d92c98e Author: davemds Date: Thu Aug 7 12:27:56 2014 +0200 edcref: unbreak formatting of the page Every @block need a @context, or the table will broken up and formatting will be bad. Also be a bit less redundant --- src/bin/edje/edje_cc_handlers.c | 32 +++- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index d43350e..cf6871d 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -1565,25 +1565,8 @@ st_externals_external(void) image: "filename1.ext" COMP; image: "filename2.ext" LOSSY 99; image: "filename2.ext" LOSSY_ETC1 50; - set { - name: "image_name_used"; - image { - image: "filename3.ext" LOSSY 90; - size: 201 201 500 500; - } - image { - image: "filename4.ext" COMP; - size: 51 51 200 200; - } - image { - image: "filename5.ext" COMP; - size: 11 11 50 50; - } - image { - image: "filename6.ext" RAW; - size: 0 0 10 10; - } -} +set { } +set { } .. } @description @@ -1781,7 +1764,7 @@ st_images_set_name(void) } /** - @edcsubsection{toplevel_images_image,Image} + @edcsubsection{toplevel_images_set_image,Image} */ /** @@ -1789,9 +1772,16 @@ st_images_set_name(void) @block image +@context +image { + image: "filename4.ext" COMP; + size: 51 51 200 200; + border: 0 0 0 0; + border_scale_by: 0.0; +} @description The "image" block inside a "set" block define the characteristic of an image. - Every block will describe one image and the size rule to use it. +Every block will describe one image and the size rule to use it. @endblock **/ static void --
[EGIT] [core/efl] master 01/01: evas gl - glx - sety current to NULL on free of window or context
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=01cd90b6c3e695fad36378cc5be0149eef0d4ea8 commit 01cd90b6c3e695fad36378cc5be0149eef0d4ea8 Author: Carsten Haitzler (Rasterman) Date: Thu Aug 7 19:34:13 2014 +0900 evas gl - glx - sety current to NULL on free of window or context hunting a mem leak i found we dont nuke the current context when freeing it or the window bound to the current context. fix this. --- src/modules/evas/engines/gl_x11/evas_x_main.c | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c b/src/modules/evas/engines/gl_x11/evas_x_main.c index 4a0cf62..31e120e 100644 --- a/src/modules/evas/engines/gl_x11/evas_x_main.c +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c @@ -447,9 +447,18 @@ eng_window_free(Outbuf *gw) context = EGL_NO_CONTEXT; } #else - if (gw->glxwin) glXDestroyWindow(gw->disp, gw->glxwin); + if (gw->glxwin) + { +glXMakeContextCurrent(gw->disp, 0, 0, gw->context); +glXDestroyWindow(gw->disp, gw->glxwin); + } if (ref == 0) { +if (!gw->glxwin) + { + if (glXGetCurrentContext() == gw->context) + glXMakeCurrent(gw->disp, 0, NULL); + } if (context) glXDestroyContext(gw->disp, context); if (rgba_context) glXDestroyContext(gw->disp, rgba_context); context = 0; @@ -457,6 +466,11 @@ eng_window_free(Outbuf *gw) fbconf = 0; rgba_fbconf = 0; } + else if (!gw->glxwin) + { +if (glXGetCurrentDrawable() == gw->win) + glXMakeCurrent(gw->disp, 0, gw->context); + } #endif free(gw); } --
[EGIT] [apps/rage] master 01/01: sue proper vid obj
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=271711e2b4c4b1be90ea8eded20774aa7a83476b commit 271711e2b4c4b1be90ea8eded20774aa7a83476b Author: Carsten Haitzler (Rasterman) Date: Thu Aug 7 17:56:47 2014 +0900 sue proper vid obj --- src/bin/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/video.c b/src/bin/video.c index c2b624b..d96846e 100644 --- a/src/bin/video.c +++ b/src/bin/video.c @@ -812,7 +812,7 @@ video_lowquality_set(Evas_Object *obj, Eina_Bool lowq) Video *sd = evas_object_smart_data_get(obj); if (!sd) return; sd->lowqual = lowq; - emotion_object_smooth_scale_set(sd->o_vid, + emotion_object_smooth_scale_set(sd->o_vid, (!sd->nosmooth) & (!sd->lowqual)); } --
[EGIT] [core/efl] master 01/02: edcref: quick access list: fix a link and make it more compact
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=25ce0509208da5d6a192fcce0e4e7a8e4d0959dc commit 25ce0509208da5d6a192fcce0e4e7a8e4d0959dc Author: davemds Date: Thu Aug 7 12:47:53 2014 +0200 edcref: quick access list: fix a link and make it more compact --- doc/e.css | 4 src/bin/edje/edje_cc_handlers.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/e.css b/doc/e.css index dbdee55..f286f8c 100644 --- a/doc/e.css +++ b/doc/e.css @@ -25,6 +25,10 @@ dt { font-weight: bold; } +ul { + padding-left: 30px; +} + div.multicol { -moz-column-gap: 1em; -webkit-column-gap: 1em; diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index cf6871d..83335fd 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -55,7 +55,7 @@ * *@ref sec_toplevel_images_set "Set" * - * @ref sec_toplevel_images_image "Image" + * @ref sec_toplevel_images_set_image "Image" * * * @ref sec_toplevel_fonts "Fonts" --
[EGIT] [core/efl] master 02/02: doc style: better @since html render
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8fe920ee79b04394c98c95b9f2176b739ce2765f commit 8fe920ee79b04394c98c95b9f2176b739ce2765f Author: davemds Date: Thu Aug 7 13:20:19 2014 +0200 doc style: better @since html render Now @since have a left colored border, like @deprecaded, @note, etc Also keep the number on the same line: instead of: since 1.10 it now render as: since 1.10 --- doc/e.css | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/e.css b/doc/e.css index f286f8c..551f009 100644 --- a/doc/e.css +++ b/doc/e.css @@ -783,7 +783,7 @@ dl { padding: 0 0 0 10px; } -dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug { +dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug, dl.since { border-left: 4px solid; padding: 0 0 0 6px; } @@ -800,10 +800,14 @@ dl.pre, dl.post, dl.invariant { border-color: #00D000; } -dl.deprecated { +dl.deprecated, dl.since { border-color: #505050; } +dl.since dt { + height: 0; +} + dl.todo { border-color: #00C0E0; } --
[EGIT] [core/efl] master 01/01: edcref: keep properties name aligned with their parameters.
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9ebc480e91c16ec40e5b2b93c0c6751f8948f8b0 commit 9ebc480e91c16ec40e5b2b93c0c6751f8948f8b0 Author: davemds Date: Thu Aug 7 13:45:14 2014 +0200 edcref: keep properties name aligned with their parameters. Also make them bold --- doc/e.css | 14 ++ 1 file changed, 14 insertions(+) diff --git a/doc/e.css b/doc/e.css index 551f009..dd111c0 100644 --- a/doc/e.css +++ b/doc/e.css @@ -953,3 +953,17 @@ dl.citelist dd { background-color: #a0a0a0; text-shadow: 0px 1px 0px #cc; } + +/* EdcRef page specific styles */ + +table.edcref td { + vertical-align: top; +} + +table.edcref td.property, table.edcref td.parameters { + font-weight: bold; +} + + + + --
[EGIT] [core/efl] master 01/01: edcref: review all the @since usage
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ba7ea64d9749edfa3080597e51db0cda31e830fe commit ba7ea64d9749edfa3080597e51db0cda31e830fe Author: davemds Date: Thu Aug 7 14:41:25 2014 +0200 edcref: review all the @since usage * put them inside the @property block they belongs * do not show micro version (1.7 instead of 1.7.0) --- src/bin/edje/edje_cc_handlers.c | 139 1 file changed, 71 insertions(+), 68 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 83335fd..4f791be 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -1881,11 +1881,11 @@ st_images_set_image_size(void) border @parameters [left] [right] [top] [bottom] -@since 1.8 @effect If set, the area (in pixels) of each side of the image will be displayed as a fixed size border, from the side -> inwards, preventing the corners from being changed on a resize. +@since 1.8 @endproperty */ static void @@ -1910,7 +1910,6 @@ st_images_set_image_border(void) border_scale_by @parameters 0.0 or bigger (0.0 or 1.0 to turn it off) -@since 1.8 @effect If border scaling is enabled then normally the OUTPUT border sizes (e.g. if 3 pixels on the left edge are set as a border, then normally @@ -1920,6 +1919,7 @@ st_images_set_image_border(void) factor by this multiplier, allowing the creation of "supersampled" borders to make much higher resolution outputs possible by always using the highest resolution artwork and then runtime scaling it down. +@since 1.8 @endproperty */ static void @@ -2551,8 +2551,9 @@ st_collections_base_scale(void) @li COMP: Lossless compression. @li LOSSY [-0.1 - 1.0]: Lossy compression with quality from 0 to 1.0. @li AS_IS: Check for re-encoding, no compression/encoding, just write the file information as it is. + +@since 1.1 @endproperty -@since 1.1.0 */ static void st_collections_group_sound_sample_name(void) @@ -2619,8 +2620,8 @@ st_collections_group_sound_sample_name(void) @effect The Sound source file name (Source can be mono/stereo WAV file. Only files with 44.1 KHz sample rate supported now) +@since 1.1 @endproperty -@since 1.1.0 */ static void st_collections_group_sound_sample_source(void) @@ -2648,8 +2649,8 @@ st_collections_group_sound_sample_source(void) [tone name] [frequency] @effect sound of specific frequency +@since 1.1 @endproperty -@since 1.1.0 */ static void st_collections_group_sound_tone(void) @@ -2721,8 +2722,8 @@ st_collections_group_sound_tone(void) @description The "vibrations" block contains a list of one or more vibration sample. -@endblock @since 1.10 +@endblock */ /** @@ -2748,8 +2749,8 @@ st_collections_group_sound_tone(void) @effect Used to include each vibration file. The full path to the directory holding the vibrations can be defined later with edje_cc's "-vd" option. -@endproperty @since 1.10 +@endproperty */ static void st_collections_group_vibration_sample_name(void) @@ -2802,8 +2803,8 @@ st_collections_group_vibration_sample_name(void) [vibration file name] @effect The Vibration source file name -@endproperty @since 1.10 +@endproperty */ static void st_collections_group_vibration_sample_source(void) @@ -3167,8 +3168,8 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2) will inhibit edje_cc resolving of programs and parts that may not exist in this group, but are located in the group which is inheriting this group. -@endproperty @since 1.10 +@endproperty */ static void st_collections_group_inherit_only(void) @@ -3193,8 +3194,8 @@ st_collections_group_inherit_only(void) The resulting program will have all of the parts/programs within the specified group added as targets. At least one part/program MUST be specified. -@endproperty @since 1.10 +@endproperty */ static void st_collections_group_target_group(void) @@ -3241,8 +3242,8 @@ st_collections_group_target_group(void) to fix that). @warning When inheriting any parts, descriptions without state names are NOT allowed. +@since 1.10 @endproperty -@since 1.1.0 */ static void st_collections_group_inherit(void) @@ -3523,7 +3524,7 @@ st_collections_group_script_only(void) For example, running an Embryo script which calls EDC which has a script{} block is unsafe, and the outer-most (first) Embryo stack is GUARANTEED to be corrupted. Only use this flag if you are sure that you know what you are doing. -@since 1.10 +@since 1
Re: [E-devel] [EGIT] [core/efl] master 01/01: Eet: Add support for ETC2 encoding and decoding
Hello. Still on my way through the API/ABI reports form 1.10 to 1.11 On Fri, 2014-06-13 at 01:18, Jean-Philippe ANDRXX wrote: > jpeg pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=c21968bcd76e07ff300c8e102c0062f74fcb704d > > commit c21968bcd76e07ff300c8e102c0062f74fcb704d > Author: Jean-Philippe Andre > Date: Fri Jun 13 16:56:39 2014 +0900 > > Eet: Add support for ETC2 encoding and decoding > > Since we now have full support for ETC2, add the colorspaces > to Eet. > > @feature > --- > src/Makefile_Eet.am | 2 + > src/lib/eet/Eet.h | 8 +- > src/lib/eet/eet_image.c | 310 > +++- > 3 files changed, 237 insertions(+), 83 deletions(-) > > lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ > diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h > index 50645a0..95be2e5 100644 > --- a/src/lib/eet/Eet.h > +++ b/src/lib/eet/Eet.h > @@ -477,14 +477,18 @@ typedef enum _Eet_Image_Encoding > { > EET_IMAGE_LOSSLESS = 0, > EET_IMAGE_JPEG = 1, > - EET_IMAGE_ETC1 = 2 > + EET_IMAGE_ETC1 = 2, > + EET_IMAGE_ETC2_RGB = 3, > + EET_IMAGE_ETC2_RGBA = 4 > } Eet_Image_Encoding; > > typedef enum _Eet_Colorspace > { > EET_COLORSPACE_ARGB = 0, > /* The number between are reserved to preserve compatibility with evas */ > - EET_COLORSPACE_ETC1 = 8 > + EET_COLORSPACE_ETC1 = 9, Reported by the ABI checker and it seems valid to me. We should keep it at 8 here and leave 9 empty or move all newly added ones one up. All all code that might comapre to this will be wrong now and we have an ABI break. Agreed? > + EET_COLORSPACE_RGB8_ETC2 = 10, > + EET_COLORSPACE_RGBA8_ETC2_EAC = 11 > } Eet_Colorspace; regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: edc_editor: update file path on title exactly.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=e804f003718ddf5b52063209b9f862a1bd30b821 commit e804f003718ddf5b52063209b9f862a1bd30b821 Author: ChunEon Park Date: Thu Aug 7 21:55:13 2014 +0900 edc_editor: update file path on title exactly. --- src/bin/edc_editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 50ee1d1..1228169 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -1154,7 +1154,7 @@ edit_edc_read(edit_data *ed, const char *file_path) parser_first_group_name_get(ed->pd, ed->en_edit); stats_edc_group_update(group_name); - base_title_set(config_edc_path_get()); + base_title_set(file_path); ecore_animator_add(syntax_color_timer_cb, ed); --
[EGIT] [tools/enventor] master 01/01: menu: Fix change window title.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=717ad0148e09e49ede2e03b58b58c6b4dc0ae97e commit 717ad0148e09e49ede2e03b58b58c6b4dc0ae97e Author: Mykyta Biliavskyi Date: Thu Aug 7 21:57:44 2014 +0900 menu: Fix change window title. Summary: When file saved with new name - changes title of main window. @fix Reviewers: Hermet Projects: #enventor Differential Revision: https://phab.enlightenment.org/D1286 --- src/bin/menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/menu.c b/src/bin/menu.c index c0aa656..5f642f7 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -439,6 +439,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, void *event_info) edj_mgr_reload_need_set(EINA_TRUE); config_apply(); + base_title_set(selected); fileselector_close(md); menu_close(md); } --
[EGIT] [tools/enventor] master 01/01: redoundo: dismiss text selection after redo/undo action.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=e9950a286918d158acba0c55d2cb4f4590d73ea6 commit e9950a286918d158acba0c55d2cb4f4590d73ea6 Author: Mykyta Biliavskyi Date: Thu Aug 7 21:58:48 2014 +0900 redoundo: dismiss text selection after redo/undo action. Summary: after apply diff from undo/redo queue any text selection in the entry will be dismissed. Fixes T1483 @fix Reviewers: Hermet Reviewed By: Hermet Subscribers: kfesyna Projects: #enventor Maniphest Tasks: T1483 Differential Revision: https://phab.enlightenment.org/D1285 --- src/bin/redoundo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/redoundo.c b/src/bin/redoundo.c index 88e6bd5..d4d14c2 100644 --- a/src/bin/redoundo.c +++ b/src/bin/redoundo.c @@ -157,6 +157,7 @@ redoundo_undo(redoundo_data *rd, Eina_Bool *changed) { elm_entry_calc_force(rd->entry); *changed = EINA_TRUE; +elm_entry_select_none(rd->entry); } return lines; @@ -235,6 +236,7 @@ redoundo_redo(redoundo_data *rd, Eina_Bool *changed) { elm_entry_calc_force(rd->entry); *changed = EINA_TRUE; +elm_entry_select_none(rd->entry); } return lines; --
[EGIT] [tools/enventor] master 01/01: [EDC-Editor] Make template of parts to use unique names on insertion
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=7d24fc8a3cc9588517bf0ee962157b22c713e557 commit 7d24fc8a3cc9588517bf0ee962157b22c713e557 Author: Kateryna Fesyna Date: Thu Aug 7 21:59:51 2014 +0900 [EDC-Editor] Make template of parts to use unique names on insertion Summary: To create templates with unique name the counter of created parts is added to the Configure Data. The line with the name of the part is placed in separate template because it is the same for each part template. Reviewers: Hermet Projects: #enventor Differential Revision: https://phab.enlightenment.org/D1278 --- src/bin/edc_editor.c| 23 +++ src/include/template_code.h | 8 ++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 1228169..10bc611 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -8,6 +8,12 @@ const int SYNTAX_COLOR_SPARE_LINES = 42; const double SYNTAX_COLOR_DEFAULT_TIME = 0.25; const double SYNTAX_COLOR_SHORT_TIME = 0.025; +static const char ALPHA_STRING[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz"; + +static const char ALPHA_STRING_LEN = 52; + typedef struct syntax_color_thread_data_s { edit_data *ed; @@ -463,6 +469,14 @@ edit_cur_indent_depth_get(edit_data *ed) return indent_space_get(syntax_indent_data_get(ed->sh), ed->en_edit); } +static void +part_name_string_generate(char *part_name_line) +{ + char *pos = strstr(part_name_line, QUOT); + while (*(++pos) != QUOT_C) + *pos = ALPHA_STRING[rand() % ALPHA_STRING_LEN]; +} + void edit_template_part_insert(edit_data *ed, Edje_Part_Type type) { @@ -525,6 +539,14 @@ edit_template_part_insert(edit_data *ed, Edje_Part_Type type) break; } + char *part_name_line = strdup(TEMPLATE_PART_NAME_FORMAT); + part_name_string_generate(part_name_line); + + elm_entry_entry_insert(ed->en_edit, p); + elm_entry_entry_insert(ed->en_edit, part_name_line); + edit_line_increase(ed, 1); + free(part_name_line); + int i; for (i = 0; i < (line_cnt - 1); i++) { @@ -982,6 +1004,7 @@ scroller_vbar_unpress_cb(void *data, Evas_Object *obj EINA_UNUSED, edit_data * edit_init(Evas_Object *parent) { + srand(time(NULL)); parser_data *pd = parser_init(); syntax_helper *sh = syntax_init(); diff --git a/src/include/template_code.h b/src/include/template_code.h index 5c7e452..77338a1 100644 --- a/src/include/template_code.h +++ b/src/include/template_code.h @@ -32,12 +32,13 @@ const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] = "}" }; +const char * TEMPLATE_PART_NAME_FORMAT = + "part { name: \"PartName\";"; #define TEMPLATE_PART_IMAGE_LINE_CNT 15 const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] = { - "part { name: \"XXX\";", " type: IMAGE;", " scale: 1;", " mouse_events: 1;", @@ -58,7 +59,6 @@ const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] = const char *TEMPLATE_PART_RECT[TEMPLATE_PART_RECT_LINE_CNT] = { - "part { name: \"XXX\";", " type: RECT;", " scale: 1;", " mouse_events: 1;", @@ -78,7 +78,6 @@ const char *TEMPLATE_PART_RECT[TEMPLATE_PART_RECT_LINE_CNT] = const char *TEMPLATE_PART_SWALLOW[TEMPLATE_PART_SWALLOW_LINE_CNT] = { - "part { name: \"XXX\";", " type: SWALLOW;", " scale: 1;", " mouse_events: 1;", @@ -97,7 +96,6 @@ const char *TEMPLATE_PART_SWALLOW[TEMPLATE_PART_SWALLOW_LINE_CNT] = const char *TEMPLATE_PART_SPACER[TEMPLATE_PART_SPACER_LINE_CNT] = { - "part { name: \"XXX\";", " type: SPACER;", " scale: 1;", " description { state: \"default\" 0.0;", @@ -114,7 +112,6 @@ const char *TEMPLATE_PART_SPACER[TEMPLATE_PART_SPACER_LINE_CNT] = const char *TEMPLATE_PART_TEXT[TEMPLATE_PART_TEXT_LINE_CNT] = { - "part { name: \"XXX\";", " type: TEXT;", " scale: 1;", " mouse_events: 1;", @@ -144,7 +141,6 @@ const char *TEMPLATE_PART_TEXT[TEMPLATE_PART_TEXT_LINE_CNT] = const char *TEMPLATE_PART_TEXTBLOCK[TEMPLATE_PART_TEXTBLOCK_LINE_CNT] = { - "part { name: \"XXX\";", " type: TEXTBLOCK;", " description { state: \"default\" 0.0;", " rel1 { relative: 0.0 0.0; offset: 0 0; /*to: \"XXX\";*/ }", --
[EGIT] [core/efl] master 01/01: Eolian/Generator: fix generation of class functions.
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=99888ceaec4641113eeb5be9678a27dc6202b66b commit 99888ceaec4641113eeb5be9678a27dc6202b66b Author: Daniel Zaoui Date: Thu Aug 7 15:49:03 2014 +0300 Eolian/Generator: fix generation of class functions. The generation for legacy was missing. The patch removes too the EINA_UNUSED flag for static functions data. --- src/bin/eolian/eo_generator.c | 2 -- src/bin/eolian/legacy_generator.c | 46 +-- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c index 65690d1..2d5f7de 100644 --- a/src/bin/eolian/eo_generator.c +++ b/src/bin/eolian/eo_generator.c @@ -494,8 +494,6 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, if (need_implementation) { Eina_Bool is_cf = eolian_function_is_class(funcid); -if (is_cf) - eina_strbuf_append(full_params, " EINA_UNUSED"); eina_strbuf_replace_all(fbody, "@#full_params", eina_strbuf_string_get(full_params)); const char *data_type = eolian_class_data_type_get(class); if (is_cf || (data_type && !strcmp(data_type, "null"))) diff --git a/src/bin/eolian/legacy_generator.c b/src/bin/eolian/legacy_generator.c index db4f64e..52303a5 100644 --- a/src/bin/eolian/legacy_generator.c +++ b/src/bin/eolian/legacy_generator.c @@ -16,7 +16,7 @@ tmpl_eapi_funcdef[] = "\n\ *\n\ @#list_desc_param\ */\n\ -EAPI @#type_return%s(@#is_constEo *obj@#params)@#flags;\n\ +EAPI @#type_return%s(@#params)@#flags;\n\ "; /*@#CLASS_CHECK(obj) @#check_ret;\n\*/ @@ -24,18 +24,18 @@ static const char tmpl_eapi_body[] ="\ \n\ EAPI @#ret_type\n\ -@#eapi_func(@#is_constEo *obj@#full_params)\n\ +@#eapi_func(@#full_params)\n\ {\n\ - return eo_do((Eo *) obj, @#eo_func(@#eo_params));\n\ + return eo_do(@#eo_obj, @#eo_func(@#eo_params));\n\ }\n\ "; static const char tmpl_eapi_body_void[] ="\ \n\ EAPI void\n\ -@#eapi_func(@#is_constEo *obj@#full_params)\n\ +@#eapi_func(@#full_params)\n\ {\n\ - eo_do((Eo *) obj, @#eo_func(@#eo_params));\n\ + eo_do(@#eo_obj, @#eo_func(@#eo_params));\n\ }\n\ "; @@ -85,6 +85,12 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci if (func_env.legacy_func[0] == '\0') goto end; eina_strbuf_append_printf(fbody, tmpl_eapi_funcdef, func_env.legacy_func); + if (!eolian_function_is_class(funcid)) + { +if (ftype == EOLIAN_PROP_GET || eolian_function_object_is_const(funcid)) + eina_strbuf_append(fparam, "const "); +eina_strbuf_append(fparam, "Eo *obj"); + } sprintf (tmpstr, "comment%s", suffix); const char *desc = eolian_function_description_get(funcid, tmpstr); Eina_Strbuf *linedesc = eina_strbuf_new(); @@ -113,7 +119,8 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci eolian_parameter_information_get((Eolian_Function_Parameter*)data, NULL, &ptypet, &pname, &pdesc); ptype = eolian_type_c_type_get(ptypet); leg_param_idx++; -eina_strbuf_append_printf(fparam, ", %s%s %s", +if (eina_strbuf_length_get(fparam)) eina_strbuf_append(fparam, ", "); +eina_strbuf_append_printf(fparam, "%s%s %s", eolian_parameter_const_attribute_get(data, ftype == EOLIAN_PROP_GET)?"const":"", ptype, pname); eina_stringshare_del(ptype); @@ -148,7 +155,8 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci if (ftype == EOLIAN_PROP_GET) pdir = EOLIAN_OUT_PARAM; if (ftype == EOLIAN_PROP_SET) pdir = EOLIAN_IN_PARAM; leg_param_idx++; -eina_strbuf_append_printf(fparam, ", %s%s%s%s%s", +if (eina_strbuf_length_get(fparam)) eina_strbuf_append(fparam, ", "); +eina_strbuf_append_printf(fparam, "%s%s%s%s%s", eolian_parameter_const_attribute_get(data, ftype == EOLIAN_PROP_GET)?"const ":"", ptype, had_star?"":" ", add_star?"*":"", pname); eina_stringshare_del(ptype); @@ -167,6 +175,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci } eina_iterator_free(itr); } + if (!eina_strbuf_length_get(fparam)) eina_strbuf_append(fparam, "void"); if (flags) eina_strbuf_append_printf(flags, ")"); if (rettypet) rettype = eolian_type_c_type_get(rettypet); @@ -179,7 +188,6 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci rettype ? rettype : "void", rettype && strchr(rettype, '*')?"":" "); eina_strbuf_replace_all(fbody, "@#type_return", eina_strbuf_string_get(fparam)); - eina_strbuf_replace_all(fbody, "@#is_const", (ftype == EOLIAN_PROP_GET || eolian_function_object_is_const(funcid)) ? "const " : "");
[EGIT] [tools/enventor] master 01/01: template: refactoring.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=89a65c680c31e406542bb67df2ea226f74188af2 commit 89a65c680c31e406542bb67df2ea226f74188af2 Author: ChunEon Park Date: Thu Aug 7 22:32:27 2014 +0900 template: refactoring. revise the code. --- src/bin/Makefile.am | 3 ++- src/bin/edc_editor.c| 21 ++--- src/bin/template.c | 20 src/include/Makefile.am | 3 ++- src/include/common.h| 1 + src/include/template.h | 1 + src/include/template_code.h | 3 --- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 03c049c..6f90d0f 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -33,7 +33,8 @@ enventor_SOURCES = \ auto_comp.c \ setting.c \ globals.c \ - redoundo.c + redoundo.c \ + template.c enventor_LDADD = @ENVENTOR_LIBS@ enventor_LDFLAGS = $(LTLIBINTL) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 10bc611..b44ab5c 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -8,12 +8,6 @@ const int SYNTAX_COLOR_SPARE_LINES = 42; const double SYNTAX_COLOR_DEFAULT_TIME = 0.25; const double SYNTAX_COLOR_SHORT_TIME = 0.025; -static const char ALPHA_STRING[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz"; - -static const char ALPHA_STRING_LEN = 52; - typedef struct syntax_color_thread_data_s { edit_data *ed; @@ -469,14 +463,6 @@ edit_cur_indent_depth_get(edit_data *ed) return indent_space_get(syntax_indent_data_get(ed->sh), ed->en_edit); } -static void -part_name_string_generate(char *part_name_line) -{ - char *pos = strstr(part_name_line, QUOT); - while (*(++pos) != QUOT_C) - *pos = ALPHA_STRING[rand() % ALPHA_STRING_LEN]; -} - void edit_template_part_insert(edit_data *ed, Edje_Part_Type type) { @@ -539,13 +525,10 @@ edit_template_part_insert(edit_data *ed, Edje_Part_Type type) break; } - char *part_name_line = strdup(TEMPLATE_PART_NAME_FORMAT); - part_name_string_generate(part_name_line); - elm_entry_entry_insert(ed->en_edit, p); - elm_entry_entry_insert(ed->en_edit, part_name_line); + const char *first_line = template_part_first_line_get(); + elm_entry_entry_insert(ed->en_edit, first_line); edit_line_increase(ed, 1); - free(part_name_line); int i; for (i = 0; i < (line_cnt - 1); i++) diff --git a/src/bin/template.c b/src/bin/template.c new file mode 100644 index 000..d44a396 --- /dev/null +++ b/src/bin/template.c @@ -0,0 +1,20 @@ +#include +#include "common.h" + +const char *NAME_SEED = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +const int NAME_SEED_LEN = 52; + +const char * +template_part_first_line_get(void) +{ + static char buf[40]; + char name[8]; + int i; + + for (i = 0; i < 8; i++) + name[i] = NAME_SEED[(rand() % NAME_SEED_LEN)]; + + snprintf(buf, sizeof(buf), "part { name: \"%s\";", name); + + return (const char *) buf; +} diff --git a/src/include/Makefile.am b/src/include/Makefile.am index e7548d8..3d86423 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -25,4 +25,5 @@ EXTRA_DIST = common.h \ goto.h \ setting.h \ search.h \ - redoundo.h + redoundo.h \ + template.h diff --git a/src/include/common.h b/src/include/common.h index f56a3df..c88afd0 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -33,5 +33,6 @@ typedef struct redoundo_s redoundo_data; #include "auto_comp.h" #include "setting.h" #include "redoundo.h" +#include "template.h" #endif diff --git a/src/include/template.h b/src/include/template.h new file mode 100644 index 000..61c4216 --- /dev/null +++ b/src/include/template.h @@ -0,0 +1 @@ +const char *template_part_first_line_get(void); diff --git a/src/include/template_code.h b/src/include/template_code.h index 77338a1..c5ac93a 100644 --- a/src/include/template_code.h +++ b/src/include/template_code.h @@ -32,9 +32,6 @@ const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] = "}" }; -const char * TEMPLATE_PART_NAME_FORMAT = - "part { name: \"PartName\";"; - #define TEMPLATE_PART_IMAGE_LINE_CNT 15 const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] = --
Re: [E-devel] E causing problems with ArchLinux kernel 3.15.8-1-ARCH and possible vbox
well, it's a bug in their part. I've isolated the problem to a simple libdrm subcase of their vbltest.c, reported to: https://www.virtualbox.org/ticket/13265 But I'm not sure how fast they handle this. You don't need to detect virtualbox per se, only if vboxvideo is loaded, then stat to /sys/module/vboxvideo is enough. One thing is that libdrm provides drmOpen() that takes a module name (ie: nvidia, vboxvideo), while we open the /dev directly. So far it seems to be okay, but I guess in future they may change this and add some ioctl from inside such API to configure and in that case we'll enter into problems. It would also be nice to know which device we're using, suppose we have more than one video card, then we need to use the current one, not the first one. On Wed, Aug 6, 2014 at 7:53 PM, Carsten Haitzler wrote: > On Wed, 6 Aug 2014 17:57:05 -0300 Gustavo Sverzut Barbieri > > said: > >> update, this is caused by efl/src/lib/ecore_x/xlib/ecore_x_vsync.c >> "#define ECORE_X_VSYNC_DRM 1". If you remove that line (or #undef the >> sym), it works, now to find out the actual call that triggers it to >> produce a test case for them... > > aaah shit. the code is really simple - it really does one of 4 things. > open /dev/dri/card0, call a drm lib call to schedule a new vsync event, and > then select to listen on the drm fd with a timeout and then use drm call to > "read" the fd for the event info. one of those would do it. given that, i > would > imagine it's the schedule of a new vsync interrupt one. > > is there a nice simple way to know you have a vbox virtual driver in the > kernel > and are a guest? i can put in something to veto it (eg something in /proc > or /sys - some file that exists only inside vbox if the guest driver is there > - > i can put in a simple stat for it and avoid if there)? > >> On Wed, Aug 6, 2014 at 12:38 PM, Gustavo Sverzut Barbieri >> wrote: >> > sorry for the noise, this has nothing to do with Enlightenment or new >> > vsync. I've disabled it and still happens, we're just triggering a bug >> > in drm. >> > >> > if you suffer from this problem just remove virtualbox-guest-modules >> > and you'll fallback to fbdev without problems (just setting X to use >> > fbdev does not help, you need to remove vboxvideo.ko so it's never >> > loaded). >> > >> > On Wed, Aug 6, 2014 at 11:42 AM, Gustavo Sverzut Barbieri >> > wrote: >> >> Hi all, >> >> >> >> Just a heads up that recent Enlightenment (GIT) is causing problems >> >> with ArchLinux vanilla kernel (3.15.8-1-ARCH), at least running inside >> >> VirtualBox 4.3.14. >> >> >> >> I'm trying to isolate the problem to report that to kernel guys since >> >> a Kernel Oops is always a kernel bug, until then watch out if you want >> >> to update and run similar setup. >> >> >> >> The relevant dmesg part is: >> >> >> >> [7.142526] BUG: unable to handle kernel NULL pointer dereference at >> >> (null) [7.142532] IP: [< (null)>] (null) >> >> [7.142534] *pde = >> >> [7.142536] Oops: [#1] PREEMPT SMP >> >> [7.142539] Modules linked in: ext4 crc16 mbcache jbd2 ppdev >> >> snd_intel8x0 snd_ac97_codec intel_rapl microcode ac97_bus pcspkr >> >> snd_pcm psmouse serio_raw snd_timer i2c_piix4 joydev mousedev snd >> >> soundcore mac_hid e1000 parport_pc parport floppy(+) ac battery >> >> intel_agp intel_gtt button evdev vboxvideo(O) drm agpgart i2c_core >> >> vboxsf(O) vboxguest(O) hid_generic usbhid hid crc32c_generic btrfs xor >> >> raid6_pq sd_mod crc_t10dif crct10dif_common atkbd libps2 ohci_pci >> >> ohci_hcd ehci_pci ehci_hcd ahci libahci libata scsi_mod usbcore >> >> usb_common i8042 serio >> >> [7.142562] CPU: 0 PID: 254 Comm: enlightenment Tainted: G >> >> O 3.15.8-1-ARCH #1 >> >> [7.142564] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS >> >> VirtualBox 12/01/2006 >> >> [7.142566] task: f39fd2c0 ti: f3a58000 task.ti: f3a58000 >> >> [7.142568] EIP: 0060:[<>] EFLAGS: 00210046 CPU: 0 >> >> [7.142570] EIP is at 0x0 >> >> [7.142572] EAX: f5228400 EBX: f5228400 ECX: f8b7d140 EDX: >> >> [7.142573] ESI: f9fdb560 EDI: EBP: f3a59de4 ESP: f3a59d90 >> >> [7.142574] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 >> >> [7.142576] CR0: 80050033 CR2: CR3: 33a5c000 CR4: 06d0 >> >> [7.142581] Stack: >> >> [7.142583] f9fda8c2 f53a1d90 f5228400 f5228438 f5121cc0 >> >> f539f9c0 f3a59db4 >> >> [7.142586] f9fdd1e0 00200046 f52284e8 f52284ea 00200246 >> >> f5b75024 >> >> [7.142589] f539f9c0 c29a0d46 f5228400 f9fdb560 0401 f3a59e44 >> >> f9fdb5d8 f57cf948 >> >> [7.142592] Call Trace: >> >> [7.142601] [] ? drm_vblank_get+0xd2/0x240 [drm] >> >> [7.142607] [] ? drm_minor_release+0x10/0x20 [drm] >> >> [7.142613] [] ? drm_modeset_ctl+0x70/0x70 [drm] >> >> [7.142617] [] drm_wait_vblank+0x78/0x5e0 [drm] >> >> [7.142622] [] ? lockref_put_or_lock+0x20/0x40 >> >> [7.142625]
[EGIT] [tools/enventor] master 01/01: theme: adjust text editor background color.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8eeb5206adc27b6e1aacf53cbcb402f00547277f commit 8eeb5206adc27b6e1aacf53cbcb402f00547277f Author: ChunEon Park Date: Thu Aug 7 22:55:43 2014 +0900 theme: adjust text editor background color. --- data/themes/default/theme_ext.edc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index 6f83631..f45437d 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -925,7 +925,7 @@ group { name: "elm/panes/vertical/enventor"; description { state: "default" 0.0; rel1.to: "elm.swallow.right"; rel2.to: "elm.swallow.right"; -color: 0 0 0 255; +color: 0 0 0 175; } } part { name: "sub_whole"; type: SPACER; --
[EGIT] [tools/enventor] master 01/01: menu: adjust some messages.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=072a088a73e525b759f31613624defdfaa8f0964 commit 072a088a73e525b759f31613624defdfaa8f0964 Author: ChunEon Park Date: Thu Aug 7 23:01:32 2014 +0900 menu: adjust some messages. --- src/bin/menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/menu.c b/src/bin/menu.c index 5f642f7..2ebe9fd 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -141,7 +141,7 @@ newfile_open(menu_data *md) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "newfile_layout"); - elm_object_part_text_set(layout, "elm.text.title", "New File: choose a template."); + elm_object_part_text_set(layout, "elm.text.title", "New File: Choose a template"); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", newfile_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -413,7 +413,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, void *event_info) if (ecore_file_is_dir(selected)) { elm_object_part_text_set(md->fileselector_layout, - "elm.text.msg", "Choose a file to save."); + "elm.text.msg", "Choose a file to save"); elm_object_signal_emit(md->fileselector_layout, "elm,action,msg,show", ""); return; --
Re: [E-devel] [EGIT] [core/elementary] master 02/02: atspi: add AtspiText and AtspiEditableText interface support.
Hello. Looking through newly added API for 1.11 right now. On Tue, 2014-06-10 at 00:18, Lukasz Stanislawski wrote: > raster pushed a commit to branch master. > > http://git.enlightenment.org/core/elementary.git/commit/?id=0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > > commit 0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > Author: Lukasz Stanislawski > Date: Tue Jun 10 16:18:17 2014 +0900 > > atspi: add AtspiText and AtspiEditableText interface support. > > Summary: > Added reference interface implementation for elm_entry widget. Tests > added. > Updated at-spi-constants.h header to version 2.12.0. > > Reviewers: raster, seoz > > CC: raster > > Differential Revision: https://phab.enlightenment.org/D806 > --- [SNIP] > + > +/** > + * @brief Free Elm_Atspi_Text_Attribute structure > + */ > +void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); This one show up as a newly added symbol. It has no EAPI defined though. Should this be an internal or public symbol? If public we whould use EAPI here plus a bit more doxygen description and @since 1.11. If on the other hand this should be internal only we need to have a look why it shows up externally. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: elementary: Handle case where ELM_ENGINE environment variable is misspelled.
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=e57a00da5340124677b4c2d8f18dab5639704890 commit e57a00da5340124677b4c2d8f18dab5639704890 Author: Chris Michael Date: Thu Aug 7 10:10:45 2014 -0400 elementary: Handle case where ELM_ENGINE environment variable is misspelled. In case someone exports the ELM_ENGINE to be wayland-shm or wayland-egl, let's handle That case also. Typically it is set to wayland_shm or wayland_egl but since we check variants of spelling for other engines also, then let's check it for the wayland engines too. @fix Signed-off-by: Chris Michael --- src/lib/elm_config.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index 0804fb7..a74c49c 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -1979,9 +1979,11 @@ _env_get(void) eina_stringshare_replace(&_elm_config->engine, s); else if ((!strcasecmp(s, "ews"))) eina_stringshare_replace(&_elm_config->engine, ELM_EWS); -else if ((!strcasecmp(s, "wayland_shm"))) +else if ((!strcasecmp(s, "wayland_shm")) || + (!strcasecmp(s, "wayland-shm"))) eina_stringshare_replace(&_elm_config->engine, ELM_WAYLAND_SHM); -else if ((!strcasecmp(s, "wayland_egl"))) +else if ((!strcasecmp(s, "wayland_egl")) || + (!strcasecmp(s, "wayland-egl"))) eina_stringshare_replace(&_elm_config->engine, ELM_WAYLAND_EGL); else if ((!strcasecmp(s, "drm"))) eina_stringshare_replace(&_elm_config->engine, ELM_DRM); --
[EGIT] [core/elementary] master 01/01: win: Don't call ecore_x_screensaver APIs if elm win doesn't have X11 window
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ceecd67d648bf5df9f9f3e877847f26d3b07477c commit ceecd67d648bf5df9f9f3e877847f26d3b07477c Author: Gwanglim Lee Date: Thu Aug 7 10:19:24 2014 -0400 win: Don't call ecore_x_screensaver APIs if elm win doesn't have X11 window Summary: Elementary application crashes on startup when it is running with wayland engine. This crash problem happens while ecore_x_screensaver API is being called from _win_noblank_eval funcion. Thus we should not call ecore_x_screensaver APIs if elm win doesn't have X11 window. Test Plan: 1. build efl and elementary to support x11 and also wayland 1. run weston without xwayland 2. run elementary_test on the weston Reviewers: raster, seoz, stefan_schmidt, devilhorns Differential Revision: https://phab.enlightenment.org/D1293 --- src/lib/elm_win.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 68f5365..2ffef69 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -319,6 +319,7 @@ _win_noblank_eval(void) Eina_List *l; Evas_Object *obj; int noblanks = 0; + Eina_Bool change = EINA_FALSE; #ifdef HAVE_ELEMENTARY_X EINA_LIST_FOREACH(_elm_win_list, l, obj) @@ -329,10 +330,14 @@ _win_noblank_eval(void) { if ((sd->noblank) && (!sd->iconified) && (!sd->withdrawn) && evas_object_visible_get(obj)) - noblanks++; + noblanks++; + + change = EINA_TRUE; } } + if (!change) return; + if (ENGINE_COMPARE(ELM_SOFTWARE_X11) || ENGINE_COMPARE(ELM_SOFTWARE_16_X11) || ENGINE_COMPARE(ELM_XRENDER_X11) || ENGINE_COMPARE(ELM_OPENGL_X11) || --
Re: [E-devel] [EGIT] [core/elementary] master 02/02: atspi: add AtspiText and AtspiEditableText interface support.
On 07/08/14 15:13, Stefan Schmidt wrote: > Hello. > > Looking through newly added API for 1.11 right now. > > On Tue, 2014-06-10 at 00:18, Lukasz Stanislawski wrote: >> raster pushed a commit to branch master. >> >> http://git.enlightenment.org/core/elementary.git/commit/?id=0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 >> >> commit 0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 >> Author: Lukasz Stanislawski >> Date: Tue Jun 10 16:18:17 2014 +0900 >> >> atspi: add AtspiText and AtspiEditableText interface support. >> >> Summary: >> Added reference interface implementation for elm_entry widget. Tests >> added. >> Updated at-spi-constants.h header to version 2.12.0. >> >> Reviewers: raster, seoz >> >> CC: raster >> >> Differential Revision: https://phab.enlightenment.org/D806 >> --- > > [SNIP] > >> + >> +/** >> + * @brief Free Elm_Atspi_Text_Attribute structure >> + */ >> +void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); > > This one show up as a newly added symbol. It has no EAPI defined > though. Should this be an internal or public symbol? > > If public we whould use EAPI here plus a bit more doxygen description > and @since 1.11. If on the other hand this should be internal only we > need to have a look why it shows up externally. I have -fvisibility=hidden in my cflags, so it doesn't look like something is wrong with my .so generation. Maybe it was just detected by the tool's header scanner? -- Tom. -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore_x_vsync: hack to workaround bug in vboxvideo
barbieri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a306c19871f8a44bda0008d760567aa6cae2bca2 commit a306c19871f8a44bda0008d760567aa6cae2bca2 Author: Gustavo Sverzut Barbieri Date: Thu Aug 7 11:29:52 2014 -0300 ecore_x_vsync: hack to workaround bug in vboxvideo there is a kernel oops when using vboxvideo 4.3.14 and one calls drmWaitVBlank(), then do not init drm when using such driver. https://www.virtualbox.org/ticket/13265 --- src/lib/ecore_x/xlib/ecore_x_vsync.c | 19 +++ 1 file changed, 19 insertions(+) diff --git a/src/lib/ecore_x/xlib/ecore_x_vsync.c b/src/lib/ecore_x/xlib/ecore_x_vsync.c index e8f2824..e3b1140 100644 --- a/src/lib/ecore_x/xlib/ecore_x_vsync.c +++ b/src/lib/ecore_x/xlib/ecore_x_vsync.c @@ -323,6 +323,25 @@ _drm_init(void) struct stat st; char buf[512]; + // vboxvideo 4.3.14 is crashing when calls drmWaitVBlank() + // https://www.virtualbox.org/ticket/13265 + if (stat("/sys/module/vboxvideo", &st) == 0) + { +FILE *fp = fopen("/sys/module/vboxvideo/version", "r"); +if (fp) + { + if (fgets(buf, sizeof(buf), fp)) + { + if (eina_str_has_prefix(buf, "4.3.14")) +{ + fclose(fp); + return 0; +} + } + fclose(fp); + } + } + snprintf(buf, sizeof(buf), "/dev/dri/card1"); if (stat(buf, &st) == 0) { --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_map: Add new elm_map_region_zoom_bring_in() API
Hello. Looking through ABI/API changes between and 1.11. On Wed, 2014-05-28 at 01:10, bluezery wrote: > raster pushed a commit to branch master. > > http://git.enlightenment.org/core/elementary.git/commit/?id=84c2351bc339eca22acb79c86acbee7a1322f8c0 > > commit 84c2351bc339eca22acb79c86acbee7a1322f8c0 > Author: bluezery > Date: Wed May 28 17:08:00 2014 +0900 > > elm_map: Add new elm_map_region_zoom_bring_in() API > > Summary: > By using this API, we can do region show & bring in concurrently. > This needs some tuning more because some main layouting logic in map > needs to be modified to support more smooth animation. > I will spare my time to do that later. > @feature > > Reviewers: Hermet, raster, stefan_schmidt > > Reviewed By: raster > > CC: Jaehyun > > Differential Revision: https://phab.enlightenment.org/D887 > --- > src/bin/test_map.c | 7 > src/lib/elm_map.c| 88 > +--- > src/lib/elm_map.eo | 20 +++ > src/lib/elm_widget_map.h | 7 ++-- > 4 files changed, 115 insertions(+), 7 deletions(-) [SNIP] > --- a/src/lib/elm_widget_map.h > +++ b/src/lib/elm_widget_map.h > @@ -432,8 +432,11 @@ struct _Elm_Map_Data > struct > { >double zoom; > - double diff; > - intcnt; > + double zoom_diff; > + double lon, lat; > + double lon_diff, lat_diff; > + intzoom_cnt; > + intregion_cnt; > } ani; Did you intend here to rename diff to zoom_diff and cnt to region_cnt? In any case it is bad to remove already exported symbols from this public struct. Even if you handle the change internally you never know what people in the outside are doing with it and if they get a new elm version and their code starts to crash because a symbol is no longer there thats really bad. I see two options out of this. a) Mark the old struct entries as deprecated in the header and report a deprecating warning on usage. or b) just keep the old names even if they are not good. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E causing problems with ArchLinux kernel 3.15.8-1-ARCH and possible vbox
pushed to git https://git.enlightenment.org/core/efl.git/commit/?id=a306c19871f8a44bda0008d760567aa6cae2bca2 (btw it is confirmed to fail on Fedora guest as well as ArchLinux) On Thu, Aug 7, 2014 at 10:44 AM, Gustavo Sverzut Barbieri wrote: > well, it's a bug in their part. I've isolated the problem to a simple > libdrm subcase of their vbltest.c, reported to: > https://www.virtualbox.org/ticket/13265 But I'm not sure how fast they > handle this. > > You don't need to detect virtualbox per se, only if vboxvideo is > loaded, then stat to /sys/module/vboxvideo is enough. > > One thing is that libdrm provides drmOpen() that takes a module name > (ie: nvidia, vboxvideo), while we open the /dev directly. So far it > seems to be okay, but I guess in future they may change this and add > some ioctl from inside such API to configure and in that case we'll > enter into problems. It would also be nice to know which device we're > using, suppose we have more than one video card, then we need to use > the current one, not the first one. > > > On Wed, Aug 6, 2014 at 7:53 PM, Carsten Haitzler wrote: >> On Wed, 6 Aug 2014 17:57:05 -0300 Gustavo Sverzut Barbieri >> >> said: >> >>> update, this is caused by efl/src/lib/ecore_x/xlib/ecore_x_vsync.c >>> "#define ECORE_X_VSYNC_DRM 1". If you remove that line (or #undef the >>> sym), it works, now to find out the actual call that triggers it to >>> produce a test case for them... >> >> aaah shit. the code is really simple - it really does one of 4 things. >> open /dev/dri/card0, call a drm lib call to schedule a new vsync event, and >> then select to listen on the drm fd with a timeout and then use drm call to >> "read" the fd for the event info. one of those would do it. given that, i >> would >> imagine it's the schedule of a new vsync interrupt one. >> >> is there a nice simple way to know you have a vbox virtual driver in the >> kernel >> and are a guest? i can put in something to veto it (eg something in /proc >> or /sys - some file that exists only inside vbox if the guest driver is >> there - >> i can put in a simple stat for it and avoid if there)? >> >>> On Wed, Aug 6, 2014 at 12:38 PM, Gustavo Sverzut Barbieri >>> wrote: >>> > sorry for the noise, this has nothing to do with Enlightenment or new >>> > vsync. I've disabled it and still happens, we're just triggering a bug >>> > in drm. >>> > >>> > if you suffer from this problem just remove virtualbox-guest-modules >>> > and you'll fallback to fbdev without problems (just setting X to use >>> > fbdev does not help, you need to remove vboxvideo.ko so it's never >>> > loaded). >>> > >>> > On Wed, Aug 6, 2014 at 11:42 AM, Gustavo Sverzut Barbieri >>> > wrote: >>> >> Hi all, >>> >> >>> >> Just a heads up that recent Enlightenment (GIT) is causing problems >>> >> with ArchLinux vanilla kernel (3.15.8-1-ARCH), at least running inside >>> >> VirtualBox 4.3.14. >>> >> >>> >> I'm trying to isolate the problem to report that to kernel guys since >>> >> a Kernel Oops is always a kernel bug, until then watch out if you want >>> >> to update and run similar setup. >>> >> >>> >> The relevant dmesg part is: >>> >> >>> >> [7.142526] BUG: unable to handle kernel NULL pointer dereference at >>> >> (null) [7.142532] IP: [< (null)>] (null) >>> >> [7.142534] *pde = >>> >> [7.142536] Oops: [#1] PREEMPT SMP >>> >> [7.142539] Modules linked in: ext4 crc16 mbcache jbd2 ppdev >>> >> snd_intel8x0 snd_ac97_codec intel_rapl microcode ac97_bus pcspkr >>> >> snd_pcm psmouse serio_raw snd_timer i2c_piix4 joydev mousedev snd >>> >> soundcore mac_hid e1000 parport_pc parport floppy(+) ac battery >>> >> intel_agp intel_gtt button evdev vboxvideo(O) drm agpgart i2c_core >>> >> vboxsf(O) vboxguest(O) hid_generic usbhid hid crc32c_generic btrfs xor >>> >> raid6_pq sd_mod crc_t10dif crct10dif_common atkbd libps2 ohci_pci >>> >> ohci_hcd ehci_pci ehci_hcd ahci libahci libata scsi_mod usbcore >>> >> usb_common i8042 serio >>> >> [7.142562] CPU: 0 PID: 254 Comm: enlightenment Tainted: G >>> >> O 3.15.8-1-ARCH #1 >>> >> [7.142564] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS >>> >> VirtualBox 12/01/2006 >>> >> [7.142566] task: f39fd2c0 ti: f3a58000 task.ti: f3a58000 >>> >> [7.142568] EIP: 0060:[<>] EFLAGS: 00210046 CPU: 0 >>> >> [7.142570] EIP is at 0x0 >>> >> [7.142572] EAX: f5228400 EBX: f5228400 ECX: f8b7d140 EDX: >>> >> [7.142573] ESI: f9fdb560 EDI: EBP: f3a59de4 ESP: f3a59d90 >>> >> [7.142574] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 >>> >> [7.142576] CR0: 80050033 CR2: CR3: 33a5c000 CR4: 06d0 >>> >> [7.142581] Stack: >>> >> [7.142583] f9fda8c2 f53a1d90 f5228400 f5228438 f5121cc0 >>> >> f539f9c0 f3a59db4 >>> >> [7.142586] f9fdd1e0 00200046 f52284e8 f52284ea 00200246 >>> >> f5b75024 >>> >> [7.142589] f539f9c0 c29a0d46 f5228400 f9fdb560 0401 f3a59e44 >>> >> f9fdb5d8 f5
Re: [E-devel] [EGIT] [core/elementary] master 02/02: atspi: add AtspiText and AtspiEditableText interface support.
Hello Stefan, W dniu 07.08.2014 16:13, Stefan Schmidt pisze: > Hello. > > Looking through newly added API for 1.11 right now. > > On Tue, 2014-06-10 at 00:18, Lukasz Stanislawski wrote: >> raster pushed a commit to branch master. >> >> http://git.enlightenment.org/core/elementary.git/commit/?id=0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 >> >> commit 0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 >> Author: Lukasz Stanislawski >> Date: Tue Jun 10 16:18:17 2014 +0900 >> >> atspi: add AtspiText and AtspiEditableText interface support. >> >> Summary: >> Added reference interface implementation for elm_entry widget. Tests >> added. >> Updated at-spi-constants.h header to version 2.12.0. >> >> Reviewers: raster, seoz >> >> CC: raster >> >> Differential Revision: https://phab.enlightenment.org/D806 >> --- > > [SNIP] > >> + >> +/** >> + * @brief Free Elm_Atspi_Text_Attribute structure >> + */ >> +void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); > > This one show up as a newly added symbol. It has no EAPI defined > though. Should this be an internal or public symbol? > > If public we whould use EAPI here plus a bit more doxygen description > and @since 1.11. If on the other hand this should be internal only we > need to have a look why it shows up externally. I would like to keep all atspi APIs internal for now (with two exceptions in elm_config), until atspi support will be finished. This, I assume, will happen after Elm_Object_Item migration to Eo. Until then no public atspi symbols other then in elm_config. Best regards, LS > > regards > Stefan Schmidt > > -- > Infragistics Professional > Build stunning WinForms apps today! > Reboot your WinForms applications with our WinForms controls. > Build a bridge from your legacy apps to the future. > http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore_x_vsync: hack to workaround bug in vboxvideo
Is it just 4.3.14? No other version? -- Tom. On 07/08/14 15:32, Gustavo Sverzut Barbieri wrote: > barbieri pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=a306c19871f8a44bda0008d760567aa6cae2bca2 > > commit a306c19871f8a44bda0008d760567aa6cae2bca2 > Author: Gustavo Sverzut Barbieri > Date: Thu Aug 7 11:29:52 2014 -0300 > > ecore_x_vsync: hack to workaround bug in vboxvideo > > there is a kernel oops when using vboxvideo 4.3.14 and one calls > drmWaitVBlank(), then do not init drm when using such driver. > > https://www.virtualbox.org/ticket/13265 > --- > src/lib/ecore_x/xlib/ecore_x_vsync.c | 19 +++ > 1 file changed, 19 insertions(+) > > diff --git a/src/lib/ecore_x/xlib/ecore_x_vsync.c > b/src/lib/ecore_x/xlib/ecore_x_vsync.c > index e8f2824..e3b1140 100644 > --- a/src/lib/ecore_x/xlib/ecore_x_vsync.c > +++ b/src/lib/ecore_x/xlib/ecore_x_vsync.c > @@ -323,6 +323,25 @@ _drm_init(void) > struct stat st; > char buf[512]; > > + // vboxvideo 4.3.14 is crashing when calls drmWaitVBlank() > + // https://www.virtualbox.org/ticket/13265 > + if (stat("/sys/module/vboxvideo", &st) == 0) > + { > +FILE *fp = fopen("/sys/module/vboxvideo/version", "r"); > +if (fp) > + { > + if (fgets(buf, sizeof(buf), fp)) > + { > + if (eina_str_has_prefix(buf, "4.3.14")) > +{ > + fclose(fp); > + return 0; > +} > + } > + fclose(fp); > + } > + } > + > snprintf(buf, sizeof(buf), "/dev/dri/card1"); > if (stat(buf, &st) == 0) >{ > -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/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: photocam should reset its preload when a new file is loaded
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=9e4b6b06cb0f2db65893120a0d90bfee585092c4 commit 9e4b6b06cb0f2db65893120a0d90bfee585092c4 Author: zmike Date: Thu Aug 7 10:35:52 2014 -0400 photocam should reset its preload when a new file is loaded this prevents infinite busy animations @fix --- src/lib/elm_photocam.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c index 57e8137..88b02f1 100644 --- a/src/lib/elm_photocam.c +++ b/src/lib/elm_photocam.c @@ -1572,6 +1572,7 @@ _elm_photocam_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file) free(sd->remote_data); if (sd->remote) _elm_url_cancel(sd->remote); sd->remote = NULL; + sd->preload_num = 0; for (i = 0; i < sizeof (remote_uri) / sizeof (remote_uri[0]); ++i) if (!strncmp(remote_uri[i], file, strlen(remote_uri[i]))) --
Re: [E-devel] EFL + Elementary ABI report v1.11.0
Hello. On Tue, 2014-07-29 at 11:06, Tom Hacohen wrote: > Hey, > > Here again, the new EFL + Elementary ABI reports. > > As usual: > https://devs.enlightenment.org/~tasn/abi/ > > There's some noise because of the Eo changes. Hopefully by next version > we'll be able to remove the beta api from the report. > > It already helped me find an issue that was fixed (GL headers). Please > review and raise issues if you see any. I took the time today to go through the reports for efl and elm as well. Found four issues I traced back their original commits and brought them up here on the ml with my concerns. Lets get this settled before the final 1.11 release. Together with the issue you found this makes 5 issues in total that we might have missed. Good to hjave it around. Cold you do one last run maybe mid next week? That way we can confirm that fixes that got in by that time and check all other changes that happened since this first run. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 02/02: atspi: add AtspiText and AtspiEditableText interface support.
Hello. On Thu, 2014-08-07 at 16:35, Lukasz Stanislawski wrote: > Hello Stefan, > > W dniu 07.08.2014 16:13, Stefan Schmidt pisze: > > Hello. > > > > Looking through newly added API for 1.11 right now. > > > > On Tue, 2014-06-10 at 00:18, Lukasz Stanislawski wrote: > >> raster pushed a commit to branch master. > >> > >> http://git.enlightenment.org/core/elementary.git/commit/?id=0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > >> > >> commit 0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > >> Author: Lukasz Stanislawski > >> Date: Tue Jun 10 16:18:17 2014 +0900 > >> > >> atspi: add AtspiText and AtspiEditableText interface support. > >> > >> Summary: > >> Added reference interface implementation for elm_entry widget. Tests > >> added. > >> Updated at-spi-constants.h header to version 2.12.0. > >> > >> Reviewers: raster, seoz > >> > >> CC: raster > >> > >> Differential Revision: https://phab.enlightenment.org/D806 > >> --- > > > > [SNIP] > > > >> + > >> +/** > >> + * @brief Free Elm_Atspi_Text_Attribute structure > >> + */ > >> +void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); > > > > This one show up as a newly added symbol. It has no EAPI defined > > though. Should this be an internal or public symbol? > > > > If public we whould use EAPI here plus a bit more doxygen description > > and @since 1.11. If on the other hand this should be internal only we > > need to have a look why it shows up externally. > > I would like to keep all atspi APIs internal for now (with two > exceptions in elm_config), until atspi support will be finished. This, I > assume, will happen after Elm_Object_Item migration to Eo. > > Until then no public atspi symbols other then in elm_config. Thanks, that clarifies it. We will have a look why it showed up in the ABI/API checker tool. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 02/02: atspi: add AtspiText and AtspiEditableText interface support.
Hello. On Thu, 2014-08-07 at 15:25, Tom Hacohen wrote: > On 07/08/14 15:13, Stefan Schmidt wrote: > > Hello. > > > > Looking through newly added API for 1.11 right now. > > > > On Tue, 2014-06-10 at 00:18, Lukasz Stanislawski wrote: > >> raster pushed a commit to branch master. > >> > >> http://git.enlightenment.org/core/elementary.git/commit/?id=0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > >> > >> commit 0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > >> Author: Lukasz Stanislawski > >> Date: Tue Jun 10 16:18:17 2014 +0900 > >> > >> atspi: add AtspiText and AtspiEditableText interface support. > >> > >> Summary: > >> Added reference interface implementation for elm_entry widget. Tests > >> added. > >> Updated at-spi-constants.h header to version 2.12.0. > >> > >> Reviewers: raster, seoz > >> > >> CC: raster > >> > >> Differential Revision: https://phab.enlightenment.org/D806 > >> --- > > > > [SNIP] > > > >> + > >> +/** > >> + * @brief Free Elm_Atspi_Text_Attribute structure > >> + */ > >> +void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); > > > > This one show up as a newly added symbol. It has no EAPI defined > > though. Should this be an internal or public symbol? > > > > If public we whould use EAPI here plus a bit more doxygen description > > and @since 1.11. If on the other hand this should be internal only we > > need to have a look why it shows up externally. > > I have -fvisibility=hidden in my cflags, so it doesn't look like > something is wrong with my .so generation. Maybe it was just detected by > the tool's header scanner? Hmm, good question. I was thinking the tools verify the symbol from the .so as well. It does not do this for other internal symbols, right? Something to look into. Maybe tomorrow. regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: edje_edit: fixing return value of edje_edit_program_name_set
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fd3f5f4615b84ae6f8427160017a2019bb4f7ba5 commit fd3f5f4615b84ae6f8427160017a2019bb4f7ba5 Author: Andrii Kroitor Date: Thu Aug 7 23:48:22 2014 +0900 edje_edit: fixing return value of edje_edit_program_name_set Summary: If name of program is setted to its current value EINA_TRUE should be returned Reviewers: cedric, seoz, raster, Hermet Reviewed By: Hermet Subscribers: cedric, reutskiy.v.v Differential Revision: https://phab.enlightenment.org/D1290 --- src/lib/edje/edje_edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 629df59..d471994 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -8109,6 +8109,8 @@ edje_edit_program_name_set(Evas_Object *obj, const char *prog, const char* new_n if (!new_name) return EINA_FALSE; + if (!strcmp(prog, new_name)) return EINA_TRUE; + if (_edje_program_get_byname(obj, new_name)) return EINA_FALSE; //printf("SET NAME for program: %s [new name: %s]\n", prog, new_name); --
[EGIT] [core/elementary] master 01/01: gengrid: Fix since version for new elm_gengrid_reorder_type_set()
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1884aa52cd829e66d443c13a7d3291061d718b2e commit 1884aa52cd829e66d443c13a7d3291061d718b2e Author: Stefan Schmidt Date: Thu Aug 7 16:01:40 2014 +0200 gengrid: Fix since version for new elm_gengrid_reorder_type_set() Looks like it was developed in the 1.10 timeframe but only made it into the repo after the 1.10 release. Will be part of 1.11 so adjust it. --- src/lib/elm_gengrid_legacy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_gengrid_legacy.h b/src/lib/elm_gengrid_legacy.h index 6c2602d..e7e4688 100644 --- a/src/lib/elm_gengrid_legacy.h +++ b/src/lib/elm_gengrid_legacy.h @@ -250,7 +250,7 @@ EAPI void elm_gengrid_reorder_mode_stop(Evas_Object *obj) * @param type Elm_Gengrid_Reorder_Type value * * @see Elm_Gengrid_Reorder_Type - * @since 1.10 + * @since 1.11 * * @ingroup Gengrid */ --
Re: [E-devel] EFL + Elementary ABI report v1.11.0
On 07/08/14 15:40, Stefan Schmidt wrote: > Hello. > > On Tue, 2014-07-29 at 11:06, Tom Hacohen wrote: >> Hey, >> >> Here again, the new EFL + Elementary ABI reports. >> >> As usual: >> https://devs.enlightenment.org/~tasn/abi/ >> >> There's some noise because of the Eo changes. Hopefully by next version >> we'll be able to remove the beta api from the report. >> >> It already helped me find an issue that was fixed (GL headers). Please >> review and raise issues if you see any. > > I took the time today to go through the reports for efl and elm as > well. > > Found four issues I traced back their original commits and brought > them up here on the ml with my concerns. Lets get this settled before > the final 1.11 release. > > Together with the issue you found this makes 5 issues in total that we > might have missed. Good to hjave it around. > > Cold you do one last run maybe mid next week? That way we can confirm > that fixes that got in by that time and check all other changes that > happened since this first run. I'm away (no laptop) next week starting from Tuesday evening. Please remind me Monday/Tuesday morning and I'll happily do it. I'm glad to see it's working well for us. Thanks a lot for reviewing the report as well as you have. -- Tom. -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 02/02: atspi: add AtspiText and AtspiEditableText interface support.
Hello. On Thu, 2014-08-07 at 16:44, Stefan Schmidt wrote: > Hello. > > On Thu, 2014-08-07 at 15:25, Tom Hacohen wrote: > > On 07/08/14 15:13, Stefan Schmidt wrote: > > > Hello. > > > > > > Looking through newly added API for 1.11 right now. > > > > > > On Tue, 2014-06-10 at 00:18, Lukasz Stanislawski wrote: > > >> raster pushed a commit to branch master. > > >> > > >> http://git.enlightenment.org/core/elementary.git/commit/?id=0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > > >> > > >> commit 0c5c00ee68bb0c4cf7f4ecea7912ff14025129c8 > > >> Author: Lukasz Stanislawski > > >> Date: Tue Jun 10 16:18:17 2014 +0900 > > >> > > >> atspi: add AtspiText and AtspiEditableText interface support. > > >> > > >> Summary: > > >> Added reference interface implementation for elm_entry widget. > > >> Tests added. > > >> Updated at-spi-constants.h header to version 2.12.0. > > >> > > >> Reviewers: raster, seoz > > >> > > >> CC: raster > > >> > > >> Differential Revision: https://phab.enlightenment.org/D806 > > >> --- > > > > > > [SNIP] > > > > > >> + > > >> +/** > > >> + * @brief Free Elm_Atspi_Text_Attribute structure > > >> + */ > > >> +void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); > > > > > > This one show up as a newly added symbol. It has no EAPI defined > > > though. Should this be an internal or public symbol? > > > > > > If public we whould use EAPI here plus a bit more doxygen description > > > and @since 1.11. If on the other hand this should be internal only we > > > need to have a look why it shows up externally. > > > > I have -fvisibility=hidden in my cflags, so it doesn't look like > > something is wrong with my .so generation. Maybe it was just detected by > > the tool's header scanner? > > Hmm, good question. I was thinking the tools verify the symbol from > the .so as well. > > It does not do this for other internal symbols, right? Something to > look into. Maybe tomorrow. Easy enough. EAPI was defined in the .c file during the function implementation. :) And while the normal build works it fails during tes suite linking as one of the atspi tests is using it. That also explains we someone put it it. :) regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E causing problems with ArchLinux kernel 3.15.8-1-ARCH and possible vbox
On Thu, 7 Aug 2014 10:44:36 -0300 Gustavo Sverzut Barbieri said: > well, it's a bug in their part. I've isolated the problem to a simple > libdrm subcase of their vbltest.c, reported to: > https://www.virtualbox.org/ticket/13265 But I'm not sure how fast they > handle this. > > You don't need to detect virtualbox per se, only if vboxvideo is > loaded, then stat to /sys/module/vboxvideo is enough. > > One thing is that libdrm provides drmOpen() that takes a module name > (ie: nvidia, vboxvideo), while we open the /dev directly. So far it > seems to be okay, but I guess in future they may change this and add > some ioctl from inside such API to configure and in that case we'll > enter into problems. It would also be nice to know which device we're > using, suppose we have more than one video card, then we need to use > the current one, not the first one. i was using the code we had that liked to dri2 - for whatever reason dri2 is no longer usable so i skipped it and went right to the device i already knew. :) that's why i veto it if you have > 1 card. :) yeah might want to use drmopen later. right now it works though. and thanks for that - you have all the details with you. you might not want to veto just by version but veto entirely if vboxvideo is there... until we have a known version with a fix. :) (unless you know the bug only started at some specific version ie - the one you check for, and this is the last version the bug will be in?) > > On Wed, Aug 6, 2014 at 7:53 PM, Carsten Haitzler wrote: > > On Wed, 6 Aug 2014 17:57:05 -0300 Gustavo Sverzut Barbieri > > said: > > > >> update, this is caused by efl/src/lib/ecore_x/xlib/ecore_x_vsync.c > >> "#define ECORE_X_VSYNC_DRM 1". If you remove that line (or #undef the > >> sym), it works, now to find out the actual call that triggers it to > >> produce a test case for them... > > > > aaah shit. the code is really simple - it really does one of 4 things. > > open /dev/dri/card0, call a drm lib call to schedule a new vsync event, and > > then select to listen on the drm fd with a timeout and then use drm call to > > "read" the fd for the event info. one of those would do it. given that, i > > would imagine it's the schedule of a new vsync interrupt one. > > > > is there a nice simple way to know you have a vbox virtual driver in the > > kernel and are a guest? i can put in something to veto it (eg something > > in /proc or /sys - some file that exists only inside vbox if the guest > > driver is there - i can put in a simple stat for it and avoid if there)? > > > >> On Wed, Aug 6, 2014 at 12:38 PM, Gustavo Sverzut Barbieri > >> wrote: > >> > sorry for the noise, this has nothing to do with Enlightenment or new > >> > vsync. I've disabled it and still happens, we're just triggering a bug > >> > in drm. > >> > > >> > if you suffer from this problem just remove virtualbox-guest-modules > >> > and you'll fallback to fbdev without problems (just setting X to use > >> > fbdev does not help, you need to remove vboxvideo.ko so it's never > >> > loaded). > >> > > >> > On Wed, Aug 6, 2014 at 11:42 AM, Gustavo Sverzut Barbieri > >> > wrote: > >> >> Hi all, > >> >> > >> >> Just a heads up that recent Enlightenment (GIT) is causing problems > >> >> with ArchLinux vanilla kernel (3.15.8-1-ARCH), at least running inside > >> >> VirtualBox 4.3.14. > >> >> > >> >> I'm trying to isolate the problem to report that to kernel guys since > >> >> a Kernel Oops is always a kernel bug, until then watch out if you want > >> >> to update and run similar setup. > >> >> > >> >> The relevant dmesg part is: > >> >> > >> >> [7.142526] BUG: unable to handle kernel NULL pointer dereference at > >> >> (null) [7.142532] IP: [< (null)>] (null) > >> >> [7.142534] *pde = > >> >> [7.142536] Oops: [#1] PREEMPT SMP > >> >> [7.142539] Modules linked in: ext4 crc16 mbcache jbd2 ppdev > >> >> snd_intel8x0 snd_ac97_codec intel_rapl microcode ac97_bus pcspkr > >> >> snd_pcm psmouse serio_raw snd_timer i2c_piix4 joydev mousedev snd > >> >> soundcore mac_hid e1000 parport_pc parport floppy(+) ac battery > >> >> intel_agp intel_gtt button evdev vboxvideo(O) drm agpgart i2c_core > >> >> vboxsf(O) vboxguest(O) hid_generic usbhid hid crc32c_generic btrfs xor > >> >> raid6_pq sd_mod crc_t10dif crct10dif_common atkbd libps2 ohci_pci > >> >> ohci_hcd ehci_pci ehci_hcd ahci libahci libata scsi_mod usbcore > >> >> usb_common i8042 serio > >> >> [7.142562] CPU: 0 PID: 254 Comm: enlightenment Tainted: G > >> >> O 3.15.8-1-ARCH #1 > >> >> [7.142564] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS > >> >> VirtualBox 12/01/2006 > >> >> [7.142566] task: f39fd2c0 ti: f3a58000 task.ti: f3a58000 > >> >> [7.142568] EIP: 0060:[<>] EFLAGS: 00210046 CPU: 0 > >> >> [7.142570] EIP is at 0x0 > >> >> [7.142572] EAX: f5228400 EBX: f5228400 ECX: f8b7d140 EDX: > >> >> [7.142573] ESI: f9fdb560 EDI: EBP: f3a59de4 ESP: f3a59d90
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_map: Add new elm_map_region_zoom_bring_in() API
On Thu, 7 Aug 2014 16:33:54 +0200 Stefan Schmidt said: > Hello. > > Looking through ABI/API changes between and 1.11. > > On Wed, 2014-05-28 at 01:10, bluezery wrote: > > raster pushed a commit to branch master. > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > > commit 84c2351bc339eca22acb79c86acbee7a1322f8c0 > > Author: bluezery > > Date: Wed May 28 17:08:00 2014 +0900 > > > > elm_map: Add new elm_map_region_zoom_bring_in() API > > > > Summary: > > By using this API, we can do region show & bring in concurrently. > > This needs some tuning more because some main layouting logic in map > > needs to be modified to support more smooth animation. > > I will spare my time to do that later. > > @feature > > > > Reviewers: Hermet, raster, stefan_schmidt > > > > Reviewed By: raster > > > > CC: Jaehyun > > > > Differential Revision: https://phab.enlightenment.org/D887 > > --- > > src/bin/test_map.c | 7 > > src/lib/elm_map.c| 88 > > +--- src/lib/elm_map.eo | 20 +++ > > src/lib/elm_widget_map.h | 7 ++-- > > 4 files changed, 115 insertions(+), 7 deletions(-) > > [SNIP] > > > --- a/src/lib/elm_widget_map.h > > +++ b/src/lib/elm_widget_map.h > > @@ -432,8 +432,11 @@ struct _Elm_Map_Data > > struct > > { > >double zoom; > > - double diff; > > - intcnt; > > + double zoom_diff; > > + double lon, lat; > > + double lon_diff, lat_diff; > > + intzoom_cnt; > > + intregion_cnt; > > } ani; > > Did you intend here to rename diff to zoom_diff and cnt to region_cnt? > > In any case it is bad to remove already exported symbols from this > public struct. Even if you handle the change internally you never know > what people in the outside are doing with it and if they get a new elm > version and their code starts to crash because a symbol is no longer > there thats really bad. > > I see two options out of this. > > a) Mark the old struct entries as deprecated in the header and report > a deprecating warning on usage. > > or > > b) just keep the old names even if they are not good. elm widget api's... from elm_widget.h: /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK * IT AT RUNTIME. :) mall widget api's - the structs for their internals, elm_widget etc. are not api/bi stable and are commented explicitly as such like above. :) > regards > Stefan Schmidt > > > -- > Infragistics Professional > Build stunning WinForms apps today! > Reboot your WinForms applications with our WinForms controls. > Build a bridge from your legacy apps to the future. > http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/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 -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E causing problems with ArchLinux kernel 3.15.8-1-ARCH and possible vbox
i did already, in git since few minutes ago. working for me On Thu, Aug 7, 2014 at 12:03 PM, Carsten Haitzler wrote: > On Thu, 7 Aug 2014 10:44:36 -0300 Gustavo Sverzut Barbieri > > said: > >> well, it's a bug in their part. I've isolated the problem to a simple >> libdrm subcase of their vbltest.c, reported to: >> https://www.virtualbox.org/ticket/13265 But I'm not sure how fast they >> handle this. >> >> You don't need to detect virtualbox per se, only if vboxvideo is >> loaded, then stat to /sys/module/vboxvideo is enough. >> >> One thing is that libdrm provides drmOpen() that takes a module name >> (ie: nvidia, vboxvideo), while we open the /dev directly. So far it >> seems to be okay, but I guess in future they may change this and add >> some ioctl from inside such API to configure and in that case we'll >> enter into problems. It would also be nice to know which device we're >> using, suppose we have more than one video card, then we need to use >> the current one, not the first one. > > i was using the code we had that liked to dri2 - for whatever reason dri2 is > no > longer usable so i skipped it and went right to the device i already knew. :) > that's why i veto it if you have > 1 card. :) yeah might want to use drmopen > later. right now it works though. > > and thanks for that - you have all the details with you. you might not want to > veto just by version but veto entirely if vboxvideo is there... until we have > a > known version with a fix. :) (unless you know the bug only started at some > specific version ie - the one you check for, and this is the last version the > bug will be in?) > >> >> On Wed, Aug 6, 2014 at 7:53 PM, Carsten Haitzler >> wrote: >> > On Wed, 6 Aug 2014 17:57:05 -0300 Gustavo Sverzut Barbieri >> > said: >> > >> >> update, this is caused by efl/src/lib/ecore_x/xlib/ecore_x_vsync.c >> >> "#define ECORE_X_VSYNC_DRM 1". If you remove that line (or #undef the >> >> sym), it works, now to find out the actual call that triggers it to >> >> produce a test case for them... >> > >> > aaah shit. the code is really simple - it really does one of 4 things. >> > open /dev/dri/card0, call a drm lib call to schedule a new vsync event, and >> > then select to listen on the drm fd with a timeout and then use drm call to >> > "read" the fd for the event info. one of those would do it. given that, i >> > would imagine it's the schedule of a new vsync interrupt one. >> > >> > is there a nice simple way to know you have a vbox virtual driver in the >> > kernel and are a guest? i can put in something to veto it (eg something >> > in /proc or /sys - some file that exists only inside vbox if the guest >> > driver is there - i can put in a simple stat for it and avoid if there)? >> > >> >> On Wed, Aug 6, 2014 at 12:38 PM, Gustavo Sverzut Barbieri >> >> wrote: >> >> > sorry for the noise, this has nothing to do with Enlightenment or new >> >> > vsync. I've disabled it and still happens, we're just triggering a bug >> >> > in drm. >> >> > >> >> > if you suffer from this problem just remove virtualbox-guest-modules >> >> > and you'll fallback to fbdev without problems (just setting X to use >> >> > fbdev does not help, you need to remove vboxvideo.ko so it's never >> >> > loaded). >> >> > >> >> > On Wed, Aug 6, 2014 at 11:42 AM, Gustavo Sverzut Barbieri >> >> > wrote: >> >> >> Hi all, >> >> >> >> >> >> Just a heads up that recent Enlightenment (GIT) is causing problems >> >> >> with ArchLinux vanilla kernel (3.15.8-1-ARCH), at least running inside >> >> >> VirtualBox 4.3.14. >> >> >> >> >> >> I'm trying to isolate the problem to report that to kernel guys since >> >> >> a Kernel Oops is always a kernel bug, until then watch out if you want >> >> >> to update and run similar setup. >> >> >> >> >> >> The relevant dmesg part is: >> >> >> >> >> >> [7.142526] BUG: unable to handle kernel NULL pointer dereference at >> >> >> (null) [7.142532] IP: [< (null)>] (null) >> >> >> [7.142534] *pde = >> >> >> [7.142536] Oops: [#1] PREEMPT SMP >> >> >> [7.142539] Modules linked in: ext4 crc16 mbcache jbd2 ppdev >> >> >> snd_intel8x0 snd_ac97_codec intel_rapl microcode ac97_bus pcspkr >> >> >> snd_pcm psmouse serio_raw snd_timer i2c_piix4 joydev mousedev snd >> >> >> soundcore mac_hid e1000 parport_pc parport floppy(+) ac battery >> >> >> intel_agp intel_gtt button evdev vboxvideo(O) drm agpgart i2c_core >> >> >> vboxsf(O) vboxguest(O) hid_generic usbhid hid crc32c_generic btrfs xor >> >> >> raid6_pq sd_mod crc_t10dif crct10dif_common atkbd libps2 ohci_pci >> >> >> ohci_hcd ehci_pci ehci_hcd ahci libahci libata scsi_mod usbcore >> >> >> usb_common i8042 serio >> >> >> [7.142562] CPU: 0 PID: 254 Comm: enlightenment Tainted: G >> >> >> O 3.15.8-1-ARCH #1 >> >> >> [7.142564] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS >> >> >> VirtualBox 12/01/2006 >> >> >> [7.142566] task: f39fd2c0 ti: f3a58000 task.ti: f3a58000 >> >> >> [7.142568] EIP: 0
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_map: Add new elm_map_region_zoom_bring_in() API
Hello. On Thu, 2014-08-07 at 23:58, Carsten Haitzler wrote: > On Thu, 7 Aug 2014 16:33:54 +0200 Stefan Schmidt > said: > > > Hello. > > > > Looking through ABI/API changes between and 1.11. > > > > On Wed, 2014-05-28 at 01:10, bluezery wrote: > > > raster pushed a commit to branch master. > > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > > > > commit 84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > Author: bluezery > > > Date: Wed May 28 17:08:00 2014 +0900 > > > > > > elm_map: Add new elm_map_region_zoom_bring_in() API > > > > > > Summary: > > > By using this API, we can do region show & bring in concurrently. > > > This needs some tuning more because some main layouting logic in map > > > needs to be modified to support more smooth animation. > > > I will spare my time to do that later. > > > @feature > > > > > > Reviewers: Hermet, raster, stefan_schmidt > > > > > > Reviewed By: raster > > > > > > CC: Jaehyun > > > > > > Differential Revision: https://phab.enlightenment.org/D887 > > > --- > > > src/bin/test_map.c | 7 > > > src/lib/elm_map.c| 88 > > > > > > +--- src/lib/elm_map.eo | 20 +++ > > > src/lib/elm_widget_map.h | 7 ++-- > > > 4 files changed, 115 insertions(+), 7 deletions(-) > > > > [SNIP] > > > > > --- a/src/lib/elm_widget_map.h > > > +++ b/src/lib/elm_widget_map.h > > > @@ -432,8 +432,11 @@ struct _Elm_Map_Data > > > struct > > > { > > >double zoom; > > > - double diff; > > > - intcnt; > > > + double zoom_diff; > > > + double lon, lat; > > > + double lon_diff, lat_diff; > > > + intzoom_cnt; > > > + intregion_cnt; > > > } ani; > > > > Did you intend here to rename diff to zoom_diff and cnt to region_cnt? > > > > In any case it is bad to remove already exported symbols from this > > public struct. Even if you handle the change internally you never know > > what people in the outside are doing with it and if they get a new elm > > version and their code starts to crash because a symbol is no longer > > there thats really bad. > > > > I see two options out of this. > > > > a) Mark the old struct entries as deprecated in the header and report > > a deprecating warning on usage. > > > > or > > > > b) just keep the old names even if they are not good. > > elm widget api's... from elm_widget.h: But this is from elm_widget_map.h > > /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR > * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT > * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK > * IT AT RUNTIME. > > :) mall widget api's - the structs for their internals, elm_widget etc. are > not > api/bi stable and are commented explicitly as such like above. :) The header file above does not have this warning and happily sits in my /us/local/include/elementary/ to be used by everyone. So none of this is part of our stable API? regards Stefan Schmidt -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [editors/jedit-configs] master 01/01: eo: fix number highlighting
q66 pushed a commit to branch master. http://git.enlightenment.org/editors/jedit-configs.git/commit/?id=a1affcf47ed0fe35e3074f38704babe8a2d9f7a4 commit a1affcf47ed0fe35e3074f38704babe8a2d9f7a4 Author: Daniel Kolesa Date: Thu Aug 7 16:38:12 2014 +0100 eo: fix number highlighting --- eo/eo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eo/eo.xml b/eo/eo.xml index 49add2d..3a5ec0a 100644 --- a/eo/eo.xml +++ b/eo/eo.xml @@ -18,8 +18,8 @@ - --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_map: Add new elm_map_region_zoom_bring_in() API
Hi. Very good catch! On Fri, Aug 8, 2014 at 12:29 AM, Stefan Schmidt wrote: > Hello. > > On Thu, 2014-08-07 at 23:58, Carsten Haitzler wrote: > > On Thu, 7 Aug 2014 16:33:54 +0200 Stefan Schmidt < > ste...@datenfreihafen.org> > > said: > > > > > Hello. > > > > > > Looking through ABI/API changes between and 1.11. > > > > > > On Wed, 2014-05-28 at 01:10, bluezery wrote: > > > > raster pushed a commit to branch master. > > > > > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > > > > > > commit 84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > > Author: bluezery > > > > Date: Wed May 28 17:08:00 2014 +0900 > > > > > > > > elm_map: Add new elm_map_region_zoom_bring_in() API > > > > > > > > Summary: > > > > By using this API, we can do region show & bring in > concurrently. > > > > This needs some tuning more because some main layouting logic in > map > > > > needs to be modified to support more smooth animation. > > > > I will spare my time to do that later. > > > > @feature > > > > > > > > Reviewers: Hermet, raster, stefan_schmidt > > > > > > > > Reviewed By: raster > > > > > > > > CC: Jaehyun > > > > > > > > Differential Revision: https://phab.enlightenment.org/D887 > > > > --- > > > > src/bin/test_map.c | 7 > > > > src/lib/elm_map.c| 88 > > > > > +--- src/lib/elm_map.eo | 20 +++ > > > > src/lib/elm_widget_map.h | 7 ++-- > > > > 4 files changed, 115 insertions(+), 7 deletions(-) > > > > > > [SNIP] > > > > > > > --- a/src/lib/elm_widget_map.h > > > > +++ b/src/lib/elm_widget_map.h > > > > @@ -432,8 +432,11 @@ struct _Elm_Map_Data > > > > struct > > > > { > > > >double zoom; > > > > - double diff; > > > > - intcnt; > > > > + double zoom_diff; > > > > + double lon, lat; > > > > + double lon_diff, lat_diff; > > > > + intzoom_cnt; > > > > + intregion_cnt; > > > > } ani; > > > > > > Did you intend here to rename diff to zoom_diff and cnt to region_cnt? > > > > > > In any case it is bad to remove already exported symbols from this > > > public struct. Even if you handle the change internally you never know > > > what people in the outside are doing with it and if they get a new elm > > > version and their code starts to crash because a symbol is no longer > > > there thats really bad. > > > > > > I see two options out of this. > > > > > > a) Mark the old struct entries as deprecated in the header and report > > > a deprecating warning on usage. > > > > > > or > > > > > > b) just keep the old names even if they are not good. > > > > elm widget api's... from elm_widget.h: > > Well But this is from elm_widget_map.h > > Yes elm_widget_xxx.h are in the same category with elm_widget.h. So internal. > > > > /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR > > * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT > > * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK > > * IT AT RUNTIME. > > > > :) mall widget api's - the structs for their internals, elm_widget etc. > are not > > api/bi stable and are commented explicitly as such like above. :) > > The header file above does not have this warning and happily sits in > my /us/local/include/elementary/ to be used by everyone. > > I will put the warning messages to all of the elm_widget_xxx.h header files as they're internal headers but still needs to be installed if someone wants to customize widgets unofficially. > So none of this is part of our stable API? > > Yes. Thanks for the good catch. Daniel Juyung Seo (SeoZ) > regards > Stefan Schmidt > > > -- > Infragistics Professional > Build stunning WinForms apps today! > Reboot your WinForms applications with our WinForms controls. > Build a bridge from your legacy apps to the future. > > http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [editors/jedit-configs] master 01/01: eo: highlight return the same as legacy
q66 pushed a commit to branch master. http://git.enlightenment.org/editors/jedit-configs.git/commit/?id=334e8d033863e100562e6e214d1ff334495677f6 commit 334e8d033863e100562e6e214d1ff334495677f6 Author: Daniel Kolesa Date: Thu Aug 7 17:16:07 2014 +0100 eo: highlight return the same as legacy --- eo/eo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/eo.xml b/eo/eo.xml index 3a5ec0a..f896817 100644 --- a/eo/eo.xml +++ b/eo/eo.xml @@ -92,7 +92,6 @@ mixin params properties -return set type values @@ -103,6 +102,7 @@ eo_prefix legacy legacy_prefix +return const own --
[EGIT] [core/elementary] master 01/01: widget: added warnings to internal headers.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=40034a82ee5be6d4ec362d6642b2fedcf9a9cca2 commit 40034a82ee5be6d4ec362d6642b2fedcf9a9cca2 Author: Daniel Juyung Seo Date: Fri Aug 8 01:26:47 2014 +0900 widget: added warnings to internal headers. These headers are installed in the system but not officially supported as they are considered as internal headers. The reason why they still need to be installed is that - they were exposed even in the previous releases. - they are needed for widget customization (unofficially) - or it will break ewe. Special thanks to Stefan for the reporting. --- src/lib/elm_widget_actionslider.h| 6 ++ src/lib/elm_widget_bg.h | 6 ++ src/lib/elm_widget_box.h | 6 ++ src/lib/elm_widget_bubble.h | 6 ++ src/lib/elm_widget_button.h | 6 ++ src/lib/elm_widget_calendar.h| 6 ++ src/lib/elm_widget_check.h | 6 ++ src/lib/elm_widget_clock.h | 6 ++ src/lib/elm_widget_colorselector.h | 6 ++ src/lib/elm_widget_conform.h | 6 ++ src/lib/elm_widget_container.h | 6 ++ src/lib/elm_widget_ctxpopup.h| 6 ++ src/lib/elm_widget_datetime.h| 6 ++ src/lib/elm_widget_dayselector.h | 6 ++ src/lib/elm_widget_diskselector.h| 6 ++ src/lib/elm_widget_entry.h | 6 ++ src/lib/elm_widget_fileselector.h| 6 ++ src/lib/elm_widget_fileselector_button.h | 6 ++ src/lib/elm_widget_fileselector_entry.h | 6 ++ src/lib/elm_widget_flip.h| 6 ++ src/lib/elm_widget_flipselector.h| 6 ++ src/lib/elm_widget_frame.h | 6 ++ src/lib/elm_widget_gengrid.h | 6 ++ src/lib/elm_widget_genlist.h | 6 ++ src/lib/elm_widget_glview.h | 6 ++ src/lib/elm_widget_grid.h| 6 ++ src/lib/elm_widget_hover.h | 6 ++ src/lib/elm_widget_hoversel.h| 6 ++ src/lib/elm_widget_icon.h| 6 ++ src/lib/elm_widget_image.h | 6 ++ src/lib/elm_widget_index.h | 6 ++ src/lib/elm_widget_inwin.h | 6 ++ src/lib/elm_widget_label.h | 6 ++ src/lib/elm_widget_layout.h | 6 ++ src/lib/elm_widget_list.h| 6 ++ src/lib/elm_widget_map.h | 6 ++ src/lib/elm_widget_mapbuf.h | 6 ++ src/lib/elm_widget_menu.h| 6 ++ src/lib/elm_widget_multibuttonentry.h| 6 ++ src/lib/elm_widget_naviframe.h | 6 ++ src/lib/elm_widget_notify.h | 6 ++ src/lib/elm_widget_panel.h | 6 ++ src/lib/elm_widget_panes.h | 6 ++ src/lib/elm_widget_photo.h | 6 ++ src/lib/elm_widget_photocam.h| 6 ++ src/lib/elm_widget_player.h | 6 ++ src/lib/elm_widget_plug.h| 6 ++ src/lib/elm_widget_popup.h | 6 ++ src/lib/elm_widget_prefs.h | 6 ++ src/lib/elm_widget_progressbar.h | 6 ++ src/lib/elm_widget_radio.h | 6 ++ src/lib/elm_widget_route.h | 6 ++ src/lib/elm_widget_scroller.h| 6 ++ src/lib/elm_widget_segment_control.h | 6 ++ src/lib/elm_widget_separator.h | 6 ++ src/lib/elm_widget_slider.h | 6 ++ src/lib/elm_widget_slideshow.h | 6 ++ src/lib/elm_widget_spinner.h | 6 ++ src/lib/elm_widget_table.h | 6 ++ src/lib/elm_widget_thumb.h | 6 ++ src/lib/elm_widget_toolbar.h | 6 ++ src/lib/elm_widget_video.h | 6 ++ src/lib/elm_widget_web.h | 6 ++ 63 files changed, 378 insertions(+) diff --git a/src/lib/elm_widget_actionslider.h b/src/lib/elm_widget_actionslider.h index d68f082..6025c7b 100644 --- a/src/lib/elm_widget_actionslider.h +++ b/src/lib/elm_widget_actionslider.h @@ -3,6 +3,12 @@ #include "Elementary.h" +/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR + * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT + * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK + * IT AT RUNTIME. + */ + /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_bg.h b/src/lib/elm_widget_bg.h index 65ded66..e8541f7 100644 --- a/src/lib/elm_widget_bg.h +++ b/src/lib/elm_widget_bg.h @@ -3,6 +3,12 @@ #include "Elementary.h" +/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR + * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT + * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSIO
[EGIT] [core/efl] master 01/01: autotools: install .pc files to the correct directory on FreeBSD
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=236cdce358bee45bd5b0808b7efc9d9017bec3ba commit 236cdce358bee45bd5b0808b7efc9d9017bec3ba Author: Daniel Kolesa Date: Thu Aug 7 22:41:22 2014 +0100 autotools: install .pc files to the correct directory on FreeBSD --- Makefile.am | 5 + configure.ac | 5 + 2 files changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index ecdbfd5..41a6bf3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,7 +108,12 @@ pkgbuild/efl.install \ po/xgettext_wrapper.sh \ po/Makevars.in +if HAVE_FREEBSD +pkgconfigdir = $(libdir)data/pkgconfig +else pkgconfigdir = $(libdir)/pkgconfig +endif + pkgconfig_DATA = if HAVE_WINDOWS diff --git a/configure.ac b/configure.ac index f1a2e33..51ffe92 100644 --- a/configure.ac +++ b/configure.ac @@ -187,6 +187,7 @@ AC_SUBST(EFL_VERSION_MINOR) have_systemd_pkg="no" have_win32="no" have_windows="no" +have_freebsd="no" have_darwin="no" have_linux="no" have_ps3="no" @@ -197,6 +198,9 @@ case "$host_os" in have_windows="yes" EFL_CFLAGS="${EFL_CFLAGS} -D__USE_MINGW_ANSI_STDIO" ;; + freebsd*) + have_freebsd="yes" + ;; darwin*) have_darwin="yes" ;; @@ -221,6 +225,7 @@ AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"]) +AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"]) AM_CONDITIONAL([HAVE_OSX], [test "x${have_darwin}" = "xyes"]) AM_CONDITIONAL([HAVE_X86_64], [test "x${host_cpu}" = "xx86_64"]) --
[EGIT] [core/elementary] master 01/01: autotools: install .pc files to the correct directory on FreeBSD
q66 pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=dea408a2a4f1651f8ade3c4105b9d26b8cfe29b0 commit dea408a2a4f1651f8ade3c4105b9d26b8cfe29b0 Author: q66 Date: Thu Aug 7 22:49:09 2014 +0100 autotools: install .pc files to the correct directory on FreeBSD --- Makefile.am | 5 + configure.ac | 7 +++ 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index 13d9ac9..9ab1e96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,12 @@ m4/efl_doxygen.m4 \ config.rpath \ pkgbuild/PKGBUILD +if HAVE_FREEBSD +pkgconfigdir = $(libdir)data/pkgconfig +else pkgconfigdir = $(libdir)/pkgconfig +endif + pkgconfig_DATA = elementary.pc cmakeconfigdir = $(libdir)/cmake/Elementary diff --git a/configure.ac b/configure.ac index 2934824..21b7e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,12 @@ ELM_UNIX_DEF="#undef" ELM_WIN32_DEF="#undef" have_windows="no" have_dlopen="no" +have_freebsd="no" +case "$host_os" in + freebsd*) + have_freebsd="yes" + ;; +esac case "$host_os" in mingw*) PKG_CHECK_MODULES([EVIL], [evil]) @@ -88,6 +94,7 @@ esac AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) +AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"]) AC_SUBST([default_engine]) AC_DEFINE_UNQUOTED([DEFAULT_ENGINE], ["$default_engine"], ["Default engine according to host"]) --
[EGIT] [core/enlightenment] master 01/01: autotools: install .pc files to the correct directory on FreeBSD
q66 pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=076aa56b9be524ca86f768ff989944c1eb52f445 commit 076aa56b9be524ca86f768ff989944c1eb52f445 Author: q66 Date: Thu Aug 7 22:53:47 2014 +0100 autotools: install .pc files to the correct directory on FreeBSD --- Makefile.am | 5 + configure.ac | 5 + 2 files changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index fa91c5a..886b2ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,12 @@ include src/Makefile.mk filesdir = $(datadir)/enlightenment/ files_DATA = AUTHORS COPYING +if HAVE_FREEBSD +pkgconfigdir = $(libdir)data/pkgconfig +else pkgconfigdir = $(libdir)/pkgconfig +endif + pkgconfig_DATA = enlightenment.pc include doc/Makefile.mk diff --git a/configure.ac b/configure.ac index 34559a9..62c0f6d 100644 --- a/configure.ac +++ b/configure.ac @@ -659,6 +659,7 @@ define([CHECK_MODULE_BATTERY], ]) have_openbsd="no" +have_freebsd="no" BATTERY_LDFLAGS= case "$host_os" in darwin*) @@ -667,10 +668,14 @@ case "$host_os" in openbsd*) have_openbsd="yes" ;; + freebsd*) +have_freebsd="yes" + ;; esac AC_SUBST([BATTERY_LDFLAGS]) AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"]) +AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"]) AM_CONDITIONAL(HAVE_TEMPERATURE, false) define([CHECK_MODULE_TEMPERATURE], --
[EGIT] [core/enlightenment] master 01/01: use a bit more standard ULLONG_MAX rather than ULONG_LONG_MAX
q66 pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=8293711fc65c5329b65b20ac97511e44c6a88c22 commit 8293711fc65c5329b65b20ac97511e44c6a88c22 Author: q66 Date: Thu Aug 7 23:05:44 2014 +0100 use a bit more standard ULLONG_MAX rather than ULONG_LONG_MAX --- src/modules/teamwork/e_mod_tw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index f606efd..0d7d819 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -608,7 +608,7 @@ media_cleaner_cb(void *data) now -= tw_config->allowed_media_age * 24 * 60 * 60; } else - now = ULONG_LONG_MAX; + now = ULLONG_MAX; EINA_LIST_FOREACH_SAFE(mcl->cache, l, l2, ic) { /* only clean up to 3 entries at a time to ensure responsiveness */ --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_map: Add new elm_map_region_zoom_bring_in() API
On Thu, 7 Aug 2014 17:29:03 +0200 Stefan Schmidt said: > Hello. > > On Thu, 2014-08-07 at 23:58, Carsten Haitzler wrote: > > On Thu, 7 Aug 2014 16:33:54 +0200 Stefan Schmidt > > said: > > > > > Hello. > > > > > > Looking through ABI/API changes between and 1.11. > > > > > > On Wed, 2014-05-28 at 01:10, bluezery wrote: > > > > raster pushed a commit to branch master. > > > > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > > > > > > commit 84c2351bc339eca22acb79c86acbee7a1322f8c0 > > > > Author: bluezery > > > > Date: Wed May 28 17:08:00 2014 +0900 > > > > > > > > elm_map: Add new elm_map_region_zoom_bring_in() API > > > > > > > > Summary: > > > > By using this API, we can do region show & bring in concurrently. > > > > This needs some tuning more because some main layouting logic in map > > > > needs to be modified to support more smooth animation. > > > > I will spare my time to do that later. > > > > @feature > > > > > > > > Reviewers: Hermet, raster, stefan_schmidt > > > > > > > > Reviewed By: raster > > > > > > > > CC: Jaehyun > > > > > > > > Differential Revision: https://phab.enlightenment.org/D887 > > > > --- > > > > src/bin/test_map.c | 7 > > > > src/lib/elm_map.c| 88 + > > > > +++ +--- src/lib/elm_map.eo | 20 +++ > > > > src/lib/elm_widget_map.h | 7 ++-- > > > > 4 files changed, 115 insertions(+), 7 deletions(-) > > > > > > [SNIP] > > > > > > > --- a/src/lib/elm_widget_map.h > > > > +++ b/src/lib/elm_widget_map.h > > > > @@ -432,8 +432,11 @@ struct _Elm_Map_Data > > > > struct > > > > { > > > >double zoom; > > > > - double diff; > > > > - intcnt; > > > > + double zoom_diff; > > > > + double lon, lat; > > > > + double lon_diff, lat_diff; > > > > + intzoom_cnt; > > > > + intregion_cnt; > > > > } ani; > > > > > > Did you intend here to rename diff to zoom_diff and cnt to region_cnt? > > > > > > In any case it is bad to remove already exported symbols from this > > > public struct. Even if you handle the change internally you never know > > > what people in the outside are doing with it and if they get a new elm > > > version and their code starts to crash because a symbol is no longer > > > there thats really bad. > > > > > > I see two options out of this. > > > > > > a) Mark the old struct entries as deprecated in the header and report > > > a deprecating warning on usage. > > > > > > or > > > > > > b) just keep the old names even if they are not good. > > > > elm widget api's... from elm_widget.h: > > But this is from elm_widget_map.h > > > > > /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR > > * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT > > * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK > > * IT AT RUNTIME. > > > > :) mall widget api's - the structs for their internals, elm_widget etc. are > > not api/bi stable and are commented explicitly as such like above. :) > > The header file above does not have this warning and happily sits in > my /us/local/include/elementary/ to be used by everyone. > > So none of this is part of our stable API? correct. just look at the structs typedef struct _Path Path; typedef struct _Color Color; typedef struct _Region Region; etc. ... isn't that enough of a hint? that's internal stuff - not public api. it's elm_widget*.h. no elm namspacing there at all! it's all part of the elm widget api - the one that is as above commented/marked as "don't use this unless you want stuff to break". it's internal object data thus we can change this at will - i never wanted to expose such internal data and we do it nowhere else in efl precisely because of it exposing internal widget data - it too easily allows people to mess with it in a way they shouldn't or stops us from changing the internals. so you can ignore everything elm_widget*.h based. :) -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 02/02: Edcref: and finally apply a cool style
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=34c75a29f6ac5a4cbb669e5b3b74f1ddb6ae8423 commit 34c75a29f6ac5a4cbb669e5b3b74f1ddb6ae8423 Author: davemds Date: Fri Aug 8 02:30:18 2014 +0200 Edcref: and finally apply a cool style Now the edc ref is decently readable --- doc/Doxyfile.in | 5 +++-- doc/e.css | 47 ++--- src/bin/edje/edje_cc_handlers.c | 12 ++- 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index a1b2c0c..f18cc4f 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1709,15 +1709,16 @@ GENERATE_LEGEND= YES DOT_CLEANUP= YES # Aliases used by edcref + ALIASES= block="" ALIASES += context="\code" ALIASES += description="\endcode " ALIASES += endblock="" -ALIASES += property=" " +ALIASES += property=" " ALIASES += parameters="" ALIASES += effect=" " ALIASES += endproperty="" -ALIASES += edcsection{2}="\anchor sec_\1 \ref sec_quickaccess \"\2\"" +ALIASES += edcsection{2}="\anchor sec_\1 \ref sec_quickaccess \"\2\"" ALIASES += edcsubsection{2}="\anchor sec_\1 \ref sec_quickaccess \"\2\"" # Aliases used by luaref diff --git a/doc/e.css b/doc/e.css index dd111c0..a34c7e7 100644 --- a/doc/e.css +++ b/doc/e.css @@ -954,16 +954,57 @@ dl.citelist dd { text-shadow: 0px 1px 0px #cc; } + /* EdcRef page specific styles */ +table.edcref { + border-collapse:collapse; + border: 1px solid #AA; + margin-bottom: 30px; +} + +table.edcref td.section a { + font-size: 2.0em; +} + +table.edcref td.subsection { + background-color: #EE; + border: 1px solid #AA; +} + +table.edcref td.subsection a { + font-size: 1.5em; +} + table.edcref td { vertical-align: top; } -table.edcref td.property, table.edcref td.parameters { - font-weight: bold; +table.edcref .fragment { + width: 90%; + padding-top: 10px; + padding-left: 3px; + margin-right: 100px; + border: 1px solid #AA; + margin-top: 10px; + margin-bottom: 10px; + background-color: #F6F6F6; } +table.edcref td.description { + padding-right: 95px; +} +table.edcref td.property, table.edcref td.parameters { + font-weight: bold; + background-color: #DD; + border-top: 1px solid #AA; + padding: 2px; +} - +table.edcref_prop { + width: 90%; + border-collapse:collapse; + border: 1px solid #AA; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); +} diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index ea98da3..f48f800 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -13,6 +13,7 @@ code sample of the block \@description the block's description +\@since X.X \@endblock \@property @@ -21,6 +22,7 @@ property's parameter list \@effect the property description (lol) +\@since X.X \@endproperty */ @@ -758,6 +760,10 @@ New_Statement_Handler statement_handlers[] = }; /** + @edcsection{lazedc,LazEDC} + */ + +/** @edcsubsection{lazedc,LazEDC} */ @@ -1492,7 +1498,7 @@ _edje_program_copy(Edje_Program *ep, Edje_Program *ep2) } @description The "externals" block is used to list each external module file that will be used in others - programs. +programs. @endblock @property @@ -2426,6 +2432,10 @@ st_styles_style_tag(void) */ /** + @edcsubsection{collections,Collections Blocks} + */ + +/** @page edcref @block collections --
[EGIT] [core/efl] master 01/02: edcref: fix the base_scale property docs
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a8a71588014596bd6bb8988d40647f2641165d9b commit a8a71588014596bd6bb8988d40647f2641165d9b Author: davemds Date: Thu Aug 7 15:38:35 2014 +0200 edcref: fix the base_scale property docs base_scale is a property, so document it propertly Also added missing @since --- src/bin/edje/edje_cc_handlers.c | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 4f791be..ea98da3 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -2431,7 +2431,7 @@ st_styles_style_tag(void) collections @context collections { -.. +base_scale: 1.2; sounds { } vibrations { } group { } @@ -2457,21 +2457,18 @@ ob_collections(void) /** @page edcref -@block +@property base_scale -@context -collections { -.. -base_scale: 1.2; -.. -} -@description +@parameters +[scale val] +@effect The base_scale is the standard scale value of the collection. The default base_scale is 1.0. It means the collection is made in the environment which is same with a desktop(The monitor has 96 dpi). If you make a collection in another environment(ex: 115 dpi), you have to set the base_scale(ex: 1.2). Then it will be shown same size in the desktop. -@endblock +@since 1.11 +@endproperty */ static void st_collections_base_scale(void) --
Re: [E-devel] [EGIT] [core/efl] master 01/01: Eet: Add support for ETC2 encoding and decoding
Hi~ On Thu, Aug 7, 2014 at 9:49 PM, Stefan Schmidt wrote: > Hello. > > Still on my way through the API/ABI reports form 1.10 to 1.11 > > On Fri, 2014-06-13 at 01:18, Jean-Philippe ANDRXX wrote: > > jpeg pushed a commit to branch master. > > > > > http://git.enlightenment.org/core/efl.git/commit/?id=c21968bcd76e07ff300c8e102c0062f74fcb704d > > > > commit c21968bcd76e07ff300c8e102c0062f74fcb704d > > Author: Jean-Philippe Andre > > Date: Fri Jun 13 16:56:39 2014 +0900 > > > > Eet: Add support for ETC2 encoding and decoding > > > > Since we now have full support for ETC2, add the colorspaces > > to Eet. > > > > @feature > > --- > > src/Makefile_Eet.am | 2 + > > src/lib/eet/Eet.h | 8 +- > > src/lib/eet/eet_image.c | 310 > +++- > > 3 files changed, 237 insertions(+), 83 deletions(-) > > > > lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ > > diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h > > index 50645a0..95be2e5 100644 > > --- a/src/lib/eet/Eet.h > > +++ b/src/lib/eet/Eet.h > > @@ -477,14 +477,18 @@ typedef enum _Eet_Image_Encoding > > { > > EET_IMAGE_LOSSLESS = 0, > > EET_IMAGE_JPEG = 1, > > - EET_IMAGE_ETC1 = 2 > > + EET_IMAGE_ETC1 = 2, > > + EET_IMAGE_ETC2_RGB = 3, > > + EET_IMAGE_ETC2_RGBA = 4 > > } Eet_Image_Encoding; > > > > typedef enum _Eet_Colorspace > > { > > EET_COLORSPACE_ARGB = 0, > > /* The number between are reserved to preserve compatibility with > evas */ > > - EET_COLORSPACE_ETC1 = 8 > > + EET_COLORSPACE_ETC1 = 9, > > Reported by the ABI checker and it seems valid to me. We should keep > it at 8 here and leave 9 empty or move all newly added ones one up. > > All all code that might comapre to this will be wrong now and we have > an ABI break. Agreed? > I've seen this in the ABI break report. I thought a bit about it. It wasn't really a bug in the first place (having value 8 instead of 9), since the idea was to have the same values for EET_ colorspaces and EVAS_ colorspaces but "someone" messed up the first time. All in all these values should basically be used only from inside EFL (evas+eet cooperation), although it's possible to use the encoding/decoding APIs from a client app (they're EAPIs after all). As usual we'll blame Cedric for introducing a "bug" in the first place (b1e576081175835cfef1626). Not sure what to do. I'd rather fix this value now to keep consistency between evas and eet, it's been only 3 months this is here, and the only sane way to use these values is through Edje anyways. PS: Thanks for reviewing! -- Jean-Philippe André -- Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel