From da9be64f7dc2c463df2db18838e94d85a352f5c7 Mon Sep 17 00:00:00 2001 From: karlstav Date: Fri, 15 May 2015 11:37:26 +0200 Subject: [PATCH] improved fontfile for tty, 8 is now fullblock --- cava.c | 10 ++++++---- cava.psf | Bin 10258 -> 5558 bytes 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cava.c b/cava.c index feea0b0..d6b7704 100644 --- a/cava.c +++ b/cava.c @@ -454,6 +454,7 @@ Options:\n\ // output: get terminal's geometry initscr(); timeout(0); + noecho(); while (1) {//jumbing back to this loop means that you resized the screen for (i = 0; i < 200; i++) { @@ -536,11 +537,11 @@ Options:\n\ #ifndef DEBUG system("setterm -cursor off"); system("setterm -blank 0"); - start_color(); init_pair(1, col, bgcol); bkgd(COLOR_PAIR(1)); attron(COLOR_PAIR(1)); + attron(A_BOLD); #endif @@ -676,10 +677,11 @@ Options:\n\ for (i = rest; i < bands; i++) { if(f[i] > flastd[i]){//higher then last one - for (n = flastd[i] / 8; n < f[i] / 8; n++) for (q = 0; q < bw; q++) mvaddwstr((height - n), (i * bw) + q + i, bars[7]); + if (virt == 0) for (n = flastd[i] / 8; n < f[i] / 8; n++) for (q = 0; q < bw; q++) mvprintw((height - n), (i * bw) + q + i, "%d",8); + else for (n = flastd[i] / 8; n < f[i] / 8; n++) for (q = 0; q < bw; q++) mvaddwstr((height - n), (i * bw) + q + i, bars[7]); if (f[i] % 8 != 0) { - if (virt == 0) for (q = 0; q < bw; q++) mvprintw( (height - n), (i*bw) + q + i, "%d",(f[i] % 8) ); - else for (q = 0; q < bw; q++) mvaddwstr( (height - n), (i*bw) + q + i, bars[(f[i] % 8) - 1]); + if (virt == 0) for (q = 0; q < bw; q++) mvprintw( (height - n), (i * bw) + q + i, "%d",(f[i] % 8) ); + else for (q = 0; q < bw; q++) mvaddwstr( (height - n), (i * bw) + q + i, bars[(f[i] % 8) - 1]); } }else if(f[i] < flastd[i]){//lower then last one for (n = f[i] / 8; n < flastd[i]/8 + 1; n++) for (q = 0; q < bw; q++) mvaddstr( (height - n), (i*bw) + q + i, " "); diff --git a/cava.psf b/cava.psf index d79cb95bfc4644df9e21d7d4080cbbdc42177e76..40e13656574229763593dc2b939ce447d91ccf52 100644 GIT binary patch delta 199 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 aM1$lqNBcs_q9dU=|Ih!OGk}7B>i-Aqs7%rT