[EGIT] [admin/devs] master 01/01: ed25519
englebass pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a8917a551a8078a7bb910d8511f37b2c6607689b commit a8917a551a8078a7bb910d8511f37b2c6607689b Author: Sebastian Dransfeld Date: Wed Aug 19 14:05:49 2015 +0200 ed25519 --- developers/englebass/id_ed25519.pub | 1 + developers/englebass/id_rsa.pub | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/englebass/id_ed25519.pub b/developers/englebass/id_ed25519.pub new file mode 100644 index 000..f358c00 --- /dev/null +++ b/developers/englebass/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 C3NzaC1lZDI1NTE5IPnDhFRO/KcqQ/8c+AwSnMBcPP1FnWbX28PpFVBklfd8 sd@srm-5142 diff --git a/developers/englebass/id_rsa.pub b/developers/englebass/id_rsa.pub deleted file mode 100644 index 444b8a4..000 --- a/developers/englebass/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EDAQABAAABAQC/5/T+mrYX/9K65DgUDSy4LYDdXHVTDUTFYONsWEJBxCTlYKOsm+Z6U4ZUa7thiqHJYHU3Sk7CO3Gq+DcDhn7cFhWybwlqj62981LzPxDqZfqNEhfZEVeuFzPzMaX4QXeDychAIoezUpiL+71Yn4AY0oiTMB4UIqGpqF6637SAws6WaNXXuLUBPRjfxzQs6gekaBcuJdRAtCqA3zX4IJODhPY1cG7/Jn3LzMZ92bC2ziVQX11KUbOsvXW6nn3ZyN4stHZh26Jh40OoRGkpmdnxKcW8hFE9onG2ixogNcF79zMr3175DEgQKYwG7rl3H9JsAAdnWdm5M2km91VSl4P3 sd@srm-5142 --
[EGIT] [core/enlightenment] enlightenment-0.17 54/85: handle desktop applications better
cedric pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5f042a480c7e951539904ab2e4ab4968a144cfff
commit 5f042a480c7e951539904ab2e4ab4968a144cfff
Author: Sebastian Dransfeld
Date: Thu Nov 21 13:24:46 2013 +0100
handle desktop applications better
Fixes T201
---
src/bin/e_border.c | 18 ++
src/bin/e_border.h | 1 +
src/bin/e_focus.c | 14 +++---
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a93d0fd..fa07122 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -421,6 +421,7 @@ e_border_new(E_Container *con,
ecore_x_window_shadow_tree_flush();
e_object_del_func_set(E_OBJECT(bd), E_OBJECT_CLEANUP_FUNC(_e_border_del));
+ bd->focus_policy = e_config->focus_policy;
bd->w = 1;
bd->h = 1;
/* FIXME: ewww - round trip */
@@ -7457,6 +7458,21 @@ _e_border_eval0(E_Border *bd)
bd->client.netwm.update.state = 1;
}
}
+else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DESKTOP)
+ {
+ bd->focus_policy = E_FOCUS_CLICK;
+ e_focus_setup(bd);
+ if (!bd->client.netwm.state.skip_pager)
+ {
+ bd->client.netwm.state.skip_pager = 1;
+ bd->client.netwm.update.state = 1;
+ }
+ if (!bd->client.netwm.state.skip_taskbar)
+ {
+ bd->client.netwm.state.skip_taskbar = 1;
+ bd->client.netwm.update.state = 1;
+ }
+ }
bd->client.netwm.fetch.type = 0;
}
if (bd->client.icccm.fetch.machine)
@@ -8250,6 +8266,8 @@ _e_border_eval0(E_Border *bd)
bordername = bd->bordername;
else if ((bd->client.mwm.borderless) || (bd->borderless))
bordername = "borderless";
+else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DESKTOP)
+ bordername = "borderless";
else if (((bd->client.icccm.transient_for != 0) ||
(bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)) &&
(bd->client.icccm.min_w == bd->client.icccm.max_w) &&
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 29fe8dd..cd084b8 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -669,6 +669,7 @@ struct _E_Border
Eina_Bool argb;
inttmp_input_hidden;
+ intfocus_policy;
};
struct _E_Border_Pending_Move_Resize
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 7ce5c9e..a9a3b02 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -27,8 +27,8 @@ e_focus_idler_before(void)
EAPI void
e_focus_event_mouse_in(E_Border *bd)
{
- if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
- (e_config->focus_policy == E_FOCUS_SLOPPY))
+ if ((bd->focus_policy == E_FOCUS_MOUSE) ||
+ (bd->focus_policy == E_FOCUS_SLOPPY))
{
if (bd != e_border_focused_get())
e_border_focus_set(bd, 1, 1);
@@ -53,7 +53,7 @@ e_focus_event_mouse_in(E_Border *bd)
EAPI void
e_focus_event_mouse_out(E_Border *bd)
{
- if (e_config->focus_policy == E_FOCUS_MOUSE)
+ if (bd->focus_policy == E_FOCUS_MOUSE)
{
/* FIXME: this is such a hack. its a big hack around x's async events
* as we dont know always exactly what action causes what event
@@ -82,7 +82,7 @@ e_focus_event_mouse_down(E_Border *bd)
{
if (!bd->focused)
{
-if (e_config->focus_policy == E_FOCUS_CLICK)
+if (bd->focus_policy == E_FOCUS_CLICK)
e_border_focus_set(bd, 1, 1);
else if (e_config->always_click_to_focus)
e_border_focus_set(bd, 1, 1);
@@ -102,7 +102,7 @@ e_focus_event_mouse_up(E_Border *bd __UNUSED__)
EAPI void
e_focus_event_focus_in(E_Border *bd)
{
- if ((e_config->focus_policy == E_FOCUS_CLICK) &&
+ if ((bd->focus_policy == E_FOCUS_CLICK) &&
(!e_config->always_click_to_raise) &&
(!e_config->always_click_to_focus))
{
@@ -126,7 +126,7 @@ e_focus_event_focus_in(E_Border *bd)
EAPI void
e_focus_event_focus_out(E_Border *bd)
{
- if ((e_config->focus_policy == E_FOCUS_CLICK) &&
+ if ((bd->focus_policy == E_FOCUS_CLICK) &&
(!e_config->always_click_to_raise) &&
(!e_config->always_click_to_focus))
{
@@ -150,7 +150,7 @@ e_focus_event_focus_out(E_Border *bd)
EAPI void
e_focus_setup(E_Border *bd)
{
- if ((e_config->focus_policy == E_FOCUS_CLICK) ||
+ if ((bd->focus_policy == E_FOCUS_CLICK) ||
(e_config->always_click_to_raise) ||
(e_config->always_click_to_focus))
{
--
[EGIT] [core/enlightenment] enlightenment-0.17 33/85: e: remove un-needed NULL check.
cedric pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5a4755ee1ed911cb981bde3e52fa921a526ea193
commit 5a4755ee1ed911cb981bde3e52fa921a526ea193
Author: Sebastian Dransfeld
Date: Tue Dec 10 20:19:46 2013 +0100
e: remove un-needed NULL check.
bdname = params, which is already checked
CID 1039830, 1039831
---
src/bin/e_actions.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index b28b06c..fb8eacf 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -831,7 +831,7 @@ ACT_FN_GO(window_border_cycle, __UNUSED__)
{
const char *bdname = params;
- while ((space = strchr(bdname, ' ')))
+ while (space = strchr(bdname, ' '))
{
if (strncmp(bd->bordername, bdname, space - bdname) ==
0)
{
--
[EGIT] [core/enlightenment] enlightenment-0.17 59/85: Check return value from mkdir
cedric pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fb3a692233a0e91dda163c0f87673635d69cf2be
commit fb3a692233a0e91dda163c0f87673635d69cf2be
Author: Sebastian Dransfeld
Date: Sat Dec 7 21:32:11 2013 +0100
Check return value from mkdir
If mkdir fails, no need to stat.
Fixes CID 1039963
---
src/bin/e_ipc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index c616c0f..069d1ae 100644
--- a/src/bin/e_ipc.c
+++ b/src/bin/e_ipc.c
@@ -55,7 +55,8 @@ e_ipc_init(void)
snprintf(buf, sizeof(buf), "%s/e-%s@%x",
base, user, id1);
-mkdir(buf, S_IRWXU);
+if (mkdir(buf, S_IRWXU) < 0)
+ goto retry;
if (stat(buf, &st) == 0)
{
if ((st.st_uid == getuid()) &&
@@ -69,6 +70,7 @@ e_ipc_init(void)
if (_e_ipc_server) break;
}
}
+retry:
id1 = rand();
}
if (!_e_ipc_server) return 0;
--
[EGIT] [core/enlightenment] enlightenment-0.17 69/85: Find correct border under pointer
cedric pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b2e1a0657bdccc8f264e4d02864d8b9f3a925b93
commit b2e1a0657bdccc8f264e4d02864d8b9f3a925b93
Author: Sebastian Dransfeld
Date: Sat Dec 7 22:28:01 2013 +0100
Find correct border under pointer
Previously we would find the first border and then break. Now we find
the border with the highest layer, as the code intended.
Fixes CID 1039952
---
src/bin/e_border.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a21e087..834f800 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -10176,10 +10176,7 @@ _e_border_under_pointer_helper(E_Desk *desk, E_Border
*exclude, int x, int y)
/* If the layer is higher, the position of the window is higher
* (always on top vs always below) */
if (!bd || (cbd->layer > bd->layer))
- {
- bd = cbd;
- break;
- }
+ bd = cbd;
}
return bd;
}
--
[EGIT] [core/enlightenment] enlightenment-0.17 45/85: dialog: allow setting of NULL icon
cedric pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4c594998d175dd09094630a1eabe213d07258b82
commit 4c594998d175dd09094630a1eabe213d07258b82
Author: Sebastian Dransfeld
Date: Mon Mar 24 13:13:53 2014 +0100
dialog: allow setting of NULL icon
If NULL is passed as icon, icon should be disabled.
CID 1039951
---
src/bin/e_dialog.c | 36
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index b923d04..5291d28 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -163,19 +163,31 @@ e_dialog_text_set(E_Dialog *dia, const char *text)
EAPI void
e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
{
- if (!icon) return;
-
- dia->icon_object = e_icon_add(e_win_evas_get(dia->win));
- if (!e_util_icon_theme_set(dia->icon_object, icon))
- e_icon_file_edje_set(dia->icon_object, icon, "icon");
- edje_extern_object_min_size_set(dia->icon_object, size * e_scale, size *
e_scale);
- edje_object_part_swallow(dia->bg_object, "e.swallow.icon",
dia->icon_object);
- edje_object_signal_emit(dia->bg_object, "e,state,icon", "e");
- evas_object_show(dia->icon_object);
- if (icon)
- edje_object_signal_emit(dia->bg_object, "e,icon,enabled", "e");
+ if (!icon)
+ {
+if (dia->icon_object)
+ {
+ edje_object_part_unswallow(dia->bg_object, dia->icon_object);
+ evas_object_del(dia->icon_object);
+ dia->icon_object = NULL;
+ }
+edje_object_signal_emit(dia->bg_object, "e,state,icon", "e");
+edje_object_signal_emit(dia->bg_object, "e,icon,disabled", "e");
+ }
else
- edje_object_signal_emit(dia->bg_object, "e,icon,disabled", "e");
+ {
+if (!dia->icon_object)
+ {
+ dia->icon_object = e_icon_add(e_win_evas_get(dia->win));
+ edje_object_part_swallow(dia->bg_object, "e.swallow.icon",
dia->icon_object);
+ evas_object_show(dia->icon_object);
+ }
+if (!e_util_icon_theme_set(dia->icon_object, icon))
+ e_icon_file_edje_set(dia->icon_object, icon, "icon");
+edje_extern_object_min_size_set(dia->icon_object, size * e_scale, size
* e_scale);
+edje_object_signal_emit(dia->bg_object, "e,state,icon", "e");
+edje_object_signal_emit(dia->bg_object, "e,icon,enabled", "e");
+ }
edje_object_message_signal_process(dia->bg_object);
}
--
[EGIT] [core/enlightenment] enlightenment-0.17 32/85: e: double paranthesis as gcc suggests
cedric pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5fbac0819fe19230283ded157728fb2cd446b3df
commit 5fbac0819fe19230283ded157728fb2cd446b3df
Author: Sebastian Dransfeld
Date: Tue Dec 10 20:30:15 2013 +0100
e: double paranthesis as gcc suggests
Since we assign and check for true value in one operation, use double
paranthesis.
---
src/bin/e_actions.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 4478cae..b28b06c 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -831,7 +831,7 @@ ACT_FN_GO(window_border_cycle, __UNUSED__)
{
const char *bdname = params;
- while (bdname && (space = strchr(bdname, ' ')))
+ while ((space = strchr(bdname, ' ')))
{
if (strncmp(bd->bordername, bdname, space - bdname) ==
0)
{
--
[EGIT] [core/efl] master 02/02: efreet: fix signed warning
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e0a00d768b90917a0b190420c65db8d4c640ed2
commit 9e0a00d768b90917a0b190420c65db8d4c640ed2
Author: Sebastian Dransfeld
Date: Mon May 11 13:31:21 2015 +0200
efreet: fix signed warning
Update to 6a0d23. Casting to int isn't a real solution, since we could
have values which overflows.
Since we want the absolute value, just make sure we subtract the larger
value from the smaller.
---
src/lib/efreet/efreet_icon.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/lib/efreet/efreet_icon.c b/src/lib/efreet/efreet_icon.c
index 89e87f0..3cb7f5c 100644
--- a/src/lib/efreet/efreet_icon.c
+++ b/src/lib/efreet/efreet_icon.c
@@ -612,7 +612,10 @@ static double
efreet_icon_size_distance(Efreet_Cache_Icon_Element *elem, unsigned int size)
{
if (elem->type == EFREET_ICON_SIZE_TYPE_FIXED)
-return (abs((int) elem->normal - (int) size));
+{
+if (elem->normal > size) return elem->normal - size;
+else return size - elem->normal;
+}
if ((elem->type == EFREET_ICON_SIZE_TYPE_SCALABLE) ||
(elem->type == EFREET_ICON_SIZE_TYPE_THRESHOLD))
--
[EGIT] [core/efl] master 01/02: edje: rename variable
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3433c1449e69bcc3701dd1ca204d5d4d2ba3853e
commit 3433c1449e69bcc3701dd1ca204d5d4d2ba3853e
Author: Sebastian Dransfeld
Date: Mon May 11 12:21:54 2015 +0200
edje: rename variable
Give variable a name which better describes its purpose.
---
src/lib/edje/edje_calc.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 58f7633..31cfbd0 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -566,7 +566,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep,
const char *d1, doubl
{
Edje_Part_Description_Common *epd1;
Edje_Part_Description_Common *epd2 = NULL;
- Edje_Part_Description_Common *chosen_desc;
+ Edje_Part_Description_Common *last_desc;
Eina_Bool change_w, change_h;
Edje_Part_Description_Image *epdi;
@@ -624,13 +624,13 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part
*ep, const char *d1, doubl
ep->param2 = NULL;
}
- chosen_desc = ep->chosen_description;
+ last_desc = ep->chosen_description;
ep->param1.description = epd1;
ep->chosen_description = epd1;
- if (chosen_desc)
+ if (last_desc)
{
-change_w = ep->chosen_description->fixed.w != chosen_desc->fixed.w;
-change_h = ep->chosen_description->fixed.h != chosen_desc->fixed.h;
+change_w = ep->chosen_description->fixed.w != last_desc->fixed.w;
+change_h = ep->chosen_description->fixed.h != last_desc->fixed.h;
}
_edje_real_part_rel_to_apply(ed, ep, &ep->param1);
@@ -644,18 +644,18 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part
*ep, const char *d1, doubl
ep->chosen_description = epd2;
}
- if (chosen_desc != ep->chosen_description)
+ if (last_desc != ep->chosen_description)
{
if (ep->part->type == EDJE_PART_TYPE_EXTERNAL)
- _edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
-else if ((chosen_desc) && (ep->part->type == EDJE_PART_TYPE_GROUP))
+ _edje_external_recalc_apply(ed, ep, NULL, last_desc);
+else if ((last_desc) && (ep->part->type == EDJE_PART_TYPE_GROUP))
{
Edje_Size *min, *max, *pmin, *pmax;
min = &ep->chosen_description->min;
max = &ep->chosen_description->max;
- pmin = &chosen_desc->min;
- pmax = &chosen_desc->max;
+ pmin = &last_desc->min;
+ pmax = &last_desc->max;
if (change_w || change_h ||
(((pmin->w == pmax->w) && (pmin->h == pmax->h) && (pmin->w >
0) && (pmin->h > 0)) &&
(((min->w != max->w) || (min->h != max->h) || (min->w <= 0) ||
(min->h <= 0)
--
