6 files changed, 19 insertions, 14 deletions

diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 30340571190e..3b15c08ec1fa 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -140,8 +140,8 @@ do_resize:
         max_choice = MIN(list_height, item_count());
 
         /* center dialog box on screen */
-        x = (COLS - width) / 2;
-        y = (LINES - height) / 2;
+        x = (getmaxx(stdscr) - width) / 2;
+        y = (getmaxy(stdscr) - height) / 2;
 
         draw_shadow(stdscr, y, x, height, width);
 
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 7b01add415a8..447a582198c9 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -62,8 +62,8 @@ do_resize:
                 return -ERRDISPLAYTOOSMALL;
 
         /* center dialog box on screen */
-        x = (COLS - width) / 2;
-        y = (LINES - height) / 2;
+        x = (getmaxx(stdscr) - width) / 2;
+        y = (getmaxy(stdscr) - height) / 2;
 
         draw_shadow(stdscr, y, x, height, width);
 
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 00d28410adc9..92b89a6cb35a 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -203,8 +203,8 @@ do_resize:
         max_choice = MIN(menu_height, item_count());
 
         /* center dialog box on screen */
-        x = (COLS - width) / 2;
-        y = (LINES - height) / 2;
+        x = (getmaxx(stdscr) - width) / 2;
+        y = (getmaxy(stdscr) - height) / 2;
 
         draw_shadow(stdscr, y, x, height, width);
 
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 907cdcb397c1..1773319b95e7 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -98,8 +98,8 @@ do_resize:
                         width = 0;
 
         /* center dialog box on screen */
-        x = (COLS - width) / 2;
-        y = (LINES - height) / 2;
+        x = (getmaxx(stdscr) - width) / 2;
+        y = (getmaxy(stdscr) - height) / 2;
 
         draw_shadow(stdscr, y, x, height, width);
 
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index 0fa567eb68c6..58a8289dd650 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -254,7 +254,12 @@ void attr_clear(WINDOW * win, int height, int width, chtype attr)
 
 void dialog_clear(void)
 {
-        attr_clear(stdscr, LINES, COLS, dlg.screen.atr);
+        int lines, columns;
+
+        lines = getmaxy(stdscr);
+        columns = getmaxx(stdscr);
+
+        attr_clear(stdscr, lines, columns, dlg.screen.atr);
         /* Display background title if it exists ... - SLH */
         if (dlg.backtitle != NULL) {
                 int i, len = 0, skip = 0;
@@ -269,10 +274,10 @@ void dialog_clear(void)
                 }
 
                 wmove(stdscr, 1, 1);
-                if (len > COLS - 2) {
+                if (len > columns - 2) {
                         const char *ellipsis = "[...] ";
                         waddstr(stdscr, ellipsis);
-                        skip = len - (COLS - 2 - strlen(ellipsis));
+                        skip = len - (columns - 2 - strlen(ellipsis));
                 }
 
                 for (pos = dlg.subtitles; pos != NULL; pos = pos->next) {
@@ -298,7 +303,7 @@ void dialog_clear(void)
                                 skip--;
                 }
 
-                for (i = len + 1; i < COLS - 1; i++)
+                for (i = len + 1; i < columns - 1; i++)
                         waddch(stdscr, ACS_HLINE);
         }
         wnoutrefresh(stdscr);
diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
index abb0c392e01b..676fb2f824a3 100644
--- a/scripts/kconfig/lxdialog/yesno.c
+++ b/scripts/kconfig/lxdialog/yesno.c
@@ -51,8 +51,8 @@ do_resize:
                 return -ERRDISPLAYTOOSMALL;
 
         /* center dialog box on screen */
-        x = (COLS - width) / 2;
-        y = (LINES - height) / 2;
+        x = (getmaxx(stdscr) - width) / 2;
+        y = (getmaxy(stdscr) - height) / 2;
 
         draw_shadow(stdscr, y, x, height, width);