Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some issues with invalid column handling.

Browse Source
This commit is contained in:
Bruce Hill 2020-02-24 03:11:01 -08:00
parent 9d9ad35bde
commit 304cbddf73
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bb.c
View File

@ -213,6 +213,7 @@ void handle_next_key_binding(bb_t *bb)
if (mouse_x != -1 && mouse_y != -1) { if (mouse_x != -1 && mouse_y != -1) {
// Get bb column: // Get bb column:
for (int col = 0, x = 0; bb->columns[col]; col++, x++) { for (int col = 0, x = 0; bb->columns[col]; col++, x++) {
if (!columns[(int)bb->columns[col]].name) continue;
x += (int)strlen(columns[(int)bb->columns[col]].name); x += (int)strlen(columns[(int)bb->columns[col]].name);
if (x >= mouse_x) { if (x >= mouse_x) {
bbmousecol[0] = bb->columns[col]; bbmousecol[0] = bb->columns[col];
@ -732,6 +733,7 @@ void render(bb_t *bb)
int space = winsize.ws_col - 1, nstretchy = 0; int space = winsize.ws_col - 1, nstretchy = 0;
for (int c = 0; bb->columns[c]; c++) { for (int c = 0; bb->columns[c]; c++) {
column_t col = columns[(int)bb->columns[c]]; column_t col = columns[(int)bb->columns[c]];
if (!col.name) continue;
if (col.stretchy) { if (col.stretchy) {
++nstretchy; ++nstretchy;
} else { } else {
@ -769,21 +771,23 @@ void render(bb_t *bb)
move_cursor(tty_out, 0, 1); move_cursor(tty_out, 0, 1);
fputs("\033[0;44;30m\033[K", tty_out); fputs("\033[0;44;30m\033[K", tty_out);
int x = 0; int x = 0;
for (int col = 0; bb->columns[col]; col++) { for (int c = 0; bb->columns[c]; c++) {
const char *title = columns[(int)bb->columns[col]].name; column_t col = columns[(int)bb->columns[c]];
if (!col.name) continue;
const char *title = col.name;
if (!title) title = ""; if (!title) title = "";
move_cursor(tty_out, x, 1); move_cursor(tty_out, x, 1);
if (col > 0) { if (c > 0) {
fputs("┃\033[K", tty_out); fputs("┃\033[K", tty_out);
x += 1; x += 1;
} }
const char *indicator = " "; const char *indicator = " ";
if (bb->columns[col] == bb->sort[1]) if (bb->columns[c] == bb->sort[1])
indicator = bb->sort[0] == '-' ? RSORT_INDICATOR : SORT_INDICATOR; indicator = bb->sort[0] == '-' ? RSORT_INDICATOR : SORT_INDICATOR;
move_cursor(tty_out, x, 1); move_cursor(tty_out, x, 1);
fputs(indicator, tty_out); fputs(indicator, tty_out);
fputs(title, tty_out); fputs(title, tty_out);
x += colwidths[col]; x += colwidths[c];
} }
fputs(" \033[K\033[0m", tty_out); fputs(" \033[K\033[0m", tty_out);
} }
@ -821,7 +825,7 @@ void render(bb_t *bb)
int x = 0; int x = 0;
for (int c = 0; bb->columns[c]; c++) { for (int c = 0; bb->columns[c]; c++) {
column_t col = columns[(int)bb->columns[c]]; column_t col = columns[(int)bb->columns[c]];
if (col.name == NULL) continue; if (!col.name) continue;
move_cursor(tty_out, x, y); move_cursor(tty_out, x, y);
fputs(color, tty_out); fputs(color, tty_out);
if (c > 0) { if (c > 0) {