Re: [E-devel] [EGIT] [core/efl] master 01/05: eina: add infrastructure to handle more CPU and compiler builtin information.
My gcc/g++ is 4.8. All of the bswap defines in eina_config.h are enabled. On Wed, Oct 2, 2013 at 3:15 PM, Cedric BAIL moa.blueb...@gmail.com wrote: Cedric Bail On Oct 2, 2013 10:45 PM, Michael Blumenkrantz michael.blumenkra...@gmail.com wrote: this commit breaks building with ephysics support, and also for c++ in general: ../src/lib/eina/eina_inline_cpu.x: In function 'short unsigned int eina_swap16(short unsigned int)': ../src/lib/eina/eina_inline_cpu.x:30:29: error: '__builtin_bswap16' was not declared in this scope Can you check the content of eina_config.h regarding bswap16. Also what is your gcc and g++ version. I don't think it's related to ephysics or c++ as I do compile them to. On Wed, Oct 2, 2013 at 12:57 PM, Cedric Bail cedric.b...@samsung.com wrote: cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ff3d2a68d5762ec6bed88f97f2a3751bb51caf86 commit ff3d2a68d5762ec6bed88f97f2a3751bb51caf86 Author: Cedric Bail cedric.b...@samsung.com Date: Wed Oct 2 18:31:10 2013 +0900 eina: add infrastructure to handle more CPU and compiler builtin information. --- configure.ac | 3 ++ m4/gcc_check_builtin.m4| 17 +++--- src/Makefile_Eina.am | 1 + src/lib/eina/eina_config.h.in | 15 + src/lib/eina/eina_cpu.c| 37 +++--- src/lib/eina/eina_cpu.h| 11 +++ src/lib/eina/eina_inline_cpu.x | 70 ++ src/lib/eina/eina_main.c | 4 ++- 8 files changed, 140 insertions(+), 18 deletions(-) -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Git, merges, and better work-flows
-Original Message- From: Daniel Juyung Seo [mailto:seojuyu...@gmail.com] Sent: den 3 oktober 2013 06:55 To: Enlightenment developer list Subject: Re: [E-devel] Git, merges, and better work-flows On Thu, Oct 3, 2013 at 12:20 AM, Tom Hacohen tom.haco...@samsung.comwrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over- simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature- sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. Needless to say, that if agreed upon, I will add some documentation about how best to follow this work-flow. Just update https://phab.enlightenment.org/w/git_practices/ must be enough :) Daniel Juyung Seo (SeoZ) -- Tom. The branching model Tom describes is a personal favorite of mine. Here is a description of it with some dos and don'ts and other tips: https://gist.github.com/jbenet/ee6c9ac48068889b0912 //Peter -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] EFL 1.8 + Valgrind
If anyone has recently tried to valgrind a graphical EFL app, they've probably noticed the thousands of lines of backtraces from possibly lost blocks, none of which were present in 1.7. Are these blocks actually lost, or can they be ignored? If they can/should be ignored (which is annoying), shouldn't we ship a valgrind suppression file for them? -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: fix blank Name[$locale]= values in .desktops
discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5c37d93a0bf01d90e2be218f8acd3c94fd1c46cd commit 5c37d93a0bf01d90e2be218f8acd3c94fd1c46cd Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 09:03:24 2013 +0100 fix blank Name[$locale]= values in .desktops T346 --- data/desktop/enlightenment_filemanager.desktop | 10 -- data/xsession/enlightenment.desktop.in | 11 --- 2 files changed, 21 deletions(-) diff --git a/data/desktop/enlightenment_filemanager.desktop b/data/desktop/enlightenment_filemanager.desktop index e236047..d7f5377 100644 --- a/data/desktop/enlightenment_filemanager.desktop +++ b/data/desktop/enlightenment_filemanager.desktop @@ -3,23 +3,13 @@ Encoding=UTF-8 Type=Application Name=Enlightenment File Manager Name[Name]=Enlightenment File Manager -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Dosieradministrilo de Enlightenment Name[es]=Administrador de archivos de Enlightenment Name[fr]=Gestionnaire de fichiers d'Enlightenment Name[gl]=Xestor de ficheiros de Enlightenment -Name[hu]= Name[it]=Filemanager di Enlightenment -Name[ja]= -Name[ko]= Name[pt]=Gestor de ficheiros do Enlightenment Name[ru]=Файловый менеджер для Enlightenment -Name[sr]= -Name[tr]= Comment=File Manager provided by Enlightenment Comment[eo]=La dosieradministrilo provizita de Enlightenment Comment[es]=El administrador de ficheros proporcionado por Enlightenment diff --git a/data/xsession/enlightenment.desktop.in b/data/xsession/enlightenment.desktop.in index 2e1795e..252a2f5 100644 --- a/data/xsession/enlightenment.desktop.in +++ b/data/xsession/enlightenment.desktop.in @@ -3,22 +3,11 @@ Encoding=UTF-8 Type=Application Name=Enlightenment Name[Name]=Enlightenment -Name[ab]= Name[ca]=Enlightenment -Name[cs]= -Name[de]= Name[el]=Enlightenment Name[eo]=Enlightenment -Name[es]= Name[fr]=Enlightenment -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= Name[ru]=Enlightenment -Name[sr]= Name[tr]=Enlightenment Comment=Log in using Enlightenment (Version @VERSION@) Comment[ca]=Iniciar sessió amb Enlightenment (Versió @VERSION@) --
[EGIT] [core/enlightenment] master 02/02: bugfix: add handler for xwindow hiding in dnd
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9ad177dd607accbe6623dc4db22a3f8d39b199b8
commit 9ad177dd607accbe6623dc4db22a3f8d39b199b8
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 10:06:54 2013 +0100
bugfix: add handler for xwindow hiding in dnd
this fixes the case where a drag is occurring on a window and the window is
closed/hidden before the dnd leave event occurs. previously this would break
things to a moderate degree and cause further dnd operations to fail, but now
we bravely soldier onward
---
ChangeLog | 1 +
NEWS| 1 +
src/bin/e_dnd.c | 39 +++
3 files changed, 41 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 38e1633..3815b9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2013-10-03 Mike Blumenkrantz
* Fix filemanager spring window closing when dragging from desktop
+* Catch XWindow closes during DND operations on those windows
2013-09-19 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index 9638ecc..ea07223 100644
--- a/NEWS
+++ b/NEWS
@@ -232,3 +232,4 @@ Fixes:
* fixed bug where setting min size on a gadget would not be passed to
desktop gadgets
* fixed bug where new files could not be created repeatedly
* fixed filemanager spring window closing when dragging from desktop
+* fixed catching XWindow closes during DND operations on those windows
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index db55982..095d31a 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -24,6 +24,7 @@ static Eina_Bool _e_dnd_cb_event_dnd_status(void *data,
int type, void *eve
static Eina_Bool _e_dnd_cb_event_dnd_finished(void *data, int type, void
*event);
static Eina_Bool _e_dnd_cb_event_dnd_drop(void *data, int type, void
*event);
static Eina_Bool _e_dnd_cb_event_dnd_selection(void *data, int type, void
*event);
+static Eina_Bool _e_dnd_cb_event_hide(void *data, int type,
Ecore_X_Event_Window_Hide *ev);
/* local subsystem globals */
@@ -121,6 +122,7 @@ e_dnd_init(void)
E_LIST_HANDLER_APPEND(_event_handlers, ECORE_X_EVENT_XDND_FINISHED,
_e_dnd_cb_event_dnd_finished, NULL);
E_LIST_HANDLER_APPEND(_event_handlers, ECORE_X_EVENT_XDND_DROP,
_e_dnd_cb_event_dnd_drop, NULL);
E_LIST_HANDLER_APPEND(_event_handlers, ECORE_X_EVENT_SELECTION_NOTIFY,
_e_dnd_cb_event_dnd_selection, NULL);
+ E_LIST_HANDLER_APPEND(_event_handlers, ECORE_X_EVENT_WINDOW_HIDE,
_e_dnd_cb_event_hide, NULL);
E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_KEY_DOWN,
_e_dnd_cb_key_down, NULL);
E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_KEY_UP,
_e_dnd_cb_key_up, NULL);
@@ -1242,6 +1244,43 @@ _e_dnd_cb_event_dnd_leave(void *data __UNUSED__, int
type __UNUSED__, void *even
}
static Eina_Bool
+_e_dnd_cb_event_hide(void *data __UNUSED__, int type __UNUSED__,
Ecore_X_Event_Window_Hide *ev)
+{
+ E_Event_Dnd_Leave leave_ev;
+ const char *id;
+ const Eina_List *l;
+
+ id = e_util_winid_str_get(ev-win);
+ if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
+ leave_ev.x = 0;
+ leave_ev.y = 0;
+
+ if (_xdnd)
+ {
+unsigned int entered = 0;
+E_Drop_Handler *h;
+
+EINA_LIST_FOREACH(_active_handlers, l, h)
+ {
+ if (h-entered (_e_drag_win_get(h, 1) == ev-win))
+ {
+ if (h-cb.leave)
+h-cb.leave(h-cb.data, h-active_type, leave_ev);
+ h-entered = 0;
+ }
+ entered += h-entered;
+ }
+
+if (!entered)
+ {
+ eina_stringshare_del(_xdnd-type);
+ E_FREE(_xdnd);
+ }
+ }
+ return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
_e_dnd_cb_event_dnd_position(void *data __UNUSED__, int type __UNUSED__, void
*event)
{
Ecore_X_Event_Xdnd_Position *ev = event;
--
[EGIT] [core/enlightenment] master 01/02: bugfix: fileman spring window closing on desktop when dnd ends
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fbe015de2e8c9be553f0218396e97b9080d9aca9
commit fbe015de2e8c9be553f0218396e97b9080d9aca9
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 09:45:26 2013 +0100
bugfix: fileman spring window closing on desktop when dnd ends
---
ChangeLog| 4
NEWS | 1 +
src/modules/fileman/e_fwin.c | 9 -
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8343a48..38e1633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-03 Mike Blumenkrantz
+
+* Fix filemanager spring window closing when dragging from desktop
+
2013-09-19 Mike Blumenkrantz
* Fix bug where new files could not be created repeatedly
diff --git a/NEWS b/NEWS
index a2606a1..9638ecc 100644
--- a/NEWS
+++ b/NEWS
@@ -231,3 +231,4 @@ Fixes:
* fixed bug where double clicking filemanager windows would not correctly
autosize
* fixed bug where setting min size on a gadget would not be passed to
desktop gadgets
* fixed bug where new files could not be created repeatedly
+* fixed filemanager spring window closing when dragging from desktop
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 3bc0e37..64e0887 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -321,7 +321,14 @@ _e_fwin_dnd_end_cb(E_Fwin *fwin, Evas_Object *obj
__UNUSED__, void *event_info _
/* NOTE: closing the drop target window here WILL break things */
fwin = drag_fwin-spring_parent;
- if (!fwin) return;
+ if (!fwin)
+ {
+if (!drag_fwin-zone) return;
+//dragging from desktop, we'll never have a parent here
+if (drag_fwin-spring_child)
+ _e_fwin_free(drag_fwin-spring_child);
+return;
+ }
fwin-spring_child-spring_parent = NULL;
fwin-spring_child = NULL;
--
[EGIT] [core/enlightenment] master 04/05: move phony e_exec creation for borders to after the desktop is located to ensure that we actually have a chance of finding a correct instance
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9210b83e5f0c089fae693b73229d34a1e6377924
commit 9210b83e5f0c089fae693b73229d34a1e6377924
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 11:21:00 2013 +0100
move phony e_exec creation for borders to after the desktop is located to
ensure that we actually have a chance of finding a correct instance
---
src/bin/e_border.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 9b4f070..53ec883 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -7999,9 +7999,7 @@ _e_border_eval0(E_Border *bd)
bd-client.netwm.pid = -1;
}
-if (bd-re_manage)
- e_exec_phony(bd);
-else
+if (!bd-re_manage)
{
inst =
e_exec_startup_id_pid_instance_find(bd-client.netwm.startup_id,
bd-client.netwm.pid);
@@ -8035,8 +8033,6 @@ _e_border_eval0(E_Border *bd)
if (!found)
e_exec_instance_found(inst);
}
- else if (!inst)
- e_exec_phony(bd);
if (e_config-window_grouping) // FIXME: We may want to make the
border urgent so that the user knows it appeared.
{
@@ -9016,6 +9012,8 @@ _e_border_eval(E_Border *bd)
ecore_event_add(E_EVENT_BORDER_ICON_CHANGE, ev,
_e_border_event_border_icon_change_free, NULL);
}
+if ((bd-new_client || bd-re_manage) bd-desktop
(!bd-exe_inst))
+ e_exec_phony(bd);
bd-changes.icon = 0;
}
--
[EGIT] [core/enlightenment] master 05/05: search for desktops by lowercased icccm class if it's different from uppercase
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fd18b6387915227cd8f4f274e9ded157f6425b3f
commit fd18b6387915227cd8f4f274e9ded157f6425b3f
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 11:21:47 2013 +0100
search for desktops by lowercased icccm class if it's different from
uppercase
fixes finding firefox and some others
---
src/bin/e_border.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 53ec883..8f3f1a6 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -8963,6 +8963,16 @@ _e_border_eval(E_Border *bd)
snprintf(buf, sizeof(buf), %s.desktop,
bd-client.icccm.class);
bd-desktop = efreet_util_desktop_file_id_find(buf);
}
+ if (!bd-desktop)
+ {
+ char buf[4096] = {0}, *s;
+
+ strncpy(buf, bd-client.icccm.class, sizeof(buf));
+ s = buf;
+ eina_str_tolower(s);
+ if (strcmp(s, bd-client.icccm.class))
+bd-desktop = efreet_util_desktop_exec_find(s);
+ }
}
if (!bd-desktop)
{
--
[EGIT] [core/enlightenment] master 01/05: don't check startup_id for internal windows
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=247f45f26fb09eb7a43e8d4839ffe150b497ce6d
commit 247f45f26fb09eb7a43e8d4839ffe150b497ce6d
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 11:19:21 2013 +0100
don't check startup_id for internal windows
this is guaranteed to be wrong and trigger confusion in e_exec
---
src/bin/e_border.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 1f80a3c..667bbf4 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -7970,9 +7970,10 @@ _e_border_eval0(E_Border *bd)
{
char *str = NULL;
- if ((ecore_x_netwm_startup_id_get(bd-client.win, str) (str)) ||
+ if ((!bd-internal)
+ ((ecore_x_netwm_startup_id_get(bd-client.win, str) (str))
||
((bd-client.icccm.client_leader 0)
-ecore_x_netwm_startup_id_get(bd-client.icccm.client_leader,
str) (str))
+ecore_x_netwm_startup_id_get(bd-client.icccm.client_leader,
str) (str)))
)
{
if (!strncmp(str, E_START|, 8))
--
[EGIT] [core/enlightenment] master 02/05: don't delete just-set desktop/icon objects for borders during new_client run
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a2d85fc0abddbc0740a444fd193a8cb4b898dea9
commit a2d85fc0abddbc0740a444fd193a8cb4b898dea9
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 11:20:15 2013 +0100
don't delete just-set desktop/icon objects for borders during new_client run
---
src/bin/e_border.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 667bbf4..e8ff944 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -8928,12 +8928,12 @@ _e_border_eval(E_Border *bd)
if (bd-changes.icon)
{
-if (bd-desktop)
+if (bd-desktop (!bd-new_client))
{
efreet_desktop_free(bd-desktop);
bd-desktop = NULL;
}
-if (bd-icon_object)
+if (bd-icon_object (!bd-new_client))
{
evas_object_del(bd-icon_object);
bd-icon_object = NULL;
--
[EGIT] [core/enlightenment] master 03/05: find efm's .desktop file for efm windows
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7dee42020e63f929542b9f1d44e1f75f74520419
commit 7dee42020e63f929542b9f1d44e1f75f74520419
Author: Mike Blumenkrantz m.blumenk...@samsung.com
Date: Thu Oct 3 11:20:36 2013 +0100
find efm's .desktop file for efm windows
---
src/bin/e_border.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index e8ff944..9b4f070 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -8948,6 +8948,11 @@ _e_border_eval(E_Border *bd)
}
if (!bd-desktop)
{
+ if (bd-internal (bd-client.icccm.class
(!strncmp(bd-client.icccm.class, e_fwin::, 8
+ bd-desktop =
efreet_util_desktop_exec_find(enlightenment_filemanager);
+ }
+if (!bd-desktop)
+ {
if ((bd-client.icccm.name) (bd-client.icccm.class))
bd-desktop =
efreet_util_desktop_wm_class_find(bd-client.icccm.name,
bd-client.icccm.class);
--
Re: [E-devel] Pen support in EFL?
On Wed, 2 Oct 2013 22:28:54 -0700 Jason Gerecke killert...@gmail.com said:
On Wed, Oct 2, 2013 at 8:21 PM, Carsten Haitzler ras...@rasterman.com wrote:
On Wed, 2 Oct 2013 13:59:47 -0700 Jason Gerecke killert...@gmail.com said:
3 things here.
1. for general device queries (get name, description, device classes etc.)
there is already an evas_device api. right now though nothng populates the
evas device information from lower levels (xi/xi2, etc. etc.), so it's
unused. but it's there.
Would clients be expected to call this just once prior to receiving
input, or is there some way to notify them that a change has occured?
the query of the devices and building of their nodes and tree should be in
ecore-evas. EVAS_CALLBACK_DEVICE_CHANGED is already there for this - u can set
a callback on the evas itself to listen for this. the idea is that if you get
this callback - re-query the device tree and see. :)
I ask because the type information (e.g. pen tip vs. eraser or
airbrush vs. inking pen) is likely to change fairly regularly. We
would want to be sure that clients can get their hands on that,
whether it means notifying that they need to refresh their
understanding or sending the type information in each event.
well the device add/del is really more about plug and unplug. here i'd expect
there to be a single device representing the pen and pen vs eraser vs brush i'd
expect as a mode field on the pen (like i mention below about eraser)
2. i've talked with some people about this and the general take was that we
need to add new pen events (ala multi) because they need to handle more than
multi: e.g.:
* button number on pen pressed/released SEPARATELY from pen touching.
* pen touch vs eraser touch (ie indicate which end of N ends a pen
presses down).
* some pens support a hover ability - so that means motion events without
down/up begin/end points like multi, BUT we would ned/want to report
distance as a value during this hover
* possibly other custom inputs on the pens themselves that are not
accounted for.
we COULD extend multi events and add fields, but i think you are mistaking
habitual over-engineering in efl for intent for these to be pen events. a
lot of stuff gets extended beyond its initial scope in case. eg in case
out touch surface can report size, pressure and angle of your finger... :)
also it'd cause issues with existing multi event usage.
As I said, the multi event is interesting for its extra fields, but
might not be a good semantic match. A pen isn't anything more than
fancy mouse: it has motion without a touch event and a set of buttons
to worry about. The only thing that makes it special are all those
extra axes, and most of those could be imagined on a
sufficiently-advanced mouse. Wacom actually makes such a mouse for
their Intuos tablets which reports things like height above the pad,
rotation about the z-axis, and absolute position of a spring-loaded
fingerwheel.
The way most APIs handle pen input is to just pass the data alongside
the X/Y position you'd expect for a mouse. Throw in an enum or
function to let clients distinguish pen tip from eraser and you're
set.
i'm thinking similarly - have down/up and move events, with a bunch of extra
fields. only q is.. what set of fileds pretty much covers every aspect of a
possible pen :)
3. if you want to tal about the extra buttons and what not that you find on
pen tablets (i have a bamboo sitting on my desk at home - i know cheapo
little pen tablet, but its indicative at a small scale of a lot of them), i
believe these should just be keys like any keyboard. i don't think these
belong in any specialized event system. as with #1 we CAN attach a special
device handle to them though so you can differentiate where the key comes
from... :)
Most implementations send these as buttons rather than keys. In
the case of evdev, the Intuos and Cintiq tablets will send the
meaningless BTN_{0,1,2,3,...} buttons. For a Bamboo though, you'll
find the mouse buttons BTN_{LEFT,RIGHT,FORWARD,BACK} instead. In the X
driver these are all mapped to mouse buttons that clients can easily
understand. The first few mouse buttons usually have attached
semantics (e.g. button 1 = left click = primary action) which makes
them non-ideal, but keys don't fare much better since you'd need
clients to properly understand a non-standard keyboard layout. These
buttons are always a tricky issue.
sure, but i see keys as better as they have keysyms at least that have
enumerations... if the intent is to emulate a mouse - then buttons sounds
right... anyway... if buttons then its kind of weirs to expose a button pres
from the tablet base as this press event carries x/y info but actually has
nothing to do with location... :)
adding new event type isn't too hard in evas - you add the structures,
enums (at the end of the current list of callbacks), add the feed api's to
[EGIT] [apps/ecrire] master 01/02: Don't crash if config file doesn't exist.
tasn pushed a commit to branch master. http://git.enlightenment.org/apps/ecrire.git/commit/?id=3a1efb5d49c968e4d62dc07b10b53e3d88ad9087 commit 3a1efb5d49c968e4d62dc07b10b53e3d88ad9087 Author: Tom Hacohen t...@stosb.com Date: Thu Oct 3 11:55:35 2013 +0100 Don't crash if config file doesn't exist. This fixes T425. Thanks to Scimmia for reporting. --- src/bin/cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/cfg.c b/src/bin/cfg.c index 648edca..d8b3fa9 100644 --- a/src/bin/cfg.c +++ b/src/bin/cfg.c @@ -86,7 +86,7 @@ ecrire_cfg_load(void) Eet_File *ef; if (!config_file) - return EINA_FALSE; + goto end; ef = eet_open(config_file, EET_FILE_MODE_READ); if (!ef) --
[EGIT] [apps/ecrire] master 02/02: Removed redundant condition.
tasn pushed a commit to branch master. http://git.enlightenment.org/apps/ecrire.git/commit/?id=64635b74b6cfe71f8ad461f1785a9fb70ae3acfc commit 64635b74b6cfe71f8ad461f1785a9fb70ae3acfc Author: Tom Hacohen t...@stosb.com Date: Thu Oct 3 11:55:48 2013 +0100 Removed redundant condition. --- src/bin/cfg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bin/cfg.c b/src/bin/cfg.c index d8b3fa9..24afcaf 100644 --- a/src/bin/cfg.c +++ b/src/bin/cfg.c @@ -96,8 +96,6 @@ ecrire_cfg_load(void) } _ent_cfg = eet_data_read(ef, _ent_cfg_descriptor, _CONFIG_ENTRY); - if (!_ent_cfg) - goto end; end: if (!_ent_cfg) --
Re: [E-devel] Git, merges, and better work-flows
On 03/10/13 08:48, Peter Kjellerstedt wrote: -Original Message- From: Daniel Juyung Seo [mailto:seojuyu...@gmail.com] Sent: den 3 oktober 2013 06:55 To: Enlightenment developer list Subject: Re: [E-devel] Git, merges, and better work-flows On Thu, Oct 3, 2013 at 12:20 AM, Tom Hacohen tom.haco...@samsung.comwrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over- simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature- sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. Needless to say, that if agreed upon, I will add some documentation about how best to follow this work-flow. Just update https://phab.enlightenment.org/w/git_practices/ must be enough :) Daniel Juyung Seo (SeoZ) -- Tom. The branching model Tom describes is a personal favorite of mine. Here is a description of it with some dos and don'ts and other tips: https://gist.github.com/jbenet/ee6c9ac48068889b0912 //Peter -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel THANK YOU. A very good link indeed. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] elementary-1.7 01/02: fix blank Name[$locale]= values in .desktops
discomfitor pushed a commit to branch elementary-1.7. http://git.enlightenment.org/core/elementary.git/commit/?id=c958ba05d80253c5e28494077b06adcf847e06d7 commit c958ba05d80253c5e28494077b06adcf847e06d7 Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 09:05:35 2013 +0100 fix blank Name[$locale]= values in .desktops T346 --- data/desktop/elementary_config.desktop | 9 - data/desktop/elementary_test.desktop | 13 - 2 files changed, 22 deletions(-) diff --git a/data/desktop/elementary_config.desktop b/data/desktop/elementary_config.desktop index 1dcfe6b..8cc6ef8 100644 --- a/data/desktop/elementary_config.desktop +++ b/data/desktop/elementary_config.desktop @@ -3,23 +3,14 @@ Encoding=UTF-8 Type=Application Name=Elementary Configuration Name[Name]=Elementary Configuration -Name[ab]= -Name[ca]= Name[cs]=Konfigurace Elementary -Name[de]= -Name[el]= Name[eo]=Agordoj de Elementary Name[es]=Configuración de Elementary Name[fr]=Configuration pour Elementary Name[gl]=Configuración de Elementary -Name[hu]= Name[it]=Configurazione di Elementary -Name[ja]= -Name[ko]= Name[pt]=Configure o Elementary Name[ru]=Конфигурация для Elementary (Элементарий) -Name[sr]= -Name[tr]= Comment=Elementary Configuration Comment[cs]=Konfigurace Elementary Comment[eo]=Agordoj de Elementary diff --git a/data/desktop/elementary_test.desktop b/data/desktop/elementary_test.desktop index 0cdb56b..855dd42 100644 --- a/data/desktop/elementary_test.desktop +++ b/data/desktop/elementary_test.desktop @@ -3,23 +3,10 @@ Encoding=UTF-8 Type=Application Name=Elementary Test Name[Name]=Elementary Test -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Provo de Elementary -Name[es]= Name[fr]=Test Elementary -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Testes Elementary Name[ru]=Тест Elementary -Name[sr]= -Name[tr]= Comment=Elementary Test Application Comment[cs]=Testovací aplikace Elementary Comment[eo]=Provoversia aplikaĵo de Elementary --
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: remove more invalid Name[]= entries
discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c3bae7cb39bbeb997360ab91a28d27a10a7f910c commit c3bae7cb39bbeb997360ab91a28d27a10a7f910c Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 13:16:04 2013 +0100 remove more invalid Name[]= entries T346 --- config/default/profile.desktop | 1 - config/mobile/profile.desktop | 1 - config/standard/profile.desktop| 1 - data/desktop/enlightenment_filemanager.desktop | 1 - data/favorites/desktop.desktop | 1 - data/favorites/home.desktop| 1 - data/favorites/root.desktop| 1 - data/favorites/tmp.desktop | 1 - data/xsession/enlightenment.desktop.in | 1 - src/modules/access/module.desktop.in | 1 - src/modules/backlight/module.desktop.in| 1 - src/modules/battery/module.desktop.in | 1 - src/modules/clock/module.desktop.in| 1 - src/modules/comp/module.desktop.in | 1 - src/modules/conf/module.desktop.in | 1 - src/modules/conf_applications/module.desktop.in| 1 - src/modules/conf_dialogs/module.desktop.in | 1 - src/modules/conf_display/module.desktop.in | 1 - src/modules/conf_edgebindings/module.desktop.in| 1 - src/modules/conf_interaction/module.desktop.in | 1 - src/modules/conf_intl/module.desktop.in| 1 - src/modules/conf_keybindings/module.desktop.in | 1 - src/modules/conf_menus/module.desktop.in | 1 - src/modules/conf_paths/module.desktop.in | 1 - src/modules/conf_performance/module.desktop.in | 1 - src/modules/conf_randr/module.desktop.in | 1 - src/modules/conf_shelves/module.desktop.in | 1 - src/modules/conf_theme/module.desktop.in | 1 - src/modules/conf_wallpaper2/module.desktop.in | 1 - src/modules/conf_window_manipulation/module.desktop.in | 1 - src/modules/conf_window_remembers/module.desktop.in| 1 - src/modules/connman/module.desktop.in | 1 - src/modules/cpufreq/module.desktop.in | 1 - src/modules/dropshadow/module.desktop.in | 1 - src/modules/everything/module.desktop.in | 1 - src/modules/fileman/module.desktop.in | 1 - src/modules/fileman_opinfo/module.desktop.in | 1 - src/modules/gadman/module.desktop.in | 1 - src/modules/ibar/module.desktop.in | 1 - src/modules/ibox/module.desktop.in | 1 - src/modules/illume-bluetooth/module.desktop.in | 1 - src/modules/illume-home-toggle/module.desktop.in | 1 - src/modules/illume-home/module.desktop.in | 1 - src/modules/illume-indicator/module.desktop.in | 1 - src/modules/illume-kbd-toggle/module.desktop.in| 1 - src/modules/illume-keyboard/module.desktop.in | 1 - src/modules/illume-mode-toggle/module.desktop.in | 1 - src/modules/illume-softkey/module.desktop.in | 1 - src/modules/illume2/module.desktop.in | 1 - src/modules/layout/module.desktop.in | 1 - src/modules/mixer/module.desktop.in| 1 - src/modules/msgbus/module.desktop.in | 1 - src/modules/notification/module.desktop.in | 1 - src/modules/pager/module.desktop.in| 1 - src/modules/physics/module.desktop.in | 1 - src/modules/quickaccess/module.desktop.in | 1 - src/modules/shot/module.desktop.in | 1 - src/modules/start/module.desktop.in| 1 - src/modules/syscon/module.desktop.in | 1 - src/modules/systray/module.desktop.in | 1 - src/modules/tasks/module.desktop.in| 1 - src/modules/temperature/module.desktop.in | 1 - src/modules/tiling/module.desktop.in | 1 - src/modules/winlist/module.desktop.in | 1 - src/modules/wizard/data/desktop/home.desktop | 1 - src/modules/wizard/data/desktop/root.desktop | 1 - src/modules/wizard/data/desktop/tmp.desktop| 1 - src/modules/wizard/data/extra_desktops/mplayer.desktop | 1 - src/modules/wizard/data/extra_desktops/xterm.desktop | 1 - src/modules/wizard/module.desktop.in | 1 - src/modules/wl_drm/module.desktop | 1 - src/modules/wl_screenshot/module.desktop | 1 - src/modules/wl_shell/module.desktop| 1 - src/modules/xkbswitch/module.desktop.in| 1 - 74 files changed, 74 deletions(-) diff --git
Re: [E-devel] Pen support in EFL?
On Thu, Oct 3, 2013 at 7:58 AM, Carsten Haitzler ras...@rasterman.com wrote:
On Wed, 2 Oct 2013 22:28:54 -0700 Jason Gerecke killert...@gmail.com said:
On Wed, Oct 2, 2013 at 8:21 PM, Carsten Haitzler ras...@rasterman.com
wrote:
On Wed, 2 Oct 2013 13:59:47 -0700 Jason Gerecke killert...@gmail.com
said:
3 things here.
1. for general device queries (get name, description, device classes etc.)
there is already an evas_device api. right now though nothng populates the
evas device information from lower levels (xi/xi2, etc. etc.), so it's
unused. but it's there.
Would clients be expected to call this just once prior to receiving
input, or is there some way to notify them that a change has occured?
the query of the devices and building of their nodes and tree should be in
ecore-evas. EVAS_CALLBACK_DEVICE_CHANGED is already there for this - u can set
a callback on the evas itself to listen for this. the idea is that if you get
this callback - re-query the device tree and see. :)
I ask because the type information (e.g. pen tip vs. eraser or
airbrush vs. inking pen) is likely to change fairly regularly. We
would want to be sure that clients can get their hands on that,
whether it means notifying that they need to refresh their
understanding or sending the type information in each event.
well the device add/del is really more about plug and unplug. here i'd expect
there to be a single device representing the pen and pen vs eraser vs brush
i'd
expect as a mode field on the pen (like i mention below about eraser)
2. i've talked with some people about this and the general take was that we
need to add new pen events (ala multi) because they need to handle more
than
multi: e.g.:
* button number on pen pressed/released SEPARATELY from pen touching.
* pen touch vs eraser touch (ie indicate which end of N ends a pen
presses down).
* some pens support a hover ability - so that means motion events without
down/up begin/end points like multi, BUT we would ned/want to report
distance as a value during this hover
* possibly other custom inputs on the pens themselves that are not
accounted for.
we COULD extend multi events and add fields, but i think you are mistaking
habitual over-engineering in efl for intent for these to be pen events. a
lot of stuff gets extended beyond its initial scope in case. eg in case
out touch surface can report size, pressure and angle of your finger... :)
also it'd cause issues with existing multi event usage.
As I said, the multi event is interesting for its extra fields, but
might not be a good semantic match. A pen isn't anything more than
fancy mouse: it has motion without a touch event and a set of buttons
to worry about. The only thing that makes it special are all those
extra axes, and most of those could be imagined on a
sufficiently-advanced mouse. Wacom actually makes such a mouse for
their Intuos tablets which reports things like height above the pad,
rotation about the z-axis, and absolute position of a spring-loaded
fingerwheel.
The way most APIs handle pen input is to just pass the data alongside
the X/Y position you'd expect for a mouse. Throw in an enum or
function to let clients distinguish pen tip from eraser and you're
set.
i'm thinking similarly - have down/up and move events, with a bunch of extra
fields. only q is.. what set of fileds pretty much covers every aspect of a
possible pen :)
3. if you want to tal about the extra buttons and what not that you find on
pen tablets (i have a bamboo sitting on my desk at home - i know cheapo
little pen tablet, but its indicative at a small scale of a lot of them), i
believe these should just be keys like any keyboard. i don't think these
belong in any specialized event system. as with #1 we CAN attach a special
device handle to them though so you can differentiate where the key comes
from... :)
Most implementations send these as buttons rather than keys. In
the case of evdev, the Intuos and Cintiq tablets will send the
meaningless BTN_{0,1,2,3,...} buttons. For a Bamboo though, you'll
find the mouse buttons BTN_{LEFT,RIGHT,FORWARD,BACK} instead. In the X
driver these are all mapped to mouse buttons that clients can easily
understand. The first few mouse buttons usually have attached
semantics (e.g. button 1 = left click = primary action) which makes
them non-ideal, but keys don't fare much better since you'd need
clients to properly understand a non-standard keyboard layout. These
buttons are always a tricky issue.
sure, but i see keys as better as they have keysyms at least that have
enumerations... if the intent is to emulate a mouse - then buttons sounds
right... anyway... if buttons then its kind of weirs to expose a button pres
from the tablet base as this press event carries x/y info but actually has
nothing to do with location... :)
adding new event type isn't too hard in evas -
[EGIT] [core/elementary] elementary-1.7 02/02: remove more invalid Name[]= entries
discomfitor pushed a commit to branch elementary-1.7. http://git.enlightenment.org/core/elementary.git/commit/?id=d28fc804d0d0324bb5788b2d43e5e64284737ac6 commit d28fc804d0d0324bb5788b2d43e5e64284737ac6 Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 13:17:44 2013 +0100 remove more invalid Name[]= entries T346 --- config/default/profile.desktop | 1 - config/mobile/profile.desktop | 1 - config/standard/profile.desktop| 1 - data/desktop/elementary_config.desktop | 1 - data/desktop/elementary_test.desktop | 1 - 5 files changed, 5 deletions(-) diff --git a/config/default/profile.desktop b/config/default/profile.desktop index e773f4f..f8fccad 100644 --- a/config/default/profile.desktop +++ b/config/default/profile.desktop @@ -2,7 +2,6 @@ Encoding=UTF-8 Type=Link Name=Default -Name[Name]=Default Name[ab]=默认 Name[ca]= Name[cs]=Výchozí diff --git a/config/mobile/profile.desktop b/config/mobile/profile.desktop index 72d0848..8573846 100644 --- a/config/mobile/profile.desktop +++ b/config/mobile/profile.desktop @@ -2,7 +2,6 @@ Encoding=UTF-8 Type=Link Name=Mobile -Name[Name]=Mobile Name[ab]= Name[ca]= Name[cs]= diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop index 2c072e4..e2f8809 100644 --- a/config/standard/profile.desktop +++ b/config/standard/profile.desktop @@ -2,7 +2,6 @@ Encoding=UTF-8 Type=Link Name=Standard -Name[Name]=Standard Name[ab]=标准 Name[ca]= Name[cs]=Standartní diff --git a/data/desktop/elementary_config.desktop b/data/desktop/elementary_config.desktop index 8cc6ef8..50c92ab 100644 --- a/data/desktop/elementary_config.desktop +++ b/data/desktop/elementary_config.desktop @@ -2,7 +2,6 @@ Encoding=UTF-8 Type=Application Name=Elementary Configuration -Name[Name]=Elementary Configuration Name[cs]=Konfigurace Elementary Name[eo]=Agordoj de Elementary Name[es]=Configuración de Elementary diff --git a/data/desktop/elementary_test.desktop b/data/desktop/elementary_test.desktop index 855dd42..17dd7e2 100644 --- a/data/desktop/elementary_test.desktop +++ b/data/desktop/elementary_test.desktop @@ -2,7 +2,6 @@ Encoding=UTF-8 Type=Application Name=Elementary Test -Name[Name]=Elementary Test Name[eo]=Provo de Elementary Name[fr]=Test Elementary Name[pt]=Testes Elementary --
Re: [E-devel] Git, merges, and better work-flows
On 03/10/13 03:55, Carsten Haitzler (The Rasterman) wrote: On Wed, 02 Oct 2013 16:20:38 +0100 Tom Hacohen tom.haco...@samsung.com said: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. Needless to say, that if agreed upon, I will add some documentation about how best to follow this work-flow. write some mini tools/scripts. not just docs. if any step in such a workflow involves knowing some magic git incantation and/or more than 1 step, then wrap it up. eg. gitfeature-start BRANCHNAME gitfeature-merge the first just creates the branch named BRANCHNAME (with any given namespace prepended ) and ensure you switch to it. the second does all the last steps (rebase over master, blah blah blah) and just executes the appropriate sequence of git cmds. As Lucas has said, it's pretty straight forward (and only one difference) compared to what most of us are used to. The only real difference is passing --no-ff instead of --rebase to git merge in my process. Anyhow, this is the process in git commands: Create a local branch for the feature (something I hope people do already): git checkout -b branch-name Work on your feature and commit. rebase over master: git fetch ; git rebase origin/master Switch to master and merge --no-ff instead of --rebase git checkout master ; git merge --no-ff branch-name And push: git push origin master The stages are similar and the same. Also, as I've mentioned, let's let people try using it (it's not mandatory) and wait for feedback. Also, please refer to the really good link Peter has posted to this thread: https://gist.github.com/jbenet/ee6c9ac48068889b0912 -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: probably fix menu clicks which I broke a couple commits ago...
discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 commit 0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 13:32:48 2013 +0100 probably fix menu clicks which I broke a couple commits ago... --- src/bin/e_menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 3556bed..c270e31 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -2978,6 +2978,8 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) m-zone-x + m-cur.x + m-cur.w, m-zone-y + m-cur.y + m-cur.h)) ret = _e_menu_active_call(); +else + ret = -1; } _e_menu_activate_maybe_drag = 0; _e_menu_activate_dragging = 0; --
Re: [E-devel] RFC: a new git-access level
On Thu, 2013-09-19 at 16:23, Gustavo Sverzut Barbieri wrote: On Thu, Sep 19, 2013 at 4:10 PM, Michael Blumenkrantz michael.blumenkra...@gmail.com wrote: I guess maybe this is why we have no female contributors you wish that it was that easy to solve this problem. If you account the number of developers then we're on the average, round(0.1234) = 0 However you put it, this sort of crap still doesn't help. Regards, Daniel Willmann -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [themes/dark] master 01/01: themes/dark - send reload signal to preserve the scroller policies.
hermet pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=88f1187a88e3efdc848ac2ce9d79b071099e5cc8
commit 88f1187a88e3efdc848ac2ce9d79b071099e5cc8
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Oct 3 23:06:47 2013 +0900
themes/dark - send reload signal to preserve the scroller policies.
---
edje/edc/elm/scroller.edc | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/edje/edc/elm/scroller.edc b/edje/edc/elm/scroller.edc
index aadb19e..6020c6d 100644
--- a/edje/edc/elm/scroller.edc
+++ b/edje/edc/elm/scroller.edc
@@ -33,11 +33,9 @@ group { name: elm/scroller/base/default;
parts {
program {
signal: load; source: ;
- action: STATE_SET hidden 0.0;
- target: sb_hbar;
- target: sb_hbar_show;
- target: sb_vbar;
- target: sb_vbar_show;
+ script {
+emit(reload, elm);
+ }
}
// vert bar
part { name: sb_vbar_show; type: RECT;
--
Re: [E-devel] [EGIT] [core/enlightenment] enlightenment-0.17 01/01: probably fix menu clicks which I broke a couple commits ago...
http://eelslap.com 2013/10/3 Mike Blumenkrantz m.blumenk...@samsung.com: discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 commit 0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 13:32:48 2013 +0100 probably fix menu clicks which I broke a couple commits ago... --- src/bin/e_menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 3556bed..c270e31 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -2978,6 +2978,8 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) m-zone-x + m-cur.x + m-cur.w, m-zone-y + m-cur.y + m-cur.h)) ret = _e_menu_active_call(); +else + ret = -1; } _e_menu_activate_maybe_drag = 0; _e_menu_activate_dragging = 0; -- -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: elementary/focus - update focus highlight when theme is changed.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=99ab56d5ae0bbd33cb782bd4867590073561c567
commit 99ab56d5ae0bbd33cb782bd4867590073561c567
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Oct 3 23:57:08 2013 +0900
elementary/focus - update focus highlight when theme is changed.
---
ChangeLog | 3 +++
NEWS | 1 +
src/lib/elm_win.c | 9 +
3 files changed, 13 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 1017722..8a070fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1668,3 +1668,6 @@
2013-10-02 Ryuan Choi (ryuan)
* fileselector: Add activated smart callback. It can be used to
execute
a file activated by double-clicking or pressing Enter key.
+
+2013-10-03 ChunEon Park (Hermet)
+* Focus: update the focus highlight style when theme is changed.
diff --git a/NEWS b/NEWS
index 417f1f8..6355743 100644
--- a/NEWS
+++ b/NEWS
@@ -308,6 +308,7 @@ Removals:
* Popup: Fix the corrupted internal widget tree that caused elm_theme_set()
doesn't work correctly.
* Mapbuf: Ensure that content size calculation is correctly finished
because the mapbuf is willing to block the size calculation forcely.
* Gesture layer: Fix gesture layer with pointer events.
+ * Focus: update the focus highlight style when theme is changed.
Changes since Elementary 1.0.0:
-
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 3fbfd82..5dfe0f6 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -5208,6 +5208,14 @@ elm_win_focus_highlight_style_set(Evas_Object *obj,
}
static void
+_elm_win_smart_theme(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
+{
+ Elm_Win_Smart_Data *sd = _pd;
+ sd-focus_highlight.theme_changed = EINA_TRUE;
+ _elm_win_focus_highlight_reconfigure_job_start(sd);
+}
+
+static void
_focus_highlight_style_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
const char *style = va_arg(*list, const char *);
@@ -5512,6 +5520,7 @@ _class_constructor(Eo_Class *klass)
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT),
_elm_win_smart_focus_next),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS),
_elm_win_smart_focus_direction_manager_is),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION),
_elm_win_smart_focus_direction),
+EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME),
_elm_win_smart_theme),
EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WIN_CONSTRUCTOR),
_win_constructor),
EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_ADD),
_resize_object_add),
--
Re: [E-devel] [EGIT] [core/enlightenment] enlightenment-0.17 01/01: probably fix menu clicks which I broke a couple commits ago...
http://s0.thejournal.ie/media/2013/05/slow-clap.gif On Thu, 3 Oct 2013 11:46:32 -0300 Eduardo Lima (Etrunko) ebl...@gmail.com wrote: http://eelslap.com 2013/10/3 Mike Blumenkrantz m.blumenk...@samsung.com: discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 commit 0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 13:32:48 2013 +0100 probably fix menu clicks which I broke a couple commits ago... --- src/bin/e_menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 3556bed..c270e31 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -2978,6 +2978,8 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) m-zone-x + m-cur.x + m-cur.w, m-zone-y + m-cur.y + m-cur.h)) ret = _e_menu_active_call(); +else + ret = -1; } _e_menu_activate_maybe_drag = 0; _e_menu_activate_dragging = 0; -- -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [Enlightenment-release] Releases pending
Fresh new Enlightenment and Elementary. Also, not so new Ecore which was not sent to the ML. md5sum 860e38f358cda23f40509f25a819d335 ecore-1.7.9.tar.bz2 8f9f8f74b8b899dd80d26fdb7008d89d ecore-1.7.9.tar.gz 589ade7ae89dc236976bfa0c25fcb84f elementary-1.7.9.tar.bz2 39fcd51f67b54cc1ebf7fcef4e2539ae elementary-1.7.9.tar.gz fe30d720080c3a7dd03ffc76a71d27af enlightenment-0.17.5.tar.bz2 195029366047e65150fb77c53bb35f63 enlightenment-0.17.5.tar.gz sha256sum f94b0d7146bdda8cc50ab8fa90b95b5039cd7a2ee349160517e484877364b1d1 ecore-1.7.9.tar.bz2 c754014f60edfa972dc2dd8318d3226239b1f53e7a77c3ef8660c70c576bd0a5 ecore-1.7.9.tar.gz 81a485fa6ed210df21eed9e6323efdcf85df12253bcee6f6e11593ae56efb0bc elementary-1.7.9.tar.bz2 7c47a794521b263f90ea80e3d8b330b90d9db3f8b696e470bd6965994d41b58d elementary-1.7.9.tar.gz 2eacc173090f256d14677c11ba81e1b58f5396ae9a42850c7232079152b35407 enlightenment-0.17.5.tar.bz2 7250d4f3f9b52e730d07f14521b131fd272f5a20cd3811ca76ace9f4c3233e39 enlightenment-0.17.5.tar.gz 2013/9/23 Eduardo Lima (Etrunko) ebl...@gmail.com: I have just uploaded new Evas tarballs which include latest texblock fixes from Tom. ae00f5eda9d9d2c7fc287b12babfc87b evas-1.7.9.tar.bz2 38f5add4539d8494807b17bfa6930977 evas-1.7.9.tar.gz 83b23239b46fa0c349a48dc6146927136578fa413530d084f5d1c269e6d4c63c evas-1.7.9.tar.bz2 e12f92acd344d5854f0b215cbc8740f1feef7e822ef87bfa8419fe012a25b164 evas-1.7.9.tar.gz Regards, Eduardo. 2013/9/18 Eduardo Lima (Etrunko) ebl...@gmail.com: 2013/9/18 Thomas Sachau to...@gentoo.org: Carsten Haitzler (The Rasterman) schrieb: On Fri, 13 Sep 2013 14:57:33 -0300 Eduardo Lima (Etrunko) ebl...@gmail.com said: It is already Friday the 13th, and I have not yet heard any feedbacks. Can we get this official release out of the doors by Tuesday? no. give it a few weeks. last release left people with systems that couldnt even stat e and had a blank screen. let's not do that again. Current status: fixed: -opengl+gles support with =mesa-9.1 (Gentoo Bug 462732) -e hanging prior to splash screen (Gentoo Bug 483194) -black screen on startup with multiscreen setup (might be the a duplicate of the previous one) (Gentoo Bug 484996) Still open: -black screen, when starting with an older config from before 0.17.4, while startup is fine with a new, clean config (Gentoo Bug 485268) Thanks for the report. :) I have updated the elementary tarballs with a couple of commits that went in today. md5sum 59b495e9a5f1736bb0e69d4f9e4acfc5 elementary-1.7.9.tar.bz2 ef8074cc3feca6fc5978984accffbbb2 elementary-1.7.9.tar.gz sha256sum fe5d673d7687e31862d6728de362fdb9bca5c5a660c2aa6c47e663ad92ae6dbd elementary-1.7.9.tar.bz2 89846ee721a23d9dd01cf18eff186ce5680cafe8fbe760a6869dd909c296c4d1 elementary-1.7.9.tar.gz Regards, Eduardo -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eina/eina_file - fix eina_file_map_lines() to not drop of one character in the last line.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=18be4c50d9990c82ed9ce4269b7820e61f772699 commit 18be4c50d9990c82ed9ce4269b7820e61f772699 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Oct 4 01:58:35 2013 +0900 eina/eina_file - fix eina_file_map_lines() to not drop of one character in the last line. --- ChangeLog | 4 NEWS| 1 + src/lib/eina/eina_file_common.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2444fdb..cb4ea4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-04 ChunEon Park (Hermet) + + * Eina: fix eina_file_map_lines() to not drop of one character in the last line. + 2013-10-02 Cedric Bail * Eina: add eina_swap16(), eina_swap32(), eina_swap64(). diff --git a/NEWS b/NEWS index cd3d9f2..fc83666 100644 --- a/NEWS +++ b/NEWS @@ -258,6 +258,7 @@ Fixes: - Fix memory leak in eina_xattr_value_ls. - Fix magic failure in eina_value_array_count when array has not been allocated. - Fix issue when wchar_t is signed and eina_unicode does negative array lookups. + - Eina: fix eina_file_map_lines() to not drop of one character in the last line. * Eet: - Fix PPC (big endian) image codec bug. - Fix leak in eet_pbkdf2_sha1 with OpenSSL. diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c index 5d7ef11..ec9cac8 100644 --- a/src/lib/eina/eina_file_common.c +++ b/src/lib/eina/eina_file_common.c @@ -543,7 +543,8 @@ _eina_file_map_lines_iterator_next(Eina_Lines_Iterator *it, void **data) it-current.start = it-current.end; it-current.end = eol; - it-current.length = eol - it-current.start - 1; + it-current.length = eol - it-current.start; + if (eol it-end) it-current.length--; *data = it-current; return EINA_TRUE; --
[EGIT] [core/efl] master 01/01: evas/textblock - null check.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fe33aa74084aa383fb880ce9a32fa17663c41346 commit fe33aa74084aa383fb880ce9a32fa17663c41346 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Oct 4 02:43:20 2013 +0900 evas/textblock - null check. --- src/lib/evas/canvas/evas_object_textblock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 021f59a..de53f11 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -8887,6 +8887,7 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur) char *ret; fnode = _evas_textblock_node_visible_at_pos_get( evas_textblock_cursor_format_get(cur)); +if (!fnode) return NULL; buf = eina_strbuf_new(); _markup_get_format_append(buf, fnode); --
[EGIT] [core/efl] master 01/01: Revert evas/textblock - null check.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=82f5f78dac8d3055fe1e1c3431875250456887b9 commit 82f5f78dac8d3055fe1e1c3431875250456887b9 Author: Tom Hacohen t...@stosb.com Date: Thu Oct 3 18:45:07 2013 +0100 Revert evas/textblock - null check. I'm sorry, but those kind of commit messages are unacceptable for code I'm the only maintainer of. It's bad enough that to have them in the project in general, but this I won't accept. I wanted to review this commit, but the lack of explanation about what you are trying to fix and why you think this is the good fix prevents me from doing my job. However, without really looking too much into it, this commit looks wrong. evas_textblock_cursor_format_is_visible_get should verify there's a format node... Please come up with a better commit message and re-commit. This reverts commit fe33aa74084aa383fb880ce9a32fa17663c41346. --- src/lib/evas/canvas/evas_object_textblock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index de53f11..021f59a 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -8887,7 +8887,6 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur) char *ret; fnode = _evas_textblock_node_visible_at_pos_get( evas_textblock_cursor_format_get(cur)); -if (!fnode) return NULL; buf = eina_strbuf_new(); _markup_get_format_append(buf, fnode); --
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert evas/textblock - null check.
If so, why dot you leave the evas_textblock_cursor_format_is_visible_get() to return NULL if you think it must verify the fnode? -Regards, Hermet- -Original Message- From: Tom Hacohent...@stosb.com To: g...@lists.enlightenment.org; Cc: Sent: 2013-10-04 (금) 02:51:01 Subject: [EGIT] [core/efl] master 01/01: Revert evas/textblock - null check. tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=82f5f78dac8d3055fe1e1c3431875250456887b9 commit 82f5f78dac8d3055fe1e1c3431875250456887b9 Author: Tom Hacohen tom@stosb.com Date: Thu Oct 3 18:45:07 2013 +0100 Revert evas/textblock - null check. I'm sorry, but those kind of commit messages are unacceptable for code I'm the only maintainer of. It's bad enough that to have them in the project in general, but this I won't accept. I wanted to review this commit, but the lack of explanation about what you are trying to fix and why you think this is the good fix prevents me from doing my job. However, without really looking too much into it, this commit looks wrong. evas_textblock_cursor_format_is_visible_get should verify there's a format node... Please come up with a better commit message and re-commit. This reverts commit fe33aa74084aa383fb880ce9a32fa17663c41346. --- src/lib/evas/canvas/evas_object_textblock.c 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index de53f11..021f59a 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -8887,7 +8887,6 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur) char *ret; fnode = _evas_textblock_node_visible_at_pos_get( evas_textblock_cursor_format_get(cur)); -if (!fnode) return NULL; buf = eina_strbuf_new(); _markup_get_format_append(buf, fnode); -- -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/clouseau] master 01/01: Make systemd config files installation optional.
antognolli pushed a commit to branch master.
http://git.enlightenment.org/tools/clouseau.git/commit/?id=d95ff67dd64efd1ff8574a8a0d8c92dfb6e3c4ad
commit d95ff67dd64efd1ff8574a8a0d8c92dfb6e3c4ad
Author: Rafael Antognolli rafael.antogno...@intel.com
Date: Thu Oct 3 15:52:00 2013 -0300
Make systemd config files installation optional.
---
configure.ac | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 676f464..491b931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,13 +62,26 @@ PKG_CHECK_MODULES([EFL],
]
)
+want_systemd=yes
EFL_ENABLE_BETA_API_SUPPORT
+AC_ARG_ENABLE([systemd],
+ [AC_HELP_STRING([--disable-systemd],
+ [disable systemd integration. @:@default=enabled@:@])],
+ [
+if test x${enableval} = xyes ; then
+ want_systemd=yes
+else
+ want_systemd=no
+fi
+ ])
-# Detect systemd user session directory properly
-EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd], [systemduserunitdir],
-[have_systemd_user_session=yes], [have_systemd_user_session=no])
+if test x${want_systemd} = xyes; then
+# Detect systemd user session directory properly
+EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd], [systemduserunitdir],
+[have_systemd_user_session=yes],
[have_systemd_user_session=no])
+AC_SUBST([USER_SESSION_DIR])
+fi
AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test
x${have_systemd_user_session} = xyes])
-AC_SUBST([USER_SESSION_DIR])
### Checks for linker characteristics
lt_enable_auto_import=
--
Re: [E-devel] [EGIT] [core/enlightenment] enlightenment-0.17 01/01: probably fix menu clicks which I broke a couple commits ago...
On Thu, 3 Oct 2013 11:46:32 -0300 Eduardo Lima (Etrunko) ebl...@gmail.com said: the internet has become most... useful. :) http://eelslap.com 2013/10/3 Mike Blumenkrantz m.blumenk...@samsung.com: discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 commit 0e5d2c0ccfb685d27e91b176e15c63c18e8d63a4 Author: Mike Blumenkrantz m.blumenk...@samsung.com Date: Thu Oct 3 13:32:48 2013 +0100 probably fix menu clicks which I broke a couple commits ago... --- src/bin/e_menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 3556bed..c270e31 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -2978,6 +2978,8 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) m-zone-x + m-cur.x + m-cur.w, m-zone-y + m-cur.y + m-cur.h)) ret = _e_menu_active_call(); +else + ret = -1; } _e_menu_activate_maybe_drag = 0; _e_menu_activate_dragging = 0; -- -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina/eina_file - fix eina_file_map_lines() to not drop of one character in the last line.
On Thu, Oct 3, 2013 at 6:58 PM, ChunEon Park her...@hermet.pe.kr wrote: hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=18be4c50d9990c82ed9ce4269b7820e61f772699 commit 18be4c50d9990c82ed9ce4269b7820e61f772699 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Oct 4 01:58:35 2013 +0900 eina/eina_file - fix eina_file_map_lines() to not drop of one character in the last line. That remember me that with eina_file_virtualize we should be able to have easier test for those case. If anyone as the time to write small test case for eina_file, you are more than welcome. Maybe I will have some times one of this days... --- ChangeLog | 4 NEWS| 1 + src/lib/eina/eina_file_common.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2444fdb..cb4ea4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-04 ChunEon Park (Hermet) + + * Eina: fix eina_file_map_lines() to not drop of one character in the last line. + 2013-10-02 Cedric Bail * Eina: add eina_swap16(), eina_swap32(), eina_swap64(). diff --git a/NEWS b/NEWS index cd3d9f2..fc83666 100644 --- a/NEWS +++ b/NEWS @@ -258,6 +258,7 @@ Fixes: - Fix memory leak in eina_xattr_value_ls. - Fix magic failure in eina_value_array_count when array has not been allocated. - Fix issue when wchar_t is signed and eina_unicode does negative array lookups. + - Eina: fix eina_file_map_lines() to not drop of one character in the last line. * Eet: - Fix PPC (big endian) image codec bug. - Fix leak in eet_pbkdf2_sha1 with OpenSSL. diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c index 5d7ef11..ec9cac8 100644 --- a/src/lib/eina/eina_file_common.c +++ b/src/lib/eina/eina_file_common.c @@ -543,7 +543,8 @@ _eina_file_map_lines_iterator_next(Eina_Lines_Iterator *it, void **data) it-current.start = it-current.end; it-current.end = eol; - it-current.length = eol - it-current.start - 1; + it-current.length = eol - it-current.start; + if (eol it-end) it-current.length--; *data = it-current; return EINA_TRUE; -- -- Cedric BAIL -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/05: eina: add infrastructure to handle more CPU and compiler builtin information.
On Thu, Oct 3, 2013 at 4:11 AM, Lucas De Marchi
lucas.demar...@profusion.mobi wrote:
On Wed, Oct 2, 2013 at 8:57 AM, Cedric Bail cedric.b...@samsung.com wrote:
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff3d2a68d5762ec6bed88f97f2a3751bb51caf86
commit ff3d2a68d5762ec6bed88f97f2a3751bb51caf86
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Oct 2 18:31:10 2013 +0900
eina: add infrastructure to handle more CPU and compiler builtin
information.
---
[snip]
+static inline unsigned short eina_swap16(unsigned short x);
+static inline unsigned int eina_swap32(unsigned int x);
+static inline unsigned long long eina_swap64(unsigned long long x);
what's wrong with bswap_{32,16,64}? At least with gcc the correct
bswap instruction is emitted when available.
Your millage may vary depending on your compiler or its version. Mine
on an very old ubuntu doesn't. Same goes with LLVM.
--
Cedric BAIL
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/02: eina: in case of an error we should exit not continue and manipulate dead data.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d52f825de60cf8d168aa6899253b6edb862d135b commit d52f825de60cf8d168aa6899253b6edb862d135b Author: Cedric Bail cedric.b...@samsung.com Date: Fri Oct 4 09:54:27 2013 +0900 eina: in case of an error we should exit not continue and manipulate dead data. This should fix a warning catched by LLVM/Clang. --- src/lib/eina/eina_inline_value.x | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x index 2395e48..9ed7620 100644 --- a/src/lib/eina/eina_inline_value.x +++ b/src/lib/eina/eina_inline_value.x @@ -1296,6 +1296,7 @@ eina_value_hash_vset(Eina_Value *value, const char *key, va_list args) eina_value_type_flush(desc-subtype, mem); eina_hash_del_by_key(desc-hash, key); free(mem); + return EINA_FALSE; } } @@ -1378,6 +1379,7 @@ eina_value_hash_pset(Eina_Value *value, const char *key, const void *ptr) eina_value_type_flush(desc-subtype, mem); eina_hash_del_by_key(desc-hash, key); free(mem); + return EINA_FALSE; } } --
[EGIT] [core/efl] master 02/02: eina: handle more compiler strangeness for bswap.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fe25608edd6fc531b5c865dd511cd438bea2e897
commit fe25608edd6fc531b5c865dd511cd438bea2e897
Author: Cedric Bail cedric.b...@samsung.com
Date: Fri Oct 4 12:49:02 2013 +0900
eina: handle more compiler strangeness for bswap.
So current order is :
- __builtin_bswap*() for compiler that provide it
- _byteswap_*() for MSVC
- bswap_*() for older Linux and some BSD
- own C code when everything else fall appart.
The reason for this order is that the builtin will always generate
the best assembly possible. On my system bswap_*() are not changing
in all version to the best solution as they are almost equivalent to
the C macro.
---
configure.ac | 4
src/lib/eina/eina_config.h.in | 5 +
src/lib/eina/eina_inline_cpu.x | 26 +-
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 6ca409e..77972b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -792,6 +792,10 @@ AC_DEFINE_IF([HAVE_DIRENT_H], [test x${have_dirent} =
xyes],
### Checks for structures
### Checks for compiler characteristics
+AC_CHECK_HEADER([byteswap.h], [have_byteswap=yes], [have_byteswap=no])
+
+EINA_CONFIG([HAVE_BYTESWAP_H], [test x${have_byteswap} = xyes])
+
EFL_CHECK_GCC_BUILTIN([bswap16], [HAVE_BSWAP16])
EFL_CHECK_GCC_BUILTIN([bswap32], [HAVE_BSWAP32])
EFL_CHECK_GCC_BUILTIN([bswap64], [HAVE_BSWAP64])
diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in
index eb0869c..27acdf7 100644
--- a/src/lib/eina/eina_config.h.in
+++ b/src/lib/eina/eina_config.h.in
@@ -87,4 +87,9 @@
#endif
@EINA_CONFIGURE_HAVE_BSWAP64@
+#ifdef EINA_HAVE_BYTESWAP_H
+# undef EINA_HAVE_BYTESWAP_H
+#endif
+@EINA_CONFIGURE_HAVE_BYTESWAP_H@
+
#endif /* EINA_CONFIG_H_ */
diff --git a/src/lib/eina/eina_inline_cpu.x b/src/lib/eina/eina_inline_cpu.x
index bdfb4a4..18310f7 100644
--- a/src/lib/eina/eina_inline_cpu.x
+++ b/src/lib/eina/eina_inline_cpu.x
@@ -23,11 +23,27 @@
#ifndef EINA_INLINE_CPU_X_
#define EINA_INLINE_CPU_X_
+#ifdef EINA_HAVE_BYTESWAP_H
+# include byteswap.h
+#endif
+
+#ifdef __has_builtin
+# define EINA_HAS_BUILTIN(x) __has_builtin(x)
+#elif (defined(__GNUC__) (__GNUC__ 4 || (__GNUC__ == 4 __GNUC_MINOR__
= 8)))
+# define EINA_HAS_BUILTIN(x) 1
+#else
+# define EINA_HAS_BUILTIN(x) 0 // Compatibility for the rest of the world
+#endif
+
static inline unsigned short
eina_swap16(unsigned short x)
{
-#ifdef EINA_HAVE_BSWAP16
+#if defined EINA_HAVE_BSWAP16 EINA_HAS_BUILTIN(__builtin_bswap16)
return __builtin_bswap16(x);
+#elif defined _MSC_VER /* Windows. Apparently in stdlib.h. */
+ return _byteswap_ushort(x);
+#elif defined EINA_HAVE_BYTESWAP_H
+ return bswap_16(x);
#else
return (((x 0xff00) 8) |
((x 0x00ff) 8));
@@ -39,6 +55,10 @@ eina_swap32(unsigned int x)
{
#ifdef EINA_HAVE_BSWAP32
return __builtin_bswap32(x);
+#elif defined _MSC_VER /* Windows. Apparently in stdlib.h. */
+ return _byteswap_ulong(x);
+#elif defined EINA_HAVE_BYTESWAP_H
+ return bswap_32(x);
#else
return (x 24) |
((x 8) 0xFF00) |
@@ -52,6 +72,10 @@ eina_swap64(unsigned long long x)
{
#ifdef EINA_HAVE_BSWAP64
return __builtin_bswap64(x);
+#elif defined _MSC_VER /* Windows. Apparently in stdlib.h. */
+ return _byteswap_uint64(x);
+#elif defined EINA_HAVE_BYTESWAP_H
+ return bswap_64(x);
#else
return (((x 0xff00ull) 56) |
((x 0x00ffull) 40) |
--
Re: [E-devel] [EGIT] [core/efl] master 01/05: eina: add infrastructure to handle more CPU and compiler builtin information.
On Fri, Oct 4, 2013 at 1:09 AM, Cedric BAIL cedric.b...@free.fr wrote:
On Thu, Oct 3, 2013 at 4:11 AM, Lucas De Marchi
lucas.demar...@profusion.mobi wrote:
On Wed, Oct 2, 2013 at 8:57 AM, Cedric Bail cedric.b...@samsung.com wrote:
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff3d2a68d5762ec6bed88f97f2a3751bb51caf86
commit ff3d2a68d5762ec6bed88f97f2a3751bb51caf86
Author: Cedric Bail cedric.b...@samsung.com
Date: Wed Oct 2 18:31:10 2013 +0900
eina: add infrastructure to handle more CPU and compiler builtin
information.
---
[snip]
+static inline unsigned short eina_swap16(unsigned short x);
+static inline unsigned int eina_swap32(unsigned int x);
+static inline unsigned long long eina_swap64(unsigned long long x);
what's wrong with bswap_{32,16,64}? At least with gcc the correct
bswap instruction is emitted when available.
Your millage may vary depending on your compiler or its version. Mine
on an very old ubuntu doesn't. Same goes with LLVM.
Then I'd say to fix the compiler instead of adding API that we will
need to carry on. These will become the Eina_Bool of tomorrow.
Lucas De Marchi
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
