Re: [E-devel] Seeking inout for Enlightenment Developer Days 2019
On Sat, 25 May 2019 05:14:39 + Jonathan Aquilina said: > Hi Stefan, > > EDD discussions have seem to have gone silent. Has anything been decided? just busy ... :) depending on when and some dates i'd love to make it, but things may come up. malta would be nice IMHO. :) > Regards, > Jonathan > > -Original Message- > From: Stefan Schmidt > Sent: 29 April 2019 12:35 > To: Enlightenment developer list ; > Jonathan Aquilina Subject: Re: [E-devel] Seeking > inout for Enlightenment Developer Days 2019 > > Hello. > > On 28.04.19 07:39, Jonathan Aquilina wrote: > > Hi Stefan, yes it would be the same location as last time. But then again > > it doesn’t have to be we can meet at a restaurant with WIFI if you guys > > want we can enjoy drinks and food easily and have no issues with a locked > > down university network. > > The original location would be fine. Restaurant or bar is for the evening but > not for the sessions where we have talks and discussions. > > I will add Malta to the list of hosting offers again. > > regards > Stefan Schmidt > > ___ > 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" -- Carsten Haitzler - ras...@rasterman.com ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Seeking inout for Enlightenment Developer Days 2019
@Carsten Haitzler would love to host you guys again. Now that I am self employed I have a bit more time to be a tour guide so to speak lol. But it really is up to the community. -Original Message- From: Carsten Haitzler Sent: 25 May 2019 10:09 To: Enlightenment developer list Cc: Jonathan Aquilina ; Stefan Schmidt Subject: Re: [E-devel] Seeking inout for Enlightenment Developer Days 2019 On Sat, 25 May 2019 05:14:39 + Jonathan Aquilina said: > Hi Stefan, > > EDD discussions have seem to have gone silent. Has anything been decided? just busy ... :) depending on when and some dates i'd love to make it, but things may come up. malta would be nice IMHO. :) > Regards, > Jonathan > > -Original Message- > From: Stefan Schmidt > Sent: 29 April 2019 12:35 > To: Enlightenment developer list > ; > Jonathan Aquilina Subject: Re: [E-devel] > Seeking inout for Enlightenment Developer Days 2019 > > Hello. > > On 28.04.19 07:39, Jonathan Aquilina wrote: > > Hi Stefan, yes it would be the same location as last time. But then > > again it doesn’t have to be we can meet at a restaurant with WIFI if > > you guys want we can enjoy drinks and food easily and have no issues > > with a locked down university network. > > The original location would be fine. Restaurant or bar is for the > evening but not for the sessions where we have talks and discussions. > > I will add Malta to the list of hosting offers again. > > regards > Stefan Schmidt > > ___ > 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" -- Carsten Haitzler - ras...@rasterman.com ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/02: win: use elm_layout for the base objects
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=3c12162dcfa7d2d3b5553f133d093f03999144d1 commit 3c12162dcfa7d2d3b5553f133d093f03999144d1 Author: Boris Faure Date: Wed May 22 23:03:03 2019 +0200 win: use elm_layout for the base objects --- src/bin/utils.c | 26 ++ src/bin/utils.h | 1 + src/bin/win.c | 109 ++-- src/bin/win.h | 1 - 4 files changed, 77 insertions(+), 60 deletions(-) diff --git a/src/bin/utils.c b/src/bin/utils.c index 57cdb1e..ecd2da3 100644 --- a/src/bin/utils.c +++ b/src/bin/utils.c @@ -49,6 +49,32 @@ theme_apply(Evas_Object *edje, const Config *config, const char *group) return EINA_FALSE; } +Eina_Bool +theme_apply_elm(Evas_Object *layout, const Config *config, const char *group) +{ + const char *errmsg; + Evas_Object *edje; + + EINA_SAFETY_ON_NULL_RETURN_VAL(layout, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(config, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(group, EINA_FALSE); + + if (elm_layout_file_set(layout, config_theme_path_get(config), group)) + return EINA_TRUE; + + edje = elm_layout_edje_get(layout); + errmsg = edje_load_error_str(edje_object_load_error_get(edje)); + INF("Cannot find theme: file=%s group=%s error='%s', trying default...", + config_theme_path_get(config), group, errmsg); + + if (elm_layout_file_set(layout, config_theme_path_default_get(config), group)) + return EINA_TRUE; + + errmsg = edje_load_error_str(edje_object_load_error_get(edje)); + ERR(_("Could not load any theme for group=%s: %s"), group, errmsg); + return EINA_FALSE; +} + Eina_Bool theme_apply_default(Evas_Object *edje, const Config *config, const char *group) { diff --git a/src/bin/utils.h b/src/bin/utils.h index cf25322..73476de 100644 --- a/src/bin/utils.h +++ b/src/bin/utils.h @@ -5,6 +5,7 @@ #include "config.h" Eina_Bool theme_apply(Evas_Object *edje, const Config *config, const char *group); +Eina_Bool theme_apply_elm(Evas_Object *edje, const Config *config, const char *group); Eina_Bool theme_apply_default(Evas_Object *edje, const Config *config, const char *group); void theme_reload(Evas_Object *edje); void theme_auto_reload_enable(Evas_Object *edje); diff --git a/src/bin/win.c b/src/bin/win.c index 06ba7db..fd87a8c 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -385,11 +385,11 @@ _solo_bell(Term_Container *tc, if (!tc->wn->config->disable_visual_bell) { edje_object_signal_emit(term->bg, "bell", "terminology"); -edje_object_signal_emit(term->base, "bell", "terminology"); +elm_layout_signal_emit(term->base, "bell", "terminology"); if (tc->wn->config->bell_rings) { edje_object_signal_emit(term->bg, "bell,ring", "terminology"); - edje_object_signal_emit(term->base, "bell,ring", "terminology"); + elm_layout_signal_emit(term->base, "bell,ring", "terminology"); } } tc->parent->bell(tc->parent, tc); @@ -419,7 +419,7 @@ _solo_unfocus(Term_Container *tc, Term_Container *relative) if (!term->config->disable_focus_visuals) { edje_object_signal_emit(term->bg, "focus,out", "terminology"); -edje_object_signal_emit(term->base, "focus,out", "terminology"); +elm_layout_signal_emit(term->base, "focus,out", "terminology"); } } @@ -454,12 +454,12 @@ _solo_focus(Term_Container *tc, Term_Container *relative) if (term->config->disable_focus_visuals) { edje_object_signal_emit(term->bg, "focused,set", "terminology"); -edje_object_signal_emit(term->base, "focused,set", "terminology"); +elm_layout_signal_emit(term->base, "focused,set", "terminology"); } else { edje_object_signal_emit(term->bg, "focus,in", "terminology"); -edje_object_signal_emit(term->base, "focus,in", "terminology"); +elm_layout_signal_emit(term->base, "focus,in", "terminology"); } if (term->wn->cmdbox) elm_object_focus_set(term->wn->cmdbox, EINA_FALSE); @@ -574,7 +574,7 @@ _cb_win_focus_in(void *data, if (!term->config->disable_focus_visuals) { edje_object_signal_emit(term->bg, "focus,out", "terminology"); - edje_object_signal_emit(term->base, "focus,out", "terminology"); + elm_layout_signal_emit(term->base, "focus,out", "terminology"); } } term = term_mouse; @@ -624,8 +624,6 @@ _win_is_focused(Win *wn) int win_term_set(Win *wn, Term *term) { Term_Container *tc_win = NULL, *tc_child = NULL; - Evas_Object *base = win_base_get(wn); - Evas *evas = evas_object_evas_get(base); tc_child = _solo_new(term, wn); if (!tc_child) @@ -635,7 +633,7 @@ int win_term_set(Win *wn, Term *term) tc_win->swallow(tc_win, NULL, tc_child)
[EGIT] [apps/terminology] master 02/02: Merge remote-tracking branch 'origin/terminology-1.4'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=b963622c5d7ca4d0170529c615447879e8184d40 commit b963622c5d7ca4d0170529c615447879e8184d40 Merge: 3c12162 49d9eb5 Author: Boris Faure Date: Sat May 25 11:35:46 2019 +0200 Merge remote-tracking branch 'origin/terminology-1.4' ChangeLog | 6 ++ NEWS | 9 + README.md | 2 +- man/terminology-helpers.1 | 2 +- man/terminology.1 | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) --
[EGIT] [apps/evisum] master 01/01: Fixes: Multiple Batteries and CPU on OpenBSD/Linux
netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=5860cd7351d3ebb17a745c4da43fc5c2c265c9ca commit 5860cd7351d3ebb17a745c4da43fc5c2c265c9ca Author: Alastair Poole Date: Sat May 25 15:34:33 2019 +0100 Fixes: Multiple Batteries and CPU on OpenBSD/Linux --- src/system.c| 24 - src/tingle/tingle.c | 97 + 2 files changed, 84 insertions(+), 37 deletions(-) diff --git a/src/system.c b/src/system.c index 7275db4..fc8b259 100644 --- a/src/system.c +++ b/src/system.c @@ -54,6 +54,7 @@ #endif #if defined(__OpenBSD__) || defined(__NetBSD__) +# include # include # include # include @@ -68,7 +69,11 @@ #include "system.h" -#define CPU_STATES5 +#if defined(__OpenBSD__) +# define CPU_STATES 6 +#else +# define CPU_STATES5 +#endif /* Filter requests and results */ #define RESULTS_CPU 0x01 @@ -244,7 +249,8 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) core->idle = idle; } #elif defined(__OpenBSD__) - unsigned long cpu_times[CPU_STATES]; + struct cpustats cpu_times[CPU_STATES]; + memset(&cpu_times, 0, CPU_STATES * sizeof(struct cpustats)); if (!ncpu) return; if (ncpu == 1) @@ -257,9 +263,9 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) total = 0; for (j = 0; j < CPU_STATES; j++) - total += cpu_times[j]; + total += cpu_times[0].cs_time[j]; -idle = cpu_times[4]; +idle = cpu_times[0].cs_time[CP_IDLE]; diff_total = total - core->total; diff_idle = idle - core->idle; @@ -281,17 +287,17 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) { for (i = 0; i < ncpu; i++) { core = cores[i]; - int cpu_time_mib[] = { CTL_KERN, KERN_CPTIME2, 0 }; - size = CPU_STATES * sizeof(unsigned long); + int cpu_time_mib[] = { CTL_KERN, KERN_CPUSTATS, 0 }; + size = sizeof(struct cpustats); cpu_time_mib[2] = i; - if (sysctl(cpu_time_mib, 3, &cpu_times, &size, NULL, 0) < 0) + if (sysctl(cpu_time_mib, 3, &cpu_times[i], &size, NULL, 0) < 0) return; total = 0; for (j = 0; j < CPU_STATES; j++) - total += cpu_times[j]; + total += cpu_times[i].cs_time[j]; - idle = cpu_times[4]; + idle = cpu_times[i].cs_time[CP_IDLE]; diff_total = total - core->total; if (diff_total == 0) diff_total = 1; diff --git a/src/tingle/tingle.c b/src/tingle/tingle.c index be1bc00..cc8420e 100644 --- a/src/tingle/tingle.c +++ b/src/tingle/tingle.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2017, Al Poole + Copyright (c) 2017, Alastair Poole All rights reserved. Redistribution and use in source and binary forms, with or without @@ -60,6 +60,7 @@ #if defined(__OpenBSD__) || defined(__NetBSD__) # include +# include # include # include # include @@ -81,7 +82,11 @@ # include #endif +#if defined(__OpenBSD__) +# define CPU_STATES 6 +#else #define CPU_STATES5 +#endif #define MAX_BATTERIES 5 #define INVALID_TEMP -999 @@ -116,14 +121,19 @@ typedef struct unsigned long swap_used; } meminfo_t; +typedef struct +{ + double charge_full; + double charge_current; + uint8_t percent; +} bat_t; + typedef struct { boolhave_ac; int battery_count; - double charge_full; - double charge_current; - uint8_t percent; + bat_t **batteries; charbattery_names[256]; int*bat_mibs[MAX_BATTERIES]; @@ -308,7 +318,8 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) core->idle = idle; } #elif defined(__OpenBSD__) - unsigned long cpu_times[CPU_STATES]; + struct cpustats cpu_times[CPU_STATES]; + memset(&cpu_times, 0, CPU_STATES * sizeof(struct cpustats)); if (!ncpu) return; if (ncpu == 1) @@ -321,9 +332,9 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) total = 0; for (j = 0; j < CPU_STATES; j++) - total += cpu_times[j]; + total += cpu_times[0].cs_time[j]; -idle = cpu_times[4]; +idle = cpu_times[0].cs_time[CP_IDLE]; diff_total = total - core->total; diff_idle = idle - core->idle; @@ -345,17 +356,17 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) { for (i = 0; i < ncpu; i++) { core = cores[i]; - int cpu_time_mib[] = { CTL_KERN, KERN_CPTIME2, 0 }; - size = CPU_STATES * sizeof(unsigned long); + int cpu_time_mib[] = { CTL_KERN, KERN_CPUSTATS, 0 }; + size = sizeof(struct cpustats); cpu_time_mib[2] = i; - if (sysctl(cpu_time_mib, 3, &cpu_times, &size, NULL, 0) < 0) + if (sysctl(cpu_time_mib, 3, &cpu_times[i], &size, NULL, 0) < 0) return; - total =
[EGIT] [apps/evisum] master 01/01: OpenBSD: Fix SP.
netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=95f81498c0e82efaa8886e0490b49b3364744c6b commit 95f81498c0e82efaa8886e0490b49b3364744c6b Author: Alastair Poole Date: Sat May 25 16:03:38 2019 +0100 OpenBSD: Fix SP. --- src/system.c| 4 ++-- src/tingle/tingle.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system.c b/src/system.c index fc8b259..67462fe 100644 --- a/src/system.c +++ b/src/system.c @@ -257,8 +257,8 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) { core = cores[0]; int cpu_time_mib[] = { CTL_KERN, KERN_CPTIME }; -size = CPU_STATES * sizeof(unsigned long); -if (sysctl(cpu_time_mib, 2, &cpu_times, &size, NULL, 0) < 0) +size = sizeof(struct cpustats); +if (sysctl(cpu_time_mib, 2, &cpu_times[0], &size, NULL, 0) < 0) return; total = 0; diff --git a/src/tingle/tingle.c b/src/tingle/tingle.c index cc8420e..aa430ac 100644 --- a/src/tingle/tingle.c +++ b/src/tingle/tingle.c @@ -326,8 +326,8 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) { core = cores[0]; int cpu_time_mib[] = { CTL_KERN, KERN_CPTIME }; -size = CPU_STATES * sizeof(unsigned long); -if (sysctl(cpu_time_mib, 2, &cpu_times, &size, NULL, 0) < 0) +size = sizeof(struct cpustats); +if (sysctl(cpu_time_mib, 2, &cpu_times[0], &size, NULL, 0) < 0) return; total = 0; --
[EGIT] [apps/evisum] master 01/01: OpenBSD: Unified CPU polling API.
netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=56f2667451c3cf791beb9cee05874337a8b51353 commit 56f2667451c3cf791beb9cee05874337a8b51353 Author: Alastair Poole Date: Sat May 25 16:24:55 2019 +0100 OpenBSD: Unified CPU polling API. Further testing proves we can use one approach for both SP and MP machines. --- src/system.c| 49 + src/tingle/tingle.c | 49 + 2 files changed, 18 insertions(+), 80 deletions(-) diff --git a/src/system.c b/src/system.c index 67462fe..9808bc2 100644 --- a/src/system.c +++ b/src/system.c @@ -253,24 +253,26 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) memset(&cpu_times, 0, CPU_STATES * sizeof(struct cpustats)); if (!ncpu) return; - if (ncpu == 1) + + for (i = 0; i < ncpu; i++) { -core = cores[0]; -int cpu_time_mib[] = { CTL_KERN, KERN_CPTIME }; +core = cores[i]; +int cpu_time_mib[] = { CTL_KERN, KERN_CPUSTATS, 0 }; size = sizeof(struct cpustats); -if (sysctl(cpu_time_mib, 2, &cpu_times[0], &size, NULL, 0) < 0) +cpu_time_mib[2] = i; +if (sysctl(cpu_time_mib, 3, &cpu_times[i], &size, NULL, 0) < 0) return; total = 0; for (j = 0; j < CPU_STATES; j++) - total += cpu_times[0].cs_time[j]; + total += cpu_times[i].cs_time[j]; -idle = cpu_times[0].cs_time[CP_IDLE]; +idle = cpu_times[i].cs_time[CP_IDLE]; diff_total = total - core->total; -diff_idle = idle - core->idle; if (diff_total == 0) diff_total = 1; +diff_idle = idle - core->idle; ratio = diff_total / 100.0; used = diff_total - diff_idle; percent = used / ratio; @@ -283,39 +285,6 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) core->total = total; core->idle = idle; } - else if (ncpu > 1) - { -for (i = 0; i < ncpu; i++) { - core = cores[i]; - int cpu_time_mib[] = { CTL_KERN, KERN_CPUSTATS, 0 }; - size = sizeof(struct cpustats); - cpu_time_mib[2] = i; - if (sysctl(cpu_time_mib, 3, &cpu_times[i], &size, NULL, 0) < 0) - return; - - total = 0; - for (j = 0; j < CPU_STATES; j++) - total += cpu_times[i].cs_time[j]; - - idle = cpu_times[i].cs_time[CP_IDLE]; - - diff_total = total - core->total; - if (diff_total == 0) diff_total = 1; - - diff_idle = idle - core->idle; - ratio = diff_total / 100.0; - used = diff_total - diff_idle; - percent = used / ratio; - - if (percent > 100) percent = 100; - else if (percent < 0) - percent = 0; - - core->percent = percent; - core->total = total; - core->idle = idle; - } - } #elif defined(__linux__) char *buf, name[128]; int i; diff --git a/src/tingle/tingle.c b/src/tingle/tingle.c index aa430ac..454ef4a 100644 --- a/src/tingle/tingle.c +++ b/src/tingle/tingle.c @@ -322,24 +322,26 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) memset(&cpu_times, 0, CPU_STATES * sizeof(struct cpustats)); if (!ncpu) return; - if (ncpu == 1) + + for (i = 0; i < ncpu; i++) { -core = cores[0]; -int cpu_time_mib[] = { CTL_KERN, KERN_CPTIME }; +core = cores[i]; +int cpu_time_mib[] = { CTL_KERN, KERN_CPUSTATS, 0 }; size = sizeof(struct cpustats); -if (sysctl(cpu_time_mib, 2, &cpu_times[0], &size, NULL, 0) < 0) +cpu_time_mib[2] = i; +if (sysctl(cpu_time_mib, 3, &cpu_times[i], &size, NULL, 0) < 0) return; total = 0; for (j = 0; j < CPU_STATES; j++) - total += cpu_times[0].cs_time[j]; + total += cpu_times[i].cs_time[j]; -idle = cpu_times[0].cs_time[CP_IDLE]; +idle = cpu_times[i].cs_time[CP_IDLE]; diff_total = total - core->total; -diff_idle = idle - core->idle; if (diff_total == 0) diff_total = 1; +diff_idle = idle - core->idle; ratio = diff_total / 100.0; used = diff_total - diff_idle; percent = used / ratio; @@ -352,39 +354,6 @@ _cpu_state_get(cpu_core_t **cores, int ncpu) core->total = total; core->idle = idle; } - else if (ncpu > 1) - { -for (i = 0; i < ncpu; i++) { - core = cores[i]; - int cpu_time_mib[] = { CTL_KERN, KERN_CPUSTATS, 0 }; - size = sizeof(struct cpustats); - cpu_time_mib[2] = i; - if (sysctl(cpu_time_mib, 3, &cpu_times[i], &size, NULL, 0) < 0) - return; - -total = 0; - for (j = 0; j < CPU_STATES; j++) - total += cpu_times[i].cs_time[
[EGIT] [core/enlightenment] master 01/01: Fix typos in messages
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e83259bccd201057dde5e8d9fac674becc57f424 commit e83259bccd201057dde5e8d9fac674becc57f424 Author: maxerba Date: Sat May 25 21:43:24 2019 +0200 Fix typos in messages --- src/modules/mixer/gadget/backend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/mixer/gadget/backend.c b/src/modules/mixer/gadget/backend.c index 59e7d7acb..89c2e3d0a 100644 --- a/src/modules/mixer/gadget/backend.c +++ b/src/modules/mixer/gadget/backend.c @@ -315,7 +315,7 @@ _actions_unregister(void) if (_action_incr_app) { e_action_predef_name_del("Mixer", - _("Increase Volume of Focuse Application")); + _("Increase Volume of Focused Application")); e_action_del("volume_increase_app"); _action_incr_app = NULL; } @@ -323,7 +323,7 @@ _actions_unregister(void) if (_action_decr_app) { e_action_predef_name_del("Mixer", - _("Decrease Volume of Focuse Application")); + _("Decrease Volume of Focused Application")); e_action_del("volume_decrease_app"); _action_decr_app = NULL; } @@ -331,7 +331,7 @@ _actions_unregister(void) if (_action_mute_app) { e_action_predef_name_del("Mixer", - _("Mute Volume of Focuse Application")); + _("Mute Volume of Focused Application")); e_action_del("volume_mute_app"); _action_mute_app = NULL; } --