We can now display other UI elements (menus) "on top" of a textbox and then seemingly come back to it in the same state it was left.
Showing the changes to scripts (3 of 3 files). Show all
Unified · Split
| @@ -211,7 +211,7 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width); · 210 unmodified lines | ||
| 211 | 211 | int dialog_msgbox(const char *title, const char *prompt, int height, |
| 212 | 212 | int width, int pause); |
| 213 | 213 | int dialog_textbox(const char *title, const char *file, int height, int width, |
| 214 | − int *keys); | |
| 214 | + int *keys, int *_vscroll, int *_hscroll); | |
| 215 | 215 | int dialog_menu(const char *title, const char *prompt, |
| 216 | 216 | const void *selected, int *s_scroll); |
| 217 | 217 | int dialog_checklist(const char *title, const char *prompt, int height, |
| @@ -51,7 +51,7 @@ static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw, · 50 unmodified lines | ||
| 51 | 51 | * keys is a null-terminated array |
| 52 | 52 | */ |
| 53 | 53 | int dialog_textbox(const char *title, const char *tbuf, int initial_height, |
| 54 | − int initial_width, int *keys) | |
| 54 | + int initial_width, int *keys, int *_vscroll, int *_hscroll) | |
| 55 | 55 | { |
| 56 | 56 | int i, x, y, cur_x, cur_y, key = 0; |
| 57 | 57 | int height, width, boxh, boxw; |
| @@ -65,6 +65,15 @@ int dialog_textbox(const char *title, const char *tbuf, int initial_height, · 7 unmodified lines | ||
| 65 | 65 | buf = tbuf; |
| 66 | 66 | page = buf; /* page is pointer to start of page to be displayed */ |
| 67 | 67 | |
| 68 | + if (_vscroll && *_vscroll) { | |
| 69 | + begin_reached = 0; | |
| 70 | + | |
| 71 | + for (i = 0; i < *_vscroll; i++) | |
| 72 | + get_line(); | |
| 73 | + } | |
| 74 | + if (_hscroll) | |
| 75 | + hscroll = *_hscroll; | |
| 76 | + | |
| 68 | 77 | do_resize: |
| 69 | 78 | getmaxyx(stdscr, height, width); |
| 70 | 79 | if (height < 8 || width < 8) |
| @@ -275,6 +284,19 @@ do_resize: · 204 unmodified lines | ||
| 275 | 284 | } |
| 276 | 285 | delwin(box); |
| 277 | 286 | delwin(dialog); |
| 287 | + if (_vscroll) { | |
| 288 | + const char *s; | |
| 289 | + | |
| 290 | + s = buf; | |
| 291 | + *_vscroll = 0; | |
| 292 | + back_lines(page_length); | |
| 293 | + while (s < page && (s = strchr(s, '\n'))) { | |
| 294 | + (*_vscroll)++; | |
| 295 | + s++; | |
| 296 | + } | |
| 297 | + } | |
| 298 | + if (_hscroll) | |
| 299 | + *_hscroll = hscroll; | |
| 278 | 300 | return key; |
| 279 | 301 | } |
| 280 | 302 | |
| @@ -280,7 +280,7 @@ static void conf_string(struct menu *menu); · 279 unmodified lines | ||
| 280 | 280 | static void conf_load(void); |
| 281 | 281 | static void conf_save(void); |
| 282 | 282 | static int show_textbox_ext(const char *title, const char *text, int r, int c, |
| 283 | − int *keys); | |
| 283 | + int *keys, int *vscroll, int *hscroll); | |
| 284 | 284 | static void show_textbox(const char *title, const char *text, int r, int c); |
| 285 | 285 | static void show_helptext(const char *title, const char *text); |
| 286 | 286 | static void show_help(struct menu *menu); |
| @@ -621,15 +621,15 @@ static void conf(struct menu *menu) · 334 unmodified lines | ||
| 621 | 621 | } |
| 622 | 622 | |
| 623 | 623 | static int show_textbox_ext(const char *title, const char *text, int r, int c, |
| 624 | − int *keys) | |
| 624 | + int *keys, int *vscroll, int *hscroll) | |
| 625 | 625 | { |
| 626 | 626 | dialog_clear(); |
| 627 | − return dialog_textbox(title, text, r, c, keys); | |
| 627 | + return dialog_textbox(title, text, r, c, keys, vscroll, hscroll); | |
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | static void show_textbox(const char *title, const char *text, int r, int c) |
| 631 | 631 | { |
| 632 | − show_textbox_ext(title, text, r, c, (int []) {0}); | |
| 632 | + show_textbox_ext(title, text, r, c, (int []) {0}, NULL, NULL); | |
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | static void show_helptext(const char *title, const char *text) |