netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=32a9f55dbed4233674685e5a37f95b0d194979b5
commit 32a9f55dbed4233674685e5a37f95b0d194979b5
Author: Alastair Poole <nets...@gmail.com>
Date: Thu Dec 17 11:12:15 2020 +0000
purge: remove the crud
---
src/bin/ui/ui.c | 28 +++++-----
src/bin/ui/ui.h | 1 -
src/bin/ui/ui_cpu.c | 4 +-
src/bin/ui/ui_disk.c | 4 +-
src/bin/ui/ui_memory.c | 4 +-
src/bin/ui/ui_process_list.c | 50 ++++++------------
src/bin/ui/ui_process_view.c | 30 +----------
src/bin/ui/ui_sensors.c | 4 +-
src/bin/ui/ui_util.c | 122 -------------------------------------------
src/bin/ui/ui_util.h | 9 ----
10 files changed, 39 insertions(+), 217 deletions(-)
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 87d0ed9..d16ff15 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -39,12 +39,12 @@ evisum_ui_config_save(Ui *ui)
_evisum_config->sort_reverse = ui->settings.sort_reverse;
_evisum_config->width = w;
_evisum_config->height = h;
- _evisum_config->effects = evisum_ui_effects_enabled_get();
+ _evisum_config->effects = 0;
_evisum_config->backgrounds = evisum_ui_backgrounds_enabled_get();
_evisum_config->poll_delay = ui->settings.poll_delay;
_evisum_config->show_kthreads = ui->settings.show_kthreads;
_evisum_config->show_user = ui->settings.show_user;
- _evisum_config->show_desktop = ui->settings.show_desktop;
+ _evisum_config->show_desktop = 0; //ui->settings.show_desktop;
proc_info_kthreads_show_set(ui->settings.show_kthreads);
@@ -93,13 +93,12 @@ evisum_ui_config_load(Ui *ui)
ui->settings.sort_reverse = _evisum_config->sort_reverse;
ui->settings.poll_delay = _evisum_config->poll_delay;
- evisum_ui_effects_enabled_set(_evisum_config->effects);
evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
ui->settings.show_kthreads = _evisum_config->show_kthreads;
proc_info_kthreads_show_set(ui->settings.show_kthreads);
ui->settings.show_user = _evisum_config->show_user;
- ui->settings.show_desktop = _evisum_config->show_desktop;
+ ui->settings.show_desktop = 0; // _evisum_config->show_desktop;
ui->cpu.width = _evisum_config->cpu.width;
ui->cpu.height = _evisum_config->cpu.height;
@@ -171,17 +170,14 @@ static void
_menu_effects_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Ui *ui = data;
+ Ui *ui;
+ Eina_Bool state;
- if ((!evisum_ui_effects_enabled_get()) &&
(!evisum_ui_backgrounds_enabled_get()))
- evisum_ui_backgrounds_enabled_set(1);
- else if (evisum_ui_backgrounds_enabled_get() &&
(!evisum_ui_effects_enabled_get()))
- evisum_ui_effects_enabled_set(1);
- else
- {
- evisum_ui_effects_enabled_set(0);
- evisum_ui_backgrounds_enabled_set(0);
- }
+ ui = data;
+
+ state = !evisum_ui_backgrounds_enabled_get();
+
+ evisum_ui_backgrounds_enabled_set(state);
evisum_ui_config_save(ui);
@@ -247,6 +243,7 @@ _main_menu_show_threads_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
evisum_ui_config_save(ui);
}
+/*
static void
_main_menu_show_desktop_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
@@ -256,6 +253,7 @@ _main_menu_show_desktop_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
ui->settings.show_desktop = elm_check_state_get(obj);
evisum_ui_config_save(ui);
}
+*/
static void
_main_menu_show_user_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
@@ -395,6 +393,7 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent)
_main_menu_show_user_changed_cb, ui);
elm_box_pack_end(bx2, chk);
+ /*
chk = elm_check_add(bx2);
evas_object_size_hint_weight_set(chk, EXPAND, EXPAND);
evas_object_size_hint_align_set(chk, FILL, FILL);
@@ -404,6 +403,7 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent)
evas_object_smart_callback_add(chk, "changed",
_main_menu_show_desktop_changed_cb, ui);
elm_box_pack_end(bx2, chk);
+ */
elm_object_content_set(fr, bx2);
elm_box_pack_end(bx, fr);
diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h
index 381ae9a..8afbda8 100644
--- a/src/bin/ui/ui.h
+++ b/src/bin/ui/ui.h
@@ -25,7 +25,6 @@ typedef struct Ui
Evas_Object *win;
int width;
int height;
- Ecore_Animator *animator;
} processes;
Evas_Object *win;
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index c60d997..c29586b 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -711,8 +711,8 @@ ui_win_cpu_add(Ui *ui)
elm_win_autodel_set(win, EINA_TRUE);
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
- evisum_ui_backgrounds_enabled_get()));
+ evisum_ui_background_random_add(win,
+ evisum_ui_backgrounds_enabled_get());
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
_win_resize_cb, ui);
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 6db2b73..373db57 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -515,8 +515,8 @@ ui_win_disk_add(Ui *ui)
elm_win_autodel_set(win, EINA_TRUE);
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
- evisum_ui_backgrounds_enabled_get()));
+ evisum_ui_background_random_add(win,
+ evisum_ui_backgrounds_enabled_get());
Ui_Data *pd = calloc(1, sizeof(Ui_Data));
pd->ui = ui;
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index 6b7bad5..d557b29 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -394,8 +394,8 @@ ui_win_memory_add(Ui *ui)
elm_win_autodel_set(win, EINA_TRUE);
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
- evisum_ui_backgrounds_enabled_get()));
+ evisum_ui_background_random_add(win,
+ evisum_ui_backgrounds_enabled_get());
_graph_init(&graphs[GR_USED], COLOR_USED);
_graph_init(&graphs[GR_CACHED], COLOR_CACHED);
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 722e8e6..38251d1 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -652,20 +652,6 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread
EINA_UNUSED,
if (!eina_lock_take_try(&_lock))
return;
- if (ui->settings.show_desktop)
- {
- int pid = 0;
- list = proc_info_all_get();
- EINA_LIST_FREE(list, proc)
- {
- if (!strcmp(proc->command, "enlightenment"))
- pid = proc->pid;
- proc_info_free(proc);
- }
- if (pid != -1)
- list = proc_info_pid_children_get(pid);
- }
-
if (!list)
list = proc_info_all_get();
@@ -702,12 +688,12 @@ _process_list_feedback_cb(void *data, Ecore_Thread
*thread EINA_UNUSED,
}
}
+ list = _list_sort(ui, list);
+
_genlist_ensure_n_items(pd->genlist, eina_list_count(list));
it = elm_genlist_first_item_get(pd->genlist);
- list = _list_sort(ui, list);
-
EINA_LIST_FREE(list, proc)
{
if (!it)
@@ -1376,7 +1362,6 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
evas_object_size_hint_align_set(plist, FILL, FILL);
elm_table_pack(tbl, plist, 0, 2, i, 1);
-
_evisum_search_add(pd);
evas_object_smart_callback_add(pd->genlist, "selected",
@@ -1401,7 +1386,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
}
static void
-_evisum_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Key_Down *ev;
Ui *ui;
@@ -1487,9 +1472,6 @@ _win_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_U
pd->thread = NULL;
ui->win = NULL;
- if (ui->processes.animator)
- ecore_animator_del(ui->processes.animator);
-
if (pd->cache)
evisum_ui_item_cache_free(pd->cache);
@@ -1527,39 +1509,39 @@ ui_process_list_win_add(Ui *ui)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "evisum");
elm_win_icon_object_set(win, icon);
- evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, pd);
-
if (_evisum_config->width > 1 && _evisum_config->height > 1)
evas_object_resize(win, _evisum_config->width, _evisum_config->height);
else
evas_object_resize(win, EVISUM_WIN_WIDTH * elm_config_scale_get(),
EVISUM_WIN_HEIGHT * elm_config_scale_get());
elm_win_center(win, EINA_TRUE, EINA_TRUE);
+ evas_object_show(win);
- if (evisum_ui_effects_enabled_get() || evisum_ui_backgrounds_enabled_get())
+ if (evisum_ui_backgrounds_enabled_get())
evisum_ui_background_add(ui->win, EINA_TRUE);
o = _ui_content_system_add(pd, win);
elm_object_content_set(win, o);
- pd->cache = evisum_ui_item_cache_new(pd->genlist, _item_create, 50);
-
- if (evisum_ui_effects_enabled_get()) evisum_ui_animate(ui);
- pd->thread = ecore_thread_feedback_run(_process_list,
- _process_list_feedback_cb,
- _process_list_cancel_cb,
- NULL, pd, EINA_FALSE);
- _process_list_update(pd);
+ pd->cache = evisum_ui_item_cache_new(pd->genlist, _item_create, 50);
+ evas_object_event_callback_add(win, EVAS_CALLBACK_DEL,
+ _win_del_cb, pd);
evas_object_event_callback_add(ui->win, EVAS_CALLBACK_RESIZE,
_win_resize_cb, pd);
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
- _evisum_key_down_cb, pd);
+ _win_key_down_cb, pd);
ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED,
_elm_config_changed_cb, pd);
ecore_event_handler_add(EVISUM_EVENT_CONFIG_CHANGED,
_evisum_config_changed_cb, pd);
- evas_object_show(win);
+
+ pd->thread = ecore_thread_feedback_run(_process_list,
+ _process_list_feedback_cb,
+ _process_list_cancel_cb,
+ NULL, pd, EINA_FALSE);
+ _process_list_update(pd);
+
}
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c
index 06ad0ab..c23e742 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/ui_process_view.c
@@ -713,7 +713,6 @@ _process_tab_add(Evas_Object *parent, Ui_Data *pd)
Evas_Object *rec;
Proc_Info *proc;
int i = 0;
- int r, g, b, a;
fr = elm_frame_add(parent);
elm_object_style_set(fr, "pad_small");
@@ -721,12 +720,6 @@ _process_tab_add(Evas_Object *parent, Ui_Data *pd)
evas_object_size_hint_align_set(fr, FILL, FILL);
evas_object_show(fr);
- if (evisum_ui_effects_enabled_get())
- {
- evas_object_color_get(fr, &r, &g, &b, &a);
- evas_object_color_set(fr, r * 0.75, g * 0.75, b * 0.75, a * 0.75);
- }
-
tbl = elm_table_add(parent);
evas_object_size_hint_weight_set(tbl, EXPAND, EXPAND);
evas_object_size_hint_align_set(tbl, FILL, FILL);
@@ -995,19 +988,12 @@ static Evas_Object *
_threads_tab_add(Evas_Object *parent, Ui_Data *pd)
{
Evas_Object *fr, *box, *hbox, *btn, *genlist;
- int r, g, b, a;
fr = elm_frame_add(parent);
evas_object_size_hint_weight_set(fr, EXPAND, EXPAND);
evas_object_size_hint_align_set(fr, FILL, FILL);
elm_object_style_set(fr, "pad_small");
- if (evisum_ui_effects_enabled_get())
- {
- evas_object_color_get(fr, &r, &g, &b, &a);
- evas_object_color_set(fr, r * 0.75, g * 0.75, b * 0.75, a * 0.75);
- }
-
box = elm_box_add(parent);
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
evas_object_size_hint_align_set(box, FILL, FILL);
@@ -1088,19 +1074,12 @@ static Evas_Object *
_tree_tab_add(Evas_Object *parent, Ui_Data *pd)
{
Evas_Object *fr, *box, *genlist;
- int r, g, b, a;
fr = elm_frame_add(parent);
evas_object_size_hint_weight_set(fr, EXPAND, EXPAND);
evas_object_size_hint_align_set(fr, FILL, FILL);
elm_object_style_set(fr, "pad_small");
- if (evisum_ui_effects_enabled_get())
- {
- evas_object_color_get(fr, &r, &g, &b, &a);
- evas_object_color_set(fr, r * 0.75, g * 0.75, b * 0.75, a * 0.75);
- }
-
box = elm_box_add(parent);
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
evas_object_size_hint_align_set(box, FILL, FILL);
@@ -1127,19 +1106,12 @@ static Evas_Object *
_info_tab_add(Evas_Object *parent, Ui_Data *pd)
{
Evas_Object *fr, *box, *entry;
- int r, g, b, a;
fr = elm_frame_add(parent);
evas_object_size_hint_weight_set(fr, EXPAND, EXPAND);
evas_object_size_hint_align_set(fr, FILL, FILL);
elm_object_style_set(fr, "pad_small");
- if (evisum_ui_effects_enabled_get())
- {
- evas_object_color_get(fr, &r, &g, &b, &a);
- evas_object_color_set(fr, r * 0.75, g * 0.75, b * 0.75, a * 0.75);
- }
-
box = elm_box_add(parent);
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
evas_object_size_hint_align_set(box, FILL, FILL);
@@ -1389,7 +1361,7 @@ ui_process_win_add(Evas_Object *parent_win, int pid,
const char *cmd, int poll_d
elm_win_icon_object_set(win, ic);
tabs = _tabs_add(win, pd);
- evisum_ui_background_random_add(win, evisum_ui_effects_enabled_get());
+ evisum_ui_background_random_add(win, evisum_ui_backgrounds_enabled_get());
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c
index 1e330a9..9db6635 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/ui_sensors.c
@@ -268,8 +268,8 @@ ui_win_sensors_add(Ui *ui)
elm_win_autodel_set(win, EINA_TRUE);
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
- evisum_ui_backgrounds_enabled_get()));
+ evisum_ui_background_random_add(win,
+ evisum_ui_backgrounds_enabled_get());
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
_win_resize_cb, ui);
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index 2542fc5..c829d16 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -5,7 +5,6 @@
#define ARRAY_SIZE(n) sizeof(n) / sizeof(n[0])
-static Eina_Bool _effects_enabled = EINA_FALSE;
static Eina_Bool _backgrounds_enabled = EINA_FALSE;
static Eina_Hash *_icon_cache = NULL;
@@ -602,124 +601,3 @@ evisum_ui_backgrounds_enabled_set(Eina_Bool enabled)
_backgrounds_enabled = enabled;
}
-Eina_Bool
-evisum_ui_effects_enabled_get(void)
-{
- return _effects_enabled;
-}
-
-void
-evisum_ui_effects_enabled_set(Eina_Bool enabled)
-{
- _effects_enabled = enabled;
-}
-
-typedef struct
-{
- Ui *ui;
- int pos;
- Evas_Object *im;
- Evas_Object *bolt;
-} Animation;
-
-static Eina_Bool
-_anim_clouds(void *data)
-{
- Ui *ui;
- Animation *anim;
- Evas_Coord ww, wh, iw, ih;
- int cpu;
- time_t t;
- static int bolt = 0;
-
- anim = data;
- ui = anim->ui;
-
- evas_object_geometry_get(ui->win, NULL, NULL, &ww, &wh);
- if (ww <= 0 || wh <= 0) return EINA_TRUE;
- evas_object_image_size_get(anim->im, &iw, &ih);
-
- if (ww > iw) iw = ww;
-
- cpu = (ui->cpu_usage / 10) > 0 ? ui->cpu_usage / 10 : 1;
-
- evas_object_resize(anim->im, iw, wh);
- evas_object_image_fill_set(anim->im, anim->pos, -50, iw, ih);
- anim->pos += cpu;
-
- t = time(NULL);
-
- if (cpu >= 6 && !bolt)
- {
- if (cpu == 6 && !(t % 16)) bolt++;
- else if (cpu == 7 && !(t % 8)) bolt++;
- else if (cpu == 8 && !(t % 4)) bolt++;
- else if (cpu == 9 && !(t % 2)) bolt++;
- else if (cpu == 10) bolt++;
- }
-
- if (bolt)
- {
- struct timespec ts;
-
- if (bolt++ == 1)
- {
- clock_gettime(CLOCK_REALTIME, &ts);
- srand(ts.tv_nsec);
- evas_object_image_size_get(anim->bolt, &iw, &ih);
- evas_object_move(anim->bolt, -(rand() % iw), -(rand() % (ih /
4)));
- }
-
- if (bolt > 20)
- {
- evas_object_hide(anim->bolt);
- bolt = 0;
- }
- else if (!(bolt % 2))
- evas_object_show(anim->bolt);
- else
- evas_object_hide(anim->bolt);
- }
-
- if (anim->pos >= iw)
- anim->pos = 0;
-
- return ECORE_CALLBACK_RENEW;
-}
-
-void
-evisum_ui_animate(void *data)
-{
- Animation *anim;
- Ui *ui;
- Evas_Object *im;
- Evas_Coord iw, ih, ww, wh;
-
- ui = data;
-
- anim = calloc(1, sizeof(Animation));
- if (!anim) return;
-
- anim->ui = ui;
-
- evas_object_geometry_get(ui->win, NULL, NULL, &ww, &wh);
-
- anim->bolt = im =
evas_object_image_filled_add(evas_object_evas_get(ui->win));
- evas_object_pass_events_set(im, 1);
- evas_object_image_file_set(im, evisum_icon_path_get("bolt"), NULL);
- evas_object_image_size_get(im, &iw, &ih);
- evas_object_size_hint_min_set(im, iw, ih);
- evas_object_resize(im, iw, ih);
-
- anim->im = im = evas_object_image_add(evas_object_evas_get(ui->win));
- evas_object_image_file_set(im, evisum_icon_path_get("clo"), NULL);
- evas_object_image_size_get(im, &iw, &ih);
- evas_object_image_fill_set(im, 0, -50, iw, wh);
- evas_object_resize(im, iw, wh);
- evas_object_move(im, 0, 0);
- evas_object_pass_events_set(im, 1);
- evas_object_show(im);
-
- ui->processes.animator = ecore_animator_add(_anim_clouds, anim);
-}
-
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index 976e011..8211de4 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -55,15 +55,6 @@ evisum_ui_backgrounds_enabled_set(Eina_Bool enabled);
Eina_Bool
evisum_ui_backgrounds_enabled_get(void);
-void
-evisum_ui_effects_enabled_set(Eina_Bool enabled);
-
-Eina_Bool
-evisum_ui_effects_enabled_get(void);
-
-void
-evisum_ui_animate(void *data);
-
int
evisum_ui_textblock_font_size_get(Evas_Object *tb);
--
