Client: Save commands config file path in world struct.

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 6a71592b20fd9293a5ee158d7f9b297900b799b9..c7ac6f1a94a771f36577f899e68581bd0bd85124 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,12 +1,16 @@
 /* main.c */
 
+#include <ncurses.h> /* keypad() */
+#include <signal.h> /* struct sigaction, sigaction() */
+#include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
-#include "../common/rexit.h" /* set_cleanup_func() */
-#include "cleanup.h" /* cleanup() */
+#include <string.h> /* memset() */
+#include "../common/rexit.h" /* set_cleanup_func(), exit_trouble() */
+#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() */
-#include "windows.h" /* init_win_meta(); */
+#include "misc.h" /* load_interface_conf(), winch_called() */
+#include "windows.h" /* struct Win, winch_called() */
 #include "world.h" /* struct World */
 
 
@@ -15,20 +19,36 @@ 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";
+    world.path_server_in      = "server/in";
+    world.path_commands       = "confclient/commands";
+    world.path_interface_conf = "confclient/interface_conf";
+
+    /* Parse command line arguments. */
+    obey_argv(argc, argv);
 
     /* So error exits also go through the client's cleanup() function. */
     set_cleanup_func(cleanup);
 
     /* Initialize the whole interface. */
-    init_win_meta();
-    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. */
 
+    /* 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();