netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=d1796ba074a7f6f0cc614781ccccd9c972521ac2
commit d1796ba074a7f6f0cc614781ccccd9c972521ac2
Author: Alastair Poole <nets...@gmail.com>
Date: Mon Nov 9 13:40:00 2020 +0000
purge...
---
src/bin/ui/meson.build | 2 +
src/bin/ui/ui.c | 1584 ++------------------------------
src/bin/ui/ui.h | 9 +
src/bin/ui/{ui.c => ui_process_list.c} | 421 +--------
src/bin/ui/ui_process_list.h | 9 +
5 files changed, 83 insertions(+), 1942 deletions(-)
diff --git a/src/bin/ui/meson.build b/src/bin/ui/meson.build
index b83b812..bfbabf8 100644
--- a/src/bin/ui/meson.build
+++ b/src/bin/ui/meson.build
@@ -16,4 +16,6 @@ src += files([
'ui_cpu.h',
'ui_process_view.c',
'ui_process_view.h',
+ 'ui_process_list.c',
+ 'ui_process_list.h',
])
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 1d382c0..d5a058a 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -6,6 +6,7 @@
#include "ui/ui_disk.h"
#include "ui/ui_sensors.h"
#include "ui/ui_process_view.h"
+#include "ui/ui_process_list.h"
#include <stdio.h>
#include <sys/types.h>
@@ -17,1061 +18,53 @@
Ui *_ui;
Evisum_Config *_evisum_config;
-Eina_Lock _lock;
-static void
-_config_save(Ui *ui)
-{
- Evas_Coord w, h;
-
- if (!_evisum_config) return;
-
- evas_object_geometry_get(ui->win, NULL, NULL, &w, &h);
-
- _evisum_config->sort_type = ui->settings.sort_type;
- _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->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;
-
- proc_info_kthreads_show_set(ui->settings.show_kthreads);
-
- config_save(_evisum_config);
-}
-
-static void
-_config_load(Ui *ui)
-{
- _evisum_config = config_load();
-
- ui->settings.sort_type = _evisum_config->sort_type;
- ui->settings.sort_reverse = _evisum_config->sort_reverse;
- ui->settings.poll_delay = _evisum_config->poll_delay;
-
- if ((_evisum_config->width > 0) && (_evisum_config->height > 0))
- evas_object_resize(ui->win, _evisum_config->width,
_evisum_config->height);
-
- 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;
-}
-
-static int
-_sort_by_pid(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return inf1->pid - inf2->pid;
-}
-
-static int
-_sort_by_uid(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return inf1->uid - inf2->uid;
-}
-
-static int
-_sort_by_nice(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return inf1->nice - inf2->nice;
-}
-
-static int
-_sort_by_pri(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return inf1->priority - inf2->priority;
-}
-
-static int
-_sort_by_cpu(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return inf1->cpu_id - inf2->cpu_id;
-}
-
-static int
-_sort_by_threads(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return inf1->numthreads - inf2->numthreads;
-}
-
-static int
-_sort_by_size(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
- int64_t size1, size2;
-
- inf1 = p1; inf2 = p2;
-
- size1 = inf1->mem_size;
- size2 = inf2->mem_size;
-
- if (size1 > size2)
- return 1;
- if (size1 < size2)
- return -1;
-
- return 0;
-}
-
-static int
-_sort_by_rss(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
- int64_t size1, size2;
-
- inf1 = p1; inf2 = p2;
-
- size1 = inf1->mem_rss;
- size2 = inf2->mem_rss;
-
- if (size1 > size2)
- return 1;
- if (size1 < size2)
- return -1;
-
- return 0;
-}
-
-static int
-_sort_by_cpu_usage(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
- double one, two;
-
- inf1 = p1; inf2 = p2;
-
- one = inf1->cpu_usage;
- two = inf2->cpu_usage;
-
- if (one > two)
- return 1;
- else if (one < two)
- return -1;
- else return 0;
-}
-
-static int
-_sort_by_cmd(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return strcasecmp(inf1->command, inf2->command);
-}
-
-static int
-_sort_by_state(const void *p1, const void *p2)
-{
- const Proc_Info *inf1, *inf2;
-
- inf1 = p1; inf2 = p2;
-
- return strcmp(inf1->state, inf2->state);
-}
-
-static Eina_List *
-_list_sort(Ui *ui, Eina_List *list)
-{
- switch (ui->settings.sort_type)
- {
- case SORT_BY_NONE:
- case SORT_BY_PID:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_pid);
- break;
-
- case SORT_BY_UID:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_uid);
- break;
-
- case SORT_BY_NICE:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_nice);
- break;
-
- case SORT_BY_PRI:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_pri);
- break;
-
- case SORT_BY_CPU:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_cpu);
- break;
-
- case SORT_BY_THREADS:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_threads);
- break;
-
- case SORT_BY_SIZE:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_size);
- break;
-
- case SORT_BY_RSS:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_rss);
- break;
-
- case SORT_BY_CMD:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_cmd);
- break;
-
- case SORT_BY_STATE:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_state);
- break;
-
- case SORT_BY_CPU_USAGE:
- list = eina_list_sort(list, eina_list_count(list), _sort_by_cpu_usage);
- break;
- }
-
- if (ui->settings.sort_reverse)
- list = eina_list_reverse(list);
-
- return list;
-}
-
-typedef struct {
- pid_t pid;
- int64_t cpu_time_prev;
-} pid_cpu_time_t;
-
-static void
-_proc_pid_cpu_times_free(Ui *ui)
-{
- pid_cpu_time_t *tmp;
-
- EINA_LIST_FREE(ui->cpu_times, tmp)
- {
- free(tmp);
- }
-}
-
-static void
-_proc_pid_cpu_times_reset(Ui *ui)
-{
- Eina_List *l;
- pid_cpu_time_t *tmp;
- EINA_LIST_FOREACH(ui->cpu_times, l, tmp)
- tmp->cpu_time_prev = 0;
-}
-
-static void
-_proc_pid_cpu_time_save(Ui *ui, Proc_Info *proc)
-{
- Eina_List *l;
- pid_cpu_time_t *tmp;
-
- EINA_LIST_FOREACH(ui->cpu_times, l, tmp)
- {
- if (tmp->pid == proc->pid)
- {
- tmp->cpu_time_prev = proc->cpu_time;
- return;
- }
- }
-
- tmp = calloc(1, sizeof(pid_cpu_time_t));
- if (tmp)
- {
- tmp->pid = proc->pid;
- tmp->cpu_time_prev = proc->cpu_time;
- ui->cpu_times = eina_list_append(ui->cpu_times, tmp);
- }
-}
-
-static void
-_proc_pid_cpu_usage_get(Ui *ui, Proc_Info *proc)
-{
- Eina_List *l;
- pid_cpu_time_t *tmp;
-
- EINA_LIST_FOREACH(ui->cpu_times, l, tmp)
- {
- if (tmp->pid == proc->pid)
- {
- if (tmp->cpu_time_prev && proc->cpu_time > tmp->cpu_time_prev)
- {
- proc->cpu_usage =
- (double) (proc->cpu_time - tmp->cpu_time_prev) /
- ui->settings.poll_delay;
- }
- _proc_pid_cpu_time_save(ui, proc);
- return;
- }
- }
-
- _proc_pid_cpu_time_save(ui, proc);
-}
-
-static void
-_item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui;
- Evas_Object *o;
- Eina_List *contents = NULL;
-
- ui = data;
-
- elm_genlist_item_all_contents_unset(event_info, &contents);
-
- EINA_LIST_FREE(contents, o)
- {
- evisum_ui_item_cache_item_release(ui->cache, o);
- }
-}
-
-static void
-_item_del(void *data, Evas_Object *obj EINA_UNUSED)
-{
- Proc_Info *proc = data;
- proc_info_free(proc);
- proc = NULL;
-}
-
-static Evas_Object *
-_item_column_add(Evas_Object *table, const char *text, int col)
-{
- Evas_Object *rect, *label;
-
- label = elm_label_add(table);
- evas_object_data_set(table, text, label);
- evas_object_size_hint_align_set(label, FILL, FILL);
- evas_object_size_hint_weight_set(label, EXPAND, EXPAND);
- evas_object_show(label);
-
- rect = evas_object_rectangle_add(table);
- evas_object_data_set(label, "rect", rect);
-
- elm_table_pack(table, rect, col, 0, 1, 1);
- elm_table_pack(table, label, col, 0, 1, 1);
-
- return label;
-}
-
-static Evas_Object *
-_item_create(Evas_Object *parent)
-{
- Evas_Object *obj, *table, *label, *ic, *rect;
- Evas_Object *hbx, *pb;
- int i = 0;
-
- obj = parent;
-
- table = elm_table_add(obj);
- evas_object_size_hint_align_set(table, 1.0, FILL);
- evas_object_size_hint_weight_set(table, EXPAND, EXPAND);
-
- hbx = elm_box_add(table);
- elm_box_horizontal_set(hbx, 1);
- evas_object_size_hint_align_set(hbx, 0.0, FILL);
- evas_object_size_hint_weight_set(hbx, EXPAND, EXPAND);
- evas_object_show(hbx);
-
- ic = elm_icon_add(table);
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- evas_object_size_hint_align_set(ic, FILL, FILL);
- evas_object_size_hint_min_set(ic, 16, 16);
- evas_object_size_hint_max_set(ic, 24, 24);
- evas_object_show(ic);
- evas_object_data_set(table, "icon", ic);
- elm_box_pack_end(hbx, ic);
- elm_table_pack(table, hbx, i, 0, 1, 1);
-
- rect = evas_object_rectangle_add(table);
- evas_object_size_hint_min_set(rect, 6, 1);
- elm_box_pack_end(hbx, rect);
-
- rect = evas_object_rectangle_add(table);
- evas_object_data_set(ic, "rect", rect);
- elm_table_pack(table, rect, i++, 0, 1, 1);
-
- label = elm_label_add(table);
- evas_object_size_hint_weight_set(label, 0, EXPAND);
- evas_object_data_set(table, "proc_cmd", label);
- evas_object_data_set(label, "hbox", hbx);
- evas_object_show(label);
- elm_box_pack_end(hbx, label);
-
- rect = evas_object_rectangle_add(table);
- evas_object_size_hint_min_set(rect, 4, 1);
- elm_box_pack_end(hbx, rect);
-
- label =_item_column_add(table, "proc_uid", i++);
- evas_object_size_hint_align_set(label, 0.0, FILL);
- label = _item_column_add(table, "proc_pid", i++);
- evas_object_size_hint_align_set(label, 0.0, FILL);
- label = _item_column_add(table, "proc_size", i++);
- evas_object_size_hint_align_set(label, 0.0, FILL);
- label = _item_column_add(table, "proc_rss", i++);
- evas_object_size_hint_align_set(label, 0.0, FILL);
- label = _item_column_add(table, "proc_state", i++);
- evas_object_size_hint_align_set(label, 0.5, FILL);
-
- hbx = elm_box_add(table);
- elm_box_horizontal_set(hbx, 1);
- evas_object_size_hint_align_set(hbx, FILL, FILL);
- evas_object_size_hint_weight_set(hbx, EXPAND, EXPAND);
- evas_object_show(hbx);
- elm_table_pack(table, hbx, i++, 0, 1, 1);
-
- pb = elm_progressbar_add(hbx);
- evas_object_size_hint_weight_set(pb, EXPAND, EXPAND);
- evas_object_size_hint_align_set(pb, FILL, FILL);
- elm_box_pack_end(hbx, pb);
- evas_object_data_set(table, "proc_cpu_usage", pb);
-
- return table;
-}
-
-static Evas_Object *
-_content_get(void *data, Evas_Object *obj, const char *source)
-{
- Ui *ui;
- Proc_Info *proc;
- struct passwd *pwd_entry;
- Evas_Object *l, *r, *o, *hbx, *pb;
- Evas_Coord w, ow;
-
- proc = (void *) data;
- ui = _ui;
-
- if (strcmp(source, "elm.swallow.content")) return NULL;
- if (!proc) return NULL;
- if (!ui->state.ready) return NULL;
-
- Item_Cache *it = evisum_ui_item_cache_item_get(ui->cache);
- if (!it)
- {
- fprintf(stderr, "Error: Object cache creation failed.\n");
- exit(-1);
- }
-
- evas_object_geometry_get(ui->btn_pid, NULL, NULL, &w, NULL);
- l = evas_object_data_get(it->obj, "proc_pid");
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%d</>", proc->pid));
- evas_object_geometry_get(l, NULL, NULL, &ow, NULL);
- if (ow > w) evas_object_size_hint_min_set(ui->btn_pid, w, 1);
- r = evas_object_data_get(l, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(l);
-
- evas_object_geometry_get(ui->btn_uid, NULL, NULL, &w, NULL);
- l = evas_object_data_get(it->obj, "proc_uid");
- pwd_entry = getpwuid(proc->uid);
- if (pwd_entry)
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%s</>",
pwd_entry->pw_name));
- else
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%d</>", proc->uid));
- evas_object_geometry_get(l, NULL, NULL, &ow, NULL);
- if (ow > w) evas_object_size_hint_min_set(ui->btn_uid, w, 1);
- r = evas_object_data_get(l, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(l);
-
- evas_object_geometry_get(ui->btn_size, NULL, NULL, &w, NULL);
- l = evas_object_data_get(it->obj, "proc_size");
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%s</>",
evisum_size_format(proc->mem_size)));
- evas_object_geometry_get(l, NULL, NULL, &ow, NULL);
- if (ow > w) evas_object_size_hint_min_set(ui->btn_size, w, 1);
- r = evas_object_data_get(l, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(l);
-
- evas_object_geometry_get(ui->btn_rss, NULL, NULL, &w, NULL);
- l = evas_object_data_get(it->obj, "proc_rss");
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%s</>",
evisum_size_format(proc->mem_rss)));
- evas_object_geometry_get(l, NULL, NULL, &ow, NULL);
- if (ow > w) evas_object_size_hint_min_set(ui->btn_rss, w, 1);
- r = evas_object_data_get(l, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(l);
-
- evas_object_geometry_get(ui->btn_cmd, NULL, NULL, &w, NULL);
- l = evas_object_data_get(it->obj, "proc_cmd");
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%s</>",
proc->command));
- hbx = evas_object_data_get(l, "hbox");
- evas_object_geometry_get(hbx, NULL, NULL, &ow, NULL);
- if (ow > w) evas_object_size_hint_min_set(ui->btn_cmd, w, 1);
- r = evas_object_data_get(l, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(l);
-
- o = evas_object_data_get(it->obj, "icon");
- elm_icon_standard_set(o,
evisum_icon_path_get(evisum_icon_cache_find(proc->command)));
- r = evas_object_data_get(o, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(o);
-
- evas_object_geometry_get(ui->btn_state, NULL, NULL, &w, NULL);
- l = evas_object_data_get(it->obj, "proc_state");
- elm_object_text_set(l, eina_slstr_printf("<color=#fff>%s</>", proc->state));
- evas_object_geometry_get(l, NULL, NULL, &ow, NULL);
- //if (ow > w) evas_object_size_hint_min_set(ui->btn_state, w, 1);
- r = evas_object_data_get(l, "rect");
- evas_object_size_hint_min_set(r, w, 1);
- evas_object_show(l);
-
- pb = evas_object_data_get(it->obj, "proc_cpu_usage");
- elm_progressbar_value_set(pb, proc->cpu_usage / 100.0);
- evas_object_show(pb);
-
- evas_object_show(it->obj);
- // Let the genlist resize but align the text.
- elm_table_align_set(it->obj, 0, 0.5);
-
- return it->obj;
-}
-
-static void
-_genlist_ensure_n_items(Evas_Object *genlist, unsigned int items)
-{
- Elm_Object_Item *it;
- Elm_Genlist_Item_Class *itc;
- unsigned int i, existing = elm_genlist_items_count(genlist);
-
- if (items < existing)
- {
- for (i = existing - items; i > 0; i--)
- {
- it = elm_genlist_last_item_get(genlist);
- if (it)
- elm_object_item_del(it);
- }
- }
-
- if (items == existing) return;
-
- itc = elm_genlist_item_class_new();
- itc->item_style = "full";
- itc->func.text_get = NULL;
- itc->func.content_get = _content_get;
- itc->func.filter_get = NULL;
- itc->func.del = _item_del;
-
- for (i = existing; i < items; i++)
- {
- elm_genlist_item_append(genlist, itc, NULL, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- }
-
- elm_genlist_item_class_free(itc);
-}
-
-static Eina_Bool
-_show_items(void *data)
-{
- Ui *ui = data;
-
- elm_genlist_realized_items_update(ui->genlist_procs);
- evas_object_show(ui->genlist_procs);
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-_bring_in(void *data)
-{
- Ui *ui;
- int h_page, v_page;
-
- ui = data;
- elm_scroller_gravity_set(ui->scroller, 0.0, 0.0);
- elm_scroller_last_page_get(ui->scroller, &h_page, &v_page);
- elm_scroller_page_bring_in(ui->scroller, h_page, v_page);
-
- ecore_timer_add(0.5, _show_items, ui);
-
- return EINA_FALSE;
-}
-
-static void
-_process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
- void *msg EINA_UNUSED)
-{
- Ui *ui;
- Eina_List *list, *l, *l_next;
- Proc_Info *proc;
- Elm_Object_Item *it;
- int len = 0;
- list = NULL;
-
- ui = data;
-
- 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();
-
- if (ui->search_text && ui->search_text[0])
- len = strlen(ui->search_text);
-
- if (ui->settings.show_user)
- {
- static uid_t uid = 0;
-
- if (!uid) uid = getuid();
-
- EINA_LIST_FOREACH_SAFE(list, l, l_next, proc)
- {
- if (proc->uid != uid)
- {
- proc_info_free(proc);
- list = eina_list_remove_list(list, l);
- }
- }
- }
-
- EINA_LIST_FOREACH_SAFE(list, l, l_next, proc)
- {
- if (((len && (strncasecmp(proc->command, ui->search_text, len))) ||
- (!ui->settings.show_self && (proc->pid == ui->program_pid))))
- {
- proc_info_free(proc);
- list = eina_list_remove_list(list, l);
- }
- else
- {
- _proc_pid_cpu_usage_get(ui, proc);
- }
- }
-
- _genlist_ensure_n_items(ui->genlist_procs, eina_list_count(list));
-
- it = elm_genlist_first_item_get(ui->genlist_procs);
-
- list = _list_sort(ui, list);
-
- EINA_LIST_FREE(list, proc)
- {
- if (!it)
- proc_info_free(proc);
- else
- {
- Proc_Info *prev = elm_object_item_data_get(it);
- if (prev)
- proc_info_free(prev);
-
- elm_object_item_data_set(it, proc);
-
- it = elm_genlist_item_next_get(it);
- }
- }
-
- elm_genlist_realized_items_update(ui->genlist_procs);
-
- eina_lock_release(&_lock);
-}
-
-static void
-_process_list_update(Ui *ui)
-{
- _process_list_feedback_cb(ui, NULL, NULL);
-}
-
-static void
-_process_list(void *data, Ecore_Thread *thread)
-{
- Ui *ui;
- int delay = 1;
-
- ui = data;
-
- while (1)
- {
- ecore_thread_feedback(thread, ui);
- for (int i = 0; i < delay * 4; i++)
- {
- if (ecore_thread_check(thread)) return;
-
- if (ui->state.skip_wait)
- {
- ui->state.skip_wait = EINA_FALSE;
- break;
- }
- usleep(250000);
- }
- ui->state.ready = EINA_TRUE;
- delay = ui->settings.poll_delay;
- }
-}
-
-static void
-_btn_icon_state_update(Evas_Object *button, Eina_Bool reverse)
-{
- Evas_Object *icon = elm_icon_add(button);
-
- if (reverse)
- elm_icon_standard_set(icon, evisum_icon_path_get("go-down"));
- else
- elm_icon_standard_set(icon, evisum_icon_path_get("go-up"));
-
- elm_object_part_content_set(button, "icon", icon);
- evas_object_show(icon);
-}
-
-static void
-_btn_icon_state_init(Evas_Object *button, Eina_Bool reverse,
- Eina_Bool selected EINA_UNUSED)
-{
- Evas_Object *icon = elm_icon_add(button);
-
- if (reverse)
- elm_icon_standard_set(icon, evisum_icon_path_get("go-down"));
- else
- elm_icon_standard_set(icon, evisum_icon_path_get("go-up"));
-
- elm_object_part_content_set(button, "icon", icon);
- evas_object_show(icon);
-}
-
-static void
-_btn_clicked_state_save(Ui *ui, Evas_Object *btn)
-{
- _btn_icon_state_update(btn, ui->settings.sort_reverse);
-
- _config_save(ui);
- _process_list_update(ui);
-
- elm_scroller_page_bring_in(ui->scroller, 0, 0);
-}
-
-static void
-_btn_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_PID)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_PID;
-
- _btn_clicked_state_save(ui, ui->btn_pid);
-}
-
-static void
-_btn_uid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_UID)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_UID;
-
- _btn_clicked_state_save(ui, ui->btn_uid);
-}
-
-static void
-_btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_CPU_USAGE)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_CPU_USAGE;
-
- _btn_clicked_state_save(ui, ui->btn_cpu_usage);
-}
-
-static void
-_btn_size_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_SIZE)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_SIZE;
-
- _btn_clicked_state_save(ui, ui->btn_size);
-}
-
-static void
-_btn_rss_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_RSS)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_RSS;
-
- _btn_clicked_state_save(ui, ui->btn_rss);
-}
-
-static void
-_btn_cmd_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_CMD)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_CMD;
-
- _btn_clicked_state_save(ui, ui->btn_cmd);
-}
-
-static void
-_btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (ui->settings.sort_type == SORT_BY_STATE)
- ui->settings.sort_reverse = !ui->settings.sort_reverse;
- ui->settings.sort_type = SORT_BY_STATE;
-
- _btn_clicked_state_save(ui, ui->btn_state);
-}
-
-static void
-_item_menu_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj,
- void *ev EINA_UNUSED)
-{
- Ui *ui = data;
-
- evas_object_del(obj);
-
- ui->menu = NULL;
-}
-
-static void
-_item_menu_start_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- kill(ui->selected_pid, SIGCONT);
-}
-
-static void
-_item_menu_stop_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- kill(ui->selected_pid, SIGSTOP);
-}
-
-static void
-_item_menu_kill_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- kill(ui->selected_pid, SIGKILL);
-}
-
-static void
-_item_menu_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- elm_menu_close(ui->menu);
- ui->menu = NULL;
-}
-
-static void
-_item_menu_debug_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui;
- Proc_Info *proc;
- const char *terminal = "xterm";
-
- ui = data;
-
- _item_menu_cancel_cb(ui, NULL, NULL);
-
- proc = proc_info_by_pid(ui->selected_pid);
- if (!proc) return;
-
- if (ecore_file_app_installed("terminology"))
- terminal = "terminology";
-
- ecore_exe_run(eina_slstr_printf("%s -e gdb attach %d", terminal, proc->pid),
- NULL);
-
- proc_info_free(proc);
-}
-
-static void
-_item_menu_actions_add(Evas_Object *menu, Elm_Object_Item *menu_it,
- Ui *ui)
-{
- elm_menu_item_add(menu, menu_it, evisum_icon_path_get("bug"),
- _("Debug"), _item_menu_debug_cb, ui);
-}
-
-static void
-_process_win_add(Evas_Object *parent, int pid, int delay)
-{
- Proc_Info *proc;
-
- proc = proc_info_by_pid(pid);
- if (!proc) return;
-
- ui_process_win_add(parent, proc->pid, proc->command, delay);
-
- proc_info_free(proc);
-}
-
-static void
-_item_menu_properties_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui;
-
- ui = data;
-
- _item_menu_cancel_cb(ui, NULL, NULL);
-
- _process_win_add(ui->win, ui->selected_pid, ui->settings.poll_delay);
-}
-
-static Evas_Object *
-_item_menu_create(Ui *ui, Proc_Info *proc)
+void
+evisum_ui_config_save(Ui *ui)
{
- Elm_Object_Item *menu_it, *menu_it2;
- Evas_Object *menu;
- Eina_Bool stopped;
-
- if (!proc) return NULL;
-
- ui->selected_pid = proc->pid;
-
- ui->menu = menu = elm_menu_add(ui->win);
- if (!menu) return NULL;
-
- evas_object_smart_callback_add(menu, "dismissed",
- _item_menu_dismissed_cb, ui);
-
- stopped = !(!strcmp(proc->state, "stop"));
-
- menu_it = elm_menu_item_add(menu, NULL,
-
evisum_icon_path_get(evisum_icon_cache_find(proc->command)),
- proc->command, NULL, NULL);
-
- menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("window"),
- _("Actions"), NULL, NULL);
- _item_menu_actions_add(menu, menu_it2, ui);
- elm_menu_item_separator_add(menu, menu_it);
-
- menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("start"),
- _("Start"), _item_menu_start_cb, ui);
+ Evas_Coord w, h;
- 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, ui);
+ if (!_evisum_config) return;
- 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, ui);
+ evas_object_geometry_get(ui->win, NULL, NULL, &w, &h);
- elm_menu_item_separator_add(menu, menu_it);
- menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("window"),
- _("Properties"), _item_menu_properties_cb, ui);
+ _evisum_config->sort_type = ui->settings.sort_type;
+ _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->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;
- elm_menu_item_separator_add(menu, menu_it);
- elm_menu_item_add(menu, menu_it, evisum_icon_path_get("cancel"),
- _("Cancel"), _item_menu_cancel_cb, ui);
+ proc_info_kthreads_show_set(ui->settings.show_kthreads);
- return menu;
+ config_save(_evisum_config);
}
-static void
-_item_pid_secondary_clicked_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
- Evas_Object *obj, void *event_info)
+void
+evisum_ui_config_load(Ui *ui)
{
- Evas_Object *menu;
- Evas_Event_Mouse_Up *ev;
- Ui *ui;
- Elm_Object_Item *it;
- Proc_Info *proc;
-
- ev = event_info;
- if (ev->button != 3) return;
+ _evisum_config = config_load();
- it = elm_genlist_at_xy_item_get(obj, ev->output.x, ev->output.y, NULL);
- proc = elm_object_item_data_get(it);
- if (!proc) return;
+ ui->settings.sort_type = _evisum_config->sort_type;
+ ui->settings.sort_reverse = _evisum_config->sort_reverse;
+ ui->settings.poll_delay = _evisum_config->poll_delay;
- ui = data;
+ if ((_evisum_config->width > 0) && (_evisum_config->height > 0))
+ evas_object_resize(ui->win, _evisum_config->width,
_evisum_config->height);
- menu = _item_menu_create(ui, proc);
- if (!menu) return;
+ evisum_ui_effects_enabled_set(_evisum_config->effects);
+ evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
- elm_menu_move(menu, ev->canvas.x, ev->canvas.y);
- evas_object_show(menu);
+ 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;
}
-static void
-_item_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info)
-{
- Ui *ui;
- Elm_Object_Item *it;
- Proc_Info *proc;
-
- ui = data;
- it = event_info;
-
- elm_genlist_item_selected_set(it, EINA_FALSE);
- if (ui->menu) return;
-
- proc = elm_object_item_data_get(it);
- if (!proc) return;
-
- ui->selected_pid = proc->pid;
- ui_process_win_add(ui->win, proc->pid, proc->command,
- ui->settings.poll_delay);
-}
static void
_about_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
@@ -1134,23 +127,11 @@ _menu_effects_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
evisum_ui_backgrounds_enabled_set(0);
}
- _config_save(ui);
+ evisum_ui_config_save(ui);
evisum_restart();
}
-static void
-_main_menu_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *ev EINA_UNUSED)
-{
- Ui *ui = data;
-
- elm_ctxpopup_dismiss(ui->main_menu);
- evas_object_del(ui->main_menu);
-
- ui->main_menu = NULL;
-}
-
static Evas_Object *
_btn_create(Evas_Object *parent, const char *icon, const char *text, void *cb,
void *data)
@@ -1197,9 +178,7 @@ _main_menu_slider_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
else
elm_slider_unit_format_set(obj, _("%1.0f sec"));
- _config_save(ui);
-
- _proc_pid_cpu_times_reset(ui);
+ evisum_ui_config_save(ui);
}
static void
@@ -1209,7 +188,7 @@ _main_menu_show_threads_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
Ui *ui = data;
ui->settings.show_kthreads = elm_check_state_get(obj);
- _config_save(ui);
+ evisum_ui_config_save(ui);
}
static void
@@ -1219,7 +198,7 @@ _main_menu_show_desktop_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
Ui *ui = data;
ui->settings.show_desktop = elm_check_state_get(obj);
- _config_save(ui);
+ evisum_ui_config_save(ui);
}
static void
@@ -1229,17 +208,17 @@ _main_menu_show_user_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
Ui *ui = data;
ui->settings.show_user = elm_check_state_get(obj);
- _config_save(ui);
+ evisum_ui_config_save(ui);
}
-static void
-_main_menu_create(Ui *ui, Evas_Object *btn)
+void
+evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent)
{
Evas_Object *o, *bx, *bx2, *hbox, *sep, *fr, *sli;
- Evas_Object *chk;
+ Evas_Object *btn, *chk;
Evas_Coord ox, oy, ow, oh;
- evas_object_geometry_get(btn, &ox, &oy, &ow, &oh);
+ evas_object_geometry_get(parent, &ox, &oy, &ow, &oh);
o = elm_ctxpopup_add(ui->win);
evas_object_size_hint_weight_set(o, EXPAND, EXPAND);
evas_object_size_hint_align_set(o, FILL, FILL);
@@ -1382,296 +361,6 @@ _main_menu_create(Ui *ui, Evas_Object *btn)
ui->main_menu = o;
}
-static void
-_btn_menu_clicked_cb(void *data, Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- if (!ui->main_menu)
- _main_menu_create(ui, obj);
- else
- _main_menu_dismissed_cb(ui, NULL, NULL);
-}
-
-static Evas_Object *
-_ui_content_system_add(Ui *ui, Evas_Object *parent)
-{
- Evas_Object *box, *hbox, *frame, *table;
- Evas_Object *entry, *pb, *button, *plist, *btn;
- int i = 0;
-
- table = elm_table_add(parent);
- evas_object_size_hint_weight_set(table, EXPAND, EXPAND);
- evas_object_size_hint_align_set(table, FILL, FILL);
- evas_object_show(table);
-
- ui->btn_cmd = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_CMD ? ui->settings.sort_reverse
: EINA_FALSE,
- ui->settings.sort_type == SORT_BY_CMD);
- evas_object_size_hint_weight_set(button, EXPAND, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("Command"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->btn_uid = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_UID ? ui->settings.sort_reverse
: EINA_FALSE,
- ui->settings.sort_type == SORT_BY_UID);
- evas_object_size_hint_weight_set(button, 0.5, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("User"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->btn_pid = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_PID ? ui->settings.sort_reverse
: EINA_FALSE,
- ui->settings.sort_type == SORT_BY_PID);
- evas_object_size_hint_weight_set(button, 0.5, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("PID"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->btn_size = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_SIZE ? ui->settings.sort_reverse
: EINA_FALSE,
- ui->settings.sort_type == SORT_BY_SIZE);
- evas_object_size_hint_weight_set(button, 0.1, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("Size"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->btn_rss = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_RSS ? ui->settings.sort_reverse
: EINA_FALSE,
- ui->settings.sort_type == SORT_BY_RSS);
- evas_object_size_hint_weight_set(button, 0.1, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("Res"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->btn_state = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_STATE ?
ui->settings.sort_reverse : EINA_FALSE,
- ui->settings.sort_type == SORT_BY_STATE);
- evas_object_size_hint_weight_set(button, 0, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("State"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->btn_cpu_usage = button = elm_button_add(parent);
- _btn_icon_state_init(button,
- ui->settings.sort_type == SORT_BY_CPU_USAGE ?
ui->settings.sort_reverse : EINA_FALSE,
- ui->settings.sort_type == SORT_BY_CPU_USAGE);
- evas_object_size_hint_weight_set(button, EXPAND, 0);
- evas_object_size_hint_align_set(button, FILL, FILL);
- elm_object_text_set(button, _("CPU %"));
- evas_object_show(button);
- elm_table_pack(table, button, i++, 1, 1, 1);
-
- ui->scroller = ui->genlist_procs = plist = elm_genlist_add(parent);
- elm_scroller_gravity_set(ui->scroller, 0.0, 1.0);
- elm_object_focus_allow_set(plist, EINA_FALSE);
- elm_scroller_movement_block_set(ui->scroller,
- ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
- elm_scroller_policy_set(ui->scroller, ELM_SCROLLER_POLICY_OFF,
- ELM_SCROLLER_POLICY_AUTO);
- elm_genlist_homogeneous_set(plist, EINA_TRUE);
- elm_genlist_multi_select_set(plist, EINA_FALSE);
- evas_object_size_hint_weight_set(plist, EXPAND, EXPAND);
- evas_object_size_hint_align_set(plist, FILL, FILL);
- elm_table_pack(table, plist, 0, 2, i, 1);
-
- hbox = elm_box_add(parent);
- evas_object_size_hint_weight_set(hbox, EXPAND, 0);
- evas_object_size_hint_align_set(hbox, FILL, 1.0);
- elm_box_horizontal_set(hbox, EINA_TRUE);
- evas_object_show(hbox);
-
- btn = _btn_create(hbox, "menu", NULL, _btn_menu_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
-
- ui->entry_search = entry = elm_entry_add(parent);
- evas_object_size_hint_weight_set(entry, EXPAND, EXPAND);
- evas_object_size_hint_align_set(entry, FILL, FILL);
- elm_entry_single_line_set(entry, EINA_TRUE);
- elm_entry_scrollable_set(entry, EINA_TRUE);
- elm_entry_editable_set(entry, EINA_TRUE);
- evas_object_show(entry);
-
- elm_box_pack_end(hbox, entry);
- elm_table_pack(table, hbox, 0, 3, i, 1);
-
- box = elm_box_add(parent);
- evas_object_size_hint_weight_set(box, EXPAND, 0);
- evas_object_size_hint_align_set(box, FILL, FILL);
- evas_object_show(box);
- elm_table_pack(table, box, 0, 0, i, 1);
-
- hbox = elm_box_add(box);
- evas_object_size_hint_weight_set(hbox, EXPAND, 0);
- evas_object_size_hint_align_set(hbox, FILL, 0);
- elm_box_horizontal_set(hbox, EINA_TRUE);
- evas_object_show(hbox);
- elm_box_pack_end(box, hbox);
-
- frame = elm_frame_add(hbox);
- evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
- evas_object_size_hint_align_set(frame, FILL, FILL);
- elm_object_text_set(frame, _("System CPU"));
- elm_object_style_set(frame, "pad_small");
- evas_object_show(frame);
- elm_box_pack_end(hbox, frame);
-
- ui->progress_cpu = pb = elm_progressbar_add(parent);
- evas_object_size_hint_align_set(pb, FILL, FILL);
- evas_object_size_hint_weight_set(pb, EXPAND, EXPAND);
- elm_progressbar_unit_format_set(pb, "%1.2f %%");
- elm_object_content_set(frame, pb);
- evas_object_show(pb);
-
- frame = elm_frame_add(hbox);
- evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
- evas_object_size_hint_align_set(frame, FILL, FILL);
- elm_object_text_set(frame, _("System Memory"));
- elm_object_style_set(frame, "pad_small");
- evas_object_show(frame);
- elm_box_pack_end(hbox, frame);
-
- ui->progress_mem = pb = elm_progressbar_add(parent);
- evas_object_size_hint_align_set(pb, FILL, FILL);
- evas_object_size_hint_weight_set(pb, EXPAND, EXPAND);
- evas_object_show(pb);
- elm_object_content_set(frame, pb);
-
- evas_object_smart_callback_add(ui->btn_pid, "clicked",
- _btn_pid_clicked_cb, ui);
- evas_object_smart_callback_add(ui->btn_uid, "clicked",
- _btn_uid_clicked_cb, ui);
- evas_object_smart_callback_add(ui->btn_size, "clicked",
- _btn_size_clicked_cb, ui);
- evas_object_smart_callback_add(ui->btn_rss, "clicked",
- _btn_rss_clicked_cb, ui);
- evas_object_smart_callback_add(ui->btn_cmd, "clicked",
- _btn_cmd_clicked_cb, ui);
- evas_object_smart_callback_add(ui->btn_state, "clicked",
- _btn_state_clicked_cb, ui);
- evas_object_smart_callback_add(ui->btn_cpu_usage, "clicked",
- _btn_cpu_usage_clicked_cb, ui);
- evas_object_smart_callback_add(ui->genlist_procs, "selected",
- _item_pid_clicked_cb, ui);
- evas_object_event_callback_add(ui->genlist_procs, EVAS_CALLBACK_MOUSE_UP,
- _item_pid_secondary_clicked_cb, ui);
- evas_object_smart_callback_add(ui->genlist_procs, "unrealized",
- _item_unrealized_cb, ui);
-
- frame = elm_frame_add(parent);
- evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
- evas_object_size_hint_align_set(frame, FILL, FILL);
- elm_object_style_set(frame, "pad_small");
- evas_object_show(frame);
- elm_object_content_set(frame, table);
-
- return frame;
-}
-
-static void
-_evisum_process_filter(Ui *ui, const char *text)
-{
- if (ui->search_text)
- free(ui->search_text);
-
- ui->search_text = strdup(text);
-}
-
-static void
-_evisum_search_keypress_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
- void *event_info)
-{
- Ui * ui;
- const char *markup;
- char *text;
- Evas_Object *entry;
- Evas_Event_Key_Down *event;
-
- event = event_info;
- entry = obj;
- ui = data;
-
- if (!event) return;
-
- ui->state.skip_wait = EINA_TRUE;
-
- markup = elm_object_part_text_get(entry, NULL);
- text = elm_entry_markup_to_utf8(markup);
- if (text)
- {
- _evisum_process_filter(ui, text);
- free(text);
- }
-}
-
-static void
-_evisum_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
- Evas_Event_Key_Down *ev;
- Ui *ui;
- Eina_Bool control;
-
- ev = event_info;
- ui = data;
-
- if (!ev || !ev->keyname)
- return;
-
- ui->state.skip_wait = EINA_TRUE;
-
- if (!strcmp(ev->keyname, "Escape"))
- {
- ecore_main_loop_quit();
- return;
- }
-
- control = evas_key_modifier_is_set(ev->modifiers, "Control");
- if (!control)
- {
- elm_object_focus_set(ui->entry_search, EINA_TRUE);
- return;
- }
-
- if (ev->keyname[0] == 'e' || ev->keyname[0] == 'E')
- ui->settings.show_self = !ui->settings.show_self;
-
- if (ev->keyname[0] == 'k' || ev->keyname[0] == 'K')
- ui->settings.show_kthreads = !ui->settings.show_kthreads;
-
- _config_save(ui);
-}
-
-static void
-_evisum_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
- Ui *ui = data;
-
- if (eina_lock_take_try(&_lock))
- {
- elm_genlist_realized_items_update(ui->genlist_procs);
- eina_lock_release(&_lock);
- }
-
- if (ui->main_menu)
- _main_menu_dismissed_cb(ui, NULL, NULL);
-
- _config_save(ui);
-}
-
Eina_Bool
evisum_ui_can_exit(Ui *ui)
{
@@ -1680,174 +369,6 @@ evisum_ui_can_exit(Ui *ui)
return 0;
}
-static void
-_system_info_all_poll(void *data, Ecore_Thread *thread)
-{
- Ui *ui = data;
-
- while (1)
- {
- Sys_Info *info = system_info_basic_get();
- if (!info)
- {
- ecore_main_loop_quit();
- return;
- }
- ecore_thread_feedback(thread, info);
- for (int i = 0; i < 4 * ui->settings.poll_delay; i++)
- {
- if (ecore_thread_check(thread)) return;
- usleep(250000);
- }
- }
-}
-
-static void
-_system_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
-{
- Ui *ui;
- Evas_Object *pb;
- Sys_Info *info;
- double ratio, value, cpu_usage = 0.0;
-
- ui = data;
- info = msg;
-
- if (ecore_thread_check(thread))
- goto out;
-
- for (int i = 0; i < info->cpu_count; i++)
- cpu_usage += info->cores[i]->percent;
-
- cpu_usage /= system_cpu_online_count_get();
-
- elm_progressbar_value_set(ui->progress_cpu, cpu_usage / 100);
-
- ui->cpu_usage = cpu_usage;
-
- if (ui->mem.zfs_mounted)
- info->memory.used += info->memory.zfs_arc_used;
-
- pb = ui->progress_mem;
- ratio = info->memory.total / 100.0;
- value = info->memory.used / ratio;
- elm_progressbar_value_set(pb, value / 100);
- elm_progressbar_unit_format_set(pb, eina_slstr_printf("%s / %s",
- evisum_size_format(info->memory.used),
- evisum_size_format(info->memory.total)));
-out:
- system_info_all_free(info);
-}
-
-static Eina_Bool
-_elm_config_change_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
-{
- Ui *ui = data;
-
- elm_genlist_clear(ui->genlist_procs);
- _process_list_update(ui);
-
- return EINA_TRUE;
-}
-
-static void
-_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- evas_object_del(ui->win);
-
- if (ui->thread_system)
- ecore_thread_cancel(ui->thread_system);
-
- if (ui->thread_process)
- ecore_thread_cancel(ui->thread_process);
-
- if (ui->thread_system)
- ecore_thread_wait(ui->thread_system, 0.2);
-
- if (ui->thread_process)
- ecore_thread_wait(ui->thread_process, 0.2);
-
- ui->thread_system = ui->thread_process = NULL;
-
- ui->win = NULL;
-
- if (ui->animator)
- ecore_animator_del(ui->animator);
-
- if (ui->cache)
- evisum_ui_item_cache_free(ui->cache);
-
- if (evisum_ui_can_exit(ui))
- ecore_main_loop_quit();
-}
-
-void
-ui_main_win_add(Ui *ui)
-{
- Evas_Object *win, *icon;
- Evas_Object *o;
-
- if (ui->win)
- {
- elm_win_raise(ui->win);
- return;
- }
-
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- ui->win = win = elm_win_util_standard_add("evisum", "evisum");
- icon = elm_icon_add(win);
- elm_icon_standard_set(icon, "evisum");
- elm_win_icon_object_set(win, icon);
-
- 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_title_set(win, _("EFL System Monitor"));
- elm_win_center(win, EINA_TRUE, EINA_TRUE);
- evas_object_smart_callback_add(win, "delete,request", _win_del_cb, ui);
- evas_object_show(win);
-
- ecore_timer_add(2.0, _bring_in, ui);
-
- if (evisum_ui_effects_enabled_get() || evisum_ui_backgrounds_enabled_get())
- evisum_ui_background_random_add(ui->win, 1);
-
- o = _ui_content_system_add(ui, win);
- elm_object_content_set(win, o);
-
- if (evisum_ui_effects_enabled_get())
- evisum_ui_animate(ui);
-
- elm_object_focus_set(ui->entry_search, EINA_TRUE);
-
- ui->cache = evisum_ui_item_cache_new(ui->genlist_procs, _item_create, 50);
-
- ui->thread_system =
- ecore_thread_feedback_run(_system_info_all_poll,
- _system_info_all_poll_feedback_cb,
- NULL, NULL, ui, EINA_FALSE);
- ui->thread_process =
- ecore_thread_feedback_run(_process_list,
- _process_list_feedback_cb,
- NULL, NULL, ui, EINA_FALSE);
- _process_list_update(ui);
-
- evas_object_event_callback_add(ui->win, EVAS_CALLBACK_RESIZE,
- _evisum_resize_cb, ui);
- evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
- _evisum_key_down_cb, ui);
- evas_object_event_callback_add(ui->entry_search, EVAS_CALLBACK_KEY_DOWN,
- _evisum_search_keypress_cb, ui);
- ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED,
- _elm_config_change_cb, ui);
-}
-
static void
_ui_init_system_probe(Ui *ui)
{
@@ -1862,13 +383,26 @@ evisum_restart(void)
ecore_main_loop_quit();
}
+static void
+_process_win_add(Evas_Object *parent, int pid, int delay)
+{
+ Proc_Info *proc;
+
+ proc = proc_info_by_pid(pid);
+ if (!proc) return;
+
+ ui_process_win_add(parent, proc->pid, proc->command, delay);
+
+ proc_info_free(proc);
+}
+
void
evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
{
switch (action)
{
case EVISUM_ACTION_DEFAULT:
- ui_main_win_add(ui);
+ ui_process_list_win_add(ui);
break;
case EVISUM_ACTION_PROCESS:
_process_win_add(NULL, pid, 3);
@@ -1891,12 +425,8 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
void
evisum_ui_del(Ui *ui)
{
- _proc_pid_cpu_times_free(ui);
-
evisum_icon_cache_shutdown();
- eina_lock_free(&_lock);
-
free(ui);
}
@@ -1921,7 +451,7 @@ _ui_init(void)
_ui = NULL;
_evisum_config = NULL;
- _config_load(ui);
+ evisum_ui_config_load(ui);
return ui;
}
@@ -1929,8 +459,6 @@ _ui_init(void)
Ui *
evisum_ui_init(void)
{
- eina_lock_new(&_lock);
-
Ui *ui = _ui = _ui_init();
if (!ui) return NULL;
diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h
index 2b309e9..eb4ebd2 100644
--- a/src/bin/ui/ui.h
+++ b/src/bin/ui/ui.h
@@ -124,12 +124,21 @@ evisum_ui_del(Ui *ui);
Eina_Bool
evisum_ui_can_exit(Ui *ui);
+void
+evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent);
+
void
evisum_ui_activate(Ui *ui, Evisum_Action action, int pid);
const char *
evisum_ui_icon_cache_find(Ui *ui, const char *cmd);
+void
+evisum_ui_config_load(Ui *ui);
+
+void
+evisum_ui_config_save(Ui *ui);
+
void
evisum_restart(void);
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui_process_list.c
similarity index 78%
copy from src/bin/ui/ui.c
copy to src/bin/ui/ui_process_list.c
index 1d382c0..852ef3d 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui_process_list.c
@@ -15,56 +15,10 @@
// These should be static. Please do not change.
// OpenBSD has issues which are undetermined yet.
-Ui *_ui;
-Evisum_Config *_evisum_config;
+extern Ui *_ui;
+extern Evisum_Config *_evisum_config;
Eina_Lock _lock;
-static void
-_config_save(Ui *ui)
-{
- Evas_Coord w, h;
-
- if (!_evisum_config) return;
-
- evas_object_geometry_get(ui->win, NULL, NULL, &w, &h);
-
- _evisum_config->sort_type = ui->settings.sort_type;
- _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->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;
-
- proc_info_kthreads_show_set(ui->settings.show_kthreads);
-
- config_save(_evisum_config);
-}
-
-static void
-_config_load(Ui *ui)
-{
- _evisum_config = config_load();
-
- ui->settings.sort_type = _evisum_config->sort_type;
- ui->settings.sort_reverse = _evisum_config->sort_reverse;
- ui->settings.poll_delay = _evisum_config->poll_delay;
-
- if ((_evisum_config->width > 0) && (_evisum_config->height > 0))
- evas_object_resize(ui->win, _evisum_config->width,
_evisum_config->height);
-
- 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;
-}
-
static int
_sort_by_pid(const void *p1, const void *p2)
{
@@ -773,7 +727,7 @@ _btn_clicked_state_save(Ui *ui, Evas_Object *btn)
{
_btn_icon_state_update(btn, ui->settings.sort_reverse);
- _config_save(ui);
+ evisum_ui_config_save(ui);
_process_list_update(ui);
elm_scroller_page_bring_in(ui->scroller, 0, 0);
@@ -1073,72 +1027,6 @@ _item_pid_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info)
ui->settings.poll_delay);
}
-static void
-_about_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- evisum_about_window_show(ui);
-}
-
-static void
-_menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui_win_memory_add(ui);
-}
-
-static void
-_menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui_win_disk_add(ui);
-}
-
-static void
-_menu_sensors_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui_win_sensors_add(ui);
-}
-
-static void
-_menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui_win_cpu_add(ui);
-}
-
-static void
-_menu_effects_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- 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);
- }
-
- _config_save(ui);
-
- evisum_restart();
-}
-
static void
_main_menu_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *ev EINA_UNUSED)
@@ -1184,204 +1072,6 @@ _btn_create(Evas_Object *parent, const char *icon,
const char *text, void *cb,
return ot;
}
-static void
-_main_menu_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui->settings.poll_delay = elm_slider_value_get(obj) + 0.5;
-
- if (ui->settings.poll_delay > 1)
- elm_slider_unit_format_set(obj, _("%1.0f secs"));
- else
- elm_slider_unit_format_set(obj, _("%1.0f sec"));
-
- _config_save(ui);
-
- _proc_pid_cpu_times_reset(ui);
-}
-
-static void
-_main_menu_show_threads_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui->settings.show_kthreads = elm_check_state_get(obj);
- _config_save(ui);
-}
-
-static void
-_main_menu_show_desktop_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui->settings.show_desktop = elm_check_state_get(obj);
- _config_save(ui);
-}
-
-static void
-_main_menu_show_user_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- Ui *ui = data;
-
- ui->settings.show_user = elm_check_state_get(obj);
- _config_save(ui);
-}
-
-static void
-_main_menu_create(Ui *ui, Evas_Object *btn)
-{
- Evas_Object *o, *bx, *bx2, *hbox, *sep, *fr, *sli;
- Evas_Object *chk;
- Evas_Coord ox, oy, ow, oh;
-
- evas_object_geometry_get(btn, &ox, &oy, &ow, &oh);
- o = elm_ctxpopup_add(ui->win);
- evas_object_size_hint_weight_set(o, EXPAND, EXPAND);
- evas_object_size_hint_align_set(o, FILL, FILL);
- elm_object_style_set(o, "noblock");
-
- bx = elm_box_add(o);
- evas_object_size_hint_weight_set(bx, EXPAND, EXPAND);
- evas_object_size_hint_align_set(bx, FILL, FILL);
- evas_object_show(bx);
-
- fr = elm_frame_add(o);
- elm_object_text_set(fr, _("Actions"));
- evas_object_size_hint_weight_set(fr, EXPAND, EXPAND);
- evas_object_size_hint_align_set(fr, FILL, FILL);
- evas_object_show(fr);
-
- evas_object_size_hint_min_set(fr, 100, 100);
- elm_object_content_set(fr, bx);
- elm_object_content_set(o, fr);
-
- hbox = elm_box_add(o);
- elm_box_horizontal_set(hbox, 1);
- evas_object_size_hint_align_set(hbox, FILL, FILL);
- evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND);
- evas_object_show(hbox);
-
- btn = _btn_create(hbox, "cpu", _("CPU"),
- _menu_cpu_activity_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
-
- btn = _btn_create(hbox, "memory", _("Memory"),
- _menu_memory_activity_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
-
- btn = _btn_create(hbox, "storage", _("Storage"),
- _menu_disk_activity_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
-
- btn = _btn_create(hbox, "misc", _("Sensors"),
- _menu_sensors_activity_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
-
- sep = elm_separator_add(hbox);
- evas_object_size_hint_align_set(sep, FILL, FILL);
- evas_object_size_hint_weight_set(sep, EXPAND, EXPAND);
- elm_separator_horizontal_set(sep, 0);
- evas_object_show(sep);
- elm_box_pack_end(hbox, sep);
-
- btn = _btn_create(hbox, "effects", _("Effects"),
- _menu_effects_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
-
- sep = elm_separator_add(hbox);
- evas_object_size_hint_align_set(sep, FILL, FILL);
- evas_object_size_hint_weight_set(sep, EXPAND, EXPAND);
- elm_separator_horizontal_set(sep, 0);
- evas_object_show(sep);
- elm_box_pack_end(hbox, sep);
-
- btn = _btn_create(hbox, "evisum", _("About"), _about_clicked_cb, ui);
- elm_box_pack_end(hbox, btn);
- elm_box_pack_end(bx, hbox);
-
- fr = elm_frame_add(o);
- elm_object_text_set(fr, _("Options"));
- evas_object_size_hint_weight_set(fr, EXPAND, EXPAND);
- evas_object_size_hint_align_set(fr, FILL, FILL);
- evas_object_show(fr);
-
- bx2 = elm_box_add(o);
- evas_object_size_hint_weight_set(bx2, EXPAND, EXPAND);
- evas_object_size_hint_align_set(bx2, FILL, FILL);
- evas_object_show(bx2);
-
- sli = elm_slider_add(o);
- evas_object_size_hint_weight_set(sli, EXPAND, EXPAND);
- elm_slider_min_max_set(sli, 1.0, 10.0);
- elm_slider_span_size_set(sli, 10.0);
- elm_slider_step_set(sli, 1 / 10.0);
- elm_slider_indicator_format_set(sli, "%1.0f");
- elm_slider_unit_format_set(sli, _("%1.0f secs"));
- elm_slider_value_set(sli, ui->settings.poll_delay);
- evas_object_size_hint_align_set(sli, FILL, FILL);
- elm_object_tooltip_text_set(sli, _("Poll delay"));
- evas_object_smart_callback_add(sli, "slider,drag,stop",
- _main_menu_slider_changed_cb, ui);
- evas_object_smart_callback_add(sli, "changed",
- _main_menu_slider_changed_cb, ui);
- evas_object_show(sli);
- _main_menu_slider_changed_cb(ui, sli, NULL);
- elm_box_pack_end(bx2, sli);
-
- sep = elm_separator_add(bx2);
- evas_object_size_hint_align_set(sep, FILL, FILL);
- evas_object_size_hint_weight_set(sep, EXPAND, EXPAND);
- elm_separator_horizontal_set(sep, 1);
- evas_object_show(sep);
- elm_box_pack_end(bx2, sep);
-
- chk = elm_check_add(bx2);
- evas_object_size_hint_weight_set(chk, EXPAND, EXPAND);
- evas_object_size_hint_align_set(chk, FILL, FILL);
- elm_object_text_set(chk, _("Show kernel threads?"));
- elm_check_state_set(chk, _evisum_config->show_kthreads);
- evas_object_show(chk);
- evas_object_smart_callback_add(chk, "changed",
- _main_menu_show_threads_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);
- elm_object_text_set(chk, _("User only?"));
- elm_check_state_set(chk, _evisum_config->show_user);
- evas_object_show(chk);
- evas_object_smart_callback_add(chk, "changed",
- _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);
- elm_object_text_set(chk, _("Current desktop session only?"));
- elm_check_state_set(chk, _evisum_config->show_desktop);
- evas_object_show(chk);
- 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);
-
- elm_ctxpopup_direction_priority_set(o, ELM_CTXPOPUP_DIRECTION_UP,
- ELM_CTXPOPUP_DIRECTION_DOWN,
- ELM_CTXPOPUP_DIRECTION_LEFT,
- ELM_CTXPOPUP_DIRECTION_RIGHT);
- evas_object_move(o, ox + (ow / 2), oy);
- evas_object_show(o);
- ui->main_menu = o;
-}
-
static void
_btn_menu_clicked_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
@@ -1389,7 +1079,7 @@ _btn_menu_clicked_cb(void *data, Evas_Object *obj,
Ui *ui = data;
if (!ui->main_menu)
- _main_menu_create(ui, obj);
+ evisum_ui_main_menu_create(ui, obj);
else
_main_menu_dismissed_cb(ui, NULL, NULL);
}
@@ -1652,7 +1342,7 @@ _evisum_key_down_cb(void *data, Evas *e, Evas_Object
*obj, void *event_info)
if (ev->keyname[0] == 'k' || ev->keyname[0] == 'K')
ui->settings.show_kthreads = !ui->settings.show_kthreads;
- _config_save(ui);
+ evisum_ui_config_save(ui);
}
static void
@@ -1669,15 +1359,7 @@ _evisum_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
if (ui->main_menu)
_main_menu_dismissed_cb(ui, NULL, NULL);
- _config_save(ui);
-}
-
-Eina_Bool
-evisum_ui_can_exit(Ui *ui)
-{
- if (!ui->win && !ui->cpu.win && !ui->mem.win && !ui->sensors.win)
- return 1;
- return 0;
+ evisum_ui_config_save(ui);
}
static void
@@ -1785,7 +1467,7 @@ _win_del_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
}
void
-ui_main_win_add(Ui *ui)
+ui_process_list_win_add(Ui *ui)
{
Evas_Object *win, *icon;
Evas_Object *o;
@@ -1848,92 +1530,3 @@ ui_main_win_add(Ui *ui)
_elm_config_change_cb, ui);
}
-static void
-_ui_init_system_probe(Ui *ui)
-{
- ui->mem.zfs_mounted = file_system_in_use("ZFS");
-}
-
-void
-evisum_restart(void)
-{
- evisum_server_shutdown();
- ecore_app_restart();
- ecore_main_loop_quit();
-}
-
-void
-evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
-{
- switch (action)
- {
- case EVISUM_ACTION_DEFAULT:
- ui_main_win_add(ui);
- break;
- case EVISUM_ACTION_PROCESS:
- _process_win_add(NULL, pid, 3);
- break;
- case EVISUM_ACTION_CPU:
- ui_win_cpu_add(ui);
- break;
- case EVISUM_ACTION_MEM:
- ui_win_memory_add(ui);
- break;
- case EVISUM_ACTION_STORAGE:
- ui_win_disk_add(ui);
- break;
- case EVISUM_ACTION_SENSORS:
- ui_win_sensors_add(ui);
- break;
- }
-}
-
-void
-evisum_ui_del(Ui *ui)
-{
- _proc_pid_cpu_times_free(ui);
-
- evisum_icon_cache_shutdown();
-
- eina_lock_free(&_lock);
-
- free(ui);
-}
-
-static Ui *
-_ui_init(void)
-{
- Ui *ui = calloc(1, sizeof(Ui));
- if (!ui) return NULL;
-
- ui->settings.poll_delay = 3;
- ui->settings.sort_reverse = EINA_FALSE;
- ui->settings.sort_type = SORT_BY_PID;
- ui->selected_pid = -1;
- ui->program_pid = getpid();
- ui->cpu_times = NULL;
- ui->cpu_list = NULL;
-
- evisum_icon_cache_init();
-
- _ui_init_system_probe(ui);
-
- _ui = NULL;
- _evisum_config = NULL;
-
- _config_load(ui);
-
- return ui;
-}
-
-Ui *
-evisum_ui_init(void)
-{
- eina_lock_new(&_lock);
-
- Ui *ui = _ui = _ui_init();
- if (!ui) return NULL;
-
- return ui;
-}
-
diff --git a/src/bin/ui/ui_process_list.h b/src/bin/ui/ui_process_list.h
new file mode 100644
index 0000000..599053e
--- /dev/null
+++ b/src/bin/ui/ui_process_list.h
@@ -0,0 +1,9 @@
+#ifndef __UI_PROCESS_LIST_H__
+#define __UI_PROCESS_LIST_H__
+
+#include "ui.h"
+
+void
+ui_process_list_win_add(Ui *ui);
+
+#endif
--
