From 18b84c8043e09adb90c047fd5dfe6860e26b27e8 Mon Sep 17 00:00:00 2001
Message-Id: <18b84c8043e09adb90c047fd5dfe6860e26b27e8.1718554401.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 25 Apr 2006 13:37:28 +0000
Subject: [PATCH] Added multi-threading support
Organization: Straylight/Edgeware

From: espen <espen>

---
 gdk/gdk.lisp | 39 ++++++++++++++++++++++++++++++++++++++-
 gtk/gtk.lisp | 17 ++++++++++++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index cc1af87..c8ac552 100644
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gdk.lisp,v 1.25 2006-04-11 18:28:38 espen Exp $
+;; $Id: gdk.lisp,v 1.26 2006-04-25 13:37:28 espen Exp $
 
 
 (in-package "GDK")
@@ -762,3 +762,40 @@   (defbinding cairo-rectangle () nil
 ;;     (cr cairo:context)
 ;;     (region region))
 )
+
+
+;;; Multi-threading support
+
+#+sbcl
+(progn
+  (defvar *global-lock* (sb-thread:make-mutex :name "global GDK lock"))
+  (let ((recursive-level 0))
+    (defun threads-enter ()
+      (if (eq (sb-thread:mutex-value *global-lock*) sb-thread:*current-thread*)
+	  (incf recursive-level)
+ 	(sb-thread:get-mutex *global-lock*)))
+
+    (defun threads-leave (&optional flush-p)
+      (cond
+       ((zerop recursive-level)	  
+	(when flush-p
+	  (display-flush))
+	(sb-thread:release-mutex *global-lock*))
+       (t (decf recursive-level)))))
+
+  (define-callback %enter-fn nil ()
+    (threads-enter))
+  
+  (define-callback %leave-fn nil ()
+    (threads-leave))
+  
+  (defbinding threads-set-lock-functions (&optional) nil
+    (%enter-fn callback)
+    (%leave-fn callback))
+
+  (defmacro with-global-lock (&body body)
+    `(progn
+       (threads-enter)
+       (unwind-protect
+	   (progn ,@body)
+	 (threads-leave t)))))
diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 2fdf4c8..f054449 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtk.lisp,v 1.60 2006-04-10 18:56:19 espen Exp $
+;; $Id: gtk.lisp,v 1.61 2006-04-25 13:37:29 espen Exp $
 
 
 (in-package "GTK")
@@ -73,6 +73,21 @@ (defun clg-init (&optional display)
       (setq *max-event-to-sec* 0)
       (setq *max-event-to-usec* 1000))))
 
+#+sbcl	  
+(defun clg-init-with-threading (&optional display)
+  "Initializes the system and starts the event handling"
+  (unless (gdk:display-get-default)
+    (gdk:gdk-init)
+    (gdk:threads-set-lock-functions)
+    (unless (gtk-init)
+      (error "Initialization of GTK+ failed."))
+    (sb-thread:make-thread 
+     #'(lambda () 
+	 (gdk:display-open display)
+	 (gdk:with-global-lock (main)))
+     :name "gtk event loop")))
+
+
 ;;; Generic functions 
 
 (defgeneric add-to-radio-group (item1 item2))
-- 
[mdw]