Clean up a bit.

Add resize_screen to frotz.h.  Remove its declarations from .c files.
Also remove an unused declaration.

#42: Handle terminal resizing

diff --git a/src/common/fastmem.c b/src/common/fastmem.c
index eaec73f8c5def6d185e1534e40d9529ea95312bb..8ad1ee84db2de0cd02e3ce04d7bc265980c95b48 100644 (file)
--- a/src/common/fastmem.c
+++ b/src/common/fastmem.c
@@ -51,7 +51,6 @@
 
 extern void seed_random (int);
 extern void restart_screen (void);
-extern void resize_screen (void);
 extern void refresh_text_style (void);
 extern void call (zword, int, zword *, int);
 extern void split_window (zword);

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 89626a1f6aef8ba1b39666a9f216abe3b9f54b72..de8ea449cec53ced8afe3991f5c71682fd9e1e9b 100644 (file)
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -789,6 +789,9 @@ int         os_string_width (const zchar *);
 void   os_init_setup (void);
 void   os_warn (const char *, ...);
 
+/* Front ends call this if the terminal size changes. */
+void    resize_screen(void);
+
 /* This is callable only from resize_screen. */
 bool    os_repaint_window (int win, int ypos_old, int ypos_new, int xpos,
                            int ysize, int xsize);

diff --git a/src/curses/ux_screen.c b/src/curses/ux_screen.c
index b8ce68a7656d25c19e348f01ae155e6973541954..070b68d281acd8f040fcebac8cf8d66d3865f73d 100644 (file)
--- a/src/curses/ux_screen.c
+++ b/src/curses/ux_screen.c
@@ -33,9 +33,7 @@
 
 #include "ux_frotz.h"
 
-extern void resize_screen(void);
 extern void restart_header(void);
-extern void restart_screen(void);
 
 static WINDOW *saved_screen = NULL;
 
@@ -188,7 +186,7 @@ bool os_repaint_window(int win, int ypos_old, int ypos_new, int xpos,
 {
     int lines, cols;
     if (!saved_screen)
-        return false;
+        return FALSE;
     getmaxyx(saved_screen, lines, cols);
     ypos_old--, ypos_new--, xpos--;
     if (xpos + xsize > cols)
@@ -207,7 +205,7 @@ bool os_repaint_window(int win, int ypos_old, int ypos_new, int xpos,
             move(y, x);
     }
     if (xsize <= 0 || ysize <= 0)
-        return false;
+        return FALSE;
     return copywin(saved_screen, stdscr, ypos_old, xpos, ypos_new, xpos,
                    ypos_new + ysize - 1, xpos + xsize - 1, FALSE) != ERR;
 }