X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=737766aa3cc8818c94b760826d7ff2e37b8b2136;hb=a6e0eb4c5e06bb6107acf40eb9f6a89e691d585e;hp=f6c970b56d8d5a643520232ff62594a92e610148;hpb=c4dbd17a165312f189ec5211069dab4d039d5471;p=gacela.git

diff --git a/src/gacela.c b/src/gacela.c
index f6c970b..737766a 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -15,11 +15,17 @@
    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"
@@ -32,14 +38,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 +54,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 +80,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;
@@ -111,12 +117,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 +131,25 @@ init_gacela_client ()
 }
 
 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 ();
@@ -180,37 +200,77 @@ load_scheme_files (char *path)
 }
 
 void
-start_single (int argc, char *argv[])
+start_single (char *working_path)
 {
+  char *argv = "guile";
+
   scm_with_guile (&init_gacela, NULL);
-  load_scheme_files (dirname (argv[0]));
-  scm_shell (argc, argv);
+  load_scheme_files (working_path);
+  scm_shell (1, &argv);
 }
 
 void
-start_server (int argc, char *argv[])
+start_server (char *working_path, int port)
 {
+  char start_server[100];
+
   scm_with_guile (&init_gacela, NULL);
-  load_scheme_files (dirname (argv[0]));
-  scm_c_eval_string ("(start-server 1234)");
+  load_scheme_files (working_path);
+  sprintf (start_server, "(start-server %d)", port);
+  scm_c_eval_string (start_server);
   scm_c_eval_string ("(game-loop)");
 }
 
 void
-start_client (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);
+  char *arg;
+  int mode = 0;   // shell: 1, server: 2, client: 3
+  char *host;
+  int port = 0;
+  int i;
+
+  // Checking arguments
+  for (i = 1; i < argc; i++) {
+    if (strcmp (argv[i], "--shell-mode") == 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);
+      }
+    }
+  }
+
+  if (mode == 1)
+    start_single (dirname (argv[0]));
+  else if (mode == 2 && port != 0)
+    start_server (dirname (argv[0]), port);
+  else if (mode == 3 && port != 0)
+    start_client (host, port);
   /*
   if (fork () == 0)
     start_server ();
   else
-    start_client ();
+    start_client ("localhost", 1234);
   */
 }