X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=af78da97433302a1a775cd16ffdbb95fe72972a0;hb=85190d9f178de47361cb8bc77aaf3197632b1337;hp=3262aee68c5cd5a9e3f72bf6cb37e0cdab4b420c;hpb=70e0a8eeafcf4beee40306b3a3e6c0bc4fafd7bc;p=gacela.git
diff --git a/src/gacela.c b/src/gacela.c
index 3262aee..af78da9 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -15,6 +15,8 @@
along with this program. If not, see .
*/
+#include
+#include
#include
#include
#include
@@ -28,6 +30,11 @@
#include "gacela_GL.h"
#include "gacela_FTGL.h"
+// Global variables
+int ctrl_c = 0;
+int pid = 0;
+char *history_path = NULL;
+
static int
find_matching_paren (int k)
@@ -108,12 +115,20 @@ void
ctrl_c_handler (int signum)
{
printf ("ERROR: User interrupt\nABORT: (signal)\n");
+ ctrl_c = 1;
}
-
+
+void
+child_dies_handler (int signum)
+{
+ write_history (history_path);
+ exit (0);
+}
+
static void
init_gacela_client ()
{
- struct sigaction new_action;
+ struct sigaction ctrl_c_action, child_dies_action;
// init bouncing parens
rl_bind_key (')', match_paren);
@@ -121,31 +136,68 @@ init_gacela_client ()
rl_bind_key ('}', match_paren);
// SIGINT
- new_action.sa_handler = ctrl_c_handler;
- sigemptyset (&new_action.sa_mask);
- new_action.sa_flags = 0;
+ ctrl_c_action.sa_handler = ctrl_c_handler;
+ sigemptyset (&ctrl_c_action.sa_mask);
+ ctrl_c_action.sa_flags = 0;
+
+ sigaction (SIGINT, &ctrl_c_action, NULL);
+
+ // SIGALRM
+ if (pid != 0) {
+ child_dies_action.sa_handler = child_dies_handler;
+ sigemptyset (&child_dies_action.sa_mask);
+ child_dies_action.sa_flags = 0;
+
+ sigaction (SIGALRM, &child_dies_action, NULL);
+ }
+
+}
+
+int
+opened_parens (char *line, int k)
+{
+ int i;
+ int opened = 0;
+ char c = 0;
+
+ // Choose the corresponding opening bracket
+ if (k == ')') c = '(';
+ else if (k == ']') c = '[';
+ else if (k == '}') c = '{';
+
+ for (i = 0; i < strlen (line); i++) {
+ // Is the current character part of a character literal?
+ if (i + 2 >= strlen (line)
+ && line[i] == '#'
+ && line[i + 1] == '\\')
+ i = i + 2;
+ else if (line[i] == '"') {
+ // Skip over a string literal
+ for (i++; i < strlen (line); i++)
+ if (line[i] == '"'
+ && line[i - 1] != '\\')
+ break;
+ }
+ else if (line[i] == ';') {
+ // Comment until endline
+ break;
+ }
+ else if (line[i] == c)
+ opened++;
+ else if (line[i] == k)
+ opened--;
+ }
- sigaction (SIGINT, &new_action, NULL);
+ return opened;
}
void
-gacela_client (char *hostname, int port)
+gacela_client (SCM rec_channel, SCM send_channel)
{
- 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));
+ int n;
+ SCM buffer;
+ char *line = NULL, *line_for_sending = NULL;
+ int opened = 0;
// Command line
asprintf (&history_path, "%s/.gacela_history", getenv("HOME"));
@@ -154,12 +206,46 @@ gacela_client (char *hostname, int port)
read_history (history_path);
while (1) {
- line = readline ("gacela> ");
+ if (opened > 0)
+ line = readline ("... ");
+ else
+ line = readline ("gacela> ");
+
if (!line) break;
+
+ opened += opened_parens (line, ')');
+ ctrl_c = 0;
+
if (line && *line)
{
- printf ("%s\n", line);
add_history (line);
+ if (line_for_sending == NULL) {
+ line_for_sending = strdup (line);
+ }
+ else {
+ line_for_sending = realloc (line_for_sending, strlen (line_for_sending) + strlen (line) + 2);
+ line_for_sending = strcat (line_for_sending, "\n");
+ line_for_sending = strcat (line_for_sending, line);
+ }
+
+ if (opened <= 0) {
+ scm_write (scm_from_locale_string (line_for_sending), send_channel);
+ scm_force_output (send_channel);
+ free (line_for_sending);
+ line_for_sending = NULL;
+
+ 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);
}
@@ -169,15 +255,14 @@ gacela_client (char *hostname, int port)
}
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);
@@ -198,57 +283,106 @@ load_scheme_files (char *path)
}
void
-start_single (char *working_path)
+init_gacela (char *path)
{
- char *argv = "guile";
+ scm_with_guile (&init_scheme, NULL);
+ load_scheme_files (path);
+ scm_c_eval_string ("(init-video-mode)");
+}
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (working_path);
- scm_shell (1, &argv);
+void
+start_server (int port)
+{
+ char *start_server;
+
+ asprintf (&start_server, "(start-server #:port %d)", port);
+ scm_c_eval_string (start_server);
}
void
-start_server (char *working_path, int port)
+start_local_server (SCM pipes)
{
char start_server[100];
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (working_path);
- sprintf (start_server, "(start-server %d)", port);
- scm_c_eval_string (start_server);
- scm_c_eval_string ("(game-loop)");
+ scm_c_define ("pipes", pipes);
+ scm_c_eval_string ("(start-server #:pipes pipes)");
}
void
-start_client (char *hostname, int port)
+start_remote_client (char *hostname, int port)
{
- scm_init_guile ();
- gacela_client (hostname, 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[])
{
char *arg;
- int mode = 0; // shell: 1, server: 2, client: 3
- int port = 2;
+ int mode = 0; // dev: 1, server: 2, client: 3
+ char *host;
+ int port = 0;
int i;
+ SCM fd1, fd2;
- for (i = 1; i < argc; i++)
- if (strcmp (argv[i], "--shell-mode") == 0)
+ // Checking arguments
+ for (i = 1; i < argc; i++) {
+ if (strcmp (argv[i], "--dev") == 0)
mode = 1;
else if (strncmp (argv[i], "--server", 8) == 0) {
- arg = strdup (argv[i]);
- port = 1234;
-
- if (mode == 1)
- start_single (dirname (argv[0]));
- else
- printf ("Puerto: %d\n", port);
- /*
- if (fork () == 0)
- start_server ();
- else
- start_client ("localhost", 1234);
- */
+ 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)));
+ kill (getppid (), SIGALRM);
+ }
+ 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 {
+ init_gacela (dirname (argv[0]));
+ scm_shell (argc, argv);
+ SDL_Quit ();
+ }
}