X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=fdb76db5156994278fccde594556d73e2d94d0c5;hb=ee8cc28a7551d08466af97636c38e55516a22876;hp=66bd40a6229b32fddbd9771a611bb916d7e5cafc;hpb=495f95e1619224b8ca21a209ea5b50e15b3a6c47;p=gacela.git

diff --git a/src/gacela.c b/src/gacela.c
index 66bd40a..fdb76db 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -19,6 +19,8 @@
 #include <libgen.h>
 #include <readline/readline.h>
 #include <readline/history.h>
+#include <signal.h>
+#include <sys/socket.h>
 #include "gacela_SDL.h"
 #include "gacela_GL.h"
 #include "gacela_FTGL.h"
@@ -31,14 +33,14 @@ find_matching_paren (int k)
   register char c = 0;
   int end_parens_found = 0;
 
-  /* Choose the corresponding opening bracket.  */
+  // Choose the corresponding opening bracket
   if (k == ')') c = '(';
   else if (k == ']') c = '[';
   else if (k == '}') c = '{';
 
   for (i = rl_point-2; i >= 0; i--)
     {
-      /* Is the current character part of a character literal?  */
+      // Is the current character part of a character literal?
       if (i - 2 >= 0
  	  && rl_line_buffer[i - 1] == '\\'
  	  && rl_line_buffer[i - 2] == '#')
@@ -47,7 +49,7 @@ find_matching_paren (int k)
  	end_parens_found++;
       else if (rl_line_buffer[i] == '"')
  	{
- 	  /* Skip over a string literal.  */
+ 	  // Skip over a string literal
  	  for (i--; i >= 0; i--)
  	    if (rl_line_buffer[i] == '"'
  		&& ! (i - 1 >= 0
@@ -73,7 +75,7 @@ match_paren (int x, int k)
 
   rl_insert (x, k);
 
-  /* Did we just insert a quoted paren?  If so, then don't bounce.  */
+  // Did we just insert a quoted paren?  If so, then don't bounce
   if (rl_point - 1 >= 1
       && rl_line_buffer[rl_point - 2] == '\\')
     return 0;
@@ -99,34 +101,68 @@ match_paren (int x, int k)
   return 0;
 }
 
+void
+ctrl_c_handler (int signum)
+{
+  printf ("ERROR: User interrupt\nABORT: (signal)\n");
+}
+     
 static void
 init_gacela_client ()
 {
-  /* init bouncing parens */
+  struct sigaction new_action;
+
+  // init bouncing parens
   rl_bind_key (')', match_paren);
   rl_bind_key (']', match_paren);
   rl_bind_key ('}', match_paren);
 
-  /* SIGINT */
-  scm_c_eval_string ("(sigaction SIGINT (lambda (sig) (format #t \"ERROR: User interrupt~%ABORT: (signal)~%\")))");
+  // SIGINT
+  new_action.sa_handler = ctrl_c_handler;
+  sigemptyset (&new_action.sa_mask);
+  new_action.sa_flags = 0;
+
+  sigaction (SIGINT, &new_action, NULL);
 }
 
 void
-gacela_client (void)
+gacela_client (char *hostname, int port)
 {
+  int sockfd;
+  struct hostent *server;
+  struct sockaddr_in serv_addr;
+
   char *line;
+  char *history_path;
+
+  // Connect to the server
+  sockfd = socket (AF_INET, SOCK_STREAM, 0);
+  server = gethostbyname (hostname);
+  bzero ((char *) &serv_addr, sizeof (serv_addr));
+  serv_addr.sin_family = AF_INET;
+  bcopy ((char *)server->h_addr, (char *)&serv_addr.sin_addr.s_addr, server->h_length);
+  serv_addr.sin_port = htons (port);
+  connect (sockfd, (struct sockaddr *) &serv_addr, sizeof (serv_addr));
+
+  // Command line
+  asprintf (&history_path, "%s/.gacela_history", getenv("HOME"));
 
   init_gacela_client ();
+  read_history (history_path);
 
   while (1) {
-    line = readline ("gacela>");
-    printf ("%s\n", line);
+    line = readline ("gacela> ");
+    if (!line) break;
     if (line && *line)
-      add_history (line);
-    if (strcmp(line, "fuera") == 0)
-      break;
+      {
+	printf ("%s\n", line);
+	add_history (line);
+      }
     free (line);
   }
+
+  write_history (history_path);
+  free (history_path);
 }
 
 static void*
@@ -138,7 +174,7 @@ init_gacela (void *data, int argc, char **argv)
   scm_c_eval_string ("(activate-readline)");
   scm_c_eval_string ("(use-modules (ice-9 optargs))");
   scm_c_eval_string ("(use-modules (ice-9 receive))");
-  scm_c_eval_string ("(read-enable 'case-insensitive)");
+  //  scm_c_eval_string ("(read-enable 'case-insensitive)");
 
   // Bindings for C functions and structs
   SDL_register_functions (NULL);
@@ -158,14 +194,38 @@ load_scheme_files (char *path)
   scm_primitive_load_path (scm_from_locale_string ("gacela_loader.scm"));
 }
 
-int
-main (int argc, char *argv[])
+void
+start_single (int argc, char *argv[])
 {
-  /*
   scm_with_guile (&init_gacela, NULL);
   load_scheme_files (dirname (argv[0]));
   scm_shell (argc, argv);
-  */
+}
+
+void
+start_server (int argc, char *argv[])
+{
+  scm_with_guile (&init_gacela, NULL);
+  load_scheme_files (dirname (argv[0]));
+  scm_c_eval_string ("(start-server 1234)");
+  scm_c_eval_string ("(game-loop)");
+}
+
+void
+start_client (char *hostname, int port)
+{
   scm_init_guile ();
-  gacela_client ();
+  gacela_client (hostname, port);
+}
+
+int
+main (int argc, char *argv[])
+{
+  start_single (argc, argv);
+  /*
+  if (fork () == 0)
+    start_server ();
+  else
+    start_client ("localhost", 1234);
+  */
 }