X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=9503f4146a1c66ea56725cd49615570ad0aea1b1;hb=a9ac7797c7eca236ee5b3114d9a6ab859c00b0b3;hp=d30ec0de4ad82cb598bb65eb7f68cb37134cfb20;hpb=9382649bb4f29fd789c7acaf7185b2a50ad1613c;p=gacela.git
diff --git a/src/gacela.c b/src/gacela.c
index d30ec0d..9503f41 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -15,14 +15,24 @@
along with this program. If not, see .
*/
+#include
+#include
#include
#include
#include
#include
+#include
+#include
+#include
+#include
+
#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)
{
@@ -30,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] == '#')
@@ -46,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
@@ -62,36 +72,6 @@ find_matching_paren (int k)
return -1;
}
-static void
-match_paren2 (int x, int k)
-{
- int tmp;
- fd_set readset;
- struct timeval timeout;
-
- rl_insert (x, k);
-
- /* 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;
-
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
- FD_ZERO (&readset);
- FD_SET (fileno(rl_instream), &readset);
-
- if (rl_point > 1) {
- tmp = rl_point;
- rl_point = find_matching_paren(k);
- if (rl_point > -1) {
- rl_redisplay();
- //scm_internal_select(1, &readset, NULL, NULL, &timeout);
- }
- //rl_point = tmp;
- }
-}
-
static int
match_paren (int x, int k)
{
@@ -102,12 +82,12 @@ 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;
- tmp = 1000 * 1000;
+ tmp = 500000;
timeout.tv_sec = tmp / 1000000;
timeout.tv_usec = tmp % 1000000;
FD_ZERO (&readset);
@@ -128,29 +108,73 @@ match_paren (int x, int k)
return 0;
}
+void
+ctrl_c_handler (int signum)
+{
+ printf ("ERROR: User interrupt\nABORT: (signal)\n");
+ ctrl_c = 1;
+}
+
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
+ 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 (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 ();
+ read_history (history_path);
while (1) {
- line = readline ("gacela>");
- printf ("%s\n", line);
+ line = readline ("gacela> ");
+ ctrl_c = 0;
+ if (!line) break;
if (line && *line)
- add_history (line);
+ {
+ add_history (line);
+ //scm_write (scm_from_locale_string ("("), send_channel);
+ scm_write (scm_from_locale_string (line), send_channel);
+ //scm_write (scm_from_locale_string (")"), send_channel);
+ scm_force_output (send_channel);
+
+ while (scm_char_ready_p (rec_channel) == SCM_BOOL_F) {
+ if (ctrl_c) break;
+ sleep (1);
+ }
+ if (ctrl_c)
+ ctrl_c = 0;
+ else {
+ buffer = scm_read (rec_channel);
+ printf ("%s\n", scm_to_locale_string (buffer));
+ }
+ }
free (line);
}
+
+ write_history (history_path);
+ free (history_path);
}
static void*
@@ -162,8 +186,6 @@ 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 ("(use-modules (ice-9 threads))");
- scm_c_eval_string ("(read-enable 'case-insensitive)");
// Bindings for C functions and structs
SDL_register_functions (NULL);
@@ -183,13 +205,136 @@ load_scheme_files (char *path)
scm_primitive_load_path (scm_from_locale_string ("gacela_loader.scm"));
}
+void
+start_single (char *working_path)
+{
+ char *argv = "guile";
+
+ scm_with_guile (&init_gacela, NULL);
+ load_scheme_files (working_path);
+ scm_shell (1, &argv);
+}
+
+void
+start_server (char *working_path, int port)
+{
+ 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);
+}
+
+void
+start_local_server (char *working_path, SCM pipes)
+{
+ char start_server[100];
+
+ scm_with_guile (&init_gacela, NULL);
+ load_scheme_files (working_path);
+ scm_c_define ("pipes", pipes);
+ scm_c_eval_string ("(start-server pipes)");
+}
+/*
+void
+start_remote_client (char *hostname, int port)
+{
+ int sockfd;
+ struct hostent *server;
+ struct sockaddr_in serv_addr;
+
+ // 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);
+ if (connect (sockfd, (struct sockaddr *) &serv_addr, sizeof (serv_addr)) == -1) {
+ printf ("%s [%d.%d.%d.%d] %d: Connection refused\n", hostname, server->h_addr[0], server->h_addr[1], server->h_addr[2], server->h_addr[3], port);
+ }
+ else {
+ gacela_client (sockfd, sockfd);
+ close (sockfd);
+ }
+}
+*/
int
main (int argc, char *argv[])
{
- /*
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (dirname (argv[0]));
- scm_shell (argc, argv);
- */
- gacela_client ();
+ char *arg;
+ int mode = 0; // shell: 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], "--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);
+ }
+ }
+ }
+
+ scm_init_guile ();
+
+ 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_remote_client (host, port);
+ return;
+ else {
+ fd1 = scm_pipe ();
+ fd2 = scm_pipe ();
+ pid = fork ();
+
+ if (pid == 0) {
+ scm_close (SCM_CAR (fd1));
+ scm_close (SCM_CDR (fd2));
+ start_local_server (dirname (argv[0]), 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);
+ }
+
+ /*
+ SCM buffer;
+ if (pid == 0) {
+ printf ("Hijo: 0\n");
+ scm_write (scm_from_locale_string ("Hola mundo\n"), SCM_CDR (pipes));
+ scm_force_output (SCM_CDR (pipes));
+ printf ("Hijo: 1\n");
+ }
+ else {
+ printf ("Padre: 0\n");
+ buffer = scm_read (SCM_CAR (pipes));
+ printf ("%s\n", scm_to_locale_string (buffer));
+ printf ("Padre: 1\n");
+ }
+ */
+ }
}