[EGIT] [apps/terminology] master 01/01: termpty: rewrite conditions on size_t ty->backsize
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=643e78355872c5c585114acdb8a95fd0f89e4670
commit 643e78355872c5c585114acdb8a95fd0f89e4670
Author: Boris Faure
Date: Thu Sep 13 07:47:49 2018 +0200
termpty: rewrite conditions on size_t ty->backsize
---
src/bin/termpty.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 2e54fff..ef32ffa 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -924,7 +924,7 @@ static void
_backlog_remove_latest_nolock(Termpty *ty)
{
Termsave *ts;
- if (ty->backsize <= 0)
+ if (ty->backsize == 0)
return;
ts = BACKLOG_ROW_GET(ty, 1);
@@ -948,7 +948,7 @@ termpty_text_save_top(Termpty *ty, Termcell *cells, ssize_t
w_max)
Termsave *ts;
ssize_t w, i;
- if (ty->backsize <= 0)
+ if (ty->backsize == 0)
return;
assert(ty->back);
@@ -960,7 +960,7 @@ termpty_text_save_top(Termpty *ty, Termcell *cells, ssize_t
w_max)
{
cells[i].att.autowrapped = 1;
}
- if (ty->backsize >= 1)
+ if (ty->backsize > 0)
{
ts = BACKLOG_ROW_GET(ty, 1);
if (!ts->cells)
@@ -1048,7 +1048,7 @@ termpty_backscroll_adjust(Termpty *ty, int *scroll)
int screen_y = ty->backlog_beacon.screen_y;
verify_beacon(ty, 0);
- if (!ty->backsize || *scroll <= 0)
+ if ((ty->backsize == 0) || (*scroll <= 0))
{
*scroll = 0;
return;
@@ -1350,7 +1350,7 @@ termpty_resize(Termpty *ty, int new_w, int new_h)
old_y = 0;
/* Rewrap the first line from the history if needed */
- if (ty->backsize >= 1)
+ if (ty->backsize > 0)
{
Termsave *ts;
ts = BACKLOG_ROW_GET(ty, 1);
--
[EGIT] [apps/terminology] master 01/03: termptysave: remove dead code
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=f55f273362ee3a9e112d76ecb303a7238e7b5c5b
commit f55f273362ee3a9e112d76ecb303a7238e7b5c5b
Author: Boris Faure
Date: Thu Sep 13 07:40:39 2018 +0200
termptysave: remove dead code
---
src/bin/termptysave.c | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/bin/termptysave.c b/src/bin/termptysave.c
index 558228f..56257fd 100644
--- a/src/bin/termptysave.c
+++ b/src/bin/termptysave.c
@@ -12,7 +12,6 @@ _ts_free(void *ptr)
static int ts_comp = 0;
static int ts_uncomp = 0;
static int ts_freeops = 0;
-static int ts_compfreeze = 0;
static Eina_List *ptys = NULL;
void
@@ -69,12 +68,9 @@ void
termpty_save_free(Termsave *ts)
{
if (!ts) return;
- if (!ts_compfreeze)
- {
-if (ts->comp) ts_comp--;
-else ts_uncomp--;
-ts_freeops++;
- }
+ if (ts->comp) ts_comp--;
+ else ts_uncomp--;
+ ts_freeops++;
_ts_free(ts->cells);
ts->cells = NULL;
ts->w = 0;
--
[EGIT] [apps/terminology] master 02/03: termpty: simplify code
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=0bf5343c347431c61cb8e73646c7a37feff60658
commit 0bf5343c347431c61cb8e73646c7a37feff60658
Author: Boris Faure
Date: Thu Sep 13 07:43:57 2018 +0200
termpty: simplify code
---
src/bin/termpty.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 2f8c480..2e54fff 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -1022,23 +1022,23 @@ termpty_backlog_length(Termpty *ty)
return 0;
verify_beacon(ty, 0);
- backlog_y++;
- while (42)
+ for (backlog_y++; backlog_y < (int)ty->backsize; backlog_y++)
{
int nb_lines;
const Termsave *ts;
ts = BACKLOG_ROW_GET(ty, backlog_y);
-if (!ts->cells || backlog_y >= (int)ty->backsize)
- return ty->backlog_beacon.screen_y;
+if (!ts->cells)
+ goto end;
nb_lines = (ts->w == 0) ? 1 : (ts->w + ty->w - 1) / ty->w;
screen_y += nb_lines;
ty->backlog_beacon.screen_y = screen_y;
ty->backlog_beacon.backlog_y = backlog_y;
verify_beacon(ty, 0);
-backlog_y++;
}
+end:
+ return ty->backlog_beacon.screen_y;
}
void
--
[EGIT] [apps/terminology] master 03/03: sel: remove useless condition
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=cf4dbcddd4ff8dfa5d2871ccf90e7e56a7c2fc8b
commit cf4dbcddd4ff8dfa5d2871ccf90e7e56a7c2fc8b
Author: Boris Faure
Date: Thu Sep 13 07:44:53 2018 +0200
sel: remove useless condition
---
src/bin/sel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/sel.c b/src/bin/sel.c
index 2fc1b23..5df50ed 100644
--- a/src/bin/sel.c
+++ b/src/bin/sel.c
@@ -766,7 +766,7 @@ sel_entry_selected_set(Evas_Object *obj, Evas_Object
*entry, Eina_Bool keep_befo
en->was_selected = EINA_FALSE;
en->selected = EINA_TRUE;
}
-else if (en->obj != entry)
+else
{
if (en->selected)
{
--
[EGIT] [website/www-content] master 01/01: Wiki page start.md changed with summary [] by Felipe Magno de Almeida
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f35ef7357bdbd73e09dd9cb17e36c92f79e9a8c5 commit f35ef7357bdbd73e09dd9cb17e36c92f79e9a8c5 Author: Felipe Magno de Almeida Date: Wed Sep 12 15:35:06 2018 -0700 Wiki page start.md changed with summary [] by Felipe Magno de Almeida --- pages/develop/setup/csharp/start.md.txt | 4 1 file changed, 4 insertions(+) diff --git a/pages/develop/setup/csharp/start.md.txt b/pages/develop/setup/csharp/start.md.txt index 2ef3ced6b..46ab4a777 100644 --- a/pages/develop/setup/csharp/start.md.txt +++ b/pages/develop/setup/csharp/start.md.txt @@ -59,6 +59,10 @@ sudo make install > Usually, reading the error message and installing the missing package solves > the problem. > If you cannot solve the problem by yourself, try [contacting the > community](/contact). +> **NOTE** +> If you are using Visual Studio to write EFL C# applications, you should copy to the build directory or have them in the PATH environment libraries: libeflcustomexportsmono.dll, libefl_mono.dll and if you want to use Intellisense also libefl_mono.xml. These libraries and XML file will be found at lib sub-directory of the prefix you install the library. + + ## Building EFL C# Applications ## With EFL installed, you can compile EFL applications using ``pkg-config`` to get the proper flags to use the C# bindings: --
[EGIT] [core/efl] master 01/01: evas_events: NULL check before evas_event_freezes_through.
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0b79c20c1635b4a4a9cf15056ba57c4bf11c0887
commit 0b79c20c1635b4a4a9cf15056ba57c4bf11c0887
Author: Alastair Poole
Date: Wed Sep 12 19:18:03 2018 +
evas_events: NULL check before evas_event_freezes_through.
In some cases focused_obj can be NULL. Add a check before
calling evas_event_freezes_through. Was causing a SEGV
in some situations. Avoiding a crash here is good
but we also need to warn for future debugging to
be more useful.
Differential Revision: https://phab.enlightenment.org/D7027
---
src/lib/evas/canvas/evas_events.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/lib/evas/canvas/evas_events.c
b/src/lib/evas/canvas/evas_events.c
index b670c60e02..1cb89f4f67 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -3206,6 +3206,12 @@ _key_event_dispatch(Evas_Public_Data *e, void
*event_info,
Evas_Object_Protected_Data *focused_obj =
efl_data_scope_get(focused, EFL_CANVAS_OBJECT_CLASS);
+ if (!focused_obj)
+ {
+WRN("No element focused");
+return;
+ }
+
if (!e->is_frozen && !evas_event_freezes_through(focused, focused_obj))
{
evas_object_event_callback_call(focused, focused_obj,
--
[EGIT] [core/efl] efl-1.21 01/01: efl_ui_focus_manager_calc: invalidate obj on delete.
netstar pushed a commit to branch efl-1.21.
http://git.enlightenment.org/core/efl.git/commit/?id=c112d0db2cf34ec4390fc3bf5c7d1067a16e4846
commit c112d0db2cf34ec4390fc3bf5c7d1067a16e4846
Author: Alastair Poole
Date: Wed Sep 12 20:01:57 2018 +0100
efl_ui_focus_manager_calc: invalidate obj on delete.
Summary:
In some situations focus is being set to a deleted object.
Use EFL_EVENT_INVALIDATE on object deletion not
EFL_EVENT_DEL. This prevents the object to be again selected for restoring
focus when a redirect is deleted.
This fixes SEGV with some widgets including popup tests.
Test Plan:
* elementary_test -to popup
* popup-center-text + 3 button (check add, remove buttons).
* Close popup, enter text (reopen popup and repeat).
* Crash should be avoided.
Reviewers: bu5hm4n, zmike
Reviewed By: bu5hm4n
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D7026
---
src/lib/elementary/efl_ui_focus_manager_calc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c
b/src/lib/elementary/efl_ui_focus_manager_calc.c
index b36b2053e9..6779022a61 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -442,11 +442,11 @@ _object_del_cb(void *data, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(regular_node,
{EFL_GFX_ENTITY_EVENT_RESIZE, _node_new_geometry_cb},
{EFL_GFX_ENTITY_EVENT_MOVE, _node_new_geometry_cb},
-{EFL_EVENT_DEL, _object_del_cb},
+{EFL_EVENT_INVALIDATE, _object_del_cb},
);
EFL_CALLBACKS_ARRAY_DEFINE(logical_node,
-{EFL_EVENT_DEL, _object_del_cb},
+{EFL_EVENT_INVALIDATE, _object_del_cb},
);
--
[EGIT] [core/efl] master 01/01: efl_ui_focus_manager_calc: invalidate obj on delete.
netstar pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=111f2fe89c43b3041014567bf270d07b7c8eea3c
commit 111f2fe89c43b3041014567bf270d07b7c8eea3c
Author: Alastair Poole
Date: Wed Sep 12 20:01:57 2018 +0100
efl_ui_focus_manager_calc: invalidate obj on delete.
Summary:
In some situations focus is being set to a deleted object.
Use EFL_EVENT_INVALIDATE on object deletion not
EFL_EVENT_DEL. This prevents the object to be again selected for restoring
focus when a redirect is deleted.
This fixes SEGV with some widgets including popup tests.
Test Plan:
* elementary_test -to popup
* popup-center-text + 3 button (check add, remove buttons).
* Close popup, enter text (reopen popup and repeat).
* Crash should be avoided.
Reviewers: bu5hm4n, zmike
Reviewed By: bu5hm4n
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D7026
---
src/lib/elementary/efl_ui_focus_manager_calc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c
b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 8f05d8a723..a366271146 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -470,11 +470,11 @@ _object_del_cb(void *data, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(regular_node,
{EFL_GFX_ENTITY_EVENT_RESIZE, _node_new_geometry_cb},
{EFL_GFX_ENTITY_EVENT_MOVE, _node_new_geometry_cb},
-{EFL_EVENT_DEL, _object_del_cb},
+{EFL_EVENT_INVALIDATE, _object_del_cb},
);
EFL_CALLBACKS_ARRAY_DEFINE(logical_node,
-{EFL_EVENT_DEL, _object_del_cb},
+{EFL_EVENT_INVALIDATE, _object_del_cb},
);
--
[EGIT] [core/efl] master 01/01: ecore_wl2: add support for intree loading of the module
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4aa480f6d34a8095ebab6abb780993bfca1b7744
commit 4aa480f6d34a8095ebab6abb780993bfca1b7744
Author: Marcel Hollerbach
Date: Wed Sep 12 08:39:14 2018 -0400
ecore_wl2: add support for intree loading of the module
Summary: the module was not loaded when we were running intree.
Reviewers: ManMower, devilhorns
Reviewed By: devilhorns
Subscribers: devilhorns, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D7023
---
src/Makefile_Ecore_Wl2.am | 6 +-
src/lib/ecore_wl2/ecore_wl2.c | 21 +
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am
index df89b2280e..452e1454a3 100644
--- a/src/Makefile_Ecore_Wl2.am
+++ b/src/Makefile_Ecore_Wl2.am
@@ -26,7 +26,9 @@ static_libs/libdrm/exynos_drmif.h \
static_libs/libdrm/i915_drm.h \
static_libs/libdrm/intel_bufmgr.h \
static_libs/libdrm/vc4_drm.h \
-static_libs/libdrm/LICENSE
+static_libs/libdrm/LICENSE \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \
@@ -51,6 +53,8 @@ lib_ecore_wl2_libecore_wl2_la_CPPFLAGS =
-I$(top_builddir)/src/lib/efl \
@ECORE_WL2_CFLAGS@ \
-I$(top_srcdir)/src/static_libs/libdrm \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DMODULE_ARCH=\"$(MODULE_ARCH)\"
lib_ecore_wl2_libecore_wl2_la_LIBADD = @ECORE_WL2_LIBS@
lib_ecore_wl2_libecore_wl2_la_DEPENDENCIES = @ECORE_WL2_INTERNAL_LIBS@
diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c
index 78ac85b6ac..fe447e0cec 100644
--- a/src/lib/ecore_wl2/ecore_wl2.c
+++ b/src/lib/ecore_wl2/ecore_wl2.c
@@ -2,6 +2,10 @@
# include
#endif
+#ifdef NEED_RUN_IN_TREE
+# include "../../static_libs/buildsystem/buildsystem.h"
+#endif
+
#include "ecore_wl2_private.h"
/* local variables */
@@ -66,6 +70,23 @@ _ecore_wl2_surface_modules_init(void)
{
const char *mod_dir;
+#ifdef NEED_RUN_IN_TREE
+#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
+ if (getuid() == geteuid())
+#endif
+ {
+char path[PATH_MAX];
+//when running in tree we are ignoring all the settings
+//and just load the intree module that we have build
+if (bs_mod_get(path, sizeof(path), "ecore_wl2/engines","dmabuf"))
+ {
+ Eina_Module *local_module = eina_module_new(path);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(local_module, EINA_FALSE);
+ EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_module_load(local_module),
EINA_FALSE);
+ return EINA_TRUE;
+ }
+ }
+#endif
supplied_modules = eina_module_arch_list_get(NULL,
PACKAGE_LIB_DIR"/ecore_wl2/engines",
MODULE_ARCH);
--
[EGIT] [core/efl] efl-1.21 01/01: release: Update NEWS and bump version for 1.21.1 release
stefan pushed a commit to branch efl-1.21. http://git.enlightenment.org/core/efl.git/commit/?id=309609dca2ecf0a2c8f218053bb1bcf146cd2325 commit 309609dca2ecf0a2c8f218053bb1bcf146cd2325 Author: Stefan Schmidt Date: Wed Sep 12 11:44:43 2018 +0200 release: Update NEWS and bump version for 1.21.1 release --- NEWS | 11 ++- configure.ac | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index b4763b3428..997e6a956b 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,16 @@ == -EFL 1.21.0 +EFL 1.21.1 == +Changes since 1.21.0: +- + +Fixes: + + * ecore_wl2_dmabuf: Link with ecore_wl2 (T7327) + * ecore_wl2_dmabuf: Depend on ecore_wl2 (T7327) + * efl selection manager - avoid multiple selection get callbacks for req + Changes since 1.20.0: - diff --git a/configure.ac b/configure.ac index e75ceac95a..ad98fb807e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [21], [0], [release]) +EFL_VERSION([1], [21], [1], [release]) AC_INIT([efl], [efl_version], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.60]) --
