netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=7422659f0bd50651c22fcc6441bae2d7e54f04bb
commit 7422659f0bd50651c22fcc6441bae2d7e54f04bb
Author: Alastair Poole <m...@alastairpoole.com>
Date: Tue Nov 2 20:31:01 2021 +0000
name: epdum pisdualization naming...
At least pretend to name properly. Adding more visuals...it
wasn't designed with this in mind...
---
src/bin/ui/ui_cpu.c | 64 ++++++++++++++++++++--------------------
src/bin/ui/ui_cpu.h | 8 ++---
src/bin/ui/visuals/cpu_basic.c | 26 ++++++++--------
src/bin/ui/visuals/cpu_basic.h | 2 +-
src/bin/ui/visuals/cpu_default.c | 62 +++++++++++++++++++-------------------
src/bin/ui/visuals/cpu_default.h | 2 +-
src/bin/ui/visuals/visuals.x | 2 +-
7 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 19e65cd..0718c12 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -42,23 +42,23 @@ _win_mouse_move_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
Evas_Coord w, h;
Evas_Event_Mouse_Move *ev;
- Cpu_Visual *vis = data;
+ Ui_Cpu_Data *pd = data;
ev = event_info;
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
if ((ev->cur.canvas.x >= (w - 128)) && (ev->cur.canvas.y <= 128))
{
- if (!vis->btn_visible)
+ if (!pd->btn_visible)
{
- elm_object_signal_emit(vis->btn_menu, "menu,show", "evisum/menu");
- vis->btn_visible = 1;
+ elm_object_signal_emit(pd->btn_menu, "menu,show", "evisum/menu");
+ pd->btn_visible = 1;
}
}
- else if ((vis->btn_visible) && (!vis->menu))
+ else if ((pd->btn_visible) && (!pd->menu))
{
- elm_object_signal_emit(vis->btn_menu, "menu,hide", "evisum/menu");
- vis->btn_visible = 0;
+ elm_object_signal_emit(pd->btn_menu, "menu,hide", "evisum/menu");
+ pd->btn_visible = 0;
}
}
@@ -85,15 +85,15 @@ _btn_menu_clicked_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
Evisum_Ui *ui;
- Cpu_Visual *vis = data;
+ Ui_Cpu_Data *pd = data;
- ui = vis->ui;
- if (!vis->menu)
- vis->menu = evisum_ui_main_menu_create(ui, ui->cpu.win, obj);
+ ui = pd->ui;
+ if (!pd->menu)
+ pd->menu = evisum_ui_main_menu_create(ui, ui->cpu.win, obj);
else
{
- evas_object_del(vis->menu);
- vis->menu = NULL;
+ evas_object_del(pd->menu);
+ pd->menu = NULL;
}
}
@@ -116,17 +116,17 @@ _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj, void *event_info
static void
_win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Cpu_Visual *vis = data;
- Evisum_Ui *ui = vis->ui;
+ Ui_Cpu_Data *pd = data;
+ Evisum_Ui *ui = pd->ui;
evisum_ui_config_save(ui);
- ecore_thread_cancel(vis->thread);
- ecore_thread_wait(vis->thread, 0.5);
+ ecore_thread_cancel(pd->thread);
+ ecore_thread_wait(pd->thread, 0.5);
- if (vis->ext_free_cb)
- vis->ext_free_cb(vis->ext);
+ if (pd->ext_free_cb)
+ pd->ext_free_cb(pd->ext);
- free(vis);
+ free(pd);
ui->cpu.win = NULL;
}
@@ -177,7 +177,7 @@ ui_cpu_visuals_get(void)
{
Eina_List *l = NULL;
- for (int i = 0; (i < sizeof(visualizations) / sizeof(Visualization)); i++)
+ for (int i = 0; (i < sizeof(visualizations) / sizeof(Cpu_Visual)); i++)
{
l = eina_list_append(l, strdup(visualizations[i].name));
}
@@ -185,10 +185,10 @@ ui_cpu_visuals_get(void)
return l;
}
-Visualization *
+Cpu_Visual *
ui_cpu_visual_by_name(const char *name)
{
- for (int i = 0; (i < sizeof(visualizations) / sizeof(Visualization)); i++)
+ for (int i = 0; (i < sizeof(visualizations) / sizeof(Cpu_Visual)); i++)
{
if (!strcmp(name, visualizations[i].name))
return &visualizations[i];
@@ -206,11 +206,11 @@ ui_cpu_win_restart(Evisum_Ui *ui)
void
ui_cpu_win_add(Evisum_Ui *ui)
{
- Cpu_Visual *vis;
+ Ui_Cpu_Data *pd;
Evas_Object *win, *box, *scr, *btn, *ic;
Evas_Object *tb;
Elm_Layout *lay;
- Visualization *visualization;
+ Cpu_Visual *vis;
static Eina_Bool init = 0;
if (ui->cpu.win)
@@ -253,9 +253,9 @@ ui_cpu_win_add(Evisum_Ui *ui)
elm_table_pack(tb, box, 0, 0, 1, 1);
- visualization = ui_cpu_visual_by_name(ui->cpu.visual);
- vis = visualization->func(box);
- vis->ui = ui;
+ vis = ui_cpu_visual_by_name(ui->cpu.visual);
+ pd = vis->func(box);
+ pd->ui = ui;
elm_object_content_set(scr, tb);
elm_object_content_set(win, scr);
@@ -267,9 +267,9 @@ ui_cpu_win_add(Evisum_Ui *ui)
evas_object_show(ic);
elm_object_focus_allow_set(btn, 0);
evas_object_size_hint_min_set(btn, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
- evas_object_smart_callback_add(btn, "clicked", _btn_menu_clicked_cb, vis);
+ evas_object_smart_callback_add(btn, "clicked", _btn_menu_clicked_cb, pd);
- vis->btn_menu = lay = elm_layout_add(win);
+ pd->btn_menu = lay = elm_layout_add(win);
evas_object_size_hint_weight_set(lay, 1.0, 1.0);
evas_object_size_hint_align_set(lay, 0.99, 0.01);
elm_layout_file_set(lay, PACKAGE_DATA_DIR "/themes/evisum.edj", "cpu");
@@ -277,11 +277,11 @@ ui_cpu_win_add(Evisum_Ui *ui)
elm_table_pack(tb, lay, 0, 0, 1, 1);
evas_object_show(lay);
- evas_object_event_callback_add(scr, EVAS_CALLBACK_MOUSE_MOVE,
_win_mouse_move_cb, vis);
+ evas_object_event_callback_add(scr, EVAS_CALLBACK_MOUSE_MOVE,
_win_mouse_move_cb, pd);
evas_object_event_callback_add(scr, EVAS_CALLBACK_KEY_DOWN,
_win_key_down_cb, ui);
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_resize_cb,
ui);
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_move_cb,
ui);
- evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, vis);
+ evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, pd);
if ((ui->cpu.width > 0) && (ui->cpu.height > 0))
evas_object_resize(win, ui->cpu.width, ui->cpu.height);
diff --git a/src/bin/ui/ui_cpu.h b/src/bin/ui/ui_cpu.h
index 9f31a6b..34ae496 100644
--- a/src/bin/ui/ui_cpu.h
+++ b/src/bin/ui/ui_cpu.h
@@ -38,12 +38,12 @@ typedef struct {
void (*ext_free_cb)(void *);
void *ext;
-} Cpu_Visual;
+} Ui_Cpu_Data;
typedef struct {
const char *name;
- Cpu_Visual *(*func)(Evas_Object *parent);
-} Visualization;
+ Ui_Cpu_Data *(*func)(Evas_Object *parent);
+} Cpu_Visual;
void
ui_cpu_win_add(Evisum_Ui *ui);
@@ -54,7 +54,7 @@ ui_cpu_win_restart(Evisum_Ui *ui);
Eina_List *
ui_cpu_visuals_get(void);
-Visualization *
+Cpu_Visual *
ui_cpu_visual_by_name(const char *name);
#endif
diff --git a/src/bin/ui/visuals/cpu_basic.c b/src/bin/ui/visuals/cpu_basic.c
index a69ac28..9a31de5 100644
--- a/src/bin/ui/visuals/cpu_basic.c
+++ b/src/bin/ui/visuals/cpu_basic.c
@@ -10,8 +10,8 @@ static void
_core_times_main_cb(void *data, Ecore_Thread *thread)
{
int ncpu;
- Cpu_Visual *vis = data;
- Ext *ext = vis->ext;
+ Ui_Cpu_Data *pd = data;
+ Ext *ext = pd->ext;
while (!ecore_thread_check(thread))
{
@@ -37,12 +37,12 @@ _core_times_main_cb(void *data, Ecore_Thread *thread)
static void
_core_times_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void
*msgdata)
{
- Cpu_Visual *vis;
+ Ui_Cpu_Data *pd;
Core *cores;
Ext *ext;
- vis = data;
- ext = vis->ext;
+ pd = data;
+ ext = pd->ext;
cores = msgdata;
for (int i = 0; i < ext->cpu_count; i++)
@@ -70,18 +70,18 @@ _cb_free(void *data)
free(ext);
}
-Cpu_Visual *
+Ui_Cpu_Data *
cpu_visual_basic(Evas_Object *parent_bx)
{
Evas_Object *tb;
Ext *ext;
- Cpu_Visual *vis = calloc(1, sizeof(Cpu_Visual));
- if (!vis) return NULL;
+ Ui_Cpu_Data *pd = calloc(1, sizeof(Ui_Cpu_Data));
+ if (!pd) return NULL;
- vis->ext = ext = calloc(1, sizeof(Ext));
+ pd->ext = ext = calloc(1, sizeof(Ext));
EINA_SAFETY_ON_NULL_RETURN_VAL(ext, NULL);
- vis->ext_free_cb = _cb_free;
+ pd->ext_free_cb = _cb_free;
/* Populate lookup table to match id with topology core id */
ext->cpu_count = system_cpu_count_get();
@@ -120,11 +120,11 @@ cpu_visual_basic(Evas_Object *parent_bx)
elm_box_pack_end(parent_bx, tb);
- vis->thread = ecore_thread_feedback_run(_core_times_main_cb,
+ pd->thread = ecore_thread_feedback_run(_core_times_main_cb,
_core_times_feedback_cb,
NULL,
NULL,
- vis, 1);
- return vis;
+ pd, 1);
+ return pd;
}
diff --git a/src/bin/ui/visuals/cpu_basic.h b/src/bin/ui/visuals/cpu_basic.h
index c3c6396..a586001 100644
--- a/src/bin/ui/visuals/cpu_basic.h
+++ b/src/bin/ui/visuals/cpu_basic.h
@@ -3,7 +3,7 @@
#include "ui/ui_cpu.h"
-Cpu_Visual *
+Ui_Cpu_Data *
cpu_visual_basic(Evas_Object *parent);
#endif
diff --git a/src/bin/ui/visuals/cpu_default.c b/src/bin/ui/visuals/cpu_default.c
index e39f135..1aed737 100644
--- a/src/bin/ui/visuals/cpu_default.c
+++ b/src/bin/ui/visuals/cpu_default.c
@@ -30,9 +30,9 @@ typedef struct {
static void
_core_times_main_cb(void *data, Ecore_Thread *thread)
{
- Cpu_Visual *vis = data;
+ Ui_Cpu_Data *pd = data;
int ncpu;
- Ext *ext = vis->ext;
+ Ext *ext = pd->ext;
if (!system_cpu_frequency_min_max_get(&ext->freq_min, &ext->freq_max))
ext->cpu_freq = 1;
@@ -67,14 +67,14 @@ _core_times_main_cb(void *data, Ecore_Thread *thread)
}
static void
-_update(Cpu_Visual *vis, Core *cores)
+_update(Ui_Cpu_Data *pd, Core *cores)
{
Evas_Object *obj;
unsigned int *pixels, *pix;
Evas_Coord x, y, w, h;
int iw, stride;
Eina_Bool clear = 0;
- Ext *ext = vis->ext;
+ Ext *ext = pd->ext;
obj = ext->obj;
evas_object_geometry_get(obj, &x, &y, &w, &h);
@@ -166,7 +166,7 @@ _update(Cpu_Visual *vis, Core *cores)
}
// hand back pixel data ptr so evas knows we are done with it
evas_object_image_data_set(obj, pixels);
- // now visd update region for all pixels in the image at the end as we
+ // now update region for all pixels in the image at the end as we
// changed everything
evas_object_image_data_update_add(obj, 0, 0, w, ext->cpu_count * 3);
}
@@ -178,14 +178,14 @@ typedef struct
} Explainer;
static void
-_explain(Cpu_Visual *vis, Core *cores)
+_explain(Ui_Cpu_Data *pd, Core *cores)
{
Eina_Strbuf *buf;
Explainer *exp;
Ext *ext;
Evas_Object *lb, *rec;
- ext = vis->ext;
+ ext = pd->ext;
if (!ext->explainers) return;
@@ -224,20 +224,20 @@ _explain(Cpu_Visual *vis, Core *cores)
static void
_core_times_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void
*msgdata)
{
- Cpu_Visual *vis;
+ Ui_Cpu_Data *pd;
Core *cores;
Ext *ext;
static Eina_Bool was_confused = 0;
- vis = data;
- ext = vis->ext;
+ pd = data;
+ ext = pd->ext;
cores = msgdata;
- _update(vis, cores);
+ _update(pd, cores);
if (ext->confused || was_confused)
{
- _explain(vis, cores);
+ _explain(pd, cores);
was_confused = 1;
}
@@ -262,8 +262,8 @@ static void
_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Cpu_Visual *vis = data;
- Ext *ext = vis->ext;
+ Ui_Cpu_Data *pd = data;
+ Ext *ext = pd->ext;
ext->show_cpufreq = elm_check_state_get(obj);
}
@@ -272,8 +272,8 @@ static void
_temp_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Cpu_Visual *vis = data;
- Ext *ext = vis->ext;
+ Ui_Cpu_Data *pd = data;
+ Ext *ext = pd->ext;
ext->show_cputemp = elm_check_state_get(obj);
}
@@ -282,8 +282,8 @@ static void
_confused_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Cpu_Visual *vis = data;
- Ext *ext = vis->ext;
+ Ui_Cpu_Data *pd = data;
+ Ext *ext = pd->ext;
ext->confused = elm_check_state_get(obj);
}
@@ -291,7 +291,7 @@ _confused_check_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
static void
_colors_fill(Evas_Object *colors)
{
- // fill a 3 pixel high (and 100 wide) image with 3 grvisients matching
+ // fill a 3 pixel high (and 100 wide) image with 3 grpdients matching
// the colormaps we calculated as a legend
int x, stride;
unsigned int *pixels;
@@ -311,7 +311,7 @@ _colors_fill(Evas_Object *colors)
evas_object_image_data_update_add(colors, 0, 0, 101, 1);
}
-Cpu_Visual *
+Ui_Cpu_Data *
cpu_visual_default(Evas_Object *parent_box)
{
Evas_Object *tbl, *tbl2, *box, *obj, *ic, *lb, *rec;
@@ -322,10 +322,10 @@ cpu_visual_default(Evas_Object *parent_box)
char buf[128];
Eina_Bool show_icons = 1;
- Cpu_Visual *vis = calloc(1, sizeof(Cpu_Visual));
- if (!vis) return NULL;
+ Ui_Cpu_Data *pd = calloc(1, sizeof(Ui_Cpu_Data));
+ if (!pd) return NULL;
- vis->ext = ext = calloc(1, sizeof(Ext));
+ pd->ext = ext = calloc(1, sizeof(Ext));
EINA_SAFETY_ON_NULL_RETURN_VAL(ext, NULL);
ext->cpu_count = system_cpu_count_get();
@@ -439,8 +439,8 @@ cpu_visual_default(Evas_Object *parent_box)
ext->explainers = eina_list_append(ext->explainers, exp);
}
- // Callback to free anything extra we pass around via the ext pointer in
(Cpu_Visual *).
- vis->ext_free_cb = _cb_free;
+ // Callback to free anything extra we pass around via the ext pointer in
(Ui_Cpu_Data *).
+ pd->ext_free_cb = _cb_free;
bx = elm_box_add(box);
evas_object_size_hint_align_set(bx, FILL, FILL);
@@ -554,14 +554,14 @@ cpu_visual_default(Evas_Object *parent_box)
if (!ext->cpu_freq) elm_object_disabled_set(check, 1);
evas_object_show(check);
elm_box_pack_end(hbx, check);
- evas_object_smart_callback_add(check, "changed", _check_changed_cb, vis);
+ evas_object_smart_callback_add(check, "changed", _check_changed_cb, pd);
check = elm_check_add(fr);
evas_object_size_hint_align_set(check, FILL, FILL);
evas_object_size_hint_weight_set(check, EXPAND, 0);
elm_object_text_set(check, _("Overlay CPU temperatures?"));
if (!ext->cpu_temp) elm_object_disabled_set(check, 1);
- evas_object_smart_callback_add(check, "changed", _temp_check_changed_cb,
vis);
+ evas_object_smart_callback_add(check, "changed", _temp_check_changed_cb,
pd);
evas_object_show(check);
elm_box_pack_end(hbx, check);
@@ -569,7 +569,7 @@ cpu_visual_default(Evas_Object *parent_box)
evas_object_size_hint_align_set(check, FILL, FILL);
evas_object_size_hint_weight_set(check, EXPAND, 0);
elm_object_text_set(check, _("Confused?"));
- evas_object_smart_callback_add(check, "changed",
_confused_check_changed_cb, vis);
+ evas_object_smart_callback_add(check, "changed",
_confused_check_changed_cb, pd);
evas_object_show(check);
elm_box_pack_end(hbx, check);
@@ -581,11 +581,11 @@ cpu_visual_default(Evas_Object *parent_box)
(obj, 100, (BAR_HEIGHT * ext->cpu_count) * elm_config_scale_get());
// run a feedback thread that sends feedback to the mainloop
- vis->thread = ecore_thread_feedback_run(_core_times_main_cb,
+ pd->thread = ecore_thread_feedback_run(_core_times_main_cb,
_core_times_feedback_cb,
NULL,
NULL,
- vis, 1);
- return vis;
+ pd, 1);
+ return pd;
}
diff --git a/src/bin/ui/visuals/cpu_default.h b/src/bin/ui/visuals/cpu_default.h
index 86e05c9..347e9b1 100644
--- a/src/bin/ui/visuals/cpu_default.h
+++ b/src/bin/ui/visuals/cpu_default.h
@@ -3,7 +3,7 @@
#include "ui/ui_cpu.h"
-Cpu_Visual *
+Ui_Cpu_Data *
cpu_visual_default(Evas_Object *parent);
#endif
diff --git a/src/bin/ui/visuals/visuals.x b/src/bin/ui/visuals/visuals.x
index 429d297..408fc98 100644
--- a/src/bin/ui/visuals/visuals.x
+++ b/src/bin/ui/visuals/visuals.x
@@ -1,7 +1,7 @@
#include "cpu_default.h"
#include "cpu_basic.h"
-Visualization visualizations[] = {
+Cpu_Visual visualizations[] = {
{ .name = "default", .func = cpu_visual_default },
{ .name = "basic", .func = cpu_visual_basic },
};
--
