X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=bc5dc4d9acbca0fa31ab6624e1e0814f55b83251;hb=cedf371b16bb5989593f0e7b45714b1769c5939e;hp=6a93356b0da12ecd5c331a0eb4267b9e126ba39e;hpb=e3b5db38d5d5bf4e77e21e594223e89f534fa336;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index 6a93356..bc5dc4d 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -204,29 +204,19 @@
     (maphash (lambda (key res) (free-resource key)) resources-table)))
 
 
-;;; 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 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)
-	(let ((sto *standard-output*))
-	  (setq *standard-output* cli)
-	  (setq *break-enable* nil)
-	  (eval (read cli))
-	  (setq *break-enable* t)
-	  (setq *standard-output* sto)))))
-
-  (defun stop-server ()
+;;; Connection with Gacela Skin
+(let (socket)
+  (defun start-skin-client (port)
+    (when (null socket) (setq socket (si::socket port :host "localhost"))))
+
+  (defun eval-from-skin ()
+    (when (si::listen socket)
+      (secure-block socket (eval (read-from-string (read-line socket))))))
+
+  (defun stop-skin-client ()
     (when socket
-      (dolist (cli clients) (si::close cli))
       (si::close socket)
-      (setq socket nil clients nil))))
+      (setq socket nil))))
 
 
 ;;; GaCeLa Functions
@@ -248,8 +238,7 @@
      (init-video-mode)
      (SDL_WM_SetCaption ,title "")
      (init-frame-time)
-     (check-server-connections)
-     (eval-from-clients)
+     (eval-from-skin)
      (refresh-running-mobs)
      (process-events)
      (do () ((quit?))
@@ -261,8 +250,7 @@
 	 (SDL_GL_SwapBuffers)
 	 (delay-frame)
 	 (init-frame-time)
-	 (check-server-connections)
-	 (eval-from-clients)
+	 (eval-from-skin)
 	 (refresh-running-mobs)
 	 (process-events)
 	 (setq running nil))))