netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=43bd0baeb39113bba138b0fd1350e96dc32f9c83
commit 43bd0baeb39113bba138b0fd1350e96dc32f9c83 Author: Alastair Poole <[email protected]> Date: Tue Oct 27 12:51:15 2020 +0000 ui: rights for all. No window takes presedence. Last window closes application :) Because, if this wasn't done, someone in IRC (apbbb probably) would say it should be done...soooooo --- src/bin/main.c | 2 -- src/bin/ui/ui.c | 71 ++++++++++++++++++++++++------------------------- src/bin/ui/ui.h | 4 +-- src/bin/ui/ui_cpu.c | 3 +++ src/bin/ui/ui_disk.c | 3 +++ src/bin/ui/ui_memory.c | 3 +++ src/bin/ui/ui_sensors.c | 3 +++ 7 files changed, 49 insertions(+), 40 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 5d4cfd3..cac1bd9 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -4,8 +4,6 @@ * See COPYING file for details. */ -#define DEVELOPMENT 1 - #include "config.h" #include "evisum_config.h" #include "evisum_server.h" diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index cb1720a..f2b51ee 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -577,9 +577,7 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, list = proc_info_all_get(); if (ui->search_text && ui->search_text[0]) - { - len = strlen(ui->search_text); - } + len = strlen(ui->search_text); EINA_LIST_FOREACH_SAFE(list, l, l_next, proc) { @@ -1638,33 +1636,12 @@ _evisum_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) _config_save(ui); } -void -evisum_ui_shutdown(Ui *ui) +Eina_Bool +evisum_ui_can_exit(Ui *ui) { - 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.1); - - if (ui->thread_process) - ecore_thread_wait(ui->thread_process, 0.1); - - if (ui->cpu.win) - evas_object_smart_callback_call(ui->cpu.win, "delete,request", NULL); - if (ui->mem.win) - evas_object_smart_callback_call(ui->mem.win, "delete,request", NULL); - if (ui->disk.win) - evas_object_smart_callback_call(ui->disk.win, "delete,request", NULL); - if (ui->sensors.win) - evas_object_smart_callback_call(ui->sensors.win, "delete,request", NULL); - if (ui->win_about) - evas_object_smart_callback_call(ui->win_about, "delete,request", NULL); - - ecore_main_loop_quit(); + if (!ui->win && !ui->cpu.win && !ui->mem.win && !ui->sensors.win) + return 1; + return 0; } void @@ -1672,9 +1649,6 @@ evisum_ui_del(Ui *ui) { _proc_pid_cpu_times_free(ui); - if (ui->cache) - evisum_ui_item_cache_free(ui->cache); - eina_lock_free(&_lock); free(ui); @@ -1774,7 +1748,32 @@ _win_del_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, { Ui *ui = data; - evisum_ui_shutdown(ui); + 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 @@ -1801,10 +1800,7 @@ ui_main_win_add(Ui *ui) evas_object_show(win); ui->win = win; - _process_list_update(ui); - ecore_timer_add(2.0, _bring_in, ui); - elm_object_focus_set(ui->entry_search, EINA_TRUE); if (evisum_ui_effects_enabled_get() || evisum_ui_backgrounds_enabled_get()) evisum_ui_background_random_add(ui->win, 1); @@ -1814,6 +1810,8 @@ ui_main_win_add(Ui *ui) 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 = @@ -1833,6 +1831,7 @@ ui_main_win_add(Ui *ui) _evisum_search_keypress_cb, ui); ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _elm_config_change_cb, ui); + _process_list_update(ui); } static void diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h index bb1189e..a1718d8 100644 --- a/src/bin/ui/ui.h +++ b/src/bin/ui/ui.h @@ -122,8 +122,8 @@ evisum_ui_init(void); void evisum_ui_del(Ui *ui); -void -evisum_ui_shutdown(Ui *ui); +Eina_Bool +evisum_ui_can_exit(Ui *ui); void evisum_ui_activate(Ui *ui, Evisum_Action action, int pid); diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c index 5c0de61..1d2e84b 100644 --- a/src/bin/ui/ui_cpu.c +++ b/src/bin/ui/ui_cpu.c @@ -343,6 +343,9 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void free(ad->cpu_order); free(ad); ui->cpu.win = NULL; + + if (evisum_ui_can_exit(ui)) + ecore_main_loop_quit(); } static void diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c index a39562f..c009de6 100644 --- a/src/bin/ui/ui_disk.c +++ b/src/bin/ui/ui_disk.c @@ -234,6 +234,9 @@ _win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, evas_object_del(obj); ui->disk.win = NULL; + + if (evisum_ui_can_exit(ui)) + ecore_main_loop_quit(); } void diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c index aa73d1c..8b44caa 100644 --- a/src/bin/ui/ui_memory.c +++ b/src/bin/ui/ui_memory.c @@ -117,6 +117,9 @@ _win_del_cb(void *data, Evas_Object *obj, evas_object_del(obj); ui->mem.win = NULL; + + if (evisum_ui_can_exit(ui)) + ecore_main_loop_quit(); } void diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c index 5ce4de7..3a205e0 100644 --- a/src/bin/ui/ui_sensors.c +++ b/src/bin/ui/ui_sensors.c @@ -241,6 +241,9 @@ _win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, evas_object_del(obj); ui->sensors.win = NULL; + + if (evisum_ui_can_exit(ui)) + ecore_main_loop_quit(); } void --
