diff options
Diffstat (limited to 'ui/curses/ui.c')
| -rw-r--r-- | ui/curses/ui.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/ui/curses/ui.c b/ui/curses/ui.c index de4e190..9542287 100644 --- a/ui/curses/ui.c +++ b/ui/curses/ui.c @@ -5,7 +5,6 @@ #include "tui.c" #define LOG_LINE_COUNT 1024 -#define PANE_WIDTH 27 #define PROC_FIELD_WIDTH 21 #define PROC_PAGE_LINES 12 @@ -363,7 +362,7 @@ void tui_print_process_genome_header(int l) { } void tui_print_process_gene(int l, int gcol, uint64_t gidx, uint64_t mba, uint64_t pix, int pair) { - assert(gcol >= PANE_WIDTH + 2); + assert(gcol >= PANE_AND_MARGIN_WIDTH); assert(gcol < COLS); assert(mvec_proc_is_live(&g_cores[g_core], pix)); assert(pair == PAIR_SELECTED_MB1 || pair == PAIR_SELECTED_MB2); @@ -399,7 +398,7 @@ void tui_print_process_genes(int l, uint64_t pix) { const struct Core *core = &g_cores[g_core]; - int scol = PANE_WIDTH + 2; + int scol = PANE_AND_MARGIN_WIDTH; int gcol = scol - g_proc_gene_scroll; uint64_t mb0a = arch_proc_mb0_addr(core, pix); uint64_t mb0s = arch_proc_mb0_size(core, pix); @@ -752,8 +751,8 @@ void tui_print_log_line(unsigned lptr, int line) { tui_clear_log_line(line); if (strlen(g_logs[lptr])) { - tui_field(line, PANE_WIDTH + 2, g_log_levels[lptr] == LOG_INFO ? PAIR_INFO : PAIR_WARN, A_NORMAL, "%.38s", g_logs[lptr]); - tui_field(line, PANE_WIDTH + 40, PAIR_NORMAL, A_NORMAL, g_logs[lptr] + 38); + tui_field(line, PANE_AND_MARGIN_WIDTH, g_log_levels[lptr] == LOG_INFO ? PAIR_INFO : PAIR_WARN, A_NORMAL, "%.38s", g_logs[lptr]); + tui_field(line, PANE_AND_MARGIN_WIDTH + 38, PAIR_NORMAL, A_NORMAL, g_logs[lptr] + 38); } } @@ -796,15 +795,30 @@ void tui_print(void) { tui_line(false, l++, PAIR_HEADER, A_BOLD, "SALIS [%d:%d]", g_core, CORES); tui_str_field(l++, "name", NAME); tui_ulx_field(l++, "seed", SEED); + tui_str_field(l++, "anc", ANC); + tui_str_field(l++, "arch", ARCH); + tui_ulx_field(l++, "asav", AUTOSAVE_INTERVAL); #if defined(MUTA_FLIP) - tui_str_field(l++, "fbit", "yes"); + tui_str_field(l++, "mflp", "yes"); #else - tui_str_field(l++, "fbit", "no"); + tui_str_field(l++, "mflp", "no"); #endif - tui_ulx_field(l++, "asav", AUTOSAVE_INTERVAL); - tui_str_field(l++, "arch", ARCH); + tui_ulx_field(l++, "mrng", MUTA_RANGE); tui_ulx_field(l++, "size", MVEC_SIZE); +#if defined(MVEC_LOOP) + tui_str_field(l++, "loop", "true"); +#else + tui_str_field(l++, "loop", "false"); +#endif tui_ulx_field(l++, "syni", SYNC_INTERVAL); +#if defined(DATA_PUSH_INTERVAL) + tui_ulx_field(l++, "dpsi", DATA_PUSH_INTERVAL); +#endif +#if defined(COMPRESS) + tui_str_field(l++, "xsav", "enabled"); +#else + tui_str_field(l++, "xsav", "disabled"); +#endif tui_ulx_field(l++, "step", g_steps); tui_ulx_field(l++, "sync", g_syncs); tui_ulx_field(l++, "step", g_step_block); |
