X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=344df6911aa9d19536c5bfdae8c4876df73b0d13;hb=aaa8274f5566c6f1a16bb3c8971f422ff06d0e37;hp=473228c70840eb2af513dc51713539f690326d07;hpb=e8e8f91cff96eebc1b440df18d9c3ef4ced1ca60;p=plomrogue

diff --git a/src/client/main.c b/src/client/main.c
index 473228c..344df69 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,14 +1,20 @@
 /* main.c */
 
-#include <signal.h> /* struct sigaction, sigaction() */
+#define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
+#define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
+#include <ncurses.h> /* keypad() */
+#include <signal.h> /* SIGWINCH, 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/readwrite.h" /* try_fopen() */
+#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 "interface_conf.h" /* load_interface_conf(), obey_argv() */
+#include "io.h" /* io_loop() */
+#include "windows.h" /* winch_called() */
 #include "world.h" /* struct World */
 
 
@@ -21,9 +27,12 @@ int main(int argc, char * argv[])
 {
     char * f_name = "main()";
 
-    /* Declare hard-coded paths here. */
-    world.path_server_in = "server/in";
-    world.path_interface_conf = "confclient/interface_conf";
+    /* Declare hard-coded paths and values here. */
+    world.path_commands    = "confclient/commands";
+    world.path_interface   = "confclient/interface_conf";
+    world.winDB.legal_ids  = "012ciklm";
+    char * path_server_in  = "server/in";
+    char * path_server_out = "server/out";
 
     /* Parse command line arguments. */
     obey_argv(argc, argv);
@@ -31,11 +40,19 @@ int main(int argc, char * 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. */
+    world.focus_each_turn = 1;
 
     /* Set handler for terminal window resizing. */
     struct sigaction act;
@@ -43,11 +60,18 @@ int main(int argc, char * argv[])
     act.sa_handler = &winch_called;
     exit_trouble(sigaction(SIGWINCH, &act, NULL), f_name, "sigaction()");
 
+    /* Open file streams for communicating with the server. */
+    exit_err(access(path_server_in, F_OK), "No server input file found.");
+    world.file_server_in = try_fopen(path_server_in, "a", f_name);
+    set_cleanup_flag(CLEANUP_SERVER_IN);
+    world.file_server_out = try_fopen(path_server_out, "r", f_name);
+    set_cleanup_flag(CLEANUP_SERVER_OUT);
+
     /* This is where most everything happens. */
     char * quit_msg = io_loop();
 
     /* Leave properly. */
     cleanup();
-    printf("%s\n", quit_msg);
+    exit_trouble(printf("%s\n", quit_msg) < 0, f_name, "printf()");
     exit(EXIT_SUCCESS);
 }