Client: interface config reload also re-sets virtual screen offset to 0.

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 51d5606c8ae9316095f9ee6808cbe0188d1f6d8a..c25c4f9b509ab91dd3789e78384c4f2c1e042628 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,14 +1,18 @@
 /* main.c */
 
+#include <ncurses.h> /* keypad() */
 #include <signal.h> /* struct sigaction, sigaction() */
+#include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
 #include <string.h> /* memset() */
-#include "../common/rexit.h" /* set_cleanup_func(), exit_trouble() */
-#include "cleanup.h" /* cleanup() */
+#include <unistd.h> /* access() */
+#include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
+#include "../common/rexit.h" /* set_cleanup_func(), exit_trouble(),exit_err() */
+#include "cleanup.h" /* cleanup(), set_cleanup_flag() */
 #include "command_db.h" /* init_command_db() */
 #include "io.h" /* io_loop(), try_send() */
 #include "misc.h" /* load_interface_conf(), winch_called() */
-#include "windows.h" /* init_wmeta_and_ncurses(); */
+#include "windows.h" /* winch_called() */
 #include "world.h" /* struct World */
 
 
@@ -17,19 +21,34 @@ struct World world;
 
 
 
-int main()
+int main(int argc, char * argv[])
 {
     char * f_name = "main()";
 
-    /* Declare hard-coded paths here. */
-    world.path_server_in = "server/in";
+    /* Declare hard-coded paths and values here. */
+    world.path_server_in  = "server/in";
+    world.path_commands   = "confclient/commands";
+    world.path_interface  = "confclient/interface_conf";
+    world.winDB.legal_ids = "012ciklm";
+    world.delim           = "%\n";
+    set_err_try_fgets_delim(world.delim);
+
+    /* Parse command line arguments. */
+    obey_argv(argc, argv);
 
     /* So error exits also go through the client's cleanup() function. */
     set_cleanup_func(cleanup);
 
+    /* Check existence of config files. */
+    exit_err(access(world.path_commands, F_OK), "No commands config file.");
+    exit_err(access(world.path_interface, F_OK), "No interface config file.");
+
     /* Initialize the whole interface. */
-    init_wmeta_and_ncurses();
-    keypad(world.wmeta.screen, TRUE);
+    world.winDB.t_screen = initscr();
+    set_cleanup_flag(CLEANUP_NCURSES);
+    noecho();
+    curs_set(0);
+    keypad(world.winDB.t_screen, TRUE);
     init_command_db();      /* The command DB needs to be initialized before  */
     load_interface_conf();  /* the interface, whose keybindings depend on it. */