diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-02-05 07:26:28 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-02-05 07:26:28 (GMT) |
| commit | 04d910b8267856b345db93a5395212c4f7cd9199 (patch) | |
| tree | 312dddf8b98f369ce51898e3c2c020bf4351ed14 /kconfig/nconf.gui.c | |
| parent | dfcb5fe3c14db5ec291aedb567f1da4ff19f8323 (diff) | |
| parent | 59b08f8d06700770cf1105269acb2ec2460e2a34 (diff) | |
Merge pull request #907 from bhundven/update_kconfig_4_15
Sync kconfig files with upstream 4.15
Diffstat (limited to 'kconfig/nconf.gui.c')
| -rw-r--r-- | kconfig/nconf.gui.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/kconfig/nconf.gui.c b/kconfig/nconf.gui.c index 8275f0e..a64b1c3 100644 --- a/kconfig/nconf.gui.c +++ b/kconfig/nconf.gui.c @@ -129,7 +129,7 @@ static void no_colors_theme(void) mkattrn(FUNCTION_TEXT, A_REVERSE); } -void set_colors() +void set_colors(void) { start_color(); use_default_colors(); @@ -192,7 +192,7 @@ const char *get_line(const char *text, int line_no) int lines = 0; if (!text) - return 0; + return NULL; for (i = 0; text[i] != '\0' && lines < line_no; i++) if (text[i] == '\n') @@ -364,12 +364,14 @@ int dialog_inputbox(WINDOW *main_window, WINDOW *prompt_win; WINDOW *form_win; PANEL *panel; - int i, x, y; + int i, x, y, lines, columns, win_lines, win_cols; int res = -1; int cursor_position = strlen(init); int cursor_form_win; char *result = *resultp; + getmaxyx(stdscr, lines, columns); + if (strlen(init)+1 > *result_len) { *result_len = strlen(init)+1; *resultp = result = realloc(result, *result_len); @@ -386,14 +388,19 @@ int dialog_inputbox(WINDOW *main_window, if (title) prompt_width = max(prompt_width, strlen(title)); + win_lines = min(prompt_lines+6, lines-2); + win_cols = min(prompt_width+7, columns-2); + prompt_lines = max(win_lines-6, 0); + prompt_width = max(win_cols-7, 0); + /* place dialog in middle of screen */ - y = (getmaxy(stdscr)-(prompt_lines+4))/2; - x = (getmaxx(stdscr)-(prompt_width+4))/2; + y = (lines-win_lines)/2; + x = (columns-win_cols)/2; strncpy(result, init, *result_len); /* create the windows */ - win = newwin(prompt_lines+6, prompt_width+7, y, x); + win = newwin(win_lines, win_cols, y, x); prompt_win = derwin(win, prompt_lines+1, prompt_width, 2, 2); form_win = derwin(win, 1, prompt_width, prompt_lines+3, 2); keypad(form_win, TRUE); |