X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=344df6911aa9d19536c5bfdae8c4876df73b0d13;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=c021ef8402df201ad881e8f7ad59d0b75ca02a7a;hpb=d12efb0addf420adc045cfb96647dff6241310ee;p=plomrogue

diff --git a/src/client/main.c b/src/client/main.c
index c021ef8..344df69 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,18 +1,19 @@
 /* main.c */
 
+#define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
+#define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
 #include <ncurses.h> /* keypad() */
-#include <signal.h> /* struct sigaction, sigaction() */
+#include <signal.h> /* SIGWINCH, sigaction, sigaction() */
 #include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
 #include <string.h> /* memset() */
 #include <unistd.h> /* access() */
-#include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
 #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 "interface_conf.h" /* load_interface_conf(), obey_argv() */
 #include "io.h" /* io_loop() */
-#include "misc.h" /* load_interface_conf(), winch_called() */
 #include "windows.h" /* winch_called() */
 #include "world.h" /* struct World */
 
@@ -30,8 +31,6 @@ int main(int argc, char * argv[])
     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);
     char * path_server_in  = "server/in";
     char * path_server_out = "server/out";
 
@@ -53,6 +52,7 @@ int main(int argc, char * argv[])
     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;
@@ -72,6 +72,6 @@ int main(int argc, char * argv[])
 
     /* Leave properly. */
     cleanup();
-    printf("%s\n", quit_msg);
+    exit_trouble(printf("%s\n", quit_msg) < 0, f_name, "printf()");
     exit(EXIT_SUCCESS);
 }