X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgacela.c;h=737766aa3cc8818c94b760826d7ff2e37b8b2136;hb=a6e0eb4c5e06bb6107acf40eb9f6a89e691d585e;hp=37c8c9fb0754ff5f30142b36e96e54a1dc7e5547;hpb=faa5d238501edac61e899697a6bb88f33dff13de;p=gacela.git
diff --git a/src/gacela.c b/src/gacela.c
index 37c8c9f..737766a 100644
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -15,29 +15,37 @@
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"
+
static int
-find_matching_paren(int k)
+find_matching_paren (int k)
{
register int i;
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--)
+ 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 +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
@@ -62,59 +70,104 @@ find_matching_paren(int k)
return -1;
}
-static void
-match_paren(int x, int k)
+static int
+match_paren (int x, int k)
{
int tmp;
- fd_set readset;
+ int fno;
+ SELECT_TYPE readset;
struct timeval timeout;
- rl_insert(x, k);
-
- /* Did we just insert a quoted paren? If so, then don't bounce. */
+ 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);
+ return 0;
+
+ tmp = 500000;
+ timeout.tv_sec = tmp / 1000000;
+ timeout.tv_usec = tmp % 1000000;
+ FD_ZERO (&readset);
+ fno = fileno (rl_instream);
+ FD_SET (fno, &readset);
+
+ if (rl_point > 1)
+ {
+ tmp = rl_point;
+ rl_point = find_matching_paren (k);
+ if (rl_point > -1)
+ {
+ rl_redisplay ();
+ scm_std_select (fno + 1, &readset, NULL, NULL, &timeout);
+ }
+ rl_point = tmp;
}
- rl_point = tmp;
- }
+ return 0;
}
+void
+ctrl_c_handler (int signum)
+{
+ printf ("ERROR: User interrupt\nABORT: (signal)\n");
+}
+
static void
init_gacela_client ()
{
- /* init bouncing parens */
- rl_bind_key(')', match_paren);
- rl_bind_key(']', match_paren);
- rl_bind_key('}', match_paren);
+ 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 (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 ();
+ read_history (history_path);
while (1) {
- line = readline ("gacela>");
- printf ("%s\n", line);
+ line = readline ("gacela> ");
+ if (!line) break;
if (line && *line)
- add_history (line);
+ {
+ printf ("%s\n", line);
+ add_history (line);
+ }
free (line);
}
+
+ write_history (history_path);
+ free (history_path);
}
static void*
@@ -126,8 +179,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 ("(use-modules (ice-9 threads))");
- 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);
@@ -147,13 +199,78 @@ 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);
+ scm_c_eval_string ("(game-loop)");
+}
+
+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);
*/
- gacela_client ();
}