Cleanup

tui_main.c

@@ -2414,25 +2414,27 @@ int main(int argc, char** argv) {
       goto next_getch;
     }
     case KEY_RESIZE: {
-      int term_height = getmaxy(stdscr);
+      int term_h, term_w;
-      int term_width = getmaxx(stdscr);
+      getmaxyx(stdscr, term_h, term_w);
-      assert(term_height >= 0 && term_width >= 0);
+      assert(term_h >= 0 && term_w >= 0);
-      int content_y = 0;
+      int content_y = 0, content_x = 0;
-      int content_x = 0;
+      int content_h = term_h, content_w = term_w;
-      int content_h = term_height;
-      int content_w = term_width;
       int margins_2 = margin_thickness * 2;
-      if (margin_thickness > 0 && term_height > margins_2 &&
+      if (margin_thickness > 0 && term_h > margins_2 && term_w > margins_2) {
-          term_width > margins_2) {
         content_y += margin_thickness;
         content_x += margin_thickness;
         content_h -= margins_2;
         content_w -= margins_2;
       }
-      if (cont_window == NULL || getmaxy(cont_window) != content_h ||
+      bool remake_window = true;
-          getmaxx(cont_window) != content_w ||
+      if (cont_window) {
-          getbegy(cont_window) != content_y ||
+        int cwin_y, cwin_x, cwin_h, cwin_w;
-          getbegx(cont_window) != content_x) {
+        getbegyx(cont_window, cwin_y, cwin_x);
+        getmaxyx(cont_window, cwin_h, cwin_w);
+        remake_window = cwin_y != content_y || cwin_x != content_x ||
+                        cwin_h != content_h || cwin_w != content_w;
+      }
+      if (remake_window) {
         if (cont_window) {
           delwin(cont_window);
         }