netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=2c552c26252b8e0391285222c7459b6b5c0f61cf
commit 2c552c26252b8e0391285222c7459b6b5c0f61cf
Author: Alastair Poole <nets...@gmail.com>
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 0000000..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 - 273150000) / 1000000.0; // (uK -> C)
}
@@ -679,8 +679,8 @@ _sensors_thermal_get(Sys_Info *sysinfo)
if ((sysctlbyname("hw.acpi.thermal.tz0.temperature", &value, &len, 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 <stdint.h>
#include <stdbool.h>
-
-
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;
+ bool invalid;
} sensor_t;
typedef struct
@@ -61,7 +59,7 @@ struct Sys_Info
meminfo_t memory;
power_t power;
- int snsr_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, "<bigger>%s ",
- power->battery_names[i]);
- if (power->have_ac && i == 0)
- {
- eina_strbuf_append(buf, _("(plugged in)"));
- }
- eina_strbuf_append(buf, "</bigger>");
- elm_object_text_set(label, eina_strbuf_string_get(buf));
- eina_strbuf_free(buf);
- }
+ if (power->have_ac && i == 0)
+ fmt = _("<bigger>%s (plugged in) </bigger>");
+ else
+ fmt = _("<bigger>%s</bigger>");
+ elm_object_text_set(label, eina_slstr_printf(fmt,
+ power->battery_names[i]));
hbox = elm_box_add(box);
evas_object_size_hint_align_set(hbox, FILL, FILL);
evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND);
@@ -69,18 +62,69 @@ _battery_usage_add(Evas_Object *box, power_t *power)
elm_object_content_set(frame, vbox);
elm_box_pack_end(box, frame);
}
+
+ return !!power->battery_count;
}
-static void
+static Eina_Bool
_sensor_usage_add(Evas_Object *box, Sys_Info *sysinfo)
{
+ Evas_Object *frame, *vbox, *hbox, *progress, *ic, *label;
sensor_t *snsr;
- for (int i = 0; i < sysinfo->snsr_count; i++)
+ for (int i = 0; i < sysinfo->sensor_count; i++)
{
snsr = sysinfo->sensors[i];
- printf("%s => %1.2f\n", snsr->name, snsr->value);
+
+ frame = elm_frame_add(box);
+ evas_object_size_hint_align_set(frame, FILL, FILL);
+ evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
+ elm_object_style_set(frame, "pad_small");
+ evas_object_show(frame);
+
+ vbox = elm_box_add(box);
+ evas_object_size_hint_align_set(vbox, FILL, FILL);
+ evas_object_size_hint_weight_set(vbox, EXPAND, EXPAND);
+ evas_object_show(vbox);
+
+ label = elm_label_add(box);
+ evas_object_size_hint_align_set(label, 1.0, FILL);
+ evas_object_size_hint_weight_set(label, EXPAND, EXPAND);
+ evas_object_show(label);
+ elm_box_pack_end(vbox, label);
+
+ elm_object_text_set(label, eina_slstr_printf("<bigger>%s</bigger>",
+ snsr->name));
+
+ hbox = elm_box_add(box);
+ evas_object_size_hint_align_set(hbox, FILL, FILL);
+ evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND);
+ elm_box_horizontal_set(hbox, EINA_TRUE);
+ evas_object_show(hbox);
+
+ ic = elm_image_add(box);
+ elm_image_file_set(ic, evisum_icon_path_get("sensor"), NULL);
+ evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(),
+ 32 * elm_config_scale_get());
+ evas_object_show(ic);
+ elm_box_pack_end(hbox, ic);
+
+ progress = elm_progressbar_add(frame);
+ evas_object_size_hint_align_set(progress, FILL, FILL);
+ evas_object_size_hint_weight_set(progress, EXPAND, EXPAND);
+ elm_progressbar_span_size_set(progress, 1.0);
+ elm_progressbar_unit_format_set(progress, "%1.0f°C");
+ elm_progressbar_value_set(progress,
+ (double) snsr->value / 100);
+ evas_object_show(progress);
+
+ elm_box_pack_end(hbox, progress);
+ elm_box_pack_end(vbox, hbox);
+ elm_object_content_set(frame, vbox);
+ elm_box_pack_end(box, frame);
}
+
+ return !!sysinfo->sensor_count;
}
static char *
@@ -173,6 +217,27 @@ _network_usage_add(Ui *ui, Evas_Object *box, uint64_t
bytes, Eina_Bool incoming)
elm_box_pack_end(box, vbox);
}
+static void
+_separator_add(Evas_Object *box)
+{
+ Evas_Object *hbox, *sep;
+
+ hbox = elm_box_add(box);
+ elm_box_horizontal_set(hbox, EINA_TRUE);
+ evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(hbox, FILL, FILL);
+ evas_object_show(hbox);
+
+ sep = elm_separator_add(hbox);
+ evas_object_size_hint_weight_set(sep, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(sep, FILL, FILL);
+ elm_separator_horizontal_set(sep, EINA_TRUE);
+ evas_object_show(sep);
+
+ elm_box_pack_end(hbox, sep);
+ elm_box_pack_end(box, hbox);
+}
+
void
ui_tab_misc_add(Ui *ui)
{
@@ -224,8 +289,10 @@ ui_tab_misc_update(Ui *ui, Sys_Info *sysinfo)
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
evas_object_show(box);
- _battery_usage_add(box, &sysinfo->power);
- _sensor_usage_add(box, sysinfo);
+ if (_battery_usage_add(box, &sysinfo->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);
--
