X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=af78da97433302a1a775cd16ffdbb95fe72972a0;hb=85190d9f178de47361cb8bc77aaf3197632b1337;hp=d1a15fb96d4fd94cca9d1ae3eba9f0c97f686d9b;hpb=b9e6fa296fff96cca34819510b411e12be0bdbe0;p=gacela.git diff --git a/src/gacela.c b/src/gacela.c index d1a15fb..af78da9 100644 --- a/src/gacela.c +++ b/src/gacela.c @@ -30,8 +30,11 @@ #include "gacela_GL.h" #include "gacela_FTGL.h" -// Generic variables +// Global variables int ctrl_c = 0; +int pid = 0; +char *history_path = NULL; + static int find_matching_paren (int k) @@ -114,11 +117,18 @@ 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); @@ -126,11 +136,59 @@ 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 @@ -138,8 +196,8 @@ gacela_client (SCM rec_channel, SCM send_channel) { int n; SCM buffer; - char *line; - char *history_path; + char *line = NULL, *line_for_sending = NULL; + int opened = 0; // Command line asprintf (&history_path, "%s/.gacela_history", getenv("HOME")); @@ -148,24 +206,45 @@ gacela_client (SCM rec_channel, SCM send_channel) read_history (history_path); while (1) { - line = readline ("gacela> "); - ctrl_c = 0; + if (opened > 0) + line = readline ("... "); + else + line = readline ("gacela> "); + if (!line) break; + + opened += opened_parens (line, ')'); + ctrl_c = 0; + if (line && *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 (line_for_sending == NULL) { + line_for_sending = strdup (line); } - if (ctrl_c) - ctrl_c = 0; else { - buffer = scm_read (rec_channel); - printf ("%s\n", scm_to_locale_string (buffer)); + 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); @@ -176,7 +255,7 @@ gacela_client (SCM rec_channel, SCM send_channel) } 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> \")"); @@ -204,11 +283,11 @@ load_scheme_files (char *path) } void -start_single () +init_gacela (char *path) { - char *argv = "guile"; - - scm_shell (1, &argv); + scm_with_guile (&init_scheme, NULL); + load_scheme_files (path); + scm_c_eval_string ("(init-video-mode)"); } void @@ -244,16 +323,15 @@ int main (int argc, char *argv[]) { char *arg; - int mode = 0; // shell: 1, server: 2, client: 3 + 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], "--shell-mode") == 0) + if (strcmp (argv[i], "--dev") == 0) mode = 1; else if (strncmp (argv[i], "--server", 8) == 0) { mode = 2; @@ -278,18 +356,6 @@ main (int argc, char *argv[]) scm_init_guile (); if (mode == 1) { - scm_with_guile (&init_gacela, NULL); - load_scheme_files (dirname (argv[0])); - start_single (); - } - else if (mode == 2 && port != 0) { - scm_with_guile (&init_gacela, NULL); - load_scheme_files (dirname (argv[0])); - start_server (port); - } - else if (mode == 3 && port != 0) - start_remote_client (host, port); - else { fd1 = scm_pipe (); fd2 = scm_pipe (); pid = fork (); @@ -297,9 +363,9 @@ main (int argc, char *argv[]) if (pid == 0) { scm_close (SCM_CAR (fd1)); scm_close (SCM_CDR (fd2)); - scm_with_guile (&init_gacela, NULL); - load_scheme_files (dirname (argv[0])); + 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)); @@ -308,4 +374,15 @@ main (int argc, char *argv[]) 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 (); + } }