[EGIT] [core/enlightenment] master 01/01: E Exe: Semi revert 2082bb51d3abffd991b4d791ace2567888e2e9fb. The ref count was off to begin with.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bb4d69519f84dbdd0c6b7267d4afee4f2d9a9ce5 commit bb4d69519f84dbdd0c6b7267d4afee4f2d9a9ce5 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Tue Sep 26 22:11:21 2017 -0500 E Exe: Semi revert 2082bb51d3abffd991b4d791ace2567888e2e9fb. The ref count was off to begin with. --- src/bin/e_exec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index da293a8be..851058ddc 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -280,6 +280,7 @@ e_exec_phony(E_Client *ec) lnew = eina_list_append(l, inst); if (l) eina_hash_modify(e_exec_instances, inst->key, lnew); else eina_hash_add(e_exec_instances, inst->key, lnew); + inst->ref++; ecore_event_add(E_EVENT_EXEC_NEW, inst, _e_exec_cb_exec_new_free, inst); e_exec_instance_client_add(inst, ec); return inst; @@ -361,6 +362,7 @@ e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec) e_object_ref(E_OBJECT(ec)); ec->exe_inst = inst; inst->ref++; + ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_client_free, ec); } E_API void --
[EGIT] [core/enlightenment] master 01/01: E Exe: Since we no longer ref clients in the phony cb, don't free them after reffing them in instance_client_add.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2082bb51d3abffd991b4d791ace2567888e2e9fb commit 2082bb51d3abffd991b4d791ace2567888e2e9fb Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Tue Sep 26 22:01:15 2017 -0500 E Exe: Since we no longer ref clients in the phony cb, don't free them after reffing them in instance_client_add. --- src/bin/e_exec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index f73aa9cde..da293a8be 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -361,7 +361,6 @@ e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec) e_object_ref(E_OBJECT(ec)); ec->exe_inst = inst; inst->ref++; - ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_client_free, ec); } E_API void --
[EGIT] [apps/ephoto] master 01/01: Ephoto: Install images to the correct location.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=223076607ea045680579f96ca2cbabfff7cf3799
commit 223076607ea045680579f96ca2cbabfff7cf3799
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Sep 14 11:50:38 2017 -0500
Ephoto: Install images to the correct location.
---
data/images/meson.build | 2 +-
src/bin/ephoto_config.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/data/images/meson.build b/data/images/meson.build
index 0764532..d9cd990 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -1,4 +1,4 @@
install_data('ephoto.png',
'grid.png',
'single.png',
- install_dir: join_paths(dir_data, 'icons'))
+ install_dir: join_paths(dir_data, 'ephoto/images'))
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 53797d1..31f711c 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -650,6 +650,9 @@ _ephoto_on_config_save(void *data)
snprintf(buf, sizeof(buf), "%s/ephoto/ephoto.cfg",
efreet_config_home_get());
snprintf(buf2, sizeof(buf2), "%s.tmp", buf);
+ if (ephoto->config->window_width < 15) ephoto->config->window_width = 15;
+ if (ephoto->config->window_height < 15) ephoto->config->window_height = 15;
+
ef = eet_open(buf2, EET_FILE_MODE_WRITE);
if (!ef)
goto save_end;
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Make thumbnailer work correctly.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=c50e7b2bc1ea1dfd4c75b11f8d9632e6004871ae
commit c50e7b2bc1ea1dfd4c75b11f8d9632e6004871ae
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Sep 13 15:48:17 2017 -0500
Ephoto: Make thumbnailer work correctly.
---
src/bin/ephoto_thumb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/ephoto_thumb.c b/src/bin/ephoto_thumb.c
index 76b403c..ca24a5d 100644
--- a/src/bin/ephoto_thumb.c
+++ b/src/bin/ephoto_thumb.c
@@ -142,8 +142,8 @@ e_thumb_icon_begin(Evas_Object *obj)
{
Ecore_Exe *exe;
- snprintf(buf, sizeof(buf), "%s/ephoto_thumbnail --nice=1",
PACKAGE_LIB_DIR);
- exe = ecore_exe_run(buf, NULL);
+ snprintf(buf, sizeof(buf), "%s/ephoto/ephoto_thumbnail --nice=1",
PACKAGE_LIB_DIR);
+exe = ecore_exe_run(buf, NULL);
_thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);
}
_thumb_queue = eina_list_append(_thumb_queue, eth);
@@ -432,7 +432,7 @@ _e_thumb_cb_exe_event_del(void *data EINA_UNUSED, int type
EINA_UNUSED, void *ev
Ecore_Exe *exe_thumb;
char buf[4096];
- snprintf(buf, sizeof(buf), "%s/ephoto_thumbnail --nice=1",
PACKAGE_LIB_DIR);
+ snprintf(buf, sizeof(buf), "%s/ephoto/ephoto_thumbnail --nice=1",
PACKAGE_LIB_DIR);
exe_thumb = ecore_exe_run(buf, NULL);
_thumbnailers_exe = eina_list_append(_thumbnailers_exe,
exe_thumb);
}
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Replace autofoo with meson
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=6eb4616015993ff01f872a3cc61c0de63d5c00c0 commit 6eb4616015993ff01f872a3cc61c0de63d5c00c0 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Wed Sep 13 10:38:50 2017 -0500 Ephoto: Replace autofoo with meson --- COPYING | 2 +- ChangeLog| 2 - INSTALL | 377 --- Makefile.am | 75 - NEWS | 45 -- autogen.sh | 41 + configure.ac | 116 - data/Makefile.am | 2 - data/desktop/Makefile.am | 9 -- data/desktop/meson.build | 2 + data/images/Makefile.am | 7 - data/images/meson.build | 4 + data/meson.build | 3 + data/themes/Makefile.am | 23 --- data/themes/ephoto.edc | 20 +-- data/themes/meson.build | 13 ++ data/themes/perms.sh | 3 + m4/ac_attribute.m4 | 47 -- m4/efl.m4| 123 -- m4/efl_binary.m4 | 71 m4/efl_tests.m4 | 65 meson.build | 71 meson_options.txt| 4 + po/meson.build | 6 + src/Makefile.am | 5 - src/bin/Makefile.am | 79 - src/bin/ephoto.h | 12 +- src/bin/ephoto_config.c | 2 +- src/bin/ephoto_thumbnailer.c | 2 - src/bin/meson.build | 41 + src/meson.build | 1 + 31 files changed, 199 insertions(+), 1074 deletions(-) diff --git a/COPYING b/COPYING index b0e6fa1..6adb4f2 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (C) 2000-2016 Stephen Houston +Copyright (C) 2000-2017 Stephen Houston All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 8c1c87e..000 --- a/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -Ephoto - A comprehensive image viewer written using the core EFL. -First release of Ephoto - Version 1.0 Beta diff --git a/INSTALL b/INSTALL index a1e89e1..3e797a1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,370 +1,59 @@ -Installation Instructions -* +** COMPILING and INSTALLING ** +-- -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, -Inc. +Meson is the build system used for this project. For more information please +see: - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. +http://mesonbuild.com -Basic Installation -== + - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. +Normal compilation in /usr/local: - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +meson . build +ninja -C build +sudo ninja -C build install - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. +For meson build generic options: - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. +meson --help - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to
[EGIT] [core/enlightenment] master 01/01: Pager gadget config: Don't add icon to an evas, add it to an elm widget.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=24591631eedc84551233a6722076fc98abca2878
commit 24591631eedc84551233a6722076fc98abca2878
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Sep 12 12:16:10 2017 -0500
Pager gadget config: Don't add icon to an evas, add it to an elm widget.
This fixes T5952
---
src/modules/pager/gadget/config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/pager/gadget/config.c
b/src/modules/pager/gadget/config.c
index e29c61cf7..331882b41 100644
--- a/src/modules/pager/gadget/config.c
+++ b/src/modules/pager/gadget/config.c
@@ -191,7 +191,7 @@ _config_update_btn(Evas_Object *button, const int
mouse_button)
elm_object_text_set(button, lbl);
if (icon)
{
-ic = elm_icon_add(evas_object_evas_get(button));
+ic = elm_icon_add(button);
elm_icon_standard_set(ic, icon);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
}
--
[EGIT] [core/enlightenment] master 01/01: Update netstatus in/out in the same file read. Fix cpufreq to use powersave again.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=20a96271ca5ce95e983b466b5a2efc4b35f60fc3
commit 20a96271ca5ce95e983b466b5a2efc4b35f60fc3
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Sep 12 12:10:38 2017 -0500
Update netstatus in/out in the same file read. Fix cpufreq to use powersave
again.
---
src/modules/cpufreq/e_mod_main.c | 17 --
src/modules/sysinfo/netstatus/netstatus.c| 13 ++---
src/modules/sysinfo/netstatus/netstatus.h| 12 +++--
src/modules/sysinfo/netstatus/netstatus_proc.c | 67 +++-
src/modules/sysinfo/netstatus/netstatus_sysctl.c | 55 ++-
5 files changed, 65 insertions(+), 99 deletions(-)
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index e5b6cf5a3..f4ba259b6 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -1287,9 +1287,18 @@ typedef struct _Thread_Config Thread_Config;
struct _Thread_Config
{
int interval;
+ E_Powersave_Sleeper *sleeper;
};
static void
+_cpufreq_cb_frequency_check_done(void *data, Ecore_Thread *th EINA_UNUSED)
+{
+ Thread_Config *thc = data;
+ e_powersave_sleeper_free(thc->sleeper);
+ free(thc);
+}
+
+static void
_cpufreq_cb_frequency_check_main(void *data, Ecore_Thread *th)
{
Thread_Config *thc = data;
@@ -1304,9 +1313,8 @@ _cpufreq_cb_frequency_check_main(void *data, Ecore_Thread
*th)
else
_cpufreq_status_free(status);
if (ecore_thread_check(th)) break;
-usleep((100.0 / 8.0) * (double)thc->interval);
+e_powersave_sleeper_sleep(thc->sleeper, thc->interval);
}
- free(thc);
}
static void
@@ -1380,10 +1388,13 @@ _cpufreq_poll_interval_update(void)
if (thc)
{
thc->interval = cpufreq_config->poll_interval;
+thc->sleeper = e_powersave_sleeper_new();
cpufreq_config->frequency_check_thread =
ecore_thread_feedback_run(_cpufreq_cb_frequency_check_main,
_cpufreq_cb_frequency_check_notify,
-NULL, NULL, thc, EINA_TRUE);
+_cpufreq_cb_frequency_check_done,
+_cpufreq_cb_frequency_check_done,
+thc, EINA_TRUE);
}
e_config_save_queue();
}
diff --git a/src/modules/sysinfo/netstatus/netstatus.c
b/src/modules/sysinfo/netstatus/netstatus.c
index 0e87854a7..87ea74c18 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -7,14 +7,13 @@ struct _Thread_Config
int interval;
Instance*inst;
Eina_Boolautomax;
+ time_t checktime;
int inpercent;
- time_t intime;
unsigned longin;
unsigned longincurrent;
unsigned longinmax;
Eina_Stringshare*instring;
int outpercent;
- time_t outtime;
unsigned longout;
unsigned longoutcurrent;
unsigned longoutmax;
@@ -145,11 +144,13 @@ _netstatus_cb_usage_check_main(void *data, Ecore_Thread
*th)
if (ecore_thread_check(th)) break;
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-_netstatus_sysctl_getrstatus(thc->automax, >in, >incurrent,
>inmax, >intime, >inpercent);
-_netstatus_sysctl_gettstatus(thc->automax, >out,
>outcurrent, >outmax, >outtime, >outpercent);
+_netstatus_sysctl_getstatus(thc->automax, >checktime, >in,
>incurrent,
+>inmax, >inpercent, >out, >outcurrent,
>outmax,
+>outpercent);
#else
-_netstatus_proc_getrstatus(thc->automax, >in, >incurrent,
>inmax, >intime, >inpercent);
-_netstatus_proc_gettstatus(thc->automax, >out, >outcurrent,
>outmax, >outtime, >outpercent);
+_netstatus_proc_getstatus(thc->automax, >checktime, >in,
>incurrent,
+>inmax, >inpercent, >out, >outcurrent,
>outmax,
+>outpercent);
#endif
if (!thc->incurrent)
{
diff --git a/src/modules/sysinfo/netstatus/netstatus.h
b/src/modules/sysinfo/netstatus/netstatus.h
index 87010a04a..ee1a36f90 100644
--- a/src/modules/sysinfo/netstatus/netstatus.h
+++ b/src/modules/sysinfo/netstatus/netstatus.h
@@ -17,9 +17,13 @@ struct _Netstatus_Config
};
EINTERN void _netstatus_config_updated(Instance *inst);
-EINTERN void _netstatus_proc_getrstatus(Eina_Bool automax, unsigned long
*prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax, time_t
*last_checked, int *prev_inpercent);
-EINTERN void _netstatus_proc_gettstatus(Eina_Bool automax, unsigned
[EGIT] [core/enlightenment] master 01/01: Fix bad formatting.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4bc8df4cbb4568b113e9c4c0bab63f9f97639b50
commit 4bc8df4cbb4568b113e9c4c0bab63f9f97639b50
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Sep 11 13:37:14 2017 -0500
Fix bad formatting.
---
src/modules/temperature/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/temperature/e_mod_main.c
b/src/modules/temperature/e_mod_main.c
index d05f9e77a..c90556fa0 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -293,7 +293,7 @@ _temperature_face_shutdown(const Eina_Hash *hash
EINA_UNUSED, const void *key EI
if (inst->sensor_name) eina_stringshare_del(inst->sensor_name);
if (inst->id) eina_stringshare_del(inst->id);
#ifdef HAVE_EEZE
-if (inst->poller)
+ if (inst->poller)
{
ecore_poller_del(inst->poller);
_temperature_thread_free(inst->tth);
--
[EGIT] [core/enlightenment] master 01/01: Temperature module: Don't use e_powersave_sleep. It doesn't work for ticks faster than a second.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4a92502f81a1006cf5fbc3b3dda70a902e740788
commit 4a92502f81a1006cf5fbc3b3dda70a902e740788
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Sep 11 13:31:03 2017 -0500
Temperature module: Don't use e_powersave_sleep. It doesn't work for ticks
faster than a second.
---
src/modules/temperature/e_mod_main.c | 6 ++
src/modules/temperature/e_mod_main.h | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/modules/temperature/e_mod_main.c
b/src/modules/temperature/e_mod_main.c
index a4e99a5c9..d05f9e77a 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -58,7 +58,6 @@ _temperature_thread_free(Tempthread *tth)
#if defined(HAVE_EEZE)
EINA_LIST_FREE(tth->tempdevs, s) eina_stringshare_del(s);
#endif
- e_powersave_sleeper_free(tth->sleeper);
free(tth->extn);
free(tth);
}
@@ -294,7 +293,7 @@ _temperature_face_shutdown(const Eina_Hash *hash
EINA_UNUSED, const void *key EI
if (inst->sensor_name) eina_stringshare_del(inst->sensor_name);
if (inst->id) eina_stringshare_del(inst->id);
#ifdef HAVE_EEZE
- if (inst->poller)
+if (inst->poller)
{
ecore_poller_del(inst->poller);
_temperature_thread_free(inst->tth);
@@ -330,7 +329,7 @@ _temperature_check_main(void *data, Ecore_Thread *th)
temp = temperature_tempget_get(tth);
if (ptemp != temp) ecore_thread_feedback(th, (void *)((long)temp));
ptemp = temp;
-e_powersave_sleeper_sleep(tth->sleeper, tth->poll_interval);
+usleep((100.0 / 8.0) * (double)tth->poll_interval);
if (ecore_thread_check(th)) break;
}
}
@@ -363,7 +362,6 @@ temperature_face_update_config(Config_Face *inst)
tth->poll_interval = inst->poll_interval;
tth->sensor_type = inst->sensor_type;
tth->inst = inst;
- tth->sleeper = e_powersave_sleeper_new();
if (inst->sensor_name)
tth->sensor_name = eina_stringshare_add(inst->sensor_name);
diff --git a/src/modules/temperature/e_mod_main.h
b/src/modules/temperature/e_mod_main.h
index b9cf67187..52077405c 100644
--- a/src/modules/temperature/e_mod_main.h
+++ b/src/modules/temperature/e_mod_main.h
@@ -42,7 +42,6 @@ struct _Tempthread
const char *sensor_name;
const char *sensor_path;
void *extn;
- E_Powersave_Sleeper *sleeper;
#ifdef HAVE_EEZE
Eina_List *tempdevs;
#endif
--
[EGIT] [core/enlightenment] master 01/01: Sysinfo gadgets: Revert all uses of faulty e_powersave_sleeper.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f8e17b67e463850002c92e3ec9d16d557185bbbe
commit f8e17b67e463850002c92e3ec9d16d557185bbbe
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Sep 11 13:24:54 2017 -0500
Sysinfo gadgets: Revert all uses of faulty e_powersave_sleeper.
---
src/modules/sysinfo/cpuclock/cpuclock.c| 5 +
src/modules/sysinfo/cpumonitor/cpumonitor.c| 5 +
src/modules/sysinfo/memusage/memusage.c| 5 +
src/modules/sysinfo/netstatus/netstatus.c | 5 +
src/modules/sysinfo/netstatus/netstatus_proc.c | 10 +-
src/modules/sysinfo/sysinfo.h | 1 -
src/modules/sysinfo/thermal/thermal.c | 6 ++
7 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index e786fe613..8424b4cec 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -16,7 +16,6 @@ struct _Thread_Config
{
int interval;
Instance*inst;
- E_Powersave_Sleeper *sleeper;
};
typedef struct _Pstate_Config Pstate_Config;
@@ -840,7 +839,7 @@ _cpuclock_cb_frequency_check_main(void *data, Ecore_Thread
*th)
else
_cpuclock_status_free(status);
if (ecore_thread_check(th)) break;
-e_powersave_sleeper_sleep(thc->sleeper, thc->interval);
+usleep((100.0 / 8.0) * (double)thc->interval);
if (ecore_thread_check(th)) break;
}
}
@@ -894,7 +893,6 @@ _cpuclock_cb_frequency_check_end(void *data, Ecore_Thread
*th EINA_UNUSED)
{
Thread_Config *thc = data;
- e_powersave_sleeper_free(thc->sleeper);
E_FREE(thc);
}
@@ -912,7 +910,6 @@ _cpuclock_poll_interval_update(Instance *inst)
if (thc)
{
thc->inst = inst;
-thc->sleeper = e_powersave_sleeper_new();
thc->interval = inst->cfg->cpuclock.poll_interval;
inst->cfg->cpuclock.frequency_check_thread =
ecore_thread_feedback_run(_cpuclock_cb_frequency_check_main,
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c
b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index 3a2081faa..83084bd40 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -10,7 +10,6 @@ struct _Thread_Config
unsigned longtotal;
unsigned longidle;
Instance*inst;
- E_Powersave_Sleeper *sleeper;
Eina_List *cores;
};
@@ -173,7 +172,7 @@ _cpumonitor_cb_usage_check_main(void *data, Ecore_Thread
*th)
#endif
ecore_thread_feedback(th, NULL);
if (ecore_thread_check(th)) break;
-e_powersave_sleeper_sleep(thc->sleeper, thc->interval);
+usleep((100.0 / 8.0) * (double)thc->interval);
if (ecore_thread_check(th)) break;
}
}
@@ -197,7 +196,6 @@ _cpumonitor_cb_usage_check_end(void *data, Ecore_Thread *th
EINA_UNUSED)
Thread_Config *thc = data;
CPU_Core *core;
- e_powersave_sleeper_free(thc->sleeper);
EINA_LIST_FREE(thc->cores, core)
E_FREE(core);
E_FREE(thc);
@@ -307,7 +305,6 @@ _cpumonitor_config_updated(Instance *inst)
thc->idle = 0;
thc->percent = 0;
thc->interval = inst->cfg->cpumonitor.poll_interval;
-thc->sleeper = e_powersave_sleeper_new();
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
thc->num_cores = _cpumonitor_sysctl_getcores();
#else
diff --git a/src/modules/sysinfo/memusage/memusage.c
b/src/modules/sysinfo/memusage/memusage.c
index acb8545f6..42c1a6a7e 100644
--- a/src/modules/sysinfo/memusage/memusage.c
+++ b/src/modules/sysinfo/memusage/memusage.c
@@ -15,7 +15,6 @@ struct _Thread_Config
unsigned longmem_shared;
unsigned longswp_total;
unsigned longswp_used;
- E_Powersave_Sleeper *sleeper;
};
static void
@@ -294,7 +293,7 @@ _memusage_cb_usage_check_main(void *data, Ecore_Thread *th)
ecore_thread_feedback(th, NULL);
if (ecore_thread_check(th)) break;
-e_powersave_sleeper_sleep(thc->sleeper, thc->interval);
+usleep((100.0 / 8.0) * (double)thc->interval);
if (ecore_thread_check(th)) break;
}
}
@@ -303,7 +302,6 @@ static void
_memusage_cb_usage_check_end(void *data, Ecore_Thread *th EINA_UNUSED)
{
Thread_Config *thc = data;
- e_powersave_sleeper_free(thc->sleeper);
E_FREE(thc);
}
@@ -374,7 +372,6 @@ _memusage_config_updated(Instance *inst)
if (thc)
{
thc->inst = inst;
-thc->sleeper = e_powersave_sleeper_new();
thc->interval = inst->cfg->memusage.poll_interval;
thc->mem_percent = 0;
thc->swp_percent = 0;
diff --git a/src/modules/sysinfo/ne
[EGIT] [core/enlightenment] master 02/02: Luncher: When the icon is deleted, don't leave client menu callbacks hanging.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=81fc3d68371351eb6e9da7d9471bf9fa81424883
commit 81fc3d68371351eb6e9da7d9471bf9fa81424883
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Sep 11 12:50:57 2017 -0500
Luncher: When the icon is deleted, don't leave client menu callbacks
hanging.
This fixes T5970
---
src/modules/luncher/bar.c | 9 ++---
src/modules/luncher/luncher.h | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 6440fbec2..70f26281c 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -4,6 +4,7 @@ static Eina_Bool _bar_icon_preview_show(void *data);
static Eina_Bool _bar_icon_preview_hide(void *data);
static void _bar_icon_del(Instance *inst, Icon *ic);
static void _bar_exec_new_show(void *data, Evas *e, Evas_Object *obj, void
*event_data);
+static void _bar_icon_preview_menu_hide(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *event_data EINA_UNUSED);
static void
_bar_aspect(Instance *inst)
@@ -235,6 +236,8 @@ _bar_icon_del(Instance *inst, Icon *ic)
E_Client *ec;
inst->icons = eina_list_remove(inst->icons, ic);
+ if (ic->client_menu)
+ evas_object_event_callback_del_full(ic->client_menu, EVAS_CALLBACK_HIDE,
_bar_icon_preview_menu_hide, ic);
if (ic->preview)
_bar_icon_preview_hide(ic);
if (!inst->main_del)
@@ -719,7 +722,7 @@ _bar_icon_preview_menu_hide(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj, v
Icon *ic = data;
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_HIDE,
_bar_icon_preview_menu_hide, ic);
- evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL,
_bar_icon_preview_menu_hide, ic);
+ ic->client_menu = NULL;
if (ic)
{
if (ic->preview)
@@ -743,10 +746,9 @@ _bar_icon_preview_mouse_up(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj, vo
if (ev->button == 3)
{
e_int_client_menu_show(ec, ev->canvas.x, ev->canvas.y, 0,
ev->timestamp);
-evas_object_event_callback_add(ec->border_menu->comp_object,
EVAS_CALLBACK_DEL,
-_bar_icon_preview_menu_hide, ic);
evas_object_event_callback_add(ec->border_menu->comp_object,
EVAS_CALLBACK_HIDE,
_bar_icon_preview_menu_hide, ic);
+ic->client_menu = ec->border_menu->comp_object;
ic->inst->current_preview_menu = EINA_TRUE;
return;
}
@@ -1093,6 +1095,7 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop,
E_Client *non_desktop_cli
ic->preview = NULL;
ic->preview_box = NULL;
ic->preview_scroller = NULL;
+ ic->client_menu = NULL;
ic->mouse_in_timer = NULL;
ic->mouse_out_timer = NULL;
ic->active = EINA_FALSE;
diff --git a/src/modules/luncher/luncher.h b/src/modules/luncher/luncher.h
index ba2b4e252..73b211b1f 100644
--- a/src/modules/luncher/luncher.h
+++ b/src/modules/luncher/luncher.h
@@ -75,6 +75,7 @@ struct _Icon
Evas_Object *preview;
Evas_Object *preview_box;
Evas_Object *preview_scroller;
+ Evas_Object *client_menu;
E_Exec_Instance *exec;
Efreet_Desktop *desktop;
Eina_List*execs;
--
[EGIT] [core/enlightenment] master 01/02: Luncher: Don't keep callbacks placed on dead objects hanging around.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ed49a4e9d1343b9f75223bcf44ea0c343f1e46d6
commit ed49a4e9d1343b9f75223bcf44ea0c343f1e46d6
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Sep 11 11:04:41 2017 -0500
Luncher: Don't keep callbacks placed on dead objects hanging around.
---
src/modules/luncher/bar.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 4cd7da4cc..6440fbec2 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -719,6 +719,7 @@ _bar_icon_preview_menu_hide(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj, v
Icon *ic = data;
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_HIDE,
_bar_icon_preview_menu_hide, ic);
+ evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL,
_bar_icon_preview_menu_hide, ic);
if (ic)
{
if (ic->preview)
@@ -742,6 +743,8 @@ _bar_icon_preview_mouse_up(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, vo
if (ev->button == 3)
{
e_int_client_menu_show(ec, ev->canvas.x, ev->canvas.y, 0,
ev->timestamp);
+evas_object_event_callback_add(ec->border_menu->comp_object,
EVAS_CALLBACK_DEL,
+_bar_icon_preview_menu_hide, ic);
evas_object_event_callback_add(ec->border_menu->comp_object,
EVAS_CALLBACK_HIDE,
_bar_icon_preview_menu_hide, ic);
ic->inst->current_preview_menu = EINA_TRUE;
--
[EGIT] [core/enlightenment] master 01/01: Netstatus: Average out throughput when time elapsed is greater than 1 second.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=3b7926a20a05d057f83ef15cfbbe2e2714bc948c
commit 3b7926a20a05d057f83ef15cfbbe2e2714bc948c
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 8 16:16:19 2017 -0500
Netstatus: Average out throughput when time elapsed is greater than 1
second.
This isn't very accurate but seems to be what other tools that check at
slower rates than every second do. For instance if you are checking every 10
seconds and in that time frame 500 kb was received, was the throughput for each
second 50 kb? No, not likely, but that is the result you will see here. I
guess this is one of those close enough things. Thanks to @davemds for
reporting this issue.
---
src/modules/sysinfo/netstatus/netstatus_proc.c | 10 ++
src/modules/sysinfo/netstatus/netstatus_sysctl.c | 11 ++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/modules/sysinfo/netstatus/netstatus_proc.c
b/src/modules/sysinfo/netstatus/netstatus_proc.c
index 4258a9492..1659ce471 100644
--- a/src/modules/sysinfo/netstatus/netstatus_proc.c
+++ b/src/modules/sysinfo/netstatus/netstatus_proc.c
@@ -14,11 +14,14 @@ _netstatus_proc_getrstatus(Eina_Bool automax,
char buf[4096], dummys[64];
FILE *f;
time_t current = time(NULL);
+ time_t diff = 0;
if (!*last_checked)
*last_checked = current;
else if ((current - *last_checked) < 1)
return;
+ else
+ diff = current - *last_checked;
f = fopen("/proc/net/dev", "r");
if (f)
{
@@ -34,6 +37,8 @@ _netstatus_proc_getrstatus(Eina_Bool automax,
fclose(f);
}
diffin = tot_in - *prev_in;
+ if (diff > 1)
+ diffin /= diff;
if (!*prev_in)
*prev_in = tot_in;
else
@@ -69,11 +74,14 @@ _netstatus_proc_gettstatus(Eina_Bool automax,
char buf[4096], dummys[64];
FILE *f;
time_t current = time(NULL);
+ time_t diff = 0;
if (!*last_checked)
*last_checked = current;
else if ((current - *last_checked) < 1)
return;
+ else
+ diff = current - *last_checked;
f = fopen("/proc/net/dev", "r");
if (f)
{
@@ -89,6 +97,8 @@ _netstatus_proc_gettstatus(Eina_Bool automax,
fclose(f);
}
diffout = tot_out - *prev_out;
+ if (diff > 1)
+ diffout /= diff;
if (!*prev_out)
*prev_out = tot_out;
else
diff --git a/src/modules/sysinfo/netstatus/netstatus_sysctl.c
b/src/modules/sysinfo/netstatus/netstatus_sysctl.c
index 007e4e85a..7d6776036 100644
--- a/src/modules/sysinfo/netstatus/netstatus_sysctl.c
+++ b/src/modules/sysinfo/netstatus/netstatus_sysctl.c
@@ -118,6 +118,7 @@ _netstatus_sysctl_getrstatus(Eina_Bool automax,
int percent = 0;
unsigned long int incoming = 0, outgoing = 0;
time_t current = time(NULL);
+ time_t diff = 0;
#if defined(__OpenBSD__)
_openbsd_generic_network_status(, );
#elif defined(__FreeBSD__) || defined(__DragonFly__)
@@ -128,9 +129,12 @@ _netstatus_sysctl_getrstatus(Eina_Bool automax,
*last_checked = current;
else if ((current - *last_checked) < 1)
return;
-
+ else
+ diff = current - *last_checked;
tot_in = incoming;
diffin = tot_in - *prev_in;
+ if (diff > 1)
+ diffin /= diff;
if (!*prev_in)
*prev_in = tot_in;
else
@@ -164,6 +168,7 @@ _netstatus_sysctl_gettstatus(Eina_Bool automax,
int percent = 0;
unsigned long int incoming = 0, outgoing = 0;
time_t current = time(NULL);
+ time_t diff = 0;
#if defined(__OpenBSD__)
_openbsd_generic_network_status(, );
#elif defined(__FreeBSD__) || defined(__DragonFly__)
@@ -175,8 +180,12 @@ _netstatus_sysctl_gettstatus(Eina_Bool automax,
*last_checked = current;
else if ((current - *last_checked) < 1)
return;
+ else
+ diff = current - *last_checked;
diffout = tot_out - *prev_out;
+ if (diff > 1)
+ diffout /= diff;
if (!*prev_out)
*prev_out = tot_out;
else
--
[EGIT] [core/enlightenment] master 01/01: Show netstatus output in bits per second while still polling based on ticks to avoid unnecessary wake ups.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7f3e7d933e825567ffe623ca42af8d786b8e149f
commit 7f3e7d933e825567ffe623ca42af8d786b8e149f
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 8 15:17:52 2017 -0500
Show netstatus output in bits per second while still polling based on ticks
to avoid unnecessary wake ups.
---
src/modules/sysinfo/netstatus/netstatus.c| 26 +---
src/modules/sysinfo/netstatus/netstatus.h| 8
src/modules/sysinfo/netstatus/netstatus_proc.c | 14 +
src/modules/sysinfo/netstatus/netstatus_sysctl.c | 16 +++
4 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/modules/sysinfo/netstatus/netstatus.c
b/src/modules/sysinfo/netstatus/netstatus.c
index 00536fe6e..0e87854a7 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -8,11 +8,13 @@ struct _Thread_Config
Instance*inst;
Eina_Boolautomax;
int inpercent;
+ time_t intime;
unsigned longin;
unsigned longincurrent;
unsigned longinmax;
Eina_Stringshare*instring;
int outpercent;
+ time_t outtime;
unsigned longout;
unsigned longoutcurrent;
unsigned longoutmax;
@@ -143,38 +145,38 @@ _netstatus_cb_usage_check_main(void *data, Ecore_Thread
*th)
if (ecore_thread_check(th)) break;
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-_netstatus_sysctl_getrstatus(thc->automax, >in, >incurrent,
>inmax, >inpercent);
-_netstatus_sysctl_gettstatus(thc->automax, >out,
>outcurrent, >outmax, >outpercent);
+_netstatus_sysctl_getrstatus(thc->automax, >in, >incurrent,
>inmax, >intime, >inpercent);
+_netstatus_sysctl_gettstatus(thc->automax, >out,
>outcurrent, >outmax, >outtime, >outpercent);
#else
-_netstatus_proc_getrstatus(thc->automax, >in, >incurrent,
>inmax, >inpercent);
-_netstatus_proc_gettstatus(thc->automax, >out, >outcurrent,
>outmax, >outpercent);
+_netstatus_proc_getrstatus(thc->automax, >in, >incurrent,
>inmax, >intime, >inpercent);
+_netstatus_proc_gettstatus(thc->automax, >out, >outcurrent,
>outmax, >outtime, >outpercent);
#endif
if (!thc->incurrent)
{
- snprintf(rin, sizeof(rin), "%s: 0 B", _("Receiving"));
+ snprintf(rin, sizeof(rin), "%s: 0 B/s", _("Receiving"));
}
else
{
if (thc->incurrent > 1048576)
- snprintf(rin, sizeof(rin), "%s: %.2f MB", _("Receiving"),
((float)thc->incurrent / 1048576));
+ snprintf(rin, sizeof(rin), "%s: %.2f MB/s", _("Receiving"),
((float)thc->incurrent / 1048576));
else if ((thc->incurrent > 1024) && (thc->incurrent < 1048576))
- snprintf(rin, sizeof(rin), "%s: %lu KB", _("Receiving"),
(thc->incurrent / 1024));
+ snprintf(rin, sizeof(rin), "%s: %lu KB/s", _("Receiving"),
(thc->incurrent / 1024));
else
- snprintf(rin, sizeof(rin), "%s: %lu B", _("Receiving"),
thc->incurrent);
+ snprintf(rin, sizeof(rin), "%s: %lu B/s", _("Receiving"),
thc->incurrent);
}
eina_stringshare_replace(>instring, rin);
if (!thc->outcurrent)
{
- snprintf(rout, sizeof(rout), "%s: 0 B", _("Sending"));
+ snprintf(rout, sizeof(rout), "%s: 0 B/s", _("Sending"));
}
else
{
if (thc->outcurrent > 1048576)
- snprintf(rout, sizeof(rout), "%s: %.2f MB", _("Sending"),
((float)thc->outcurrent / 1048576));
+ snprintf(rout, sizeof(rout), "%s: %.2f MB/s", _("Sending"),
((float)thc->outcurrent / 1048576));
else if ((thc->outcurrent > 1024) && (thc->outcurrent < 1048576))
- snprintf(rout, sizeof(rout), "%s: %lu KB", _("Sending"),
(thc->outcurrent / 1024));
+ snprintf(rout, sizeof(rout), "%s: %lu KB/s", _("Sending"),
(thc->outcurrent / 1024));
else
- snprintf(rout, sizeof(rout), "%s: %lu B", _("Sending"),
thc->outcurrent);
+ snprintf(rout, sizeof(rout), "%s: %lu B/s", _("Sending"),
thc
[EGIT] [core/enlightenment] master 01/01: Netstatus: Use proper label for throughput in config.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6f6f344c0a3076d14de902526e0ca5d0c05842ae
commit 6f6f344c0a3076d14de902526e0ca5d0c05842ae
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 8 14:10:28 2017 -0500
Netstatus: Use proper label for throughput in config.
---
src/modules/sysinfo/netstatus/netstatus_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/sysinfo/netstatus/netstatus_config.c
b/src/modules/sysinfo/netstatus/netstatus_config.c
index 43a849fa1..73776cbde 100644
--- a/src/modules/sysinfo/netstatus/netstatus_config.c
+++ b/src/modules/sysinfo/netstatus/netstatus_config.c
@@ -278,7 +278,7 @@ netstatus_configure(Instance *inst)
elm_object_content_set(frame, box);
frame = elm_frame_add(main_box);
- elm_object_text_set(frame, _("Maximum Transfer Speed"));
+ elm_object_text_set(frame, _("Maximum Throughput"));
E_EXPAND(frame);
E_FILL(frame);
elm_box_pack_end(main_box, frame);
--
[EGIT] [core/enlightenment] master 01/01: Netstatus: Don't show an incorrect unit on the popup label.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ce61c37782f530a36552fecb72847195610eea92
commit ce61c37782f530a36552fecb72847195610eea92
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 8 09:29:53 2017 -0500
Netstatus: Don't show an incorrect unit on the popup label.
---
src/modules/sysinfo/netstatus/netstatus.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/modules/sysinfo/netstatus/netstatus.c
b/src/modules/sysinfo/netstatus/netstatus.c
index 0099818cb..00536fe6e 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -151,30 +151,30 @@ _netstatus_cb_usage_check_main(void *data, Ecore_Thread
*th)
#endif
if (!thc->incurrent)
{
- snprintf(rin, sizeof(rin), "%s: 0 B/s", _("Receiving"));
+ snprintf(rin, sizeof(rin), "%s: 0 B", _("Receiving"));
}
else
{
if (thc->incurrent > 1048576)
- snprintf(rin, sizeof(rin), "%s: %.2f MB/s", _("Receiving"),
((float)thc->incurrent / 1048576));
+ snprintf(rin, sizeof(rin), "%s: %.2f MB", _("Receiving"),
((float)thc->incurrent / 1048576));
else if ((thc->incurrent > 1024) && (thc->incurrent < 1048576))
- snprintf(rin, sizeof(rin), "%s: %lu KB/s", _("Receiving"),
(thc->incurrent / 1024));
+ snprintf(rin, sizeof(rin), "%s: %lu KB", _("Receiving"),
(thc->incurrent / 1024));
else
- snprintf(rin, sizeof(rin), "%s: %lu B/s", _("Receiving"),
thc->incurrent);
+ snprintf(rin, sizeof(rin), "%s: %lu B", _("Receiving"),
thc->incurrent);
}
eina_stringshare_replace(>instring, rin);
if (!thc->outcurrent)
{
- snprintf(rout, sizeof(rout), "%s: 0 B/s", _("Sending"));
+ snprintf(rout, sizeof(rout), "%s: 0 B", _("Sending"));
}
else
{
if (thc->outcurrent > 1048576)
- snprintf(rout, sizeof(rout), "%s: %.2f MB/s", _("Sending"),
((float)thc->outcurrent / 1048576));
+ snprintf(rout, sizeof(rout), "%s: %.2f MB", _("Sending"),
((float)thc->outcurrent / 1048576));
else if ((thc->outcurrent > 1024) && (thc->outcurrent < 1048576))
- snprintf(rout, sizeof(rout), "%s: %lu KB/s", _("Sending"),
(thc->outcurrent / 1024));
+ snprintf(rout, sizeof(rout), "%s: %lu KB", _("Sending"),
(thc->outcurrent / 1024));
else
- snprintf(rout, sizeof(rout), "%s: %lu B/s", _("Sending"),
thc->outcurrent);
+ snprintf(rout, sizeof(rout), "%s: %lu B", _("Sending"),
thc->outcurrent);
}
eina_stringshare_replace(>outstring, rout);
ecore_thread_feedback(th, NULL);
--
[EGIT] [core/enlightenment] master 01/01: Luncher: Remove the engage feature
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ef43d6bd4cc5cabd4111daaca9c696a8c596b5d3
commit ef43d6bd4cc5cabd4111daaca9c696a8c596b5d3
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 1 13:51:13 2017 -0500
Luncher: Remove the engage feature
The engage feature was mainly there as a demo of the capabilities of bryce.
Now that we are nearing release we need to clean up our gadgets. The engage
style for the luncher gadget is not complete, and does not work adequately, and
quite honestly better belongs as a feature of bryce itself not luncher.
---
src/modules/luncher/bar.c | 155 +-
src/modules/luncher/config.c | 73
src/modules/luncher/grid.c| 1 -
src/modules/luncher/luncher.h | 5 --
src/modules/luncher/mod.c | 3 -
5 files changed, 17 insertions(+), 220 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index cf1fbcd44..4cd7da4cc 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -5,32 +5,22 @@ static Eina_Bool _bar_icon_preview_hide(void *data);
static void _bar_icon_del(Instance *inst, Icon *ic);
static void _bar_exec_new_show(void *data, Evas *e, Evas_Object *obj, void
*event_data);
-static float
-_bar_size_calc(Instance *inst)
-{
- Icon *ic;
- Eina_List *l;
- float tot = 0.0;
-
- EINA_LIST_FOREACH(inst->icons, l, ic)
- tot += ic->scale;
-
- return tot;
-}
-
static void
_bar_aspect(Instance *inst)
{
- float tot = _bar_size_calc(inst);
+ Evas_Coord w, h;
switch (e_gadget_site_orient_get(e_gadget_site_get(inst->o_main)))
{
case E_GADGET_SITE_ORIENT_VERTICAL:
-evas_object_size_hint_aspect_set(inst->o_main,
EVAS_ASPECT_CONTROL_BOTH, 1, ceil(tot));
+h = eina_list_count(inst->icons);
+w = 1;
break;
default:
-evas_object_size_hint_aspect_set(inst->o_main,
EVAS_ASPECT_CONTROL_BOTH, ceil(tot), 1);
+w = eina_list_count(inst->icons);
+h = 1;
}
+ evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w,
h);
}
static Eina_Bool
@@ -470,6 +460,8 @@ _bar_icon_mouse_out(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *eve
{
Icon *ic = data;
+ elm_layout_signal_emit(ic->o_layout, "e,state,default", "e");
+ elm_layout_signal_emit(ic->o_layout, "e,state,unfocused", "e");
ic->active = EINA_FALSE;
elm_object_tooltip_hide(obj);
E_FREE_FUNC(ic->mouse_in_timer, ecore_timer_del);
@@ -488,42 +480,8 @@ _bar_icon_mouse_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUS
if (_bar_check_modifiers(ev->modifiers)) return;
if (!ic->drag.start)
- {
-Icon *ico = NULL;
-Eina_List *l = NULL;
-Evas_Coord px, py;
-const char *position = _bar_location_get(ic->inst);
-int pos;
-
-if (eina_streq(position, "left"))
- pos = 0;
-else if (eina_streq(position, "top"))
- pos = 1;
-else if (eina_streq(position, "right"))
- pos = 2;
-else
- pos = 3;
+ return;
-evas_pointer_canvas_xy_get(evas_object_evas_get(ic->inst->o_main),
, );
-EINA_LIST_FOREACH(ic->inst->icons, l, ico)
- {
- Edje_Message_Int_Set *msg;
- Evas_Coord x, y, w, h;
-
- evas_object_geometry_get(ico->o_icon, , , , );
- msg = alloca(sizeof(Edje_Message_Int_Set) + (7 * sizeof(int)));
- msg->count = 7;
- msg->val[0] = px;
- msg->val[1] = py;
- msg->val[2] = x;
- msg->val[3] = y;
- msg->val[4] = w;
- msg->val[5] = h;
- msg->val[6] = pos;
- edje_object_message_send(elm_layout_edje_get(ico->o_layout),
EDJE_MESSAGE_INT_SET, 2, msg);
- }
-return;
- }
dx = ev->cur.output.x - ic->drag.x;
dy = ev->cur.output.y - ic->drag.y;
if (((dx * dx) + (dy * dy)) >
@@ -962,9 +920,12 @@ _bar_icon_mouse_in(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *even
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
if (_bar_check_modifiers(ev->modifiers)) return;
- elm_object_tooltip_show(obj);
- ic->active = EINA_TRUE;
-
+ if (!ic->active)
+ {
+elm_object_tooltip_show(obj);
+ic->active = EINA_TRUE;
+elm_layout_signal_emit(ic->o_layout, "e,state,focused", "e");
+ }
E_FREE_FUNC(ic->mouse_out_timer, ecore_timer_del);
E_FREE_FUNC(ic->mouse_in_timer, ecore_timer_del);
if (eina_list_count(ic->execs) || eina_list_count(ic->clients))
@@ -1110,56 +1071,8 @@ static void
[EGIT] [core/efl] efl-1.20 01/01: Luncher: Remove the engage feature.
okra pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=90931fc3b871be6e5d706bd67a610b696f379d7f
commit 90931fc3b871be6e5d706bd67a610b696f379d7f
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 1 13:45:09 2017 -0500
Luncher: Remove the engage feature.
The engage feature was mainly there as a demo of the capabilities of bryce.
Now that we are nearing release we need to clean up our gadgets. The engage
style for the luncher gadget is not complete, and does not work adequately, and
quite honestly better belongs as a feature of bryce itself not luncher.
---
data/elementary/themes/edc/luncher.edc | 102 ++---
1 file changed, 5 insertions(+), 97 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 35ac82a803..6e8aa38aba 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -42,101 +42,6 @@ group { name: "e/gadget/luncher/grid";
group { name: "e/gadget/luncher/icon";
script {
public urgent;
- public style;
- public current_size;
- public Float:engage_scale(cursorpos, iconpos, size) {
- new Float:zoom = 1.75;
- new Float:scale = zoom - (abs(cursorpos-(iconpos+size/2)) / (size*4));
- if (scale < 1.0) scale = 1.0;
-
- return scale;
- }
- public message(Msg_Type:type, id, ...) {
-
-//Style Variable - Used to Identify Style - Name Must Match an Item in the
Data List of e/gadget/luncher/bar
-//Style Setting Messages Will Always Have an ID of 1
-//Icon Messages Related To The Style Will Have an ID of 2.
-//Arguments are in the Following Order:
-//X Position of the Cursor
-//Y Position of the Cursor
-//X Position of Icon
-//Y Position of Icon
-//Width of icon
-//Height of icon
-//Location of the bar - 0 is left, 1 is top, 2 is right, 3 is bottom
-
- if ((type == MSG_STRING) && (id == 1)) {
-new s[32];
-
-getsarg(2, s, sizeof(s));
-set_str(style, s);
- }
- if ((type == MSG_INT_SET) && (id == 2)) {
-new xpos = getarg(2);
-new ypos = getarg(3);
-new x = getarg(4);
-new y = getarg(5);
-new w = getarg(6);
-new h = getarg(7);
-new pos = getarg(8);
-new s[32];
-
-get_str(style, s, sizeof(s));
-
-if (!strcmp(s, "default")) {
- if ((ypos >= y) && (ypos <= (y+h)) && (xpos >= x) && (xpos <=
(x+w))) {
- set_state_anim(PART:"background", "visible", 0.0, LINEAR,
1.0);
- }
- else {
- set_state_anim(PART:"background", "default", 0.0, LINEAR,
1.0);
- }
-}
-else if (!strcmp(s, "engage")) {
- new Float:scale = 1.0;
- if (pos == 0 && (xpos >= x) && (xpos <= (x+w))) {
- scale = engage_scale(ypos, y, h);
- new Float:halfscale = scale/2.0;
-
- custom_state(PART:"sizer", "default", 0.0);
- set_state_val(PART:"sizer", STATE_REL1, 0.0, 0.5-halfscale);
- set_state_val(PART:"sizer", STATE_REL2, scale,
0.5+halfscale);
- set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0);
- }
- else if (pos == 1 && (ypos >= y) && (ypos <= (y+h))) {
- scale = engage_scale(xpos, x, w);
- new Float:halfscale = scale/2.0;
-
- custom_state(PART:"sizer", "default", 0.0);
- set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 0.0);
- set_state_val(PART:"sizer", STATE_REL2, 0.5+halfscale,
scale);
- set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0);
- }
- else if (pos == 2 && (xpos >= x) && (xpos <= (x+w))) {
- scale = engage_scale(ypos, y, h);
- new Float:halfscale = scale/2.0;
-
- custom_state(PART:"sizer", "default", 0.0);
- set_state_val(PART:"sizer", STATE_REL1, 1.0-scale,
0.5-halfscale);
- set_state_val(PART:"sizer", STATE_REL2, 1.0, 0.5+halfscale);
- set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0);
- }
- else if (pos == 3 && (ypos >= y) && (ypos <= (y+h))) {
- scale = engage_scale(xpos, x, w);
- new Float:halfscale
[EGIT] [core/efl] master 01/01: Luncher: Remove the engage feature.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8df0576358ac25b7f3d286e6463fe4f052428597
commit 8df0576358ac25b7f3d286e6463fe4f052428597
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Sep 1 13:45:09 2017 -0500
Luncher: Remove the engage feature.
The engage feature was mainly there as a demo of the capabilities of bryce.
Now that we are nearing release we need to clean up our gadgets. The engage
style for the luncher gadget is not complete, and does not work adequately, and
quite honestly better belongs as a feature of bryce itself not luncher.
---
data/elementary/themes/edc/luncher.edc | 102 ++---
1 file changed, 5 insertions(+), 97 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 35ac82a803..6e8aa38aba 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -42,101 +42,6 @@ group { name: "e/gadget/luncher/grid";
group { name: "e/gadget/luncher/icon";
script {
public urgent;
- public style;
- public current_size;
- public Float:engage_scale(cursorpos, iconpos, size) {
- new Float:zoom = 1.75;
- new Float:scale = zoom - (abs(cursorpos-(iconpos+size/2)) / (size*4));
- if (scale < 1.0) scale = 1.0;
-
- return scale;
- }
- public message(Msg_Type:type, id, ...) {
-
-//Style Variable - Used to Identify Style - Name Must Match an Item in the
Data List of e/gadget/luncher/bar
-//Style Setting Messages Will Always Have an ID of 1
-//Icon Messages Related To The Style Will Have an ID of 2.
-//Arguments are in the Following Order:
-//X Position of the Cursor
-//Y Position of the Cursor
-//X Position of Icon
-//Y Position of Icon
-//Width of icon
-//Height of icon
-//Location of the bar - 0 is left, 1 is top, 2 is right, 3 is bottom
-
- if ((type == MSG_STRING) && (id == 1)) {
-new s[32];
-
-getsarg(2, s, sizeof(s));
-set_str(style, s);
- }
- if ((type == MSG_INT_SET) && (id == 2)) {
-new xpos = getarg(2);
-new ypos = getarg(3);
-new x = getarg(4);
-new y = getarg(5);
-new w = getarg(6);
-new h = getarg(7);
-new pos = getarg(8);
-new s[32];
-
-get_str(style, s, sizeof(s));
-
-if (!strcmp(s, "default")) {
- if ((ypos >= y) && (ypos <= (y+h)) && (xpos >= x) && (xpos <=
(x+w))) {
- set_state_anim(PART:"background", "visible", 0.0, LINEAR,
1.0);
- }
- else {
- set_state_anim(PART:"background", "default", 0.0, LINEAR,
1.0);
- }
-}
-else if (!strcmp(s, "engage")) {
- new Float:scale = 1.0;
- if (pos == 0 && (xpos >= x) && (xpos <= (x+w))) {
- scale = engage_scale(ypos, y, h);
- new Float:halfscale = scale/2.0;
-
- custom_state(PART:"sizer", "default", 0.0);
- set_state_val(PART:"sizer", STATE_REL1, 0.0, 0.5-halfscale);
- set_state_val(PART:"sizer", STATE_REL2, scale,
0.5+halfscale);
- set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0);
- }
- else if (pos == 1 && (ypos >= y) && (ypos <= (y+h))) {
- scale = engage_scale(xpos, x, w);
- new Float:halfscale = scale/2.0;
-
- custom_state(PART:"sizer", "default", 0.0);
- set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 0.0);
- set_state_val(PART:"sizer", STATE_REL2, 0.5+halfscale,
scale);
- set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0);
- }
- else if (pos == 2 && (xpos >= x) && (xpos <= (x+w))) {
- scale = engage_scale(ypos, y, h);
- new Float:halfscale = scale/2.0;
-
- custom_state(PART:"sizer", "default", 0.0);
- set_state_val(PART:"sizer", STATE_REL1, 1.0-scale,
0.5-halfscale);
- set_state_val(PART:"sizer", STATE_REL2, 1.0, 0.5+halfscale);
- set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0);
- }
- else if (pos == 3 && (ypos >= y) && (ypos <= (y+h))) {
- scale = engage_scale(xpos, x, w);
- new Float:halfscale = scale/2.
[EGIT] [core/efl] efl-1.20 01/01: Luncher Theme: Set no border for alpha. This needs to be backported.
okra pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=59fa359880711c426b0fab71d35e45699aeb392c
commit 59fa359880711c426b0fab71d35e45699aeb392c
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 30 20:14:20 2017 -0500
Luncher Theme: Set no border for alpha. This needs to be backported.
---
data/elementary/themes/edc/luncher.edc | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 61af2578fb..35ac82a803 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -559,12 +559,10 @@ group { name: "e/gadget/luncher/preview";
target: "e.swallow.title";
target: "icon";
}
- program { name: "go_preview";
- signal: "e,state,icon,preview"; source: "e";
- action: STATE_SET "default" 0.0;
+ program { name: "go_alpha";
+ signal: "e,state,icon,alpha"; source: "e";
+ action: STATE_SET "menu" 0.0;
target: "border";
- target: "e.swallow.title";
- target: "icon";
}
}
}
--
[EGIT] [core/enlightenment] master 01/01: Luncher: Don't set preview state to menu. Set to alpha. Requires EFL update.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0880d1795d806a3a286f57d3d4601b17da6db3a0
commit 0880d1795d806a3a286f57d3d4601b17da6db3a0
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 30 20:15:47 2017 -0500
Luncher: Don't set preview state to menu. Set to alpha. Requires EFL update.
This fixes T5948
---
src/modules/luncher/bar.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index c52b18b9c..cf1fbcd44 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -836,7 +836,7 @@ _bar_icon_preview_client_add(Icon *ic, E_Client *ec)
edje_extern_object_aspect_set(img, EDJE_ASPECT_CONTROL_BOTH, ec->client.w,
ec->client.h);
elm_layout_content_set(layout, "e.swallow.icon", img);
if (evas_object_image_alpha_get(img))
- elm_layout_signal_emit(layout, "e,state,icon,menu", "e");
+ elm_layout_signal_emit(layout, "e,state,icon,alpha", "e");
evas_object_show(img);
if (!(ec->desk->visible) || (ec->iconic))
@@ -927,7 +927,6 @@ _bar_icon_preview_show(void *data)
if (!e_client_util_is_popup(ec))
{
_bar_icon_preview_client_add(ic, ec);
-
count++;
}
}
--
[EGIT] [core/efl] master 01/01: Luncher Theme: Set no border for alpha. This needs to be backported.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b0fc5dde62f6392ccf2a46c5be6265e72260b137
commit b0fc5dde62f6392ccf2a46c5be6265e72260b137
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 30 20:14:20 2017 -0500
Luncher Theme: Set no border for alpha. This needs to be backported.
---
data/elementary/themes/edc/luncher.edc | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 61af2578fb..35ac82a803 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -559,12 +559,10 @@ group { name: "e/gadget/luncher/preview";
target: "e.swallow.title";
target: "icon";
}
- program { name: "go_preview";
- signal: "e,state,icon,preview"; source: "e";
- action: STATE_SET "default" 0.0;
+ program { name: "go_alpha";
+ signal: "e,state,icon,alpha"; source: "e";
+ action: STATE_SET "menu" 0.0;
target: "border";
- target: "e.swallow.title";
- target: "icon";
}
}
}
--
[EGIT] [core/enlightenment] master 02/02: Pager: Remember to remove deleted desks.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=03ea4bfe390745e32352591064013c5f4bdc6ee9
commit 03ea4bfe390745e32352591064013c5f4bdc6ee9
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 30 13:22:23 2017 -0500
Pager: Remember to remove deleted desks.
---
src/modules/pager/gadget/pager.c | 41
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index 35732ed31..7d5f826bc 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -536,7 +536,7 @@ _pager_fill(Pager *p)
{
if ((p->plain) || (pager_config->permanent_plain))
{
- if (!eina_list_count(phandlers))
+ if (!phandlers)
{
E_LIST_HANDLER_APPEND(phandlers, E_EVENT_CLIENT_RESIZE,
_pager_cb_event_client_resize, NULL);
E_LIST_HANDLER_APPEND(phandlers, E_EVENT_CLIENT_MOVE,
_pager_cb_event_client_move, NULL);
@@ -580,7 +580,7 @@ _pager_empty(Pager *p)
p->active_pd = NULL;
if (!(p->plain) && !(pager_config->permanent_plain))
{
-if (eina_list_count(phandlers))
+if (!phandlers)
{
Ecore_Event_Handler *handler;
EINA_LIST_FREE(phandlers, handler)
@@ -713,12 +713,9 @@ _pager_desk_free(Pager_Desk *pd)
evas_object_del(pd->drop_handler);
pd->drop_handler = NULL;
evas_object_del(pd->o_desk);
- evas_object_del(pd->o_layout);
- if (pd->wins)
- {
-EINA_LIST_FREE(pd->wins, w)
- _pager_window_free(w);
- }
+ evas_object_del(pd->o_layout);
+ EINA_LIST_FREE(pd->wins, w)
+ _pager_window_free(w);
e_object_unref(E_OBJECT(pd->desk));
free(pd);
}
@@ -1775,7 +1772,7 @@ static Eina_Bool
_pager_cb_event_zone_desk_count_set(void *data EINA_UNUSED, int type
EINA_UNUSED, E_Event_Zone_Desk_Count_Set *ev)
{
E_Desk *desk;
- Eina_List *l;
+ Eina_List *l, *ll;
Pager *p;
Pager_Desk *pd = NULL;
int x, y, xx, yy;
@@ -1800,26 +1797,12 @@ _pager_cb_event_zone_desk_count_set(void *data
EINA_UNUSED, int type EINA_UNUSED
}
}
}
-if (xx < p->xnum)
- {
- for (y = 0; y < yy; y++)
- {
- for (x = xx; x < p->xnum; x++)
-{
- pd = eina_list_nth(p->desks, x + (y * p->xnum));
- _pager_desk_free(pd);
-}
- }
- }
-if (yy < p->ynum)
+EINA_LIST_FOREACH(p->desks, ll, pd)
{
- for (x = 0; x < xx; x++)
+ if (!e_desk_at_xy_get(p->zone, pd->xpos, pd->ypos))
{
- for (y = yy; y < p->ynum; y++)
-{
- pd = eina_list_nth(p->desks, x + (y * p->xnum));
- _pager_desk_free(pd);
-}
+ p->desks = eina_list_remove(p->desks, pd);
+ _pager_desk_free(pd);
}
}
e_zone_desk_count_get(p->zone, &(p->xnum), &(p->ynum));
@@ -1837,7 +1820,7 @@ _pager_cb_event_desk_show(void *data EINA_UNUSED, int
type EINA_UNUSED, void *ev
Pager_Popup *pp;
Pager_Desk *pd;
- if (!eina_list_count(pagers))
+ if (!pagers)
return ECORE_CALLBACK_PASS_ON;
EINA_LIST_FOREACH(pagers, l, p)
@@ -1904,7 +1887,7 @@ _pager_cb_event_client_urgent_change(void *data
EINA_UNUSED, int type EINA_UNUSE
Pager_Win *pw;
if (!(ev->property & E_CLIENT_PROPERTY_URGENCY)) return
ECORE_CALLBACK_RENEW;
- if (!eina_list_count(pagers)) return ECORE_CALLBACK_RENEW;
+ if (!pagers) return ECORE_CALLBACK_RENEW;
if (pager_config->popup_urgent && (!e_client_util_desk_visible(ev->ec,
e_desk_current_get(ev->ec->zone))) &&
(pager_config->popup_urgent_focus ||
--
[EGIT] [core/enlightenment] master 01/02: Pager: Don't empty/fill pager unecessarily.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=18ce3e4d93e19ad70c097394d4d7e729f33aeabc
commit 18ce3e4d93e19ad70c097394d4d7e729f33aeabc
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 30 11:27:13 2017 -0500
Pager: Don't empty/fill pager unecessarily.
---
src/modules/pager/gadget/pager.c | 79 +++-
1 file changed, 69 insertions(+), 10 deletions(-)
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index c371dec8a..35732ed31 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -317,12 +317,29 @@ static void
_pager_gadget_anchor_change_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Instance *inst = data;
+ Eina_Bool invert;
if (inst->pager && inst->o_pager)
{
-_pager_orient(inst, e_gadget_site_orient_get(obj));
-_pager_empty(inst->pager);
-_pager_fill(inst->pager);
+switch (e_gadget_site_orient_get(obj))
+ {
+ case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ invert = EINA_FALSE;
+ break;
+
+ case E_GADGET_SITE_ORIENT_VERTICAL:
+ invert = EINA_TRUE;
+ break;
+
+ default:
+ invert = EINA_FALSE;
+ }
+if (invert != inst->pager->invert)
+ {
+ _pager_orient(inst, e_gadget_site_orient_get(obj));
+ _pager_empty(inst->pager);
+ _pager_fill(inst->pager);
+ }
}
}
@@ -697,8 +714,11 @@ _pager_desk_free(Pager_Desk *pd)
pd->drop_handler = NULL;
evas_object_del(pd->o_desk);
evas_object_del(pd->o_layout);
- EINA_LIST_FREE(pd->wins, w)
- _pager_window_free(w);
+ if (pd->wins)
+ {
+EINA_LIST_FREE(pd->wins, w)
+ _pager_window_free(w);
+ }
e_object_unref(E_OBJECT(pd->desk));
free(pd);
}
@@ -1754,18 +1774,57 @@ _pager_cb_event_client_property(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
static Eina_Bool
_pager_cb_event_zone_desk_count_set(void *data EINA_UNUSED, int type
EINA_UNUSED, E_Event_Zone_Desk_Count_Set *ev)
{
+ E_Desk *desk;
Eina_List *l;
Pager *p;
+ Pager_Desk *pd = NULL;
+ int x, y, xx, yy;
+ xx = ev->zone->desk_x_count;
+ yy = ev->zone->desk_y_count;
EINA_LIST_FOREACH(pagers, l, p)
{
-if ((ev->zone->desk_x_count == p->xnum) &&
-(ev->zone->desk_y_count == p->ynum)) continue;
-_pager_empty(p);
-_pager_fill(p);
+if ((xx == p->xnum) && (yy == p->ynum))
+ continue;
+for (x = 0; x < xx; x++)
+ {
+ for (y = 0; y < yy; y++)
+ {
+ if ((x >= p->xnum) || (y >= p->ynum))
+{
+ desk = e_desk_at_xy_get(p->zone, x, y);
+ if (desk)
+ pd = _pager_desk_new(p, desk, x, y, p->invert);
+ if (pd)
+ p->desks = eina_list_append(p->desks, pd);
+}
+ }
+ }
+if (xx < p->xnum)
+ {
+ for (y = 0; y < yy; y++)
+ {
+ for (x = xx; x < p->xnum; x++)
+{
+ pd = eina_list_nth(p->desks, x + (y * p->xnum));
+ _pager_desk_free(pd);
+}
+ }
+ }
+if (yy < p->ynum)
+ {
+ for (x = 0; x < xx; x++)
+ {
+ for (y = yy; y < p->ynum; y++)
+{
+ pd = eina_list_nth(p->desks, x + (y * p->xnum));
+ _pager_desk_free(pd);
+}
+ }
+ }
+e_zone_desk_count_get(p->zone, &(p->xnum), &(p->ynum));
if (p->inst) _pager_orient(p->inst,
e_gadget_site_orient_get(e_gadget_site_get(p->inst->o_pager)));
}
-
return ECORE_CALLBACK_PASS_ON;
}
--
[EGIT] [core/efl] efl-1.20 05/07: CPUMonitor theme: Don't set aspect in theme.
discomfitor pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=f8a4e1a4d3e28781d6ecc98fbd745898db5e0f59
commit f8a4e1a4d3e28781d6ecc98fbd745898db5e0f59
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Aug 24 08:05:44 2017 -0500
CPUMonitor theme: Don't set aspect in theme.
---
data/elementary/themes/edc/cpumonitor.edc | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/elementary/themes/edc/cpumonitor.edc
b/data/elementary/themes/edc/cpumonitor.edc
index bbc8ac4f18..dfc17dcb63 100644
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ b/data/elementary/themes/edc/cpumonitor.edc
@@ -3,8 +3,6 @@ group { name: "e/gadget/cpumonitor/main";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
-aspect: 1 1;
-aspect_preference: BOTH;
}
}
}
--
[EGIT] [core/efl] efl-1.20 03/07: Luncher Theme: Use a proxy for the overlay effect.
discomfitor pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=15e563fe717913eebf3d588e2c9003006491b2d5
commit 15e563fe717913eebf3d588e2c9003006491b2d5
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 17:06:10 2017 -0500
Luncher Theme: Use a proxy for the overlay effect.
---
data/elementary/themes/edc/luncher.edc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index cbc35c0039..8d4db80941 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -291,11 +291,13 @@ group { name: "e/gadget/luncher/icon";
color: 255 255 255 0;
}
}
- part { name: "e.swallow.overlay"; type: SWALLOW;
+ part { name: "e.swallow.overlay"; type: PROXY;
clip_to: "obackground";
repeat_events: 1;
description {
state: "default" 0.0;
+source: "e.swallow.icon";
+proxy.source_clip: 0;
rel1.to: "obackground";
rel2.to: "obackground";
}
--
[EGIT] [core/efl] efl-1.20 01/07: Netstatus: Use arrows for up and down net traffic indicators.
discomfitor pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=2cd13a9beb359d757ef4d15cf20dfa74beadbff9
commit 2cd13a9beb359d757ef4d15cf20dfa74beadbff9
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 20:44:14 2017 -0500
Netstatus: Use arrows for up and down net traffic indicators.
---
data/elementary/themes/edc/netstatus.edc | 44 ++
data/elementary/themes/img/netstatus_base.png | Bin 1339 -> 1975 bytes
data/elementary/themes/img/netstatus_over.png | Bin 1101 -> 180 bytes
data/elementary/themes/img/netstatus_rx.png | Bin 1196 -> 1116 bytes
data/elementary/themes/img/netstatus_tx.png | Bin 1304 -> 1150 bytes
5 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/data/elementary/themes/edc/netstatus.edc
b/data/elementary/themes/edc/netstatus.edc
index 88d8040bc7..53eecc218d 100644
--- a/data/elementary/themes/edc/netstatus.edc
+++ b/data/elementary/themes/edc/netstatus.edc
@@ -14,15 +14,17 @@ group { name: "e/gadget/netstatus/main";
new txper = getarg(6);
// new txmax = getarg(7);
-new Float:val = rxper / 100.0;
-custom_state(PART:"rx_clip", "default", 0.0);
-set_state_val(PART:"rx_clip", STATE_REL1, 0.0, 1.0 - val);
-set_state(PART:"rx_clip", "custom", 0.0);
+new val = rxper + 155;
+if (val == 155) val = 0;
+custom_state(PART:"rx", "default", 0.0);
+set_state_val(PART:"rx", STATE_COLOR, 255, 255, 255, val);
+set_state(PART:"rx", "custom", 0.0);
-val = txper / 100.0;
-custom_state(PART:"tx_clip", "default", 0.0);
-set_state_val(PART:"tx_clip", STATE_REL1, 0.0, 1.0 - val);
-set_state(PART:"tx_clip", "custom", 0.0);
+val = txper + 155;
+if (val == 155) val = 0;
+custom_state(PART:"tx", "default", 0.0);
+set_state_val(PART:"tx", STATE_COLOR, 255, 255, 255, val);
+set_state(PART:"tx", "custom", 0.0);
}
}
}
@@ -34,40 +36,14 @@ group { name: "e/gadget/netstatus/main";
image.normal: "netstatus_base.png";
}
}
- part { name: "rx_spacer"; type: SPACER;
- description { state: "default" 0.0;
-rel1.relative: 0.32 0.33;
-rel2.relative: 0.98 0.78;
- }
- }
- part { name: "rx_clip"; type: RECT;
- description { state: "default" 0.0;
-rel1.to: "rx_spacer";
-rel2.to: "rx_spacer";
- }
- }
part { name: "rx"; type: IMAGE;
- clip_to: "rx_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
image.normal: "netstatus_rx.png";
}
}
- part { name: "tx_spacer"; type: SPACER;
- description { state: "default" 0.0;
-rel1.relative: 0.04 0.08;
-rel2.relative: 0.68 0.50;
- }
- }
- part { name: "tx_clip"; type: RECT;
- description { state: "default" 0.0;
-rel1.to: "tx_spacer";
-rel2.to: "tx_spacer";
- }
- }
part { name: "tx"; type: IMAGE;
- clip_to: "tx_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
diff --git a/data/elementary/themes/img/netstatus_base.png
b/data/elementary/themes/img/netstatus_base.png
index 9c2c55f837..cdc8e20137 100644
Binary files a/data/elementary/themes/img/netstatus_base.png and
b/data/elementary/themes/img/netstatus_base.png differ
diff --git a/data/elementary/themes/img/netstatus_over.png
b/data/elementary/themes/img/netstatus_over.png
index 62d5dcf10c..fdd2f9d900 100644
Binary files a/data/elementary/themes/img/netstatus_over.png and
b/data/elementary/themes/img/netstatus_over.png differ
diff --git a/data/elementary/themes/img/netstatus_rx.png
b/data/elementary/themes/img/netstatus_rx.png
index 2877ff69af..1fa2655a32 100644
Binary files a/data/elementary/themes/img/netstatus_rx.png and
b/data/elementary/themes/img/netstatus_rx.png differ
diff --git a/data/elementary/themes/img/netstatus_tx.png
b/data/elementary/themes/img/netstatus_tx.png
index 1387226652..ef23e11f35 100644
Binary files a/data/elementary/themes/img/netstatus_tx.png and
b/data/elementary/themes/img/netstatus_tx.png differ
--
[EGIT] [core/efl] efl-1.20 02/07: Gadget themes: Remove shines.
discomfitor pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=cfa3b628b470bdea2755c56cdec8ebc98d473728
commit cfa3b628b470bdea2755c56cdec8ebc98d473728
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 15:26:55 2017 -0500
Gadget themes: Remove shines.
---
data/elementary/themes/Makefile.am| 1 +
data/elementary/themes/edc/batman.edc | 30 +--
data/elementary/themes/edc/pager.edc | 340 ++
data/elementary/themes/edc/pager16.edc| 326 +++-
data/elementary/themes/edc/temperature.edc| 8 -
data/elementary/themes/img/batman_overlay.png | Bin 0 -> 694 bytes
6 files changed, 672 insertions(+), 33 deletions(-)
diff --git a/data/elementary/themes/Makefile.am
b/data/elementary/themes/Makefile.am
index d48aaca248..d7632d7641 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -168,6 +168,7 @@ elementary/themes/img/bat_shadow.png \
elementary/themes/img/bat_shine.png \
elementary/themes/img/bat_top0.png \
elementary/themes/img/bat_top1.png \
+elementary/themes/img/batman_overlay.png \
elementary/themes/img/bevel_curved_horiz_out.png \
elementary/themes/img/bevel_curved_vert_out.png \
elementary/themes/img/bevel_dark_in.png \
diff --git a/data/elementary/themes/edc/batman.edc
b/data/elementary/themes/edc/batman.edc
index c4cdf793c1..f32751ad62 100644
--- a/data/elementary/themes/edc/batman.edc
+++ b/data/elementary/themes/edc/batman.edc
@@ -2,11 +2,9 @@ group { name: "e/gadget/batman/main";
alias: "e/gadget/batman/main_vert";
images.image: "bat_shadow.png" COMP;
images.image: "bat_base.png" COMP;
- images.image: "bat_shine.png" COMP;
images.image: "bat_bottom0.png" COMP;
- images.image: "bat_bottom1.png" COMP;
images.image: "bat_top0.png" COMP;
- images.image: "bat_top1.png" COMP;
+ images.image: "batman_overlay.png" COMP;
images.image: "glow_med_white.png" COMP;
script {
public message(Msg_Type:type, id, ...) {
@@ -58,7 +56,9 @@ group { name: "e/gadget/batman/main";
part { name: "fill_region"; type: SPACER;
description { state: "default" 0.0;
rel1.to: "bg";
+rel1.offset: 1 0;
rel2.to: "bg";
+rel2.offset: -2 -1;
}
}
part { name: "pwr"; type: SPACER;
@@ -134,30 +134,14 @@ group { name: "e/gadget/batman/main";
color: 51 153 255 255;
}
}
- part { name: "top-shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
-rel1.to: "top";
-rel2.to: "top";
-image.normal: "bat_top1.png";
- }
- }
- part { name: "bottom-shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
-rel1.to: "bottom";
-rel2.to: "bottom";
-image.normal: "bat_bottom1.png";
- }
- }
- part { name: "shine";
+ part { name: "overlay";
clip_to: "pulse_clip";
description { state: "default" 0.0;
rel1.to: "bg";
-rel1.offset: 0 -6;
+rel1.offset: 0 0;
rel2.to: "bg";
-rel2.offset: -1 5;
-image.normal: "bat_shine.png";
+rel2.offset: -1 -1;
+image.normal: "batman_overlay.png";
image.border: 0 0 7 7;
}
}
diff --git a/data/elementary/themes/edc/pager.edc
b/data/elementary/themes/edc/pager.edc
index 4596db8451..74af167908 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -1,4 +1,5 @@
group { name: "e/modules/pager/popup";
+ alias: "e/gadget/pager/popup";
images.image: "vgrad_tall.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
@@ -355,7 +356,346 @@ group { name: "e/modules/pager/desk";
}
}
+group { name: "e/gadget/pager/desk";
+ images.image: "vgrad_med_darker.png" COMP;
+ images.image: "bevel_out.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "inset_shadow.png" COMP;
+ images.image: "mini_blue_glow_arrow_0.png" COMP;
+ images.image: "mini_blue_glow_arrow_1.png" COMP;
+ images.image: "mini_blue_glow_arrow_2.png" COMP;
+ images.image: "mini_blue_glow_arrow_3.png" COMP;
+ parts {
+ part { name: &q
[EGIT] [core/efl] efl-1.20 04/07: Cpumonitor Theme: Add a theme for the base and the core. This fixes aspect.
discomfitor pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=0890c175774dfb77f35255073efa748e2b617551
commit 0890c175774dfb77f35255073efa748e2b617551
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 19:01:52 2017 -0500
Cpumonitor Theme: Add a theme for the base and the core. This fixes aspect.
---
data/elementary/themes/edc/cpumonitor.edc | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/cpumonitor.edc
b/data/elementary/themes/edc/cpumonitor.edc
index 2ee4b1989b..bbc8ac4f18 100644
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ b/data/elementary/themes/edc/cpumonitor.edc
@@ -1,4 +1,15 @@
group { name: "e/gadget/cpumonitor/main";
+ alias: "e/gadget/cpumonitor/main_vert";
+ parts {
+ part { name: "e.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+aspect: 1 1;
+aspect_preference: BOTH;
+ }
+ }
+ }
+}
+group { name: "e/gadget/cpumonitor/core/main";
image: "cpu_bar.png" COMP;
image: "cpu_green_on.png" COMP;
image: "cpu_yellow_on.png" COMP;
@@ -87,7 +98,7 @@ group { name: "e/gadget/cpumonitor/main";
}
}
-group { name: "e/gadget/cpumonitor/main_vert";
+group { name: "e/gadget/cpumonitor/core/main_vert";
image: "cpu_bar_vert.png" COMP;
image: "cpu_green_on_vert.png" COMP;
image: "cpu_yellow_on_vert.png" COMP;
--
[EGIT] [core/efl] efl-1.20 06/07: Theme updates: Luncher icon indicator not relative. New pager plain style.
discomfitor pushed a commit to branch efl-1.20.
http://git.enlightenment.org/core/efl.git/commit/?id=b54b6f208dfe93d5458558b7fbe67df90f350488
commit b54b6f208dfe93d5458558b7fbe67df90f350488
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Sat Aug 26 14:04:01 2017 -0500
Theme updates: Luncher icon indicator not relative. New pager plain style.
---
data/elementary/themes/edc/luncher.edc | 10 -
data/elementary/themes/edc/pager.edc | 339 -
data/elementary/themes/edc/pager16.edc | 324 ---
3 files changed, 337 insertions(+), 336 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 8d4db80941..61af2578fb 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -184,15 +184,11 @@ group { name: "e/gadget/luncher/icon";
description { state: "default" 0.0;
visible: 0;
align: 0.6 0.6;
-rel1.to: "sizer";
-rel2.to: "sizer";
color: 255 255 255 0;
}
description { state: "on_left" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_y: "e.swallow.icon";
-rel2.to_y: "e.swallow.icon";
rel1.relative: 0.0 0.025;
rel2.relative: 0.05 0.975;
color: 51 153 255 255;
@@ -200,8 +196,6 @@ group { name: "e/gadget/luncher/icon";
description { state: "on_top" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_x: "e.swallow.icon";
-rel2.to_x: "e.swallow.icon";
rel1.relative: 0.025 0.0;
rel2.relative: 0.975 0.05;
color: 51 153 255 255;
@@ -209,8 +203,6 @@ group { name: "e/gadget/luncher/icon";
description { state: "on_right" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_y: "e.swallow.icon";
-rel2.to_y: "e.swallow.icon";
rel1.relative: 0.95 0.025;
rel2.relative: 1.0 0.975;
color: 51 153 255 255;
@@ -218,8 +210,6 @@ group { name: "e/gadget/luncher/icon";
description { state: "on_bottom" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_x: "e.swallow.icon";
-rel2.to_x: "e.swallow.icon";
rel1.relative: 0.025 0.95;
rel2.relative: 0.975 1.0;
color: 51 153 255 255;
diff --git a/data/elementary/themes/edc/pager.edc
b/data/elementary/themes/edc/pager.edc
index 74af167908..218fbe9b24 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -356,7 +356,7 @@ group { name: "e/modules/pager/desk";
}
}
-group { name: "e/gadget/pager/desk";
+group { name: "e/gadget/pager/plain/desk";
images.image: "vgrad_med_darker.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "bevel_in.png" COMP;
@@ -412,6 +412,18 @@ group { name: "e/gadget/pager/desk";
rel2.to: "base";
}
}
+ part { name: "e.swallow.drop"; type: SWALLOW;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+rel2.offset: -2 -1;
+link.base: "e,state,visible" "e";
+ }
+ desc { "hid"; inherit; hid;
+link.base: "e,state,hidden" "e";
+ }
+ }
part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
@@ -694,8 +706,331 @@ group { name: "e/gadget/pager/desk";
}
}
+group { name: "e/gadget/pager/default/desk";
+ images.image: "vgrad_med_darker.png" COMP;
+ images.image: "bevel_out.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "inset_shadow.png" COMP;
+ images.image: "mini_blue_glow_arrow_0.png" COMP;
+ images.image: "mini_blue_glow_arrow_1.png" COMP;
+ images.image: "mini_blue_glow_arrow_2.png" COMP;
+ images.image: "mini_blue_glow_arrow_3.png" COMP;
+ parts {
+ part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+rel1.to: "inset";
+rel1.offset: 1 1;
+rel2.to: "inset";
+rel2.offset: -2 -2;
+ }
+ }
+ part { name: "bev
[EGIT] [apps/ephoto] master 01/01: Ephoto: Don't use panes in the editor.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=ab43168f907cc3da747fab8297edec2b9a6515d6
commit ab43168f907cc3da747fab8297edec2b9a6515d6
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Aug 21 16:05:49 2017 -0500
Ephoto: Don't use panes in the editor.
---
src/bin/ephoto_editor.c | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/bin/ephoto_editor.c b/src/bin/ephoto_editor.c
index 4a0c253..358fd3c 100644
--- a/src/bin/ephoto_editor.c
+++ b/src/bin/ephoto_editor.c
@@ -29,11 +29,10 @@ ephoto_editor_add(Ephoto *ephoto, Evas_Object *parent,
const char *title, const
frame = elm_frame_add(parent);
elm_object_text_set(frame, title);
- EPHOTO_WEIGHT(frame, 0.3, EVAS_HINT_EXPAND);
+ EPHOTO_WEIGHT(frame, ephoto->config->right_size, EVAS_HINT_EXPAND);
EPHOTO_FILL(frame);
evas_object_data_set(frame, data_name, data);
- elm_object_part_content_set(parent, "right", frame);
- elm_panes_content_right_size_set(parent, ephoto->config->right_size);
+ elm_box_pack_end(parent, frame);
evas_object_show(frame);
box = elm_box_add(frame);
@@ -94,14 +93,12 @@ ephoto_editor_add(Ephoto *ephoto, Evas_Object *parent,
const char *title, const
}
void
-ephoto_editor_del(Evas_Object *obj, Evas_Object *parent)
+ephoto_editor_del(Evas_Object *obj, Evas_Object *parent EINA_UNUSED)
{
Evas_Object *frame = evas_object_data_get(obj, "frame");
- elm_object_part_content_unset(parent, "right");
if (frame)
evas_object_del(frame);
- elm_panes_content_right_size_set(parent, 0.0);
ecore_event_add(EPHOTO_EVENT_EDITOR_BACK, NULL, NULL, NULL);
}
--
[EGIT] [core/enlightenment] master 01/01: Pager: Add the option to switch between live and plain pagers as well as switch to plain pager when saving power.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2ab2fe18eaee605657fb3b678cb3e6375b8e3e40
commit 2ab2fe18eaee605657fb3b678cb3e6375b8e3e40
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Sat Aug 26 14:24:20 2017 -0500
Pager: Add the option to switch between live and plain pagers as well as
switch to plain pager when saving power.
---
src/modules/pager/e_mod_config.c |4 +-
src/modules/pager/e_mod_main.c| 57 ---
src/modules/pager/gadget/config.c | 83 ++-
src/modules/pager/gadget/mod.c|8 +-
src/modules/pager/gadget/pager.c | 1024 ++---
src/modules/pager/gadget/pager.h |6 +-
6 files changed, 1027 insertions(+), 155 deletions(-)
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 20fd336e0..5a78db9fb 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -153,7 +153,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfdata)
pager_config->show_desk_names = cfdata->show_desk_names;
pager_config->popup_urgent = cfdata->popup.urgent_show;
_pager_cb_config_updated();
- _pager_cb_config_gadget_updated();
+ _pager_cb_config_gadget_updated(EINA_FALSE);
e_config_save_queue();
return 1;
}
@@ -307,7 +307,7 @@ _adv_apply(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfdata)
pager_config->btn_noplace = cfdata->btn.noplace;
pager_config->btn_desk = cfdata->btn.desk;
_pager_cb_config_updated();
- _pager_cb_config_gadget_updated();
+ _pager_cb_config_gadget_updated(EINA_FALSE);
e_config_save_queue();
return 1;
}
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 2306e2ed7..5d8850f5f 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -164,7 +164,6 @@ static Pager_Popup *act_popup = NULL; /* active popup */
static int hold_count = 0;
static int hold_mod = 0;
static E_Desk *current_desk = NULL;
-static E_Config_DD *conf_edd = NULL;
static Eina_List *pagers = NULL;
EINTERN E_Module *module;
@@ -2052,57 +2051,6 @@ e_modapi_init(E_Module *m)
e_util_dialog_show(_("Error"), _("Pager module cannot be loaded at the
same time as Pager Plain!"));
return NULL;
}
- conf_edd = E_CONFIG_DD_NEW("Pager_Config", Config);
-#undef T
-#undef D
-#define T Config
-#define D conf_edd
- E_CONFIG_VAL(D, T, popup, UINT);
- E_CONFIG_VAL(D, T, popup_speed, DOUBLE);
- E_CONFIG_VAL(D, T, popup_urgent, UINT);
- E_CONFIG_VAL(D, T, popup_urgent_stick, UINT);
- E_CONFIG_VAL(D, T, popup_urgent_speed, DOUBLE);
- E_CONFIG_VAL(D, T, show_desk_names, UINT);
- E_CONFIG_VAL(D, T, popup_height, INT);
- E_CONFIG_VAL(D, T, popup_act_height, INT);
- E_CONFIG_VAL(D, T, drag_resist, UINT);
- E_CONFIG_VAL(D, T, btn_drag, UCHAR);
- E_CONFIG_VAL(D, T, btn_noplace, UCHAR);
- E_CONFIG_VAL(D, T, btn_desk, UCHAR);
- E_CONFIG_VAL(D, T, flip_desk, UCHAR);
-
- pager_config = e_config_domain_load("module.pager", conf_edd);
-
- if (!pager_config)
- {
-pager_config = E_NEW(Config, 1);
-pager_config->popup = 1;
-pager_config->popup_speed = 1.0;
-pager_config->popup_urgent = 0;
-pager_config->popup_urgent_stick = 0;
-pager_config->popup_urgent_speed = 1.5;
-pager_config->show_desk_names = 0;
-pager_config->popup_height = 60;
-pager_config->popup_act_height = 60;
-pager_config->drag_resist = 3;
-pager_config->btn_drag = 1;
-pager_config->btn_noplace = 2;
-pager_config->btn_desk = 2;
-pager_config->flip_desk = 0;
- }
- E_CONFIG_LIMIT(pager_config->popup, 0, 1);
- E_CONFIG_LIMIT(pager_config->popup_speed, 0.1, 10.0);
- E_CONFIG_LIMIT(pager_config->popup_urgent, 0, 1);
- E_CONFIG_LIMIT(pager_config->popup_urgent_stick, 0, 1);
- E_CONFIG_LIMIT(pager_config->popup_urgent_speed, 0.1, 10.0);
- E_CONFIG_LIMIT(pager_config->show_desk_names, 0, 1);
- E_CONFIG_LIMIT(pager_config->popup_height, 20, 200);
- E_CONFIG_LIMIT(pager_config->popup_act_height, 20, 200);
- E_CONFIG_LIMIT(pager_config->drag_resist, 0, 50);
- E_CONFIG_LIMIT(pager_config->flip_desk, 0, 1);
- E_CONFIG_LIMIT(pager_config->btn_drag, 0, 32);
- E_CONFIG_LIMIT(pager_config->btn_noplace, 0, 32);
- E_CONFIG_LIMIT(pager_config->btn_desk, 0, 32);
E_LIST_HANDLER_APPEND(shandlers, E_EVENT_ZONE_DESK_COUNT_SET,
_pager_cb_event_zone_desk_count_set, NULL);
E_LIST_HANDLER_APPEND(shandlers, E_EVENT_DESK_SHOW,
_pager_cb_event_desk_show, NULL);
@@ -2155,8 +2103,6 @@ e_modapi_shutdown(E_Module *m)
e_object_del(E_OBJECT(config_dialog));
E_FREE_LIST(shandlers, ecore_event_handler_del);
- e_configure_registry_ite
[EGIT] [core/efl] master 01/01: Theme updates: Luncher icon indicator not relative. New pager plain style.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=924a59d5db2915232b27be72b0aea2c9d92fb4eb
commit 924a59d5db2915232b27be72b0aea2c9d92fb4eb
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Sat Aug 26 14:04:01 2017 -0500
Theme updates: Luncher icon indicator not relative. New pager plain style.
---
data/elementary/themes/edc/luncher.edc | 10 -
data/elementary/themes/edc/pager.edc | 339 -
data/elementary/themes/edc/pager16.edc | 324 ---
3 files changed, 337 insertions(+), 336 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 8d4db80941..61af2578fb 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -184,15 +184,11 @@ group { name: "e/gadget/luncher/icon";
description { state: "default" 0.0;
visible: 0;
align: 0.6 0.6;
-rel1.to: "sizer";
-rel2.to: "sizer";
color: 255 255 255 0;
}
description { state: "on_left" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_y: "e.swallow.icon";
-rel2.to_y: "e.swallow.icon";
rel1.relative: 0.0 0.025;
rel2.relative: 0.05 0.975;
color: 51 153 255 255;
@@ -200,8 +196,6 @@ group { name: "e/gadget/luncher/icon";
description { state: "on_top" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_x: "e.swallow.icon";
-rel2.to_x: "e.swallow.icon";
rel1.relative: 0.025 0.0;
rel2.relative: 0.975 0.05;
color: 51 153 255 255;
@@ -209,8 +203,6 @@ group { name: "e/gadget/luncher/icon";
description { state: "on_right" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_y: "e.swallow.icon";
-rel2.to_y: "e.swallow.icon";
rel1.relative: 0.95 0.025;
rel2.relative: 1.0 0.975;
color: 51 153 255 255;
@@ -218,8 +210,6 @@ group { name: "e/gadget/luncher/icon";
description { state: "on_bottom" 0.0;
inherit: "default" 0.0;
visible: 1;
-rel1.to_x: "e.swallow.icon";
-rel2.to_x: "e.swallow.icon";
rel1.relative: 0.025 0.95;
rel2.relative: 0.975 1.0;
color: 51 153 255 255;
diff --git a/data/elementary/themes/edc/pager.edc
b/data/elementary/themes/edc/pager.edc
index 74af167908..218fbe9b24 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -356,7 +356,7 @@ group { name: "e/modules/pager/desk";
}
}
-group { name: "e/gadget/pager/desk";
+group { name: "e/gadget/pager/plain/desk";
images.image: "vgrad_med_darker.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "bevel_in.png" COMP;
@@ -412,6 +412,18 @@ group { name: "e/gadget/pager/desk";
rel2.to: "base";
}
}
+ part { name: "e.swallow.drop"; type: SWALLOW;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+rel2.offset: -2 -1;
+link.base: "e,state,visible" "e";
+ }
+ desc { "hid"; inherit; hid;
+link.base: "e,state,hidden" "e";
+ }
+ }
part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
@@ -694,8 +706,331 @@ group { name: "e/gadget/pager/desk";
}
}
+group { name: "e/gadget/pager/default/desk";
+ images.image: "vgrad_med_darker.png" COMP;
+ images.image: "bevel_out.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "inset_shadow.png" COMP;
+ images.image: "mini_blue_glow_arrow_0.png" COMP;
+ images.image: "mini_blue_glow_arrow_1.png" COMP;
+ images.image: "mini_blue_glow_arrow_2.png" COMP;
+ images.image: "mini_blue_glow_arrow_3.png" COMP;
+ parts {
+ part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+rel1.to: "inset";
+rel1.offset: 1 1;
+rel2.to: "inset";
+rel2.offset: -2 -2;
+ }
+ }
+ part { name: "bevel&qu
[EGIT] [core/enlightenment] master 01/01: Don't dereference NULL pointers in sysinfo and cpuclock.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4a22d2f17893e8d2777e37eb1d077452d3499bcf
commit 4a22d2f17893e8d2777e37eb1d077452d3499bcf
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Aug 25 14:57:45 2017 -0500
Don't dereference NULL pointers in sysinfo and cpuclock.
This fixes @CID1379941 and @CID1379947
---
src/modules/sysinfo/cpuclock/cpuclock.c | 3 ++-
src/modules/sysinfo/sysinfo.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index 333d170e8..b9cb57c42 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -853,7 +853,8 @@ _cpuclock_cb_frequency_check_notify(void *data,
Eina_Bool init_set = EINA_FALSE;
Thread_Config *thc = data;
- if (!thc->inst && !thc->inst->cfg) return;
+ if (!thc->inst) return;
+ if (!thc->inst->cfg) return;
if (thc->inst->cfg->esm != E_SYSINFO_MODULE_CPUCLOCK && thc->inst->cfg->esm
!= E_SYSINFO_MODULE_SYSINFO) return;
if ((thc->inst->cfg->cpuclock.status) && (status) &&
diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c
index 17b5ced32..17778ac4c 100644
--- a/src/modules/sysinfo/sysinfo.c
+++ b/src/modules/sysinfo/sysinfo.c
@@ -7,6 +7,7 @@ _sysinfo_removed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_data)
{
Instance *inst = data;
+ if (!inst) return;
if (inst->o_main != event_data) return;
sysinfo_batman_remove(inst, NULL, NULL, NULL);
sysinfo_thermal_remove(inst, NULL, NULL, NULL);
@@ -17,7 +18,7 @@ _sysinfo_removed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_data)
evas_object_smart_callback_del_full(e_gadget_site_get(obj),
"gadget_removed", _sysinfo_removed_cb, inst);
evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL,
_sysinfo_deleted_cb, data);
- if (inst && inst->cfg)
+ if (inst->cfg)
{
sysinfo_config->items = eina_list_remove(sysinfo_config->items,
inst->cfg);
if (inst->cfg->id >= 0)
--
[EGIT] [core/enlightenment] master 01/01: CPUMonitor: Don't pack the box in sysinfo mode.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5bcdfb0421f2460c14b35a861786668b88dc7a82 commit 5bcdfb0421f2460c14b35a861786668b88dc7a82 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Thu Aug 24 19:39:20 2017 -0500 CPUMonitor: Don't pack the box in sysinfo mode. --- src/modules/sysinfo/cpumonitor/cpumonitor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index 9a1882c27..8823164f0 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -439,7 +439,6 @@ sysinfo_cpumonitor_create(Evas_Object *parent, Instance *inst) "e/gadget/cpumonitor/main"); E_EXPAND(inst->cfg->cpumonitor.o_gadget); E_FILL(inst->cfg->cpumonitor.o_gadget); - elm_box_pack_end(inst->o_main, inst->cfg->cpumonitor.o_gadget); evas_object_event_callback_add(inst->cfg->cpumonitor.o_gadget, EVAS_CALLBACK_MOUSE_DOWN, _cpumonitor_mouse_down_cb, inst); evas_object_show(inst->cfg->cpumonitor.o_gadget); --
[EGIT] [core/enlightenment] master 01/01: Batman: Set the demo gadget to have full battery.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1af5125cc93e153049f5e3c598fc09187f4152d2
commit 1af5125cc93e153049f5e3c598fc09187f4152d2
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Aug 24 08:08:41 2017 -0500
Batman: Set the demo gadget to have full battery.
---
src/modules/sysinfo/batman/batman.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index 328d089f0..1939174dd 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -392,7 +392,7 @@ _batman_config_updated(Instance *inst)
if (inst->cfg->id == -1)
{
-_batman_face_level_set(inst->cfg->batman.o_gadget, .60);
+_batman_face_level_set(inst->cfg->batman.o_gadget, 1.0);
return;
}
if ((inst->cfg->batman.force_mode == UNKNOWN) ||
--
[EGIT] [core/enlightenment] master 01/01: CPUMonitor: Make sure to set the number of cores so aspect calcs.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=30ee8c52849d469ebf955cb57329d1f5fe0b0ba9
commit 30ee8c52849d469ebf955cb57329d1f5fe0b0ba9
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Aug 24 08:06:20 2017 -0500
CPUMonitor: Make sure to set the number of cores so aspect calcs.
---
src/modules/sysinfo/cpumonitor/cpumonitor.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c
b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index d9e2fea81..9a1882c27 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -154,10 +154,9 @@ _cpumonitor_resize_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *e
}
if (w < 1) w = 1;
if (h < 1) h = 1;
+ evas_object_size_hint_aspect_set(inst->cfg->cpumonitor.o_gadget_box,
EVAS_ASPECT_CONTROL_BOTH, w, h);
if (inst->cfg->esm == E_SYSINFO_MODULE_CPUMONITOR)
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH,
w, h);
- else
- evas_object_size_hint_aspect_set(inst->cfg->cpumonitor.o_gadget,
EVAS_ASPECT_CONTROL_BOTH, w, h);
}
static void
@@ -273,6 +272,8 @@ _cpumonitor_config_updated(Instance *inst)
thc->total = 0;
thc->idle = 0;
thc->percent = 60;
+ thc->num_cores = 4;
+ inst->cfg->cpumonitor.cores = thc->num_cores;
for (i = 0; i < 4; i++)
{
core = E_NEW(CPU_Core, 1);
@@ -312,6 +313,7 @@ _cpumonitor_config_updated(Instance *inst)
#else
thc->num_cores = _cpumonitor_proc_getcores();
#endif
+inst->cfg->cpumonitor.cores = thc->num_cores;
for (i = 0; i < thc->num_cores; i++)
{
core = E_NEW(CPU_Core, 1);
--
[EGIT] [core/efl] master 01/01: CPUMonitor theme: Don't set aspect in theme.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7683780351b91709469e3fb2b824f7c1bb8dade8
commit 7683780351b91709469e3fb2b824f7c1bb8dade8
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Aug 24 08:05:44 2017 -0500
CPUMonitor theme: Don't set aspect in theme.
---
data/elementary/themes/edc/cpumonitor.edc | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/elementary/themes/edc/cpumonitor.edc
b/data/elementary/themes/edc/cpumonitor.edc
index bbc8ac4f18..dfc17dcb63 100644
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ b/data/elementary/themes/edc/cpumonitor.edc
@@ -3,8 +3,6 @@ group { name: "e/gadget/cpumonitor/main";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
-aspect: 1 1;
-aspect_preference: BOTH;
}
}
}
--
[EGIT] [core/enlightenment] master 01/01: CPUMonitor: Fix aspect by using correct theme names. This requires an EFL update too.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c7e6b52d2ea27e44076b4bac427eaa9e99764c2a commit c7e6b52d2ea27e44076b4bac427eaa9e99764c2a Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Wed Aug 23 19:02:46 2017 -0500 CPUMonitor: Fix aspect by using correct theme names. This requires an EFL update too. --- src/modules/sysinfo/cpumonitor/cpumonitor.c | 46 ++--- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index db22514fa..d9e2fea81 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -214,10 +214,10 @@ _cpumonitor_add_layout(Instance *inst) edje_object_update_hints_set(elm_layout_edje_get(layout), EINA_TRUE); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(layout, "base/theme/gadget/cpumonitor", - "e/gadget/cpumonitor/main_vert"); + "e/gadget/cpumonitor/core/main_vert"); else e_theme_edje_object_set(layout, "base/theme/gadget/cpumonitor", - "e/gadget/cpumonitor/main"); + "e/gadget/cpumonitor/core/main"); E_EXPAND(layout); E_FILL(layout); elm_box_pack_end(inst->cfg->cpumonitor.o_gadget_box, layout); @@ -390,10 +390,20 @@ _cpumonitor_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSE e_gadget_configure_cb_set(inst->o_main, _cpumonitor_configure_cb); - inst->cfg->cpumonitor.o_gadget = elm_table_add(inst->o_main); + inst->cfg->cpumonitor.o_gadget = elm_layout_add(inst->o_main); + if (orient == E_GADGET_SITE_ORIENT_VERTICAL) + e_theme_edje_object_set(inst->cfg->cpumonitor.o_gadget, + "base/theme/gadget/cpumonitor", + "e/gadget/cpumonitor/main_vert"); + else + e_theme_edje_object_set(inst->cfg->cpumonitor.o_gadget, + "base/theme/gadget/cpumonitor", + "e/gadget/cpumonitor/main"); E_EXPAND(inst->cfg->cpumonitor.o_gadget); E_FILL(inst->cfg->cpumonitor.o_gadget); elm_box_pack_end(inst->o_main, inst->cfg->cpumonitor.o_gadget); + evas_object_event_callback_add(inst->cfg->cpumonitor.o_gadget, EVAS_CALLBACK_MOUSE_DOWN, + _cpumonitor_mouse_down_cb, inst); evas_object_show(inst->cfg->cpumonitor.o_gadget); inst->cfg->cpumonitor.o_gadget_box = elm_box_add(inst->cfg->cpumonitor.o_gadget); @@ -404,17 +414,9 @@ _cpumonitor_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSE elm_box_horizontal_set(inst->cfg->cpumonitor.o_gadget_box, EINA_TRUE); E_EXPAND(inst->cfg->cpumonitor.o_gadget_box); E_FILL(inst->cfg->cpumonitor.o_gadget_box); - elm_table_pack(inst->cfg->cpumonitor.o_gadget, inst->cfg->cpumonitor.o_gadget_box, 0, 0, 1, 1); + elm_layout_content_set(inst->cfg->cpumonitor.o_gadget, "e.swallow.content", inst->cfg->cpumonitor.o_gadget_box); evas_object_show(inst->cfg->cpumonitor.o_gadget_box); - inst->cfg->cpumonitor.event = evas_object_rectangle_add(inst->cfg->cpumonitor.o_gadget); - evas_object_color_set(inst->cfg->cpumonitor.event, 0, 0, 0, 0); - E_EXPAND(inst->cfg->cpumonitor.event); - E_FILL(inst->cfg->cpumonitor.event); - evas_object_event_callback_add(inst->cfg->cpumonitor.event, EVAS_CALLBACK_MOUSE_DOWN, _cpumonitor_mouse_down_cb, inst); - elm_table_pack(inst->cfg->cpumonitor.o_gadget, inst->cfg->cpumonitor.event, 0, 0, 1, 1); - evas_object_show(inst->cfg->cpumonitor.event); - evas_object_smart_callback_del_full(obj, "gadget_created", _cpumonitor_created_cb, data); E_LIST_HANDLER_APPEND(inst->cfg->cpumonitor.handlers, E_EVENT_SCREENSAVER_ON, _screensaver_on, inst); @@ -429,11 +431,15 @@ sysinfo_cpumonitor_create(Evas_Object *parent, Instance *inst) inst->cfg->cpumonitor.percent = 0; inst->cfg->cpumonitor.popup = NULL; inst->cfg->cpumonitor.configure = NULL; - inst->cfg->cpumonitor.o_gadget = elm_table_add(parent); + inst->cfg->cpumonitor.o_gadget = elm_layout_add(parent); + e_theme_edje_object_set(inst->cfg->cpumonitor.o_gadget, + "base/theme/gadget/cpumonitor", + "e/gadget/cpumonitor/main"); E_EXPAND(inst->cfg->cpumonitor.o_gadget); E_FILL(inst->cfg->cpumonitor.o_gadget); - if (inst->cfg->esm != E_SYSINFO_MODULE_SYSINFO) - elm_box_pack
[EGIT] [core/efl] master 01/01: Cpumonitor Theme: Add a theme for the base and the core. This fixes aspect.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95d0a85933986edebcd993ca5eabcacc9cdd32bf
commit 95d0a85933986edebcd993ca5eabcacc9cdd32bf
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 19:01:52 2017 -0500
Cpumonitor Theme: Add a theme for the base and the core. This fixes aspect.
---
data/elementary/themes/edc/cpumonitor.edc | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/cpumonitor.edc
b/data/elementary/themes/edc/cpumonitor.edc
index 2ee4b1989b..bbc8ac4f18 100644
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ b/data/elementary/themes/edc/cpumonitor.edc
@@ -1,4 +1,15 @@
group { name: "e/gadget/cpumonitor/main";
+ alias: "e/gadget/cpumonitor/main_vert";
+ parts {
+ part { name: "e.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+aspect: 1 1;
+aspect_preference: BOTH;
+ }
+ }
+ }
+}
+group { name: "e/gadget/cpumonitor/core/main";
image: "cpu_bar.png" COMP;
image: "cpu_green_on.png" COMP;
image: "cpu_yellow_on.png" COMP;
@@ -87,7 +98,7 @@ group { name: "e/gadget/cpumonitor/main";
}
}
-group { name: "e/gadget/cpumonitor/main_vert";
+group { name: "e/gadget/cpumonitor/core/main_vert";
image: "cpu_bar_vert.png" COMP;
image: "cpu_green_on_vert.png" COMP;
image: "cpu_yellow_on_vert.png" COMP;
--
[EGIT] [core/enlightenment] master 01/01: Luncher: Don't use a second object for the overlay. This requires EFL updating due to theme.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ccf30bd726c5bb022c00cfa15dc414813abf28fc
commit ccf30bd726c5bb022c00cfa15dc414813abf28fc
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 17:06:57 2017 -0500
Luncher: Don't use a second object for the overlay. This requires EFL
updating due to theme.
---
src/modules/luncher/bar.c | 8
src/modules/luncher/grid.c| 8
src/modules/luncher/luncher.h | 1 -
3 files changed, 17 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 79c313950..737c2473b 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -250,7 +250,6 @@ _bar_icon_del(Instance *inst, Icon *ic)
if (!inst->main_del)
_bar_aspect(inst);
evas_object_del(ic->o_icon);
- evas_object_del(ic->o_overlay);
evas_object_del(ic->o_layout);
eina_hash_del_by_data(inst->icons_desktop_hash, ic);
eina_hash_del_by_data(inst->icons_clients_hash, ic);
@@ -1106,7 +1105,6 @@ _bar_icon_file_set(Icon *ic, Efreet_Desktop *desktop,
E_Client *non_desktop_clie
k = "e/icons/unknown";
}
elm_image_file_set(ic->o_icon, path, k);
- elm_image_file_set(ic->o_overlay, path, k);
}
static void
@@ -1223,8 +1221,6 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop,
E_Client *non_desktop_cli
ic->o_icon = elm_icon_add(ic->o_layout);
E_EXPAND(ic->o_icon);
- ic->o_overlay = elm_icon_add(ic->o_layout);
- E_EXPAND(ic->o_overlay);
_bar_icon_file_set(ic, desktop, non_desktop_client);
@@ -1261,10 +1257,6 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop,
E_Client *non_desktop_cli
_bar_icon_mouse_out, ic);
evas_object_show(ic->o_icon);
- evas_object_size_hint_aspect_set(ic->o_overlay, EVAS_ASPECT_CONTROL_BOTH,
1, 1);
- elm_layout_content_set(ic->o_layout, "e.swallow.overlay", ic->o_overlay);
- evas_object_show(ic->o_overlay);
-
if (desktop)
eina_hash_add(inst->icons_desktop_hash,
eina_stringshare_add(desktop->orig_path), ic);
else
diff --git a/src/modules/luncher/grid.c b/src/modules/luncher/grid.c
index 2f520056f..547d1f691 100644
--- a/src/modules/luncher/grid.c
+++ b/src/modules/luncher/grid.c
@@ -61,7 +61,6 @@ _grid_icon_del(Instance *inst, Icon *ic)
{
inst->icons = eina_list_remove(inst->icons, ic);
evas_object_del(ic->o_icon);
- evas_object_del(ic->o_overlay);
evas_object_del(ic->o_layout);
if (ic->desktop)
efreet_desktop_unref(ic->desktop);
@@ -311,7 +310,6 @@ _grid_icon_file_set(Icon *ic, Efreet_Desktop *desktop)
k = "e/icons/unknown";
}
elm_image_file_set(ic->o_icon, path, k);
- elm_image_file_set(ic->o_overlay, path, k);
}
static Icon *
@@ -340,8 +338,6 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
ic->o_icon = elm_icon_add(ic->o_layout);
E_EXPAND(ic->o_icon);
- ic->o_overlay = elm_icon_add(ic->o_layout);
- E_EXPAND(ic->o_overlay);
_grid_icon_file_set(ic, desktop);
@@ -362,10 +358,6 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
_grid_icon_mouse_out, ic);
evas_object_show(ic->o_icon);
- evas_object_size_hint_aspect_set(ic->o_overlay, EVAS_ASPECT_CONTROL_BOTH,
1, 1);
- elm_layout_content_set(ic->o_layout, "e.swallow.overlay", ic->o_overlay);
- evas_object_show(ic->o_overlay);
-
elm_layout_sizing_eval(ic->o_layout);
elm_gengrid_item_append(inst->o_icon_con, &_grid_icon_class, ic, NULL,
NULL);
diff --git a/src/modules/luncher/luncher.h b/src/modules/luncher/luncher.h
index e79701522..f33625c55 100644
--- a/src/modules/luncher/luncher.h
+++ b/src/modules/luncher/luncher.h
@@ -74,7 +74,6 @@ struct _Icon
Instance *inst;
Evas_Object *o_layout;
Evas_Object *o_icon;
- Evas_Object *o_overlay;
Evas_Object *o_spacera;
Evas_Object *o_spacerb;
Evas_Object *preview;
--
[EGIT] [core/efl] master 01/01: Luncher Theme: Use a proxy for the overlay effect.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a6c7234afa60af3d671062b90f545210eda56094
commit a6c7234afa60af3d671062b90f545210eda56094
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 17:06:10 2017 -0500
Luncher Theme: Use a proxy for the overlay effect.
---
data/elementary/themes/edc/luncher.edc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index cbc35c0039..8d4db80941 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -291,11 +291,13 @@ group { name: "e/gadget/luncher/icon";
color: 255 255 255 0;
}
}
- part { name: "e.swallow.overlay"; type: SWALLOW;
+ part { name: "e.swallow.overlay"; type: PROXY;
clip_to: "obackground";
repeat_events: 1;
description {
state: "default" 0.0;
+source: "e.swallow.icon";
+proxy.source_clip: 0;
rel1.to: "obackground";
rel2.to: "obackground";
}
--
[EGIT] [core/enlightenment] master 01/01: Pager gadget: Take advantage of new theme. For this to work, you must update EFL first.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ae9966970b3a7cd19197d009056fb5a6eb69aa6d
commit ae9966970b3a7cd19197d009056fb5a6eb69aa6d
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 15:27:39 2017 -0500
Pager gadget: Take advantage of new theme. For this to work, you must
update EFL first.
---
src/modules/pager/gadget/pager.c | 120 ++-
1 file changed, 118 insertions(+), 2 deletions(-)
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index e3f8f8a96..23c7726d6 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -140,6 +140,108 @@ static Eina_List *pagers = NULL;
static E_Action *act_popup_show = NULL;
static E_Action *act_popup_switch = NULL;
+static const char *
+_pager_location_get(Instance *inst)
+{
+ const char *s = "float";
+
+ if (!inst) return NULL;
+
+ E_Gadget_Site_Orient orient =
e_gadget_site_orient_get(e_gadget_site_get(inst->o_pager));
+ E_Gadget_Site_Anchor anchor =
e_gadget_site_anchor_get(e_gadget_site_get(inst->o_pager));
+
+ if (anchor & E_GADGET_SITE_ANCHOR_LEFT)
+ {
+if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ {
+ switch (orient)
+ {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ s = "top";
+ break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+ s = "left";
+ break;
+case E_GADGET_SITE_ORIENT_NONE:
+ s = "left";
+ break;
+ }
+ }
+else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ {
+ switch (orient)
+ {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ s = "bottom";
+ break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+ s = "left";
+ break;
+case E_GADGET_SITE_ORIENT_NONE:
+ s = "left";
+ break;
+ }
+ }
+else
+ s = "left";
+ }
+ else if (anchor & E_GADGET_SITE_ANCHOR_RIGHT)
+ {
+if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ {
+ switch (orient)
+ {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ s = "top";
+ break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+ s = "right";
+ break;
+case E_GADGET_SITE_ORIENT_NONE:
+ s = "right";
+ break;
+ }
+ }
+else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ {
+ switch (orient)
+ {
+case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ s = "bottom";
+ break;
+case E_GADGET_SITE_ORIENT_VERTICAL:
+ s = "right";
+ break;
+case E_GADGET_SITE_ORIENT_NONE:
+ s = "right";
+ break;
+ }
+ }
+else
+ s = "right";
+ }
+ else if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ s = "top";
+ else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ s = "bottom";
+ else
+ {
+switch (orient)
+ {
+ case E_GADGET_SITE_ORIENT_HORIZONTAL:
+ s = "bottom";
+ break;
+ case E_GADGET_SITE_ORIENT_VERTICAL:
+ s = "left";
+ break;
+ default:
+ s = "bottom";
+ break;
+ }
+ }
+ return s;
+}
+
static Eina_Bool
_pager_check_modifiers(Evas_Modifier *modifiers)
{
@@ -502,6 +604,8 @@ _pager_desk_free(Pager_Desk *pd)
static void
_pager_desk_select(Pager_Desk *pd)
{
+ char ori[32];
+ const char *s = _pager_location_get(pd->pager->inst);
if (pd->current) return;
if (pd->pager->active_pd)
{
@@ -510,7 +614,11 @@ _pager_desk_select(Pager_Desk *pd)
}
pd->current = 1;
evas_object_raise(pd->o_desk);
- edje_object_signal_emit(pd->o_desk, "e,state,selected", "e");
+ if (s)
+ snprintf(ori, sizeof(ori), "e,state,selected,%s", s);
+ else
+ snprintf(ori, sizeof(ori), "e,state,selected,bottom");
+ edje_object_signal_emit(pd->o_desk, ori, "e");
pd->pager->active_pd = pd;
}
@@ -859,7 +967,15 @@ _pager_cb_config_gadget_updated(void)
EINA_LIST_FOREACH(p->desks, ll, pd)
{
if (pd->current)
-edje_object_signal_em
[EGIT] [core/efl] master 01/01: Gadget themes: Remove shines.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95f59ecd517b878316829389f3a0e90a8047786b
commit 95f59ecd517b878316829389f3a0e90a8047786b
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 15:26:55 2017 -0500
Gadget themes: Remove shines.
---
data/elementary/themes/Makefile.am| 1 +
data/elementary/themes/edc/batman.edc | 30 +--
data/elementary/themes/edc/pager.edc | 340 ++
data/elementary/themes/edc/pager16.edc| 326 +++-
data/elementary/themes/edc/temperature.edc| 8 -
data/elementary/themes/img/batman_overlay.png | Bin 0 -> 694 bytes
6 files changed, 672 insertions(+), 33 deletions(-)
diff --git a/data/elementary/themes/Makefile.am
b/data/elementary/themes/Makefile.am
index d48aaca248..d7632d7641 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -168,6 +168,7 @@ elementary/themes/img/bat_shadow.png \
elementary/themes/img/bat_shine.png \
elementary/themes/img/bat_top0.png \
elementary/themes/img/bat_top1.png \
+elementary/themes/img/batman_overlay.png \
elementary/themes/img/bevel_curved_horiz_out.png \
elementary/themes/img/bevel_curved_vert_out.png \
elementary/themes/img/bevel_dark_in.png \
diff --git a/data/elementary/themes/edc/batman.edc
b/data/elementary/themes/edc/batman.edc
index c4cdf793c1..f32751ad62 100644
--- a/data/elementary/themes/edc/batman.edc
+++ b/data/elementary/themes/edc/batman.edc
@@ -2,11 +2,9 @@ group { name: "e/gadget/batman/main";
alias: "e/gadget/batman/main_vert";
images.image: "bat_shadow.png" COMP;
images.image: "bat_base.png" COMP;
- images.image: "bat_shine.png" COMP;
images.image: "bat_bottom0.png" COMP;
- images.image: "bat_bottom1.png" COMP;
images.image: "bat_top0.png" COMP;
- images.image: "bat_top1.png" COMP;
+ images.image: "batman_overlay.png" COMP;
images.image: "glow_med_white.png" COMP;
script {
public message(Msg_Type:type, id, ...) {
@@ -58,7 +56,9 @@ group { name: "e/gadget/batman/main";
part { name: "fill_region"; type: SPACER;
description { state: "default" 0.0;
rel1.to: "bg";
+rel1.offset: 1 0;
rel2.to: "bg";
+rel2.offset: -2 -1;
}
}
part { name: "pwr"; type: SPACER;
@@ -134,30 +134,14 @@ group { name: "e/gadget/batman/main";
color: 51 153 255 255;
}
}
- part { name: "top-shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
-rel1.to: "top";
-rel2.to: "top";
-image.normal: "bat_top1.png";
- }
- }
- part { name: "bottom-shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
-rel1.to: "bottom";
-rel2.to: "bottom";
-image.normal: "bat_bottom1.png";
- }
- }
- part { name: "shine";
+ part { name: "overlay";
clip_to: "pulse_clip";
description { state: "default" 0.0;
rel1.to: "bg";
-rel1.offset: 0 -6;
+rel1.offset: 0 0;
rel2.to: "bg";
-rel2.offset: -1 5;
-image.normal: "bat_shine.png";
+rel2.offset: -1 -1;
+image.normal: "batman_overlay.png";
image.border: 0 0 7 7;
}
}
diff --git a/data/elementary/themes/edc/pager.edc
b/data/elementary/themes/edc/pager.edc
index 4596db8451..74af167908 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -1,4 +1,5 @@
group { name: "e/modules/pager/popup";
+ alias: "e/gadget/pager/popup";
images.image: "vgrad_tall.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
@@ -355,7 +356,346 @@ group { name: "e/modules/pager/desk";
}
}
+group { name: "e/gadget/pager/desk";
+ images.image: "vgrad_med_darker.png" COMP;
+ images.image: "bevel_out.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "inset_shadow.png" COMP;
+ images.image: "mini_blue_glow_arrow_0.png" COMP;
+ images.image: "mini_blue_glow_arrow_1.png" COMP;
+ images.image: "mini_blue_glow_arrow_2.png" COMP;
+ images.image: "mini_blue_glow_arrow_3.png" COMP;
+ parts {
+ part { name: "base";
+ descript
[EGIT] [core/enlightenment] master 01/01: Gadgets: Don't set gadgets to expand.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ad46d041a8614b9383e797b679c60ca2ded5354c
commit ad46d041a8614b9383e797b679c60ca2ded5354c
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Aug 23 09:55:59 2017 -0500
Gadgets: Don't set gadgets to expand.
---
src/modules/backlight/gadget/backlight.c| 3 ---
src/modules/mixer/gadget/mixer.c| 2 --
src/modules/sysinfo/batman/batman.c | 1 -
src/modules/sysinfo/cpuclock/cpuclock.c | 1 -
src/modules/sysinfo/cpumonitor/cpumonitor.c | 1 -
src/modules/sysinfo/memusage/memusage.c | 1 -
src/modules/sysinfo/netstatus/netstatus.c | 1 -
src/modules/sysinfo/thermal/thermal.c | 1 -
src/modules/xkbswitch/gadget/xkbswitch.c| 2 --
9 files changed, 13 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index 8e31c410a..d4aa7e7b0 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -278,9 +278,6 @@ backlight_gadget_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orien
backlight_init();
else
inst->val = -1.0;
-
- E_EXPAND(inst->o_main);
- E_FILL(inst->o_main);
evas_object_smart_callback_add(parent, "gadget_created",
_backlight_gadget_created_cb, inst);
if (*id != -1)
{
diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c
index 7fb14e559..8f7fc64c5 100644
--- a/src/modules/mixer/gadget/mixer.c
+++ b/src/modules/mixer/gadget/mixer.c
@@ -672,8 +672,6 @@ mixer_gadget_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient)
inst->o_main = elm_box_add(parent);
inst->orient = orient;
inst->id = *id;
- E_EXPAND(inst->o_main);
- E_FILL(inst->o_main);
evas_object_show(inst->o_main);
evas_object_smart_callback_add(parent, "gadget_created",
_mixer_gadget_created_cb, inst);
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index fcfedec0b..328d089f0 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -742,7 +742,6 @@ batman_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_UNU
inst->cfg = _conf_item_get(id);
*id = inst->cfg->id;
inst->o_main = elm_box_add(parent);
- E_EXPAND(inst->o_main);
evas_object_data_set(inst->o_main, "Instance", inst);
evas_object_smart_callback_add(parent, "gadget_created",
_batman_created_cb, inst);
evas_object_smart_callback_add(parent, "gadget_removed",
_batman_removed_cb, inst);
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index f6000c98b..333d170e8 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -1152,7 +1152,6 @@ cpuclock_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_U
inst->cfg = _conf_item_get(id);
*id = inst->cfg->id;
inst->o_main = elm_box_add(parent);
- E_EXPAND(inst->o_main);
evas_object_data_set(inst->o_main, "Instance", inst);
evas_object_smart_callback_add(parent, "gadget_created",
_cpuclock_created_cb, inst);
evas_object_smart_callback_add(parent, "gadget_removed",
_cpuclock_removed_cb, inst);
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c
b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index a4f13ff94..db22514fa 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -499,7 +499,6 @@ cpumonitor_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA
inst->cfg->cpumonitor.popup = NULL;
inst->cfg->cpumonitor.configure = NULL;
inst->o_main = elm_box_add(parent);
- E_EXPAND(inst->o_main);
evas_object_data_set(inst->o_main, "Instance", inst);
evas_object_smart_callback_add(parent, "gadget_created",
_cpumonitor_created_cb, inst);
evas_object_smart_callback_add(parent, "gadget_removed",
_cpumonitor_removed_cb, inst);
diff --git a/src/modules/sysinfo/memusage/memusage.c
b/src/modules/sysinfo/memusage/memusage.c
index e246fced2..310c736d8 100644
--- a/src/modules/sysinfo/memusage/memusage.c
+++ b/src/modules/sysinfo/memusage/memusage.c
@@ -569,7 +569,6 @@ memusage_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_U
inst->cfg->memusage.popup = NULL;
inst->cfg->memusage.configure = NULL;
inst->o_main = elm_box_add(parent);
- E_EXPAND(inst->o_main);
evas_object_data_set(inst->o_main, "Instance", inst);
evas_object_smart_callback_add(parent, "gadget_created",
_memusage_created_cb, inst);
diff --git a/src/modules/
[EGIT] [core/efl] master 01/01: Netstatus: Use arrows for up and down net traffic indicators.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fa1842370be003a246fe0d9f09fe6aa560714f3a
commit fa1842370be003a246fe0d9f09fe6aa560714f3a
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 20:44:14 2017 -0500
Netstatus: Use arrows for up and down net traffic indicators.
---
data/elementary/themes/edc/netstatus.edc | 44 ++
data/elementary/themes/img/netstatus_base.png | Bin 1339 -> 1975 bytes
data/elementary/themes/img/netstatus_over.png | Bin 1101 -> 180 bytes
data/elementary/themes/img/netstatus_rx.png | Bin 1196 -> 1116 bytes
data/elementary/themes/img/netstatus_tx.png | Bin 1304 -> 1150 bytes
5 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/data/elementary/themes/edc/netstatus.edc
b/data/elementary/themes/edc/netstatus.edc
index 88d8040bc7..53eecc218d 100644
--- a/data/elementary/themes/edc/netstatus.edc
+++ b/data/elementary/themes/edc/netstatus.edc
@@ -14,15 +14,17 @@ group { name: "e/gadget/netstatus/main";
new txper = getarg(6);
// new txmax = getarg(7);
-new Float:val = rxper / 100.0;
-custom_state(PART:"rx_clip", "default", 0.0);
-set_state_val(PART:"rx_clip", STATE_REL1, 0.0, 1.0 - val);
-set_state(PART:"rx_clip", "custom", 0.0);
+new val = rxper + 155;
+if (val == 155) val = 0;
+custom_state(PART:"rx", "default", 0.0);
+set_state_val(PART:"rx", STATE_COLOR, 255, 255, 255, val);
+set_state(PART:"rx", "custom", 0.0);
-val = txper / 100.0;
-custom_state(PART:"tx_clip", "default", 0.0);
-set_state_val(PART:"tx_clip", STATE_REL1, 0.0, 1.0 - val);
-set_state(PART:"tx_clip", "custom", 0.0);
+val = txper + 155;
+if (val == 155) val = 0;
+custom_state(PART:"tx", "default", 0.0);
+set_state_val(PART:"tx", STATE_COLOR, 255, 255, 255, val);
+set_state(PART:"tx", "custom", 0.0);
}
}
}
@@ -34,40 +36,14 @@ group { name: "e/gadget/netstatus/main";
image.normal: "netstatus_base.png";
}
}
- part { name: "rx_spacer"; type: SPACER;
- description { state: "default" 0.0;
-rel1.relative: 0.32 0.33;
-rel2.relative: 0.98 0.78;
- }
- }
- part { name: "rx_clip"; type: RECT;
- description { state: "default" 0.0;
-rel1.to: "rx_spacer";
-rel2.to: "rx_spacer";
- }
- }
part { name: "rx"; type: IMAGE;
- clip_to: "rx_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
image.normal: "netstatus_rx.png";
}
}
- part { name: "tx_spacer"; type: SPACER;
- description { state: "default" 0.0;
-rel1.relative: 0.04 0.08;
-rel2.relative: 0.68 0.50;
- }
- }
- part { name: "tx_clip"; type: RECT;
- description { state: "default" 0.0;
-rel1.to: "tx_spacer";
-rel2.to: "tx_spacer";
- }
- }
part { name: "tx"; type: IMAGE;
- clip_to: "tx_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
diff --git a/data/elementary/themes/img/netstatus_base.png
b/data/elementary/themes/img/netstatus_base.png
index 9c2c55f837..cdc8e20137 100644
Binary files a/data/elementary/themes/img/netstatus_base.png and
b/data/elementary/themes/img/netstatus_base.png differ
diff --git a/data/elementary/themes/img/netstatus_over.png
b/data/elementary/themes/img/netstatus_over.png
index 62d5dcf10c..fdd2f9d900 100644
Binary files a/data/elementary/themes/img/netstatus_over.png and
b/data/elementary/themes/img/netstatus_over.png differ
diff --git a/data/elementary/themes/img/netstatus_rx.png
b/data/elementary/themes/img/netstatus_rx.png
index 2877ff69af..1fa2655a32 100644
Binary files a/data/elementary/themes/img/netstatus_rx.png and
b/data/elementary/themes/img/netstatus_rx.png differ
diff --git a/data/elementary/themes/img/netstatus_tx.png
b/data/elementary/themes/img/netstatus_tx.png
index 1387226652..ef23e11f35 100644
Binary files a/data/elementary/themes/img/netstatus_tx.png and
b/data/elementary/themes/img/netstatus_tx.png differ
--
[EGIT] [core/enlightenment] master 01/01: Backlight: Don't add del callback for demo gadgets.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c3ae81586ce2da9be5a14578f1c7462dba67e10c
commit c3ae81586ce2da9be5a14578f1c7462dba67e10c
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 18:18:22 2017 -0500
Backlight: Don't add del callback for demo gadgets.
---
src/modules/backlight/gadget/backlight.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index 95f6f5682..8e31c410a 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -282,10 +282,11 @@ backlight_gadget_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orien
E_EXPAND(inst->o_main);
E_FILL(inst->o_main);
evas_object_smart_callback_add(parent, "gadget_created",
_backlight_gadget_created_cb, inst);
- evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL,
backlight_del, inst);
-
if (*id != -1)
- ginstances = eina_list_append(ginstances, inst);
+ {
+evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL,
backlight_del, inst);
+ginstances = eina_list_append(ginstances, inst);
+ }
return inst->o_main;
}
--
[EGIT] [core/enlightenment] master 01/02: Backlight: Use a static number for demo purposes.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=062664d839f6d98f5d7206301d4dc4e43212c77a
commit 062664d839f6d98f5d7206301d4dc4e43212c77a
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 11:10:48 2017 -0500
Backlight: Use a static number for demo purposes.
---
src/modules/backlight/gadget/backlight.c | 16 +---
src/modules/backlight/gadget/mod.c | 2 --
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index e2966db23..c37e54817 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -20,7 +20,10 @@ _backlight_gadget_update(Instance *inst)
{
Edje_Message_Float msg;
- msg.val = inst->val;
+ if (EINA_FLT_EQ(inst->val, -1.0))
+ msg.val = .75;
+ else
+ msg.val = inst->val;
if (msg.val < 0.0) msg.val = 0.0;
else if (msg.val > 1.0) msg.val = 1.0;
edje_object_message_send(elm_layout_edje_get(inst->o_backlight),
EDJE_MESSAGE_FLOAT, 0, );
@@ -244,7 +247,8 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj,
void *event_info EINA
inst);
elm_box_pack_end(inst->o_main, inst->o_backlight);
evas_object_show(inst->o_backlight);
-inst->val = e_backlight_level_get(e_zone_current_get());
+if (!EINA_FLT_EQ(inst->val, -1.0))
+ inst->val = e_backlight_level_get(e_zone_current_get());
_backlight_gadget_update(inst);
}
evas_object_smart_callback_del_full(obj, "gadget_created",
_backlight_gadget_created_cb, data);
@@ -257,18 +261,24 @@ backlight_del(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, voi
if (inst->popup)
elm_ctxpopup_dismiss(inst->popup);
+ backlight_shutdown();
ginstances = eina_list_remove(ginstances, inst);
free(inst);
}
EINTERN Evas_Object *
-backlight_gadget_create(Evas_Object *parent, int *id EINA_UNUSED,
E_Gadget_Site_Orient orient)
+backlight_gadget_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient
orient)
{
Instance *inst;
inst = E_NEW(Instance, 1);
inst->o_main = elm_box_add(parent);
inst->orient = orient;
+ if (*id != -1)
+ backlight_init();
+ else
+ inst->val = -1.0;
+
E_EXPAND(inst->o_main);
E_FILL(inst->o_main);
evas_object_smart_callback_add(parent, "gadget_created",
_backlight_gadget_created_cb, inst);
diff --git a/src/modules/backlight/gadget/mod.c
b/src/modules/backlight/gadget/mod.c
index 7025dfeb6..f27ca80d4 100644
--- a/src/modules/backlight/gadget/mod.c
+++ b/src/modules/backlight/gadget/mod.c
@@ -3,7 +3,6 @@
EINTERN void *
e_modapi_gadget_init(E_Module *m)
{
- backlight_init();
e_gadget_type_add("Backlight", backlight_gadget_create, NULL);
return m;
}
@@ -11,7 +10,6 @@ e_modapi_gadget_init(E_Module *m)
EINTERN int
e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
{
- backlight_shutdown();
e_gadget_type_del("Backlight");
return 1;
}
--
[EGIT] [core/enlightenment] master 02/02: Mixer Gadget: Use demo gadget in places where demo gadgets are used.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0332eca3c7f2ed446f93d8987a82296dccc2b663
commit 0332eca3c7f2ed446f93d8987a82296dccc2b663
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 11:54:52 2017 -0500
Mixer Gadget: Use demo gadget in places where demo gadgets are used.
---
src/modules/backlight/gadget/backlight.c | 3 ++-
src/modules/mixer/gadget/mixer.c | 29 ++---
src/modules/mixer/gadget/mod.c | 15 +--
3 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index c37e54817..95f6f5682 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -284,7 +284,8 @@ backlight_gadget_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orien
evas_object_smart_callback_add(parent, "gadget_created",
_backlight_gadget_created_cb, inst);
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL,
backlight_del, inst);
- ginstances = eina_list_append(ginstances, inst);
+ if (*id != -1)
+ ginstances = eina_list_append(ginstances, inst);
return inst->o_main;
}
diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c
index 22d5f322d..806cb46e9 100644
--- a/src/modules/mixer/gadget/mixer.c
+++ b/src/modules/mixer/gadget/mixer.c
@@ -39,6 +39,7 @@ struct _Context
typedef struct _Instance Instance;
struct _Instance
{
+ int id;
Evas_Object *o_main;
Evas_Object *o_mixer;
Evas_Object *popup;
@@ -626,8 +627,22 @@ _mixer_gadget_created_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNU
_mixer_resize_cb, inst);
elm_box_pack_end(inst->o_main, inst->o_mixer);
evas_object_show(inst->o_mixer);
-gmixer_context->instances =
eina_list_append(gmixer_context->instances, inst);
-_mixer_gadget_update();
+if (inst->id != -1)
+ gmixer_context->instances =
eina_list_append(gmixer_context->instances, inst);
+if (inst->id == -1)
+ {
+ Edje_Message_Int_Set *msg;
+
+ msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
+ msg->count = 3;
+ msg->val[0] = EINA_FALSE;
+ msg->val[1] = 60;
+ msg->val[2] = 60;
+ edje_object_message_send(elm_layout_edje_get(inst->o_mixer),
EDJE_MESSAGE_INT_SET, 0, msg);
+ elm_layout_signal_emit(inst->o_mixer, "e,action,volume,change",
"e");
+ }
+else
+ _mixer_gadget_update();
}
evas_object_smart_callback_del_full(obj, "gadget_created",
_mixer_gadget_created_cb, data);
}
@@ -642,13 +657,21 @@ mixer_del(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *e
}
EINTERN Evas_Object *
-mixer_gadget_create(Evas_Object *parent, int *id EINA_UNUSED,
E_Gadget_Site_Orient orient)
+mixer_gadget_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient)
{
Instance *inst;
+ if (*id != -1)
+ {
+EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init(), NULL);
+
+if (!mixer_init())
+ return NULL;
+ }
inst = E_NEW(Instance, 1);
inst->o_main = elm_box_add(parent);
inst->orient = orient;
+ inst->id = *id;
E_EXPAND(inst->o_main);
E_FILL(inst->o_main);
evas_object_show(inst->o_main);
diff --git a/src/modules/mixer/gadget/mod.c b/src/modules/mixer/gadget/mod.c
index 333ddf241..d815ebacd 100644
--- a/src/modules/mixer/gadget/mod.c
+++ b/src/modules/mixer/gadget/mod.c
@@ -5,23 +5,11 @@ EINTERN int _e_gemix_log_domain;
EINTERN void *
e_modapi_gadget_init(E_Module *m)
{
- Eina_Bool loaded = EINA_FALSE;
-
_e_gemix_log_domain = eina_log_domain_register("mixer_gadget",
EINA_COLOR_RED);
- EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init(), NULL);
-
- loaded = mixer_init();
- if (!loaded)
- goto err;
-
e_gadget_type_add("Mixer", mixer_gadget_create, NULL);
return m;
-err:
-// emix_config_shutdown();
- emix_shutdown();
- return NULL;
}
EINTERN int
@@ -31,9 +19,8 @@ e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
e_gadget_type_del("Mixer");
-
emix_shutdown();
-// emix_config_shutdown();
+
return 1;
}
--
[EGIT] [core/enlightenment] master 02/02: Sysinfo Gadgets: Provide only demo data and don't poll/thread when gadgets are in demo mode.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=993f8ad519c99948444bf84cf2f9576a76390a99
commit 993f8ad519c99948444bf84cf2f9576a76390a99
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 10:23:20 2017 -0500
Sysinfo Gadgets: Provide only demo data and don't poll/thread when gadgets
are in demo mode.
This fixes T5816
---
src/modules/sysinfo/batman/batman.c | 5 +
src/modules/sysinfo/cpuclock/cpuclock.c | 8
src/modules/sysinfo/cpumonitor/cpumonitor.c | 31 -
src/modules/sysinfo/memusage/memusage.c | 7 +++
src/modules/sysinfo/netstatus/netstatus.c | 13
src/modules/sysinfo/thermal/thermal.c | 5 +
6 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index 79e06fa83..fcfedec0b 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -390,6 +390,11 @@ _batman_config_updated(Instance *inst)
if (!inst->cfg) return;
+ if (inst->cfg->id == -1)
+ {
+_batman_face_level_set(inst->cfg->batman.o_gadget, .60);
+return;
+ }
if ((inst->cfg->batman.force_mode == UNKNOWN) ||
(inst->cfg->batman.force_mode == SUBSYSTEM))
{
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index d446ca255..f6000c98b 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -364,6 +364,14 @@ _cpuclock_config_updated(Instance *inst)
int i;
unsigned int count;
+ if (inst->cfg->id == -1)
+ {
+inst->cfg->cpuclock.status->cur_frequency = 3.0;
+inst->cfg->cpuclock.status->can_set_frequency = 1;
+inst->cfg->cpuclock.status->cur_min_frequency = 0.5;
+inst->cfg->cpuclock.status->cur_max_frequency = 3.5;
+return;
+ }
if (inst->cfg->cpuclock.status->frequencies)
{
count = eina_list_count(inst->cfg->cpuclock.status->frequencies);
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c
b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index 526c5f6c3..a4f13ff94 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -262,7 +262,36 @@ _cpumonitor_config_updated(Instance *inst)
Thread_Config *thc;
CPU_Core *core;
int i = 0;
-
+
+ if (inst->cfg->id == -1)
+ {
+int percent = 15;
+thc = E_NEW(Thread_Config, 1);
+if (thc)
+ {
+ thc->inst = inst;
+ thc->total = 0;
+ thc->idle = 0;
+ thc->percent = 60;
+ for (i = 0; i < 4; i++)
+ {
+ core = E_NEW(CPU_Core, 1);
+ core->layout = _cpumonitor_add_layout(inst);
+ if (i == 0)
+evas_object_event_callback_add(core->layout,
EVAS_CALLBACK_RESIZE, _cpumonitor_resize_cb, inst);
+ core->percent = percent;
+ core->total = 0;
+ core->idle = 0;
+ thc->cores = eina_list_append(thc->cores, core);
+ percent += 15;
+ }
+ _cpumonitor_face_update(thc);
+ EINA_LIST_FREE(thc->cores, core)
+ E_FREE(core);
+ E_FREE(thc);
+ }
+ return;
+ }
if (!ecore_thread_check(inst->cfg->cpumonitor.usage_check_thread))
{
_cpumonitor_del_layouts(inst);
diff --git a/src/modules/sysinfo/memusage/memusage.c
b/src/modules/sysinfo/memusage/memusage.c
index 9b1478172..e246fced2 100644
--- a/src/modules/sysinfo/memusage/memusage.c
+++ b/src/modules/sysinfo/memusage/memusage.c
@@ -358,6 +358,13 @@ _memusage_config_updated(Instance *inst)
{
Thread_Config *thc;
+ if (inst->cfg->id == -1)
+ {
+inst->cfg->memusage.mem_percent = 75;
+inst->cfg->memusage.swp_percent = 30;
+_memusage_face_update(inst);
+ return;
+ }
if (inst->cfg->memusage.usage_check_thread)
{
ecore_thread_cancel(inst->cfg->memusage.usage_check_thread);
diff --git a/src/modules/sysinfo/netstatus/netstatus.c
b/src/modules/sysinfo/netstatus/netstatus.c
index 2092674ea..ac4259d07 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -237,6 +237,19 @@ _netstatus_config_updated(Instance *inst)
{
Thread_Config *thc;
+ if (inst->cfg->id == -1)
+ {
+thc = E_NEW(Thread_Config, 1);
+if (thc)
+ {
+ thc->inst = inst;
+ thc->inpercent = 75;
+ thc->outpercent = 30;
+
[EGIT] [core/enlightenment] master 01/02: CPUMonitor: Don't try and delete objects after the gadget has been removed.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=12b8f482ed49d92613a0b411de5687bfa43ccc7f
commit 12b8f482ed49d92613a0b411de5687bfa43ccc7f
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Aug 22 09:38:02 2017 -0500
CPUMonitor: Don't try and delete objects after the gadget has been removed.
This fixes T5816
---
src/modules/sysinfo/cpumonitor/cpumonitor.c | 25 -
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c
b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index f10aae031..526c5f6c3 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -200,10 +200,7 @@ _cpumonitor_cb_usage_check_end(void *data, Ecore_Thread
*th EINA_UNUSED)
e_powersave_sleeper_free(thc->sleeper);
EINA_LIST_FREE(thc->cores, core)
- {
-evas_object_del(core->layout);
-E_FREE(core);
- }
+ E_FREE(core);
E_FREE(thc);
}
@@ -229,15 +226,22 @@ _cpumonitor_add_layout(Instance *inst)
return layout;
}
+static void
+_cpumonitor_del_layouts(Instance *inst)
+{
+ elm_box_clear(inst->cfg->cpumonitor.o_gadget_box);
+}
+
static Eina_Bool
_screensaver_on(void *data)
{
Instance *inst = data;
- if (inst->cfg->cpumonitor.usage_check_thread)
+ if (!ecore_thread_check(inst->cfg->cpumonitor.usage_check_thread))
{
+_cpumonitor_del_layouts(inst);
ecore_thread_cancel(inst->cfg->cpumonitor.usage_check_thread);
-inst->cfg->cpumonitor.usage_check_thread = NULL;
+ inst->cfg->cpumonitor.usage_check_thread = NULL;
}
return ECORE_CALLBACK_RENEW;
}
@@ -259,8 +263,9 @@ _cpumonitor_config_updated(Instance *inst)
CPU_Core *core;
int i = 0;
- if (inst->cfg->cpumonitor.usage_check_thread)
+ if (!ecore_thread_check(inst->cfg->cpumonitor.usage_check_thread))
{
+_cpumonitor_del_layouts(inst);
ecore_thread_cancel(inst->cfg->cpumonitor.usage_check_thread);
inst->cfg->cpumonitor.usage_check_thread = NULL;
}
@@ -315,8 +320,9 @@ _cpumonitor_removed_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_dat
evas_object_smart_callback_del_full(e_gadget_site_get(inst->o_main),
"gadget_removed",
_cpumonitor_removed_cb, inst);
evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL,
sysinfo_cpumonitor_remove, data);
- if (inst->cfg->cpumonitor.usage_check_thread)
+ if (!ecore_thread_check(inst->cfg->cpumonitor.usage_check_thread))
{
+_cpumonitor_del_layouts(inst);
ecore_thread_cancel(inst->cfg->cpumonitor.usage_check_thread);
inst->cfg->cpumonitor.usage_check_thread = NULL;
}
@@ -339,8 +345,9 @@ sysinfo_cpumonitor_remove(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA
E_FREE_FUNC(inst->cfg->cpumonitor.configure, evas_object_del);
EINA_LIST_FREE(inst->cfg->cpumonitor.handlers, handler)
ecore_event_handler_del(handler);
- if (inst->cfg->cpumonitor.usage_check_thread)
+ if (!ecore_thread_check(inst->cfg->cpumonitor.usage_check_thread))
{
+_cpumonitor_del_layouts(inst);
ecore_thread_cancel(inst->cfg->cpumonitor.usage_check_thread);
inst->cfg->cpumonitor.usage_check_thread = NULL;
}
--
[EGIT] [apps/ephoto] master 01/02: Ephoto: Removed buggy panes.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=a9ddb8add7352833720a8fb679b1271193265df1
commit a9ddb8add7352833720a8fb679b1271193265df1
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Aug 21 15:58:07 2017 -0500
Ephoto: Removed buggy panes.
---
src/bin/ephoto.h | 2 +-
src/bin/ephoto_config.c| 41 +-
src/bin/ephoto_directory_browser.c | 3 +++
src/bin/ephoto_main.c | 52 +-
src/bin/ephoto_single_browser.c| 43 +++
5 files changed, 70 insertions(+), 71 deletions(-)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 857c03a..8450a09 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -240,6 +240,7 @@ struct _Ephoto_Config
Evas_Object *slide_move;
Evas_Object *show_folders;
Evas_Object *thumb_aspect;
+ Evas_Object *panel_size;
};
struct _Ephoto
@@ -261,7 +262,6 @@ struct _Ephoto
Evas_Object *single_browser;
Evas_Object *slideshow;
Evas_Object *dir_browser;
- Evas_Object *right_menu;
Evas_Object *file_popup;
Eina_Bool folders_toggle;
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 962f4dd..2781547 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -44,6 +44,13 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
ephoto->config->smooth = elm_check_state_get(ephoto->config->smooth_scale);
ephoto->config->folders = elm_check_state_get(ephoto->config->show_folders);
ephoto->config->thumbnail_aspect =
elm_check_state_get(ephoto->config->thumb_aspect);
+ if (elm_spinner_value_get(ephoto->config->panel_size) > 0)
+ {
+ephoto->config->left_size =
(elm_spinner_value_get(ephoto->config->panel_size) / 0.05) * 0.05;
+ephoto->config->right_size =
(elm_spinner_value_get(ephoto->config->panel_size) / 0.05) * 0.05;
+evas_object_size_hint_weight_set(ephoto->dir_browser,
ephoto->config->left_size, EVAS_HINT_EXPAND);
+ }
+
if (elm_spinner_value_get(ephoto->config->slide_time) > 0)
ephoto->config->slideshow_timeout =
elm_spinner_value_get(ephoto->config->slide_time);
@@ -72,7 +79,8 @@ _open_hv_select(void *data, Evas_Object *obj, void
*event_info)
static void
_config_general(Ephoto *ephoto, Evas_Object *parent)
{
- Evas_Object *table, *check, *hoversel, *entry, *label;
+ Evas_Object *table, *check, *hoversel, *entry, *label, *spinner;
+ char buf[PATH_MAX];
table = elm_table_add(parent);
EPHOTO_EXPAND(table);
@@ -121,11 +129,30 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
ephoto->config->thumb_aspect = check;
label = elm_label_add(table);
- elm_object_text_set(label, _("Top Level Directory"));
+ elm_object_text_set(label, _("File Panel Size"));
EPHOTO_ALIGN(label, 0.5, 0.5);
elm_table_pack(table, label, 0, 5, 1, 1);
evas_object_show(label);
+ spinner = elm_spinner_add(table);
+ elm_spinner_editable_set(spinner, EINA_TRUE);
+ snprintf(buf, PATH_MAX, "%%1.2f %s", _("Weight (1.0 Max)"));
+ elm_spinner_label_format_set(spinner, buf);
+ elm_spinner_step_set(spinner, .05);
+ elm_spinner_value_set(spinner, ephoto->config->left_size);
+ elm_spinner_min_max_set(spinner, 0, 1);
+ EPHOTO_EXPAND(spinner);
+ EPHOTO_FILL(spinner);
+ elm_table_pack(table, spinner, 0, 6, 1, 1);
+ evas_object_show(spinner);
+ ephoto->config->panel_size = spinner;
+
+ label = elm_label_add(table);
+ elm_object_text_set(label, _("Top Level Directory"));
+ EPHOTO_ALIGN(label, 0.5, 0.5);
+ elm_table_pack(table, label, 0, 7, 1, 1);
+ evas_object_show(label);
+
hoversel = elm_hoversel_add(table);
elm_hoversel_hover_parent_set(hoversel, ephoto->win);
elm_hoversel_item_add(hoversel, _("Root Directory"), NULL, 0,
@@ -140,7 +167,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
evas_object_data_set(hoversel, "ephoto", ephoto);
EPHOTO_WEIGHT(hoversel, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
EPHOTO_FILL(hoversel);
- elm_table_pack(table, hoversel, 0, 6, 1, 1);
+ elm_table_pack(table, hoversel, 0, 8, 1, 1);
evas_object_show(hoversel);
ephoto->config->open_dir = hoversel;
@@ -153,7 +180,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
ELM_SCROLLER_POLICY_OFF);
EPHOTO_EXPAND(entry);
EPHOTO_FILL(entry);
- elm_table_pack(table, entry, 0, 7, 1, 1);
+ elm_table_pack(table, entry, 0, 9, 1, 1);
evas_object_show(entry);
ephoto->config->open_dir_custom = entry;
}
@@ -422,7 +449,7 @@ _config_bindings(Evas_Object *parent)
"Home: Navigate First"
"Left Arrow: Navigate Previous"
[EGIT] [apps/ephoto] master 02/02: Ephoto: Bump version to 1.5 - A bugfix Release and Bridge from 1.0 to 2.0.
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=01af89d1648de796e598cc4c39c890f27a30c6f9 commit 01af89d1648de796e598cc4c39c890f27a30c6f9 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Mon Aug 21 15:59:36 2017 -0500 Ephoto: Bump version to 1.5 - A bugfix Release and Bridge from 1.0 to 2.0. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3622571..3a95c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([ephoto], [1.0], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([ephoto], [1.5], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([configure.ac]) --
[EGIT] [apps/ephoto] master 01/01: Ephoto: Remove unneccessary header.
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=b76a54bd3ee93fe9d529e577251a1d5fc6b32d1a commit b76a54bd3ee93fe9d529e577251a1d5fc6b32d1a Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Thu Jul 27 12:51:28 2017 -0500 Ephoto: Remove unneccessary header. This fixes compilation and T5761 --- src/bin/ephoto_thumb_browser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index bdfab34..f7fb408 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -1,5 +1,4 @@ #include "ephoto.h" -#include #define ZOOM_MAX512 #define ZOOM_MIN128 --
[EGIT] [core/enlightenment] master 01/01: Netstatus - Fix dupclicate Receiving labels.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=59a6892984ebf91e369aeac86bdfd2fc03d20a88
commit 59a6892984ebf91e369aeac86bdfd2fc03d20a88
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Jul 24 13:53:53 2017 -0500
Netstatus - Fix dupclicate Receiving labels.
---
src/modules/sysinfo/netstatus/netstatus.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/modules/sysinfo/netstatus/netstatus.c
b/src/modules/sysinfo/netstatus/netstatus.c
index 14ee3a918..49e29bd0e 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -165,16 +165,16 @@ _netstatus_cb_usage_check_main(void *data, Ecore_Thread
*th)
eina_stringshare_replace(>instring, rin);
if (!thc->outcurrent)
{
- snprintf(rout, sizeof(rout), "%s: 0 B/s", _("Receiving"));
+ snprintf(rout, sizeof(rout), "%s: 0 B/s", _("Sending"));
}
else
{
if (thc->outcurrent > 1048576)
- snprintf(rout, sizeof(rout), "%s: %.2f MB/s", _("Receiving"),
((float)thc->outcurrent / 1048576));
+ snprintf(rout, sizeof(rout), "%s: %.2f MB/s", _("Sending"),
((float)thc->outcurrent / 1048576));
else if ((thc->outcurrent > 1024) && (thc->outcurrent < 1048576))
- snprintf(rout, sizeof(rout), "%s: %lu KB/s", _("Receiving"),
(thc->outcurrent / 1024));
+ snprintf(rout, sizeof(rout), "%s: %lu KB/s", _("Sending"),
(thc->outcurrent / 1024));
else
- snprintf(rout, sizeof(rout), "%s: %lu B/s", _("Receiving"),
thc->outcurrent);
+ snprintf(rout, sizeof(rout), "%s: %lu B/s", _("Sending"),
thc->outcurrent);
}
eina_stringshare_replace(>outstring, rout);
ecore_thread_feedback(th, NULL);
--
[EGIT] [core/enlightenment] master 03/03: Sysinfo Gadget: More thread vs object lifetime work: Make threads no longer dependent on the main loop objects and vice versa.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=53707933992eee68e17a6101739aff2249390fd8
commit 53707933992eee68e17a6101739aff2249390fd8
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Sat Jul 15 21:31:06 2017 -0500
Sysinfo Gadget: More thread vs object lifetime work: Make threads no longer
dependent on the main loop objects and vice versa.
---
src/modules/sysinfo/batman/batman.c| 15 --
src/modules/sysinfo/batman/batman_config.c | 2 +-
src/modules/sysinfo/batman/batman_fallback.c | 36 ++---
src/modules/sysinfo/batman/batman_sysctl.c | 14 +-
src/modules/sysinfo/batman/batman_udev.c | 8 +-
src/modules/sysinfo/batman/batman_upower.c | 8 +-
src/modules/sysinfo/cpuclock/cpuclock.c| 131 +--
src/modules/sysinfo/cpuclock/cpuclock_config.c | 2 +-
src/modules/sysinfo/cpumonitor/cpumonitor.c| 131 ---
src/modules/sysinfo/cpumonitor/cpumonitor.h| 4 +-
src/modules/sysinfo/cpumonitor/cpumonitor_proc.c | 21 +--
src/modules/sysinfo/cpumonitor/cpumonitor_sysctl.c | 54 +++
src/modules/sysinfo/memusage/memusage.c| 81 ++
src/modules/sysinfo/memusage/memusage_sysctl.c | 4 +-
src/modules/sysinfo/mod.c | 28 +---
src/modules/sysinfo/netstatus/netstatus.c | 175 ++---
src/modules/sysinfo/netstatus/netstatus.h | 8 +-
src/modules/sysinfo/netstatus/netstatus_config.c | 2 +-
src/modules/sysinfo/netstatus/netstatus_proc.c | 96 +--
src/modules/sysinfo/netstatus/netstatus_sysctl.c | 90 ---
src/modules/sysinfo/sysinfo.c | 35 +
src/modules/sysinfo/sysinfo.h | 27 +---
src/modules/sysinfo/thermal/thermal.c | 60 +--
src/modules/sysinfo/thermal/thermal_config.c | 2 +-
src/modules/sysinfo/thermal/thermal_fallback.c | 8 +-
25 files changed, 346 insertions(+), 696 deletions(-)
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index 1af63702d..79e06fa83 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -617,19 +617,6 @@ sysinfo_batman_remove(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNU
(void) inst;
_batman_fallback_stop();
#endif
- inst->cfg->batman.done = EINA_TRUE;
- if (inst->cfg->esm == E_SYSINFO_MODULE_SYSINFO)
- {
-if (inst->cfg->memusage.done && inst->cfg->thermal.done &&
-inst->cfg->netstatus.done && inst->cfg->cpuclock.done &&
inst->cfg->cpumonitor.done)
- {
- sysinfo_config->items = eina_list_remove(sysinfo_config->items,
inst->cfg);
- if (inst->cfg->id >= 0)
-sysinfo_instances = eina_list_remove(sysinfo_instances, inst);
- E_FREE(inst->cfg);
- E_FREE(inst);
- }
- }
}
static void
@@ -678,7 +665,6 @@ sysinfo_batman_create(Evas_Object *parent, Instance *inst)
inst->cfg->batman.time_left = -2;
inst->cfg->batman.have_battery = -2;
inst->cfg->batman.have_power = -2;
- inst->cfg->batman.done = EINA_FALSE;
inst->cfg->batman.o_gadget = elm_layout_add(parent);
e_theme_edje_object_set(inst->cfg->batman.o_gadget,
"base/theme/gadget/batman",
@@ -750,7 +736,6 @@ batman_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_UNU
inst = E_NEW(Instance, 1);
inst->cfg = _conf_item_get(id);
*id = inst->cfg->id;
- inst->cfg->batman.done = EINA_FALSE;
inst->o_main = elm_box_add(parent);
E_EXPAND(inst->o_main);
evas_object_data_set(inst->o_main, "Instance", inst);
diff --git a/src/modules/sysinfo/batman/batman_config.c
b/src/modules/sysinfo/batman/batman_config.c
index 5622c0af4..e08c346ad 100644
--- a/src/modules/sysinfo/batman/batman_config.c
+++ b/src/modules/sysinfo/batman/batman_config.c
@@ -7,7 +7,7 @@ _config_close(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, voi
Instance *inst = bc->inst;
E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del);
- E_FREE_FUNC(bc, free);
+ E_FREE(bc);
e_config_save_queue();
}
diff --git a/src/modules/sysinfo/batman/batman_fallback.c
b/src/modules/sysinfo/batman/batman_fallback.c
index a04980a3c..0b840e9c0 100644
--- a/src/modules/sysinfo/batman/batman_fallback.c
+++ b/src/modules/sysinfo/batman/batman_fallback.c
@@ -277,8 +277,8 @@ linux_sys_class_power_supply_cb_re_init(void *data)
// if (sysev->fd_handler)
// ecore_main_fd_handler_del(sysev->fd_handler);
// if (sysev->fd >= 0) close(sysev->fd
[EGIT] [core/enlightenment] master 02/03: Sysinfo Gadget: Unify define macro checking.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=139045c12023f8af289f769b1e609428319d023e
commit 139045c12023f8af289f769b1e609428319d023e
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Sat Jul 15 11:14:41 2017 -0500
Sysinfo Gadget: Unify define macro checking.
---
src/modules/sysinfo/batman/batman.c| 4 ++--
src/modules/sysinfo/batman/batman.h| 8
src/modules/sysinfo/batman/batman_fallback.c | 2 +-
src/modules/sysinfo/cpuclock/cpuclock.c| 18 +-
src/modules/sysinfo/cpuclock/cpuclock.h| 2 +-
src/modules/sysinfo/cpuclock/cpuclock_config.c | 4 ++--
src/modules/sysinfo/memusage/memusage.c| 4 ++--
src/modules/sysinfo/mod.c | 4 ++--
src/modules/sysinfo/sysinfo.c | 2 +-
src/modules/sysinfo/sysinfo.h | 14 +++---
src/modules/sysinfo/thermal/thermal.h | 4 ++--
src/modules/sysinfo/thermal/thermal_sysctl.c | 10 +-
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index 2d69e49b6..1af63702d 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -605,7 +605,7 @@ sysinfo_batman_remove(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNU
E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del);
EINA_LIST_FREE(inst->cfg->batman.handlers, handler)
ecore_event_handler_del(handler);
-#ifdef HAVE_EEZE
+#if defined(HAVE_EEZE)
_batman_udev_stop(inst);
#elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
|| defined(__NetBSD__)
(void) inst;
@@ -731,7 +731,7 @@ _conf_item_get(int *id)
ci->batman.time_left = -2;
ci->batman.have_battery = -2;
ci->batman.have_power = -2;
-#if defined HAVE_EEZE || defined __OpenBSD__ || defined __NetBSD__
+#if defined(HAVE_EEZE) || defined(__OpenBSD__) || defined(__NetBSD__)
ci->batman.fuzzy = 0;
#endif
ci->batman.desktop_notifications = 0;
diff --git a/src/modules/sysinfo/batman/batman.h
b/src/modules/sysinfo/batman/batman.h
index f40ce6036..1b6684551 100644
--- a/src/modules/sysinfo/batman/batman.h
+++ b/src/modules/sysinfo/batman/batman.h
@@ -27,12 +27,12 @@ struct _Battery
{
Instance *inst;
const char *udi;
-#if defined HAVE_EEZE || defined __OpenBSD__ || defined __DragonFly__ ||
defined __FreeBSD__ || defined __NetBSD__
+#if defined(HAVE_EEZE) || defined(__OpenBSD__) || defined(__DragonFly__) ||
defined(__FreeBSD__) || defined(__NetBSD__)
Ecore_Poller *poll;
#endif
Eina_Bool present:1;
Eina_Bool charging:1;
-#if defined HAVE_EEZE || defined __OpenBSD__ || defined __DragonFly__ ||
defined __FreeBSD__ || defined __NetBSD__
+#if defined(HAVE_EEZE) || defined(__OpenBSD__) || defined(__DragonFly__) ||
defined(__FreeBSD__) || defined(__NetBSD__)
double last_update;
double percent;
double current_charge;
@@ -98,12 +98,12 @@ EINTERN void _batman_device_update(Instance *inst);
EINTERN int _batman_fallback_start(Instance *inst);
EINTERN void _batman_fallback_stop(void);
/* end batman_fallback.c */
-#ifdef HAVE_EEZE
+#if defined(HAVE_EEZE)
/* in batman_udev.c */
EINTERN int _batman_udev_start(Instance *inst);
EINTERN void _batman_udev_stop(Instance *inst);
/* end batman_udev.c */
-#elif !defined __OpenBSD__ && !defined __DragonFly__ && !defined __FreeBSD__
&& !defined __NetBSD__
+#elif !defined(__OpenBSD__) && !defined(__DragonFly__) &&
!defined(__FreeBSD__) && !defined(__NetBSD__)
/* in batman_upower.c */
EINTERN int _batman_upower_start(Instance *inst);
EINTERNvoid _batman_upower_stop(void);
diff --git a/src/modules/sysinfo/batman/batman_fallback.c
b/src/modules/sysinfo/batman/batman_fallback.c
index b6374d700..a04980a3c 100644
--- a/src/modules/sysinfo/batman/batman_fallback.c
+++ b/src/modules/sysinfo/batman/batman_fallback.c
@@ -1,6 +1,6 @@
#include "batman.h"
-#ifdef HAVE_CFBASE_H
+#if defined(HAVE_CFBASE_H)
# include
# include
# include
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index a6a4940c2..35dc7892c 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -69,7 +69,7 @@ _cpuclock_cb_sort(const void *item1, const void *item2)
return 0;
}
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined (__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
static void
_cpuclock_set_thread_frequency(void *data, Ecore_Thread *th EINA_UNUSED)
{
@@ -88,7 +88,7 @@ _cpuclock_set_thread_done(void *data EINA_UNUSED,
Ecore_Thread *th EINA_UNUSED)
void
_cpuclock_set_governor(const char *governor)
{
-#if defined __FreeBSD__ || defined __OpenBSD__
+#if de
[EGIT] [core/enlightenment] master 01/01: Sysinfo Gadget: Thread Lifetime vs Object Lifetime management.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=804f038f71cb0976ea7b1c012ed286f85e6796e9
commit 804f038f71cb0976ea7b1c012ed286f85e6796e9
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Jul 13 19:16:50 2017 -0500
Sysinfo Gadget: Thread Lifetime vs Object Lifetime management.
This cleans up how sysinfo manages object vs thread lifetimes. If thread
is still alive dependent on aspects that need to be freed in the gadget removal
process, it defers that cleanup from the remove callback to the thread end
callback. As for the combination sysinfo gadget, each gadget inside of sysinfo
will set a done flag alerting that the cleanup of the combination gadget can
happen once all threads are done.
This fixes T5694
---
src/modules/sysinfo/batman/batman.c | 20
src/modules/sysinfo/cpuclock/cpuclock.c | 78 +++-
src/modules/sysinfo/cpumonitor/cpumonitor.c | 74 +--
src/modules/sysinfo/memusage/memusage.c | 72 --
src/modules/sysinfo/mod.c | 11
src/modules/sysinfo/netstatus/netstatus.c | 72 --
src/modules/sysinfo/sysinfo.c | 30 +--
src/modules/sysinfo/sysinfo.h | 11
src/modules/sysinfo/thermal/thermal.c | 79 ++---
9 files changed, 405 insertions(+), 42 deletions(-)
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index 9cd9e87fd..e4877f73a 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -579,9 +579,14 @@ _batman_removed_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_data)
#endif
evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL,
sysinfo_batman_remove, data);
+ evas_object_smart_callback_del_full(e_gadget_site_get(inst->o_main),
"gadget_removed",
+ _batman_removed_cb, inst);
sysinfo_config->items = eina_list_remove(sysinfo_config->items, inst->cfg);
+ if (inst->cfg->id >= 0)
+ sysinfo_instances = eina_list_remove(sysinfo_instances, inst);
E_FREE(inst->cfg);
+ E_FREE(inst);
}
void
@@ -608,6 +613,19 @@ sysinfo_batman_remove(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNU
(void) inst;
_batman_fallback_stop();
#endif
+ inst->cfg->batman.done = EINA_TRUE;
+ if (inst->cfg->esm == E_SYSINFO_MODULE_SYSINFO)
+ {
+if (inst->cfg->memusage.done && inst->cfg->thermal.done &&
+inst->cfg->netstatus.done && inst->cfg->cpuclock.done &&
inst->cfg->cpumonitor.done)
+ {
+ sysinfo_config->items = eina_list_remove(sysinfo_config->items,
inst->cfg);
+ if (inst->cfg->id >= 0)
+sysinfo_instances = eina_list_remove(sysinfo_instances, inst);
+ E_FREE(inst->cfg);
+ E_FREE(inst);
+ }
+ }
}
static void
@@ -656,6 +674,7 @@ sysinfo_batman_create(Evas_Object *parent, Instance *inst)
inst->cfg->batman.time_left = -2;
inst->cfg->batman.have_battery = -2;
inst->cfg->batman.have_power = -2;
+ inst->cfg->batman.done = EINA_FALSE;
inst->cfg->batman.o_gadget = elm_layout_add(parent);
e_theme_edje_object_set(inst->cfg->batman.o_gadget,
"base/theme/gadget/batman",
@@ -727,6 +746,7 @@ batman_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_UNU
inst = E_NEW(Instance, 1);
inst->cfg = _conf_item_get(id);
*id = inst->cfg->id;
+ inst->cfg->batman.done = EINA_FALSE;
inst->o_main = elm_box_add(parent);
E_EXPAND(inst->o_main);
evas_object_data_set(inst->o_main, "Instance", inst);
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index bf054fbd5..35f6b99ca 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -880,6 +880,36 @@ _cpuclock_cb_frequency_check_end(void *data, Ecore_Thread
*th EINA_UNUSED)
{
Thread_Config *thc = data;
e_powersave_sleeper_free(thc->sleeper);
+ if (thc->inst->cfg->cpuclock.defer)
+ {
+if (thc->inst->cfg->cpuclock.handler)
+ ecore_event_handler_del(thc->inst->cfg->cpuclock.handler);
+if (thc->inst->cfg->cpuclock.governor)
+ eina_stringshare_del(thc->inst->cfg->cpuclock.governor);
+E_FREE_FUNC(thc->inst->cfg->cpuclock.status, _cpuclock_status_free);
+thc->inst->cfg->cpuclock.defer = EINA_FALSE;
+thc->inst->cfg->cpuclock.done = EINA_TRUE;
+if (thc->inst->cfg->esm
[EGIT] [core/enlightenment] master 02/02: Sysinfo Gadgets: Thread handling improvement. Pause on Screensaver. Follow powersave.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=739c1aa4b84d4c5cd406adec19f66407c8a0ac22
commit 739c1aa4b84d4c5cd406adec19f66407c8a0ac22
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Jul 13 14:36:09 2017 -0500
Sysinfo Gadgets: Thread handling improvement. Pause on Screensaver. Follow
powersave.
---
src/modules/sysinfo/batman/batman.c | 44 +++-
src/modules/sysinfo/cpuclock/cpuclock.c | 52 +---
src/modules/sysinfo/cpumonitor/cpumonitor.c | 63 +++--
src/modules/sysinfo/memusage/memusage.c | 57 +-
src/modules/sysinfo/netstatus/netstatus.c | 47 -
src/modules/sysinfo/sysinfo.h | 6 +++
src/modules/sysinfo/thermal/thermal.c | 47 +++--
7 files changed, 301 insertions(+), 15 deletions(-)
diff --git a/src/modules/sysinfo/batman/batman.c
b/src/modules/sysinfo/batman/batman.c
index f44731a60..9cd9e87fd 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -351,6 +351,34 @@ _batman_device_update(Instance *inst)
_batman_update(inst, full, time_left, have_battery, have_power);
}
+static Eina_Bool
+_screensaver_on(void *data)
+{
+ Instance *inst = data;
+
+#if defined(HAVE_EEZE)
+ _batman_udev_stop(inst);
+#elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
|| defined(__NetBSD__)
+ _batman_sysctl_stop();
+#elif defined(upower)
+ _batman_upower_stop();
+#else
+ _batman_fallback_stop();
+#endif
+
+ return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_screensaver_off(void *data)
+{
+ Instance *inst = data;
+
+ _batman_config_updated(inst);
+
+ return ECORE_CALLBACK_RENEW;
+}
+
void
_batman_config_updated(Instance *inst)
{
@@ -529,6 +557,7 @@ static void
_batman_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data)
{
Instance *inst = data;
+ Ecore_Event_Handler *handler;
if (inst->o_main != event_data) return;
if (_handler)
@@ -537,6 +566,8 @@ _batman_removed_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_data)
E_FREE_FUNC(inst->cfg->batman.popup, evas_object_del);
if (inst->cfg->batman.configure)
E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del);
+ EINA_LIST_FREE(inst->cfg->batman.handlers, handler)
+ ecore_event_handler_del(handler);
#if defined(HAVE_EEZE)
_batman_udev_stop(inst);
#elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
|| defined(__NetBSD__)
@@ -557,11 +588,14 @@ void
sysinfo_batman_remove(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_data EINA_UNUSED)
{
Instance *inst = data;
+ Ecore_Event_Handler *handler;
if (inst->cfg->batman.popup)
E_FREE_FUNC(inst->cfg->batman.popup, evas_object_del);
if (inst->cfg->batman.configure)
E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del);
+ EINA_LIST_FREE(inst->cfg->batman.handlers, handler)
+ ecore_event_handler_del(handler);
#ifdef HAVE_EEZE
_batman_udev_stop(inst);
#elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
|| defined(__NetBSD__)
@@ -608,6 +642,10 @@ _batman_created_cb(void *data, Evas_Object *obj, void
*event_data EINA_UNUSED)
_powersave_cb_config_update, inst);
evas_object_show(inst->cfg->batman.o_gadget);
evas_object_smart_callback_del_full(obj, "gadget_created",
_batman_created_cb, data);
+
+ E_LIST_HANDLER_APPEND(inst->cfg->batman.handlers, E_EVENT_SCREENSAVER_ON,
_screensaver_on, inst);
+ E_LIST_HANDLER_APPEND(inst->cfg->batman.handlers, E_EVENT_SCREENSAVER_OFF,
_screensaver_off, inst);
+
_batman_config_updated(inst);
}
@@ -631,6 +669,10 @@ sysinfo_batman_create(Evas_Object *parent, Instance *inst)
_handler = ecore_event_handler_add(E_EVENT_POWERSAVE_CONFIG_UPDATE,
_powersave_cb_config_update, inst);
evas_object_show(inst->cfg->batman.o_gadget);
+
+ E_LIST_HANDLER_APPEND(inst->cfg->batman.handlers, E_EVENT_SCREENSAVER_ON,
_screensaver_on, inst);
+ E_LIST_HANDLER_APPEND(inst->cfg->batman.handlers, E_EVENT_SCREENSAVER_OFF,
_screensaver_off, inst);
+
_batman_config_updated(inst);
return inst->cfg->batman.o_gadget;
@@ -691,7 +733,7 @@ batman_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_UNU
evas_object_smart_callback_add(parent, "gadget_created",
_batman_created_cb, inst);
evas_object_smart_callback_add(parent, "gadget_removed",
_batman_removed_cb, inst);
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL,
sysinfo_batman_remove, inst);
- evas_object_show(inst->o_main);
+ evas_object_show(in
[EGIT] [core/enlightenment] master 01/02: Gitignore the sysfs frequency bin.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=abfc0e82107c5f5028f9dbc597348429f66bd96d commit abfc0e82107c5f5028f9dbc597348429f66bd96d Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Thu Jul 13 14:24:02 2017 -0500 Gitignore the sysfs frequency bin. --- src/modules/sysinfo/cpuclock/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/sysinfo/cpuclock/.gitignore b/src/modules/sysinfo/cpuclock/.gitignore new file mode 100644 index 0..7f5758ce0 --- /dev/null +++ b/src/modules/sysinfo/cpuclock/.gitignore @@ -0,0 +1 @@ +cpuclock_sysfs --
[EGIT] [admin/devs] master 01/01: Okra: Update info
okra pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a77ac9d350da3370e9434e85aaacd2298ed64ae2 commit a77ac9d350da3370e9434e85aaacd2298ed64ae2 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Thu Jul 13 11:19:27 2017 -0500 Okra: Update info --- developers/okra/info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/okra/info.txt b/developers/okra/info.txt index fc06156..15e15f8 100644 --- a/developers/okra/info.txt +++ b/developers/okra/info.txt @@ -8,5 +8,5 @@ WWW:http://www.smhouston.us Managing: Ephoto Contributing: E, EFL, Elementary Group: Core, Applications, Libraries -Platform: Arch (Linux) +Platform: Fedora (Linux) GeoData: 32.470378 -90.085144 --
[EGIT] [core/enlightenment] master 01/01: Backlight Gadget: No need for a settings button as the uniform right click does the same.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0b6c8a4d91c14a8059880c2d6d134cf96e21242c
commit 0b6c8a4d91c14a8059880c2d6d134cf96e21242c
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Jul 13 11:12:58 2017 -0500
Backlight Gadget: No need for a settings button as the uniform right click
does the same.
---
src/modules/backlight/gadget/backlight.c | 21 +
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index fafb2540e..e2966db23 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -41,14 +41,6 @@ _backlight_level_set(Instance *inst, double val, Eina_Bool
set_slider)
}
static void
-_backlight_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_data EINA_UNUSED)
-{
- Instance *inst = data;
- e_gadget_configure(inst->o_main);
- elm_ctxpopup_dismiss(inst->popup);
-}
-
-static void
_slider_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Instance *inst = data;
@@ -74,7 +66,7 @@ _backlight_popup_deleted(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_
static void
_backlight_popup_new(Instance *inst)
{
- Evas_Object *ic, *o;
+ Evas_Object *o;
if (inst->popup) return;
@@ -108,17 +100,6 @@ _backlight_popup_new(Instance *inst)
evas_object_show(o);
inst->o_slider = o;
- ic = elm_icon_add(inst->box);
- elm_icon_standard_set(ic, "preferences-system");
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- evas_object_show(ic);
-
- o = elm_button_add(inst->box);
- elm_object_part_content_set(o, "icon", ic);
- evas_object_smart_callback_add(o, "clicked", _backlight_settings_cb, inst);
- elm_box_pack_end(inst->box, o);
- evas_object_show(o);
-
e_gadget_util_ctxpopup_place(inst->o_main, inst->popup, inst->o_backlight);
evas_object_show(inst->popup);
}
--
[EGIT] [core/enlightenment] master 01/01: Cpuclock: Don't debug print the exec string.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=392d12bafdcd228bb63b2b76dd687f17d38af0cc
commit 392d12bafdcd228bb63b2b76dd687f17d38af0cc
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 16:07:58 2017 -0500
Cpuclock: Don't debug print the exec string.
---
src/modules/sysinfo/cpuclock/cpuclock.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index f37d349d8..0047373f8 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -89,12 +89,10 @@ _cpuclock_set_governor(const char *governor)
snprintf(exe, 4096, "%s/%s/cpuclock_sysfs",
e_module_dir_get(sysinfo_config->module), MODULE_ARCH);
- printf("%s\n", exe);
if (stat(exe, ) < 0) return;
snprintf(buf, sizeof(buf),
"%s %s %s", exe, "governor", governor);
- printf("%s\n", buf);
system(buf);
}
--
[EGIT] [core/enlightenment] master 01/01: Gadgets: Make sure to avoid conflicts with functions and globals.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9e7b78ffabf588c096ceba18a9069b1bd58ecaea
commit 9e7b78ffabf588c096ceba18a9069b1bd58ecaea
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 16:03:06 2017 -0500
Gadgets: Make sure to avoid conflicts with functions and globals.
---
src/modules/backlight/gadget/backlight.h| 2 --
src/modules/backlight/gadget/mod.c | 3 ---
src/modules/luncher/luncher.h | 4 ++--
src/modules/mixer/gadget/mixer.c| 1 -
src/modules/mixer/gadget/mixer.h| 3 +--
src/modules/mixer/gadget/mod.c | 3 ---
src/modules/pager/gadget/mod.c | 3 ---
src/modules/pager/gadget/pager.h| 7 +++
src/modules/sysinfo/batman/batman.h | 28 ++--
src/modules/sysinfo/batman/batman_sysctl.c | 4 ++--
src/modules/sysinfo/batman/batman_udev.c| 6 +++---
src/modules/sysinfo/batman/batman_upower.c | 6 +++---
src/modules/sysinfo/cpuclock/cpuclock.h | 12 ++--
src/modules/sysinfo/cpumonitor/cpumonitor.h | 12 ++--
src/modules/sysinfo/memusage/memusage.h | 8
src/modules/sysinfo/netstatus/netstatus.h | 12 ++--
src/modules/sysinfo/sysinfo.h | 4 ++--
src/modules/sysinfo/thermal/thermal.h | 10 +-
src/modules/xkbswitch/gadget/xkbswitch.h| 2 +-
19 files changed, 58 insertions(+), 72 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.h
b/src/modules/backlight/gadget/backlight.h
index 7b26537fc..a6cfd1aed 100644
--- a/src/modules/backlight/gadget/backlight.h
+++ b/src/modules/backlight/gadget/backlight.h
@@ -11,6 +11,4 @@ EINTERN Evas_Object *backlight_gadget_create(Evas_Object
*parent, int *id EINA_U
EINTERN void backlight_init(void);
EINTERN void backlight_shutdown(void);
-extern E_Module *gm;
-
#endif
diff --git a/src/modules/backlight/gadget/mod.c
b/src/modules/backlight/gadget/mod.c
index 4e618250f..7025dfeb6 100644
--- a/src/modules/backlight/gadget/mod.c
+++ b/src/modules/backlight/gadget/mod.c
@@ -1,11 +1,8 @@
#include "backlight.h"
-E_Module *gm;
-
EINTERN void *
e_modapi_gadget_init(E_Module *m)
{
- gm = m;
backlight_init();
e_gadget_type_add("Backlight", backlight_gadget_create, NULL);
return m;
diff --git a/src/modules/luncher/luncher.h b/src/modules/luncher/luncher.h
index e64ce7f22..e79701522 100644
--- a/src/modules/luncher/luncher.h
+++ b/src/modules/luncher/luncher.h
@@ -112,7 +112,7 @@ EINTERN Evas_Object *grid_create(Evas_Object *parent, int
*id, E_Gadget_Site_Ori
EINTERN void grid_reorder(Instance *inst);
EINTERN void grid_recalculate(Instance *inst);
-extern Config *luncher_config;
-extern Eina_List *luncher_instances;
+EINTERN extern Config *luncher_config;
+EINTERN extern Eina_List *luncher_instances;
#endif
diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c
index c68c0e197..04a8c5304 100644
--- a/src/modules/mixer/gadget/mixer.c
+++ b/src/modules/mixer/gadget/mixer.c
@@ -1269,7 +1269,6 @@ mixer_init(void)
gmixer_context->desklock_handler =
ecore_event_handler_add(E_EVENT_DESKLOCK, _desklock_cb, NULL);
-gmixer_context->module = gm;
snprintf(buf, sizeof(buf), "%s/mixer.edj",
e_module_dir_get(gmixer_context->module));
gmixer_context->theme = strdup(buf);
diff --git a/src/modules/mixer/gadget/mixer.h b/src/modules/mixer/gadget/mixer.h
index 014a0e528..bb9ece15a 100644
--- a/src/modules/mixer/gadget/mixer.h
+++ b/src/modules/mixer/gadget/mixer.h
@@ -10,8 +10,7 @@ EINTERN void *e_modapi_gadget_init(E_Module *m);
EINTERN int e_modapi_gadget_shutdown(E_Module *m);
EINTERN int e_modapi_gadget_save(E_Module *m);
-extern int _e_gemix_log_domain;
-extern E_Module *gm;
+EINTERN extern int _e_gemix_log_domain;
#undef GDBG
#undef GINF
diff --git a/src/modules/mixer/gadget/mod.c b/src/modules/mixer/gadget/mod.c
index 80daabf7c..52e685c39 100644
--- a/src/modules/mixer/gadget/mod.c
+++ b/src/modules/mixer/gadget/mod.c
@@ -1,7 +1,6 @@
#include "mixer.h"
int _e_gemix_log_domain;
-E_Module *gm;
EINTERN void *
e_modapi_gadget_init(E_Module *m)
@@ -12,8 +11,6 @@ e_modapi_gadget_init(E_Module *m)
EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init(), NULL);
- gm = m;
-
loaded = mixer_init();
if (!loaded)
goto err;
diff --git a/src/modules/pager/gadget/mod.c b/src/modules/pager/gadget/mod.c
index c593c54ba..cb7687d6d 100644
--- a/src/modules/pager/gadget/mod.c
+++ b/src/modules/pager/gadget/mod.c
@@ -1,7 +1,6 @@
#include "pager.h"
static E_Config_DD *conf_edd = NULL;
Config *pager_config;
-E_Module *gmodule;
Evas_Object *cfg_dialog;
Eina_List *ginstances, *ghandlers;
@@ -60,8 +59,6 @@ e_modapi_gadget_init(E_Module *m)
E_CONFIG_LIMIT(pager_co
[EGIT] [core/enlightenment] master 03/03: Thermal: Add units.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b93849072a27905819bbb7ccd20819169ddd45e7
commit b93849072a27905819bbb7ccd20819169ddd45e7
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 15:44:01 2017 -0500
Thermal: Add units.
---
src/modules/sysinfo/thermal/thermal.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/modules/sysinfo/thermal/thermal.c
b/src/modules/sysinfo/thermal/thermal.c
index d2e1ddfdf..467c7d6bf 100644
--- a/src/modules/sysinfo/thermal/thermal.c
+++ b/src/modules/sysinfo/thermal/thermal.c
@@ -290,7 +290,6 @@ _thermal_resize_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED
Instance *inst = data;
edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->thermal.o_gadget),
0, 0, , );
- printf("%d x %d\n", w, h);
if (w < 1) w = 1;
if (h < 1) h = 1;
if (inst->cfg->esm == E_SYSINFO_MODULE_THERMAL)
--
[EGIT] [core/enlightenment] master 01/03: CPUClock: Allow setting of governors.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ada1fdb71a48821f9ed369d149c751638c1d6660
commit ada1fdb71a48821f9ed369d149c751638c1d6660
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 15:42:56 2017 -0500
CPUClock: Allow setting of governors.
---
src/modules/Makefile_sysinfo.mk| 21 -
src/modules/sysinfo/cpuclock/cpuclock.c| 107 -
src/modules/sysinfo/cpuclock/cpuclock.h| 3 -
src/modules/sysinfo/cpuclock/cpuclock_config.c | 4 +-
src/modules/sysinfo/cpuclock/cpuclock_sysfs.c | 105
src/modules/sysinfo/mod.c | 2 -
src/modules/sysinfo/sysinfo.h | 1 -
7 files changed, 162 insertions(+), 81 deletions(-)
diff --git a/src/modules/Makefile_sysinfo.mk b/src/modules/Makefile_sysinfo.mk
index 9965321e3..8dfa15d3c 100644
--- a/src/modules/Makefile_sysinfo.mk
+++ b/src/modules/Makefile_sysinfo.mk
@@ -24,7 +24,6 @@ src_modules_sysinfo_module_la_SOURCES =
src/modules/sysinfo/mod.c \
src/modules/sysinfo/thermal/thermal_fallback.c \
src/modules/sysinfo/cpuclock/cpuclock.h \
src/modules/sysinfo/cpuclock/cpuclock.c \
- src/modules/sysinfo/cpuclock/cpuclock_sysfs.c \
src/modules/sysinfo/cpuclock/cpuclock_config.c \
src/modules/sysinfo/cpumonitor/cpumonitor.h \
src/modules/sysinfo/cpumonitor/cpumonitor.c \
@@ -84,7 +83,23 @@ endif
endif
endif
+src_modules_sysinfo_sysfsfreqdir = $(sysinfopkgdir)
+src_modules_sysinfo_sysfsfreq_PROGRAMS =
src/modules/sysinfo/cpuclock/cpuclock_sysfs
+
+src_modules_sysinfo_sysfsfreq_SOURCES =
src/modules/sysinfo/cpuclock/cpuclock_sysfs.c
+src_modules_sysinfo_sysfsfreq_CPPFLAGS = $(MOD_CPPFLAGS) @e_cflags@
@SUID_CFLAGS@
+src_modules_sysinfo_sysfsfreq_LDFLAGS = @SUID_LDFLAGS@
+
+sysfsfreq_setuid_root_mode = a=rx,u+xs
+sysfsfreq_setuid_root_user = root
+
+sysfsfreq-install-data-hook:
+ @chown $(sysfsfreq_setuid_root_user)
$(DESTDIR)$(src_modules_sysinfo_sysfsfreqdir)/cpuclock_sysfs$(EXEEXT) || true
+ @chmod $(sysfsfreq_setuid_root_mode)
$(DESTDIR)$(src_modules_sysinfo_sysfsfreqdir)/cpuclock_sysfs$(EXEEXT) || true
+
+INSTALL_DATA_HOOKS += sysfsfreq-install-data-hook
+
PHONIES += sysinfo install-sysinfo
-sysinfo: $(sysinfopkg_LTLIBRARIES) $(sysinfo_DATA)
-install-sysinfo: install-sysinfoDATA install-sysinfopkgLTLIBRARIES
+sysinfo: $(sysinfopkg_LTLIBRARIES) $(sysinfo_DATA)
$(src_modules_sysinfo_sysfsfreq_PROGRAMS)
+install-sysinfo: install-sysinfoDATA install-sysinfopkgLTLIBRARIES
install-src_modules_sysinfo_sysfsfreqPROGRAMS
endif
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index 0172a5e79..f37d349d8 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -62,38 +62,13 @@ _cpuclock_cb_sort(const void *item1, const void *item2)
return 0;
}
-static void
-_cpuclock_set_thread_governor(void *data, Ecore_Thread *th EINA_UNUSED)
-{
- const char *governor = data;
-
- if (_cpuclock_sysfs_setall("scaling_governor", governor) == 0)
- return;
- if (!strcmp(governor, "ondemand"))
- _cpuclock_sysfs_set("ondemand/ignore_nice_load", "0");
- else if (!strcmp(governor, "conservative"))
- _cpuclock_sysfs_set("conservative/ignore_nice_load", "0");
-}
-
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined (__OpenBSD__)
static void
_cpuclock_set_thread_frequency(void *data, Ecore_Thread *th EINA_UNUSED)
{
const char *freq = data;
-
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined (__OpenBSD__)
int frequency = atoi(freq);
_cpuclock_sysctl_frequency(frequency);
-#else
- _cpuclock_sysfs_setall("scaling_setspeed", freq);
-#endif
-}
-
-static void
-_cpuclock_set_thread_pstate(void *data, Ecore_Thread *th EINA_UNUSED)
-{
- Pstate_Config *pc = data;
-
- _cpuclock_sysfs_pstate(pc->min, pc->max, pc->turbo);
}
static void
@@ -101,16 +76,7 @@ _cpuclock_set_thread_done(void *data EINA_UNUSED,
Ecore_Thread *th EINA_UNUSED)
{
return;
}
-
-static void
-_cpuclock_set_thread_pstate_done(void *data, Ecore_Thread *th EINA_UNUSED)
-{
- Pstate_Config *pc = data;
-
- E_FREE_FUNC(pc, free);
-
- return;
-}
+#endif
void
_cpuclock_set_governor(const char *governor)
@@ -118,24 +84,44 @@ _cpuclock_set_governor(const char *governor)
#if defined __FreeBSD__ || defined __OpenBSD__
return;
#endif
-
- ecore_thread_run(_cpuclock_set_thread_governor, _cpuclock_set_thread_done,
NULL, governor);
+ char buf[4096], exe[4096];
+ struct stat st;
+
+ snprintf(exe, 4096, "%s/%s/cpuclock_sysfs",
+e_module_dir_get(sysinfo_co
[EGIT] [core/enlightenment] master 02/03: Luncher: Remove useless and dangerous global.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=731590ee7613e0af29e9e51906c1937dbf3dea82
commit 731590ee7613e0af29e9e51906c1937dbf3dea82
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 15:43:39 2017 -0500
Luncher: Remove useless and dangerous global.
---
src/modules/luncher/luncher.h | 1 -
src/modules/luncher/mod.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/modules/luncher/luncher.h b/src/modules/luncher/luncher.h
index e2b7037e9..e64ce7f22 100644
--- a/src/modules/luncher/luncher.h
+++ b/src/modules/luncher/luncher.h
@@ -114,6 +114,5 @@ EINTERN void grid_recalculate(Instance *inst);
extern Config *luncher_config;
extern Eina_List *luncher_instances;
-extern E_Module *module;
#endif
diff --git a/src/modules/luncher/mod.c b/src/modules/luncher/mod.c
index b03e34c1a..919d63f55 100644
--- a/src/modules/luncher/mod.c
+++ b/src/modules/luncher/mod.c
@@ -5,7 +5,6 @@
static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL;
Eina_List *luncher_instances = NULL;
-E_Module *module = NULL;
Config *luncher_config = NULL;
EINTERN void
@@ -91,7 +90,7 @@ e_modapi_init(E_Module *m)
{
luncher_init();
- module = m;
+ luncher_config->module = m;
return m;
}
--
[EGIT] [core/enlightenment] master 01/02: Thermal: Add left click info popup
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2fa8df456a57fb48860beb0caec3db3d43d42498
commit 2fa8df456a57fb48860beb0caec3db3d43d42498
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 13:31:22 2017 -0500
Thermal: Add left click info popup
---
src/modules/sysinfo/mod.c | 4 +-
src/modules/sysinfo/sysinfo.c | 1 +
src/modules/sysinfo/sysinfo.h | 2 +
src/modules/sysinfo/thermal/thermal.c | 93 ---
4 files changed, 91 insertions(+), 9 deletions(-)
diff --git a/src/modules/sysinfo/mod.c b/src/modules/sysinfo/mod.c
index 5dad8227d..b87a4520c 100644
--- a/src/modules/sysinfo/mod.c
+++ b/src/modules/sysinfo/mod.c
@@ -96,6 +96,7 @@ sysinfo_init(void)
ci->thermal.sensor_name = NULL;
ci->thermal.temp = -900;
ci->thermal.units = CELSIUS;
+ci->thermal.popup = NULL;
ci->thermal.configure = NULL;
ci->cpuclock.poll_interval = 32;
ci->cpuclock.restore_governor = 0;
@@ -104,7 +105,8 @@ sysinfo_init(void)
ci->cpuclock.governor = NULL;
ci->cpuclock.pstate_min = 1;
ci->cpuclock.pstate_max = 101;
-ci->cpuclock.configure = NULL;
+ci->cpuclock.popup = NULL;
+ ci->cpuclock.configure = NULL;
ci->cpumonitor.poll_interval = 32;
ci->cpumonitor.total = 0;
ci->cpumonitor.idle = 0;
diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c
index 4b97fae54..4dc02f01b 100644
--- a/src/modules/sysinfo/sysinfo.c
+++ b/src/modules/sysinfo/sysinfo.c
@@ -104,6 +104,7 @@ _conf_item_get(int *id)
ci->thermal.sensor_type = SENSOR_TYPE_NONE;
ci->thermal.sensor_name = NULL;
ci->thermal.units = CELSIUS;
+ ci->thermal.popup = NULL;
ci->thermal.configure = NULL;
ci->cpuclock.poll_interval = 32;
ci->cpuclock.restore_governor = 0;
diff --git a/src/modules/sysinfo/sysinfo.h b/src/modules/sysinfo/sysinfo.h
index 06f06eaae..98275af8a 100644
--- a/src/modules/sysinfo/sysinfo.h
+++ b/src/modules/sysinfo/sysinfo.h
@@ -157,6 +157,8 @@ struct _Config_Item
{
Evas_Object *o_gadget;
Evas_Object *configure;
+ Evas_Object *popup;
+ Evas_Object *popup_label;
int poll_interval;
int low, high;
int sensor_type;
diff --git a/src/modules/sysinfo/thermal/thermal.c
b/src/modules/sysinfo/thermal/thermal.c
index ddf0d7215..d2e1ddfdf 100644
--- a/src/modules/sysinfo/thermal/thermal.c
+++ b/src/modules/sysinfo/thermal/thermal.c
@@ -32,7 +32,6 @@ _thermal_face_level_set(Instance *inst, double level)
static void
_thermal_apply(Instance *inst, int temp)
{
- char buf[64];
if (inst->cfg->thermal.temp == temp) return;
inst->cfg->thermal.temp = temp;
@@ -46,15 +45,10 @@ _thermal_apply(Instance *inst, int temp)
elm_layout_signal_emit(inst->cfg->thermal.o_gadget,
"e,state,known", "");
inst->cfg->thermal.have_temp = EINA_TRUE;
}
-if (inst->cfg->thermal.units == FAHRENHEIT)
- snprintf(buf, sizeof(buf), "%i°F", temp);
-else
- snprintf(buf, sizeof(buf), "%i°C", temp);
_thermal_face_level_set(inst,
(double)(temp - inst->cfg->thermal.low) /
(double)(inst->cfg->thermal.high -
inst->cfg->thermal.low));
-elm_layout_text_set(inst->cfg->thermal.o_gadget, "e.text.reading",
buf);
}
else
{
@@ -62,11 +56,20 @@ _thermal_apply(Instance *inst, int temp)
{
/* disable therm object */
elm_layout_signal_emit(inst->cfg->thermal.o_gadget,
"e,state,unknown", "");
- elm_layout_text_set(inst->cfg->thermal.o_gadget,
"e.text.reading", "N/A");
_thermal_face_level_set(inst, 0.5);
inst->cfg->thermal.have_temp = EINA_FALSE;
}
}
+ if (inst->cfg->thermal.popup)
+ {
+char buf[100];
+
+if (inst->cfg->thermal.units == FAHRENHEIT)
+ snprintf(buf, 100, "%s: %d F", _("Temperature"),
(int)((inst->cfg->thermal.temp * 9.0 / 5.0) + 32));
+else
+ snprintf(buf, 100, "%s: %d C", _("Temperature"),
inst->cfg->thermal.temp);
+elm_object_text_set(inst->cfg->thermal.popup_label, buf);
+ }
}
#if defined(HAVE_EEZE)
@@ -146,18 +149,82 @@ _thermal_configure_cb(Evas_Object *g)
Instance *inst = evas_object_data_get(g, "Instance");
if (!sysinfo_config) return NULL;
+ if (inst->cfg->thermal.popup)
[EGIT] [core/enlightenment] master 02/02: Cpuclock: Clean up some governor handling code.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d4bc101866c09188bc90d68e3cd9f72d294c3606
commit d4bc101866c09188bc90d68e3cd9f72d294c3606
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 13:32:56 2017 -0500
Cpuclock: Clean up some governor handling code.
---
src/modules/sysinfo/cpuclock/cpuclock.c| 3 ++-
src/modules/sysinfo/cpuclock/cpuclock_config.c | 8 +---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index 71dab70f6..0172a5e79 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -67,7 +67,8 @@ _cpuclock_set_thread_governor(void *data, Ecore_Thread *th
EINA_UNUSED)
{
const char *governor = data;
- _cpuclock_sysfs_setall("scaling_governor", governor);
+ if (_cpuclock_sysfs_setall("scaling_governor", governor) == 0)
+ return;
if (!strcmp(governor, "ondemand"))
_cpuclock_sysfs_set("ondemand/ignore_nice_load", "0");
else if (!strcmp(governor, "conservative"))
diff --git a/src/modules/sysinfo/cpuclock/cpuclock_config.c
b/src/modules/sysinfo/cpuclock/cpuclock_config.c
index 995258370..255b10104 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock_config.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock_config.c
@@ -154,7 +154,7 @@ _powersave_changed(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
Cpuclock_Config *cc = data;
Instance *inst = cc->inst;
- const char *value = elm_object_text_get(obj);
+ const char *value = evas_object_data_get(obj, "governor");
if (value)
eina_stringshare_replace(>cfg->cpuclock.powersave_governor, value);
@@ -167,7 +167,7 @@ _governor_changed(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
Cpuclock_Config *cc = data;
Instance *inst = cc->inst;
- const char *value = elm_object_text_get(obj);
+ const char *value = evas_object_data_get(obj, "governor");
if (value)
{
@@ -403,7 +403,8 @@ cpuclock_configure(Instance *inst)
elm_object_text_set(o, _("Maximum Speed"));
else
elm_object_text_set(o, l->data);
-elm_box_pack_end(box, o);
+ evas_object_data_set(o, "governor", (const char *)l->data);
+ elm_box_pack_end(box, o);
evas_object_smart_callback_add(o, "changed", _governor_changed, cc);
evas_object_show(o);
@@ -472,6 +473,7 @@ cpuclock_configure(Instance *inst)
else
elm_object_text_set(o, l->data);
elm_object_disabled_set(o, inst->cfg->cpuclock.auto_powersave);
+ evas_object_data_set(o, "governor", l->data);
elm_box_pack_end(box, o);
evas_object_smart_callback_add(o, "changed", _powersave_changed, cc);
evas_object_show(o);
--
[EGIT] [core/efl] master 01/01: Thermal theme: Remove text from theme and quit wasting space.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d2ce06c69ba9e65ee5490108c0b21d0049ece5a1
commit d2ce06c69ba9e65ee5490108c0b21d0049ece5a1
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 13:07:22 2017 -0500
Thermal theme: Remove text from theme and quit wasting space.
---
data/elementary/themes/edc/temperature.edc | 99 +-
1 file changed, 97 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/edc/temperature.edc
b/data/elementary/themes/edc/temperature.edc
index d21f3a7a97..41a0d49e62 100644
--- a/data/elementary/themes/edc/temperature.edc
+++ b/data/elementary/themes/edc/temperature.edc
@@ -1,6 +1,4 @@
group { name: "e/modules/temperature/main";
- alias: "e/gadget/thermal/main";
- alias: "e/gadget/thermal/main_vert";
images.image: "therm_content.png" COMP;
images.image: "therm_shadow.png" COMP;
images.image: "therm_shine.png" COMP;
@@ -115,4 +113,101 @@ group { name: "e/modules/temperature/main";
}
}
+group { name: "e/gadget/thermal/main";
+ alias: "e/gadget/thermal/main_vert";
+ images.image: "therm_content.png" COMP;
+ images.image: "therm_shadow.png" COMP;
+ images.image: "therm_shine.png" COMP;
+ script {
+public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_FLOAT) && (id == 1)) {
+ new Float:val;
+ val = getfarg(2);
+ set_drag(PART:"temp_top", 0.0, val);
+ }
+}
+ }
+ parts {
+ part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+aspect: (80 / 160) (80 / 160);
+aspect_preference: BOTH;
+ }
+ }
+ part { name: "shadow";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+image.normal: "therm_shadow.png";
+ }
+ }
+ part { name: "temp";
+ clip_to: "temp_clip";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+image.normal: "therm_content.png";
+ }
+ }
+ part { name: "overlay";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+image.normal: "therm_shine.png";
+ }
+ }
+ part { name: "fade_clip"; type: RECT;
+ description { state: "default" 0.0;
+rel1.to_x: "base";
+rel2.to_x: "base";
+color: 255 255 255 255;
+ }
+ description { state: "faded" 0.0;
+color: 255 255 255 128;
+ }
+ }
+ part { name: "temp_clip"; type: RECT;
+ clip_to: "fade_clip";
+ description { state: "default" 0.0;
+rel1.to_x: "base";
+rel2.to_x: "base";
+rel1.to_y: "temp_top";
+ }
+ }
+ part { name: "temp_top"; type: SPACER;
+ dragable.x: 0 0 0;
+ dragable.y: -1 1 0;
+ dragable.confine: "temp_limit";
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "temp_limit"; type: SPACER;
+ description { state: "default" 0.0;
+rel1.to_x: "base";
+rel2.to_x: "base";
+rel1.relative: 0.0 0.1;
+rel2.relative: 1.0 0.9;
+ }
+ }
+ part { name: "over"; type: RECT;
+ description { state: "default" 0.0;
+rel1.to_x: "base";
+rel2.to_x: "base";
+color: 0 0 0 0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "e,state,known"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "fade_clip";
+ }
+ program {
+ signal: "e,state,unknown"; source: "e";
+ action: STATE_SET "faded" 0.0;
+ target: "fade_clip";
+ }
+ }
+}
--
[EGIT] [core/efl] master 01/01: Theme: Don't display freq on the meter for cpuclock.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1130d10852a341e66dffbee4e23f663c66a9c0c2
commit 1130d10852a341e66dffbee4e23f663c66a9c0c2
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 01:24:43 2017 -0500
Theme: Don't display freq on the meter for cpuclock.
---
data/elementary/themes/edc/cpufreq.edc | 16
1 file changed, 16 insertions(+)
diff --git a/data/elementary/themes/edc/cpufreq.edc
b/data/elementary/themes/edc/cpufreq.edc
index c8a581ac54..fac534d78c 100644
--- a/data/elementary/themes/edc/cpufreq.edc
+++ b/data/elementary/themes/edc/cpufreq.edc
@@ -351,3 +351,19 @@ group { name: "e/modules/cpufreq/main";
}
}
}
+
+group { name: "e/gadget/cpuclock/main";
+ alias: "e/gadget/cpuclock/main_vert";
+ inherit: "e/modules/cpufreq/main";
+ parts {
+ part { name: "readout"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ effect: SHADOW BOTTOM;
+ clip_to: "fade_clip";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+ }
+ }
+}
+
--
[EGIT] [core/enlightenment] master 02/03: Sysinfo - Cpuclock: Add the left click info and right click config popup.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d03c254f5ea82ec75b9c33b392ca53ab3b1fbc76
commit d03c254f5ea82ec75b9c33b392ca53ab3b1fbc76
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 01:08:34 2017 -0500
Sysinfo - Cpuclock: Add the left click info and right click config popup.
---
src/modules/Makefile_sysinfo.mk| 1 +
src/modules/sysinfo/cpuclock/cpuclock.c| 172 ++-
src/modules/sysinfo/cpuclock/cpuclock.h| 22 +
src/modules/sysinfo/cpuclock/cpuclock_config.c | 617 +
src/modules/sysinfo/mod.c | 3 +-
src/modules/sysinfo/sysinfo.c | 2 +
src/modules/sysinfo/sysinfo.h | 3 +
7 files changed, 818 insertions(+), 2 deletions(-)
diff --git a/src/modules/Makefile_sysinfo.mk b/src/modules/Makefile_sysinfo.mk
index faf424776..9965321e3 100644
--- a/src/modules/Makefile_sysinfo.mk
+++ b/src/modules/Makefile_sysinfo.mk
@@ -25,6 +25,7 @@ src_modules_sysinfo_module_la_SOURCES =
src/modules/sysinfo/mod.c \
src/modules/sysinfo/cpuclock/cpuclock.h \
src/modules/sysinfo/cpuclock/cpuclock.c \
src/modules/sysinfo/cpuclock/cpuclock_sysfs.c \
+ src/modules/sysinfo/cpuclock/cpuclock_config.c \
src/modules/sysinfo/cpumonitor/cpumonitor.h \
src/modules/sysinfo/cpumonitor/cpumonitor.c \
src/modules/sysinfo/cpumonitor/cpumonitor_config.c \
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index f93017509..394f262bf 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -120,7 +120,7 @@ _cpuclock_set_governor(const char *governor)
ecore_thread_run(_cpuclock_set_thread_governor, _cpuclock_set_thread_done,
NULL, governor);
}
-static void
+void
_cpuclock_set_frequency(int frequency)
{
char buf[4096];
@@ -259,6 +259,106 @@ _cpuclock_event_cb_powersave(void *data, int type, void
*event)
return ECORE_CALLBACK_PASS_ON;
}
+static Evas_Object *
+_cpuclock_configure_cb(Evas_Object *g)
+{
+ Instance *inst = evas_object_data_get(g, "Instance");
+
+ if (!sysinfo_config) return NULL;
+ if (inst->cfg->cpuclock.popup) return NULL;
+ return cpuclock_configure(inst);
+}
+
+static void
+_cpuclock_popup_dismissed(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ Instance *inst = data;
+ E_FREE_FUNC(obj, evas_object_del);
+
+ inst->cfg->cpuclock.popup = NULL;
+ inst->cfg->cpuclock.popup_label = NULL;
+}
+
+static void
+_cpuclock_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ Instance *inst = data;
+ inst->cfg->cpuclock.popup = NULL;
+}
+
+static Evas_Object *
+_cpuclock_popup_create(Instance *inst)
+{
+ Evas_Object *popup, *box, *label;
+ double f = inst->cfg->cpuclock.status->cur_frequency;
+ char buf[100];
+
+ if (f < 100)
+ {
+f += 500;
+f /= 1000;
+ }
+ else
+ {
+f += 5;
+f /= 100;
+ }
+
+ popup = elm_ctxpopup_add(e_comp->elm);
+ elm_object_style_set(popup, "noblock");
+ evas_object_smart_callback_add(popup, "dismissed",
+ _cpuclock_popup_dismissed, inst);
+ evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL,
+ _cpuclock_popup_deleted, inst);
+
+ box = elm_box_add(popup);
+ elm_box_horizontal_set(box, EINA_FALSE);
+ E_EXPAND(box); E_FILL(box);
+ elm_object_content_set(popup, box);
+ evas_object_show(box);
+
+ label = elm_label_add(box);
+ elm_object_style_set(label, "marker");
+ snprintf(buf, 100, "%s: %1.1f", _("Frequency"), f);
+ elm_object_text_set(label, buf);
+ elm_box_pack_end(box, label);
+ evas_object_show(label);
+ inst->cfg->cpuclock.popup_label = label;
+
+ e_gadget_util_ctxpopup_place(inst->o_main, popup,
+inst->cfg->cpuclock.o_gadget);
+ evas_object_show(popup);
+
+ return popup;
+}
+
+static void
+_cpuclock_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_data)
+{
+ Evas_Event_Mouse_Down *ev = event_data;
+ Instance *inst = data;
+
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+ if (ev->button != 3)
+ {
+if (inst->cfg->cpuclock.popup)
+ elm_ctxpopup_dismiss(inst->cfg->cpuclock.popup);
+else
+ inst->cfg->cpuclock.popup = _cpuclock_popup_create(inst);
+ }
+ else
+ {
+if (inst->cfg->cpuclock.popup)
+ elm_ctxpopup_dismiss(inst->cfg->cpuc
[EGIT] [core/enlightenment] master 03/03: Sysinfo: Update Cpuclock and Thermal to the powersave api.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2bbdd999ed91f1e078278feee3b9c5e930202b13
commit 2bbdd999ed91f1e078278feee3b9c5e930202b13
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed Jul 12 01:24:03 2017 -0500
Sysinfo: Update Cpuclock and Thermal to the powersave api.
---
src/modules/sysinfo/cpuclock/cpuclock.c | 8 +---
src/modules/sysinfo/sysinfo.h | 1 +
src/modules/sysinfo/thermal/thermal.c | 8 +++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c
b/src/modules/sysinfo/cpuclock/cpuclock.c
index 394f262bf..71dab70f6 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -9,6 +9,7 @@ struct _Thread_Config
{
int interval;
Instance *inst;
+ E_Powersave_Sleeper *sleeper;
};
typedef struct _Pstate_Config Pstate_Config;
@@ -238,7 +239,6 @@ _cpuclock_event_cb_powersave(void *data, int type, void
*event)
eina_stringshare_del(inst->cfg->cpuclock.status->orig_governor);
inst->cfg->cpuclock.status->orig_governor = NULL;
break;
-
case E_POWERSAVE_MODE_MEDIUM:
case E_POWERSAVE_MODE_HIGH:
if ((inst->cfg->cpuclock.powersave_governor) || (has_conservative))
@@ -249,8 +249,8 @@ _cpuclock_event_cb_powersave(void *data, int type, void
*event)
_cpuclock_set_governor("conservative");
break;
}
-
case E_POWERSAVE_MODE_EXTREME:
+ default:
if (has_powersave)
_cpuclock_set_governor("powersave");
break;
@@ -831,7 +831,7 @@ _cpuclock_cb_frequency_check_main(void *data, Ecore_Thread
*th)
else
_cpuclock_status_free(status);
if (ecore_thread_check(th)) break;
-usleep((100.0 / 8.0) * (double)thc->interval);
+e_powersave_sleeper_sleep(thc->sleeper, thc->interval);
}
}
@@ -877,6 +877,7 @@ static void
_cpuclock_cb_frequency_check_end(void *data, Ecore_Thread *th EINA_UNUSED)
{
Thread_Config *thc = data;
+ e_powersave_sleeper_free(thc->sleeper);
E_FREE_FUNC(thc, free);
}
@@ -894,6 +895,7 @@ _cpuclock_poll_interval_update(Instance *inst)
if (thc)
{
thc->inst = inst;
+ thc->sleeper = e_powersave_sleeper_new();
thc->interval = inst->cfg->cpuclock.poll_interval;
inst->cfg->cpuclock.frequency_check_thread =
ecore_thread_feedback_run(_cpuclock_cb_frequency_check_main,
diff --git a/src/modules/sysinfo/sysinfo.h b/src/modules/sysinfo/sysinfo.h
index ae9a07981..06f06eaae 100644
--- a/src/modules/sysinfo/sysinfo.h
+++ b/src/modules/sysinfo/sysinfo.h
@@ -76,6 +76,7 @@ struct _Tempthread
const char *sensor_name;
const char *sensor_path;
void *extn;
+ E_Powersave_Sleeper *sleeper;
#ifdef HAVE_EEZE
Eina_List *tempdevs;
#endif
diff --git a/src/modules/sysinfo/thermal/thermal.c
b/src/modules/sysinfo/thermal/thermal.c
index e9f670fd5..ddf0d7215 100644
--- a/src/modules/sysinfo/thermal/thermal.c
+++ b/src/modules/sysinfo/thermal/thermal.c
@@ -13,6 +13,7 @@ _thermal_thread_free(Tempthread *tth)
#if defined(HAVE_EEZE)
EINA_LIST_FREE(tth->tempdevs, s) eina_stringshare_del(s);
#endif
+ e_powersave_sleeper_free(tth->sleeper);
free(tth->extn);
free(tth);
}
@@ -93,7 +94,11 @@ _thermal_check_sysctl(void *data, Ecore_Thread *th)
temp = thermal_sysctl_get(tth);
if (ptemp != temp) ecore_thread_feedback(th, (void *)((long)temp));
ptemp = temp;
-usleep((100.0 / 8.0) * (double)tth->poll_interval);
+e_powersave_sleeper_sleep(tth->sleeper, tth->poll_interval);
+if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE)
+ usleep((100.0 / 800.0) * (double)tth->poll_interval);
+else
+ usleep((100.0 / 8.0) * (double)tth->poll_interval);
if (ecore_thread_check(th)) break;
}
}
@@ -173,6 +178,7 @@ _thermal_config_updated(Instance *inst)
tth->poll_interval = inst->cfg->thermal.poll_interval;
tth->sensor_type = inst->cfg->thermal.sensor_type;
tth->inst = inst;
+ tth->sleeper = e_powersave_sleeper_new();
if (inst->cfg->thermal.sensor_name)
tth->sensor_name = eina_stringshare_add(inst->cfg->thermal.sensor_name);
--
[EGIT] [core/enlightenment] master 01/03: Thermal config: Fix rounding and math issues when switching between units.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ae26e913caca459a0ee01f53548879786ec58d4e
commit ae26e913caca459a0ee01f53548879786ec58d4e
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue Jul 11 21:41:05 2017 -0500
Thermal config: Fix rounding and math issues when switching between units.
---
src/modules/sysinfo/thermal/thermal_config.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/modules/sysinfo/thermal/thermal_config.c
b/src/modules/sysinfo/thermal/thermal_config.c
index 737cd8ef4..afd2676e3 100644
--- a/src/modules/sysinfo/thermal/thermal_config.c
+++ b/src/modules/sysinfo/thermal/thermal_config.c
@@ -19,7 +19,7 @@ _update_high_temperature(void *data, Evas_Object *obj
EINA_UNUSED, void *event_i
{
Thermal_Config *tc = data;
Instance *inst = tc->inst;
- int value = elm_slider_value_get(tc->high);
+ int value = (int)elm_slider_value_get(tc->high);
inst->cfg->thermal.high = value;
e_config_save_queue();
@@ -31,7 +31,7 @@ _update_low_temperature(void *data, Evas_Object *obj
EINA_UNUSED, void *event_in
{
Thermal_Config *tc = data;
Instance *inst = tc->inst;
- int value = elm_slider_value_get(tc->low);
+ int value = (int)elm_slider_value_get(tc->low);
inst->cfg->thermal.low = value;
e_config_save_queue();
@@ -61,10 +61,10 @@ _units_changed(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
elm_slider_min_max_set(tc->low, 0, 200);
elm_slider_min_max_set(tc->high, 0, 230);
-val = elm_slider_value_get(tc->low);
-elm_slider_value_set(tc->low, CEL_2_FAR(val));
-val = elm_slider_value_get(tc->high);
-elm_slider_value_set(tc->high, CEL_2_FAR(val));
+val = (int)elm_slider_value_get(tc->low);
+elm_slider_value_set(tc->low, ceil(CEL_2_FAR(val)));
+val = (int)elm_slider_value_get(tc->high);
+elm_slider_value_set(tc->high, ceil(CEL_2_FAR(val)));
elm_slider_unit_format_set(tc->high, "%1.0f F");
elm_slider_indicator_format_set(tc->high, "%1.0f F");
elm_slider_unit_format_set(tc->low, "%1.0f F");
@@ -72,20 +72,20 @@ _units_changed(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
}
else
{
-elm_slider_min_max_set(tc->low, 0, 95);
-elm_slider_min_max_set(tc->high, 0, 110);
-val = elm_slider_value_get(tc->low);
-elm_slider_value_set(tc->low, FAR_2_CEL(val));
-val = elm_slider_value_get(tc->high);
-elm_slider_value_set(tc->high, FAR_2_CEL(val));
+val = (int)elm_slider_value_get(tc->low);
+elm_slider_value_set(tc->low, ceil(FAR_2_CEL(val)));
+val = (int)elm_slider_value_get(tc->high);
+elm_slider_value_set(tc->high, ceil(FAR_2_CEL(val)));
elm_slider_unit_format_set(tc->low, "%1.0f C");
elm_slider_indicator_format_set(tc->low, "%1.0f C");
elm_slider_unit_format_set(tc->high, "%1.0f C");
elm_slider_indicator_format_set(tc->high, "%1.0f C");
+elm_slider_min_max_set(tc->low, 0, 95);
+elm_slider_min_max_set(tc->high, 0, 110);
}
- val = elm_slider_value_get(tc->high);
+ val = (int)elm_slider_value_get(tc->high);
inst->cfg->thermal.high = val;
- val = elm_slider_value_get(tc->low);
+ val = (int)elm_slider_value_get(tc->low);
inst->cfg->thermal.low = val;
e_config_save_queue();
_thermal_config_updated(inst);
--
[EGIT] [core/enlightenment] master 01/01: Cpuclock: Fix sysinfo cpuclock theme name.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a1b2771496d9f32f40deb7cb38e51a0e2976ed6d commit a1b2771496d9f32f40deb7cb38e51a0e2976ed6d Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Fri Jul 7 14:52:16 2017 -0500 Cpuclock: Fix sysinfo cpuclock theme name. --- src/modules/sysinfo/cpuclock/cpuclock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index f2455fce7..f93017509 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -874,8 +874,8 @@ sysinfo_cpuclock_create(Evas_Object *parent, Instance *inst) if (inst->cfg->cpuclock.pstate_max == 0) inst->cfg->cpuclock.pstate_max = 101; inst->cfg->cpuclock.o_gadget = elm_layout_add(parent); - e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, "base/theme/gadget/cpufreq", - "e/gadget/cpufreq/main"); + e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, "base/theme/gadget/cpuclock", + "e/gadget/cpuclock/main"); E_EXPAND(inst->cfg->cpuclock.o_gadget); E_FILL(inst->cfg->cpuclock.o_gadget); edje_object_signal_callback_add(elm_layout_edje_get(inst->cfg->cpuclock.o_gadget), "e,action,governor,next", "*", --
[EGIT] [core/enlightenment] master 01/01: Thermal Gadget: Add configuration popup.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=557a060c78ebe78598804a7bb088066f461248cf
commit 557a060c78ebe78598804a7bb088066f461248cf
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Jul 7 14:38:57 2017 -0500
Thermal Gadget: Add configuration popup.
Choose temp units, update poll time, and min/max temps.
---
src/modules/Makefile_sysinfo.mk | 1 +
src/modules/sysinfo/mod.c| 3 +-
src/modules/sysinfo/sysinfo.c| 1 +
src/modules/sysinfo/sysinfo.h| 1 +
src/modules/sysinfo/thermal/thermal.c| 46 +++-
src/modules/sysinfo/thermal/thermal.h| 11 +
src/modules/sysinfo/thermal/thermal_config.c | 356 +++
7 files changed, 415 insertions(+), 4 deletions(-)
diff --git a/src/modules/Makefile_sysinfo.mk b/src/modules/Makefile_sysinfo.mk
index e4af9a10f..faf424776 100644
--- a/src/modules/Makefile_sysinfo.mk
+++ b/src/modules/Makefile_sysinfo.mk
@@ -20,6 +20,7 @@ src_modules_sysinfo_module_la_SOURCES =
src/modules/sysinfo/mod.c \
src/modules/sysinfo/batman/batman_config.c \
src/modules/sysinfo/thermal/thermal.h \
src/modules/sysinfo/thermal/thermal.c \
+ src/modules/sysinfo/thermal/thermal_config.c \
src/modules/sysinfo/thermal/thermal_fallback.c \
src/modules/sysinfo/cpuclock/cpuclock.h \
src/modules/sysinfo/cpuclock/cpuclock.c \
diff --git a/src/modules/sysinfo/mod.c b/src/modules/sysinfo/mod.c
index ff9ffb651..0fb0f1be5 100644
--- a/src/modules/sysinfo/mod.c
+++ b/src/modules/sysinfo/mod.c
@@ -96,7 +96,8 @@ sysinfo_init(void)
ci->thermal.sensor_name = NULL;
ci->thermal.temp = -900;
ci->thermal.units = CELSIUS;
-ci->cpuclock.poll_interval = 32;
+ci->thermal.configure = NULL;
+ ci->cpuclock.poll_interval = 32;
ci->cpuclock.restore_governor = 0;
ci->cpuclock.auto_powersave = 1;
ci->cpuclock.powersave_governor = NULL;
diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c
index 956e2..353ab2a78 100644
--- a/src/modules/sysinfo/sysinfo.c
+++ b/src/modules/sysinfo/sysinfo.c
@@ -104,6 +104,7 @@ _conf_item_get(int *id)
ci->thermal.sensor_type = SENSOR_TYPE_NONE;
ci->thermal.sensor_name = NULL;
ci->thermal.units = CELSIUS;
+ ci->thermal.configure = NULL;
ci->cpuclock.poll_interval = 32;
ci->cpuclock.restore_governor = 0;
ci->cpuclock.auto_powersave = 1;
diff --git a/src/modules/sysinfo/sysinfo.h b/src/modules/sysinfo/sysinfo.h
index 2c9f49a70..896cd83a4 100644
--- a/src/modules/sysinfo/sysinfo.h
+++ b/src/modules/sysinfo/sysinfo.h
@@ -155,6 +155,7 @@ struct _Config_Item
struct
{
Evas_Object *o_gadget;
+ Evas_Object *configure;
int poll_interval;
int low, high;
int sensor_type;
diff --git a/src/modules/sysinfo/thermal/thermal.c
b/src/modules/sysinfo/thermal/thermal.c
index 2ee8a9c9f..e9f670fd5 100644
--- a/src/modules/sysinfo/thermal/thermal.c
+++ b/src/modules/sysinfo/thermal/thermal.c
@@ -135,6 +135,33 @@ _thermal_check_done(void *data, Ecore_Thread *th
EINA_UNUSED)
}
#endif
+static Evas_Object *
+_thermal_configure_cb(Evas_Object *g)
+{
+ Instance *inst = evas_object_data_get(g, "Instance");
+
+ if (!sysinfo_config) return NULL;
+ return thermal_configure(inst);
+}
+
+static void
+_thermal_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_data)
+{
+ Evas_Event_Mouse_Down *ev = event_data;
+ Instance *inst = data;
+
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+ if (ev->button == 3)
+ {
+if (!sysinfo_config) return;
+ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+if (inst->cfg->esm != E_SYSINFO_MODULE_THERMAL)
+ thermal_configure(inst);
+else
+ e_gadget_configure(inst->o_main);
+ }
+}
+
void
_thermal_config_updated(Instance *inst)
{
@@ -204,7 +231,8 @@ _thermal_removed_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_data)
Instance *inst = data;
if (inst->o_main != event_data) return;
-
+ if (inst->cfg->thermal.configure)
+ E_FREE_FUNC(inst->cfg->thermal.configure, evas_object_del);
_thermal_face_shutdown(inst);
evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL,
sysinfo_thermal_remove, data);
@@ -218,6 +246,8 @@ sysinfo_thermal_remove(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UN
{
Instance *inst = data;
+ if (inst->cfg->thermal.configure)
+ E_FREE_FUNC(inst->cfg->thermal.configure, evas_obje
[EGIT] [core/enlightenment] master 01/01: Luncher: Hint the preview popup to have the same min size as the preview windows.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=480eb2a04fb03bd081db1e485ede54d347da60aa commit 480eb2a04fb03bd081db1e485ede54d347da60aa Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Fri Jul 7 10:29:33 2017 -0500 Luncher: Hint the preview popup to have the same min size as the preview windows. This fixes T5669 --- src/modules/luncher/bar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c index 2e196ee20..022aee447 100644 --- a/src/modules/luncher/bar.c +++ b/src/modules/luncher/bar.c @@ -882,7 +882,7 @@ _bar_icon_preview_show(void *data) ic->preview = elm_ctxpopup_add(e_comp->elm); elm_object_style_set(ic->preview, "noblock"); - evas_object_size_hint_min_set(ic->preview, ic->inst->size, ic->inst->size); + evas_object_size_hint_min_set(ic->preview, ic->inst->cfg->preview_size, ic->inst->cfg->preview_size); evas_object_smart_callback_add(ic->preview, "dismissed", _bar_popup_dismissed, ic); evas_object_event_callback_add(ic->preview, EVAS_CALLBACK_MOUSE_IN, _bar_icon_preview_mouse_in, ic); --
[EGIT] [core/enlightenment] master 01/01: Wireless Gadget: Make the network list popup and right click popup work correctly.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bac93b1bb5aa056f1d259fdf9277b7528d260ff4
commit bac93b1bb5aa056f1d259fdf9277b7528d260ff4
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Jul 6 16:27:45 2017 -0500
Wireless Gadget: Make the network list popup and right click popup work
correctly.
This fixes an issue where layering was off for the popup network list and
when the right click settings window would not open.
---
src/modules/wireless/wireless.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/modules/wireless/wireless.c b/src/modules/wireless/wireless.c
index 6d553300c..10c70d180 100644
--- a/src/modules/wireless/wireless.c
+++ b/src/modules/wireless/wireless.c
@@ -348,6 +348,7 @@ _wireless_edit_del(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object *obj
array_clear(wireless_edit[i]->proxy_servers);
E_FREE(wireless_edit[i]);
}
+ wireless_popup.popup = NULL;
wireless_edit_popup = NULL;
}
@@ -709,6 +710,7 @@ _wireless_gadget_edit(int type)
evas_object_hide(wireless_popup.popup);
evas_object_del(wireless_popup.popup);
}
+ printf("Sup hoe\n");
wireless_edit[0] = E_NEW(Wireless_Connection, 1);
wireless_edit[1] = E_NEW(Wireless_Connection, 1);
wn = E_NEW(Wireless_Network, 1);
@@ -902,14 +904,17 @@ _wireless_gadget_mouse_down(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj, v
if (obj == inst->icon[type])
break;
if (ev->button == 2) connman_technology_enabled_set(type,
!wireless_type_enabled[type]);
- if (ev->button == 3) _wireless_gadget_edit(type);
+ if (ev->button == 3)
+ {
+ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+_wireless_gadget_edit(type);
+ }
if (ev->button != 1) return;
if (wireless_popup.popup)
{
evas_object_hide(wireless_popup.popup);
evas_object_del(wireless_popup.popup);
-if (wireless_popup.type == type)
- return;
+return;
}
inst->popup = 1;
wireless_popup.type = type;
@@ -939,11 +944,9 @@ _wireless_gadget_mouse_down(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj, v
evas_object_smart_callback_add(toggle, "changed", _wireless_popup_toggle,
inst);
elm_box_pack_end(box, toggle);
elm_object_content_set(ctx, box);
- wireless_popup.popup = e_comp_object_util_add(ctx, E_COMP_OBJECT_TYPE_NONE);
- evas_object_layer_set(wireless_popup.popup, E_LAYER_POPUP);
+ wireless_popup.popup = ctx;
zone = e_zone_current_get();
- evas_object_resize(wireless_popup.popup, zone->w / 5, zone->h / 3);
evas_object_size_hint_min_set(box, zone->w / 5, zone->h / 3);
e_gadget_util_ctxpopup_place(inst->box, ctx, inst->icon[type]);
evas_object_show(wireless_popup.popup);
--
[EGIT] [core/enlightenment] master 01/01: Gadgets: Clamp aspect sets to a minimum of width and height minimum of 1.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9894726039072ed4db69f7c82791dbd2b408f259 commit 9894726039072ed4db69f7c82791dbd2b408f259 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Thu Jul 6 14:16:00 2017 -0500 Gadgets: Clamp aspect sets to a minimum of width and height minimum of 1. This fixes T5600 --- src/modules/backlight/gadget/backlight.c| 2 ++ src/modules/mixer/gadget/mixer.c| 2 ++ src/modules/sysinfo/batman/batman.c | 2 ++ src/modules/sysinfo/cpuclock/cpuclock.c | 2 ++ src/modules/sysinfo/cpumonitor/cpumonitor.c | 2 ++ src/modules/sysinfo/memusage/memusage.c | 2 ++ src/modules/sysinfo/netstatus/netstatus.c | 2 ++ src/modules/sysinfo/thermal/thermal.c | 2 ++ 8 files changed, 16 insertions(+) diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c index 883801bc7..fafb2540e 100644 --- a/src/modules/backlight/gadget/backlight.c +++ b/src/modules/backlight/gadget/backlight.c @@ -224,6 +224,8 @@ _backlight_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS Instance *inst = data; edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_backlight), 0, 0, , ); + if (w < 1) w = 1; + if (h < 1) h = 1; evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); } diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c index 8e1583a27..c68c0e197 100644 --- a/src/modules/mixer/gadget/mixer.c +++ b/src/modules/mixer/gadget/mixer.c @@ -593,6 +593,8 @@ _mixer_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Instance *inst = data; edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_mixer), 0, 0, , ); + if (w < 1) w = 1; + if (h < 1) h = 1; evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); } diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c index 00f04b22d..f44731a60 100644 --- a/src/modules/sysinfo/batman/batman.c +++ b/src/modules/sysinfo/batman/batman.c @@ -517,6 +517,8 @@ _batman_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Instance *inst = data; edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->batman.o_gadget), 0, 0, , ); + if (w < 1) w = 1; + if (h < 1) h = 1; if (inst->cfg->esm == E_SYSINFO_MODULE_BATMAN) evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); else diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index 25b821a4a..f2455fce7 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -689,6 +689,8 @@ _cpuclock_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE Instance *inst = data; edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->cpuclock.o_gadget), 0, 0, , ); + if (w < 1) w = 1; + if (h < 1) h = 1; if (inst->cfg->esm == E_SYSINFO_MODULE_CPUCLOCK) evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); else diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index 760d931e1..2220ca40d 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -147,6 +147,8 @@ _cpumonitor_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e w *= num_cores; h = sh; } + if (w < 1) w = 1; + if (h < 1) h = 1; if (inst->cfg->esm == E_SYSINFO_MODULE_CPUMONITOR) evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); else diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index c590bb731..c36c10722 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -260,6 +260,8 @@ _memusage_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->memusage.o_gadget), 0, 0, , ); + if (w < 1) w = 1; + if (h < 1) h = 1; if (inst->cfg->esm == E_SYSINFO_MODULE_MEMUSAGE) evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index 815b4b650..e16e2b1c3 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -115,6 +115,8 @@ _netstatus_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS Instance *inst = data; edje_object_parts_exte
[EGIT] [core/enlightenment] master 01/01: Gadgets: Follow gadget theme naming conventions.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=202bf770f4a88b14e72c080b0117536a918e54a0 commit 202bf770f4a88b14e72c080b0117536a918e54a0 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Thu Jul 6 12:20:27 2017 -0500 Gadgets: Follow gadget theme naming conventions. --- src/modules/backlight/gadget/backlight.c| 8 src/modules/mixer/gadget/mixer.c| 8 src/modules/pager/gadget/pager.c| 12 ++-- src/modules/sysinfo/batman/batman.c | 20 ++-- src/modules/sysinfo/cpuclock/cpuclock.c | 12 ++-- src/modules/sysinfo/cpumonitor/cpumonitor.c | 8 src/modules/sysinfo/memusage/memusage.c | 12 ++-- src/modules/sysinfo/netstatus/netstatus.c | 12 ++-- src/modules/sysinfo/thermal/thermal.c | 12 ++-- src/modules/xkbswitch/gadget/xkbswitch.c| 24 10 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c index bbf643509..883801bc7 100644 --- a/src/modules/backlight/gadget/backlight.c +++ b/src/modules/backlight/gadget/backlight.c @@ -241,12 +241,12 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA E_FILL(inst->o_backlight); if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->o_backlight, - "base/theme/modules/backlight", - "e/modules/backlight/main_vert"); + "base/theme/gadget/backlight", + "e/gadget/backlight/main_vert"); else e_theme_edje_object_set(inst->o_backlight, - "base/theme/modules/backlight", - "e/modules/backlight/main"); + "base/theme/gadget/backlight", + "e/gadget/backlight/main"); evas_object_event_callback_add(inst->o_backlight, EVAS_CALLBACK_MOUSE_DOWN, _backlight_cb_mouse_down, diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c index fb602d7a8..8e1583a27 100644 --- a/src/modules/mixer/gadget/mixer.c +++ b/src/modules/mixer/gadget/mixer.c @@ -610,12 +610,12 @@ _mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNU E_FILL(inst->o_mixer); if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->o_mixer, - "base/theme/modules/mixer", - "e/modules/mixer/main_vert"); + "base/theme/gadget/mixer", + "e/gadget/mixer/main_vert"); else e_theme_edje_object_set(inst->o_mixer, - "base/theme/modules/mixer", - "e/modules/mixer/main"); + "base/theme/gadget/mixer", + "e/gadget/mixer/main"); evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, inst); evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_WHEEL, diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c index 6ac1e534a..e3f8f8a96 100644 --- a/src/modules/pager/gadget/pager.c +++ b/src/modules/pager/gadget/pager.c @@ -423,8 +423,8 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, Eina_Bool invert) e = evas_object_evas_get(p->o_table); o = edje_object_add(e); pd->o_desk = o; - e_theme_edje_object_set(o, "base/theme/modules/pager", - "e/modules/pager16/desk"); + e_theme_edje_object_set(o, "base/theme/gadget/pager", + "e/gadget/pager16/desk"); edje_object_part_text_set(o, "e.text.label", desk->name); if (pager_config->show_desk_names) edje_object_signal_emit(o, "e,name,show", "e"); @@ -647,8 +647,8 @@ _pager_window_new(Pager_Desk *pd, Evas_Object *mirror, E_Client *client) //o = edje_object_add(evas_object_evas_get(pd->pager->o_table)); //pw->o_window = o; - //e_theme_edje_object_set(o, "base/theme/modules/pager", - //"e/modules/pager16/window"); + //e_theme_edje_object_set(o, "base/theme/gadget/pager", + //"e/gadget/pager16/window"); //if (visible) evas_object_show(
[EGIT] [core/efl] master 01/01: Theme: Follow gadget naming conventions.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=457d53ec29171a759697ec30012fe2668ad6c292
commit 457d53ec29171a759697ec30012fe2668ad6c292
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Jul 6 12:19:12 2017 -0500
Theme: Follow gadget naming conventions.
---
data/elementary/themes/edc/backlight.edc | 3 ++-
data/elementary/themes/edc/batman.edc | 6 +++---
data/elementary/themes/edc/cpufreq.edc | 4 ++--
data/elementary/themes/edc/cpumonitor.edc | 4 ++--
data/elementary/themes/edc/memusage.edc| 4 ++--
data/elementary/themes/edc/mixer.edc | 3 ++-
data/elementary/themes/edc/netstatus.edc | 4 ++--
data/elementary/themes/edc/pager16.edc | 2 ++
data/elementary/themes/edc/temperature.edc | 4 ++--
data/elementary/themes/edc/xkbswitch.edc | 6 --
10 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/data/elementary/themes/edc/backlight.edc
b/data/elementary/themes/edc/backlight.edc
index 9313602a48..a9b0626e50 100644
--- a/data/elementary/themes/edc/backlight.edc
+++ b/data/elementary/themes/edc/backlight.edc
@@ -1,5 +1,6 @@
group { name: "e/modules/backlight/main";
- alias: "e/modules/backlight/main_vert";
+ alias: "e/gadget/backlight/main";
+ alias: "e/gadget/backlight/main_vert";
images.image: "bulb_glow.png" COMP;
images.image: "bulb_off.png" COMP;
images.image: "bulb_on.png" COMP;
diff --git a/data/elementary/themes/edc/batman.edc
b/data/elementary/themes/edc/batman.edc
index 89f5962a0a..c4cdf793c1 100644
--- a/data/elementary/themes/edc/batman.edc
+++ b/data/elementary/themes/edc/batman.edc
@@ -1,5 +1,5 @@
-group { name: "e/modules/batman/main";
- alias: "e/modules/batman/main_vert";
+group { name: "e/gadget/batman/main";
+ alias: "e/gadget/batman/main_vert";
images.image: "bat_shadow.png" COMP;
images.image: "bat_base.png" COMP;
images.image: "bat_shine.png" COMP;
@@ -242,7 +242,7 @@ group { name: "e/modules/batman/main";
}
}
-group { name: "e/modules/batman/popup";
+group { name: "e/gadget/batman/popup";
min: 240 60;
parts {
part { name: "e.swallow.batman"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/cpufreq.edc
b/data/elementary/themes/edc/cpufreq.edc
index f6e06eae11..c8a581ac54 100644
--- a/data/elementary/themes/edc/cpufreq.edc
+++ b/data/elementary/themes/edc/cpufreq.edc
@@ -1,6 +1,6 @@
group { name: "e/modules/cpufreq/main";
- alias: "e/modules/cpuclock/main";
- alias: "e/modules/cpuclock/main_vert";
+ alias: "e/gadget/cpuclock/main";
+ alias: "e/gadget/cpuclock/main_vert";
images.image: "tacho_base.png" COMP;
images.image: "inset_round_hilight.png" COMP;
images.image: "inset_round_shadow.png" COMP;
diff --git a/data/elementary/themes/edc/cpumonitor.edc
b/data/elementary/themes/edc/cpumonitor.edc
index e1eae961db..2ee4b1989b 100644
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ b/data/elementary/themes/edc/cpumonitor.edc
@@ -1,4 +1,4 @@
-group { name: "e/modules/cpumonitor/main";
+group { name: "e/gadget/cpumonitor/main";
image: "cpu_bar.png" COMP;
image: "cpu_green_on.png" COMP;
image: "cpu_yellow_on.png" COMP;
@@ -87,7 +87,7 @@ group { name: "e/modules/cpumonitor/main";
}
}
-group { name: "e/modules/cpumonitor/main_vert";
+group { name: "e/gadget/cpumonitor/main_vert";
image: "cpu_bar_vert.png" COMP;
image: "cpu_green_on_vert.png" COMP;
image: "cpu_yellow_on_vert.png" COMP;
diff --git a/data/elementary/themes/edc/memusage.edc
b/data/elementary/themes/edc/memusage.edc
index 5e4bcb6c2f..660df56672 100644
--- a/data/elementary/themes/edc/memusage.edc
+++ b/data/elementary/themes/edc/memusage.edc
@@ -1,4 +1,4 @@
-group { name: "e/modules/memusage/main";
+group { name: "e/gadget/memusage/main";
image: "mem_bar.png" COMP;
image: "mem_on.png" COMP;
script {
@@ -111,7 +111,7 @@ group { name: "e/modules/memusage/main";
}
}
-group { name: "e/modules/memusage/main_vert";
+group { name: "e/gadget/memusage/main_vert";
image: "mem_bar_vert.png" COMP;
image: "mem_on_vert.png" COMP;
script {
diff --git a/data/elementary/themes/edc/mixer.edc
b/data/elementary/themes/edc/mixer.edc
index 802b1b8b3c..1dff72 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -1,5 +1,6 @@
group { name: "e/modules/mixer/main";
- alias: "e/modules/mixer/main_vert";
+ alias: "e/gadget/mixer/main";
+ alias: "e/gadge
[EGIT] [apps/ephoto] master 01/01: Ephoto: Give the user the option to choose between cropped thumbnails and aspect based thumbnails.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=4828fe95a4b5065c2d88da1ad1a223843dee23bf
commit 4828fe95a4b5065c2d88da1ad1a223843dee23bf
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon Jun 26 12:28:24 2017 -0500
Ephoto: Give the user the option to choose between cropped thumbnails and
aspect based thumbnails.
---
src/bin/ephoto.h | 5 -
src/bin/ephoto_config.c| 18 +++---
src/bin/ephoto_main.c | 2 +-
src/bin/ephoto_thumb.c | 7 +--
src/bin/ephoto_thumb_browser.c | 30 --
5 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index a3edc90..857c03a 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -103,6 +103,7 @@ void ephoto_thumb_browser_update_info_label(Ephoto *ephoto);
void ephoto_thumb_browser_slideshow(Evas_Object *obj);
void ephoto_thumb_browser_paste(Ephoto *ephoto, Elm_Object_Item *item);
void ephoto_thumb_browser_clear(Ephoto *ephoto);
+void ephoto_thumb_browser_recalc(Ephoto *ephoto);
void ephoto_thumb_browser_dirs_only_set(Ephoto *ephoto, Eina_Bool dirs_only);
/* smart callbacks called: "selected" - an item in the thumb browser is
* selected. The selected Ephoto_Entry is passed as event_info argument. */
@@ -116,7 +117,7 @@ void ephoto_directory_browser_clear(Ephoto *ephoto);
/*thumbnailing functions taken from enlightenment*/
int e_thumb_init(void);
int e_thumb_shutdown(void);
-Evas_Object *e_thumb_icon_add(Evas *evas);
+Evas_Object *e_thumb_icon_add(Evas *evas, Eina_Bool aspect);
void e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char
*key);
void e_thumb_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
void e_thumb_icon_begin(Evas_Object *obj);
@@ -228,6 +229,7 @@ struct _Ephoto_Config
Eina_Bool smooth;
Eina_Bool firstrun;
Eina_Bool folders;
+ Eina_Bool thumbnail_aspect;
Evas_Object *slide_time;
Evas_Object *slide_trans;
Evas_Object *open_dir;
@@ -237,6 +239,7 @@ struct _Ephoto_Config
Evas_Object *smooth_scale;
Evas_Object *slide_move;
Evas_Object *show_folders;
+ Evas_Object *thumb_aspect;
};
struct _Ephoto
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 6b4b645..962f4dd 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -43,6 +43,7 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
ephoto->config->movess = elm_check_state_get(ephoto->config->slide_move);
ephoto->config->smooth = elm_check_state_get(ephoto->config->smooth_scale);
ephoto->config->folders = elm_check_state_get(ephoto->config->show_folders);
+ ephoto->config->thumbnail_aspect =
elm_check_state_get(ephoto->config->thumb_aspect);
if (elm_spinner_value_get(ephoto->config->slide_time) > 0)
ephoto->config->slideshow_timeout =
elm_spinner_value_get(ephoto->config->slide_time);
@@ -52,6 +53,7 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_del(popup);
elm_object_focus_set(ephoto->pager, EINA_TRUE);
+ ephoto_thumb_browser_recalc(ephoto);
}
static void
@@ -110,10 +112,18 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
evas_object_show(check);
ephoto->config->smooth_scale = check;
+ check = elm_check_add(table);
+ elm_object_text_set(check, _("Keep Aspect on Thumbnails"));
+ EPHOTO_FILL(check);
+ elm_check_state_set(check, ephoto->config->thumbnail_aspect);
+ elm_table_pack(table, check, 0, 4, 1, 1);
+ evas_object_show(check);
+ ephoto->config->thumb_aspect = check;
+
label = elm_label_add(table);
elm_object_text_set(label, _("Top Level Directory"));
EPHOTO_ALIGN(label, 0.5, 0.5);
- elm_table_pack(table, label, 0, 4, 1, 1);
+ elm_table_pack(table, label, 0, 5, 1, 1);
evas_object_show(label);
hoversel = elm_hoversel_add(table);
@@ -130,7 +140,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
evas_object_data_set(hoversel, "ephoto", ephoto);
EPHOTO_WEIGHT(hoversel, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
EPHOTO_FILL(hoversel);
- elm_table_pack(table, hoversel, 0, 5, 1, 1);
+ elm_table_pack(table, hoversel, 0, 6, 1, 1);
evas_object_show(hoversel);
ephoto->config->open_dir = hoversel;
@@ -143,7 +153,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
ELM_SCROLLER_POLICY_OFF);
EPHOTO_EXPAND(entry);
EPHOTO_FILL(entry);
- elm_table_pack(table, entry, 0, 6, 1, 1);
+ elm_table_pack(table, entry, 0, 7, 1, 1);
evas_object_show(entry);
ephoto->config->open_dir_custom = entry;
}
@@ -772,6 +782,7 @@ ephoto_config_init(Ephoto *ephoto)
C_VAL(D, T, smooth, EET_T_INT);
C_VAL(D, T, firstrun, EET_T_INT);
C_VAL(D, T, folders, EET_T_INT);
+ C_VAL(D, T,
[EGIT] [core/enlightenment] master 01/01: Luncher: Allow the size of previews to be configurable.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=16c05faabdc1c54bef2e43b5ac0d5f295f3f9bf7
commit 16c05faabdc1c54bef2e43b5ac0d5f295f3f9bf7
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Jun 9 14:21:12 2017 -0500
Luncher: Allow the size of previews to be configurable.
---
src/modules/luncher/bar.c | 20 +---
src/modules/luncher/config.c | 40 +++-
src/modules/luncher/grid.c| 3 +++
src/modules/luncher/luncher.h | 1 +
src/modules/luncher/mod.c | 4 +++-
5 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 59bedacdc..86efd1872 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -602,7 +602,7 @@ _bar_icon_mouse_down(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUS
popup = elm_ctxpopup_add(e_comp->elm);
elm_object_style_set(popup, "noblock");
-evas_object_smart_callback_add(popup, "dismissed",
_bar_popup_dismissed, NULL);
+evas_object_smart_callback_add(popup, "dismissed",
_bar_popup_dismissed, ic);
evas_object_size_hint_min_set(popup, ic->inst->size, ic->inst->size);
box = elm_box_add(popup);
@@ -811,6 +811,7 @@ static void
_bar_icon_preview_client_add(Icon *ic, E_Client *ec)
{
Evas_Object *layout, *label, *img;
+ Edje_Message_Int_Set *msg;
layout = elm_layout_add(ic->preview_box);
evas_object_data_set(layout, "icon", ic);
@@ -824,6 +825,11 @@ _bar_icon_preview_client_add(Icon *ic, E_Client *ec)
elm_box_pack_end(ic->preview_box, layout);
evas_object_show(layout);
+ msg = alloca(sizeof(Edje_Message_Int_Set) + (sizeof(int)));
+ msg->count = 1;
+ msg->val[0] = ic->inst->cfg->preview_size;
+ edje_object_message_send(elm_layout_edje_get(layout), EDJE_MESSAGE_INT_SET,
1, msg);
+
label = elm_label_add(layout);
elm_object_style_set(label, "luncher_preview");
elm_label_ellipsis_set(label, EINA_TRUE);
@@ -900,12 +906,15 @@ _bar_icon_preview_show(void *data)
{
case E_GADGET_SITE_ORIENT_HORIZONTAL:
elm_box_horizontal_set(ic->preview_box, EINA_TRUE);
- break;
+ elm_box_padding_set(ic->preview_box, 2, 0);
+ break;
case E_GADGET_SITE_ORIENT_VERTICAL:
elm_box_horizontal_set(ic->preview_box, EINA_FALSE);
- break;
+ elm_box_padding_set(ic->preview_box, 0, 2);
+ break;
default:
elm_box_horizontal_set(ic->preview_box, EINA_TRUE);
+ elm_box_padding_set(ic->preview_box, 2, 0);
}
EINA_LIST_FOREACH(ic->execs, l, ex)
{
@@ -2030,6 +2039,7 @@ _conf_item_get(int *id)
ci->id = eina_list_count(luncher_config->items)+1;
else
ci->id = -1;
+ ci->preview_size = 64;
ci->dir = eina_stringshare_add("default");
ci->style = eina_stringshare_add("default");
ci->type = E_LUNCHER_MODULE_FULL;
@@ -2132,6 +2142,10 @@ bar_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_UNUSED
inst->main_del = EINA_FALSE;
inst->icons_desktop_hash = eina_hash_string_superfast_new(NULL);
inst->icons_clients_hash = eina_hash_pointer_new(NULL);
+
+ if (!inst->cfg->preview_size)
+ inst->cfg->preview_size = 64;
+
inst->o_main = elm_layout_add(parent);
e_theme_edje_object_set(inst->o_main, "e/gadget/luncher/bar",
"e/gadget/luncher/bar");
diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c
index 6664bad69..318ee289a 100644
--- a/src/modules/luncher/config.c
+++ b/src/modules/luncher/config.c
@@ -315,11 +315,22 @@ _icon_theme_file_set(Evas_Object *img, const char *icon)
elm_image_file_set(img, path, k);
}
+static void
+_update_preview_size(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ Instance *inst = data;
+ int value = elm_slider_value_get(obj);
+
+ inst->cfg->preview_size = value;
+ e_config_save_queue();
+}
+
EINTERN Evas_Object *
config_luncher(E_Zone *zone, Instance *inst, Eina_Bool bar)
{
Evas_Object *popup, *tb, *lbl, *fr, *box, *list, *mlist;
Evas_Object *butbox, *sep, *hbox, *img, *but, *o, *group;
+ Evas_Object *slider;
Elm_Object_Item *it;
luncher_config->bar = bar;
@@ -374,7 +385,7 @@ config_luncher(E_Zone *zone, Instance *inst, Eina_Bool bar)
lbl = elm_label_add(box);
elm_object_text_set(lbl, _("Luncher Type:"));
- E_ALIGN(lbl, 0.0, 0.0);
+ E_ALIGN(lbl, 0.5, 0.5);
E_WEIGHT(lbl, EVAS_HINT_EXPAND, 0);
elm_box_pack_end(box, lbl);
evas_object_show(lbl);
@@ -424,6 +435,33 @@ config_luncher(E_Zone *zone, Instance *inst, Eina_Bool bar)
elm_radio_value_s
[EGIT] [core/efl] master 01/01: Luncher theme: Allow preview size to be configurable.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f7d5b0dbe8a0be86b2832ebb44ce83ab59e0c246
commit f7d5b0dbe8a0be86b2832ebb44ce83ab59e0c246
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri Jun 9 14:20:29 2017 -0500
Luncher theme: Allow preview size to be configurable.
---
data/elementary/themes/edc/luncher.edc | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/edc/luncher.edc
b/data/elementary/themes/edc/luncher.edc
index 2ad3352d71..cbc35c0039 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -456,6 +456,18 @@ group { name: "e/gadget/luncher/icon";
}
group { name: "e/gadget/luncher/preview";
+ script {
+ public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_INT_SET) && (id == 1)) {
+new size = getarg(2);
+
+custom_state(PART:"icon", "default", 0.0);
+set_state_val(PART:"icon", STATE_MIN, size, size);
+set_state_val(PART:"icon", STATE_MAX, size, size);
+set_state(PART:"icon", "custom", 0.0);
+ }
+ }
+ }
parts {
part { name: "base"; type: RECT;
description { state: "default";
@@ -559,8 +571,8 @@ group { name: "e/gadget/luncher/preview";
signal: "e,state,icon,preview"; source: "e";
action: STATE_SET "default" 0.0;
target: "border";
- target: "e.swallow.title";
- target: "icon";
+ target: "e.swallow.title";
+ target: "icon";
}
}
}
--
[EGIT] [core/enlightenment] master 01/01: Gadgets: Remove the word "Gadget" from the name of gadgets.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7ff0e585acc4ef6d34a2aea6c47eb613169833c0
commit 7ff0e585acc4ef6d34a2aea6c47eb613169833c0
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu Jun 8 15:27:24 2017 -0500
Gadgets: Remove the word "Gadget" from the name of gadgets.
---
src/modules/backlight/gadget/mod.c | 4 ++--
src/modules/mixer/gadget/mod.c | 4 ++--
src/modules/pager/gadget/mod.c | 4 ++--
src/modules/xkbswitch/gadget/mod.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/modules/backlight/gadget/mod.c
b/src/modules/backlight/gadget/mod.c
index 82b9d3a3c..4e618250f 100644
--- a/src/modules/backlight/gadget/mod.c
+++ b/src/modules/backlight/gadget/mod.c
@@ -7,7 +7,7 @@ e_modapi_gadget_init(E_Module *m)
{
gm = m;
backlight_init();
- e_gadget_type_add("Backlight Gadget", backlight_gadget_create, NULL);
+ e_gadget_type_add("Backlight", backlight_gadget_create, NULL);
return m;
}
@@ -15,7 +15,7 @@ EINTERN int
e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
{
backlight_shutdown();
- e_gadget_type_del("Backlight Gadget");
+ e_gadget_type_del("Backlight");
return 1;
}
diff --git a/src/modules/mixer/gadget/mod.c b/src/modules/mixer/gadget/mod.c
index bff5ba168..80daabf7c 100644
--- a/src/modules/mixer/gadget/mod.c
+++ b/src/modules/mixer/gadget/mod.c
@@ -18,7 +18,7 @@ e_modapi_gadget_init(E_Module *m)
if (!loaded)
goto err;
- e_gadget_type_add("Mixer Gadget", mixer_gadget_create, NULL);
+ e_gadget_type_add("Mixer", mixer_gadget_create, NULL);
return m;
err:
@@ -32,7 +32,7 @@ e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
{
mixer_shutdown();
- e_gadget_type_del("Mixer Gadget");
+ e_gadget_type_del("Mixer");
emix_shutdown();
diff --git a/src/modules/pager/gadget/mod.c b/src/modules/pager/gadget/mod.c
index 0b6f1e65e..c593c54ba 100644
--- a/src/modules/pager/gadget/mod.c
+++ b/src/modules/pager/gadget/mod.c
@@ -64,7 +64,7 @@ e_modapi_gadget_init(E_Module *m)
pager_init();
- e_gadget_type_add("Pager Gadget", pager_create, NULL);
+ e_gadget_type_add("Pager", pager_create, NULL);
return m;
}
@@ -89,7 +89,7 @@ e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
e_action_predef_name_del("Pager Gadget", "Popup Desk Next");
e_action_predef_name_del("Pager Gadget", "Popup Desk Previous");
- e_gadget_type_del("Pager Gadget");
+ e_gadget_type_del("Pager");
E_FREE(pager_config);
E_CONFIG_DD_FREE(conf_edd);
diff --git a/src/modules/xkbswitch/gadget/mod.c
b/src/modules/xkbswitch/gadget/mod.c
index 0c6e2fe28..eb2e094c4 100644
--- a/src/modules/xkbswitch/gadget/mod.c
+++ b/src/modules/xkbswitch/gadget/mod.c
@@ -7,7 +7,7 @@ e_modapi_gadget_init(E_Module *m)
{
_xkbg.module = m;
xkbg_init();
- e_gadget_type_add("Xkbswitch Gadget", xkbg_gadget_create, NULL);
+ e_gadget_type_add("Xkbswitch", xkbg_gadget_create, NULL);
return m;
}
@@ -16,7 +16,7 @@ e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
{
xkbg_shutdown();
_xkbg.module = NULL;
- e_gadget_type_del("Xkbswitch Gadget");
+ e_gadget_type_del("Xkbswitch");
return 1;
}
--
[EGIT] [core/enlightenment] master 01/01: Luncher: make sure all global handlers get created -- check for different luncher types in the callbacks.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=456e899b4424bdbd32d178eaa7545a36e005c3fc
commit 456e899b4424bdbd32d178eaa7545a36e005c3fc
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon May 22 13:28:51 2017 -0500
Luncher: make sure all global handlers get created -- check for different
luncher types in the callbacks.
---
src/modules/luncher/bar.c | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 5f50663..59bedac 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -1298,6 +1298,7 @@ _bar_cb_client_remove(void *data EINA_UNUSED, int type
EINA_UNUSED, E_Event_Clie
Icon *ic = NULL;
if (!inst->bar) continue;
+if (inst->cfg->type == E_LUNCHER_MODULE_LAUNCH_ONLY) continue;
if (ev->ec) ic = _bar_icon_match(inst, ev->ec);
if (ic)
{
@@ -1346,7 +1347,8 @@ _bar_cb_exec_del(void *data EINA_UNUSED, int type
EINA_UNUSED, E_Exec_Instance *
Icon *ic = NULL;
if (!inst->bar) continue;
-if (ex->desktop)
+if (inst->cfg->type == E_LUNCHER_MODULE_LAUNCH_ONLY) continue;
+ if (ex->desktop)
{
ic = eina_hash_find(inst->icons_desktop_hash,
ex->desktop->orig_path);
}
@@ -1421,7 +1423,8 @@ _bar_cb_exec_client_prop(void *data EINA_UNUSED, int type
EINA_UNUSED, E_Event_C
char ori[32];
if (!inst->bar) continue;
-ic = _bar_icon_match(inst, ev->ec);
+if (inst->cfg->type == E_LUNCHER_MODULE_LAUNCH_ONLY) continue;
+ ic = _bar_icon_match(inst, ev->ec);
if (skip && !ic) continue;
if (!skip)
{
@@ -1524,6 +1527,7 @@ _bar_cb_exec_new(void *data EINA_UNUSED, int type,
E_Exec_Instance *ex)
char ori[32];
if (!inst->bar) continue;
+if (inst->cfg->type == E_LUNCHER_MODULE_LAUNCH_ONLY) continue;
if (ec) ic = _bar_icon_match(inst, ec);
if (ic)
{
@@ -2145,19 +2149,16 @@ bar_create(Evas_Object *parent, int *id,
E_Gadget_Site_Orient orient EINA_UNUSED
_bar_cb_update_icons, NULL);
E_LIST_HANDLER_APPEND(handlers, EFREET_EVENT_ICON_CACHE_UPDATE,
_bar_cb_update_icons, NULL);
-if (inst->cfg->type != E_LUNCHER_MODULE_LAUNCH_ONLY)
- {
- E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW,
- _bar_cb_exec_new, NULL);
- E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW_CLIENT,
- _bar_cb_exec_new, NULL);
- E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_PROPERTY,
- _bar_cb_exec_client_prop, NULL);
- E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_DEL,
- _bar_cb_exec_del, NULL);
- E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_REMOVE,
- _bar_cb_client_remove, NULL);
- }
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW,
+ _bar_cb_exec_new, NULL);
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW_CLIENT,
+ _bar_cb_exec_new, NULL);
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_PROPERTY,
+ _bar_cb_exec_client_prop, NULL);
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_DEL,
+ _bar_cb_exec_del, NULL);
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_REMOVE,
+ _bar_cb_client_remove, NULL);
}
if (inst->cfg->id < 0) return inst->o_main;
luncher_instances = eina_list_append(luncher_instances, inst);
--
[EGIT] [core/enlightenment] master 01/01: Pager Gadget: Fix potential crash on screen changes such as screen size change.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=3b39279dfb986cd248af4c87c1eba3f66869117d
commit 3b39279dfb986cd248af4c87c1eba3f66869117d
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon May 22 13:14:55 2017 -0500
Pager Gadget: Fix potential crash on screen changes such as screen size
change.
---
src/modules/pager/gadget/pager.c | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index 6c36c18..6ac1e53 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -235,7 +235,7 @@ _pager_gadget_created_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNU
static void
_pager_orient(Instance *inst, E_Gadget_Site_Orient orient)
{
- int aspect_w, aspect_h;
+ int aspect_w, aspect_h, zone_w = 1, zone_h = 1;
if (inst->o_pager)
{
@@ -252,16 +252,21 @@ _pager_orient(Instance *inst, E_Gadget_Site_Orient orient)
inst->pager->invert = EINA_FALSE;
}
}
+ if (inst->pager->zone)
+ {
+zone_w = inst->pager->zone->w;
+zone_h = inst->pager->zone->h;
+ }
if (inst->pager->invert)
{
-aspect_w = inst->pager->ynum * inst->pager->zone->w;
-aspect_h = inst->pager->xnum * inst->pager->zone->h;
+aspect_w = inst->pager->ynum * zone_w;
+aspect_h = inst->pager->xnum * zone_h;
evas_object_size_hint_aspect_set(inst->o_pager,
EVAS_ASPECT_CONTROL_BOTH, aspect_w, aspect_h);
}
else
{
-aspect_w = inst->pager->xnum * inst->pager->zone->w;
-aspect_h = inst->pager->ynum * inst->pager->zone->h;
+aspect_w = inst->pager->xnum * zone_w;
+aspect_h = inst->pager->ynum * zone_h;
evas_object_size_hint_aspect_set(inst->o_pager,
EVAS_ASPECT_CONTROL_BOTH, aspect_w, aspect_h);
}
}
--
[EGIT] [core/enlightenment] master 01/01: Luncher Improvements: Don't add multiple global handlers for the same events and don't show preview immediately for iconic.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=171686f0a91339443353288b3e005fbc0503fc1b
commit 171686f0a91339443353288b3e005fbc0503fc1b
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon May 22 13:01:12 2017 -0500
Luncher Improvements: Don't add multiple global handlers for the same
events and don't show preview immediately for iconic.
This fixes T5377
---
src/modules/luncher/bar.c | 92 +--
1 file changed, 24 insertions(+), 68 deletions(-)
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 20c082d..5f50663 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -33,29 +33,6 @@ _bar_aspect(Instance *inst)
}
static Eina_Bool
-_bar_check_for_iconic(Icon *ic)
-{
- Eina_List *l, *ll, *clients = NULL;
- E_Client *ec;
- E_Exec_Instance *ex;
-
- EINA_LIST_FOREACH(ic->execs, l, ex)
- {
-EINA_LIST_FOREACH(ex->clients, ll, ec)
- clients = eina_list_append(clients, ec);
- }
- EINA_LIST_FOREACH(ic->clients, l, ec)
- clients = eina_list_append(clients, ec);
-
- EINA_LIST_FREE(clients, ec)
- {
- if (ec->iconic)
-return EINA_TRUE;
- }
- return EINA_FALSE;
-}
-
-static Eina_Bool
_bar_check_for_duplicates(Icon *ic, E_Client *dupe)
{
Eina_List *l, *ll, *clients = NULL;
@@ -990,8 +967,6 @@ _bar_icon_mouse_in(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *even
clients = EINA_TRUE;
if (clients && ic->inst->current_preview && !ic->inst->current_preview_menu)
_bar_icon_preview_show(ic);
- else if (_bar_check_for_iconic(ic))
- _bar_icon_preview_show(ic);
else if (clients && !ic->inst->current_preview)
ic->mouse_in_timer = ecore_timer_loop_add(0.3, _bar_icon_preview_show,
ic);
}
@@ -1014,8 +989,6 @@ _bar_exec_new_show(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *even
E_FREE_FUNC(ic->mouse_in_timer, ecore_timer_del);
if (ic->inst->current_preview && !ic->inst->current_preview_menu)
_bar_icon_preview_show(ic);
- else if (_bar_check_for_iconic(ic))
- _bar_icon_preview_show(ic);
else if (!ic->inst->current_preview)
ic->mouse_in_timer = ecore_timer_loop_add(0.3,
_bar_icon_preview_show, ic);
}
@@ -1783,6 +1756,7 @@ static void
_bar_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_data EINA_UNUSED)
{
Instance *inst = data;
+ Ecore_Event_Handler *handler;
inst->main_del = EINA_TRUE;
_bar_empty(inst);
@@ -1792,6 +1766,11 @@ _bar_del(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *ev
eina_hash_free(inst->icons_clients_hash);
luncher_instances = eina_list_remove(luncher_instances, inst);
free(inst);
+ if (!eina_list_count(luncher_instances))
+ {
+EINA_LIST_FREE(handlers, handler)
+ E_FREE_FUNC(handler, ecore_event_handler_del);
+ }
}
static void
@@ -1894,15 +1873,11 @@ _bar_removed_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_data)
{
Instance *inst = data;
char buf[4096];
- Ecore_Event_Handler *handler;
if (inst->o_main != event_data) return;
if (e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s",
inst->cfg->dir) >= sizeof(buf))
return;
- EINA_LIST_FREE(handlers, handler)
- E_FREE_FUNC(handler, ecore_event_handler_del);
-
E_FREE_FUNC(inst->iconify_provider, e_comp_object_effect_mover_del);
luncher_config->items = eina_list_remove(luncher_config->items, inst->cfg);
@@ -2108,30 +2083,8 @@ bar_reorder(Instance *inst)
EINTERN void
bar_config_updated(Instance *inst)
{
- Ecore_Event_Handler *handler;
const char *drop[] = { "enlightenment/desktop", "enlightenment/border",
"text/uri-list" };
- EINA_LIST_FREE(handlers, handler)
- E_FREE_FUNC(handler, ecore_event_handler_del);
-
- E_LIST_HANDLER_APPEND(handlers, E_EVENT_CONFIG_ICON_THEME,
- _bar_cb_update_icons, NULL);
- E_LIST_HANDLER_APPEND(handlers, EFREET_EVENT_ICON_CACHE_UPDATE,
- _bar_cb_update_icons, NULL);
- if (inst->cfg->type != E_LUNCHER_MODULE_LAUNCH_ONLY)
- {
-E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW,
- _bar_cb_exec_new, NULL);
-E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW_CLIENT,
- _bar_cb_exec_new, NULL);
-E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_PROPERTY,
- _bar_cb_exec_client_prop, NULL);
-E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_DEL,
- _bar_cb_exec_del, NULL);
-E_LIS
[EGIT] [core/enlightenment] master 01/01: Mixer/Backlight: Set correct levels on creation.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e5c337abfbe93d68b778523aa18be00ad748b658 commit e5c337abfbe93d68b778523aa18be00ad748b658 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Fri May 19 10:52:18 2017 -0500 Mixer/Backlight: Set correct levels on creation. This fixes T5500 --- src/modules/backlight/gadget/backlight.c | 2 ++ src/modules/mixer/gadget/mixer.c | 1 + 2 files changed, 3 insertions(+) diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c index 9118d18..bbf6435 100644 --- a/src/modules/backlight/gadget/backlight.c +++ b/src/modules/backlight/gadget/backlight.c @@ -261,6 +261,8 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA inst); elm_box_pack_end(inst->o_main, inst->o_backlight); evas_object_show(inst->o_backlight); +inst->val = e_backlight_level_get(e_zone_current_get()); + _backlight_gadget_update(inst); } evas_object_smart_callback_del_full(obj, "gadget_created", _backlight_gadget_created_cb, data); } diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c index 66d5ad3..fb602d7 100644 --- a/src/modules/mixer/gadget/mixer.c +++ b/src/modules/mixer/gadget/mixer.c @@ -625,6 +625,7 @@ _mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNU elm_box_pack_end(inst->o_main, inst->o_mixer); evas_object_show(inst->o_mixer); gmixer_context->instances = eina_list_append(gmixer_context->instances, inst); +_mixer_gadget_update(); } evas_object_smart_callback_del_full(obj, "gadget_created", _mixer_gadget_created_cb, data); } --
[EGIT] [core/enlightenment] master 01/01: Sysinfo: Fix use for non linux/bsd os's.
okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7d095c3fe3861b79b7a955035c6959e4c893efaf commit 7d095c3fe3861b79b7a955035c6959e4c893efaf Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Mon May 15 10:43:05 2017 -0500 Sysinfo: Fix use for non linux/bsd os's. This fixes T5485 --- src/modules/sysinfo/batman/batman.c | 2 +- src/modules/sysinfo/thermal/thermal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c index e992f25..ff5c499 100644 --- a/src/modules/sysinfo/batman/batman.c +++ b/src/modules/sysinfo/batman/batman.c @@ -366,7 +366,7 @@ _batman_config_updated(Instance *inst) #elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ok = _batman_sysctl_start(inst); #else -ok = _batman_upower_start(); +ok = _batman_upower_start(inst); if (ok) upower = EINA_TRUE; #endif diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c index e3e0d6b..ae39c69 100644 --- a/src/modules/sysinfo/thermal/thermal.c +++ b/src/modules/sysinfo/thermal/thermal.c @@ -161,7 +161,7 @@ _thermal_config_updated(Instance *inst) _thermal_check_done, tth, EINA_TRUE); #else - inst->cfg->thermal.th = ecore_thread_feedback_run(_thermal_check_main, + inst->cfg->thermal.th = ecore_thread_feedback_run(_thermal_check_fallback, _thermal_check_notify, _thermal_check_done, _thermal_check_done, --
[EGIT] [core/enlightenment] master 01/01: Gadgets: Send proper theme strings, and set aspect/size correctly.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9d0bcd9ce28d69c96aae8b01c93c8854aef2ae7d
commit 9d0bcd9ce28d69c96aae8b01c93c8854aef2ae7d
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri May 12 15:37:59 2017 -0500
Gadgets: Send proper theme strings, and set aspect/size correctly.
---
src/modules/backlight/gadget/backlight.c | 25 ++---
src/modules/mixer/gadget/mixer.c | 26 --
src/modules/xkbswitch/gadget/xkbswitch.c | 47
3 files changed, 80 insertions(+), 18 deletions(-)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index 1756a70..9118d18 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -218,6 +218,16 @@ _backlight_gadget_configure(Evas_Object *g EINA_UNUSED)
}
static void
+_backlight_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_data EINA_UNUSED)
+{
+ Evas_Coord w, h;
+ Instance *inst = data;
+
+ edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_backlight), 0,
0, , );
+ evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w,
h);
+}
+
+static void
_backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Instance *inst = data;
@@ -225,12 +235,16 @@ _backlight_gadget_created_cb(void *data, Evas_Object
*obj, void *event_info EINA
if (inst->o_main)
{
e_gadget_configure_cb_set(inst->o_main, _backlight_gadget_configure);
-//_backlight_orient(inst, e_gadget_site_orient_get(obj));
-
+
inst->o_backlight = elm_layout_add(inst->o_main);
E_EXPAND(inst->o_backlight);
E_FILL(inst->o_backlight);
-e_theme_edje_object_set(inst->o_backlight,
+if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL)
+ e_theme_edje_object_set(inst->o_backlight,
+ "base/theme/modules/backlight",
+ "e/modules/backlight/main_vert");
+else
+ e_theme_edje_object_set(inst->o_backlight,
"base/theme/modules/backlight",
"e/modules/backlight/main");
evas_object_event_callback_add(inst->o_backlight,
@@ -241,6 +255,10 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj,
void *event_info EINA
EVAS_CALLBACK_MOUSE_WHEEL,
_backlight_cb_mouse_wheel,
inst);
+evas_object_event_callback_add(inst->o_backlight,
+ EVAS_CALLBACK_RESIZE,
+ _backlight_resize_cb,
+ inst);
elm_box_pack_end(inst->o_main, inst->o_backlight);
evas_object_show(inst->o_backlight);
}
@@ -268,7 +286,6 @@ backlight_gadget_create(Evas_Object *parent, int *id
EINA_UNUSED, E_Gadget_Site_
inst->orient = orient;
E_EXPAND(inst->o_main);
E_FILL(inst->o_main);
- evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, 1,
1);
evas_object_smart_callback_add(parent, "gadget_created",
_backlight_gadget_created_cb, inst);
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL,
backlight_del, inst);
diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c
index 3f58259..66d5ad3 100644
--- a/src/modules/mixer/gadget/mixer.c
+++ b/src/modules/mixer/gadget/mixer.c
@@ -45,6 +45,7 @@ struct _Instance
Evas_Object *list;
Evas_Object *slider;
Evas_Object *check;
+ E_Gadget_Site_Orient orient;
Eina_Bool mute;
};
@@ -586,6 +587,16 @@ _mixer_gadget_configure(Evas_Object *g EINA_UNUSED)
}
static void
+_mixer_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_data EINA_UNUSED)
+{
+ Evas_Coord w, h;
+ Instance *inst = data;
+
+ edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_mixer), 0, 0,
, );
+ evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w,
h);
+}
+
+static void
_mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Instance *inst = data;
@@ -597,11 +608,20 @@ _mixer_gadget_created_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNU
inst->o_mixer = elm_layout_add(inst->o_main);
E_EXPAND(inst->o_mixer);
E_FILL(inst->o_mixer);
-e_theme_edje_object_set(inst->o_mixer, "base/theme/modules/mixer",
"e/modules/mixer/main");
+ if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL)
+ e_theme_edje_object_set(inst->o_mixer,
+
[EGIT] [core/efl] master 01/01: Shelf/Gadget themes... Update with proper horiz/vert theme strings for future theme developers.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ad2ba804c69e38cc925e80ace843fe400e303319
commit ad2ba804c69e38cc925e80ace843fe400e303319
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri May 12 15:35:46 2017 -0500
Shelf/Gadget themes... Update with proper horiz/vert theme strings for
future theme developers.
---
data/elementary/themes/edc/backlight.edc | 1 +
data/elementary/themes/edc/mixer.edc | 1 +
data/elementary/themes/edc/xkbswitch.edc | 2 ++
3 files changed, 4 insertions(+)
diff --git a/data/elementary/themes/edc/backlight.edc
b/data/elementary/themes/edc/backlight.edc
index 4387663..9313602 100644
--- a/data/elementary/themes/edc/backlight.edc
+++ b/data/elementary/themes/edc/backlight.edc
@@ -1,4 +1,5 @@
group { name: "e/modules/backlight/main";
+ alias: "e/modules/backlight/main_vert";
images.image: "bulb_glow.png" COMP;
images.image: "bulb_off.png" COMP;
images.image: "bulb_on.png" COMP;
diff --git a/data/elementary/themes/edc/mixer.edc
b/data/elementary/themes/edc/mixer.edc
index 149820b..802b1b8 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -1,4 +1,5 @@
group { name: "e/modules/mixer/main";
+ alias: "e/modules/mixer/main_vert";
images.image: "speaker.png" COMP;
images.image: "inset_round_hilight.png" COMP;
images.image: "inset_round_shadow.png" COMP;
diff --git a/data/elementary/themes/edc/xkbswitch.edc
b/data/elementary/themes/edc/xkbswitch.edc
index bd61ffc..b6a58b8 100644
--- a/data/elementary/themes/edc/xkbswitch.edc
+++ b/data/elementary/themes/edc/xkbswitch.edc
@@ -1,4 +1,5 @@
group { name: "e/modules/xkbswitch/main";
+ alias: "e/modules/xkbswitch/main_vert";
images.image: "shadow_square_tiny.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
@@ -91,6 +92,7 @@ group { name: "e/modules/xkbswitch/main";
}
group { name: "e/modules/xkbswitch/noflag";
+ alias: "e/modules/xkbswitch/noflag_vert";
images.image: "shadow_square_tiny.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
--
[EGIT] [core/enlightenment] master 01/01: Backlight Gadget: Properly set on hold events.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ac2c9a220fd45ba2dac1efa2e3b58190b57200e2
commit ac2c9a220fd45ba2dac1efa2e3b58190b57200e2
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri May 12 09:57:48 2017 -0500
Backlight Gadget: Properly set on hold events.
---
src/modules/backlight/gadget/backlight.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/modules/backlight/gadget/backlight.c
b/src/modules/backlight/gadget/backlight.c
index 3f49fd7..1756a70 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -129,6 +129,8 @@ _backlight_cb_mouse_down(void *data, Evas *evas
EINA_UNUSED, Evas_Object *obj EI
Instance *inst = data;
Evas_Event_Mouse_Down *ev = event;
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+
if (ev->button == 1)
{
if (inst->popup) elm_ctxpopup_dismiss(inst->popup);
@@ -136,6 +138,7 @@ _backlight_cb_mouse_down(void *data, Evas *evas
EINA_UNUSED, Evas_Object *obj EI
}
else if (ev->button == 3)
{
+ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
e_gadget_configure(inst->o_main);
}
}
--
[EGIT] [core/enlightenment] master 01/01: Bryce/Gadgets: Add backlight, xkbswitch, and mixer gadgets. This should round out the core gadget ports.
okra pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=20f94cec74b7a7d1c28eabba1704a95e7dcc261d
commit 20f94cec74b7a7d1c28eabba1704a95e7dcc261d
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Thu May 11 17:13:15 2017 -0500
Bryce/Gadgets: Add backlight, xkbswitch, and mixer gadgets. This should
round out the core gadget ports.
All three of these gadgets are ports of the existing modules of the same
name and are contained within those directories. Once the move from shelves ->
bryce and gadcon->gadgets is complete, backlight and mixer will likely need to
go into the sysinfo gadget.
---
src/modules/Makefile_backlight.mk | 5 +-
src/modules/Makefile_mixer.mk | 3 +
src/modules/Makefile_xkbswitch.mk | 5 +-
src/modules/backlight/e_mod_main.c | 11 +-
src/modules/backlight/gadget/backlight.c | 300 +
src/modules/backlight/gadget/backlight.h | 16 +
src/modules/backlight/gadget/mod.c | 27 +
src/modules/mixer/e_mod_main.c | 10 +-
src/modules/mixer/{e_mod_main.c => gadget/mixer.c} | 723 +++--
src/modules/mixer/gadget/mixer.h | 31 +
src/modules/mixer/gadget/mod.c | 49 ++
src/modules/pager/gadget/mod.c | 6 +-
src/modules/pager/gadget/pager.h | 6 +-
src/modules/xkbswitch/e_mod_main.c | 10 +-
src/modules/xkbswitch/gadget/mod.c | 28 +
src/modules/xkbswitch/gadget/xkbswitch.c | 284
src/modules/xkbswitch/gadget/xkbswitch.h | 25 +
17 files changed, 1028 insertions(+), 511 deletions(-)
diff --git a/src/modules/Makefile_backlight.mk
b/src/modules/Makefile_backlight.mk
index 2fbb123..37d5a8e 100644
--- a/src/modules/Makefile_backlight.mk
+++ b/src/modules/Makefile_backlight.mk
@@ -12,7 +12,10 @@ backlightpkg_LTLIBRARIES = src/modules/backlight/module.la
src_modules_backlight_module_la_LIBADD = $(MOD_LIBS)
src_modules_backlight_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
src_modules_backlight_module_la_LDFLAGS = $(MOD_LDFLAGS)
-src_modules_backlight_module_la_SOURCES = src/modules/backlight/e_mod_main.c
+src_modules_backlight_module_la_SOURCES = src/modules/backlight/e_mod_main.c \
+
src/modules/backlight/gadget/backlight.h \
+
src/modules/backlight/gadget/backlight.c \
+ src/modules/backlight/gadget/mod.c
PHONIES += backlight install-backlight
backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA)
diff --git a/src/modules/Makefile_mixer.mk b/src/modules/Makefile_mixer.mk
index 4f90cf1..5a8f53b 100644
--- a/src/modules/Makefile_mixer.mk
+++ b/src/modules/Makefile_mixer.mk
@@ -34,6 +34,9 @@ src_modules_mixer_module_la_SOURCES =
src/modules/mixer/e_mod_main.c \
src/modules/mixer/e_mod_main.h \
src/modules/mixer/e_mod_config.c \
src/modules/mixer/e_mod_config.h \
+ src/modules/mixer/gadget/mixer.h \
+ src/modules/mixer/gadget/mixer.c \
+ src/modules/mixer/gadget/mod.c \
$(emixerlib)
src_modules_mixer_module_la_LIBADD = $(MOD_LIBS) @PULSE_LIBS@ @ALSA_LIBS@
diff --git a/src/modules/Makefile_xkbswitch.mk
b/src/modules/Makefile_xkbswitch.mk
index 1b4df52..00ef2ec 100644
--- a/src/modules/Makefile_xkbswitch.mk
+++ b/src/modules/Makefile_xkbswitch.mk
@@ -16,7 +16,10 @@ src_modules_xkbswitch_module_la_SOURCES =
src/modules/xkbswitch/e_mod_main.c \
src/modules/xkbswitch/e_mod_main.h \
src/modules/xkbswitch/e_mod_config.c \
src/modules/xkbswitch/e_mod_parse.c \
- src/modules/xkbswitch/e_mod_parse.h
+ src/modules/xkbswitch/e_mod_parse.h \
+ src/modules/xkbswitch/gadget/xkbswitch.h \
+ src/modules/xkbswitch/gadget/xkbswitch.c \
+ src/modules/xkbswitch/gadget/mod.c
PHONIES += xkbswitch install-xkbswitch
xkbswitch: $(xkbswitchpkg_LTLIBRARIES) $(xkbswitch_DATA)
diff --git a/src/modules/backlight/e_mod_main.c
b/src/modules/backlight/e_mod_main.c
index e7e16bd..75356ed 100644
--- a/src/modules/backlight/e_mod_main.c
+++ b/src/modules/backlight/e_mod_main.c
@@ -10,6 +10,7 @@
*/
#include "e.h"
+#include "gadget/backlight.h"
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char
*id, const char *style);
@@ -469,6 +470,8 @@ E_API E_Module_Api e_modapi =
E_API void *
e_modapi_init(E_Module *m)
{
+ e_modapi_gadget_
[EGIT] [apps/ephoto] master 01/01: Ephoto: Check that a path exists before running file_file_get on it.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=1265151a8324398555ade623c5008cc4db9408e5
commit 1265151a8324398555ade623c5008cc4db9408e5
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed May 10 14:03:48 2017 -0500
Ephoto: Check that a path exists before running file_file_get on it.
---
src/bin/ephoto_single_browser.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 8fe06f2..5faa42f 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -1598,9 +1598,12 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
}
if (sb->entry)
{
- const char *bname = ecore_file_file_get(sb->entry->path);
+ const char *bname = NULL;
- sb->viewer = _viewer_add(sb->main, sb->entry->path, sb);
+if (ecore_file_exists(sb->entry->path))
+ bname = ecore_file_file_get(sb->entry->path);
+if (bname)
+ sb->viewer = _viewer_add(sb->main, sb->entry->path, sb);
if (sb->viewer)
{
elm_object_part_content_set(sb->mhbox, "left", sb->viewer);
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Implement open/closed folder icon changing and clean up some fdo icons.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=9474ceaa00ccddf020dc5df0ac9f953834cf7b56
commit 9474ceaa00ccddf020dc5df0ac9f953834cf7b56
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Mon May 8 16:21:41 2017 -0500
Ephoto: Implement open/closed folder icon changing and clean up some fdo
icons.
---
src/bin/ephoto.h | 1 +
src/bin/ephoto_directory_browser.c | 26 +--
src/bin/ephoto_main.c | 30 +---
src/bin/ephoto_single_browser.c| 94 --
src/bin/ephoto_slideshow.c | 9 +---
src/bin/ephoto_thumb_browser.c | 8 ++--
6 files changed, 112 insertions(+), 56 deletions(-)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 33f0a69..a3edc90 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -247,6 +247,7 @@ struct _Ephoto
Evas_Object *pager;
Evas_Object *statusbar;
Evas_Object *folders_button;
+ Evas_Object *folders_icon;
Evas_Object *view_button;
Evas_Object *controls_left;
Evas_Object *controls_right;
diff --git a/src/bin/ephoto_directory_browser.c
b/src/bin/ephoto_directory_browser.c
index e6d9846..86c44d6 100644
--- a/src/bin/ephoto_directory_browser.c
+++ b/src/bin/ephoto_directory_browser.c
@@ -240,7 +240,7 @@ _on_list_expand_req(void *data, Evas_Object *obj
EINA_UNUSED,
}
static void
-_on_list_contract_req(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+_on_list_contract_req(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
Ephoto_Directory_Browser *db = data;
@@ -261,9 +261,13 @@ _on_list_expanded(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
Ephoto_Directory_Browser *db = data;
Elm_Object_Item *it = event_info;
+ Evas_Object *icon;
Ephoto_Entry *entry;
const char *path;
+ icon = elm_object_item_part_content_get(it, "elm.swallow.icon");
+ elm_icon_standard_set(icon, "folder-open");
+
if (db->initializing)
return;
@@ -285,9 +289,13 @@ _on_list_contracted(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
Ephoto_Directory_Browser *db = data;
Elm_Object_Item *it = event_info;
+ Evas_Object *icon;
Ephoto_Entry *entry;
const char *path;
+ icon = elm_object_item_part_content_get(it, "elm.swallow.icon");
+ elm_icon_standard_set(icon, "folder");
+
if (db->initializing)
return;
@@ -357,14 +365,26 @@ _dir_item_text_get(void *data, Evas_Object *obj
EINA_UNUSED,
}
static Evas_Object *
-_dir_item_icon_get(void *data EINA_UNUSED, Evas_Object *obj,
+_dir_item_icon_get(void *data, Evas_Object *obj,
const char *part)
{
+ Ephoto_Entry *entry = data;
+
if (!strcmp(part, "elm.swallow.end"))
return NULL;
Evas_Object *ic = elm_icon_add(obj);
- elm_icon_standard_set(ic, "folder");
+ if (entry->item)
+ {
+if (elm_genlist_item_expanded_get(entry->item))
+ elm_icon_standard_set(ic, "folder-open");
+else
+ elm_icon_standard_set(ic, "folder");
+ }
+ else
+ {
+elm_icon_standard_set(ic, "folder");
+ }
return ic;
}
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 2b597b2..703e9eb 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -267,13 +267,15 @@ _folder_icon_clicked(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
Ephoto *ephoto = data;
+ int ret = 0;
if (!ephoto->folders_toggle)
{
elm_panes_content_left_min_size_set(ephoto->layout, 0);
elm_panes_content_left_size_set(ephoto->layout,
ephoto->config->left_size);
ephoto->folders_toggle = EINA_TRUE;
-if (elm_object_text_get(obj))
+ret = elm_icon_standard_set(ephoto->folders_icon, "folder-open");
+ if (!ret)
elm_object_text_set(obj, _("Hide Folders"));
elm_object_tooltip_text_set(obj, _("Hide Folders"));
}
@@ -282,7 +284,8 @@ _folder_icon_clicked(void *data, Evas_Object *obj,
elm_panes_content_left_min_size_set(ephoto->layout, 0);
elm_panes_content_left_size_set(ephoto->layout, 0.0);
ephoto->folders_toggle = EINA_FALSE;
-if (elm_object_text_get(obj))
+ret = elm_icon_standard_set(ephoto->folders_icon, "folder");
+ if (!ret)
elm_object_text_set(obj, _("Show Folders"));
elm_object_tooltip_text_set(obj, _("Show Folders"));
}
@@ -333,13 +336,18 @@ _ephoto_left_pane_resized(void *data, Evas_Object *obj
EINA_UNUSED,
void
ephoto_show_folders(Ephoto *ephoto, Eina_Bool toggle)
{
+ int ret = 0;
+
if (!ephoto->folders_toggle || !toggle)
{
elm_panes_content_left_min_size_set(ephoto->layout, 0);
elm_pa
[EGIT] [apps/ephoto] master 01/01: Ephoto: Fix a potential crash when switching directories in single view.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=5759135ad3e064aa33899dd805ec17aad17c1697
commit 5759135ad3e064aa33899dd805ec17aad17c1697
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Fri May 5 11:08:15 2017 -0500
Ephoto: Fix a potential crash when switching directories in single view.
---
src/bin/ephoto_single_browser.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 481eca3..282c753 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -2142,10 +2142,18 @@ ephoto_single_browser_entries_set(Evas_Object *obj,
Eina_List *entries)
elm_image_file_get(v->image, , NULL);
dir = ecore_file_dir_get(image);
- if (strcmp(sb->ephoto->config->directory, dir))
-ephoto_single_browser_entry_set(sb->main,
+ if (!dir)
+{
+ ephoto_single_browser_entry_set(sb->main,
_first_entry_find(sb));
- free(dir);
+}
+ else
+{
+ if (strcmp(sb->ephoto->config->directory, dir))
+ ephoto_single_browser_entry_set(sb->main,
+ _first_entry_find(sb));
+ free(dir);
+ }
}
else
ephoto_single_browser_entry_set(sb->main,
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: make sure the monitor callback for delete is on the file we are working on.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=e53ee13f3cfaf0b8c1cc4e094587f3a0a633bdeb
commit e53ee13f3cfaf0b8c1cc4e094587f3a0a633bdeb
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Wed May 3 09:26:45 2017 -0500
Ephoto: make sure the monitor callback for delete is on the file we are
working on.
---
src/bin/ephoto_main.c | 1 +
src/bin/ephoto_single_browser.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index fba4cda..2b597b2 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -498,6 +498,7 @@ ephoto_window_add(const char *path)
ephoto->infolabel = elm_label_add(ephoto->statusbar);
elm_object_style_set(ephoto->infolabel, "info");
elm_label_line_wrap_set(ephoto->infolabel, ELM_WRAP_MIXED);
+ elm_label_ellipsis_set(ephoto->infolabel, EINA_TRUE);
elm_object_text_set(ephoto->infolabel, _("Information"));
EPHOTO_EXPAND(ephoto->infolabel);
EPHOTO_FILL(ephoto->infolabel);
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index f8dc3b1..481eca3 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -338,7 +338,8 @@ _monitor_cb(void *data, int type,
}
else if (type == EIO_MONITOR_FILE_DELETED)
{
-_ephoto_main_back(sb, NULL, NULL);
+if (!ecore_file_exists(sb->entry->path))
+ _ephoto_main_back(sb, NULL, NULL);
}
return ECORE_CALLBACK_PASS_ON;
}
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Factor out common code, use "start" for Windows based devices instead of xdg-open, improve compiler flags.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=3480bb44b39a169b8eb052a3a8826452b2265cd8
commit 3480bb44b39a169b8eb052a3a8826452b2265cd8
Author: Stephen 'Okra' Houston <smhousto...@gmail.com>
Date: Tue May 2 11:19:43 2017 -0500
Ephoto: Factor out common code, use "start" for Windows based devices
instead of xdg-open, improve compiler flags.
---
src/bin/Makefile.am| 8 ++
src/bin/ephoto.h | 28 +++-
src/bin/ephoto_bcg.c | 83 ---
src/bin/ephoto_color.c | 219
src/bin/ephoto_config.c| 10 +-
src/bin/ephoto_directory_browser.c | 88 ++--
src/bin/ephoto_file.c | 4 +
src/bin/ephoto_filters.c | 283 +
src/bin/ephoto_hsv.c | 83 ---
src/bin/ephoto_main.c | 46 +++---
src/bin/ephoto_red_eye.c | 47 ++
src/bin/ephoto_thumb_browser.c | 8 +-
12 files changed, 362 insertions(+), 545 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 50d0d34..1d20fc2 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -50,6 +50,14 @@ ephoto_thumbnail_CPPFLAGS = \
-Wall \
-Wextra \
-Wshadow \
+-Wdeclaration-after-statement \
+-Wmissing-prototypes \
+-Wstrict-prototypes \
+-Wpointer-arith \
+-Wno-missing-field-initializers \
+-fvisibility=hidden \
+-fdata-sections \
+-ffunction-sections \
@EFL_CFLAGS@
ephoto_thumbnail_LDADD = @EFL_LIBS@
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 7895422..33f0a69 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -344,7 +344,7 @@ static inline Eina_Bool
_ephoto_eina_file_direct_info_image_useful(const Eina_File_Direct_Info *info)
{
const char *type, *bname;
- int i = 0;
+ int i = 0, count = 0;
const char *filters[] = {
"png", "jpeg", "jpg", "eet", "xpm", "tiff", "gif", "svg", "webp",
@@ -365,7 +365,7 @@ _ephoto_eina_file_direct_info_image_useful(const
Eina_File_Direct_Info *info)
type = strrchr(bname, '.');
if (!type)
return EINA_FALSE;
- int count = sizeof(filters) / sizeof(filters[0]);
+ count = sizeof(filters) / sizeof(filters[0]);
for (i = 0; i < count; i++)
{
@@ -379,14 +379,13 @@ _ephoto_eina_file_direct_info_image_useful(const
Eina_File_Direct_Info *info)
static inline Eina_Bool
_ephoto_file_image_can_save(const char *ext)
{
- int i = 0;
+ int i = 0, count = 0;
const char *filters[] = {
"png", "jpeg", "jpg", "eet", "xpm", "tiff", "tif", "gif", "svg", "webp",
"pmaps", "bmp", "wbmp", "ico", "generic"
};
-
- int count = sizeof(filters) / sizeof(filters[0]);
+ count = sizeof(filters) / sizeof(filters[0]);
for (i = 0; i < count; i++)
{
if (!strcasecmp(ext, filters[i]))
@@ -395,6 +394,25 @@ _ephoto_file_image_can_save(const char *ext)
return EINA_FALSE;
}
+/*RGBA Functions*/
+static inline int
+ephoto_normalize_color(int color)
+{
+ return (color >= 0 && color <= 255) ? color : (color < 0) ? 0 : 255;
+}
+
+static inline int
+ephoto_mul_color_alpha(int color, int alpha)
+{
+ return (alpha > 0 && alpha <= 255) ? (color * (255 /alpha)) : color;
+}
+
+static inline int
+ephoto_demul_color_alpha(int color, int alpha)
+{
+ return (alpha > 0 && alpha <= 255) ? ((color * alpha) / 255) : color;
+}
+
/*event types*/
extern int EPHOTO_EVENT_ENTRY_CREATE;
extern int EPHOTO_EVENT_POPULATE_START;
diff --git a/src/bin/ephoto_bcg.c b/src/bin/ephoto_bcg.c
index 7cdb73f..4bd0815 100644
--- a/src/bin/ephoto_bcg.c
+++ b/src/bin/ephoto_bcg.c
@@ -18,35 +18,6 @@ struct _Ephoto_BCG
unsigned int *original_im_data;
};
-static int
-_normalize_color(int color)
-{
- if (color < 0)
- return 0;
- else if (color > 255)
- return 255;
- else
- return color;
-}
-
-static int
-_mul_color_alpha(int color, int alpha)
-{
- if (alpha > 0 && alpha < 255)
- return color * (255 / alpha);
- else
- return color;
-}
-
-static int
-_demul_color_alpha(int color, int alpha)
-{
- if (alpha > 0 && alpha < 255)
- return (color * alpha) / 255;
- else
- return color;
-}
-
unsigned int *
_ephoto_bcg_adjust_brightness(Ephoto_BCG *ebcg, int brightness,
unsigned int *image_data)
@@ -75,18 +46,18 @@ _ephoto_bcg_adjust_brightness(Ephoto_BCG *ebcg, int
brightness,
g = (int) ((*p1 >> 8) & 0xff);
r = (int) ((*p1 >> 16) & 0xff);
a = (i
[EGIT] [apps/ephoto] master 01/01: Ephoto: Remove trailing /
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=d8e2df3092f564c0462ba12d7d909da86114e544 commit d8e2df3092f564c0462ba12d7d909da86114e544 Author: Stephen 'Okra' Houston <smhousto...@gmail.com> Date: Mon May 1 22:30:20 2017 -0500 Ephoto: Remove trailing / --- src/bin/ephoto_directory_browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ephoto_directory_browser.c b/src/bin/ephoto_directory_browser.c index 17b63cf..5ecf7a8 100644 --- a/src/bin/ephoto_directory_browser.c +++ b/src/bin/ephoto_directory_browser.c @@ -414,7 +414,7 @@ _trash_back(void *data, Evas_Object *obj EINA_UNUSED, elm_box_clear(db->leftbox); db->fsel = db->fsel_back; - elm_box_pack_end(db->leftbox, db->fsel);\ + elm_box_pack_end(db->leftbox, db->fsel); evas_object_show(db->fsel); db->fsel_back = NULL; --
