X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=6891d4b9f1180e661f256703cd07fde8b68c1c18;hb=e82142f2231e5aacf47e3f0cf5e82679d4291af2;hp=cb464a519d85f869da83bc5f5ceea87574661a40;hpb=3957d4932d42a1c3c7292034f0bde8ca5abeb32a;p=gacela.git

diff --git a/src/gacela.c b/src/gacela.c
index cb464a5..6891d4b 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -15,15 +15,23 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <stdio.h>
+#include <string.h>
 #include <libguile.h>
 #include <libgen.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <signal.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
 #include "gacela_SDL.h"
 #include "gacela_GL.h"
 #include "gacela_FTGL.h"
 
+// Generic variables
+int ctrl_c = 0;
 
 static int
 find_matching_paren (int k)
@@ -32,14 +40,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] == '#')
@@ -48,7 +56,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
@@ -74,7 +82,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;
@@ -104,6 +112,7 @@ void
 ctrl_c_handler (int signum)
 {
   printf ("ERROR: User interrupt\nABORT: (signal)\n");
+  ctrl_c = 1;
 }
      
 static void
@@ -111,12 +120,12 @@ init_gacela_client ()
 {
   struct sigaction new_action;
 
-  /* init bouncing parens */
+  // init bouncing parens
   rl_bind_key (')', match_paren);
   rl_bind_key (']', match_paren);
   rl_bind_key ('}', match_paren);
 
-  /* SIGINT */
+  // SIGINT
   new_action.sa_handler = ctrl_c_handler;
   sigemptyset (&new_action.sa_mask);
   new_action.sa_flags = 0;
@@ -125,11 +134,14 @@ init_gacela_client ()
 }
 
 void
-gacela_client (void)
+gacela_client (SCM rec_channel, SCM send_channel)
 {
+  int n;
+  SCM buffer;
   char *line;
   char *history_path;
 
+  // Command line
   asprintf (&history_path, "%s/.gacela_history", getenv("HOME"));
 
   init_gacela_client ();
@@ -137,11 +149,25 @@ gacela_client (void)
 
   while (1) {
     line = readline ("gacela> ");
+    ctrl_c = 0;
     if (!line) break;
     if (line && *line)
       {
-	printf ("%s\n", line);
 	add_history (line);
+	scm_write (scm_from_locale_string (line), send_channel);
+	scm_force_output (send_channel);
+
+	while (scm_char_ready_p (rec_channel) == SCM_BOOL_F) {
+	  if (ctrl_c) break;
+	  sleep (0.5);
+	}
+	if (ctrl_c)
+	  ctrl_c = 0;
+	else {
+	  buffer = scm_read (rec_channel);
+	  if (strlen (scm_to_locale_string (buffer)) > 0)
+	    printf ("%s\n", scm_to_locale_string (buffer));
+	}
       }
     free (line);
   }
@@ -151,15 +177,14 @@ gacela_client (void)
 }
 
 static void*
-init_gacela (void *data, int argc, char **argv)
+init_scheme (void *data, int argc, char **argv)
 {
   // Guile configuration
-  scm_c_eval_string ("(set-repl-prompt! \"gacela>\")");
+  scm_c_eval_string ("(set-repl-prompt! \"gacela> \")");
   scm_c_eval_string ("(use-modules (ice-9 readline))");
   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)");
 
   // Bindings for C functions and structs
   SDL_register_functions (NULL);
@@ -179,18 +204,107 @@ load_scheme_files (char *path)
   scm_primitive_load_path (scm_from_locale_string ("gacela_loader.scm"));
 }
 
+void
+init_gacela (char *path)
+{
+  scm_with_guile (&init_scheme, NULL);
+  load_scheme_files (path);
+  scm_c_eval_string ("(init-video-mode)");
+}
+
+void
+start_server (int port)
+{
+  char *start_server;
+
+  asprintf (&start_server, "(start-server #:port %d)", port);
+  scm_c_eval_string (start_server);
+}
+
+void
+start_local_server (SCM pipes)
+{
+  char start_server[100];
+
+  scm_c_define ("pipes", pipes);
+  scm_c_eval_string ("(start-server #:pipes pipes)");
+}
+
+void
+start_remote_client (char *hostname, int port)
+{
+  SCM client_socket;
+  char *connect_to_server;
+
+  asprintf (&connect_to_server, "(let ((s (socket PF_INET SOCK_STREAM 0))) (connect s AF_INET (car (hostent:addr-list (gethost \"%s\"))) %d) s)", hostname, port);
+  client_socket = scm_c_eval_string (connect_to_server);
+  gacela_client (client_socket, client_socket);
+}
+
 int
 main (int argc, char *argv[])
 {
-  if (fork () == 0) {
-    scm_with_guile (&init_gacela, NULL);
-    load_scheme_files (dirname (argv[0]));
-    //scm_shell (argc, argv);
-    scm_c_eval_string ("(start-server 1234)");
-    scm_c_eval_string ("(run-game)");
+  char *arg;
+  int mode = 0;   // dev: 1, server: 2, client: 3
+  char *host;
+  int port = 0;
+  int i;
+  SCM fd1, fd2;
+  int pid;
+
+  // Checking arguments
+  for (i = 1; i < argc; i++) {
+    if (strcmp (argv[i], "--dev") == 0)
+      mode = 1;
+    else if (strncmp (argv[i], "--server", 8) == 0) {
+      mode = 2;
+      arg = strtok (argv[i], "=");
+      arg = strtok (NULL, "=");
+      if (arg != NULL)
+	port = atoi (arg);
+    }
+    else if (strncmp (argv[i], "--client", 8) == 0) {
+      mode = 3;
+      arg = strtok (argv[i], "=");
+      arg = strtok (NULL, "=");
+      if (arg != NULL) {
+	host = strtok (arg, ":");
+	arg = strtok (NULL, ":");
+	if (arg != NULL)
+	  port = atoi (arg);
+      }
+    }
+  }
+
+  scm_init_guile ();
+
+  if (mode == 1) {
+    fd1 = scm_pipe ();
+    fd2 = scm_pipe ();
+    pid = fork ();
+
+    if (pid == 0) {
+      scm_close (SCM_CAR (fd1));
+      scm_close (SCM_CDR (fd2));
+      init_gacela (dirname (argv[0]));
+      start_local_server (scm_cons (SCM_CAR (fd2), SCM_CDR (fd1)));
+    }
+    else {
+      scm_close (SCM_CDR (fd1));
+      scm_close (SCM_CAR (fd2));
+      gacela_client (SCM_CAR (fd1), SCM_CDR (fd2));
+      kill (pid, SIGKILL);
+    }
+  }
+  else if (mode == 2 && port != 0) {
+    init_gacela (dirname (argv[0]));
+    start_server (port);
   }
+  else if (mode == 3 && port != 0)
+    start_remote_client (host, port);
   else {
-    scm_init_guile ();
-    gacela_client ();
+    init_gacela (dirname (argv[0]));
+    scm_shell (argc, argv);
+    SDL_Quit ();
   }
 }