netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=2e6231d549a9d07ae36dd8083c71cc81418f08e5
commit 2e6231d549a9d07ae36dd8083c71cc81418f08e5
Author: Alastair Poole <nets...@gmail.com>
Date: Tue May 11 15:57:49 2021 +0100
size: format.
---
src/bin/ui/ui_disk.c | 6 +++---
src/bin/ui/ui_memory.c | 24 ++++++++++++------------
src/bin/ui/ui_network.c | 4 ++--
src/bin/ui/ui_process_list.c | 10 +++++-----
src/bin/ui/ui_process_view.c | 14 +++++++-------
src/bin/ui/ui_util.c | 5 ++++-
src/bin/ui/ui_util.h | 2 +-
7 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 38415c0..0130210 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -146,7 +146,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_total, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "total");
- elm_object_text_set(lb, eina_slstr_printf("%s",
evisum_size_format(inf->usage.total)));
+ elm_object_text_set(lb, eina_slstr_printf("%s",
evisum_size_format(inf->usage.total, 0)));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(wd->btn_total, w, 1);
r = evas_object_data_get(lb, "rec");
@@ -155,7 +155,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_used, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "used");
- elm_object_text_set(lb, eina_slstr_printf("%s",
evisum_size_format(inf->usage.used)));
+ elm_object_text_set(lb, eina_slstr_printf("%s",
evisum_size_format(inf->usage.used, 0)));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(wd->btn_used, ow, 1);
r = evas_object_data_get(lb, "rec");
@@ -165,7 +165,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_free, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "free");
int64_t avail = inf->usage.total - inf->usage.used;
- elm_object_text_set(lb, eina_slstr_printf("%s", evisum_size_format(avail)));
+ elm_object_text_set(lb, eina_slstr_printf("%s", evisum_size_format(avail,
0)));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(wd->btn_free, ow, 1);
r = evas_object_data_get(lb, "rec");
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index 80b082a..eb968ad 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -74,31 +74,31 @@ _update_widgets(Data *pd, meminfo_t *memory)
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s",
- evisum_size_format(memory->used),
- evisum_size_format(memory->total)));
+ evisum_size_format(memory->used, 0),
+ evisum_size_format(memory->total, 0)));
pb = pd->cached;
value = memory->cached / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s",
- evisum_size_format(memory->cached),
- evisum_size_format(memory->total)));
+ evisum_size_format(memory->cached, 0),
+ evisum_size_format(memory->total, 0)));
pb = pd->buffered;
value = memory->buffered / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s",
- evisum_size_format(memory->buffered),
- evisum_size_format(memory->total)));
+ evisum_size_format(memory->buffered, 0),
+ evisum_size_format(memory->total, 0)));
pb = pd->shared;
value = memory->shared / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s",
- evisum_size_format(memory->shared),
- evisum_size_format(memory->total)));
+ evisum_size_format(memory->shared, 0),
+ evisum_size_format(memory->total, 0)));
pb = pd->swap;
if (memory->swap_total)
{
@@ -115,8 +115,8 @@ _update_widgets(Data *pd, meminfo_t *memory)
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s",
- evisum_size_format(memory->swap_used),
- evisum_size_format(memory->swap_total)));
+ evisum_size_format(memory->swap_used, 0),
+ evisum_size_format(memory->swap_total, 0)));
for (int i = 0; i < memory->video_count; i++)
{
@@ -129,8 +129,8 @@ _update_widgets(Data *pd, meminfo_t *memory)
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s",
- evisum_size_format(memory->video[i].used),
- evisum_size_format(memory->video[i].total)));
+ evisum_size_format(memory->video[i].used, 0),
+ evisum_size_format(memory->video[i].total, 0)));
}
}
diff --git a/src/bin/ui/ui_network.c b/src/bin/ui/ui_network.c
index aa3c596..acb325d 100644
--- a/src/bin/ui/ui_network.c
+++ b/src/bin/ui/ui_network.c
@@ -251,8 +251,8 @@ _network_update_feedback_cb(void *data, Ecore_Thread
*thread, void *msgdata EINA
{
obj = evas_object_data_get(iface->obj, "total");
elm_object_text_set(obj, eina_slstr_printf("%s / %s",
- evisum_size_format(iface->total_in),
- evisum_size_format(iface->total_out)));
+ evisum_size_format(iface->total_in, 0),
+ evisum_size_format(iface->total_out, 0)));
obj = evas_object_data_get(iface->obj, "peak");
s = _network_transfer_format(iface->peak_in);
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 712fdf9..2c6d596 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -839,7 +839,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_size, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "size");
if (!proc->is_kernel)
- snprintf(buf, sizeof(buf), "%s", evisum_size_format(proc->mem_size));
+ snprintf(buf, sizeof(buf), "%s", evisum_size_format(proc->mem_size,
1));
else
{
buf[0] = '-'; buf[1] = '\0';
@@ -854,7 +854,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_virt, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "virt");
if (!proc->is_kernel)
- snprintf(buf, sizeof(buf), "%s", evisum_size_format(proc->mem_virt));
+ snprintf(buf, sizeof(buf), "%s", evisum_size_format(proc->mem_virt,
1));
else
{
buf[0] = '-'; buf[1] = '\0';
@@ -869,7 +869,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_rss, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "rss");
if ((!proc->is_kernel) || (ui->kthreads_has_rss))
- snprintf(buf, sizeof(buf), "%s", evisum_size_format(proc->mem_rss));
+ snprintf(buf, sizeof(buf), "%s", evisum_size_format(proc->mem_rss,
1));
else
{
buf[0] = '-'; buf[1] = '\0';
@@ -884,7 +884,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(wd->btn_shared, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "share");
if (!proc->is_kernel)
- snprintf(buf, sizeof(buf), "%s",
evisum_size_format(proc->mem_shared));
+ snprintf(buf, sizeof(buf), "%s",
evisum_size_format(proc->mem_shared, 1));
else
{
buf[0] = '-'; buf[1] = '\0';
@@ -1022,7 +1022,7 @@ _summary_update(Win_Data *wd)
eina_strbuf_reset(buf);
elm_progressbar_value_set(wd->summary.pb_mem, (ui->mem_total / 100) /
ui->mem_total);
- eina_strbuf_append_printf(buf, "%s / %s ",
evisum_size_format(ui->mem_used), evisum_size_format(ui->mem_total));
+ eina_strbuf_append_printf(buf, "%s / %s ", evisum_size_format(ui->mem_used,
0), evisum_size_format(ui->mem_total, 0));
elm_object_part_text_set(wd->summary.pb_mem, "elm.text.status",
eina_strbuf_string_get(buf));
EINA_LIST_FOREACH(ui->batteries, l, bat)
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c
index b248276..3423d46 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/ui_process_view.c
@@ -691,9 +691,9 @@ _graph_summary_update(Win_Data *wd, Proc_Info *proc)
"Virtual: %s"
"</>"),
proc->cpu_usage,
- evisum_size_format(proc->mem_size),
- evisum_size_format(proc->mem_rss),
- evisum_size_format(proc->mem_virt)));
+ evisum_size_format(proc->mem_size, 0),
+ evisum_size_format(proc->mem_rss, 0),
+ evisum_size_format(proc->mem_virt, 0)));
}
static void
@@ -957,22 +957,22 @@ _general_view_update(Win_Data *wd, Proc_Info *proc)
eina_slstr_printf("%d", proc->numfiles));
if (!proc->is_kernel)
elm_object_text_set(wd->general.entry_virt,
- evisum_size_format(proc->mem_virt));
+ evisum_size_format(proc->mem_virt, 0));
else elm_object_text_set(wd->general.entry_virt, "-");
if ((!proc->is_kernel) || (wd->kthreads_has_rss))
elm_object_text_set(wd->general.entry_rss,
- evisum_size_format(proc->mem_rss));
+ evisum_size_format(proc->mem_rss, 0));
else elm_object_text_set(wd->general.entry_rss, "-");
if (!proc->is_kernel)
elm_object_text_set(wd->general.entry_shared,
- evisum_size_format(proc->mem_shared));
+ evisum_size_format(proc->mem_shared, 0));
else elm_object_text_set(wd->general.entry_shared, "-");
if (!proc->is_kernel)
elm_object_text_set(wd->general.entry_size,
- evisum_size_format(proc->mem_size));
+ evisum_size_format(proc->mem_size, 0));
else elm_object_text_set(wd->general.entry_size, "-");
s = _run_time_string(proc->run_time);
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index b632846..e469001 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -99,7 +99,7 @@ evisum_ui_button_add(Evas_Object *parent, Evas_Object
**alias, const char *text,
}
const char *
-evisum_size_format(unsigned long long bytes)
+evisum_size_format(unsigned long long bytes, Eina_Bool simple)
{
unsigned long powi = 1;
unsigned long long value;
@@ -128,6 +128,9 @@ evisum_size_format(unsigned long long bytes)
--precision;
}
+ if (simple)
+ return eina_slstr_printf("%1.*f %c", precision, (double) value / powi,
units[i][0]);
+
return eina_slstr_printf("%1.*f %s", precision, (double) value / powi,
units[i]);
}
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index 4d6df31..08e9ef2 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -37,7 +37,7 @@ void
evisum_ui_icon_size_set(Evas_Object *ic, int size);
const char *
-evisum_size_format(unsigned long long bytes);
+evisum_size_format(unsigned long long bytes, Eina_Bool simple);
const char *
evisum_icon_path_get(const char *name);
--
