(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index de3a3f886a848fee75beb12de1266fa5758bb080..8517a9c87c41a8d86189dab2e791dd2530123389 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -204,30 +204,27 @@
     (maphash (lambda (key res) (free-resource key)) resources-table)))
 
 
-;;; Connection with the GUI
-(let (socket)
-  (defun connect-to-gui ()
-    (setq socket (si::socket 1984 :host "localhost")))
+;;; Gacela Server for development mode
+(let (socket clients)
+  (defun start-server (port)
+    (when (null socket) (setq socket (si::socket port :server #'eval-from-clients))))
 
-  (defun eval-from-gui ()
-    (cond ((and socket (listen socket)) (eval (read socket))))))
+  (defun check-server-connections ()
+    (when (and socket (si::listen socket)) (push (si:accept socket) clients)))
 
+  (defun eval-from-clients ()
+    (dolist (cli clients)
+      (when (si::listen cli)
+       (secure-block cli (eval (read-from-string (read-line cli)))))))
+
+  (defun stop-server ()
+    (when socket
+      (dolist (cli clients) (si::close cli))
+      (si::close socket)
+      (setq socket nil clients nil))))
 
-;;; GaCeLa Functions
-(let (commands)
-  (defun prog-command (command)
-    (setq commands (cons command commands)))
-
-  (defun run-commands ()
-    (cond (commands
-          (let (running)
-            (setq running commands)
-            (setq commands nil)
-            (labels ((run-com (comlst)
-                              (cond (comlst (run-com (cdr comlst))
-                                            (eval (read-from-string (concatenate 'string "(progn " (car comlst) ")")))))))
-                    (run-com running)))))))
 
+;;; GaCeLa Functions
 (let (time (time-per-frame (/ 1000.0 *frames-per-second*)))
   (defun set-frames-per-second (fps)
     (setq time-per-frame (/ 1000.0 fps)))
@@ -246,6 +243,8 @@
      (init-video-mode)
      (SDL_WM_SetCaption ,title "")
      (init-frame-time)
+     (check-server-connections)
+     (eval-from-clients)
      (refresh-running-mobs)
      (process-events)
      (do () ((quit?))
@@ -257,6 +256,8 @@
         (SDL_GL_SwapBuffers)
         (delay-frame)
         (init-frame-time)
+        (check-server-connections)
+        (eval-from-clients)
         (refresh-running-mobs)
         (process-events)
         (setq running nil))))