X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.c;h=a3505049caf1ac1ff31b3b9802e73d3f6df7651d;hb=cd001a2c183f65f0894500569fea2ffcf7362f30;hp=e976bf6fb74383257c2e6fd5c092ce33f2814784;hpb=cfc3b5c1197829940765b868c41c4ef53de15f50;p=gacela.git
diff --git a/src/gacela.c b/src/gacela.c
index e976bf6..a350504 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -15,16 +15,25 @@
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)
{
@@ -32,14 +41,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 +57,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 +83,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 +113,7 @@ void
ctrl_c_handler (int signum)
{
printf ("ERROR: User interrupt\nABORT: (signal)\n");
+ ctrl_c = 1;
}
static void
@@ -111,12 +121,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,25 +135,63 @@ init_gacela_client ()
}
void
-gacela_client (void)
+gacela_client (char *hostname, int port)
{
+ int sockfd, n;
+ struct hostent *server;
+ struct sockaddr_in serv_addr;
+ char buffer[256];
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 ();
- read_history (".gacela_history");
+ read_history (history_path);
while (1) {
line = readline ("gacela> ");
+ ctrl_c = 0;
if (!line) break;
if (line && *line)
{
- printf ("%s\n", line);
add_history (line);
+ write (sockfd, "(", 1);
+ n = write (sockfd, line, strlen (line));
+ write (sockfd, ")", 1);
+ if (n < 0)
+ error("ERROR writing to socket");
+
+ bzero (buffer, 256);
+ n = read (sockfd, buffer, sizeof (buffer));
+ while (n == 0) {
+ if (ctrl_c) break;
+ sleep (1);
+ n = read (sockfd, buffer, sizeof (buffer));
+ }
+ if (n < 0)
+ error("ERROR reading from socket");
+ if (ctrl_c)
+ ctrl_c = 0;
+ else
+ printf ("%s\n", buffer);
}
free (line);
}
- write_history (".gacela_history");
+ close (sockfd);
+ write_history (history_path);
+ free (history_path);
}
static void*
@@ -155,7 +203,7 @@ 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 ("(read-enable 'case-insensitive)");
+ // scm_c_eval_string ("(read-enable 'case-insensitive)");
// Bindings for C functions and structs
SDL_register_functions (NULL);
@@ -175,14 +223,77 @@ 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_client (char *hostname, int port)
+{
+ scm_init_guile ();
+ gacela_client (hostname, port);
+}
+
int
main (int argc, char *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);
/*
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (dirname (argv[0]));
- scm_shell (argc, argv);
+ if (fork () == 0)
+ start_server ();
+ else
+ start_client ("localhost", 1234);
*/
- scm_init_guile ();
- gacela_client ();
}