]> git.draconx.ca Git - rrace.git/commitdiff
Factor out build-conditional wresize calls.
authorNick Bowler <nbowler@draconx.ca>
Sat, 18 Jun 2022 01:56:33 +0000 (21:56 -0400)
committerNick Bowler <nbowler@draconx.ca>
Sat, 18 Jun 2022 01:56:33 +0000 (21:56 -0400)
Instead of using #if HAVE_CURSES_WRESIZE at each call site, we can
make a simple wrapper function that "works" in either case.

src/curses.c

index cdaf39630b200dcbe88aa2e9b635c0cb57c00c04..8405e234fbedcb2eadd5b6e8acae8f13ddfd2d30 100644 (file)
@@ -201,17 +201,25 @@ static void curs_redraw_goal(struct app_state *state, uint_fast32_t mask)
        }
 }
 
+/* Thin wrapper around wresize which returns ERR if support is unavailable. */
+static int do_wresize(WINDOW *window, int lines, int columns)
+{
+#if HAVE_CURSES_WRESIZE
+       return wresize(window, lines, columns);
+#endif
+       return ERR;
+}
+
 static WINDOW *realloc_area(WINDOW **orig, int h, int w, int y, int x)
 {
        WINDOW *win = *orig;
 
        if (win) {
-#if HAVE_CURSES_WRESIZE
-               if (wresize(win, h, w) != ERR) {
+               if (do_wresize(win, h, w) != ERR) {
                        mvwin(win, y, x);
                        return win;
                }
-#endif
+
                delwin(win);
        }
 
@@ -228,13 +236,9 @@ static void realloc_tiles(WINDOW **win, int h)
        if (fill && border) {
                int old_w, old_h;
 
-#if HAVE_CURSES_WRESIZE
-               if (wresize(fill, h-2, w-2) != ERR
-                   && wresize(border, h, w) != ERR)
-               {
+               if (do_wresize(fill, h-2, w-2) != ERR
+                   && do_wresize(border, h, w) != ERR)
                        return;
-               }
-#endif
 
                getmaxyx(border, old_h, old_w);
                if (old_h == h)