proclist: fields

This commit is contained in:
Alastair Poole 2021-02-24 11:32:21 +00:00
parent 8a00b911a1
commit 3db0623bfe
8 changed files with 563 additions and 318 deletions

View File

@ -1 +1 @@
0.5.11 0.5.12

View File

@ -1,6 +1,6 @@
##### Project ##### Project
project('evisum', 'c', project('evisum', 'c',
version : '0.5.11', version : '0.5.12',
meson_version : '>= 0.40.0') meson_version : '>= 0.40.0')
efl_version = '>= 1.22.0' efl_version = '>= 1.22.0'

View File

@ -54,6 +54,7 @@ _config_init()
cfg->proc.poll_delay = 3; cfg->proc.poll_delay = 3;
cfg->proc.show_kthreads = 1; cfg->proc.show_kthreads = 1;
cfg->proc.transparant = 0; cfg->proc.transparant = 0;
cfg->proc.fields = 0xffffffff;
cfg->proc.alpha = 100; cfg->proc.alpha = 100;
return cfg; return cfg;

View File

@ -3,7 +3,7 @@
#include "ui/ui.h" #include "ui/ui.h"
#define CONFIG_VERSION 0x000e #define CONFIG_VERSION 0x000f
typedef struct _Evisum_Config typedef struct _Evisum_Config
{ {
@ -25,6 +25,7 @@ typedef struct _Evisum_Config
unsigned char sort_type; unsigned char sort_type;
Eina_Bool sort_reverse; Eina_Bool sort_reverse;
unsigned char poll_delay; unsigned char poll_delay;
unsigned int fields;
Eina_Bool show_scroller; Eina_Bool show_scroller;
Eina_Bool transparant; Eina_Bool transparant;

View File

@ -55,6 +55,7 @@ evisum_ui_config_save(Ui *ui)
_evisum_config->proc.show_scroller = ui->proc.show_scroller; _evisum_config->proc.show_scroller = ui->proc.show_scroller;
_evisum_config->proc.transparant = ui->proc.transparant; _evisum_config->proc.transparant = ui->proc.transparant;
_evisum_config->proc.alpha = ui->proc.alpha; _evisum_config->proc.alpha = ui->proc.alpha;
_evisum_config->proc.fields = ui->proc.fields;
proc_info_kthreads_show_set(ui->proc.show_kthreads); proc_info_kthreads_show_set(ui->proc.show_kthreads);
} }
@ -117,6 +118,7 @@ evisum_ui_config_load(Ui *ui)
ui->proc.sort_reverse = _evisum_config->proc.sort_reverse; ui->proc.sort_reverse = _evisum_config->proc.sort_reverse;
ui->proc.poll_delay = _evisum_config->proc.poll_delay; ui->proc.poll_delay = _evisum_config->proc.poll_delay;
ui->proc.show_kthreads = _evisum_config->proc.show_kthreads; ui->proc.show_kthreads = _evisum_config->proc.show_kthreads;
ui->proc.fields = _evisum_config->proc.fields;
proc_info_kthreads_show_set(ui->proc.show_kthreads); proc_info_kthreads_show_set(ui->proc.show_kthreads);
ui->proc.show_user = _evisum_config->proc.show_user; ui->proc.show_user = _evisum_config->proc.show_user;
ui->proc.show_scroller = _evisum_config->proc.show_scroller; ui->proc.show_scroller = _evisum_config->proc.show_scroller;
@ -700,7 +702,7 @@ evisum_ui_init(void)
ui->proc.poll_delay = 3; ui->proc.poll_delay = 3;
ui->proc.sort_reverse = 0; ui->proc.sort_reverse = 0;
ui->proc.sort_type = SORT_BY_PID; ui->proc.sort_type = PROC_SORT_BY_PID;
ui->program_pid = getpid(); ui->program_pid = getpid();

View File

@ -33,6 +33,7 @@ typedef struct Ui
int poll_delay; int poll_delay;
int sort_type; int sort_type;
unsigned int fields;
Eina_Bool sort_reverse; Eina_Bool sort_reverse;
Eina_Bool show_self; Eina_Bool show_self;
Eina_Bool show_kthreads; Eina_Bool show_kthreads;

File diff suppressed because it is too large Load Diff

View File

@ -5,22 +5,38 @@
typedef enum typedef enum
{ {
SORT_BY_NONE, PROC_SORT_BY_NONE,
SORT_BY_PID, PROC_SORT_BY_CMD,
SORT_BY_UID, PROC_SORT_BY_UID,
SORT_BY_NICE, PROC_SORT_BY_PID,
SORT_BY_PRI, PROC_SORT_BY_THREADS,
SORT_BY_CPU, PROC_SORT_BY_CPU,
SORT_BY_THREADS, PROC_SORT_BY_PRI,
SORT_BY_SIZE, PROC_SORT_BY_NICE,
SORT_BY_RSS, PROC_SORT_BY_SIZE,
SORT_BY_CMD, PROC_SORT_BY_RSS,
SORT_BY_TIME, PROC_SORT_BY_STATE,
SORT_BY_STATE, PROC_SORT_BY_TIME,
SORT_BY_CPU_USAGE, PROC_SORT_BY_CPU_USAGE,
PROC_SORT_BY_MAX,
} Proc_Sort;
SORT_BY_MAX, typedef enum
} Sort_Type; {
PROC_FIELD_CMD = 1,
PROC_FIELD_UID = 2,
PROC_FIELD_PID = 3,
PROC_FIELD_THREADS = 4,
PROC_FIELD_CPU = 5,
PROC_FIELD_PRI = 6,
PROC_FIELD_NICE = 7,
PROC_FIELD_SIZE = 8,
PROC_FIELD_RSS = 9,
PROC_FIELD_STATE = 10,
PROC_FIELD_TIME = 11,
PROC_FIELD_CPU_USAGE = 12,
PROC_FIELD_MAX = 13,
} Proc_Field;
void void
ui_process_list_win_add(Ui *ui); ui_process_list_win_add(Ui *ui);