diff options
author | fjoe <fjoe@FreeBSD.org> | 2011-12-01 09:01:51 +0000 |
---|---|---|
committer | fjoe <fjoe@FreeBSD.org> | 2011-12-01 09:01:51 +0000 |
commit | 0df8b7ddd2736298596f9dfa37b3a093cd821376 (patch) | |
tree | 42cc15826e65f177e7b169d183348224e3624113 /usr.sbin | |
parent | 313c8641792060169fdcd62fee68db2c917149f5 (diff) | |
download | FreeBSD-src-0df8b7ddd2736298596f9dfa37b3a093cd821376.zip FreeBSD-src-0df8b7ddd2736298596f9dfa37b3a093cd821376.tar.gz |
Fix dialog autosizing: dlg_count_columns() does not handle NL characters.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/misc.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c index 0e52f69..3279e63 100644 --- a/usr.sbin/sade/misc.c +++ b/usr.sbin/sade/misc.c @@ -233,6 +233,23 @@ xdialog_count_rows(const char *p) return rows ? rows : 1; } +static int +xdialog_count_columns(const char *p) +{ + int len; + int max_len = 0; + const char *q; + + for (; (q = strchr(p, '\n')) != NULL; p = q + 1) { + len = q - p; + max_len = MAX(max_len, len); + } + + len = strlen(p); + max_len = MAX(max_len, len); + return max_len; +} + int xdialog_menu(const char *title, const char *cprompt, int height, int width, int menu_height, int item_no, dialogMenuItem *ditems) @@ -270,7 +287,7 @@ xdialog_menu(const char *title, const char *cprompt, int height, int width, tag_x = MAX(tag_x, l + k + 2); } } - width = MAX(dlg_count_columns(cprompt), title != NULL ? dlg_count_columns(title) : 0); + width = MAX(xdialog_count_columns(cprompt), title != NULL ? xdialog_count_columns(title) : 0); width = MAX(width, tag_x + 4) + 4; } width = MAX(width, 24); @@ -345,7 +362,7 @@ xdialog_radiolist(const char *title, const char *cprompt, int height, int width, check_x = MAX(check_x, l + k + 6); } } - width = MAX(dlg_count_columns(cprompt), title != NULL ? dlg_count_columns(title) : 0); + width = MAX(xdialog_count_columns(cprompt), title != NULL ? xdialog_count_columns(title) : 0); width = MAX(width, check_x + 4) + 4; } width = MAX(width, 24); @@ -397,8 +414,8 @@ xdialog_msgbox(const char *title, const char *cprompt, /* calculate width */ if (width < 0) { - width = title != NULL ? dlg_count_columns(title) : 0; - width = MAX(width, dlg_count_columns(cprompt)) + 4; + width = title != NULL ? xdialog_count_columns(title) : 0; + width = MAX(width, xdialog_count_columns(cprompt)) + 4; } if (pauseopt) width = MAX(width, 10); |