Removed memory leak in client's reset_windows(). (Previously, not all Win

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 26ad72822063d95fe9ac3a10a258b11691e9450d..51d5606c8ae9316095f9ee6808cbe0188d1f6d8a 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,12 +1,14 @@
 /* main.c */
 
+#include <signal.h> /* struct sigaction, sigaction() */
 #include <stdlib.h> /* exit() */
-#include "../common/rexit.h" /* set_cleanup_func() */
+#include <string.h> /* memset() */
+#include "../common/rexit.h" /* set_cleanup_func(), exit_trouble() */
 #include "cleanup.h" /* cleanup() */
 #include "command_db.h" /* init_command_db() */
 #include "io.h" /* io_loop(), try_send() */
-#include "misc.h" /* load_interface_conf() */
-#include "windows.h" /* init_win_meta(); */
+#include "misc.h" /* load_interface_conf(), winch_called() */
+#include "windows.h" /* init_wmeta_and_ncurses(); */
 #include "world.h" /* struct World */
 
 
@@ -17,6 +19,8 @@ struct World world;
 
 int main()
 {
+    char * f_name = "main()";
+
     /* Declare hard-coded paths here. */
     world.path_server_in = "server/in";
 
@@ -24,10 +28,16 @@ int main()
     set_cleanup_func(cleanup);
 
     /* Initialize the whole interface. */
-    init_win_meta();
+    init_wmeta_and_ncurses();
     keypad(world.wmeta.screen, TRUE);
-    init_command_db();
-    load_interface_conf();
+    init_command_db();      /* The command DB needs to be initialized before  */
+    load_interface_conf();  /* the interface, whose keybindings depend on it. */
+
+    /* Set handler for terminal window resizing. */
+    struct sigaction act;
+    memset(&act, 0, sizeof(act));
+    act.sa_handler = &winch_called;
+    exit_trouble(sigaction(SIGWINCH, &act, NULL), f_name, "sigaction()");
 
     /* This is where most everything happens. */
     char * quit_msg = io_loop();