diff options
author | Andrés <andmarti@gmail.com> | 2021-03-23 11:26:18 -0300 |
---|---|---|
committer | Andrés <andmarti@gmail.com> | 2021-03-23 11:26:18 -0300 |
commit | 7428fe51fca51e2782ed2f03131fe0128803a2d8 (patch) | |
tree | 27eb07eb479f2350733c525b00bed80d3291e57f /src | |
parent | e8e167c19a3540655af0a6ff9535298cc15703a4 (diff) |
moved cmd multiplier to the left of mode
Diffstat (limited to 'src')
-rw-r--r-- | src/help.c | 12 | ||||
-rw-r--r-- | src/tui.c | 35 |
2 files changed, 23 insertions, 24 deletions
@@ -227,7 +227,7 @@ void help() { curs_set(1); char hline [100]; hline[0]='\0'; - mvwprintw(input_win, 0, rescol, ":%s", hline); + mvwprintw(input_win, 0, 0, ":%s", hline); wclrtoeol(input_win); wrefresh(input_win); @@ -238,7 +238,7 @@ void help() { } else { sprintf(hline + strlen(hline), "%c", d); } - mvwprintw(input_win, 0, rescol, ":%s", hline); + mvwprintw(input_win, 0, 0, ":%s", hline); wclrtoeol(input_win); wrefresh(input_win); d = wgetch(input_win); @@ -246,7 +246,7 @@ void help() { if (d == OKEY_ENTER && ( ! strcmp(hline, "q") || ! strcmp(hline, "quit") || ! strcmp(hline, "q!") )) { quit_help_now = TRUE; } else if (d == OKEY_ESC) { - wmove(input_win, 0, rescol); + wmove(input_win, 0, 0); wclrtoeol(input_win); wrefresh(input_win); //d = wgetch(input_win); @@ -257,7 +257,7 @@ void help() { case '/': curs_set(1); word_looked[0]='\0'; - mvwprintw(input_win, 0, rescol, "/%s", word_looked); + mvwprintw(input_win, 0, 0, "/%s", word_looked); wrefresh(input_win); d = wgetch(input_win); while (d != OKEY_ENTER && d != OKEY_ESC) { @@ -267,7 +267,7 @@ void help() { //sprintf(word_looked, "%s%c", word_looked, d); sprintf(word_looked + strlen(word_looked), "%c", d); } - mvwprintw(input_win, 0, rescol, "/%s", word_looked); + mvwprintw(input_win, 0, 0, "/%s", word_looked); wclrtoeol(input_win); wrefresh(input_win); d = wgetch(input_win); @@ -276,7 +276,7 @@ void help() { if (d == OKEY_ENTER && strlen(word_looked)) { find_word(word_looked, 'f'); } - mvwprintw(input_win, 0, rescol, ""); + mvwprintw(input_win, 0, 0, ""); wclrtoeol(input_win); wrefresh(input_win); curs_set(0); @@ -213,7 +213,7 @@ int ui_getch(wint_t * wd) { int ui_getch_b(wint_t * wd) { wint_t digraph = 0; wtimeout(input_win, -1); - move(0, rescol + inputline_pos + 1); + move(0, inputline_pos + 1); wget_wch(input_win, wd); if (*wd == ctl('k')) { wget_wch(input_win, wd); @@ -386,7 +386,7 @@ void ui_update(int header) { #endif // Clean from top to bottom - wmove(main_win, 0, rescol); + wmove(main_win, 0, 0); wclrtobot(main_win); // comment this to prevent info message to be erased //wmove(input_win, 0, 0); @@ -521,7 +521,7 @@ void ui_print_mult_pend() { subst(field, '0', ' '); strcat(strm, field); - mvwprintw(input_win, 0, 0, "%s", strm); + mvwprintw(input_win, 0, COLS - rescol - 14, "%s", strm); // Return cursor to previous position wmove(input_win, row_orig, col_orig); @@ -552,16 +552,16 @@ void ui_show_header() { // Print input text switch (curmode) { case COMMAND_MODE: - mvwprintw(input_win, 0, rescol, ":%ls", inputline); - wmove(input_win, 0, inputline_pos + 1 + rescol); + mvwprintw(input_win, 0, 0, ":%ls", inputline); + wmove(input_win, 0, inputline_pos + 1); break; case INSERT_MODE: - mvwprintw(input_win, 0, 1 + rescol, "%ls", inputline); - wmove(input_win, 0, inputline_pos + 1 + rescol); + mvwprintw(input_win, 0, 1, "%ls", inputline); + wmove(input_win, 0, inputline_pos + 1); break; case EDIT_MODE: - mvwprintw(input_win, 0, rescol, " %ls", inputline); - wmove(input_win, 0, inputline_pos + 1 + rescol); + mvwprintw(input_win, 0, 0, " %ls", inputline); + wmove(input_win, 0, inputline_pos + 1); } wrefresh(input_win); return; @@ -625,8 +625,7 @@ void ui_print_mode() { ui_set_ucolor(input_win, &ucolors[INPUT], DEFAULT_COLOR); #endif // Show submode (INSERT) - mvwprintw(input_win, 0, 0 + rescol, "%c", insert_edit_submode); - //wmove(input_win, 0, 1); commented on 01/06 + mvwprintw(input_win, 0, 0, "%c", insert_edit_submode); } else if (curmode == EDIT_MODE) { strcat(strm, " -- EDIT --"); @@ -646,8 +645,8 @@ void ui_print_mode() { ui_set_ucolor(input_win, &ucolors[INPUT], DEFAULT_COLOR); #endif // muestro ':' - mvwprintw(input_win, 0, 0 + rescol, ":"); - wmove(input_win, 0, 1 + rescol); + mvwprintw(input_win, 0, 0, ":"); + wmove(input_win, 0, 1); } return; @@ -1130,8 +1129,8 @@ void ui_show_celldetails() { ui_set_ucolor(input_win, &ucolors[CELL_ID], DEFAULT_COLOR); #endif sprintf(head, "%s%d ", coltoa(curcol), currow); - mvwprintw(input_win, 0, 0 + rescol, "%s", head); - inputline_pos += strlen(head) + rescol; + mvwprintw(input_win, 0, 0, "%s", head); + inputline_pos += strlen(head); // show the current cell's format #ifdef USECOLORS @@ -1339,7 +1338,7 @@ wchar_t ui_query_opt(wchar_t * initial_msg, wchar_t * valid) { curs_set(1); wtimeout(input_win, -1); - move(0, rescol + wcslen(initial_msg) + 1); + move(0, wcslen(initial_msg) + 1); while ((res = wstr_in_wstr(valid, wdc)) == -1) { wget_wch(input_win, &wd); swprintf(wdc, FBUFLEN, L"%lc", wd); @@ -1388,7 +1387,7 @@ char * ui_query(char * initial_msg) { // ask for input wtimeout(input_win, -1); notimeout(input_win, TRUE); - wmove(input_win, 0, rescol); + wmove(input_win, 0, 0); wclrtoeol(input_win); wrefresh(input_win); int d = wgetch(input_win); @@ -1400,7 +1399,7 @@ char * ui_query(char * initial_msg) { sprintf(hline + strlen(hline), "%c", d); } - mvwprintw(input_win, 0, rescol, "%s", hline); + mvwprintw(input_win, 0, 0, "%s", hline); wclrtoeol(input_win); wrefresh(input_win); d = wgetch(input_win); |