X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fclient%2Fmain.c;h=68841ca640552960d11759408f5d4a9188576c67;hb=8ecbd583ff7282db315850c16a66782d78cae54f;hp=a0cb82c6b93f22e8db4313661b729c9d52bdf555;hpb=be8c57c7e1de5962913f849b862faae01bead264;p=plomrogue
diff --git a/src/client/main.c b/src/client/main.c
index a0cb82c..68841ca 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,12 +1,13 @@
/* main.c */
-#include /* keypad() */
-#include /* struct sigaction, sigaction() */
+#define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
+#define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
+#include /* keypad(), start_color() */
+#include /* SIGWINCH, sigaction, sigaction() */
#include /* NULL */
#include /* exit() */
#include /* memset() */
#include /* 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() */
@@ -24,14 +25,10 @@ struct World world;
int main(int argc, char * argv[])
{
- char * f_name = "main()";
-
/* Declare hard-coded paths and values here. */
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";
@@ -47,24 +44,26 @@ int main(int argc, char * argv[])
/* Initialize the whole interface. */
world.winDB.t_screen = initscr();
+ start_color();
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;
memset(&act, 0, sizeof(act));
act.sa_handler = &winch_called;
- exit_trouble(sigaction(SIGWINCH, &act, NULL), f_name, "sigaction()");
+ exit_trouble(sigaction(SIGWINCH, &act, NULL), __func__, "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);
+ world.file_server_in = try_fopen(path_server_in, "a", __func__);
set_cleanup_flag(CLEANUP_SERVER_IN);
- world.file_server_out = try_fopen(path_server_out, "r", f_name);
+ world.file_server_out = try_fopen(path_server_out, "r", __func__);
set_cleanup_flag(CLEANUP_SERVER_OUT);
/* This is where most everything happens. */
@@ -72,6 +71,6 @@ int main(int argc, char * argv[])
/* Leave properly. */
cleanup();
- printf("%s\n", quit_msg);
+ exit_trouble(printf("%s\n", quit_msg) < 0, __func__, "printf");
exit(EXIT_SUCCESS);
}