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

use new human readable var names in noncurses source, and better code reuse

Browse Source
master
karlstav 6 years ago
parent 5d262c0eeb
commit 80679a86a7
2 changed files with 82 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 184
      output/terminal_noncurses.c
  2. 2
      output/terminal_noncurses.h

184
output/terminal_noncurses.c
Unescape View File

@ -110,14 +110,14 @@ int init_terminal_noncurses(int tty, int col, int bgcol, int width, int lines, i
bgcol += 40; bgcol += 40;
printf("\033[%dm", bgcol); printf("\033[%dm", bgcol);
for (n = (h); n >= 0; n--) { for (int n = (lines); n >= 0; n--) {
for (i = 0; i < w; i++) { for (int i = 0; i < width; i++) {
printf(" "); // setting backround color printf(" "); // setting backround color
} }
printf("\n"); printf("\n");
} }
printf("\033[%dA", h); // moving cursor back up printf("\033[%dA", lines); // moving cursor back up
} }
setecho(STDIN_FILENO, 0); setecho(STDIN_FILENO, 0);
@ -125,166 +125,144 @@ int init_terminal_noncurses(int tty, int col, int bgcol, int width, int lines, i
return 0; return 0;
} }
void get_terminal_dim_noncurses(int *w, int *h) { void get_terminal_dim_noncurses(int *width, int *lines) {
struct winsize dim; struct winsize dim;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &dim); ioctl(STDOUT_FILENO, TIOCGWINSZ, &dim);
*h = (int)dim.ws_row; *lines = (int)dim.ws_row;
*w = (int)dim.ws_col; *width = (int)dim.ws_col;
system("clear"); // clearing in case of resieze system("clear"); // clearing in case of resieze
} }
int draw_terminal_noncurses(int tty, int h, int w, int bars, int bar_width, int bs, int rest, int draw_terminal_noncurses(int tty, int lines, int width, int number_of_bars, int bar_width,
int f[200], int flastd[200]) { int bar_spacing, int rest, int bars[200], int previous_frame[200]) {
int current_char, last_char, n, o, same_line, new_line, cx;
int current_cell, prev_cell, same_line, new_line, cx;
struct winsize dim; struct winsize dim;
same_line = 0; same_line = 0;
new_line = 0; new_line = 0;
cx = 0; cx = 0;
if (!tty) {
if (tty) { // output: check if terminal has been resized
ioctl(STDOUT_FILENO, TIOCGWINSZ, &dim);
ttyline_buffer[0] = '\0'; if ((int)dim.ws_row != lines || (int)dim.ws_col != width) {
free(frame_buffer);
free(spacestring);
for (int i = 0; i < 8; i++)
free(barstring[i]);
return -1;
}
}
if (tty)
ttyframe_buffer[0] = '\0';
else if (!tty)
frame_buffer[0] = '\0';
for (n = h - 1; n >= 0; n--) { for (int current_line = lines - 1; current_line >= 0; current_line--) {
int same_bar = 0; int same_bar = 0;
int center_adjusted = 0; int center_adjusted = 0;
for (o = 0; o < bars; o++) { for (int i = 0; i < number_of_bars; i++) {
current_char = f[o] - n * 8; current_cell = bars[i] - current_line * 8;
last_char = flastd[o] - n * 8; prev_cell = previous_frame[i] - current_line * 8;
// same as last frame // same as last frame
if ((current_char < 1 && last_char < 1) || (current_char > 7 && last_char > 7) || if ((current_cell < 1 && prev_cell < 1) || (current_cell > 7 && prev_cell > 7) ||
(current_char == last_char)) { (current_cell == prev_cell)) {
same_bar++; same_bar++;
} else { } else {
if (tty) {
if (same_line > 0) { if (same_line > 0) {
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "\033[%dB", cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "\033[%dB",
same_line); // move down same_line); // move down
new_line += same_line; new_line += same_line;
same_line = 0; same_line = 0;
} }
if (same_bar > 0) { if (same_bar > 0) {
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "\033[%dC", cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "\033[%dC",
(bar_width + bs) * same_bar); // move forward (bar_width + bar_spacing) * same_bar); // move forward
same_bar = 0; same_bar = 0;
} }
if (!center_adjusted) { if (!center_adjusted) {
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "\033[%dC", rest); cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "\033[%dC", rest);
center_adjusted = 1; center_adjusted = 1;
} }
if (current_char < 1) if (current_cell < 1)
cx += cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "%s",
snprintf(ttyline_buffer + cx, ttybuf_length - cx, "%s", ttyspacestring); ttyspacestring);
else if (current_char > 7) else if (current_cell > 7)
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "%s", cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "%s",
ttybarstring[0]); ttybarstring[0]);
else else
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "%s", cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "%s",
ttybarstring[current_char]); ttybarstring[current_cell]);
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "\033[%dC", bs);
}
}
if (same_bar != bars) { cx +=
if (n != 0) { snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "\033[%dC", bar_spacing);
cx += snprintf(ttyline_buffer + cx, ttybuf_length - cx, "\n"); } else if (!tty) {
new_line++;
}
} else {
same_line++;
}
}
if (same_line != h) {
printf("%s\r\033[%dA", ttyline_buffer,
new_line); //\r\033[%dA", ttyline_buffer, h - same_line);
fflush(stdout);
}
} else if (!tty) {
// output: check if terminal has been resized
ioctl(STDOUT_FILENO, TIOCGWINSZ, &dim);
if ((int)dim.ws_row != h || (int)dim.ws_col != w) {
free(line_buffer);
free(wspacestring);
for (int i = 0; i < 8; i++)
free(barstring[i]);
return -1;
}
line_buffer[0] = '\0';
for (n = h - 1; n >= 0; n--) {
int same_bar = 0;
int center_adjusted = 0;
for (o = 0; o < bars; o++) {
current_char = f[o] - n * 8;
last_char = flastd[o] - n * 8;
// same as last frame
if ((current_char < 1 && last_char < 1) || (current_char > 7 && last_char > 7) ||
(current_char == last_char)) {
same_bar++;
} else {
if (same_line > 0) { if (same_line > 0) {
cx += swprintf(line_buffer + cx, buf_length - cx, L"\033[%dB", cx += swprintf(frame_buffer + cx, buf_length - cx, L"\033[%dB",
same_line); // move down same_line); // move down
new_line += same_line; new_line += same_line;
same_line = 0; same_line = 0;
} }
if (same_bar > 0) { if (same_bar > 0) {
cx += swprintf(line_buffer + cx, buf_length - cx, L"\033[%dC", cx += swprintf(frame_buffer + cx, buf_length - cx, L"\033[%dC",
(bar_width + bs) * same_bar); // move forward (bar_width + bar_spacing) * same_bar); // move forward
same_bar = 0; same_bar = 0;
} }
if (!center_adjusted && rest) { if (!center_adjusted && rest) {
cx += swprintf(line_buffer + cx, buf_length - cx, L"\033[%dC", rest); cx += swprintf(frame_buffer + cx, buf_length - cx, L"\033[%dC", rest);
center_adjusted = 1; center_adjusted = 1;
} }
if (current_char < 1) if (current_cell < 1)
cx += swprintf(line_buffer + cx, buf_length - cx, wspacestring); cx += swprintf(frame_buffer + cx, buf_length - cx, spacestring);
else if (current_char > 7) else if (current_cell > 7)
cx += swprintf(line_buffer + cx, buf_length - cx, barstring[0]); cx += swprintf(frame_buffer + cx, buf_length - cx, barstring[0]);
else else
cx += swprintf(line_buffer + cx, buf_length - cx, barstring[current_char]); cx += swprintf(frame_buffer + cx, buf_length - cx, barstring[current_cell]);
cx += swprintf(line_buffer + cx, buf_length - cx, L"\033[%dC", bs); cx += swprintf(frame_buffer + cx, buf_length - cx, L"\033[%dC", bar_spacing);
} }
} }
}
if (same_bar != bars) { if (same_bar != number_of_bars) {
if (n != 0) { if (current_line != 0) {
cx += swprintf(line_buffer + cx, buf_length - cx, L"\n"); if (tty)
new_line++; cx += snprintf(ttyframe_buffer + cx, ttybuf_length - cx, "\n");
} else if (!tty)
} else { cx += swprintf(frame_buffer + cx, buf_length - cx, L"\n");
same_line++;
new_line++;
} }
} else {
same_line++;
} }
if (same_line != h) { }
printf("%ls\r\033[%dA", line_buffer, if (same_line != lines) {
new_line); //\r\033[%dA", line_buffer, h - same_line); if (tty)
fflush(stdout); printf("%s\r\033[%dA", ttyframe_buffer, new_line);
} else if (!tty)
printf("%ls\r\033[%dA", frame_buffer, new_line);
fflush(stdout);
} }
return 0; return 0;
} }

2
output/terminal_noncurses.h
Unescape View File

@ -1,4 +1,4 @@
int init_terminal_noncurses(int col, int bgcol, int w, int h, int bar_width); int init_terminal_noncurses(int tty, int col, int bgcol, int w, int h, int bar_width);
void get_terminal_dim_noncurses(int *w, int *h); void get_terminal_dim_noncurses(int *w, int *h);
int draw_terminal_noncurses(int virt, int height, int width, int bars, int bar_width, int bs, int draw_terminal_noncurses(int virt, int height, int width, int bars, int bar_width, int bs,
int rest, int f[200], int flastd[200]); int rest, int f[200], int flastd[200]);

Write Preview
Loading…
Cancel
Save