evisum: Naming and JPEGS!

To be able to differentiate between two completely different
structs use different naming. Also remove the jpegs if am going
to be using edje.

data/images/meson.build

@@ -5,8 +5,7 @@ install_data('go-up.png', 'go-down.png',
              'sensor.png', 'mount.png', 'ladyhand.png',
              'find.png', 'bug.png', 'exit.png', 'cpu.png',
              'memory.png', 'storage.png', 'misc.png',
-             'sky_01.jpg', 'sky_02.jpg', 'sky_03.jpg',
-             'sky_04.jpg', 'effects.png', 'info.png',
+             'effects.png', 'info.png',
              'menu.png','lovethisdogharvey.png', 'application.png',
              'e.png', 'freebsd.png', 'linux.png', 'on.png', 'off.png',
              'proc.png', 'manual.png', 'actions.png', 'threads.png',

src/bin/evisum_config.h

@@ -1,7 +1,7 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
-#include "ui/ui.h"
+#include "ui/evisum_ui.h"
 
 #define CONFIG_VERSION 0x0010
 

src/bin/evisum_server.c

@@ -6,7 +6,7 @@
 #include <Ecore.h>
 #include <Ecore_Con.h>
 #include "evisum_server.h"
-#include "src/bin/ui/ui.h"
+#include "src/bin/ui/evisum_ui.h"
 
 #define LISTEN_SOCKET_NAME "evisum_server"
 #define WANTED "bonjour monde"
@@ -23,7 +23,7 @@ _evisum_server_server_client_connect_cb(void *data EINA_UNUSED, int type EINA_UN
 {
    Ecore_Con_Event_Client_Data *ev;
    Evisum_Action *action;
-   Ui *ui;
+   Evisum_Ui *ui;
    int *pid;
 
    ev = event;
@@ -54,7 +54,7 @@ evisum_server_shutdown(void)
 Eina_Bool
 evisum_server_init(void *data)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
    Evisum_Server *server = calloc(1, sizeof(Evisum_Server));
    if (!server) return 0;
 

src/bin/main.c

@@ -7,12 +7,12 @@
 #include "config.h"
 #include "evisum_config.h"
 #include "evisum_server.h"
-#include "ui/ui.h"
+#include "ui/evisum_ui.h"
 
 static Eina_Bool
 _shutdown_cb(void *data, int type, void *event EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    if (ui->cpu.win) evas_object_del(ui->cpu.win);
    if (ui->mem.win) evas_object_del(ui->mem.win);
@@ -24,7 +24,7 @@ _shutdown_cb(void *data, int type, void *event EINA_UNUSED)
 }
 
 static void
-_signals(Ui *ui)
+_signals(Evisum_Ui *ui)
 {
    ui->handler_sig = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _shutdown_cb, ui);
 }
@@ -32,7 +32,7 @@ _signals(Ui *ui)
 int
 elm_main(int argc, char **argv)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    int i, pid = -1;
    Evisum_Action action = EVISUM_ACTION_DEFAULT;
 

src/bin/ui/evisum_ui.c

@@ -5,7 +5,7 @@
 
 #include "system/filesystems.h"
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "ui/ui_cpu.h"
 #include "ui/ui_memory.h"
 #include "ui/ui_disk.h"
@@ -20,14 +20,14 @@ int EVISUM_EVENT_CONFIG_CHANGED;
 static Evas_Object *_slider_alpha = NULL;
 
 void
-evisum_ui_config_save(Ui *ui)
+evisum_ui_config_save(Evisum_Ui *ui)
 {
    Eina_Bool notify = 0;
 
    if (!_evisum_config) return;
 
    _evisum_config->effects = 0;
-   _evisum_config->backgrounds = evisum_ui_backgrounds_enabled_get();
+   _evisum_config->backgrounds = 0;
 
    if (ui->proc.win)
      {
@@ -111,14 +111,12 @@ evisum_ui_config_save(Ui *ui)
 }
 
 void
-evisum_ui_config_load(Ui *ui)
+evisum_ui_config_load(Evisum_Ui *ui)
 {
    _evisum_config = NULL;
 
    _evisum_config = config_load();
 
-   evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
-
    ui->proc.sort_type    = _evisum_config->proc.sort_type;
    ui->proc.sort_reverse = _evisum_config->proc.sort_reverse;
    ui->proc.poll_delay   = _evisum_config->proc.poll_delay;
@@ -168,7 +166,7 @@ evisum_ui_config_load(Ui *ui)
 }
 
 void
-evisum_ui_restart(Ui *ui)
+evisum_ui_restart(Evisum_Ui *ui)
 {
    if (ui->proc.win) ui->proc.restart = 1;
    if (ui->cpu.win) ui->cpu.restart = 1;
@@ -187,7 +185,7 @@ static void
 _about_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                   void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    evisum_about_window_show(ui);
 }
@@ -196,7 +194,7 @@ static void
 _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                  void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_mem_win_add(ui);
 }
@@ -205,7 +203,7 @@ static void
 _menu_network_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                   void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_network_win_add(ui);
 }
@@ -214,7 +212,7 @@ static void
 _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_disk_win_add(ui);
 }
@@ -223,7 +221,7 @@ static void
 _menu_sensors_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_sensors_win_add(ui);
 }
@@ -232,7 +230,7 @@ static void
 _menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                               void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_cpu_win_add(ui);
 }
@@ -241,7 +239,7 @@ static void
 _menu_process_view_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                               void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_process_list_win_add(ui);
 }
@@ -250,18 +248,15 @@ static void
 _menu_effects_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                          void *event_info EINA_UNUSED)
 {
-   Ui *ui;
-   Eina_Bool state;
+   Evisum_Ui *ui;
 
    ui = data;
 
-   state = !evisum_ui_backgrounds_enabled_get();
-
-   evisum_ui_backgrounds_enabled_set(state);
-
+#if 0
    evisum_ui_config_save(ui);
 
    evisum_ui_restart(ui);
+#endif
 }
 
 static Evas_Object *
@@ -290,7 +285,7 @@ static void
 _main_menu_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                              void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.poll_delay = elm_slider_value_get(obj) + 0.5;
 
@@ -306,7 +301,7 @@ static void
 _main_menu_slider_alpha_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                              void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.alpha = elm_slider_value_get(obj) + 0.5;
 
@@ -317,7 +312,7 @@ static void
 _main_menu_transparant_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                     void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    if (!ui->proc.alpha) return;
 
@@ -331,7 +326,7 @@ static void
 _main_menu_show_threads_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                    void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.show_kthreads = elm_check_state_get(obj);
    evisum_ui_config_save(ui);
@@ -341,7 +336,7 @@ static void
 _main_menu_show_scroller_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                     void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.show_scroller = elm_check_state_get(obj);
    evisum_ui_config_save(ui);
@@ -351,7 +346,7 @@ static void
 _main_menu_show_user_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                 void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.show_user = elm_check_state_get(obj);
    evisum_ui_config_save(ui);
@@ -388,7 +383,7 @@ _main_menu_focus_timer_cb(void *data)
 }
 
 Evas_Object *
-evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj)
+evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj)
 {
    Evas_Object *o, *obx, *bx, *tb, *hbx, *sep, *fr, *sli;
    Evas_Object *it_focus, *btn, *chk, *rec;
@@ -636,7 +631,7 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj)
 
 // Any OS specific feature checks.
 static void
-_ui_init_system_probe(Ui *ui)
+_ui_init_system_probe(Evisum_Ui *ui)
 {
 #if defined(__OpenBSD__)
    ui->proc.has_kthreads = 0;
@@ -649,7 +644,7 @@ _ui_init_system_probe(Ui *ui)
 }
 
 void
-evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
+evisum_ui_activate(Evisum_Ui *ui, Evisum_Action action, int pid)
 {
    Eina_Bool restart = 0;
 
@@ -725,7 +720,7 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
 }
 
 void
-evisum_ui_shutdown(Ui *ui)
+evisum_ui_shutdown(Evisum_Ui *ui)
 {
    evisum_icon_cache_shutdown();
    evisum_ui_config_save(ui);
@@ -733,10 +728,10 @@ evisum_ui_shutdown(Ui *ui)
    free(ui);
 }
 
-Ui *
+Evisum_Ui *
 evisum_ui_init(void)
 {
-   Ui *ui = calloc(1, sizeof(Ui));
+   Evisum_Ui *ui = calloc(1, sizeof(Evisum_Ui));
    if (!ui) return NULL;
 
    ui->proc.poll_delay = 3;
@@ -747,7 +742,6 @@ evisum_ui_init(void)
 
    EVISUM_EVENT_CONFIG_CHANGED = ecore_event_type_new();
 
-   evisum_ui_backgrounds_enabled_set(0);
    evisum_ui_config_load(ui);
 
    evisum_icon_cache_init();

src/bin/ui/evisum_ui.h

@@ -1,5 +1,5 @@
-#ifndef __UI_H__
-#define __UI_H__
+#ifndef __EVISUM_UI_H__
+#define __EVISUM_UI_H__
 
 #include <Elementary.h>
 #include "gettext.h"
@@ -16,7 +16,7 @@
 #define EVISUM_WIN_WIDTH  800
 #define EVISUM_WIN_HEIGHT 600
 
-typedef struct Ui
+typedef struct _Evisum_Ui
 {
    pid_t                program_pid;
    Ecore_Event_Handler *handler_sig;
@@ -91,30 +91,30 @@ typedef struct Ui
       int           x, y;
       Eina_Bool     restart;
    } network;
-} Ui;
+} Evisum_Ui;
 
-Ui *
+Evisum_Ui *
 evisum_ui_init(void);
 
 void
-evisum_ui_shutdown(Ui *ui);
+evisum_ui_shutdown(Evisum_Ui *ui);
 
 Evas_Object *
-evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj);
+evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj);
 
 void
-evisum_ui_activate(Ui *ui, Evisum_Action action, int pid);
+evisum_ui_activate(Evisum_Ui *ui, Evisum_Action action, int pid);
 
 const char *
-evisum_ui_icon_cache_find(Ui *ui, const char *cmd);
+evisum_ui_icon_cache_find(Evisum_Ui *ui, const char *cmd);
 
 void
-evisum_ui_config_load(Ui *ui);
+evisum_ui_config_load(Evisum_Ui *ui);
 
 void
-evisum_ui_config_save(Ui *ui);
+evisum_ui_config_save(Evisum_Ui *ui);
 
 void
-evisum_ui_restart(Ui *ui);
+evisum_ui_restart(Evisum_Ui *ui);
 
 #endif

src/bin/ui/meson.build

@@ -1,7 +1,7 @@
 src += files([
    'gettext.h',
-   'ui.h',
-   'ui.c',
+   'evisum_ui.h',
+   'evisum_ui.c',
    'ui_util.h',
    'ui_util.c',
    'ui_cache.c',

src/bin/ui/ui_cpu.c

@@ -8,8 +8,6 @@ typedef struct {
 } Core;
 
 typedef struct {
-   Ui             *ui;
-
    Ecore_Thread   *thread;
 
    Evas_Object    *win;
@@ -19,9 +17,7 @@ typedef struct {
    Evas_Object    *obj;
 
    Evas_Object    *colors;
-
    int             cpu_count;
-
    int            *cpu_order;
 
    Eina_Bool       show_cpufreq;
@@ -38,6 +34,8 @@ typedef struct {
 
    Eina_Bool       confused;
    Eina_List      *explainers;
+
+   Evisum_Ui      *ui;
 } Animate;
 
 typedef struct _Color_Point {
@@ -345,7 +343,7 @@ static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Animate *ad;
-   Ui *ui;
+   Evisum_Ui *ui;
 
    ad = data;
    ui = ad->ui;
@@ -358,7 +356,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
 {
    Explainer *exp;
    Animate *ad = data;
-   Ui *ui = ad->ui;
+   Evisum_Ui *ui = ad->ui;
 
    evisum_ui_config_save(ui);
    ecore_thread_cancel(ad->thread);
@@ -461,7 +459,7 @@ static void
 _btn_menu_clicked_cb(void *data, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    Animate *ad = data;
 
    ui = ad->ui;
@@ -475,7 +473,7 @@ _btn_menu_clicked_cb(void *data, Evas_Object *obj,
 }
 
 static Animate *
-_graph(Ui *ui, Evas_Object *parent)
+_graph(Evisum_Ui *ui, Evas_Object *parent)
 {
    Evas_Object *tbl, *tbl2, *box, *obj, *ic, *lb, *rec;
    Evas_Object *fr, *bx, *hbx, *colors, *check, *btn;
@@ -770,13 +768,13 @@ _graph(Ui *ui, Evas_Object *parent)
  static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->cpu.width, &ui->cpu.height);
 }
 
 void
-ui_cpu_win_add(Ui *ui)
+ui_cpu_win_add(Evisum_Ui *ui)
 {
    Animate *ad;
    Evas_Object *win, *box, *scr;
@@ -792,9 +790,6 @@ ui_cpu_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    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_backgrounds_enabled_get());
-
    evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
                                   _win_resize_cb, ui);
 

src/bin/ui/ui_cpu.h

@@ -1,10 +1,10 @@
 #ifndef __UI_CPU_H__
 #define __UI_CPU_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_cpu_win_add(Ui *ui);
+ui_cpu_win_add(Evisum_Ui *ui);
 
 #endif

src/bin/ui/ui_disk.c

@@ -17,14 +17,14 @@ typedef struct
    Eina_Bool        sort_reverse;
    Eina_Bool        skip_wait;
 
-   Ui              *ui;
-} Ui_Data;
+   Evisum_Ui       *ui;
+} Data;
 
 static void
 _item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
+   Data *pd;
    Evas_Object *o;
    Eina_List *contents = NULL;
 
@@ -102,7 +102,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
 {
    Evas_Object *lb, *r, *pb;
    Evas_Coord w, ow;
-   Ui_Data *pd;
+   Data *pd;
    File_System *inf = data;
 
    if (!inf) return NULL;
@@ -218,7 +218,7 @@ _glist_ensure_n_items(Evas_Object *glist, unsigned int items)
 static void
 _disks_poll(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    while (!ecore_thread_check(thread))
      {
@@ -242,7 +242,7 @@ _disks_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 {
    Elm_Object_Item *it;
    File_System *fs;
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *mounted;
 
    pd = data;
@@ -267,7 +267,7 @@ _disks_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 }
 
 static void
-_disks_poll_update(Ui_Data *pd)
+_disks_poll_update(Data *pd)
 {
    pd->skip_wait = 1;
 }
@@ -276,7 +276,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -291,8 +291,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -304,8 +304,8 @@ static void
 _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -437,7 +437,7 @@ static void
 _btn_device_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_device)
      pd->sort_reverse = !pd->sort_reverse;
@@ -451,7 +451,7 @@ static void
 _btn_mount_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_mount)
      pd->sort_reverse = !pd->sort_reverse;
@@ -465,7 +465,7 @@ static void
 _btn_fs_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                    void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_type)
      pd->sort_reverse = !pd->sort_reverse;
@@ -479,7 +479,7 @@ static void
 _btn_used_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_used)
      pd->sort_reverse = !pd->sort_reverse;
@@ -493,7 +493,7 @@ static void
 _btn_free_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_free)
      pd->sort_reverse = !pd->sort_reverse;
@@ -507,7 +507,7 @@ static void
 _btn_total_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_total)
      pd->sort_reverse = !pd->sort_reverse;
@@ -521,7 +521,7 @@ static void
 _btn_usage_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_cpu_usage)
      pd->sort_reverse = !pd->sort_reverse;
@@ -534,8 +534,8 @@ _btn_usage_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    _disks_poll_update(pd);
    evas_object_geometry_get(obj, NULL, NULL, &ui->disk.width, &ui->disk.height);
@@ -551,7 +551,7 @@ _btn_min_size(Evas_Object *parent)
 }
 
 void
-ui_disk_win_add(Ui *ui)
+ui_disk_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *tb, *scr;
    Evas_Object *glist, *rec, *btn;
@@ -567,10 +567,8 @@ ui_disk_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    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_backgrounds_enabled_get());
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    pd->ui = ui;
    pd->skip_wait = 1;
 

src/bin/ui/ui_disk.h

@@ -1,9 +1,9 @@
 #ifndef __UI_DISK_H__
 #define __UI_DISK_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 
 void
-ui_disk_win_add(Ui *ui);
+ui_disk_win_add(Evisum_Ui *ui);
 
 #endif

src/bin/ui/ui_memory.c

@@ -14,8 +14,8 @@ typedef struct  {
    Evas_Object  *swap;
    Evas_Object  *video[MEM_VIDEO_CARD_MAX];
 
-   Ui           *ui;
-} Ui_Data;
+   Evisum_Ui    *ui;
+} Data;
 
 static Evas_Object *
 _label_mem(Evas_Object *parent, const char *text)
@@ -64,7 +64,7 @@ _mem_usage_main_cb(void *data EINA_UNUSED, Ecore_Thread *thread)
 }
 
 static void
-_update_widgets(Ui_Data *pd, meminfo_t *memory)
+_update_widgets(Data *pd, meminfo_t *memory)
 {
    Evas_Object *pb;
    double ratio, value;
@@ -139,7 +139,7 @@ _update_widgets(Ui_Data *pd, meminfo_t *memory)
 static void
 _mem_usage_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *msgdata)
 {
-   Ui_Data *pd;
+   Data *pd;
    meminfo_t *memory;
 
    pd = data;
@@ -154,7 +154,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -169,8 +169,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -182,8 +182,8 @@ static void
 _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
             void *event_info EINA_UNUSED)
 {
-   Ui *ui;
-   Ui_Data *pd = data;
+   Evisum_Ui *ui;
+   Data *pd = data;
 
    ui = pd->ui;
 
@@ -198,14 +198,14 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->mem.width, &ui->mem.height);
 }
 
 void
-ui_mem_win_add(Ui *ui)
+ui_mem_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *lb, *bx, *tb, *pb;
    Evas_Object *fr;
@@ -218,7 +218,7 @@ ui_mem_win_add(Ui *ui)
         return;
      }
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    if (!pd) return;
    pd->ui = ui;
 
@@ -230,8 +230,6 @@ ui_mem_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    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_backgrounds_enabled_get());
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EXPAND, 0);

src/bin/ui/ui_memory.h

@@ -1,10 +1,10 @@
 #ifndef __UI_MEMORY_H__
 #define __UI_MEMORY_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_mem_win_add(Ui *ui);
+ui_mem_win_add(Evisum_Ui *ui);
 
 #endif

src/bin/ui/ui_network.c

@@ -7,8 +7,9 @@ typedef struct
    Evas_Object           *win;
    Evas_Object           *glist;
    Elm_Genlist_Item_Class itc, itc2;
-   Ui                    *ui;
-} Ui_Data;
+
+   Evisum_Ui             *ui;
+} Data;
 
 typedef struct
 {
@@ -29,7 +30,7 @@ typedef struct
 } Network_Interface;
 
 static void
-_interface_gone(net_iface_t **ifaces, int n, Eina_List *list, Ui_Data *pd)
+_interface_gone(net_iface_t **ifaces, int n, Eina_List *list, Data *pd)
 {
    Eina_List *l;
    Network_Interface *iface;
@@ -54,7 +55,7 @@ _interface_gone(net_iface_t **ifaces, int n, Eina_List *list, Ui_Data *pd)
 static void
 _network_update(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    Eina_List *interfaces = NULL;
    Network_Interface *iface;
 
@@ -215,7 +216,7 @@ _network_update_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata EINA
 {
    Eina_List *interfaces;
    Network_Interface *iface;
-   Ui_Data *pd;
+   Data *pd;
    Evas_Object *obj;
    Eina_List *l, *l2;
    char *s;
@@ -275,7 +276,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -290,8 +291,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -303,8 +304,8 @@ static void
 _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evisum_ui_config_save(ui);
    ecore_thread_cancel(pd->thread);
@@ -316,14 +317,14 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->network.width, &ui->network.height);
 }
 
 void
-ui_network_win_add(Ui *ui)
+ui_network_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *bx, *glist;;
    Elm_Genlist_Item_Class *itc;
@@ -334,7 +335,7 @@ ui_network_win_add(Ui *ui)
         return;
      }
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    if (!pd) return;
    pd->ui = ui;
 

src/bin/ui/ui_network.h

@@ -1,10 +1,10 @@
 #ifndef __UI_NETWORK_H__
 #define __UI_NETWORK_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_network_win_add(Ui *ui);
+ui_network_win_add(Evisum_Ui *ui);
 
 #endif

src/bin/ui/ui_process_list.c

@@ -1,7 +1,7 @@
 #include "config.h"
 #include "evisum_config.h"
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "ui/ui_process_list.h"
 #include "ui/ui_process_view.h"
 
@@ -33,8 +33,6 @@ typedef struct
    pid_t                  selected_pid;
    int                    poll_count;
 
-   Ui                    *ui;
-
    Ecore_Timer           *resize_timer;
    Evas_Object           *win;
    Evas_Object           *main_menu;
@@ -91,9 +89,12 @@ typedef struct
       int                  zombie;
       int                  dsleep;
    } summary;
-} Ui_Data;
+ 
+   Evisum_Ui              *ui;
+
+} Data;
 
-static Ui_Data *_pd = NULL;
+static Data *_pd = NULL;
 
 typedef struct
 {
@@ -153,7 +154,7 @@ _field_enabled(Proc_Field id)
 }
 
 static void
-_content_reset(Ui_Data *pd)
+_content_reset(Data *pd)
 {
    Evas_Object *rec;
    int j = 0;
@@ -186,13 +187,13 @@ _field_menu_check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
    Field *f = data;
    f->enabled = !f->enabled;
-   Ui *ui = _pd->ui;
+   Evisum_Ui *ui = _pd->ui;
    _content_reset(_pd);
    ui->proc.fields ^= (1 << f->id);
 }
 
 static Evas_Object *
-_field_menu_create(Ui_Data *pd, Evas_Object *parent)
+_field_menu_create(Data *pd, Evas_Object *parent)
 {
    Evas_Object *o, *fr, *bx, *ck;
 
@@ -236,7 +237,7 @@ _field_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
    Evas_Event_Mouse_Up *ev;
    Evas_Object *o;
    Evas_Coord ox, oy, ow, oh;
-   Ui_Data *pd;
+   Data *pd;
 
    ev = event_info;
    pd = data;
@@ -255,7 +256,7 @@ _field_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
 }
 
 static void
-_fields_init(Ui_Data *pd)
+_fields_init(Data *pd)
 {
    for (int i = PROC_FIELD_CMD; i < PROC_FIELD_MAX; i++)
      {
@@ -280,7 +281,7 @@ _item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
    Evas_Object *o;
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *contents = NULL;
 
    pd = data;
@@ -461,7 +462,7 @@ _run_time_set(char *buf, size_t n, int64_t secs)
 }
 
 static void
-_field_adjust(Ui_Data *pd, Proc_Field id, Evas_Object *obj, Evas_Coord w)
+_field_adjust(Data *pd, Proc_Field id, Evas_Object *obj, Evas_Coord w)
 {
    Evas_Object *rec = evas_object_data_get(obj, "rec");
    if (id != pd->field_max)
@@ -483,7 +484,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
    Evas_Object *rec, *lb, *o, *hbx, *pb;
    char buf[128];
    Evas_Coord w, ow;
-   Ui_Data *pd = _pd;
+   Data *pd = _pd;
 
    proc = (void *) data;
 
@@ -720,7 +721,7 @@ _glist_ensure_n_items(Evas_Object *glist, unsigned int items,
 static Eina_Bool
 _bring_in(void *data)
 {
-   Ui_Data *pd;
+   Data *pd;
    int h_page, v_page;
 
    pd = data;
@@ -734,7 +735,7 @@ _bring_in(void *data)
 }
 
 static void
-_summary_reset(Ui_Data *pd)
+_summary_reset(Data *pd)
 {
    pd->summary.total = pd->summary.running = pd->summary.sleeping = 0;
    pd->summary.stopped = pd->summary.idle  = pd->summary.zombie = 0;
@@ -742,7 +743,7 @@ _summary_reset(Ui_Data *pd)
 }
 
 static void
-_summary_update(Ui_Data *pd)
+_summary_update(Data *pd)
 {
    Eina_Strbuf *buf = eina_strbuf_new();
 
@@ -770,7 +771,7 @@ _summary_update(Ui_Data *pd)
 }
 
 static void
-_summary_total(Ui_Data *pd, Proc_Info *proc)
+_summary_total(Data *pd, Proc_Info *proc)
 {
    pd->summary.total++;
    if (!strcmp(proc->state, "running"))
@@ -790,9 +791,9 @@ _summary_total(Ui_Data *pd, Proc_Info *proc)
 }
 
 static Eina_List *
-_process_list_sort(Eina_List *list, Ui_Data *pd)
+_process_list_sort(Eina_List *list, Data *pd)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    Sorter s;
    ui = pd->ui;
 
@@ -832,11 +833,11 @@ _cpu_times_free_cb(void *data)
 }
 
 static Eina_List *
-_process_list_search_trim(Eina_List *list, Ui_Data *pd)
+_process_list_search_trim(Eina_List *list, Data *pd)
 {
    Eina_List *l, *l_next;
    Proc_Info *proc;
-   Ui *ui = pd->ui;
+   Evisum_Ui *ui = pd->ui;
 
    _summary_reset(pd);
 
@@ -879,10 +880,10 @@ _process_list_search_trim(Eina_List *list, Ui_Data *pd)
 }
 
 static Eina_List *
-_process_list_get(Ui_Data *pd)
+_process_list_get(Data *pd)
 {
    Eina_List *list;
-   Ui *ui;
+   Evisum_Ui *ui;
 
    ui = pd->ui;
 
@@ -900,9 +901,9 @@ _process_list_get(Ui_Data *pd)
 static void
 _process_list(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *list;
-   Ui *ui;
+   Evisum_Ui *ui;
    Proc_Info *proc;
    int i, delay = 1;
 
@@ -938,7 +939,7 @@ static void
 _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
                           void *msg EINA_UNUSED)
 {
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *list;
    Proc_Info *proc;
    Elm_Object_Item *it;
@@ -995,7 +996,7 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
 }
 
 static void
-_process_list_update(Ui_Data *pd)
+_process_list_update(Data *pd)
 {
    pd->skip_wait = 1;
 }
@@ -1015,9 +1016,9 @@ _btn_icon_state_update(Evas_Object *btn, Eina_Bool reverse,
 }
 
 static void
-_btn_clicked_state_save(Ui_Data *pd, Evas_Object *btn)
+_btn_clicked_state_save(Data *pd, Evas_Object *btn)
 {
-   Ui *ui = pd->ui;
+   Evisum_Ui *ui = pd->ui;
 
    if (pd->fields_menu)
      {
@@ -1037,8 +1038,8 @@ static void
 _btn_cmd_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_CMD)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1050,8 +1051,8 @@ static void
 _btn_uid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_UID)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1063,8 +1064,8 @@ static void
 _btn_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_PID)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1076,8 +1077,8 @@ static void
 _btn_threads_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                         void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;