wilderjds
/
cava
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed from rainbow to gradient, works suprisingly well, but terminal

Browse Source 
color definitaions are changed
master
karlstav 9 years ago
parent 3a8d7774bb
commit 59d2aaf3cd
5 changed files with 51 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      README.md
  2. 22
      cava.c
  3. 15
      example_files/config
  4. 51
      output/terminal_ncurses.c
  5. 4
      output/terminal_ncurses.h

6
README.md
Unescape View File

@ -5,12 +5,12 @@ C.A.V.A. (M.P.)
by [Karl Stavestrand](mailto:karl@stavestrand.no)
Now with multicolored rainbow:
Now with multicolored gradient:
```
rainbow = 1
gradient = 1
```
![spectrum](https://raw.githubusercontent.com/karlstav/cava/gh-pages/cava_rainbow.gif "spectrum")
![spectrum](https://raw.githubusercontent.com/karlstav/cava/gh-pages/cava_gradient.gif "spectrum")
thanks to [anko](https://github.com/anko) for the gif, here is the [recipe]( http://unix.stackexchange.com/questions/113695/gif-screencastng-the-unix-way).

22
cava.c
Unescape View File

@ -71,7 +71,8 @@ int rc;
char *inputMethod, *outputMethod, *modeString, *color, *bcolor, *style, *raw_target, *data_format;
// *bar_delim, *frame_delim ;
char *rainbow_colors[7];
char *gradient_color_1;
char *gradient_color_2;
double monstercat, integral, gravity, ignore, smh, sens;
int fixedbars, framerate, bw, bs, autosens, overshoot;
unsigned int lowcf, highcf;
@ -98,7 +99,7 @@ char bar_delim = ';';
char frame_delim = '\n';
int ascii_range = 1000;
int bit_format = 16;
int rainbow = 0;
int gradient = 0;
// whether we should reload the config or not
int should_reload = 0;
@ -211,15 +212,10 @@ FILE *fp;
color = (char *)iniparser_getstring(ini, "color:foreground", "default");
bcolor = (char *)iniparser_getstring(ini, "color:background", "default");
rainbow = iniparser_getint(ini, "color:rainbow", 0);
if (rainbow) {
rainbow_colors[0] = (char *)iniparser_getstring(ini, "color:rainbow_color_1", "#3366ff");
rainbow_colors[1] = (char *)iniparser_getstring(ini, "color:rainbow_color_2", "#6666ff");
rainbow_colors[2] = (char *)iniparser_getstring(ini, "color:rainbow_color_3", "#9966ff");
rainbow_colors[3] = (char *)iniparser_getstring(ini, "color:rainbow_color_4", "#cc33ff");
rainbow_colors[4] = (char *)iniparser_getstring(ini, "color:rainbow_color_5", "#ff00ff");
rainbow_colors[5] = (char *)iniparser_getstring(ini, "color:rainbow_color_6", "#cc0099");
rainbow_colors[6] = (char *)iniparser_getstring(ini, "color:rainbow_color_7", "#990099");
gradient = iniparser_getint(ini, "color:gradient", 0);
if (gradient) {
gradient_color_1 = (char *)iniparser_getstring(ini, "color:gradient_color_1", "#111111");
gradient_color_2 = (char *)iniparser_getstring(ini, "color:gradient_color_2", "#dddddd");
}
fixedbars = iniparser_getint(ini, "general:bars", 0);
@ -807,7 +803,7 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
#ifdef NCURSES
//output: start ncurses mode
if (om == 1 || om == 2) {
init_terminal_ncurses(color, bcolor, col, bgcol, rainbow, rainbow_colors);
init_terminal_ncurses(color, bcolor, col, bgcol, gradient, gradient_color_1, gradient_color_2);
get_terminal_dim_ncurses(&w, &h);
}
#endif
@ -1132,7 +1128,7 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
switch (om) {
case 1:
#ifdef NCURSES
rc = draw_terminal_ncurses(inAtty, h, w, bars, bw, bs, rest, f, flastd, rainbow);
rc = draw_terminal_ncurses(inAtty, h, w, bars, bw, bs, rest, f, flastd, gradient);
break;
#endif
case 2:

15
example_files/config
Unescape View File

@ -97,17 +97,12 @@
; background = black
; foreground = cyan
# Rainbow mode, sort of like a gradient but only with seven different colors.
# Only hex defined colors are supported, background must also be defined in hex
# gradient mode, only hex defined colors are supported, background must also be defined in hex
# or remain commented out. 1 = on, 0 = off
; rainbow = 0
; rainbow_color_1 = '#3366ff'
; rainbow_color_2 = '#6666ff'
; rainbow_color_3 = '#9966ff'
; rainbow_color_4 = '#cc33ff'
; rainbow_color_5 = '#ff00ff'
; rainbow_color_6 = '#cc0099'
; rainbow_color_7 = '#990099'
; gradient = 0
; gradient_color_1 = '#3366ff'
; gradient_color_2 = '#6666ff'
[smoothing]

51
output/terminal_ncurses.c
Unescape View File

@ -11,7 +11,7 @@ struct colors {
#define COLOR_REDEFINITION -2
#define MAX_COLOR_REDEFINITION 8
#define MAX_COLOR_REDEFINITION 16
static struct colors the_color_redefinitions[MAX_COLOR_REDEFINITION];
@ -58,8 +58,9 @@ char* const color_string, NCURSES_COLOR_T predef_color) {
return return_color_number;
}
void init_terminal_ncurses(char* const fg_color_string,
char* const bg_color_string, int predef_fg_color, int predef_bg_color, int rainbow, char* const rainbow_colors[7]) {
char* const bg_color_string, int predef_fg_color, int predef_bg_color, int gradient, char* const gradient_color_1, char* const gradient_color_2) {
initscr();
curs_set(0);
timeout(0);
@ -78,19 +79,31 @@ char* const bg_color_string, int predef_fg_color, int predef_bg_color, int rainb
NCURSES_COLOR_T color_pair_number = 1;
init_pair(color_pair_number, fg_color_number, bg_color_number);
if (rainbow) {
if (gradient) {
short unsigned int rgb[3][3];//r_1, g_1, b_1, r_2, g_2, b_2, r_next, g_next, b_next;
char next_color[8];// = "#303030";
init_pair(color_pair_number++, 1, bg_color_number);
change_color_definition(1, gradient_color_1, 1);
sscanf(gradient_color_1 + 1, "%02hx%02hx%02hx", &rgb[0][0], &rgb[0][1], &rgb[0][2]);
sscanf(gradient_color_2 + 1, "%02hx%02hx%02hx", &rgb[1][0], &rgb[1][1], &rgb[1][2]);
for (int n = 1; n < 15; n++) {
for(int i = 0; i < 3; i++)
rgb[2][i] = rgb[0][i] + (rgb[1][i] - rgb[0][i]) * n / 14;
init_pair(color_pair_number++, COLOR_RED, bg_color_number);
init_pair(color_pair_number++, COLOR_GREEN, bg_color_number);
init_pair(color_pair_number++, COLOR_YELLOW, bg_color_number);
init_pair(color_pair_number++, COLOR_BLUE, bg_color_number);
init_pair(color_pair_number++, COLOR_MAGENTA, bg_color_number);
init_pair(color_pair_number++, COLOR_CYAN, bg_color_number);
init_pair(color_pair_number, COLOR_WHITE, bg_color_number);
sprintf(next_color,"#%02x%02x%02x",rgb[2][0], rgb[2][1], rgb[2][2]);
init_pair(color_pair_number++, n + 1, bg_color_number);
change_color_definition(n + 1, next_color, n + 1);
}
for (int n = 0; n < 7; n++)
change_color_definition(n + 1, rainbow_colors[n], n + 1);
init_pair(color_pair_number++, 16, bg_color_number);
change_color_definition(16, gradient_color_2, 16);
}
@ -101,10 +114,10 @@ char* const bg_color_string, int predef_fg_color, int predef_bg_color, int rainb
}
void change_colors(int cur_height, int tot_height) {
tot_height /= 7;
tot_height /= 16;
if (tot_height < 1) tot_height = 1;
cur_height /= tot_height;
if (cur_height > 6) cur_height = 6;
if (cur_height > 15) cur_height = 15;
attron(COLOR_PAIR(cur_height + 1));
}
@ -117,7 +130,7 @@ void get_terminal_dim_ncurses(int* width, int* height) {
int draw_terminal_ncurses(int is_tty, int terminal_height, int terminal_width,
int bars_count, int bar_width, int bar_spacing, int rest, const int f[200],
int flastd[200], int rainbow) {
int flastd[200], int gradient) {
const wchar_t* bar_heights[] = {L"\u2581", L"\u2582", L"\u2583",
L"\u2584", L"\u2585", L"\u2586", L"\u2587", L"\u2588"};
@ -135,19 +148,19 @@ int flastd[200], int rainbow) {
if (f[bar] > flastd[bar]) { // higher then last frame
if (is_tty) {
for (int n = flastd[bar] / 8; n < f[bar] / 8; n++) {
if (rainbow) change_colors(n, height);
if (gradient) change_colors(n, height);
for (int width = 0; width < bar_width; width++)
mvprintw((height - n), CURRENT_COLUMN, "%d", 8);
}
} else {
for (int n = flastd[bar] / 8; n < f[bar] / 8; n++) {
if (rainbow) change_colors(n, height);
if (gradient) change_colors(n, height);
for (int width = 0; width < bar_width; width++)
mvaddwstr((height - n), CURRENT_COLUMN,
bar_heights[LAST]);
}
}
if (rainbow) change_colors(f[bar] / 8, height);
if (gradient) change_colors(f[bar] / 8, height);
if (f[bar] % 8) {
if (is_tty) {
for (int width = 0; width < bar_width; width++)
@ -164,7 +177,7 @@ int flastd[200], int rainbow) {
for (int width = 0; width < bar_width; width++)
mvaddstr((height - n), CURRENT_COLUMN, " ");
if (f[bar] % 8) {
if (rainbow) change_colors(f[bar] / 8, height);
if (gradient) change_colors(f[bar] / 8, height);
if (is_tty) {
for (int width = 0; width < bar_width; width++)
mvprintw((height - f[bar] / 8), CURRENT_COLUMN, "%d",

4
output/terminal_ncurses.h
Unescape View File

@ -1,7 +1,7 @@
void init_terminal_ncurses(char* const fg_color_string,
char* const bg_color_string, int predef_fg_color, int predef_bg_color, int rainbow, char* const rainbow_colors[7]);
char* const bg_color_string, int predef_fg_color, int predef_bg_color, int gradient, char* const gradient_color_1, char* const gradient_color_2);
void get_terminal_dim_ncurses(int* width, int* height);
int draw_terminal_ncurses(int is_tty, int terminal_height, int terminal_width,
int bars_count, int bar_width, int bar_spacing, int rest, const int f[200],
int flastd[200], int rainbow);
int flastd[200], int gradient);
void cleanup_terminal_ncurses(void);

Write Preview
Loading…
Cancel
Save