[EGIT] [bindings/python/python-efl] master 01/01: Entry: Fix the name of the callback_rejected_del function
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=281cb65c1a8daedb0bb6a2b5b374f0fae0586cad commit 281cb65c1a8daedb0bb6a2b5b374f0fae0586cad Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 16:17:33 2015 +0200 Entry: Fix the name of the callback_rejected_del function --- efl/elementary/entry.pxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efl/elementary/entry.pxi b/efl/elementary/entry.pxi index 713b40a..068f159 100644 --- a/efl/elementary/entry.pxi +++ b/efl/elementary/entry.pxi @@ -1800,7 +1800,7 @@ cdef class Entry(LayoutClass): self._callback_add(rejected, func, args, kwargs) -def callback_text_set_done_del(self, func): +def callback_rejected_del(self, func): self._callback_del(rejected, func) --
[EGIT] [bindings/python/python-efl] master 01/01: New 1.15 signal for Entry: context, open
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=7f5c30c7fd5844924e564e5d586c87f4a4658dbd commit 7f5c30c7fd5844924e564e5d586c87f4a4658dbd Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 16:20:40 2015 +0200 New 1.15 signal for Entry: context,open --- efl/elementary/entry.pxi | 11 +++ 1 file changed, 11 insertions(+) diff --git a/efl/elementary/entry.pxi b/efl/elementary/entry.pxi index 068f159..25bd031 100644 --- a/efl/elementary/entry.pxi +++ b/efl/elementary/entry.pxi @@ -1803,6 +1803,17 @@ cdef class Entry(LayoutClass): def callback_rejected_del(self, func): self._callback_del(rejected, func) +def callback_context_open_add(self, func, *args, **kwargs): +Called before showing the context menu. + +.. versionadded:: 1.15 + + +self._callback_add(context,open, func, args, kwargs) + +def callback_context_open_del(self, func): +self._callback_del(context,open, func) + property scrollbar_policy: --
[EGIT] [core/elementary] master 01/01: test_cnp: remove explicit type castings.
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=904de9707ecd09bb90bd0bd2897894182f4fc676
commit 904de9707ecd09bb90bd0bd2897894182f4fc676
Author: Amitesh Singh singh.amit...@gmail.com
Date: Mon Aug 3 21:34:09 2015 +0530
test_cnp: remove explicit type castings.
In C, the explicit typecasting is not required.
---
src/bin/test_cnp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/test_cnp.c b/src/bin/test_cnp.c
index 512fc3a..8019d91 100644
--- a/src/bin/test_cnp.c
+++ b/src/bin/test_cnp.c
@@ -8,7 +8,7 @@ static Evas_Object *glb;
static void
_bt_copy_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
- Evas_Object *en = (Evas_Object*)(data);
+ Evas_Object *en = data;
const char *txt = elm_object_text_get(en);
elm_object_text_set(glb, txt);
@@ -19,7 +19,7 @@ _bt_copy_clicked(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA
static void
_bt_paste_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
- Evas_Object *en = (Evas_Object*)(data);
+ Evas_Object *en = data;
elm_cnp_selection_get(en, ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT,
NULL, NULL);
@@ -28,7 +28,7 @@ _bt_paste_clicked(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EIN
static void
_bt_clear_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
- Evas_Object *en = (Evas_Object*)(data);
+ Evas_Object *en = data;
elm_object_text_set(glb, );
elm_object_cnp_selection_clear(elm_object_parent_widget_get(en),
ELM_SEL_TYPE_CLIPBOARD);
--
[EGIT] [bindings/python/python-efl] master 01/01: New 1.15 API: Window.autohide
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=634c56d14ca142e46f9bcfc380aded081a5ef3be commit 634c56d14ca142e46f9bcfc380aded081a5ef3be Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 18:16:26 2015 +0200 New 1.15 API: Window.autohide --- doc/elementary/elementary.rst | 6 ++ efl/elementary/elementary_cdef.pxi | 1 + efl/elementary/window.pxi | 29 + efl/elementary/window_cdef.pxi | 2 ++ 4 files changed, 38 insertions(+) diff --git a/doc/elementary/elementary.rst b/doc/elementary/elementary.rst index 197ca59..6349fa0 100644 --- a/doc/elementary/elementary.rst +++ b/doc/elementary/elementary.rst @@ -115,6 +115,12 @@ Quit policy types Quit when the application's last window is closed +.. data:: ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN + +Quit when the application's last window is hidden + +.. versionadded:: 1.15 + .. _Elm_Policy_Exit: diff --git a/efl/elementary/elementary_cdef.pxi b/efl/elementary/elementary_cdef.pxi index bc1a105..2e3c1cc 100644 --- a/efl/elementary/elementary_cdef.pxi +++ b/efl/elementary/elementary_cdef.pxi @@ -66,6 +66,7 @@ cdef extern from Elementary.h: cpdef enum Elm_Policy_Quit: ELM_POLICY_QUIT_NONE ELM_POLICY_QUIT_LAST_WINDOW_CLOSED +ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN ctypedef enum Elm_Policy_Quit: pass diff --git a/efl/elementary/window.pxi b/efl/elementary/window.pxi index e57e84c..ae0665f 100644 --- a/efl/elementary/window.pxi +++ b/efl/elementary/window.pxi @@ -209,6 +209,35 @@ cdef class Window(Object): def autodel_get(self): return elm_win_autodel_get(self.obj) +property autohide: +The window's autohide state. + +This property works similarly to :func:`autodel`, automatically handling +delete,request signals when set to ``True``, with the difference +that it will hide the window, instead of destroying it. + +It is specially designed to work together with +ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN which allows exiting Elementary's +main loop when all the windows are hidden. + +.. note:: :func:`autodel` and :func:`autohide` are not mutually exclusive. + The window will be deleted if both are set to ``True``. + +:type: bool + +.. versionadded:: 1.15 + + +def __get__(self): +return elm_win_autohide_get(self.obj) +def __set__(self, autohide): +elm_win_autohide_set(self.obj, autohide) + +def autohide_set(self, autohide): +elm_win_autohide_set(self.obj, autohide) +def autohide_get(self): +return elm_win_autohide_get(self.obj) + def activate(self): Activate a window object. diff --git a/efl/elementary/window_cdef.pxi b/efl/elementary/window_cdef.pxi index bc9caee..2485c46 100644 --- a/efl/elementary/window_cdef.pxi +++ b/efl/elementary/window_cdef.pxi @@ -81,6 +81,8 @@ cdef extern from Elementary.h: const Evas_Object *elm_win_icon_object_get(const Evas_Object*) void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel) Eina_Boolelm_win_autodel_get(const Evas_Object *obj) +void elm_win_autohide_set(Evas_Object *obj, Eina_Bool autodel) +Eina_Boolelm_win_autohide_get(const Evas_Object *obj) void elm_win_activate(Evas_Object *obj) void elm_win_lower(Evas_Object *obj) void elm_win_raise(Evas_Object *obj) --
[EGIT] [core/efl] master 01/01: ecore_evas: Fix crash in async render
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=94abb3a4221548002ade125d910a84c7d4a47891
commit 94abb3a4221548002ade125d910a84c7d4a47891
Author: jiin.moon jiin.m...@samsung.com
Date: Tue Aug 4 11:49:04 2015 +0900
ecore_evas: Fix crash in async render
Summary:
The root cause of the crash is freed memory.
The evas_object_image_data_set api called with extn buffer in
_ipc_server_data.
But there is no inform to render when free this buffer.
@fix
Reviewers: Hermet, jpeg, jypark
Subscribers: stefan_schmidt, cedric
Differential Revision: https://phab.enlightenment.org/D2902
Signed-off-by: Jean-Philippe Andre jp.an...@samsung.com
---
src/modules/ecore_evas/engines/extn/ecore_evas_extn.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index 550166c..6dd16ba 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -178,7 +178,12 @@ _ecore_evas_extn_free(Ecore_Evas *ee)
Ecore_Event_Handler *hdl;
Ipc_Data_Update *ipc;
int i;
-
+if (bdata-image)
+ {
+ evas_object_image_data_set(bdata-image, NULL);
+ evas_object_image_pixels_dirty_set(bdata-image, EINA_TRUE);
+ }
+bdata-pixels = NULL;
for (i = 0; i NBUF; i++)
{
if (extn-b[i].buf) _extnbuf_free(extn-b[i].buf);
@@ -229,7 +234,7 @@ _ecore_evas_extn_free(Ecore_Evas *ee)
ee2-sub_ecore_evas = eina_list_remove(ee2-sub_ecore_evas, ee);
}
evas_object_del(bdata-image);
- bdata-image = NULL;
+bdata-image = NULL;
}
free(bdata);
ee-engine.data = NULL;
--
[EGIT] [core/efl] master 01/01: eina: add intermediate inline function for eina_crc.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a07c526460d1a3aa0a4e863a33059f1ade32c310
commit a07c526460d1a3aa0a4e863a33059f1ade32c310
Author: Cedric BAIL ced...@osg.samsung.com
Date: Sun Aug 2 21:56:08 2015 +0200
eina: add intermediate inline function for eina_crc.
This is necessary to make my life easier when adding assembling
implementation
of eina_crc.
---
src/Makefile_Eina.am | 1 +
src/lib/eina/eina_crc.c| 2 +-
src/lib/eina/eina_crc.h| 4 +++-
src/lib/eina/eina_inline_crc.x | 30 ++
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 316542c..aab92e2 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -89,6 +89,7 @@ lib/eina/eina_thread_queue.h \
lib/eina/eina_matrix.h \
lib/eina/eina_quad.h \
lib/eina/eina_crc.h \
+lib/eina/eina_inline_crc.x \
lib/eina/eina_evlog.h \
lib/eina/eina_util.h \
lib/eina/eina_quaternion.h
diff --git a/src/lib/eina/eina_crc.c b/src/lib/eina/eina_crc.c
index 29ec08c..e509dc8 100644
--- a/src/lib/eina/eina_crc.c
+++ b/src/lib/eina/eina_crc.c
@@ -288,7 +288,7 @@ static const unsigned int table[8][256] =
};
EAPI unsigned int
-eina_crc(const char *data, int len, unsigned int seed, Eina_Bool start_stream)
+_eina_crc(const char *data, int len, unsigned int seed, Eina_Bool start_stream)
{
unsigned int crc;
unsigned int* curr = (unsigned int*) data;
diff --git a/src/lib/eina/eina_crc.h b/src/lib/eina/eina_crc.h
index 099a921..819ca91 100644
--- a/src/lib/eina/eina_crc.h
+++ b/src/lib/eina/eina_crc.h
@@ -40,6 +40,8 @@
*
* @since 1.15
*/
-EAPI unsigned int eina_crc(const char *key, int len, unsigned int seed,
Eina_Bool start_stream) EINA_ARG_NONNULL(2, 3);
+static inline unsigned int eina_crc(const char *key, int len, unsigned int
seed, Eina_Bool start_stream) EINA_ARG_NONNULL(2, 3);
+
+#include eina_inline_crc.x
#endif
diff --git a/src/lib/eina/eina_inline_crc.x b/src/lib/eina/eina_inline_crc.x
new file mode 100644
index 000..41589f1
--- /dev/null
+++ b/src/lib/eina/eina_inline_crc.x
@@ -0,0 +1,30 @@
+/* EINA - EFL data type library
+ * Copyright (C) 20015 Cedric BAIL
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef EINA_INLINE_CRC_X_
+#define EINA_INLINE_CRC_X_
+
+EAPI unsigned int _eina_crc(const char *data, int len, unsigned int seed,
Eina_Bool start_stream);
+
+static inline unsigned int
+eina_crc(const char *key, int len, unsigned int seed, Eina_Bool start_stream)
+{
+ return _eina_crc(key, len, seed, start_stream);
+}
+
+#endif
--
[EGIT] [core/efl] master 01/01: eio: grammar and typo fixes in docs.
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c1f9152f10dc930826e074b394dcf8fd65352edd
commit c1f9152f10dc930826e074b394dcf8fd65352edd
Author: Yomi abyo...@gmail.com
Date: Mon Aug 3 11:50:10 2015 +0200
eio: grammar and typo fixes in docs.
Summary:
Fix a sentence.
Changes:
src/examples/eio/eio_file_ls.c
Reviewers: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2894
---
doc/eio_examples.dox | 12 ++--
src/examples/eio/eio_file_ls.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/eio_examples.dox b/doc/eio_examples.dox
index 4b7c1ed..587cb39 100644
--- a/doc/eio_examples.dox
+++ b/doc/eio_examples.dox
@@ -181,17 +181,17 @@
*
* To use eio_file_ls(), you just need to define four callbacks:
*
- * @li The filter callback, which allow or not a file to be seen
- * by the main loop handler. This callback run in a separated thread.
+ * @li The filter callback, which allows a file to be seen (or not)
+ * by the main loop handler. This callback runs in a separate thread.
* @li The main callback, which receive in the main loop all the file
* that are allowed by the filter. If you are updating a user interface
- * it make sense to delay the insertion a little, so you get a chance
- * to update the canvas for a bunch of file instead of one by one.
+ * it makes sense to delay the insertion a little, so you get a chance
+ * to update the canvas for a bunch of files instead of one by one.
* @li The end callback, which is called in the main loop when the
* content of the directory has been correctly scanned and all the
* file notified to the main loop.
* @li The error callback, which is called if an error occurred or
- * if the listing was cancelled during it's run. You can then retrieve
+ * if the listing was cancelled during its run. You can then retrieve
* the error type as an errno error.
*
* Here is a simple example:
@@ -288,7 +288,7 @@
*if( type == EIO_MONITOR_FILE_MODIFIED )
* printf(is being modified);
*else if( type == EIO_MONITOR_FILE_CLOSED )
- * printf(is not more being modified);
+ * printf(is no longer being modified);
*else printf(got unexpected changes);
*printf(\n);
* }
diff --git a/src/examples/eio/eio_file_ls.c b/src/examples/eio/eio_file_ls.c
index a9315ff..93e6c7a 100644
--- a/src/examples/eio/eio_file_ls.c
+++ b/src/examples/eio/eio_file_ls.c
@@ -43,7 +43,7 @@ _done_cb(void *data, Eio_File *handler EINA_UNUSED)
static void
_error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error)
{
- fprintf(stderr, Something wrong has happend:%s\n, strerror(error));
+ fprintf(stderr, Something has gone wrong:%s\n, strerror(error));
ecore_main_loop_quit();
}
--
[EGIT] [core/efl] master 01/01: ecore_con: Correcting ece_svr to ece_cl in test case.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=715e0a2508115829e4652ed92c6dc0e871c15ee5 commit 715e0a2508115829e4652ed92c6dc0e871c15ee5 Author: Srivardhan Hebbar sri.heb...@samsung.com Date: Mon Aug 3 12:17:22 2015 +0200 ecore_con: Correcting ece_svr to ece_cl in test case. Summary: Signed-off-by: Srivardhan Hebbar sri.heb...@samsung.com Reviewers: cedric Subscribers: stefan_schmidt, cedric Differential Revision: https://phab.enlightenment.org/D2903 --- src/tests/ecore_con/ecore_con_test_ecore_con_eet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c index cdb7af4..edf5185 100644 --- a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c +++ b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c @@ -237,9 +237,9 @@ START_TEST(ecore_con_test_ecore_con_eet_svr_del) ecore_main_loop_begin(); - ecore_con_eet_server_connect_callback_del(ece_svr, _eet_client_cnct_cb, + ecore_con_eet_server_connect_callback_del(ece_cl, _eet_client_cnct_cb, NULL); - ecore_con_eet_server_disconnect_callback_del(ece_svr, + ecore_con_eet_server_disconnect_callback_del(ece_cl, _eet_client_discnct_cb, NULL); free(cb_data); --
[EGIT] [core/efl] master 01/02: eina/btlog: Fix some Coverity issues
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7bfecbdaf2a9cf4ebc73fc35d459ab549bd56313
commit 7bfecbdaf2a9cf4ebc73fc35d459ab549bd56313
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Fri Jul 31 15:46:08 2015 +0900
eina/btlog: Fix some Coverity issues
CID 1297406
CID 1297408
CID 1297409
---
src/bin/eina/eina_btlog.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/eina/eina_btlog.c b/src/bin/eina/eina_btlog.c
index 2f46e1e..d3cbf77 100644
--- a/src/bin/eina/eina_btlog.c
+++ b/src/bin/eina/eina_btlog.c
@@ -66,7 +66,7 @@ path_split(const char *path, char **dir, char **file)
return;
}
*dir = malloc(p - path + 1);
- if (!dir)
+ if (!*dir)
{
*dir = NULL;
*file = NULL;
@@ -90,8 +90,8 @@ _addr2line(const char *bin_dir, const char *bin_name,
unsigned long long addr,
bin_dir, bin_name, addr);
p = popen(buf, r);
if (!p) return EINA_FALSE;
- fscanf(p, %s\n, buf);
- if (fscanf(p, %s\n, func) == 1)
+ if ((fscanf(p, %4095s\n, buf) == 1)
+ (fscanf(p, %4095s\n, func) == 1))
{
if (fscanf(p, %[^:]:%i\n, buf, line) == 2)
{
--
[EGIT] [bindings/python/python-efl] master 01/01: New 1.15 API: Configuration.transition_duration_factor
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=f3b385890292fa315dd8a639c0b823b1484ea407 commit f3b385890292fa315dd8a639c0b823b1484ea407 Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 17:04:05 2015 +0200 New 1.15 API: Configuration.transition_duration_factor --- efl/elementary/configuration.pxi | 16 efl/elementary/configuration_cdef.pxi | 2 ++ 2 files changed, 18 insertions(+) diff --git a/efl/elementary/configuration.pxi b/efl/elementary/configuration.pxi index b0d38d6..f3af9e2 100644 --- a/efl/elementary/configuration.pxi +++ b/efl/elementary/configuration.pxi @@ -380,6 +380,22 @@ cdef class Configuration(object): return elm_config_softcursor_mode_get() +property transition_duration_factor: +The transitions duration factor. + +This set the edje transition duration factor, it will affect the +duration of edje animations. + +:type: float + +.. versionadded:: 1.15 + + +def __get__(self): +return elm_config_transition_duration_factor_get() +def __set__(self, double delay): +elm_config_transition_duration_factor_set(delay) + property tooltip_delay: The duration after which tooltip will be shown. diff --git a/efl/elementary/configuration_cdef.pxi b/efl/elementary/configuration_cdef.pxi index b954f98..a62f2da 100644 --- a/efl/elementary/configuration_cdef.pxi +++ b/efl/elementary/configuration_cdef.pxi @@ -199,4 +199,6 @@ cdef extern from Elementary.h: void elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visible_Mode mode) Elm_Slider_Indicator_Visible_Mode elm_config_slider_indicator_visible_mode_get() +voidelm_config_transition_duration_factor_set(double factor) +double elm_config_transition_duration_factor_get() --
[EGIT] [core/elementary] master 01/01: test_popup: add popup with content area only example
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8cac65ec7e0e8cc8feb11b8e5ac6e0340ee8511a
commit 8cac65ec7e0e8cc8feb11b8e5ac6e0340ee8511a
Author: Amitesh Singh amitesh...@samsung.com
Date: Mon Aug 3 22:55:51 2015 +0530
test_popup: add popup with content area only example
---
src/bin/test_popup.c | 60 ++--
1 file changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c
index b919545..32712ac 100644
--- a/src/bin/test_popup.c
+++ b/src/bin/test_popup.c
@@ -678,10 +678,9 @@ _popup_center_title_genlist_content_1button_cb(void *data,
Evas_Object *obj EINA
evas_object_show(popup);
}
-
static void
_subpopup_cb(void *data, Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
+ void *event_info EINA_UNUSED)
{
Evas_Object *popup;
Evas_Object *btn, *btnclose;
@@ -714,6 +713,60 @@ _subpopup_cb(void *data, Evas_Object *obj EINA_UNUSED,
}
static void
+_popup_content_only_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Evas_Object *popup, *bx, *hbx, *lbl, *btn;
+ Evas_Object *win = data;
+
+ popup = elm_popup_add(win);
+
+ bx = elm_box_add(popup);
+ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0);
+ elm_object_content_set(popup, bx);
+
+ lbl = elm_label_add(popup);
+ elm_object_text_set(lbl,
+ align=centerThis popup contains content area
only.br
+ The buttons below are the part of content area, not
action area);
+ evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, 0.0);
+ elm_box_pack_end(bx, lbl);
+ evas_object_show(lbl);
+
+ hbx = elm_box_add(bx);
+ elm_box_horizontal_set(hbx, EINA_TRUE);
+ evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(hbx, EVAS_HINT_FILL, 0.0);
+ elm_box_pack_end(bx, hbx);
+ evas_object_show(hbx);
+
+ btn = elm_button_add(hbx);
+ elm_object_text_set(btn, Save);
+ evas_object_smart_callback_add(btn, clicked, _popup_close_cb, popup);
+ elm_box_pack_end(hbx, btn);
+ evas_object_show(btn);
+
+ btn = elm_button_add(hbx);
+ elm_object_text_set(btn, Discard);
+ evas_object_smart_callback_add(btn, clicked, _popup_close_cb, popup);
+ elm_box_pack_end(hbx, btn);
+ evas_object_show(btn);
+
+ btn = elm_button_add(hbx);
+ elm_object_text_set(btn, Cancel);
+ evas_object_smart_callback_add(btn, clicked, _popup_close_cb, popup);
+ elm_box_pack_end(hbx, btn);
+ evas_object_show(btn);
+
+ // popup show should be called after adding all the contents and the buttons
+ // of popup to set the focus into popup's contents correctly.
+ evas_object_show(popup);
+ elm_object_focus_set(btn, EINA_TRUE);
+}
+
+static void
_focus_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Eina_Bool check = elm_check_state_get(obj);
@@ -782,6 +835,9 @@ test_popup(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
elm_list_item_append(list, subpopup + X button,
NULL, NULL, _subpopup_cb,
win);
+ elm_list_item_append(list, popup with content only,
+NULL, NULL, _popup_content_only_cb,
+win);
elm_list_go(list);
evas_object_show(list);
--
[EGIT] [apps/express] master 01/01: express: Add support for scaleable media (svg, etc)
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=4519bfb63ad98601aa61432c7da921b924b4f5d5
commit 4519bfb63ad98601aa61432c7da921b924b4f5d5
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Aug 3 14:21:37 2015 -0400
express: Add support for scaleable media (svg, etc)
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/media.c | 233
1 file changed, 219 insertions(+), 14 deletions(-)
diff --git a/src/bin/media.c b/src/bin/media.c
index 6b811ae..b122081 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -15,6 +15,7 @@ struct _Media
Evas_Object *o_ctrl;
Evas_Object *o_busy;
Evas_Object *o_event;
+ Evas_Object *o_tmp;
Ecore_Con_Url *url;
Ecore_Event_Handler *_prog_hdlr, *_compl_hdlr;
@@ -28,7 +29,9 @@ struct _Media
int w, h, iw, ih, sw, sh;
int mode, resizes;
int frame, frame_num, loops;
- Ecore_Timer *anim;
+
+ Ecore_Timer *anim_tmr;
+ Ecore_Timer *smooth_tmr;
Media_Type type;
@@ -38,6 +41,7 @@ struct _Media
Eina_Bool down : 1;
} down;
+ Eina_Bool nosmooth : 1;
Eina_Bool downloading : 1;
Eina_Bool queued : 1;
};
@@ -53,7 +57,7 @@ static void _thumb_type_init(Evas_Object *obj);
static void _ethumb_init(void);
static void
-_media_cb_img_preloaded(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event EINA_UNUSED)
+_img_cb_preloaded(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event EINA_UNUSED)
{
Media *sd;
@@ -79,7 +83,7 @@ _img_cb_frame(void *data)
if (evas_object_image_animated_loop_type_get(sd-o_img) ==
EVAS_IMAGE_ANIMATED_HINT_NONE)
{
- sd-anim = NULL;
+ sd-anim_tmr = NULL;
return EINA_FALSE;
}
@@ -89,7 +93,7 @@ _img_cb_frame(void *data)
{
if (loops sd-loops)
{
- sd-anim = NULL;
+ sd-anim_tmr = NULL;
return EINA_FALSE;
}
}
@@ -97,7 +101,7 @@ _img_cb_frame(void *data)
evas_object_image_animated_frame_set(sd-o_img, frame);
t = evas_object_image_animated_frame_duration_get(sd-o_img, frame, 0);
- ecore_timer_interval_set(sd-anim, t);
+ ecore_timer_interval_set(sd-anim_tmr, t);
return EINA_TRUE;
}
@@ -114,7 +118,7 @@ _img_type_anim_handle(Evas_Object *obj)
sd-frame_num = evas_object_image_animated_frame_count_get(sd-o_img);
if (sd-frame_num 2) return;
t = evas_object_image_animated_frame_duration_get(sd-o_img, sd-frame, 0);
- sd-anim = ecore_timer_add(t, _img_cb_frame, obj);
+ sd-anim_tmr = ecore_timer_add(t, _img_cb_frame, obj);
}
static void
@@ -129,7 +133,7 @@ _img_type_init(Evas_Object *obj)
evas_object_clip_set(sd-o_img, sd-o_clip);
evas_object_raise(sd-o_event);
evas_object_event_callback_add(sd-o_img, EVAS_CALLBACK_IMAGE_PRELOADED,
- _media_cb_img_preloaded, obj);
+ _img_cb_preloaded, obj);
evas_object_image_load_orientation_set(sd-o_img, EINA_TRUE);
evas_object_image_file_set(sd-o_img, sd-realf, NULL);
evas_object_image_size_get(sd-o_img, sd-iw, sd-ih);
@@ -379,6 +383,203 @@ _thumb_type_init(Evas_Object *obj)
_thumb_type_theme_init(obj);
}
+static void
+_scale_cb_preloaded(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event EINA_UNUSED)
+{
+ Media *sd;
+
+ if (!(sd = evas_object_smart_data_get(data))) return;
+
+ if (!sd-o_tmp)
+ {
+evas_object_show(sd-o_img);
+evas_object_show(sd-o_clip);
+ }
+ else
+ {
+evas_object_del(sd-o_img);
+sd-o_img = sd-o_tmp;
+sd-o_tmp = NULL;
+evas_object_show(sd-o_img);
+evas_object_show(sd-o_clip);
+ }
+}
+
+static void
+_scale_type_calc(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w,
Evas_Coord h)
+{
+ Media *sd;
+
+ if (!(sd = evas_object_smart_data_get(obj))) return;
+
+ if ((w = 0) || (h = 0) || (sd-iw = 0) || (sd-ih = 0))
+ {
+w = 1;
+h = 1;
+ }
+ else
+ {
+int iw = 1, ih = 1;
+
+if ((sd-mode MEDIA_SIZE_MASK) == MEDIA_BG)
+ {
+ iw = w;
+ ih = (sd-ih * w) / sd-iw;
+ if (ih h)
+ {
+ ih = h;
+ iw = (sd-iw * h) / sd-ih;
+ if (iw w) iw = w;
+ }
+ }
+else if ((sd-mode MEDIA_SIZE_MASK) == MEDIA_POP)
+ {
+ iw = w;
+ ih = (sd-ih * w) / sd-iw;
+ if (ih h)
+ {
+ ih = h;
+ iw = (sd-iw * h) / sd-ih;
+ if (iw w) iw = w;
+ }
+ /* if ((iw sd-iw) || (ih sd-ih)) */
+ /* { */
+ /* iw
[EGIT] [apps/express] master 03/03: express: Actually initialize image object for scaler
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=f08d916f27b6c0d6afa31ba6b226228957888b4c commit f08d916f27b6c0d6afa31ba6b226228957888b4c Author: Chris Michael cp.mich...@samsung.com Date: Mon Aug 3 14:29:37 2015 -0400 express: Actually initialize image object for scaler Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/bin/media.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/media.c b/src/bin/media.c index 4333463..961aa09 100644 --- a/src/bin/media.c +++ b/src/bin/media.c @@ -950,10 +950,10 @@ _media_add(Evas_Object *parent, const char *src, int mode, Media_Type type) PACKAGE_NAME); sd-realf = eina_stringshare_add(path); -sd-url_prog_hdlr = +sd-url_prog_hdlr = ecore_event_handler_add(ECORE_CON_EVENT_URL_PROGRESS, _media_cb_prog, obj); -sd-url_compl_hdlr = +sd-url_compl_hdlr = ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, _media_cb_compl, obj); } @@ -994,8 +994,9 @@ _media_add(Evas_Object *parent, const char *src, int mode, Media_Type type) case MEDIA_TYPE_IMG: if (!sd-url) _img_type_init(obj); break; - /* case MEDIA_TYPE_SCALE: */ - /* break; */ + case MEDIA_TYPE_SCALE: + if (!sd-url) _scale_type_init(obj); + break; /* case MEDIA_TYPE_EDJE: */ /* break; */ /* case MEDIA_TYPE_MOV: */ --
[EGIT] [apps/express] master 02/03: express: Rename url handlers
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ca1e9c87c7b9ba400e4b983a97129ed280a9def6
commit ca1e9c87c7b9ba400e4b983a97129ed280a9def6
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Aug 3 14:28:33 2015 -0400
express: Rename url handlers
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/media.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/bin/media.c b/src/bin/media.c
index 6c011df..4333463 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -18,7 +18,7 @@ struct _Media
Evas_Object *o_tmp;
Ecore_Con_Url *url;
- Ecore_Event_Handler *_prog_hdlr, *_compl_hdlr;
+ Ecore_Event_Handler *url_prog_hdlr, *url_compl_hdlr;
Ethumb_Client_Async *et_req;
const char *src, *ext, *realf;
@@ -659,11 +659,11 @@ _media_cb_compl(void *data, int type EINA_UNUSED, void
*event)
if (ev-url_con != sd-url) return EINA_TRUE;
edje_object_signal_emit(sd-o_busy, done, PACKAGE_NAME);
- ecore_event_handler_del(sd-_prog_hdlr);
- ecore_event_handler_del(sd-_compl_hdlr);
+ ecore_event_handler_del(sd-url_prog_hdlr);
+ ecore_event_handler_del(sd-url_compl_hdlr);
ecore_con_url_free(sd-url);
- sd-_prog_hdlr = NULL;
- sd-_compl_hdlr = NULL;
+ sd-url_prog_hdlr = NULL;
+ sd-url_compl_hdlr = NULL;
sd-url = NULL;
switch (sd-type)
@@ -718,13 +718,13 @@ _smart_del(Evas_Object *obj)
emotion_object_last_position_save(sd-o_img);
if (sd-url)
{
-ecore_event_handler_del(sd-_prog_hdlr);
-ecore_event_handler_del(sd-_compl_hdlr);
+ecore_event_handler_del(sd-url_prog_hdlr);
+ecore_event_handler_del(sd-url_compl_hdlr);
ecore_con_url_free(sd-url);
}
- sd-_prog_hdlr = NULL;
- sd-_compl_hdlr = NULL;
+ sd-url_prog_hdlr = NULL;
+ sd-url_compl_hdlr = NULL;
sd-url = NULL;
if (sd-tmpfd = 0)
@@ -941,7 +941,8 @@ _media_add(Evas_Object *parent, const char *src, int mode,
Media_Type type)
}
else
{
-sd-o_busy =
edje_object_add(evas_object_evas_get(obj));
+sd-o_busy =
+ edje_object_add(evas_object_evas_get(obj));
evas_object_smart_member_add(sd-o_busy, obj);
_theme_apply(sd-o_busy, express/mediabusy);
evas_object_show(sd-o_busy);
@@ -949,13 +950,12 @@ _media_add(Evas_Object *parent, const char *src, int
mode, Media_Type type)
PACKAGE_NAME);
sd-realf = eina_stringshare_add(path);
-sd-_prog_hdlr =
+sd-url_prog_hdlr =
ecore_event_handler_add(ECORE_CON_EVENT_URL_PROGRESS,
_media_cb_prog, obj);
-sd-_compl_hdlr =
+sd-url_compl_hdlr =
ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE,
_media_cb_compl, obj);
-
}
}
--
[EGIT] [apps/terminology] master 02/04: new resize/backlog implementation. Closes T2461
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=34592ab5b3e01e473355c9cc0f370cee0731c40c
commit 34592ab5b3e01e473355c9cc0f370cee0731c40c
Author: Boris Faure bill...@gmail.com
Date: Mon Apr 6 18:08:23 2015 +0200
new resize/backlog implementation. Closes T2461
idea: store full lines in the backlog. No need to change them on resize
---
src/bin/miniview.c| 9 +-
src/bin/termio.c | 22 +--
src/bin/termpty.c | 487 +-
src/bin/termpty.h | 12 +-
src/bin/termptyops.c | 42 +
src/bin/termptysave.c | 66 +--
src/bin/termptysave.h | 3 +-
7 files changed, 360 insertions(+), 281 deletions(-)
diff --git a/src/bin/miniview.c b/src/bin/miniview.c
index 06dc287..90b3477 100644
--- a/src/bin/miniview.c
+++ b/src/bin/miniview.c
@@ -139,12 +139,12 @@ _draw_line(const Termpty *ty, unsigned int *pixels,
Eina_Bool
_is_top_bottom_reached(Miniview *mv)
{
- Termpty *ty;
int history_len;
EINA_SAFETY_ON_NULL_RETURN_VAL(mv, EINA_FALSE);
- ty = termio_pty_get(mv-termio);
- history_len = ty-backscroll_num;
+
+ /* TODO: RESIZE */
+ history_len = 42; //termpty_backscroll_len_get(ty);
if (( (- mv-img_hist) (int)(mv-img_h - mv-rows - (mv-rows / 2)))
( (- mv-img_hist) (int)(history_len + (mv-rows / 2
@@ -522,7 +522,8 @@ _deferred_renderer(void *data)
evas_object_geometry_get(mv-termio, ox, oy, ow, oh);
if ((ow == 0) || (oh == 0)) return EINA_TRUE;
- history_len = ty-backscroll_num;
+ /* TODO: RESIZE */
+ history_len = 42; //termpty_backscroll_len_get(ty);
evas_object_image_size_set(mv-img, mv-cols, mv-img_h);
ow = mv-cols;
diff --git a/src/bin/termio.c b/src/bin/termio.c
index ffdd7e7..c964079 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -133,8 +133,6 @@ termio_scroll(Evas_Object *obj, int direction, int start_y,
int end_y)
if (mv) miniview_position_offset(mv, direction, EINA_FALSE);
// adjust scroll position for added scrollback
sd-scroll -= direction;
-if (sd-scroll sd-pty-backscroll_num)
- sd-scroll = sd-pty-backscroll_num;
}
ty = sd-pty;
if (ty-selection.is_active)
@@ -347,15 +345,8 @@ termio_scroll_delta(Evas_Object *obj, int delta, int
by_page)
delta *= by;
}
sd-scroll += delta;
- if (delta 0)
- {
-if (sd-scroll sd-pty-backscroll_num)
- sd-scroll = sd-pty-backscroll_num;
- }
- else
- {
-if (sd-scroll 0) sd-scroll = 0;
- }
+ if (delta = 0 sd-scroll 0)
+ sd-scroll = 0;
_smart_update_queue(obj, sd);
miniview_position_offset(term_miniview_get(sd-term), -delta, EINA_TRUE);
}
@@ -2050,6 +2041,7 @@ termio_selection_get(Evas_Object *obj, int c1x, int c1y,
int c2x, int c2y,
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, NULL);
termpty_cellcomp_freeze(sd-pty);
+ /* TODO: RESIZE use/save the reference point */
for (y = c1y; y = c2y; y++)
{
Termcell *cells;
@@ -4127,8 +4119,6 @@ _mouse_selection_scroll(void *data)
if (cy == 0)
cy = -1;
sd-scroll -= cy;
-if (sd-scroll sd-pty-backscroll_num)
- sd-scroll = sd-pty-backscroll_num;
sd-pty-selection.end.y = -sd-scroll;
_smart_update_queue(data, sd);
}
@@ -4324,9 +4314,8 @@ _smart_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNU
else
{
sd-scroll -= (ev-z * 4);
- if (sd-scroll sd-pty-backscroll_num)
- sd-scroll = sd-pty-backscroll_num;
- else if (sd-scroll 0) sd-scroll = 0;
+ if (sd-scroll 0)
+ sd-scroll = 0;
_smart_update_queue(data, sd);
miniview_position_offset(term_miniview_get(sd-term),
ev-z * 4, EINA_TRUE);
@@ -4520,6 +4509,7 @@ _smart_apply(Evas_Object *obj)
}
inv = sd-pty-termstate.reverse;
termpty_cellcomp_freeze(sd-pty);
+ termpty_backscroll_adjust(sd-pty, sd-scroll);
for (y = 0; y sd-grid.h; y++)
{
Termcell *cells;
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 5e49ba4..9a0a143 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -19,6 +19,7 @@
#if defined (__sun) || defined (__sun__)
# include stropts.h
#endif
+#include assert.h
/* specific log domain to help debug only terminal code parser */
int _termpty_log_dom = -1;
@@ -298,7 +299,7 @@ termpty_new(const char *cmd, Eina_Bool login_shell, const
char *cd,
if (!ty) return NULL;
ty-w = w;
ty-h = h;
- ty-backmax = backscroll;
+ ty-backsize = backscroll;
termpty_reset_state(ty);
@@ -567,16 +568,9 @@ termpty_free(Termpty *ty)
{
int i;
-for (i = 0; i ty-backmax; i++)
- {
- if (ty-back[i])
- {
- termpty_save_free(ty-back[i]);
-
[EGIT] [apps/terminology] master 04/04: renames to make the code more consistant
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=8fbffdd86940597ef47abc028b752db24a765926
commit 8fbffdd86940597ef47abc028b752db24a765926
Author: Boris Faure bill...@gmail.com
Date: Sat Aug 1 18:37:35 2015 +0200
renames to make the code more consistant
---
src/bin/miniview.c| 4 ++--
src/bin/termio.c | 26 +-
src/bin/termpty.c | 46 +-
src/bin/termpty.h | 11 ++-
src/bin/termptyops.c | 8
src/bin/termptysave.c | 26 --
src/bin/termptysave.h | 4 +---
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/src/bin/miniview.c b/src/bin/miniview.c
index 477a7e9..f1dac82 100644
--- a/src/bin/miniview.c
+++ b/src/bin/miniview.c
@@ -145,7 +145,7 @@ _is_top_bottom_reached(Miniview *mv)
EINA_SAFETY_ON_NULL_RETURN_VAL(mv, EINA_FALSE);
ty = termio_pty_get(mv-termio);
- history_len = termpty_backscroll_length(ty);
+ history_len = termpty_backlog_length(ty);
if (( (- mv-img_hist) (int)(mv-img_h - mv-rows - (mv-rows / 2)))
( (- mv-img_hist) (int)(history_len + (mv-rows / 2
@@ -523,7 +523,7 @@ _deferred_renderer(void *data)
evas_object_geometry_get(mv-termio, ox, oy, ow, oh);
if ((ow == 0) || (oh == 0)) return EINA_TRUE;
- history_len = termpty_backscroll_length(ty);
+ history_len = termpty_backlog_length(ty);
evas_object_image_size_set(mv-img, mv-cols, mv-img_h);
ow = mv-cols;
diff --git a/src/bin/termio.c b/src/bin/termio.c
index c85fcca..39cec99 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -588,7 +588,7 @@ termio_config_update(Evas_Object *obj)
sd-jump_on_change = sd-config-jump_on_change;
sd-jump_on_keypress = sd-config-jump_on_keypress;
- termpty_backscroll_set(sd-pty, sd-config-scrollback);
+ termpty_backlog_size_set(sd-pty, sd-config-scrollback);
sd-scroll = 0;
if (evas_object_focus_get(obj))
@@ -2040,7 +2040,7 @@ termio_selection_get(Evas_Object *obj, int c1x, int c1y,
int c2x, int c2y,
int x, y;
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, NULL);
- termpty_cellcomp_freeze(sd-pty);
+ termpty_backlog_lock();
for (y = c1y; y = c2y; y++)
{
Termcell *cells;
@@ -2191,7 +2191,7 @@ termio_selection_get(Evas_Object *obj, int c1x, int c1y,
int c2x, int c2y,
}
}
}
- termpty_cellcomp_thaw(sd-pty);
+ termpty_backlog_unlock();
if (rtrim)
_sb_spaces_rtrim(sb);
@@ -2437,7 +2437,7 @@ _sel_line(Termio *sd, int cy)
int y, w = 0;
Termcell *cells;
- termpty_cellcomp_freeze(sd-pty);
+ termpty_backlog_lock();
_sel_set(sd, EINA_TRUE);
sd-pty-selection.makesel = EINA_FALSE;
@@ -2471,7 +2471,7 @@ _sel_line(Termio *sd, int cy)
sd-pty-selection.by_line = EINA_TRUE;
sd-pty-selection.is_top_to_bottom = EINA_TRUE;
- termpty_cellcomp_thaw(sd-pty);
+ termpty_backlog_unlock();
}
static void
@@ -2782,7 +2782,7 @@ _sel_word(Termio *sd, int cx, int cy)
int x, y, w = 0;
Eina_Bool done = EINA_FALSE;
- termpty_cellcomp_freeze(sd-pty);
+ termpty_backlog_lock();
_sel_set(sd, EINA_TRUE);
sd-pty-selection.makesel = EINA_TRUE;
@@ -2891,7 +2891,7 @@ _sel_word(Termio *sd, int cx, int cy)
sd-pty-selection.by_word = EINA_TRUE;
sd-pty-selection.is_top_to_bottom = EINA_TRUE;
- termpty_cellcomp_thaw(sd-pty);
+ termpty_backlog_unlock();
}
static void
@@ -3206,7 +3206,7 @@ _selection_dbl_fix(Termio *sd
INT_SWAP(start_x, end_x);
}
- termpty_cellcomp_freeze(sd-pty);
+ termpty_backlog_lock();
cells = termpty_cellrow_get(sd-pty, end_y - sd-scroll, w);
if (cells)
{
@@ -3259,7 +3259,7 @@ _selection_dbl_fix(Termio *sd
}
}
}
- termpty_cellcomp_thaw(sd-pty);
+ termpty_backlog_unlock();
if (!sd-pty-selection.is_top_to_bottom)
{
@@ -3286,7 +3286,7 @@ _selection_newline_extend_fix(Evas_Object *obj)
if ((sd-top_left) || (sd-bottom_right) || (sd-pty-selection.is_box))
return;
- termpty_cellcomp_freeze(sd-pty);
+ termpty_backlog_lock();
start_x = sd-pty-selection.start.x;
start_y = sd-pty-selection.start.y;
@@ -3331,7 +3331,7 @@ _selection_newline_extend_fix(Evas_Object *obj)
sd-pty-selection.end.x = end_x;
sd-pty-selection.end.y = end_y;
- termpty_cellcomp_thaw(sd-pty);
+ termpty_backlog_unlock();
}
/* }}} */
@@ -4507,7 +4507,7 @@ _smart_apply(Evas_Object *obj)
blk-active = EINA_FALSE;
}
inv = sd-pty-termstate.reverse;
- termpty_cellcomp_freeze(sd-pty);
+ termpty_backlog_lock();
termpty_backscroll_adjust(sd-pty, sd-scroll);
for (y = 0; y sd-grid.h; y++)
{
@@ -4736,7 +4736,7 @@ _smart_apply(Evas_Object *obj)
preedit_x = x - sd-cursor.x;
preedit_y = y - sd-cursor.y;
}
- termpty_cellcomp_thaw(sd-pty);
+ termpty_backlog_unlock();
[EGIT] [apps/terminology] master 03/04: speed up browsing backlog
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=35c8fd79c014c4f51a23585f6f445f16bf165798
commit 35c8fd79c014c4f51a23585f6f445f16bf165798
Author: Boris Faure bill...@gmail.com
Date: Sun Jun 28 23:37:04 2015 +0200
speed up browsing backlog
have a beacon: single point where the link between an offset in the
backlog and one in screen coordinates
---
src/bin/miniview.c | 8 +-
src/bin/termio.c | 1 -
src/bin/termpty.c| 221 ++-
src/bin/termpty.h| 16 ++--
src/bin/termptyops.c | 3 +
5 files changed, 168 insertions(+), 81 deletions(-)
diff --git a/src/bin/miniview.c b/src/bin/miniview.c
index 90b3477..477a7e9 100644
--- a/src/bin/miniview.c
+++ b/src/bin/miniview.c
@@ -140,11 +140,12 @@ Eina_Bool
_is_top_bottom_reached(Miniview *mv)
{
int history_len;
+ Termpty *ty;
EINA_SAFETY_ON_NULL_RETURN_VAL(mv, EINA_FALSE);
- /* TODO: RESIZE */
- history_len = 42; //termpty_backscroll_len_get(ty);
+ ty = termio_pty_get(mv-termio);
+ history_len = termpty_backscroll_length(ty);
if (( (- mv-img_hist) (int)(mv-img_h - mv-rows - (mv-rows / 2)))
( (- mv-img_hist) (int)(history_len + (mv-rows / 2
@@ -522,8 +523,7 @@ _deferred_renderer(void *data)
evas_object_geometry_get(mv-termio, ox, oy, ow, oh);
if ((ow == 0) || (oh == 0)) return EINA_TRUE;
- /* TODO: RESIZE */
- history_len = 42; //termpty_backscroll_len_get(ty);
+ history_len = termpty_backscroll_length(ty);
evas_object_image_size_set(mv-img, mv-cols, mv-img_h);
ow = mv-cols;
diff --git a/src/bin/termio.c b/src/bin/termio.c
index c964079..c85fcca 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -2041,7 +2041,6 @@ termio_selection_get(Evas_Object *obj, int c1x, int c1y,
int c2x, int c2y,
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, NULL);
termpty_cellcomp_freeze(sd-pty);
- /* TODO: RESIZE use/save the reference point */
for (y = c1y; y = c2y; y++)
{
Termcell *cells;
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 9a0a143..b72510d 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -626,7 +626,49 @@ termpty_line_length(const Termcell *cells, ssize_t
nb_cells)
}
#define BACKLOG_ROW_GET(Ty, Y) \
- (Ty-back[(Ty-backsize + ty-backpos - (Y)) % Ty-backsize])
+ (Ty-back[(Ty-backsize + ty-backpos - ((Y) - 1 )) % Ty-backsize])
+
+
+#if 0
+static void
+verify_beacon(Termpty *ty)
+{
+ Termsave *ts;
+ int nb_lines;
+ int backlog_y = ty-backlog_beacon.backlog_y;
+ int screen_y = ty-backlog_beacon.screen_y;
+
+ assert(ty-backlog_beacon.screen_y = 0);
+ assert(ty-backlog_beacon.backlog_y = 0);
+ assert(ty-backlog_beacon.screen_y = ty-backlog_beacon.backlog_y);
+
+ //ERR(FROM screen_y:%d backlog_y:%d,
+ //screen_y, backlog_y);
+ while (backlog_y 0)
+ {
+ts = BACKLOG_ROW_GET(ty, backlog_y);
+if (!ts-cells)
+ {
+ ERR(went too far: screen_y:%d backlog_y:%d,
+ screen_y, backlog_y);
+ return;
+ }
+
+nb_lines = (ts-w == 0) ? 1 : (ts-w + ty-w - 1) / ty-w;
+screen_y -= nb_lines;
+backlog_y--;
+//ERR(nb_lines:%d screen_y:%d backlog_y:%d ts-w:%d ty-w:%d,
+//nb_lines, screen_y, backlog_y, ts-w, ty-w);
+assert(screen_y = backlog_y);
+
+ }
+ //ERR(TO screen_y:%d backlog_y:%d,
+ //screen_y, backlog_y);
+ assert (backlog_y == 0);
+ assert (screen_y == 0);
+}
+#endif
+
void
termpty_text_save_top(Termpty *ty, Termcell *cells, ssize_t w_max)
@@ -643,19 +685,22 @@ termpty_text_save_top(Termpty *ty, Termcell *cells,
ssize_t w_max)
w = termpty_line_length(cells, w_max);
if (ty-backsize = 1)
{
-ts = BACKLOG_ROW_GET(ty, 0);
+ts = BACKLOG_ROW_GET(ty, 1);
if (!ts-cells)
goto add_new_ts;
/* TODO: RESIZE uncompress ? */
if (ts-w ts-cells[ts-w - 1].att.autowrapped)
{
+ int old_len = ts-w;
termpty_save_expand(ts, cells, w);
+ ty-backlog_beacon.screen_y += (ts-w + ty-w - 1) / ty-w
+ - (old_len + ty-w - 1) / ty-w;
return;
}
}
add_new_ts:
- ts = BACKLOG_ROW_GET(ty, -1);
+ ts = BACKLOG_ROW_GET(ty, 0);
ts = termpty_save_new(ts, w);
if (!ts)
return;
@@ -664,6 +709,14 @@ add_new_ts:
if (ty-backpos = ty-backsize)
ty-backpos = 0;
termpty_save_thaw();
+
+ ty-backlog_beacon.screen_y++;
+ ty-backlog_beacon.backlog_y++;
+ if (ty-backlog_beacon.backlog_y = ty-backsize)
+ {
+ty-backlog_beacon.screen_y = 0;
+ty-backlog_beacon.backlog_y = 0;
+ }
}
@@ -677,7 +730,7 @@ termpty_row_length(Termpty *ty, int y)
Termcell *cells;
if (y = ty-h)
{
- ERR(invalid row given);
+ ERR(invalid row given:
[EGIT] [apps/terminology] master 01/04: add tools/scroll.sh
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4378f871629abdb72877ba2a12d520138bba89e0 commit 4378f871629abdb72877ba2a12d520138bba89e0 Author: Boris Faure bill...@gmail.com Date: Sun May 31 22:31:13 2015 +0200 add tools/scroll.sh --- tools/scroll.sh | 8 1 file changed, 8 insertions(+) diff --git a/tools/scroll.sh b/tools/scroll.sh new file mode 100755 index 000..39b064c --- /dev/null +++ b/tools/scroll.sh @@ -0,0 +1,8 @@ +#/bin/bash + +I=0 +while [ 1 ]; do +sleep 1 +echo $I +I=`expr $I + 1` +done --
[EGIT] [apps/express] master 01/03: express: Delete temporary scale object
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=40bd2ad0bf6df39e83ff4aae6a5c75f494931f31 commit 40bd2ad0bf6df39e83ff4aae6a5c75f494931f31 Author: Chris Michael cp.mich...@samsung.com Date: Mon Aug 3 14:25:42 2015 -0400 express: Delete temporary scale object Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/bin/media.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/media.c b/src/bin/media.c index b122081..6c011df 100644 --- a/src/bin/media.c +++ b/src/bin/media.c @@ -741,6 +741,7 @@ _smart_del(Evas_Object *obj) if (sd-o_ctrl) evas_object_del(sd-o_ctrl); if (sd-o_busy) evas_object_del(sd-o_busy); if (sd-o_event) evas_object_del(sd-o_event); + if (sd-o_tmp) evas_object_del(sd-o_tmp); if (sd-anim_tmr) ecore_timer_del(sd-anim_tmr); if (sd-smooth_tmr) ecore_timer_del(sd-smooth_tmr); --
[EGIT] [apps/express] master 01/02: express: Add support for animated gifs
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=91a981dc00ecc8852dab6a4e286e170749b5125b
commit 91a981dc00ecc8852dab6a4e286e170749b5125b
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Aug 3 13:07:34 2015 -0400
express: Add support for animated gifs
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/media.c | 60 -
1 file changed, 59 insertions(+), 1 deletion(-)
diff --git a/src/bin/media.c b/src/bin/media.c
index 619470e..dc38458 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -26,6 +26,8 @@ struct _Media
int tmpfd;
int w, h, iw, ih, sw, sh;
int mode, resizes;
+ int frame, frame_num, loops;
+ Ecore_Timer *anim;
Media_Type type;
@@ -54,6 +56,61 @@ _media_cb_img_preloaded(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj EIN
evas_object_show(sd-o_clip);
}
+static Eina_Bool
+_img_cb_frame(void *data)
+{
+ Media *sd;
+ double t;
+ int frame;
+
+ if (!(sd = evas_object_smart_data_get(data))) return EINA_FALSE;
+ sd-frame++;
+ frame = ((sd-frame - 1) % sd-frame_num) + 1;
+ if ((sd-frame = sd-frame_num) (frame == 1))
+ {
+int loops;
+
+if (evas_object_image_animated_loop_type_get(sd-o_img) ==
+EVAS_IMAGE_ANIMATED_HINT_NONE)
+ {
+ sd-anim = NULL;
+ return EINA_FALSE;
+ }
+
+sd-loops++;
+loops = evas_object_image_animated_loop_count_get(sd-o_img);
+if (loops != 0)
+ {
+ if (loops sd-loops)
+ {
+ sd-anim = NULL;
+ return EINA_FALSE;
+ }
+ }
+ }
+
+ evas_object_image_animated_frame_set(sd-o_img, frame);
+ t = evas_object_image_animated_frame_duration_get(sd-o_img, frame, 0);
+ ecore_timer_interval_set(sd-anim, t);
+
+ return EINA_TRUE;
+}
+
+static void
+_img_type_anim_handle(Evas_Object *obj)
+{
+ Media *sd;
+ double t;
+
+ if (!(sd = evas_object_smart_data_get(obj))) return;
+ if (!evas_object_image_animated_get(sd-o_img)) return;
+ sd-frame = 1;
+ sd-frame_num = evas_object_image_animated_frame_count_get(sd-o_img);
+ if (sd-frame_num 2) return;
+ t = evas_object_image_animated_frame_duration_get(sd-o_img, sd-frame, 0);
+ sd-anim = ecore_timer_add(t, _img_cb_frame, obj);
+}
+
static void
_img_type_init(Evas_Object *obj)
{
@@ -71,7 +128,8 @@ _img_type_init(Evas_Object *obj)
evas_object_image_file_set(sd-o_img, sd-realf, NULL);
evas_object_image_size_get(sd-o_img, sd-iw, sd-ih);
evas_object_image_preload(sd-o_img, EINA_FALSE);
- /* TODO: anim handle */
+
+ _img_type_anim_handle(obj);
}
static void
--
[EGIT] [apps/express] master 02/02: express: Add support for media thumbnails
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=331f331bcbbe3faaaf2d6f0357be00fd577a8ada
commit 331f331bcbbe3faaaf2d6f0357be00fd577a8ada
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Aug 3 13:37:21 2015 -0400
express: Add support for media thumbnails
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/media.c | 208 ++--
1 file changed, 202 insertions(+), 6 deletions(-)
diff --git a/src/bin/media.c b/src/bin/media.c
index dc38458..6b811ae 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -18,6 +18,7 @@ struct _Media
Ecore_Con_Url *url;
Ecore_Event_Handler *_prog_hdlr, *_compl_hdlr;
+ Ethumb_Client_Async *et_req;
const char *src, *ext, *realf;
@@ -43,8 +44,13 @@ struct _Media
static Evas_Smart *_smart = NULL;
static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL;
+static Ethumb_Client *et_client = NULL;
+static Eina_Bool et_connected = EINA_FALSE;
+static Eina_List *et_queue = NULL;
static void _smart_calculate(Evas_Object *obj);
+static void _thumb_type_init(Evas_Object *obj);
+static void _ethumb_init(void);
static void
_media_cb_img_preloaded(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event EINA_UNUSED)
@@ -187,6 +193,192 @@ _img_type_calc(Media *sd, Evas_Coord x, Evas_Coord y,
Evas_Coord w, Evas_Coord h
evas_object_resize(sd-o_img, w, h);
}
+static void
+_thumb_type_calc(Media *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w,
Evas_Coord h)
+{
+ if (!sd) return;
+ if ((w = 0) || (h = 0) || (sd-iw = 0) || (sd-ih = 0))
+ {
+w = 1;
+h = 1;
+ }
+ else
+ {
+int iw = 1, ih = 1;
+
+iw = w;
+ih = (sd-ih * w) / sd-iw;
+if (ih h)
+ {
+ ih = h;
+ iw = (sd-iw * h) / sd-ih;
+ if (iw w) iw = w;
+ }
+if ((iw sd-iw) || (ih sd-ih))
+ {
+ iw = sd-iw;
+ ih = sd-ih;
+ }
+
+x += ((w - iw) / 2);
+y += ((h - ih) / 2);
+w = iw;
+h = ih;
+ }
+
+ evas_object_move(sd-o_img, x, y);
+ evas_object_resize(sd-o_img, w, h);
+}
+
+static void
+_thumb_cb_preloaded(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event EINA_UNUSED)
+{
+ Media *sd;
+ Evas_Coord ox, oy, ow, oh;
+
+ if (!(sd = evas_object_smart_data_get(data))) return;
+ evas_object_geometry_get(data, ox, oy, ow, oh);
+ _thumb_type_calc(sd, ox, oy, ow, oh);
+ evas_object_show(sd-o_img);
+ evas_object_show(sd-o_clip);
+}
+
+static void
+_ethumb_cb_done(Ethumb_Client *ec EINA_UNUSED, const char *file, const char
*key, void *data)
+{
+ Media *sd;
+
+ if (!(sd = evas_object_smart_data_get(data))) return;
+ sd-et_req = NULL;
+ evas_object_event_callback_add(sd-o_img, EVAS_CALLBACK_IMAGE_PRELOADED,
+ _thumb_cb_preloaded, data);
+ evas_object_image_file_set(sd-o_img, file, key);
+ evas_object_image_size_get(sd-o_img, sd-iw, sd-ih);
+ evas_object_image_preload(sd-o_img, EINA_FALSE);
+}
+
+static void
+_ethumb_cb_error(Ethumb_Client *ec EINA_UNUSED, void *data)
+{
+ Media *sd;
+
+ if (!(sd = evas_object_smart_data_get(data))) return;
+ sd-et_req = NULL;
+}
+
+static void
+_ethumb_disconnect(void *data EINA_UNUSED, Ethumb_Client *ec)
+{
+ if (ec != et_client) return;
+ ethumb_client_disconnect(et_client);
+ et_connected = EINA_FALSE;
+ et_client = NULL;
+ if (et_queue) _ethumb_init();
+}
+
+static void
+_ethumb_connect(void *data EINA_UNUSED, Ethumb_Client *ec, Eina_Bool ok)
+{
+ if (ok)
+ {
+Evas_Object *o;
+
+et_connected = EINA_TRUE;
+
+ethumb_client_on_server_die_callback_set(ec, _ethumb_disconnect,
+ NULL, NULL);
+
+EINA_LIST_FREE(et_queue, o)
+ _thumb_type_init(o);
+ }
+ else
+ et_client = NULL;
+}
+
+static void
+_ethumb_init(void)
+{
+ if (et_client) return;
+ ethumb_client_init();
+ et_client = ethumb_client_connect(_ethumb_connect, NULL, NULL);
+}
+
+static void
+_thumb_type_theme_init(Evas_Object *obj)
+{
+ Media *sd;
+
+ if (!(sd = evas_object_smart_data_get(obj))) return;
+
+ if ((sd-realf) (sd-realf[0] != '/'))
+ {
+static const char *icon_theme = NULL;
+const char *f;
+
+if (!icon_theme)
+ {
+ Efreet_Icon_Theme *theme;
+
+ theme = efreet_icon_theme_find(getenv(E_ICON_THEME));
+ if (!theme)
+ {
+ const char **itr;
+ static const char *themes[] =
+{
+ Human, oxygen, gnome, hicolor, NULL
+};
+
+ for (itr = themes; *itr; itr++)
+{
+ theme = efreet_icon_theme_find(*itr);
+
[EGIT] [bindings/python/python-efl] master 01/01: New 1.15 API: evas.Textblock.obstacle_* functions
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=3de1d7be24840439bea5352b68236df5c44db859 commit 3de1d7be24840439bea5352b68236df5c44db859 Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 18:53:19 2015 +0200 New 1.15 API: evas.Textblock.obstacle_* functions untested, but quite simple api, should work --- efl/evas/efl.evas_object_textblock.pxi | 46 ++ include/efl.evas.pxd | 3 +++ 2 files changed, 49 insertions(+) diff --git a/efl/evas/efl.evas_object_textblock.pxi b/efl/evas/efl.evas_object_textblock.pxi index 6847848..62233c0 100644 --- a/efl/evas/efl.evas_object_textblock.pxi +++ b/efl/evas/efl.evas_object_textblock.pxi @@ -182,6 +182,52 @@ cdef class Textblock(Object): evas_object_textblock_style_insets_get(self.obj, l, r, t, b) return (l, r, t, b) +def obstacle_add(self, Object obstacle): + +Add obstacle evas object to be observed during layout of text. +The textblock does the layout of the text according to the position +of the obstacle. + +:param obstacle: An evas object to be used as an obstacle +:type obstacle: :class:`Object` + +:return: ``True`` on success or ``False`` on failure +:rtype: bool + +.. versionadded:: 1.15 + + +return bool(evas_object_textblock_obstacle_add(self.obj, obstacle.obj)) + +def obstacle_del(self, Object obstacle): +Removes an object from observation during text layout. + +:param obstacle: An evas object to be removed as an obstacle +:type obstacle: :class:`Object` + +:return: ``True`` on success or ``False`` on failure +:rtype: bool + +.. versionadded:: 1.15 + + + +return bool(evas_object_textblock_obstacle_del(self.obj, obstacle.obj)) + +def obstacles_update(self): +Triggers for relayout due to obstacles' state change. + +The obstacles alone don't affect the layout, until this is called. Use +this after doing changes (moving, positioning etc.) in the obstacles +that you would like to be considered in the layout. For example: if you +have just repositioned the obstacles to differrent coordinates relative +to the textblock, you need to call this so it will consider this new +state and will relayout the text. + +.. versionadded:: 1.15 + + +evas_object_textblock_obstacles_update(self.obj) _object_mapping_register(Evas_Textblock, Textblock) diff --git a/include/efl.evas.pxd b/include/efl.evas.pxd index 98d13bd..6eac7ba 100644 --- a/include/efl.evas.pxd +++ b/include/efl.evas.pxd @@ -1027,6 +1027,9 @@ cdef extern from Evas.h: void evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) void evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) void evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) +Eina_Bool evas_object_textblock_obstacle_add(const Evas_Object *obj, Evas_Object *obstacle) +Eina_Bool evas_object_textblock_obstacle_del(const Evas_Object *obj, Evas_Object *obstacle) +Eina_Bool evas_object_textblock_obstacles_update(const Evas_Object *obj) --
[EGIT] [core/elementary] master 01/02: Revert Removes ELM_CHECK_BACKEND[EGLFS] which searches for an ecore-eglfs
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=15565fe7967c6beb3e7902c5ffcb5033ad8a58b7
commit 15565fe7967c6beb3e7902c5ffcb5033ad8a58b7
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:39:38 2015 +0200
Revert Removes ELM_CHECK_BACKEND[EGLFS] which searches for an ecore-eglfs
This reverts commit aff92d581ed052413aa36785a9291e47315eb518.
---
configure.ac | 1 +
src/lib/elm_win.c | 12 +---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3b93e8e..41436b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,7 @@ ELM_CHECK_BACKEND([Cocoa])
ELM_CHECK_BACKEND([Win32])
ELM_CHECK_BACKEND([Wayland])
ELM_CHECK_BACKEND([DRM])
+ELM_CHECK_BACKEND([EGLFS])
ELM_CHECK_OPTION([elocation], [0.1.0])
ELM_CHECK_OPTION([eweather], [0.2.0])
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 6c29818..1000f86 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3386,7 +3386,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
}
#endif
-#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB)
+#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB) ||
defined(HAVE_ELEMENTARY_EGLFS)
else if ((disp) (!strcmp(disp, fb)))
{
#ifdef HAVE_ELEMENTARY_DRM
@@ -3394,6 +3394,8 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#endif
#ifdef HAVE_ELEMENTARY_FB
enginelist[p++] = ELM_SOFTWARE_FB;
+#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
enginelist[p++] = ELM_EGLFS;
#endif
}
@@ -3455,7 +3457,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
enginelist[p++] = ELM_DRM;
#endif
#ifdef HAVE_ELEMENTARY_FB
- enginelist[p++] = ELM_EGLFS;
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
#ifdef HAVE_ELEMENTARY_COCOA
@@ -3480,6 +3481,9 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
+ enginelist[p++] = ELM_EGLFS;
+#endif
}
else
{
@@ -3497,7 +3501,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
enginelist[p++] = ELM_DRM;
#endif
#ifdef HAVE_ELEMENTARY_FB
- enginelist[p++] = ELM_EGLFS;
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
#ifdef HAVE_ELEMENTARY_COCOA
@@ -3525,6 +3528,9 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
+ enginelist[p++] = ELM_EGLFS;
+#endif
}
}
enginelist[p++] = NULL;
--
[EGIT] [misc/entrance] master 01/04: entrance_wait: do not react on closed children
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=b67f79219d817fe54623d8e16e010736f61b3552
commit b67f79219d817fe54623d8e16e010736f61b3552
Author: Marcel Hollerbach marcel-hollerb...@t-online.de
Date: Mon Aug 3 13:22:05 2015 +0200
entrance_wait: do not react on closed children
This fixes T2627
---
src/daemon/entrance_wait.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/daemon/entrance_wait.c b/src/daemon/entrance_wait.c
index b34e913..4d97ef9 100644
--- a/src/daemon/entrance_wait.c
+++ b/src/daemon/entrance_wait.c
@@ -18,8 +18,7 @@ static void
_entrance_wait_action(int sig, siginfo_t * si __UNUSED__, void *data
__UNUSED__)
{
kill_wait();
-if (sig != SIGCHLD)
- setenv(ENTRANCE_QUIT, 1, 1);
+setenv(ENTRANCE_QUIT, 1, 1);
}
static void
@@ -48,7 +47,6 @@ main (int argc __UNUSED__, char **argv __UNUSED__)
action.sa_sigaction = _entrance_wait_action;
action.sa_flags = SA_RESTART | SA_SIGINFO;
sigemptyset(action.sa_mask);
- sigaction(SIGCHLD, action, NULL);
sigaction(SIGQUIT, action, NULL);
sigaction(SIGTERM, action, NULL);
sigaction(SIGKILL, action, NULL);
--
[EGIT] [core/efl] master 06/07: [HACK] ecore_evas_fb: Comments ecore_fb_ts calls that aren't resolved at runtime
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff5f8a0412d02e245754e4a90122a7715036cb64
commit ff5f8a0412d02e245754e4a90122a7715036cb64
Author: Florent Revest revest...@gmail.com
Date: Wed Jul 22 18:55:16 2015 +0200
[HACK] ecore_evas_fb: Comments ecore_fb_ts calls that aren't resolved at
runtime
---
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 34e410d..586d797 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -262,9 +262,9 @@ _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
if ((!mouse_handled) || (always_ts))
{
-if (ecore_fb_ts_init())
+if (1) //ecore_fb_ts_init())
{
- ecore_fb_ts_event_window_set(ee);
+ // ecore_fb_ts_event_window_set(ee);
ecore_evas_event_handlers[0] =
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
_ecore_evas_event_mouse_button_down, NULL);
ecore_evas_event_handlers[1] =
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
_ecore_evas_event_mouse_button_up, NULL);
ecore_evas_event_handlers[2] =
ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _ecore_evas_event_mouse_move,
NULL);
@@ -287,7 +287,7 @@ _ecore_evas_fb_shutdown(void)
if (ecore_evas_event_handlers[i])
ecore_event_handler_del(ecore_evas_event_handlers[i]);
}
-ecore_fb_ts_shutdown();
+// ecore_fb_ts_shutdown();
ecore_event_evas_shutdown();
}
if (_ecore_evas_init_count 0) _ecore_evas_init_count = 0;
--
[EGIT] [core/efl] master 03/07: Adds support of the eglfs module in the autotools config
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3b2074aa710a095c2379702334bfa125bcc1990a
commit 3b2074aa710a095c2379702334bfa125bcc1990a
Author: Florent Revest revest...@gmail.com
Date: Wed Jul 22 18:50:13 2015 +0200
Adds support of the eglfs module in the autotools config
---
Makefile.am| 4
configure.ac | 19 +++
m4/evas_check_engine.m4| 43 +++
pc/.gitignore | 1 +
pc/evas-eglfs.pc.in| 3 +++
src/Makefile_Ecore_Evas.am | 5 -
src/Makefile_Evas.am | 42 ++
7 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 56c298c..0c9b634 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,6 +179,10 @@ if BUILD_ENGINE_FB
pkgconfig_DATA += pc/evas-fb.pc
endif
+if BUILD_ENGINE_EGLFS
+pkgconfig_DATA += pc/evas-eglfs.pc
+endif
+
if BUILD_ENGINE_BUFFER
pkgconfig_DATA += pc/evas-software-buffer.pc
endif
diff --git a/configure.ac b/configure.ac
index 7975e55..b1e3896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1415,6 +1415,19 @@ AC_ARG_ENABLE([fb],
],
[want_fb=no])
+# Eglfs
+AC_ARG_ENABLE([eglfs],
+ [AS_HELP_STRING([--enable-eglfs],[enable hardware accelerated framebuffer
access. @:@default=disabled@:@])],
+ [
+if test x${enableval} = xyes ; then
+ want_eglfs=yes
+ want_fb=yes
+else
+ want_eglfs=no
+fi
+ ],
+ [want_eglfs=no])
+
# SDL
AC_ARG_ENABLE([sdl],
[AS_HELP_STRING([--enable-sdl],[enable SDL support.
@:@default=disabled@:@])],
@@ -1851,6 +1864,7 @@ EVAS_CHECK_ENGINE([wayland-egl],
[${want_evas_engine_wayland_egl}], [no], [Wayla
EVAS_CHECK_ENGINE([wayland-shm], [${want_wayland}], [no], [Wayland Shm])
EVAS_CHECK_ENGINE([drm], [${want_drm}], [no], [Drm])
EVAS_CHECK_ENGINE([gl-drm], [${want_gl_drm}], [no], [OpenGL Drm])
+EVAS_CHECK_ENGINE([eglfs], [${want_eglfs}], [no], [OpenGL Fb])
# Software XCB
@@ -2007,6 +2021,7 @@ if test x$have_evas_engine_gl_xlib = xyes || \
test x$have_evas_engine_gl_sdl = xyes || \
test x$have_evas_engine_gl_cocoa = xyes || \
test x$have_evas_engine_gl_drm = xyes || \
+ test x$have_evas_engine_eglfs = xyes || \
test x$have_evas_engine_wayland_egl = xyes; then
have_evas_engine_gl_common=yes
fi
@@ -2015,6 +2030,7 @@ if test x$have_evas_engine_gl_xlib = xstatic || \
test x$have_evas_engine_gl_sdl = xstatic || \
test x$have_evas_engine_gl_cocoa = xstatic || \
test x$have_evas_engine_gl_drm = xstatic || \
+ test x$have_evas_engine_eglfs = xstatic || \
test x$have_evas_engine_wayland_egl = xstatic; then
have_evas_engine_gl_common=yes
have_static_evas_engine_gl_common=yes
@@ -3890,6 +3906,7 @@ want_ecore_evas_gl_cocoa=${have_evas_engine_gl_cocoa}
want_ecore_evas_wayland_egl=${have_evas_engine_wayland_egl}
want_ecore_evas_extn=yes
want_ecore_evas_drm=${have_evas_engine_drm}
+want_ecore_evas_eglfs=${have_evas_engine_eglfs}
if test x${have_ecore_ipc} = xno || \
test x${efl_func_shm_open} = xno || \
@@ -3917,6 +3934,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [emile])
ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}])
ECORE_EVAS_MODULE([ews], [yes])
ECORE_EVAS_MODULE([fb], [${want_fb}])
+ECORE_EVAS_MODULE([eglfs], [${want_eglfs}])
ECORE_EVAS_MODULE([drm], [${want_drm}],
[EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm])])
ECORE_EVAS_MODULE([gl-drm], [${want_gl_drm}],
@@ -4701,6 +4719,7 @@ pc/eolian-cxx.pc
pc/efl.pc
pc/efl-cxx.pc
pc/evas-fb.pc
+pc/evas-eglfs.pc
pc/evas-opengl-x11.pc
pc/evas-opengl-sdl.pc
pc/evas-opengl-cocoa.pc
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 8165aa2..504d9f3 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -661,6 +661,49 @@ AS_IF([test x${have_dep} = xyes], [$4], [$5])
])
+dnl use: EVAS_CHECK_ENGINE_DEP_EGLFS(engine, simple, want_static[,
ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_EGLFS],
+[
+
+requirement=
+have_dep=no
+have_hw_dep=no
+evas_engine_[]$1[]_cflags=
+evas_engine_[]$1[]_libs=
+
+if test x${with_opengl} = xes ; then
+ gl_library=glesv2
+else
+ AC_MSG_ERROR([We do not support Eglfs without OpenGL ES. Please consider
OpenGL ES if you want to use it.])
+fi
+
+PKG_CHECK_EXISTS([egl = 7.10 ${gl_library}],
+ [
+have_dep=yes
+requirement=egl = 7.10 ${gl_library}
+ ],
+ [have_dep=no])
+
+if test x${have_dep} = xyes ; then
+ if test x$3 = xstatic ; then
+ requirements_pc_evas=${requirement} ${requirements_pc_evas}
+ requirements_pc_deps_evas=${requirement} ${requirements_pc_deps_evas}
+ else
+ PKG_CHECK_MODULES([EGLFS], [${requirement}])
+ evas_engine_[]$1[]_cflags=${EGLFS_CFLAGS}
+ evas_engine_[]$1[]_libs=${EGLFS_LIBS}
+ evas_engine_gl_common_libs=$evas_engine_[]$1[]_libdirs -lGLESv2 -lm
-lEGL
+
[EGIT] [core/efl] master 07/07: [HACK] configure.ac: Forces linking with -lEGL
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9f8f64b697f974dc204acd340560e9547b21d743
commit 9f8f64b697f974dc204acd340560e9547b21d743
Author: Florent Revest revest...@gmail.com
Date: Wed Jul 22 18:56:25 2015 +0200
[HACK] configure.ac: Forces linking with -lEGL
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 399a0bb..22e8770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1986,7 +1986,7 @@ evas_engine_gl_common_cflags=
if test x${have_egl} = xyes; then
evas_engine_gl_common_libs=-lEGL
else
- evas_engine_gl_common_libs=-lGL
+ evas_engine_gl_common_libs=-lEGL
fi
# The lines below fix compiling/linking of gl_generic on OSX
--
[EGIT] [core/elementary] master 02/02: Removes ELM_CHECK_BACKEND[EGLFS] which searches for an ecore-eglfs
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=aff92d581ed052413aa36785a9291e47315eb518
commit aff92d581ed052413aa36785a9291e47315eb518
Author: Florent Revest revest...@gmail.com
Date: Thu Jul 30 18:23:25 2015 +0200
Removes ELM_CHECK_BACKEND[EGLFS] which searches for an ecore-eglfs
---
configure.ac | 1 -
src/lib/elm_win.c | 12 +++-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 41436b4..3b93e8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,6 @@ ELM_CHECK_BACKEND([Cocoa])
ELM_CHECK_BACKEND([Win32])
ELM_CHECK_BACKEND([Wayland])
ELM_CHECK_BACKEND([DRM])
-ELM_CHECK_BACKEND([EGLFS])
ELM_CHECK_OPTION([elocation], [0.1.0])
ELM_CHECK_OPTION([eweather], [0.2.0])
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1000f86..6c29818 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3386,7 +3386,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
}
#endif
-#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB) ||
defined(HAVE_ELEMENTARY_EGLFS)
+#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB)
else if ((disp) (!strcmp(disp, fb)))
{
#ifdef HAVE_ELEMENTARY_DRM
@@ -3394,8 +3394,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#endif
#ifdef HAVE_ELEMENTARY_FB
enginelist[p++] = ELM_SOFTWARE_FB;
-#endif
-#ifdef HAVE_ELEMENTARY_EGLFS
enginelist[p++] = ELM_EGLFS;
#endif
}
@@ -3457,6 +3455,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
enginelist[p++] = ELM_DRM;
#endif
#ifdef HAVE_ELEMENTARY_FB
+ enginelist[p++] = ELM_EGLFS;
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
#ifdef HAVE_ELEMENTARY_COCOA
@@ -3481,9 +3480,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
-#ifdef HAVE_ELEMENTARY_EGLFS
- enginelist[p++] = ELM_EGLFS;
-#endif
}
else
{
@@ -3501,6 +3497,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
enginelist[p++] = ELM_DRM;
#endif
#ifdef HAVE_ELEMENTARY_FB
+ enginelist[p++] = ELM_EGLFS;
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
#ifdef HAVE_ELEMENTARY_COCOA
@@ -3528,9 +3525,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
-#ifdef HAVE_ELEMENTARY_EGLFS
- enginelist[p++] = ELM_EGLFS;
-#endif
}
}
enginelist[p++] = NULL;
--
[EGIT] [bindings/python/python-efl] master 01/01: New 1.15 API: EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, with test
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=97dadf30da441d91ba46389c9f8b711ad611aca6 commit 97dadf30da441d91ba46389c9f8b711ad611aca6 Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 14:09:36 2015 +0200 New 1.15 API: EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, with test Also fixed EVAS_CALLBACK_AXIS_UPDATE that was half implemented --- efl/evas/efl.evas.pyx | 4 efl/evas/efl.evas_canvas_callbacks.pxi | 12 ++-- efl/evas/efl.evas_object_callbacks.pxi | 15 +-- examples/elementary/test_core_evas_canvas_callbacks.py | 5 + include/efl.evas.pxd | 1 + 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/efl/evas/efl.evas.pyx b/efl/evas/efl.evas.pyx index df557a5..4f0673d 100644 --- a/efl/evas/efl.evas.pyx +++ b/efl/evas/efl.evas.pyx @@ -257,6 +257,10 @@ Evas_Callback_Type Input device changed value on some axis. (since 1.13) +.. data:: EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE + +Canvas viewport resized. (since 1.15) + .. data:: EVAS_CALLBACK_LAST kept as last element/sentinel – not really an event. diff --git a/efl/evas/efl.evas_canvas_callbacks.pxi b/efl/evas/efl.evas_canvas_callbacks.pxi index 2901158..064c927 100644 --- a/efl/evas/efl.evas_canvas_callbacks.pxi +++ b/efl/evas/efl.evas_canvas_callbacks.pxi @@ -158,10 +158,16 @@ cdef void cb_canvas_render_post(void *data, Evas *e, void *e_inf) with gil: #cb_canvas_dispatcher(Canvasdata, o, EVAS_CALLBACK_RENDER_POST) cb_canvas_dispatcher2(Canvasdata, EVAS_CALLBACK_RENDER_POST) +cdef void cb_canvas_axis_update(void *data, Evas *e, void *e_inf) with gil: +cb_canvas_dispatcher2(Canvasdata, EVAS_CALLBACK_AXIS_UPDATE) + +cdef void cb_canvas_viewport_resize(void *data, Evas *e, void *e_inf) with gil: +cb_canvas_dispatcher2(Canvasdata, EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE) + cdef int evas_canvas_event_callbacks_len -cdef Evas_Event_Cb evas_canvas_event_callbacks[34] -evas_canvas_event_callbacks_len = 34 +cdef Evas_Event_Cb evas_canvas_event_callbacks[36] +evas_canvas_event_callbacks_len = 36 evas_canvas_event_callbacks[intEVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in evas_canvas_event_callbacks[intEVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out evas_canvas_event_callbacks[intEVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down @@ -196,3 +202,5 @@ evas_canvas_event_callbacks[intEVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pr evas_canvas_event_callbacks[intEVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post evas_canvas_event_callbacks[intEVAS_CALLBACK_IMAGE_RESIZE] = cb_canvas_image_resize evas_canvas_event_callbacks[intEVAS_CALLBACK_DEVICE_CHANGED] = cb_canvas_device_changed +evas_canvas_event_callbacks[intEVAS_CALLBACK_AXIS_UPDATE] = cb_canvas_axis_update +evas_canvas_event_callbacks[intEVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE] = cb_canvas_viewport_resize diff --git a/efl/evas/efl.evas_object_callbacks.pxi b/efl/evas/efl.evas_object_callbacks.pxi index 3dc7e7b..947f8b0 100644 --- a/efl/evas/efl.evas_object_callbacks.pxi +++ b/efl/evas/efl.evas_object_callbacks.pxi @@ -246,9 +246,18 @@ cdef void cb_object_canvas_render_post(void *data, Evas *e, Evas_Object *obj, void *e_inf) with gil: print(EVAS_CALLBACK_RENDER_POST is not supported by object.) +cdef void cb_object_axis_update(void *data, Evas *e, + Evas_Object *obj, void *e_inf) with gil: +print(EVAS_CALLBACK_AXIS_UPDATE is not supported by object.) + +cdef void cb_object_viewport_resize(void *data, Evas *e, + Evas_Object *obj, void *e_inf) with gil: +print(EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE is not supported by object.) + + cdef int evas_object_event_callbacks_len -cdef Evas_Object_Event_Cb evas_object_event_callbacks[34] -evas_object_event_callbacks_len = 34 +cdef Evas_Object_Event_Cb evas_object_event_callbacks[36] +evas_object_event_callbacks_len = 36 evas_object_event_callbacks[intEVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in evas_object_event_callbacks[intEVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out evas_object_event_callbacks[intEVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down @@ -283,3 +292,5 @@ evas_object_event_callbacks[intEVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_re evas_object_event_callbacks[intEVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post evas_object_event_callbacks[intEVAS_CALLBACK_IMAGE_RESIZE] = cb_object_image_resize evas_object_event_callbacks[intEVAS_CALLBACK_DEVICE_CHANGED] = cb_object_device_changed +evas_object_event_callbacks[intEVAS_CALLBACK_AXIS_UPDATE] = cb_object_axis_update +evas_object_event_callbacks[intEVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE] = cb_object_viewport_resize diff --git a/examples/elementary/test_core_evas_canvas_callbacks.py
[EGIT] [core/efl] master 05/07: configure.ac: Don't check for Xprint extension. cf: https://github.com/openembedded/meta-oe/blob/master/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-X
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e0cd04cdcd1e7b6b02a6b34ca5bea5f9a73f1ad
commit 9e0cd04cdcd1e7b6b02a6b34ca5bea5f9a73f1ad
Author: Florent Revest revest...@gmail.com
Date: Wed Jul 22 18:53:30 2015 +0200
configure.ac: Don't check for Xprint extension. cf:
https://github.com/openembedded/meta-oe/blob/master/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index b1e3896..399a0bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3640,7 +3640,6 @@ if test x${want_x11_xlib} = xyes ; then
ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes],
[XFixesExpandRegion])
ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama],
[XineramaQueryScreens])
- ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens])
ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr],
[XRRGetScreenResourcesCurrent])
ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender],
[XRenderFindVisualFormat])
ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
--
[EGIT] [core/efl] master 02/07: evas: Adds an eglfs module
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=270215889d5ba4e93f9ec05cfa9a9510a345c96c
commit 270215889d5ba4e93f9ec05cfa9a9510a345c96c
Author: Florent Revest revest...@gmail.com
Date: Wed Jul 22 18:49:14 2015 +0200
evas: Adds an eglfs module
---
src/modules/evas/engines/eglfs/Evas_Engine_Eglfs.h | 45 +
src/modules/evas/engines/eglfs/evas_engine.c | 1245
src/modules/evas/engines/eglfs/evas_engine.h | 129 ++
src/modules/evas/engines/eglfs/evas_outbuf.c | 509
4 files changed, 1928 insertions(+)
diff --git a/src/modules/evas/engines/eglfs/Evas_Engine_Eglfs.h
b/src/modules/evas/engines/eglfs/Evas_Engine_Eglfs.h
new file mode 100644
index 000..8746e41
--- /dev/null
+++ b/src/modules/evas/engines/eglfs/Evas_Engine_Eglfs.h
@@ -0,0 +1,45 @@
+#ifndef _EVAS_ENGINE_EGLFS_H
+# define _EVAS_ENGINE_EGLFS_H
+
+typedef enum _Evas_Engine_Info_Eglfs_Swap_Mode
+{
+ EVAS_ENGINE_EGLFS_SWAP_MODE_AUTO = 0,
+ EVAS_ENGINE_EGLFS_SWAP_MODE_FULL = 1,
+ EVAS_ENGINE_EGLFS_SWAP_MODE_COPY = 2,
+ EVAS_ENGINE_EGLFS_SWAP_MODE_DOUBLE = 3,
+ EVAS_ENGINE_EGLFS_SWAP_MODE_TRIPLE = 4,
+ EVAS_ENGINE_EGLFS_SWAP_MODE_QUADRUPLE = 5
+} Evas_Engine_Info_Eglfs_Swap_Mode;
+
+typedef struct _Evas_Engine_Info_Eglfs Evas_Engine_Info_Eglfs;
+
+struct _Evas_Engine_Info_Eglfs
+{
+ /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
+ /* at you and make nasty noises */
+ Evas_Engine_Info magic;
+
+ struct
+ {
+unsigned int rotation, depth;
+unsigned int crtc_id, conn_id, buffer_id;
+unsigned int format, flags;
+
+Eina_Bool destination_alpha : 1;
+Eina_Bool vsync : 1;
+Eina_Bool indirect : 1;
+unsigned char swap_mode : 4;
+ } info;
+
+ struct
+ {
+void (*pre_swap)(void *data, Evas *evas);
+void (*post_swap)(void *data, Evas *evas);
+void *data;
+ } callback;
+
+ /* non-blocking or blocking mode */
+ Evas_Engine_Render_Mode render_mode;
+};
+
+#endif
diff --git a/src/modules/evas/engines/eglfs/evas_engine.c
b/src/modules/evas/engines/eglfs/evas_engine.c
new file mode 100644
index 000..7c59f6f
--- /dev/null
+++ b/src/modules/evas/engines/eglfs/evas_engine.c
@@ -0,0 +1,1245 @@
+#include config.h
+#include evas_engine.h
+#include wayland-client.h
+
+#ifdef HAVE_DLSYM
+# include dlfcn.h /* dlopen,dlclose,etc */
+#else
+# error eglfs should not get compiled if dlsym is not found on the system!
+#endif
+
+#ifdef EVAS_CSERVE2
+# include evas_cs2_private.h
+#endif
+
+#define EVAS_GL_NO_GL_H_CHECK 1
+#include Evas_GL.h
+
+#define EVAS_GL_UPDATE_TILE_SIZE 16
+
+#ifndef EGL_NATIVE_PIXMAP_KHR
+# define EGL_NATIVE_PIXMAP_KHR 0x30b0
+#endif
+
+/* external variables */
+int _evas_engine_eglfs_log_dom = -1;
+int _extn_have_buffer_age = 1;
+
+/* local variables */
+static Eina_Bool initted = EINA_FALSE;
+static int gl_wins = 0;
+
+/* local structures */
+typedef struct _Render_Engine Render_Engine;
+struct _Render_Engine
+{
+ Render_Engine_GL_Generic generic;
+};
+
+typedef struct _Native Native;
+struct _Native
+{
+ Evas_Native_Surface ns;
+ struct wl_buffer *wl_buf;
+ void *egl_surface;
+};
+
+/* local function prototype types */
+typedef void (*_eng_fn)(void);
+typedef _eng_fn (*glsym_func_eng_fn)();
+typedef void (*glsym_func_void)();
+typedef void *(*glsym_func_void_ptr)();
+typedef int (*glsym_func_int)();
+typedef unsigned int (*glsym_func_uint)();
+typedef const char *(*glsym_func_const_char_ptr)();
+
+/* external dynamic loaded Evas_GL function pointers */
+Evas_GL_Common_Image_Call glsym_evas_gl_common_image_ref = NULL;
+Evas_GL_Common_Image_Call glsym_evas_gl_common_image_unref = NULL;
+Evas_GL_Common_Image_Call glsym_evas_gl_common_image_free = NULL;
+Evas_GL_Common_Image_Call glsym_evas_gl_common_image_native_disable = NULL;
+Evas_GL_Common_Image_Call glsym_evas_gl_common_image_native_enable = NULL;
+Evas_GL_Common_Image_New_From_Data glsym_evas_gl_common_image_new_from_data =
NULL;
+Evas_GL_Common_Context_Call glsym_evas_gl_common_image_all_unload = NULL;
+Evas_GL_Preload glsym_evas_gl_preload_init = NULL;
+Evas_GL_Preload glsym_evas_gl_preload_shutdown = NULL;
+EVGL_Engine_Call glsym_evgl_engine_shutdown = NULL;
+EVGL_Current_Native_Context_Get_Call glsym_evgl_current_native_context_get =
NULL;
+Evas_Gl_Symbols glsym_evas_gl_symbols = NULL;
+
+Evas_GL_Common_Context_New glsym_evas_gl_common_context_new = NULL;
+Evas_GL_Common_Context_Call glsym_evas_gl_common_context_flush = NULL;
+Evas_GL_Common_Context_Call glsym_evas_gl_common_context_free = NULL;
+Evas_GL_Common_Context_Call glsym_evas_gl_common_context_use = NULL;
+Evas_GL_Common_Context_Call glsym_evas_gl_common_context_newframe = NULL;
+Evas_GL_Common_Context_Call glsym_evas_gl_common_context_done = NULL;
+Evas_GL_Common_Context_Resize_Call glsym_evas_gl_common_context_resize = NULL;
+Evas_GL_Common_Buffer_Dump_Call
[EGIT] [core/efl] master 05/07: Revert configure.ac: Don't check for Xprint extension. cf:
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2415d8d352340cc6b2edd60499aa9014b1582e1b
commit 2415d8d352340cc6b2edd60499aa9014b1582e1b
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:34:58 2015 +0200
Revert configure.ac: Don't check for Xprint extension. cf:
This reverts commit 9e0cd04cdcd1e7b6b02a6b34ca5bea5f9a73f1ad.
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index 5dda088..1b8b0e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3624,6 +3624,7 @@ if test x${want_x11_xlib} = xyes ; then
ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes],
[XFixesExpandRegion])
ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama],
[XineramaQueryScreens])
+ ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens])
ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr],
[XRRGetScreenResourcesCurrent])
ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender],
[XRenderFindVisualFormat])
ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
--
[EGIT] [core/efl] master 06/07: Revert [HACK] ecore_evas_fb: Comments ecore_fb_ts calls that aren't resolved at runtime
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d54ef1d5932ac3a886ffc31ca907c6bc846197a0
commit d54ef1d5932ac3a886ffc31ca907c6bc846197a0
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:34:59 2015 +0200
Revert [HACK] ecore_evas_fb: Comments ecore_fb_ts calls that aren't
resolved at runtime
This reverts commit ff5f8a0412d02e245754e4a90122a7715036cb64.
---
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 1f0e3f2..8042d0c 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -262,9 +262,9 @@ _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
if ((!mouse_handled) || (always_ts))
{
-if (1) //ecore_fb_ts_init())
+if (ecore_fb_ts_init())
{
- // ecore_fb_ts_event_window_set(ee);
+ ecore_fb_ts_event_window_set(ee);
ecore_evas_event_handlers[0] =
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
_ecore_evas_event_mouse_button_down, NULL);
ecore_evas_event_handlers[1] =
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
_ecore_evas_event_mouse_button_up, NULL);
ecore_evas_event_handlers[2] =
ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _ecore_evas_event_mouse_move,
NULL);
@@ -287,7 +287,7 @@ _ecore_evas_fb_shutdown(void)
if (ecore_evas_event_handlers[i])
ecore_event_handler_del(ecore_evas_event_handlers[i]);
}
-// ecore_fb_ts_shutdown();
+ecore_fb_ts_shutdown();
ecore_event_evas_shutdown();
}
if (_ecore_evas_init_count 0) _ecore_evas_init_count = 0;
--
[EGIT] [core/efl] master 07/07: Revert [HACK] configure.ac: Forces linking with -lEGL
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=da919e609e39e6aa464fc8ecc80adf6d5aaa04bb
commit da919e609e39e6aa464fc8ecc80adf6d5aaa04bb
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:35:00 2015 +0200
Revert [HACK] configure.ac: Forces linking with -lEGL
This reverts commit 9f8f64b697f974dc204acd340560e9547b21d743.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1b8b0e3..7975e55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1972,7 +1972,7 @@ evas_engine_gl_common_cflags=
if test x${have_egl} = xyes; then
evas_engine_gl_common_libs=-lEGL
else
- evas_engine_gl_common_libs=-lEGL
+ evas_engine_gl_common_libs=-lGL
fi
# The lines below fix compiling/linking of gl_generic on OSX
--
[EGIT] [core/efl] master 04/07: Revert Include Eet.h where needed. cf:
captainigloo pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b79ab57226646a1a51947336755f1a2a9ff9aaea commit b79ab57226646a1a51947336755f1a2a9ff9aaea Author: Nicolas Aguirre aguirre.nico...@gmail.com Date: Mon Aug 3 14:34:57 2015 +0200 Revert Include Eet.h where needed. cf: This reverts commit 877338659b4176e1a77f7b6cf37f6225cca763bc. --- src/lib/evas/canvas/evas_canvas3d_eet.c | 1 - src/modules/evas/model_loaders/eet/evas_model_load_eet.c | 1 - src/modules/evas/model_savers/eet/evas_model_save_eet.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas3d_eet.c b/src/lib/evas/canvas/evas_canvas3d_eet.c index 37bb3c6..281f69d 100644 --- a/src/lib/evas/canvas/evas_canvas3d_eet.c +++ b/src/lib/evas/canvas/evas_canvas3d_eet.c @@ -1,5 +1,4 @@ #include stdio.h -#include Eet.h #include evas_common_private.h #include evas_private.h diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c index 7ebaf8e..803846d 100644 --- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c +++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c @@ -3,7 +3,6 @@ #endif #include Eo.h -#include Eet.h #include stdio.h #include evas_common_private.h #include evas_private.h diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c index 4d56977..71e094a 100644 --- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c +++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c @@ -2,7 +2,6 @@ #include config.h #endif -#include Eet.h #include stdio.h #include evas_common_private.h #include evas_private.h --
[EGIT] [core/efl] master 01/07: Revert ecore_evas: Adds an eglfs module
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3594b230affeca3e940e19b2811b1d27ca9d6f85
commit 3594b230affeca3e940e19b2811b1d27ca9d6f85
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:34:54 2015 +0200
Revert ecore_evas: Adds an eglfs module
This reverts commit a254725d6dedbcfec638f8151bd89e9db068df8f.
---
src/lib/ecore_evas/Ecore_Evas.h | 3 -
src/lib/ecore_evas/ecore_evas.c | 36
src/lib/ecore_evas/ecore_evas_module.c| 3 -
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c | 106 --
4 files changed, 148 deletions(-)
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 9e94ebd..1a035ab 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -91,7 +91,6 @@ extern C {
*/
#define HAVE_ECORE_EVAS_X 1
#define HAVE_ECORE_EVAS_FB 1
-#define HAVE_ECORE_EVAS_EGLFS 1
#define HAVE_ECORE_EVAS_X11_GL 1
//#define HAVE_ECORE_EVAS_X11_16 1
//#define HAVE_ECORE_EVAS_DIRECTFB 1
@@ -122,7 +121,6 @@ typedef enum _Ecore_Evas_Engine_Type
ECORE_EVAS_ENGINE_SOFTWARE_SDL,
ECORE_EVAS_ENGINE_DIRECTFB,
ECORE_EVAS_ENGINE_SOFTWARE_FB,
- ECORE_EVAS_ENGINE_EGLFS,
ECORE_EVAS_ENGINE_SOFTWARE_8_X11,
ECORE_EVAS_ENGINE_SOFTWARE_16_X11,
ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW,
@@ -1305,7 +1303,6 @@ EAPI void
ecore_evas_software_x11_16_extra_event_window_add(Ecore_Eva
* @return The new Ecore_Evas.
*/
EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation,
int w, int h);
-EAPI Ecore_Evas *ecore_evas_eglfs_new(const char *disp_name, int rotation,
int w, int h);
EAPI Ecore_Evas *ecore_evas_directfb_new(const char *disp_name, int
windowed, int x, int y, int w, int h) EINA_DEPRECATED;
EAPI Ecore_DirectFB_Window *ecore_evas_directfb_window_get(const Ecore_Evas
*ee) EINA_DEPRECATED;
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index ad15b1f..f7fa61f 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -277,12 +277,6 @@
ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
#else
return EINA_FALSE;
#endif
- case ECORE_EVAS_ENGINE_EGLFS:
-#ifdef BUILD_ECORE_EVAS_EGLFS
-return EINA_TRUE;
-#else
-return EINA_FALSE;
-#endif
case ECORE_EVAS_ENGINE_SOFTWARE_8_X11:
return EINA_FALSE;
@@ -647,22 +641,6 @@ _ecore_evas_constructor_fb(int x EINA_UNUSED, int y
EINA_UNUSED, int w, int h, c
}
static Ecore_Evas *
-_ecore_evas_constructor_eglfs(int x EINA_UNUSED, int y EINA_UNUSED, int w, int
h, const char *extra_options)
-{
- Ecore_Evas *ee;
- char *disp_name = NULL;
- unsigned int rotation = 0;
-
- _ecore_evas_parse_extra_options_str(extra_options, display=, disp_name);
- _ecore_evas_parse_extra_options_uint(extra_options, rotation=, rotation);
-
- ee = ecore_evas_eglfs_new(disp_name, rotation, w, h);
- free(disp_name);
-
- return ee;
-}
-
-static Ecore_Evas *
_ecore_evas_constructor_psl1ght(int x EINA_UNUSED, int y EINA_UNUSED, int w,
int h, const char *extra_options)
{
Ecore_Evas *ee;
@@ -786,7 +764,6 @@ static const struct ecore_evas_engine _engines[] = {
{software_x11, _ecore_evas_constructor_software_x11},
{opengl_x11, _ecore_evas_constructor_opengl_x11},
{fb, _ecore_evas_constructor_fb},
- {eglfs, _ecore_evas_constructor_eglfs},
{software_gdi, _ecore_evas_constructor_software_gdi},
{software_ddraw, _ecore_evas_constructor_software_ddraw},
{direct3d, _ecore_evas_constructor_direct3d},
@@ -3504,19 +3481,6 @@ ecore_evas_fb_new(const char *disp_name, int rotation,
int w, int h)
}
EAPI Ecore_Evas *
-ecore_evas_eglfs_new(const char *disp_name, int rotation, int w, int h)
-{
- Ecore_Evas *(*new)(const char *, int, int, int);
- Eina_Module *m = _ecore_evas_engine_load(fb);
- EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
-
- new = eina_module_symbol_get(m, ecore_evas_eglfs_new_internal);
- EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
-
- return new(disp_name, rotation, w, h);
-}
-
-EAPI Ecore_Evas *
ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int
x, int y, int w, int h)
{
Ecore_Evas *(*new)(const char *, Ecore_X_Window, int, int, int, int);
diff --git a/src/lib/ecore_evas/ecore_evas_module.c
b/src/lib/ecore_evas/ecore_evas_module.c
index 239829d..59fb601 100644
--- a/src/lib/ecore_evas/ecore_evas_module.c
+++ b/src/lib/ecore_evas/ecore_evas_module.c
@@ -189,9 +189,6 @@ _ecore_evas_available_engines_get(void)
#ifdef BUILD_ECORE_EVAS_FB
ADDENG(fb);
#endif
-#ifdef BUILD_ECORE_EVAS_EGLFS
-ADDENG(eglfs);
-#endif
}
else if (!strcmp(name, x))
{
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
[EGIT] [core/efl] master 03/07: Revert Adds support of the eglfs module in the autotools config
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d990a7b12a748f35f34af98d8dc7e19a70e44d8e
commit d990a7b12a748f35f34af98d8dc7e19a70e44d8e
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:34:57 2015 +0200
Revert Adds support of the eglfs module in the autotools config
This reverts commit 3b2074aa710a095c2379702334bfa125bcc1990a.
---
Makefile.am| 4
configure.ac | 19 ---
m4/evas_check_engine.m4| 43 ---
pc/.gitignore | 1 -
pc/evas-eglfs.pc.in| 3 ---
src/Makefile_Ecore_Evas.am | 5 +
src/Makefile_Evas.am | 42 --
7 files changed, 1 insertion(+), 116 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0c9b634..56c298c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,10 +179,6 @@ if BUILD_ENGINE_FB
pkgconfig_DATA += pc/evas-fb.pc
endif
-if BUILD_ENGINE_EGLFS
-pkgconfig_DATA += pc/evas-eglfs.pc
-endif
-
if BUILD_ENGINE_BUFFER
pkgconfig_DATA += pc/evas-software-buffer.pc
endif
diff --git a/configure.ac b/configure.ac
index 22e8770..5dda088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1415,19 +1415,6 @@ AC_ARG_ENABLE([fb],
],
[want_fb=no])
-# Eglfs
-AC_ARG_ENABLE([eglfs],
- [AS_HELP_STRING([--enable-eglfs],[enable hardware accelerated framebuffer
access. @:@default=disabled@:@])],
- [
-if test x${enableval} = xyes ; then
- want_eglfs=yes
- want_fb=yes
-else
- want_eglfs=no
-fi
- ],
- [want_eglfs=no])
-
# SDL
AC_ARG_ENABLE([sdl],
[AS_HELP_STRING([--enable-sdl],[enable SDL support.
@:@default=disabled@:@])],
@@ -1864,7 +1851,6 @@ EVAS_CHECK_ENGINE([wayland-egl],
[${want_evas_engine_wayland_egl}], [no], [Wayla
EVAS_CHECK_ENGINE([wayland-shm], [${want_wayland}], [no], [Wayland Shm])
EVAS_CHECK_ENGINE([drm], [${want_drm}], [no], [Drm])
EVAS_CHECK_ENGINE([gl-drm], [${want_gl_drm}], [no], [OpenGL Drm])
-EVAS_CHECK_ENGINE([eglfs], [${want_eglfs}], [no], [OpenGL Fb])
# Software XCB
@@ -2021,7 +2007,6 @@ if test x$have_evas_engine_gl_xlib = xyes || \
test x$have_evas_engine_gl_sdl = xyes || \
test x$have_evas_engine_gl_cocoa = xyes || \
test x$have_evas_engine_gl_drm = xyes || \
- test x$have_evas_engine_eglfs = xyes || \
test x$have_evas_engine_wayland_egl = xyes; then
have_evas_engine_gl_common=yes
fi
@@ -2030,7 +2015,6 @@ if test x$have_evas_engine_gl_xlib = xstatic || \
test x$have_evas_engine_gl_sdl = xstatic || \
test x$have_evas_engine_gl_cocoa = xstatic || \
test x$have_evas_engine_gl_drm = xstatic || \
- test x$have_evas_engine_eglfs = xstatic || \
test x$have_evas_engine_wayland_egl = xstatic; then
have_evas_engine_gl_common=yes
have_static_evas_engine_gl_common=yes
@@ -3905,7 +3889,6 @@ want_ecore_evas_gl_cocoa=${have_evas_engine_gl_cocoa}
want_ecore_evas_wayland_egl=${have_evas_engine_wayland_egl}
want_ecore_evas_extn=yes
want_ecore_evas_drm=${have_evas_engine_drm}
-want_ecore_evas_eglfs=${have_evas_engine_eglfs}
if test x${have_ecore_ipc} = xno || \
test x${efl_func_shm_open} = xno || \
@@ -3933,7 +3916,6 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [emile])
ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}])
ECORE_EVAS_MODULE([ews], [yes])
ECORE_EVAS_MODULE([fb], [${want_fb}])
-ECORE_EVAS_MODULE([eglfs], [${want_eglfs}])
ECORE_EVAS_MODULE([drm], [${want_drm}],
[EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm])])
ECORE_EVAS_MODULE([gl-drm], [${want_gl_drm}],
@@ -4718,7 +4700,6 @@ pc/eolian-cxx.pc
pc/efl.pc
pc/efl-cxx.pc
pc/evas-fb.pc
-pc/evas-eglfs.pc
pc/evas-opengl-x11.pc
pc/evas-opengl-sdl.pc
pc/evas-opengl-cocoa.pc
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 504d9f3..8165aa2 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -661,49 +661,6 @@ AS_IF([test x${have_dep} = xyes], [$4], [$5])
])
-dnl use: EVAS_CHECK_ENGINE_DEP_EGLFS(engine, simple, want_static[,
ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([EVAS_CHECK_ENGINE_DEP_EGLFS],
-[
-
-requirement=
-have_dep=no
-have_hw_dep=no
-evas_engine_[]$1[]_cflags=
-evas_engine_[]$1[]_libs=
-
-if test x${with_opengl} = xes ; then
- gl_library=glesv2
-else
- AC_MSG_ERROR([We do not support Eglfs without OpenGL ES. Please consider
OpenGL ES if you want to use it.])
-fi
-
-PKG_CHECK_EXISTS([egl = 7.10 ${gl_library}],
- [
-have_dep=yes
-requirement=egl = 7.10 ${gl_library}
- ],
- [have_dep=no])
-
-if test x${have_dep} = xyes ; then
- if test x$3 = xstatic ; then
- requirements_pc_evas=${requirement} ${requirements_pc_evas}
- requirements_pc_deps_evas=${requirement} ${requirements_pc_deps_evas}
- else
- PKG_CHECK_MODULES([EGLFS], [${requirement}])
- evas_engine_[]$1[]_cflags=${EGLFS_CFLAGS}
- evas_engine_[]$1[]_libs=${EGLFS_LIBS}
-
[EGIT] [core/elementary] master 02/02: Revert Adds eglfs support
captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=30b732fcd1f45152c5a0ef666200640720280c86
commit 30b732fcd1f45152c5a0ef666200640720280c86
Author: Nicolas Aguirre aguirre.nico...@gmail.com
Date: Mon Aug 3 14:39:54 2015 +0200
Revert Adds eglfs support
This reverts commit de52ee0192b5b6d8ad542fb2fd9e4185b39b6518.
---
configure.ac | 2 --
src/lib/elm_config.c | 3 ---
src/lib/elm_priv.h | 1 -
src/lib/elm_win.c| 23 +--
src/lib/elm_win.h| 2 --
5 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/configure.ac b/configure.ac
index 41436b4..b1df15b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,6 @@ ELM_CHECK_BACKEND([Cocoa])
ELM_CHECK_BACKEND([Win32])
ELM_CHECK_BACKEND([Wayland])
ELM_CHECK_BACKEND([DRM])
-ELM_CHECK_BACKEND([EGLFS])
ELM_CHECK_OPTION([elocation], [0.1.0])
ELM_CHECK_OPTION([eweather], [0.2.0])
@@ -544,7 +543,6 @@ echo
echo Engines:
echo X11: ${have_elementary_x}
echo Framebuffer: ${have_elementary_fb}
-echo Eglfs..: ${have_elementary_eglfs}
echo DRM: ${have_elementary_drm}
echo PSL1GHT: ${have_elementary_psl1ght}
echo SDL: ${have_elementary_sdl}
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index a528ffa..7349a3c 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -34,7 +34,6 @@ Eina_Hash *_elm_key_bindings = NULL;
const char *_elm_engines[] = {
software_x11,
fb,
- eglfs,
opengl_x11,
software_gdi,
sdl,
@@ -1827,8 +1826,6 @@ _env_get(void)
eina_stringshare_replace(_elm_config-engine, ELM_WAYLAND_EGL);
else if ((!strcasecmp(s, drm)))
eina_stringshare_replace(_elm_config-engine, ELM_DRM);
-else if ((!strcasecmp(s, eglfs)))
- eina_stringshare_replace(_elm_config-engine, ELM_EGLFS);
else if ((!strcasecmp(s, ddraw)))
eina_stringshare_replace(_elm_config-engine, ELM_SOFTWARE_DDRAW);
else
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 0697876..04ba306 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -148,7 +148,6 @@ extern const char *_elm_engines[];
#define ELM_WAYLAND_EGL (_elm_engines[11])
#define ELM_DRM (_elm_engines[12])
#define ELM_SOFTWARE_DDRAW(_elm_engines[13])
-#define ELM_EGLFS (_elm_engines[14])
#define ELM_FONT_TOKEN_STYLE :style=
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1000f86..9c0b315 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3386,7 +3386,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
}
#endif
-#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB) ||
defined(HAVE_ELEMENTARY_EGLFS)
+#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB)
else if ((disp) (!strcmp(disp, fb)))
{
#ifdef HAVE_ELEMENTARY_DRM
@@ -3395,9 +3395,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_FB
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
-#ifdef HAVE_ELEMENTARY_EGLFS
- enginelist[p++] = ELM_EGLFS;
-#endif
}
#endif
@@ -3481,9 +3478,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
-#ifdef HAVE_ELEMENTARY_EGLFS
- enginelist[p++] = ELM_EGLFS;
-#endif
}
else
{
@@ -3528,9 +3522,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
-#ifdef HAVE_ELEMENTARY_EGLFS
- enginelist[p++] = ELM_EGLFS;
-#endif
}
}
enginelist[p++] = NULL;
@@ -3587,8 +3578,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
tmp_sd.ee = ecore_evas_ews_new(0, 0, 1, 1);
else if (!strcmp(enginelist[i], ELM_SOFTWARE_FB))
tmp_sd.ee = ecore_evas_fb_new(NULL, 0, 1, 1);
- else if (!strcmp(enginelist[i], ELM_EGLFS))
- tmp_sd.ee = ecore_evas_eglfs_new(NULL, 0, 1, 1);
else if (!strcmp(enginelist[i], ELM_BUFFER))
tmp_sd.ee = ecore_evas_buffer_new(1, 1);
else if (!strcmp(enginelist[i], ELM_SOFTWARE_PSL1GHT))
@@ -3772,7 +3761,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
_elm_win_list = eina_list_append(_elm_win_list, obj);
_elm_win_count++;
- if ((engine) ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine,
ELM_DRM)) || (!strcmp(engine, ELM_EGLFS
+ if ((engine) ((!strcmp(engine,
[EGIT] [bindings/python/python-efl] master 01/01: New 1.15 API: Object.focus_move_policy, with test.
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=130f1db451c01270554b2ac02fc4b0f7e6d49beb commit 130f1db451c01270554b2ac02fc4b0f7e6d49beb Author: Dave Andreoli d...@gurumeditation.it Date: Mon Aug 3 16:09:16 2015 +0200 New 1.15 API: Object.focus_move_policy, with test. --- doc/elementary/object.rst | 6 +++ efl/elementary/object.pxi | 20 + efl/elementary/object.py | 1 + efl/elementary/object_cdef.pxi| 3 ++ examples/elementary/test.py | 1 + examples/elementary/test_focus.py | 94 ++- 6 files changed, 123 insertions(+), 2 deletions(-) diff --git a/doc/elementary/object.rst b/doc/elementary/object.rst index 8ebeff6..14756ce 100644 --- a/doc/elementary/object.rst +++ b/doc/elementary/object.rst @@ -105,6 +105,12 @@ Focus move policy .. versionadded:: 1.10 +.. data:: ELM_FOCUS_MOVE_POLICY_KEY_ONLY + +Focus is set on key input like Left, Right, Up, Down, Tab, or Shift+Tab + +.. versionadded:: 1.15 + .. _Elm_Focus_Autoscroll_Mode: diff --git a/efl/elementary/object.pxi b/efl/elementary/object.pxi index f03f775..7d3c5e4 100644 --- a/efl/elementary/object.pxi +++ b/efl/elementary/object.pxi @@ -924,6 +924,26 @@ cdef class Object(SmartObject): def tree_focus_allow_get(self): return bool(elm_object_tree_focus_allow_get(self.obj)) +property focus_move_policy: +The focus movement policy for the object. + +:type: :ref:`Elm_Focus_Move_Policy` + +.. versionadded:: 1.15 + + +def __get__(self): +return elm_object_focus_move_policy_get(self.obj) + +def __set__(self, Elm_Focus_Move_Policy policy): +elm_object_focus_move_policy_set(self.obj, policy) + +def focus_move_policy_get(self): +return elm_object_focus_move_policy_get(self.obj) +def focus_move_policy_set(self, Elm_Focus_Move_Policy policy): +elm_object_focus_move_policy_set(self.obj, policy) + + # # Mirroring # = diff --git a/efl/elementary/object.py b/efl/elementary/object.py index d0fc55d..1345a87 100644 --- a/efl/elementary/object.py +++ b/efl/elementary/object.py @@ -7,6 +7,7 @@ from . import ELM_FOCUS_LEFT from . import ELM_FOCUS_MOVE_POLICY_CLICK from . import ELM_FOCUS_MOVE_POLICY_IN +from . import ELM_FOCUS_MOVE_POLICY_KEY_ONLY from . import ELM_FOCUS_AUTOSCROLL_MODE_SHOW from . import ELM_FOCUS_AUTOSCROLL_MODE_NONE diff --git a/efl/elementary/object_cdef.pxi b/efl/elementary/object_cdef.pxi index 8558f45..8e986d7 100644 --- a/efl/elementary/object_cdef.pxi +++ b/efl/elementary/object_cdef.pxi @@ -35,6 +35,7 @@ cdef extern from Elementary.h: cpdef enum Elm_Focus_Move_Policy: ELM_FOCUS_MOVE_POLICY_CLICK ELM_FOCUS_MOVE_POLICY_IN +ELM_FOCUS_MOVE_POLICY_KEY_ONLY ctypedef enum Elm_Focus_Move_Policy: pass @@ -156,6 +157,8 @@ cdef extern from Elementary.h: Eina_Bool elm_object_focus_highlight_style_set(Evas_Object *obj, const char *style) const char *elm_object_focus_highlight_style_get(const Evas_Object *obj) Elm_Object_Item * elm_object_focused_item_get(const Evas_Object *obj) +voidelm_object_focus_move_policy_set(Evas_Object *obj, Elm_Focus_Move_Policy policy) +Elm_Focus_Move_Policy elm_object_focus_move_policy_get(Evas_Object *obj) # Object - Mirroring (elm_mirroring.h) Eina_Bool elm_object_mirrored_get(const Evas_Object *obj) diff --git a/examples/elementary/test.py b/examples/elementary/test.py index 0878178..6e421a7 100755 --- a/examples/elementary/test.py +++ b/examples/elementary/test.py @@ -143,6 +143,7 @@ items = [ (Focus 3, test_focus, focus3_clicked), (Focus 4, test_focus, focus4_clicked), (Focus Custom, test_focus, focus5_clicked), +(Focus Move Policy, test_focus, focus6_clicked), ]), (Geographic, [ (Map, test_map, map_clicked), diff --git a/examples/elementary/test_focus.py b/examples/elementary/test_focus.py index 70d1616..63be861 100644 --- a/examples/elementary/test_focus.py +++ b/examples/elementary/test_focus.py @@ -22,9 +22,12 @@ from efl.elementary.check import Check from efl.elementary.entry import Entry from efl.elementary.table import Table from efl.elementary.toolbar import Toolbar, ELM_TOOLBAR_SHRINK_MENU -from efl.elementary.object import ELM_FOCUS_DOWN, ELM_FOCUS_UP +from efl.elementary.object import ELM_FOCUS_DOWN, ELM_FOCUS_UP, \ +ELM_FOCUS_MOVE_POLICY_CLICK, ELM_FOCUS_MOVE_POLICY_IN, \ +ELM_FOCUS_MOVE_POLICY_KEY_ONLY from efl.elementary.configuration import Configuration from efl.elementary.theme import theme_overlay_add +from efl.elementary.radio import Radio script_path = os.path.dirname(os.path.abspath(__file__)) @@ -553,6 +556,91 @@ def focus5_clicked(obj, item=None):
[EGIT] [apps/terminology] master 02/02: remove wrong assert when no backlog ever generated
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=21764bbf85eabe9aab7cb815bc4a49d5f198954f
commit 21764bbf85eabe9aab7cb815bc4a49d5f198954f
Author: Boris Faure bill...@gmail.com
Date: Mon Aug 3 21:23:38 2015 +0200
remove wrong assert when no backlog ever generated
---
src/bin/termpty.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index dc6db85..a273ebb 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -809,13 +809,8 @@ _termpty_cellrow_from_beacon_get(Termpty *ty, int
requested_y, int *wret)
int nb_lines;
ts = BACKLOG_ROW_GET(ty, backlog_y);
-assert (ts-cells);
if (!ts-cells)
- {
- ERR(went too far: requested_y:%d screen_y:%d backlog_y:%d,
- requested_y, screen_y, backlog_y);
- return NULL;
- }
+ return NULL;
nb_lines = (ts-w == 0) ? 1 : (ts-w + ty-w - 1) / ty-w;
if (!going_forward) {
screen_y -= nb_lines;
--
[EGIT] [apps/express] master 01/01: express: Reduce calls to evas_object_smart_data_get
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ab692306f54fe71ea06c8419fbcce3d022ba7b90
commit ab692306f54fe71ea06c8419fbcce3d022ba7b90
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Aug 3 15:30:30 2015 -0400
express: Reduce calls to evas_object_smart_data_get
Summary: As we have already gotten the smart data from the evas object
previously, lets modify some functions to take the smart data instead
of the object so that we can reduce calls to evas_object_smart_data_get.
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/media.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/media.c b/src/bin/media.c
index 961aa09..25d7a4d 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -61,7 +61,7 @@ _img_cb_preloaded(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj EINA_UNUS
{
Media *sd;
- if (!(sd = evas_object_smart_data_get(data))) return;
+ if (!(sd = data)) return;
evas_object_show(sd-o_img);
evas_object_show(sd-o_clip);
}
@@ -73,7 +73,7 @@ _img_cb_frame(void *data)
double t;
int frame;
- if (!(sd = evas_object_smart_data_get(data))) return EINA_FALSE;
+ if (!(sd = data)) return EINA_FALSE;
sd-frame++;
frame = ((sd-frame - 1) % sd-frame_num) + 1;
if ((sd-frame = sd-frame_num) (frame == 1))
@@ -118,7 +118,7 @@ _img_type_anim_handle(Evas_Object *obj)
sd-frame_num = evas_object_image_animated_frame_count_get(sd-o_img);
if (sd-frame_num 2) return;
t = evas_object_image_animated_frame_duration_get(sd-o_img, sd-frame, 0);
- sd-anim_tmr = ecore_timer_add(t, _img_cb_frame, obj);
+ sd-anim_tmr = ecore_timer_add(t, _img_cb_frame, sd);
}
static void
@@ -133,7 +133,7 @@ _img_type_init(Evas_Object *obj)
evas_object_clip_set(sd-o_img, sd-o_clip);
evas_object_raise(sd-o_event);
evas_object_event_callback_add(sd-o_img, EVAS_CALLBACK_IMAGE_PRELOADED,
- _img_cb_preloaded, obj);
+ _img_cb_preloaded, sd);
evas_object_image_load_orientation_set(sd-o_img, EINA_TRUE);
evas_object_image_file_set(sd-o_img, sd-realf, NULL);
evas_object_image_size_get(sd-o_img, sd-iw, sd-ih);
--
[EGIT] [apps/terminology] master 01/01: allow different backgrounds via tybg. Closes T2444
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=423d06fed38cdbfb10b5a45fe048bae0217ad1ec
commit 423d06fed38cdbfb10b5a45fe048bae0217ad1ec
Author: Boris Faure bill...@gmail.com
Date: Mon Aug 3 21:45:05 2015 +0200
allow different backgrounds via tybg. Closes T2444
---
src/bin/win.c | 22 ++
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index aad277d..0225953 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -2651,6 +2651,18 @@ _tabs_new(Term_Container *child, Term_Container *parent)
/* }}} */
/* {{{ Term */
+static void
+_term_config_set(Term *term, Config *config)
+{
+ Config *old_config = term-config;
+
+ term-config = config;
+ termio_config_set(term-termio, config);
+ _term_media_update(term, term-config);
+ if (old_config != term-wn-config)
+ config_del(old_config);
+}
+
Eina_Bool
term_has_popmedia(const Term *term)
{
@@ -3218,12 +3230,14 @@ _cb_command(void *data, Evas_Object *obj EINA_UNUSED,
void *event)
if (config)
{
- config-temporary = EINA_TRUE;
+ Config *new_config = config_fork(config);
+
+ new_config-temporary = EINA_TRUE;
if (cmd[2])
-eina_stringshare_replace((config-background), cmd + 2);
+eina_stringshare_replace((new_config-background), cmd +
2);
else
-eina_stringshare_replace((config-background), NULL);
- main_media_update(config);
+eina_stringshare_replace((new_config-background), NULL);
+ _term_config_set(term, new_config);
}
}
else if (cmd[1] == 'p') // permanent
--
[EGIT] [apps/terminology] master 01/02: typo
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=f40c63bbb6ba09c37552eaa461b70648e066d0e6 commit f40c63bbb6ba09c37552eaa461b70648e066d0e6 Author: Boris Faure bill...@gmail.com Date: Mon Aug 3 20:52:54 2015 +0200 typo --- src/bin/termptyesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c index 1d9adc4..19b7a24 100644 --- a/src/bin/termptyesc.c +++ b/src/bin/termptyesc.c @@ -1477,7 +1477,7 @@ _handle_esc_terminology(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode * return 0; } *b = 0; - // commands are stored in the buffer, 0 bytes not allowd (end marker) + // commands are stored in the buffer, 0 bytes not allowed (end marker) s = eina_unicode_unicode_to_utf8(buf, slen); ty-cur_cmd = s; if (!_termpty_ext_handle(ty, s, buf)) --
[EGIT] [core/enlightenment] master 01/01: Update README for those viewing this repo from github.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=98027f258424c028b6794accac404519649ba815 commit 98027f258424c028b6794accac404519649ba815 Author: Yomi abyo...@gmail.com Date: Mon Aug 3 15:52:09 2015 -0400 Update README for those viewing this repo from github. Summary: Update readme. Reviewers: zmike Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2908 --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index a64985c..53ab8de 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +Please report bugs and send patches to phab.enlightenment.org + Enlightenment 0.19.0 Requirements: --
