[EGIT] [apps/evisum] master 01/01: openbsd: clarify sysctl use
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=8a9146909eb4638419199e22e74835b54396f0aa
commit 8a9146909eb4638419199e22e74835b54396f0aa
Author: Alastair Poole
Date: Thu Jun 18 00:39:47 2020 +0100
openbsd: clarify sysctl use
---
src/bin/system/machine.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c
index 6b7225c..41b7d3f 100644
--- a/src/bin/system/machine.c
+++ b/src/bin/system/machine.c
@@ -835,28 +835,27 @@ _battery_state_get(power_t *power)
charge_full = charge_current = 0;
mib = power->bat_mibs[i];
-mib[3] = 7;
+mib[3] = SENSOR_WATTHOUR;
mib[4] = 0;
if (sysctl(mib, 5, , , NULL, 0) != -1)
charge_full = (double)snsr.value;
-mib[3] = 7;
+mib[3] = SENSOR_WATTHOUR;
mib[4] = 3;
if (sysctl(mib, 5, , , NULL, 0) != -1)
charge_current = (double)snsr.value;
-/* ACPI bug workaround... */
if (charge_current == 0 || charge_full == 0)
{
- mib[3] = 8;
+ mib[3] = SENSOR_AMPHOUR;
mib[4] = 0;
if (sysctl(mib, 5, , , NULL, 0) != -1)
charge_full = (double)snsr.value;
- mib[3] = 8;
+ mib[3] = SENSOR_AMPHOUR;
mib[4] = 3;
if (sysctl(mib, 5, , , NULL, 0) != -1)
--
[EGIT] [apps/evisum] master 01/01: machine: Rename
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=30dba9499ed32cc115fe109cf47a1322b3415cd4
commit 30dba9499ed32cc115fe109cf47a1322b3415cd4
Author: Alastair Poole
Date: Wed Jun 17 23:08:44 2020 +0100
machine: Rename
---
src/bin/system/machine.c | 4 ++--
src/bin/system/machine.h | 4 ++--
src/bin/ui/ui.c | 12 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c
index 4775155..6b7225c 100644
--- a/src/bin/system/machine.c
+++ b/src/bin/system/machine.c
@@ -1182,7 +1182,7 @@ _network_transfer_get_thread_cb(void *arg)
}
void
-sys_info_all_free(Sys_Info *info)
+system_info_all_free(Sys_Info *info)
{
sensor_t *snsr;
int i;
@@ -1215,7 +1215,7 @@ sys_info_all_free(Sys_Info *info)
}
Sys_Info *
-sys_info_all_get(void)
+system_info_all_get(void)
{
Sys_Info *info;
void *ret;
diff --git a/src/bin/system/machine.h b/src/bin/system/machine.h
index b5f7423..aa88b0d 100644
--- a/src/bin/system/machine.h
+++ b/src/bin/system/machine.h
@@ -67,10 +67,10 @@ struct Sys_Info
};
Sys_Info *
-sys_info_all_get(void);
+system_info_all_get(void);
void
-sys_info_all_free(Sys_Info *);
+system_info_all_free(Sys_Info *);
int
system_cpu_online_count_get();
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index c0915fb..7e2244a 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -1535,13 +1535,13 @@ _thread_error_cb(void *data EINA_UNUSED, Ecore_Thread
*thread)
}
static void
-_sys_info_all_poll(void *data, Ecore_Thread *thread)
+_system_info_all_poll(void *data, Ecore_Thread *thread)
{
Ui *ui = data;
while (1)
{
-Sys_Info *info = sys_info_all_get();
+Sys_Info *info = system_info_all_get();
if (!info)
{
ecore_main_loop_quit();
@@ -1565,7 +1565,7 @@ _sys_info_all_poll(void *data, Ecore_Thread *thread)
}
static void
-_sys_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
+_system_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
{
Ui *ui;
Evas_Object *pb;
@@ -1603,7 +1603,7 @@ _sys_info_all_poll_feedback_cb(void *data, Ecore_Thread
*thread, void *msg)
evisum_size_format(info->memory.used),
evisum_size_format(info->memory.total)));
out:
- sys_info_all_free(info);
+ system_info_all_free(info);
}
static void
@@ -1612,8 +1612,8 @@ _ui_launch(Ui *ui)
_process_list_update(ui);
ui->thread_system =
- ecore_thread_feedback_run(_sys_info_all_poll,
- _sys_info_all_poll_feedback_cb, _thread_end_cb,
+ ecore_thread_feedback_run(_system_info_all_poll,
+ _system_info_all_poll_feedback_cb, _thread_end_cb,
_thread_error_cb, ui, EINA_FALSE);
ui->thread_process =
--
[EGIT] [apps/evisum] master 01/01: filesystems: fix naming
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=ce200bf65fb9c55f89879ce7af3fe8e7a088cf79
commit ce200bf65fb9c55f89879ce7af3fe8e7a088cf79
Author: Alastair Poole
Date: Wed Jun 17 23:04:52 2020 +0100
filesystems: fix naming
---
src/bin/system/filesystems.c | 26 +-
src/bin/system/filesystems.h | 16
src/bin/ui/ui.c | 2 +-
src/bin/ui/ui_disk.c | 10 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/bin/system/filesystems.c b/src/bin/system/filesystems.c
index c45cb32..e289131 100644
--- a/src/bin/system/filesystems.c
+++ b/src/bin/system/filesystems.c
@@ -108,7 +108,7 @@ static _magic _magique[] = {
};
unsigned int
-filesystem_id_by_name(const char *name)
+file_system_id_by_name(const char *name)
{
size_t n = sizeof(_magique) / sizeof(_magic);
for (int i = 0; i < n; i++)
@@ -120,7 +120,7 @@ filesystem_id_by_name(const char *name)
}
const char *
-filesystem_name_by_id(unsigned int id)
+file_system_name_by_id(unsigned int id)
{
size_t n = sizeof(_magique) / sizeof(_magic);
for (int i = 0; i < n; i++)
@@ -133,7 +133,7 @@ filesystem_name_by_id(unsigned int id)
#if defined(__linux__)
static char *
-filesystem_type_name(const char *mountpoint)
+file_system_type_name(const char *mountpoint)
{
FILE *f;
char *mount, *res, *type, *end;
@@ -166,10 +166,10 @@ filesystem_type_name(const char *mountpoint)
#endif
-Filesystem_Info *
-filesystem_info_get(const char *path)
+File_System *
+file_system_info_get(const char *path)
{
- Filesystem_Info *fs;
+ File_System *fs;
const char *mountpoint;
struct statfs stats;
@@ -179,7 +179,7 @@ filesystem_info_get(const char *path)
if (statfs(mountpoint, ) < 0)
return NULL;
- fs = calloc(1, sizeof(Filesystem_Info));
+ fs = calloc(1, sizeof(File_System));
fs->mount = strdup(mountpoint);
fs->path = strdup(path);
@@ -189,7 +189,7 @@ filesystem_info_get(const char *path)
#endif
#if defined(__linux__)
- fs->type_name = filesystem_type_name(fs->mount);
+ fs->type_name = file_system_type_name(fs->mount);
#else
fs->type_name = strdup(stats.f_fstypename);
#endif
@@ -201,7 +201,7 @@ filesystem_info_get(const char *path)
}
void
-filesystem_info_free(Filesystem_Info *fs)
+file_system_info_free(File_System *fs)
{
free(fs->mount);
free(fs->path);
@@ -211,7 +211,7 @@ filesystem_info_free(Filesystem_Info *fs)
}
Eina_Bool
-filesystem_in_use(const char *name)
+file_system_in_use(const char *name)
{
Eina_List *disks;
char *path;
@@ -221,13 +221,13 @@ filesystem_in_use(const char *name)
disks = disks_get();
EINA_LIST_FREE(disks, path)
{
-Filesystem_Info *fs = filesystem_info_get(path);
+File_System *fs = file_system_info_get(path);
if (fs)
{
- if (fs->type == filesystem_id_by_name(name))
+ if (fs->type == file_system_id_by_name(name))
fs_mounted = EINA_TRUE;
- filesystem_info_free(fs);
+ file_system_info_free(fs);
}
free(path);
}
diff --git a/src/bin/system/filesystems.h b/src/bin/system/filesystems.h
index e0f0d18..a7d8c9f 100644
--- a/src/bin/system/filesystems.h
+++ b/src/bin/system/filesystems.h
@@ -8,27 +8,27 @@ typedef struct {
unsigned long long used;
} _Usage;
-typedef struct _Filesystem_Info {
+typedef struct _File_System {
char *path;
char *mount;
char *type_name;
unsigned int type;
_Usageusage;
-} Filesystem_Info;
+} File_System;
const char *
-filesystem_name_by_id(unsigned int id);
+file_system_name_by_id(unsigned int id);
unsigned int
-filesystem_id_by_name(const char *name);
+file_system_id_by_name(const char *name);
-Filesystem_Info *
-filesystem_info_get(const char *path);
+File_System *
+file_system_info_get(const char *path);
void
-filesystem_info_free(Filesystem_Info *fs);
+file_system_info_free(File_System *fs);
Eina_Bool
-filesystem_in_use(const char *name);
+file_system_in_use(const char *name);
#endif
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index c99ce49..c0915fb 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -1646,7 +1646,7 @@ _ui_init(Evas_Object *parent)
ui->cpu_list = NULL;
// Only take account of the ZFS ARC if there is an active mount.
- ui->zfs_mounted = filesystem_in_use("ZFS");
+ ui->zfs_mounted = file_system_in_use("ZFS");
_ui = NULL;
_evisum_config = NULL;
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index d6b5f6c..ef86a4a 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -38,7 +38,7 @@ ui_tab_disk_add(Ui *ui)
}
static void
-_ui_disk_add(Ui *ui, Filesystem_Info *inf)
+_ui_disk_add(Ui *ui, File_System *inf)
{
Evas_Object *box, *frame, *pb, *label;
const char *type;
@@ -46,7 +46,7 @@ _ui_disk_add(Ui *ui,
[EGIT] [apps/evisum] master 01/01: ui: rename
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=461c34fc0dd2c0250627b6e6c1cc700c398dbdc8
commit 461c34fc0dd2c0250627b6e6c1cc700c398dbdc8
Author: Alastair Poole
Date: Wed Jun 17 22:34:25 2020 +0100
ui: rename
---
src/bin/system/machine.c | 80 -
src/bin/ui/ui.c | 70 ++---
src/bin/ui/ui_cpu.c | 24 +-
src/bin/ui/ui_cpu.h | 2 +-
src/bin/ui/ui_disk.c | 18
src/bin/ui/ui_memory.c | 112 +++
src/bin/ui/ui_memory.h | 2 +-
src/bin/ui/ui_misc.c | 76
src/bin/ui/ui_misc.h | 2 +-
9 files changed, 192 insertions(+), 194 deletions(-)
diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c
index 727440b..4775155 100644
--- a/src/bin/system/machine.c
+++ b/src/bin/system/machine.c
@@ -629,9 +629,9 @@ swap_out:
}
static void
-_sensors_thermal_get(Sys_Info *sysinfo)
+_sensors_thermal_get(Sys_Info *info)
{
- sensor_t **sensors = sysinfo->sensors;
+ sensor_t **sensors = info->sensors;
#if defined(__OpenBSD__)
sensor_t *sensor;
int mibs[5] = { CTL_HW, HW_SENSORS, 0, 0, 0 };
@@ -667,8 +667,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if (snsr.type != SENSOR_TEMP)
continue;
-sensors = realloc(sensors, 1 + sysinfo->sensor_count * sizeof(sensor_t
*));
-sensors[sysinfo->sensor_count++] = sensor = calloc(1,
sizeof(sensor_t));
+sensors = realloc(sensors, 1 + info->sensor_count * sizeof(sensor_t
*));
+sensors[info->sensor_count++] = sensor = calloc(1, sizeof(sensor_t));
sensor->name = strdup(snsrdev.xname);
sensor->value = (snsr.value - 27315) / 100.0; // (uK -> C)
}
@@ -679,8 +679,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if ((sysctlbyname("hw.acpi.thermal.tz0.temperature", , , NULL,
0)) != -1)
{
-sensors = realloc(sensors, 1 + sysinfo->sensor_count * sizeof(sensor_t
*));
-sensors[sysinfo->sensor_count++] = sensor = calloc(1,
sizeof(sensor_t));
+sensors = realloc(sensors, 1 + info->sensor_count * sizeof(sensor_t
*));
+sensors[info->sensor_count++] = sensor = calloc(1, sizeof(sensor_t));
sensor->name = strdup("hw.acpi.thermal.tz0");
sensor->value = (float) (value - 2732) / 10;
}
@@ -704,8 +704,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if (type)
{
sensors =
-realloc(sensors, 1 + sysinfo->sensor_count * sizeof(sensor_t
*));
- sensors[sysinfo->sensor_count++] =
+realloc(sensors, 1 + info->sensor_count * sizeof(sensor_t *));
+ sensors[info->sensor_count++] =
sensor = calloc(1, sizeof(sensor_t));
sensor->name = strdup(dh->d_name);
@@ -727,7 +727,7 @@ _sensors_thermal_get(Sys_Info *sysinfo)
closedir(dir);
#elif defined(__MacOS__)
#endif
- sysinfo->sensors = sensors;
+ info->sensors = sensors;
}
static int
@@ -1150,7 +1150,7 @@ _linux_generic_network_status(unsigned long int *in,
#endif
static void
-_network_transfer_get(Sys_Info *sysinfo)
+_network_transfer_get(Sys_Info *info)
{
unsigned long first_in = 0, first_out = 0;
unsigned long last_in = 0, last_out = 0;
@@ -1167,76 +1167,76 @@ _network_transfer_get(Sys_Info *sysinfo)
usleep(100);
_freebsd_generic_network_status(_in, _out);
#endif
- sysinfo->incoming = last_in - first_in;
- sysinfo->outgoing = last_out - first_out;
+ info->incoming = last_in - first_in;
+ info->outgoing = last_out - first_out;
}
static void *
_network_transfer_get_thread_cb(void *arg)
{
- Sys_Info *sysinfo = arg;
+ Sys_Info *info = arg;
- _network_transfer_get(sysinfo);
+ _network_transfer_get(info);
return (void *)0;
}
void
-sys_info_all_free(Sys_Info *sysinfo)
+sys_info_all_free(Sys_Info *info)
{
sensor_t *snsr;
int i;
- for (i = 0; i < sysinfo->cpu_count; i++)
+ for (i = 0; i < info->cpu_count; i++)
{
-free(sysinfo->cores[i]);
+free(info->cores[i]);
}
- free(sysinfo->cores);
+ free(info->cores);
- for (i = 0; i < sysinfo->sensor_count; i++)
+ for (i = 0; i < info->sensor_count; i++)
{
-snsr = sysinfo->sensors[i];
+snsr = info->sensors[i];
if (snsr->name) free(snsr->name);
free(snsr);
}
- if (sysinfo->sensors)
- free(sysinfo->sensors);
+ if (info->sensors)
+ free(info->sensors);
- for (i = 0; i < sysinfo->power.battery_count; i++)
+ for (i = 0; i < info->power.battery_count; i++)
{
-if (sysinfo->power.battery_names[i])
- free(sysinfo->power.battery_names[i]);
-free(sysinfo->power.batteries[i]);
+if (info->power.battery_names[i])
+ free(info->power.battery_names[i]);
+free(info->power.batteries[i]);
[EGIT] [core/enlightenment] enlightenment-0.24 01/01: e xsettings - do not use long for 32bit types... it's WRONG
raster pushed a commit to branch enlightenment-0.24. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d100938c0780c38e3a1a951475afdb623c3fbba4 commit d100938c0780c38e3a1a951475afdb623c3fbba4 Author: Carsten Haitzler (Rasterman) Date: Wed Jun 17 13:21:13 2020 +0100 e xsettings - do not use long for 32bit types... it's WRONG long varies by architecture... whoever decided C32 should be long... was totally wrong. it varies between 32 and 64bit (on unixen). @fix --- src/bin/e_xsettings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c index ba9aa06e5..d7f2b25d1 100644 --- a/src/bin/e_xsettings.c +++ b/src/bin/e_xsettings.c @@ -8,7 +8,7 @@ // define here to avoid needing x includes directly. #define C16 unsigned short -#define C32 unsigned long +#define C32 unsigned int #define RETRY_TIMEOUT 2.0 --
[EGIT] [core/enlightenment] master 01/01: e xsettings - do not use long for 32bit types... it's WRONG
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e8f5794b8162188f547c1a59edae365307d66ce5 commit e8f5794b8162188f547c1a59edae365307d66ce5 Author: Carsten Haitzler (Rasterman) Date: Wed Jun 17 13:21:13 2020 +0100 e xsettings - do not use long for 32bit types... it's WRONG long varies by architecture... whoever decided C32 should be long... was totally wrong. it varies between 32 and 64bit (on unixen). @fix --- src/bin/e_xsettings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c index ee672c24c..def9523b5 100644 --- a/src/bin/e_xsettings.c +++ b/src/bin/e_xsettings.c @@ -8,7 +8,7 @@ // define here to avoid needing x includes directly. #define C16 unsigned short -#define C32 unsigned long +#define C32 unsigned int #define RETRY_TIMEOUT 2.0 --
[EGIT] [core/efl] master 01/01: elm_image: remove the spaces and keep the indentation for elm_image_file_set()
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd9059d13ef6ec378f6e7b57b700be6b73850dac
commit cd9059d13ef6ec378f6e7b57b700be6b73850dac
Author: Taehyub Kim
Date: Wed Jun 17 21:17:23 2020 +0900
elm_image: remove the spaces and keep the indentation for
elm_image_file_set()
Summary: there are wrong indentation in the elm_image_file_set, so removed
the tabs
Reviewers: Jaehyun_Cho
Reviewed By: Jaehyun_Cho
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11988
---
src/lib/elementary/efl_ui_image.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/efl_ui_image.c
b/src/lib/elementary/efl_ui_image.c
index d9166ee7fd..bda8503efc 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2461,10 +2461,10 @@ elm_image_file_set(Evas_Object *obj, const char *file,
const char *group)
{
const char *cur_group = efl_file_key_get(obj);
if (!(cur_group && group && strcmp(cur_group, group)))
- {
- if (efl_file_loaded_get(obj)) return EINA_TRUE;
- if (_efl_ui_image_is_remote(file)) return EINA_TRUE;
- }
+ {
+ if (efl_file_loaded_get(obj)) return EINA_TRUE;
+ if (_efl_ui_image_is_remote(file)) return EINA_TRUE;
+ }
}
ret = efl_file_simple_load(obj, file, group);
--
[EGIT] [core/efl] master 01/01: benchmarks: eina: make sure we do not divide by zero
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9c773ed5cf325e98a33457904e697aa8f313e9c8
commit 9c773ed5cf325e98a33457904e697aa8f313e9c8
Author: Stefan Schmidt
Date: Tue Jun 9 14:22:19 2020 +0200
benchmarks: eina: make sure we do not divide by zero
Make sure we do not divide by i if it is zero here.
CID: 1400768
Reviewed-by: Marcel Hollerbach
Differential Revision: https://phab.enlightenment.org/D11956
---
src/benchmarks/eina/ecore_hash.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/benchmarks/eina/ecore_hash.c b/src/benchmarks/eina/ecore_hash.c
index ae9befa6b5..24ff219029 100644
--- a/src/benchmarks/eina/ecore_hash.c
+++ b/src/benchmarks/eina/ecore_hash.c
@@ -429,9 +429,12 @@ ecore_hash_dump_stats(Ecore_Hash *hash)
sum_n += (double)n;
}
}
- variance = (sum_n_2 - ((sum_n * sum_n) / (double)i)) / (double)i;
- printf("Average length: %f\n\tvariance^2: %f", (sum_n / (double)i),
- variance);
+ if (i)
+ {
+variance = (sum_n_2 - ((sum_n * sum_n) / (double)i)) / (double)i;
+printf("Average length: %f\n\tvariance^2: %f", (sum_n / (double)i),
+ variance);
+ }
}
static int
--
[EGIT] [core/efl] master 01/01: elm_image: keep backword compatibility for elm_image_file_set API when setting url file set twice
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=794c52d2009b603b89eb4da53afc7ab8f9c5547d
commit 794c52d2009b603b89eb4da53afc7ab8f9c5547d
Author: Taehyub Kim
Date: Wed Jun 17 21:04:08 2020 +0900
elm_image: keep backword compatibility for elm_image_file_set API when
setting url file set twice
Summary:
when trying to set file using url path twice, the second api call's return
value is EINA_FALSE
since image obj has already has same file path. After applying Efl.File
interface, the behavior is changed compared to before.
both of the return values should be EINA_TRUE.
@fix
ex)
Eina_Bool ret1, ret2;
ret1 = elm_image_file_set(image, "http://sameurl/image.jpg;, NULL);
ret2 = elm_image_file_set(image, "http://sameurl/image.jpg;, NULL);
ret1 and ret2 should be EINA_TURE
Test Plan:
1. call elm_image_file_set api with same url path
2. see the return value
Reviewers: Hermet, kimcinoo, jsuya
Reviewed By: Hermet
Subscribers: bu5hm4n, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11979
---
src/lib/elementary/efl_ui_image.c | 14 ++
1 file changed, 14 insertions(+)
diff --git a/src/lib/elementary/efl_ui_image.c
b/src/lib/elementary/efl_ui_image.c
index 5bf297854c..d9166ee7fd 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2453,6 +2453,20 @@ elm_image_file_set(Evas_Object *obj, const char *file,
const char *group)
Eina_Bool ret = EINA_FALSE;
EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
+
+ /* check if previous path is same with new one.
+ and return true if they are same */
+ const char *cur_file_path = efl_file_get(obj);
+ if ((cur_file_path && file) && !strcmp(cur_file_path, file))
+ {
+const char *cur_group = efl_file_key_get(obj);
+if (!(cur_group && group && strcmp(cur_group, group)))
+ {
+ if (efl_file_loaded_get(obj)) return EINA_TRUE;
+ if (_efl_ui_image_is_remote(file)) return EINA_TRUE;
+ }
+ }
+
ret = efl_file_simple_load(obj, file, group);
efl_canvas_group_change(obj);
return ret;
--
[EGIT] [core/efl] master 01/01: tests: eio: make sure we check return value
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b3bc1240a6c019842a7a3e0fbb8a7a99168020ea commit b3bc1240a6c019842a7a3e0fbb8a7a99168020ea Author: Stefan Schmidt Date: Wed Jun 10 12:30:48 2020 +0200 tests: eio: make sure we check return value Make sure we fail the test if the call does not succeed. CID: 1412364 Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D11963 --- src/tests/eio/eio_test_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c index fb6c7f4054..a12b9e7a78 100644 --- a/src/tests/eio/eio_test_manager.c +++ b/src/tests/eio/eio_test_manager.c @@ -89,7 +89,7 @@ _done_cb(void *data, eina_value_setup(, EINA_VALUE_TYPE_ULONG); eina_value_convert(, ); -eina_value_ulong_get(, _count); +fail_unless(eina_value_ulong_get(, _count)); fail_if((*number_of_listed_files) != test_count); fail_if(files_count != test_count); --
[EGIT] [core/efl] master 01/01: evas gl common - remove comment - not valid anymore
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bdd439875bee0f046897fd65b6d756e7cced66f6
commit bdd439875bee0f046897fd65b6d756e7cced66f6
Author: Carsten Haitzler (Rasterman)
Date: Wed Jun 17 12:30:23 2020 +0100
evas gl common - remove comment - not valid anymore
---
src/modules/evas/engines/gl_common/evas_gl_context.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 313025f332..0012065dc1 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1846,8 +1846,6 @@ static Eina_Bool
vertex_array_size_check(Evas_Engine_GL_Context *gc, int pn, int n)
{
// return 1;
-// this fixup breaks for expedite test 32. why?
-// for reference
if ((gc->pipe[pn].array.num + n) > gc->shared->info.max_vertex_elements)
{
shader_array_flush(gc);
--
[EGIT] [core/efl] master 01/01: gl common - actually allow vertex limits
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f3e6a8c9b38959f98dc0593ddf7954ea8373ee35
commit f3e6a8c9b38959f98dc0593ddf7954ea8373ee35
Author: Carsten Haitzler (Rasterman)
Date: Wed Jun 17 12:17:13 2020 +0100
gl common - actually allow vertex limits
fix non-commented out return that should have been commented out
---
src/modules/evas/engines/gl_common/evas_gl_context.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 9ea1a86c72..313025f332 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1845,7 +1845,7 @@ pipe_region_expand(Evas_Engine_GL_Context *gc, int n,
static Eina_Bool
vertex_array_size_check(Evas_Engine_GL_Context *gc, int pn, int n)
{
- return 1;
+// return 1;
// this fixup breaks for expedite test 32. why?
// for reference
if ((gc->pipe[pn].array.num + n) > gc->shared->info.max_vertex_elements)
--
[EGIT] [apps/evisum] master 01/01: ui: track proc state properly
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=edd8923326c22960f83e82665f8ffdeb62aeca4a
commit edd8923326c22960f83e82665f8ffdeb62aeca4a
Author: Alastair Poole
Date: Wed Jun 17 11:06:45 2020 +0100
ui: track proc state properly
---
src/bin/ui/ui.c | 6 +++---
src/bin/ui/ui_misc.c | 5 +++--
src/bin/ui/ui_process_view.c | 20 +---
src/bin/ui/ui_process_view.h | 3 +++
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index efa2ea2..d1761b6 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -828,7 +828,7 @@ _item_menu_create(Ui *ui, Proc_Info *proc)
evas_object_smart_callback_add(menu, "dismissed",
_item_menu_dismissed_cb, ui);
- stopped = !!strcmp(proc->state, "stop");
+ stopped = !(!strcmp(proc->state, "stop"));
menu_it = elm_menu_item_add(menu, NULL, evisum_icon_path_get("window"),
proc->command, NULL, NULL);
@@ -841,11 +841,11 @@ _item_menu_create(Ui *ui, Proc_Info *proc)
menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("start"),
_("Start"), _item_menu_start_cb, proc);
- if (stopped) elm_object_item_disabled_set(menu_it2, EINA_TRUE);
+ elm_object_item_disabled_set(menu_it2, stopped);
menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("stop"),
_("Stop"), _item_menu_stop_cb, proc);
- if (!stopped) elm_object_item_disabled_set(menu_it2, EINA_TRUE);
+ elm_object_item_disabled_set(menu_it2, !stopped);
elm_menu_item_add(menu, menu_it, evisum_icon_path_get("kill"), "Kill",
_item_menu_kill_cb, proc);
diff --git a/src/bin/ui/ui_misc.c b/src/bin/ui/ui_misc.c
index e978041..9a4cf27 100644
--- a/src/bin/ui/ui_misc.c
+++ b/src/bin/ui/ui_misc.c
@@ -289,12 +289,13 @@ ui_tab_misc_update(Ui *ui, Sys_Info *sysinfo)
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
evas_object_show(box);
+ _network_usage_add(ui, box, sysinfo->incoming, EINA_TRUE);
+ _network_usage_add(ui, box, sysinfo->outgoing, EINA_FALSE);
+ _separator_add(box);
if (_battery_usage_add(box, >power))
_separator_add(box);
if (_sensor_usage_add(box, sysinfo))
_separator_add(box);
- _network_usage_add(ui, box, sysinfo->incoming, EINA_TRUE);
- _network_usage_add(ui, box, sysinfo->outgoing, EINA_FALSE);
frame = elm_frame_add(ui->misc_activity);
evas_object_size_hint_align_set(frame, FILL, FILL);
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c
index 1099592..7c8f4ec 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/ui_process_view.c
@@ -360,9 +360,23 @@ _proc_info_update(void *data)
_win_title_set(ui->win, _("%s (%d) - Not running"), ui->selected_cmd,
ui->selected_pid);
+elm_object_disabled_set(ui->btn_start, EINA_TRUE);
+elm_object_disabled_set(ui->btn_stop, EINA_TRUE);
+elm_object_disabled_set(ui->btn_kill, EINA_TRUE);
return ECORE_CALLBACK_CANCEL;
}
+ if (!strcmp(proc->state, "stop"))
+ {
+elm_object_disabled_set(ui->btn_stop, EINA_TRUE);
+elm_object_disabled_set(ui->btn_start, EINA_FALSE);
+ }
+ else
+ {
+elm_object_disabled_set(ui->btn_stop, EINA_FALSE);
+elm_object_disabled_set(ui->btn_start, EINA_TRUE);
+ }
+
elm_object_text_set(ui->entry_pid_cmd, proc->command);
pwd_entry = getpwuid(proc->uid);
if (pwd_entry)
@@ -587,7 +601,7 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui)
elm_object_style_set(border, "pad_small");
evas_object_show(border);
- button = elm_button_add(parent);
+ ui->btn_stop = button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EXPAND, EXPAND);
evas_object_size_hint_align_set(button, FILL, FILL);
elm_object_text_set(button, _("Stop"));
@@ -602,7 +616,7 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui)
elm_object_style_set(border, "pad_small");
evas_object_show(border);
- button = elm_button_add(parent);
+ ui->btn_start = button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EXPAND, EXPAND);
evas_object_size_hint_align_set(button, FILL, FILL);
elm_object_text_set(button, _("Start"));
@@ -617,7 +631,7 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui)
elm_object_style_set(border, "pad_small");
evas_object_show(border);
- button = elm_button_add(parent);
+ ui->btn_kill = button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EXPAND, EXPAND);
evas_object_size_hint_align_set(button, FILL, FILL);
elm_object_text_set(button, _("Kill"));
diff --git a/src/bin/ui/ui_process_view.h b/src/bin/ui/ui_process_view.h
index e382a4a..19a3876 100644
--- a/src/bin/ui/ui_process_view.h
+++ b/src/bin/ui/ui_process_view.h
@@ -36,6 +36,9 @@ typedef struct
[EGIT] [apps/evisum] master 01/01: ui: Move thermal into Misc.
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=2c552c26252b8e0391285222c7459b6b5c0f61cf
commit 2c552c26252b8e0391285222c7459b6b5c0f61cf
Author: Alastair Poole
Date: Wed Jun 17 11:27:36 2020 +0100
ui: Move thermal into Misc.
---
data/images/meson.build | 1 +
data/images/sensor.png | Bin 0 -> 3401 bytes
src/bin/system/machine.c | 14 +++
src/bin/system/machine.h | 10 ++---
src/bin/ui/ui_misc.c | 107 ++-
5 files changed, 99 insertions(+), 33 deletions(-)
diff --git a/data/images/meson.build b/data/images/meson.build
index e936d31..ba6b109 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -3,4 +3,5 @@ install_data('go-up.png', 'go-down.png',
'window.png', 'start.png', 'stop.png',
'kill.png', 'cancel.png',
'increase.png', 'decrease.png',
+ 'sensor.png',
install_dir: join_paths(dir_data, 'evisum/images'))
diff --git a/data/images/sensor.png b/data/images/sensor.png
new file mode 100644
index 000..baa9c02
Binary files /dev/null and b/data/images/sensor.png differ
diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c
index 4c76cd2..727440b 100644
--- a/src/bin/system/machine.c
+++ b/src/bin/system/machine.c
@@ -667,8 +667,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if (snsr.type != SENSOR_TEMP)
continue;
-sensors = realloc(sensors, 1 + sysinfo->snsr_count * sizeof(sensor_t
*));
-sensors[sysinfo->snsr_count++] = sensor = calloc(1, sizeof(sensor_t));
+sensors = realloc(sensors, 1 + sysinfo->sensor_count * sizeof(sensor_t
*));
+sensors[sysinfo->sensor_count++] = sensor = calloc(1,
sizeof(sensor_t));
sensor->name = strdup(snsrdev.xname);
sensor->value = (snsr.value - 27315) / 100.0; // (uK -> C)
}
@@ -679,8 +679,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if ((sysctlbyname("hw.acpi.thermal.tz0.temperature", , , NULL,
0)) != -1)
{
-sensors = realloc(sensors, 1 + sysinfo->snsr_count * sizeof(sensor_t
*));
-sensors[sysinfo->snsr_count++] = sensor = calloc(1, sizeof(sensor_t));
+sensors = realloc(sensors, 1 + sysinfo->sensor_count * sizeof(sensor_t
*));
+sensors[sysinfo->sensor_count++] = sensor = calloc(1,
sizeof(sensor_t));
sensor->name = strdup("hw.acpi.thermal.tz0");
sensor->value = (float) (value - 2732) / 10;
}
@@ -704,8 +704,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if (type)
{
sensors =
-realloc(sensors, 1 + sysinfo->snsr_count * sizeof(sensor_t *));
- sensors[sysinfo->snsr_count++] =
+realloc(sensors, 1 + sysinfo->sensor_count * sizeof(sensor_t
*));
+ sensors[sysinfo->sensor_count++] =
sensor = calloc(1, sizeof(sensor_t));
sensor->name = strdup(dh->d_name);
@@ -1193,7 +1193,7 @@ sys_info_all_free(Sys_Info *sysinfo)
}
free(sysinfo->cores);
- for (i = 0; i < sysinfo->snsr_count; i++)
+ for (i = 0; i < sysinfo->sensor_count; i++)
{
snsr = sysinfo->sensors[i];
if (snsr->name) free(snsr->name);
diff --git a/src/bin/system/machine.h b/src/bin/system/machine.h
index 6dc57ef..b5f7423 100644
--- a/src/bin/system/machine.h
+++ b/src/bin/system/machine.h
@@ -4,13 +4,11 @@
#include
#include
-
-
typedef struct
{
- float percent;
unsigned long total;
unsigned long idle;
+ float percent;
} cpu_core_t;
typedef struct
@@ -29,8 +27,8 @@ typedef struct
typedef struct
{
char *name;
- double value;
- bool invalid;
+ double value;
+ boolinvalid;
} sensor_t;
typedef struct
@@ -61,7 +59,7 @@ struct Sys_Info
meminfo_t memory;
power_t power;
- intsnsr_count;
+ int sensor_count;
sensor_t **sensors;
unsigned long incoming;
diff --git a/src/bin/ui/ui_misc.c b/src/bin/ui/ui_misc.c
index 4c6be0e..e978041 100644
--- a/src/bin/ui/ui_misc.c
+++ b/src/bin/ui/ui_misc.c
@@ -1,10 +1,10 @@
#include "ui_misc.h"
-static void
+static Eina_Bool
_battery_usage_add(Evas_Object *box, power_t *power)
{
Evas_Object *frame, *vbox, *hbox, *progress, *ic, *label;
- Eina_Strbuf *buf;
+ const char *fmt;
for (int i = 0; i < power->battery_count; i++)
{
@@ -28,20 +28,13 @@ _battery_usage_add(Evas_Object *box, power_t *power)
evas_object_show(label);
elm_box_pack_end(vbox, label);
-buf = eina_strbuf_new();
-if (buf)
- {
- eina_strbuf_append_printf(buf, "%s ",
- power->battery_names[i]);
- if (power->have_ac && i == 0)
- {
-eina_strbuf_append(buf, _("(plugged in)"));
- }
- eina_strbuf_append(buf, "");
-
[EGIT] [website/www-content] master 01/01: Wiki page efl-1.24.3 changed with summary [] by Stefan Schmidt
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=310c8af1d4decc86c2394d739a6eef852cc5eeb9 commit 310c8af1d4decc86c2394d739a6eef852cc5eeb9 Author: Stefan Schmidt Date: Wed Jun 17 01:32:10 2020 -0700 Wiki page efl-1.24.3 changed with summary [] by Stefan Schmidt --- pages/news/efl-1.24.3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/news/efl-1.24.3.txt b/pages/news/efl-1.24.3.txt index f56e919bd..e90ab3b33 100644 --- a/pages/news/efl-1.24.3.txt +++ b/pages/news/efl-1.24.3.txt @@ -1,7 +1,7 @@ === EFL 1.24.3 release === * //2020-06-17 - by Stefan Schmidt// -We are happy to release the thrid stable update for our 1.24.x series. +We are happy to release the third stable update for our 1.24.x series. Fixes: * evas - csd and wl csd - fix alpha zeroing to avoid framespace junk --
[EGIT] [website/www-content] master 01/01: Wiki page efl-1.24.3 changed with summary [created] by Stefan Schmidt
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=03bebdcd5fafc630fa528b671b0fe8ad1cc7fcaa
commit 03bebdcd5fafc630fa528b671b0fe8ad1cc7fcaa
Author: Stefan Schmidt
Date: Wed Jun 17 01:28:58 2020 -0700
Wiki page efl-1.24.3 changed with summary [created] by Stefan Schmidt
---
pages/news/efl-1.24.3.txt | 23 +++
1 file changed, 23 insertions(+)
diff --git a/pages/news/efl-1.24.3.txt b/pages/news/efl-1.24.3.txt
new file mode 100644
index 0..f56e919bd
--- /dev/null
+++ b/pages/news/efl-1.24.3.txt
@@ -0,0 +1,23 @@
+=== EFL 1.24.3 release ===
+ * //2020-06-17 - by Stefan Schmidt//
+
+We are happy to release the thrid stable update for our 1.24.x series.
+
+Fixes:
+* evas - csd and wl csd - fix alpha zeroing to avoid framespace junk
+* evas - genetic update regions smart merge - merge v adjacent regions
+* efreet - handle runtime relocation right with default XDG_DATA_DIRS
+* edje: fix animation memory leak.
+* canvas vg: fix dangling vector containers.
+* evas vg: clean up dangling instances
+* canvas vg: fix vector file data memory leak.
+* efl gfx_path: fix memory leak.
+* efl_ui_image: fixed elm_image_preload_disabled_set api is not working
when it is called before file set
+
+==Download:==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[http://download.enlightenment.org/rel/libs/efl/efl-1.24.3.tar.xz |
efl-1.24.3.tar.xz ]] |
de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a |
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
\ No newline at end of file
--
[EGIT] [website/www-content] master 01/01: Wiki page download-latest changed with summary [] by Stefan Schmidt
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ed096ab1d5f6ecb4c4d326d246be47167507ab0c commit ed096ab1d5f6ecb4c4d326d246be47167507ab0c Author: Stefan Schmidt Date: Wed Jun 17 01:01:42 2020 -0700 Wiki page download-latest changed with summary [] by Stefan Schmidt --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 3a46f6d97..c37ed7eb2 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -1,5 +1,5 @@ -efl_v = 1.24.2 +efl_v = 1.24.3 python_efl_v = 1.24.0 enlightenment_v = 0.24.1 --
[EGIT] [website/www-content] master 01/01: Wiki page start-release changed with summary [] by Stefan Schmidt
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=414e8342dbae9234e2e28a7d5cb982c897534b17 commit 414e8342dbae9234e2e28a7d5cb982c897534b17 Author: Stefan Schmidt Date: Wed Jun 17 01:01:27 2020 -0700 Wiki page start-release changed with summary [] by Stefan Schmidt --- pages/incl/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index feec79c27..4425a278d 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.24.2|EFL 1.24.2]] and [[https://www.enlightenment.org/news/e24.1|Enlightenment 0.24.1]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.24.3|EFL 1.24.3]] and [[https://www.enlightenment.org/news/e24.1|Enlightenment 0.24.1]] are out - go to our [[/download]] page. --
[EGIT] [core/efl] annotated tag v1.24.3 created (now 5b514f9dc5)
This is an automated email from the git hooks/post-receive script. stefan pushed a change to annotated tag v1.24.3 in repository core/efl. at 5b514f9dc5 (tag) tagging 0d2310678a45034f8a1c4ed6b69e9fa629021402 (commit) replaces v1.24.2 tagged by Stefan Schmidt on Wed Jun 17 10:00:37 2020 +0200 - Log - v1.24.3 Ali Alzyod (1): evas_textblock: fix doc typo Carsten Haitzler (6): evas - csd and wl csd - fix alpha zeroing to avoid framespace junk evas - genetic update regions smart merge - merge v adjacent regions efreet - handle runtime relocation right with default XDG_DATA_DIRS build - systemd service files - install fix if systemd not found evas examples - build box example again - missing header elm test - animated icon - big win to have a bg and not garbage Daniel Kolesa (4): eina: only enable EINA_LOG_BACKTRACE when backtrace API is present ecore: use standard LC_ALL instead of __LC_ALL in systemd module modules: only build gl_drm evas engine when using es-egl evas/engines/gl_generic: fix byte order after glReadPixels on BE Hermet Park (8): edje: fix animation memory leak. canvas vg: fix dangling vector containers. evas vg: clean up dangling instances canvas vg: fix vector file data memory leak. efl gfx_path: fix memory leak. canvas svg: fix missing break. eldbus: fix the data size issue. ui image: fix a missing else case. Jaehyun Cho (1): edje_cc_handlers: update documentation of "fixed" to be clearer JunsuChoi (1): elm_hoversel: Add missing resize_job's free Marcel Hollerbach (3): build: make eina drag in the -lm flag ecore_main_timechanges: fix include elm_gen: free item_content map Myoungwoon Roy, Kim (2): edje: fix memory leak in edje part recalculation. doxygen docs: Fix API reference group to Ecore_Eo Stefan Schmidt (2): modules: vnc: allow building for FreeBSD with a different header path release: Update NEWS and bump version for 1.24.3 release Subhransu Mohanty (8): edje: Fix memory leak by freeing the filter data. edje: fix memory leak by freeing the limits pointer. svg/loader: Fix memory leak elementary: Fix memory leak in elm_list eo: Fix memory leak in efl_key_wref_set() api. evas/engine: Fix memory leak in generic cache. ecore_ipc: Fix memory leak elementary/example: Fix memory leak in gengrid test Taehyub Kim (1): efl_ui_image: fixed elm_image_preload_disabled_set api is not working when it is called before file set Vincent Torri (2): Eina file test: on Windows, open cmd, not a shell Eina file test: use the correct Eina file object Woochanlee (2): edje_load : clean up vector resource when edje file freed. elm_calendar: Do not pass NULL to function. --- No new revisions were added by this update. --
[EGIT] [core/efl] efl-1.24 01/01: release: Update NEWS and bump version for 1.24.3 release
stefan pushed a commit to branch efl-1.24.
http://git.enlightenment.org/core/efl.git/commit/?id=0d2310678a45034f8a1c4ed6b69e9fa629021402
commit 0d2310678a45034f8a1c4ed6b69e9fa629021402
Author: Stefan Schmidt
Date: Wed Jun 17 09:47:23 2020 +0200
release: Update NEWS and bump version for 1.24.3 release
---
NEWS| 17 -
meson.build | 2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index a45d543a63..2b4dbba9d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,22 @@
==
-EFL 1.24.2
+EFL 1.24.3
==
+Changes since 1.24.2:
+-
+
+Fixes:
+
+ * evas - csd and wl csd - fix alpha zeroing to avoid framespace junk
+ * evas - genetic update regions smart merge - merge v adjacent regions
+ * efreet - handle runtime relocation right with default XDG_DATA_DIRS
+ * edje: fix animation memory leak.
+ * canvas vg: fix dangling vector containers.
+ * evas vg: clean up dangling instances
+ * canvas vg: fix vector file data memory leak.
+ * efl gfx_path: fix memory leak.
+ * efl_ui_image: fixed elm_image_preload_disabled_set api is not working
when it is called before file set
+
Changes since 1.24.1:
-
diff --git a/meson.build b/meson.build
index 182cce46d4..9a2bb2abc1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('efl', ['c','cpp'],
- version: '1.24.2',
+ version: '1.24.3',
default_options : ['buildtype=release', 'cpp_std=c++11'],
meson_version : '>=0.47'
)
--
[EGIT] [core/efl] master 01/01: efl_ui_widget: addition to the previous commit
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=721c097bb3e3f64f900b4fe73b8715b61a5cb908
commit 721c097bb3e3f64f900b4fe73b8715b61a5cb908
Author: Marcel Hollerbach
Date: Wed Jun 17 09:13:05 2020 +0200
efl_ui_widget: addition to the previous commit
in the previous commit we started to only receive the parent_obj from
the evas object when its not a widget. However, we still need to ensure
that the parent is equal to the current one in order to remove it when a
widget.
While this is one more call, the call to get the parent is not as
heavy as the data_get call, as this directly addresses a struct, and
does not read from a hash table.
This also fixes a test case failure.
---
src/lib/elementary/efl_ui_widget.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/elementary/efl_ui_widget.c
b/src/lib/elementary/efl_ui_widget.c
index 0b6ea105a9..16e55ec6c9 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1587,6 +1587,8 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj,
Elm_Widget_Smart_Data *sd, Evas_Ob
if (is_widget)
{
+ if (efl_ui_widget_parent_get(sobj) != obj)
+ return EINA_FALSE;
if (_is_focused(sobj))
{
elm_widget_tree_unfocusable_set(sobj, EINA_TRUE);
--
[EGIT] [core/efl] master 02/02: elementary/perf: reduce number of efl_isa() call. in elementary test application efl_isa() shows up as hotsport during profiling so refactored the code to reduce redund
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=18b0abf62f91fc4992ade39efb756a9f74bbe616
commit 18b0abf62f91fc4992ade39efb756a9f74bbe616
Author: Subhransu Mohanty
Date: Wed Jun 17 06:28:44 2020 +
elementary/perf: reduce number of efl_isa() call. in elementary test
application efl_isa() shows up as hotsport during profiling so refactored the
code to reduce redundant efl_isa() calls.
in genlist testcase the number of calls reduced by 3.
Reviewed-by: Marcel Hollerbach
Reviewed-by: Hermet Park <>
Reviewed-by: Youngbok Shin
Differential Revision: https://phab.enlightenment.org/D11984
---
src/lib/elementary/efl_ui_widget.c | 36 +---
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/lib/elementary/efl_ui_widget.c
b/src/lib/elementary/efl_ui_widget.c
index c2a0af7ce7..0b6ea105a9 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -186,8 +186,6 @@ _on_sub_obj_del(void *data, const Efl_Event *event);
static void _propagate_event(void *data, const Efl_Event *eo_event);
static void _elm_widget_shadow_update(Efl_Ui_Widget *obj);
-EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
- { EFL_EVENT_DEL, _on_sub_obj_del });
EFL_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
{ EFL_EVENT_DEL, _on_sub_obj_del });
EFL_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
@@ -198,27 +196,13 @@ EFL_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
static inline void
_callbacks_add(Eo *widget, void *data)
{
- if (_elm_widget_is(widget))
- {
-efl_event_callback_array_add(widget, elm_widget_subitems_callbacks(),
data);
- }
- else
- {
-efl_event_callback_array_add(widget, efl_subitems_callbacks(), data);
- }
+efl_event_callback_array_add(widget, efl_subitems_callbacks(), data);
}
static inline void
_callbacks_del(Eo *widget, void *data)
{
- if (_elm_widget_is(widget))
- {
-efl_event_callback_array_del(widget, elm_widget_subitems_callbacks(),
data);
- }
- else
- {
-efl_event_callback_array_del(widget, efl_subitems_callbacks(), data);
- }
+efl_event_callback_array_del(widget, efl_subitems_callbacks(), data);
}
void
@@ -1532,12 +1516,14 @@ EOLIAN static Eina_Bool
_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd,
Evas_Object *sobj)
{
Efl_Ui_Widget *parent;
+ Eina_Bool is_widget;
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(sobj, EFL_GFX_ENTITY_INTERFACE),
EINA_FALSE);
EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE);
+ is_widget = elm_widget_is(sobj);
//first make sure that we unregister the sobj from the parent
- if (elm_widget_is(sobj))
+ if (is_widget)
parent = efl_ui_widget_parent_get(sobj);
else
parent = evas_object_data_get(sobj, "elm-parent");
@@ -1560,7 +1546,7 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj,
Elm_Widget_Smart_Data *sd, Evas_Ob
//and if it is a widget, please set the correct parent on the widget itself
//the parent set method will take care of the property syncing etc.
- if (elm_widget_is(sobj))
+ if (is_widget)
efl_ui_widget_parent_set(sobj, obj);
return EINA_TRUE;
@@ -1569,13 +1555,17 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj,
Elm_Widget_Smart_Data *sd, Evas_Ob
EOLIAN static Eina_Bool
_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd,
Evas_Object *sobj)
{
- Evas_Object *sobj_parent;
+ Evas_Object *sobj_parent = NULL;
+ Eina_Bool is_widget;
if (!sobj) return EINA_FALSE;
EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE);
- sobj_parent = evas_object_data_del(sobj, "elm-parent");
+ is_widget = _elm_widget_is(sobj);
+
+ if (!is_widget) sobj_parent = evas_object_data_del(sobj, "elm-parent");
+
if (sobj_parent && sobj_parent != obj)
{
static int abort_on_warn = -1;
@@ -1595,7 +1585,7 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj,
Elm_Widget_Smart_Data *sd, Evas_Ob
return EINA_FALSE;
}
- if (_elm_widget_is(sobj))
+ if (is_widget)
{
if (_is_focused(sobj))
{
--
[EGIT] [core/efl] master 01/02: elementary/perf:remove unnecessary elm_widget_is() check
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95eb621c15462e54ba9b092bca6ceec2a0fb3a1a
commit 95eb621c15462e54ba9b092bca6ceec2a0fb3a1a
Author: Subhransu Mohanty
Date: Wed Jun 17 06:36:02 2020 +
elementary/perf:remove unnecessary elm_widget_is() check
As we always make sure the parent is a widget class we don't have to check
anymore.
Reviewed-by: Marcel Hollerbach
Reviewed-by: Hermet Park <>
Differential Revision: https://phab.enlightenment.org/D11985
---
src/lib/elementary/efl_ui_widget.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_widget.c
b/src/lib/elementary/efl_ui_widget.c
index 4b0b8db781..c2a0af7ce7 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -2356,7 +2356,7 @@ _efl_ui_widget_efl_gfx_entity_scale_get(const Eo *obj
EINA_UNUSED, Elm_Widget_Sm
// FIXME: save walking up the tree by storing/caching parent scale
if (EINA_DBL_EQ(sd->scale, 0.0))
{
-if (sd->parent_obj && elm_widget_is(sd->parent_obj))
+if (sd->parent_obj)
{
return efl_gfx_entity_scale_get(sd->parent_obj);
}
@@ -2621,7 +2621,7 @@ elm_widget_theme_get(const Evas_Object *obj)
if (!sd->theme)
{
-if (sd->parent_obj && elm_widget_is(sd->parent_obj))
+if (sd->parent_obj)
return elm_widget_theme_get(sd->parent_obj);
else return NULL;
}
@@ -5263,7 +5263,7 @@ elm_widget_show_region_set(Eo *obj, Eina_Rect sr,
Eina_Bool forceshow)
do
{
parent_obj = sd->parent_obj;
-if ((!parent_obj) || (!_elm_widget_is(parent_obj))) break;
+if ((!parent_obj)) break;
sd = efl_data_scope_get(parent_obj, MY_CLASS);
if (!sd) break;
--
