X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/5e12e92b53977e1c052d94ceffa5bdfa73e3ff16..358bbd909c4ddbe95587fe15c30d74ed05a06567:/gdk/gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index 3990e43..3d1ffe3 100644
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2000-2006 Espen S. Johnsen <espen@users.sf.net>
 ;;
 ;; Permission is hereby granted, free of charge, to any person obtaining
 ;; a copy of this software and associated documentation files (the
@@ -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.23 2006-04-10 18:27:58 espen Exp $
+;; $Id: gdk.lisp,v 1.30 2006-06-07 13:17:24 espen Exp $
 
 
 (in-package "GDK")
@@ -150,7 +150,8 @@ (defbinding (pointer-ungrab "gdk_display_pointer_ungrab")
   ((or time 0) (unsigned 32)))
 
 (defbinding (pointer-is-grabbed-p "gdk_display_pointer_is_grabbed") 
-    (&optional (display (display-get-default))) boolean)
+    (&optional (display (display-get-default))) boolean
+  (display display))
 
 (defbinding keyboard-grab (window &key owner-events time) grab-status
   (window window)
@@ -340,7 +341,7 @@ (defbinding window-begin-move-drag () nil
   (root-y int)
   (timestamp unsigned-int))
 
-;; komplett så langt
+;;
 
 (defbinding window-set-user-data () nil
   (window window)
@@ -422,13 +423,20 @@ (defbinding rgb-init () nil)
 
 ;;; Cursor
 
-(defmethod allocate-foreign ((cursor cursor) &key type mask fg bg 
+(defmethod allocate-foreign ((cursor cursor) &key source mask fg bg 
 			     (x 0) (y 0) (display (display-get-default)))
-  (etypecase type
-    (keyword (%cursor-new-for-display display type))
-    (pixbuf (%cursor-new-from-pixbuf display type x y))
-    (pixmap (%cursor-new-from-pixmap type mask fg bg x y))))
-
+  (etypecase source
+    (keyword (%cursor-new-for-display display source))
+    (pixbuf (%cursor-new-from-pixbuf display source x y))
+    (pixmap (%cursor-new-from-pixmap source mask 
+	     (or fg (ensure-color #(0.0 0.0 0.0)))
+	     (or bg (ensure-color #(1.0 1.0 1.0))) x y))
+    (pathname (%cursor-new-from-pixbuf display (pixbuf-load source) x y))))
+
+(defun ensure-cursor (cursor &rest args)
+  (if (typep cursor 'cursor)
+      cursor
+    (apply #'make-instance 'cursor :source cursor args)))
 
 (defbinding %cursor-new-for-display () pointer
   (display display)
@@ -452,29 +460,28 @@ (defbinding %cursor-ref () pointer
 (defbinding %cursor-unref () nil
   (location pointer))
 
-(defmethod reference-foreign ((class (eql (find-class 'cursor))) location)
-  (declare (ignore class))
-  (%cursor-ref location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'cursor))) location)
-  (declare (ignore class))
-  (%cursor-unref location))
-
 
 ;;; Pixmaps
 
-(defbinding pixmap-new (width height depth &key window) pixmap
+(defbinding %pixmap-new () pointer
+  (window (or null window))
   (width int)
   (height int)
-  (depth int)
-  (window (or null window)))
-					
+  (depth int))
+
+(defmethod allocate-foreign ((pximap pixmap) &key width height depth window)
+  (%pixmap-new window width height depth))
+
+(defun pixmap-new (width height depth &key window)
+  (warn "PIXMAP-NEW is deprecated, use (make-instance 'pixmap ...) instead")
+  (make-instance 'pixmap :width width :height height :depth depth :window window))
+
 (defbinding %pixmap-colormap-create-from-xpm () pixmap
   (window (or null window))
   (colormap (or null colormap))
   (mask bitmap :out)
   (color (or null color))
-  (filename string))
+  (filename pathname))
 
 (defbinding %pixmap-colormap-create-from-xpm-d () pixmap
   (window (or null window))
@@ -483,6 +490,7 @@ (defbinding %pixmap-colormap-create-from-xpm-d () pixmap
   (color (or null color))
   (data (vector string)))
 
+;; Deprecated, use pixbufs instead
 (defun pixmap-create (source &key color window colormap)
   (let ((window
 	 (if (not (or window colormap))
@@ -491,18 +499,16 @@ (defun pixmap-create (source &key color window colormap)
     (multiple-value-bind (pixmap mask)
         (etypecase source
 	  ((or string pathname)
-	   (%pixmap-colormap-create-from-xpm
-	    window colormap color (namestring (truename source))))
+	   (%pixmap-colormap-create-from-xpm window colormap color  source))
  	  ((vector string)
 	   (%pixmap-colormap-create-from-xpm-d window colormap color source)))
-;;       (unreference-instance pixmap)
-;;       (unreference-instance mask)
       (values pixmap mask))))
 
 
-
 ;;; Color
 
+(defbinding colormap-get-system () colormap)
+
 (defbinding %color-copy () pointer
   (location pointer))
 
@@ -519,9 +525,7 @@ (defun %scale-value (value)
     (integer value)
     (float (truncate (* value 65535)))))
 
-(defmethod initialize-instance ((color color) &rest initargs
-				&key red green blue)
-  (declare (ignore initargs))
+(defmethod initialize-instance ((color color) &key (red 0.0) (green 0.0) (blue 0.0))
   (call-next-method)
   (with-slots ((%red red) (%green green) (%blue blue)) color
     (setf
@@ -529,26 +533,29 @@ (defmethod initialize-instance ((color color) &rest initargs
      %green (%scale-value green)
      %blue (%scale-value blue))))
 
-(defbinding color-parse (spec &optional (make-instance 'color)) boolean
+(defbinding %color-parse () boolean
   (spec string)
   (color color :in/return))
 
+(defun color-parse (spec &optional (color (make-instance 'color)))
+  (multiple-value-bind (succeeded-p color) (%color-parse spec color)
+    (if succeeded-p
+	color
+      (error "Parsing color specification ~S failed." spec))))
+
 (defun ensure-color (color)
   (etypecase color
     (null nil)
     (color color)
+    (string (color-parse color))
     (vector
      (make-instance 'color 
-      :red (svref color 0) :green (svref color 1) :blue (svref color 2)))
-    (string
-     (multiple-value-bind (succeeded-p color) (parse-color color)
-       (if succeeded-p
-	   color
-	 (error "Parsing color specification ~S failed." color))))))
-       
+      :red (svref color 0) :green (svref color 1) :blue (svref color 2)))))
+
 
   
-;;; Drawable
+;;; Drawable -- all the draw- functions are deprecated and will be
+;;; removed, use cairo for drawing instead.
 
 (defbinding drawable-get-size () nil
   (drawable drawable)
@@ -580,20 +587,11 @@ (defbinding %draw-points () nil
   (points pointer)
   (n-points int))
 
-;; (defun draw-points (drawable gc &rest points)
-  
-;;   )
-
 (defbinding draw-line () nil
   (drawable drawable) (gc gc) 
   (x1 int) (y1 int)
   (x2 int) (y2 int))
 
-;; (defbinding draw-lines (drawable gc &rest points) nil
-;;   (drawable drawable) (gc gc) 
-;;   (points (vector point))
-;;   ((length points) int))
-
 (defbinding draw-pixbuf
     (drawable gc pixbuf src-x src-y dest-x dest-y &optional
      width height (dither :none) (x-dither 0) (y-dither 0)) nil
@@ -605,11 +603,6 @@ (defbinding draw-pixbuf
   (dither rgb-dither)
   (x-dither int) (y-dither int))
 
-;; (defbinding draw-segments (drawable gc &rest points) nil
-;;   (drawable drawable) (gc gc) 
-;;   (segments (vector segments))
-;;   ((length segments) int))
-
 (defbinding draw-rectangle () nil
   (drawable drawable) (gc gc) 
   (filled boolean)
@@ -623,35 +616,6 @@ (defbinding draw-arc () nil
   (width int) (height int)
   (angle1 int) (angle2 int))
 
-;; (defbinding draw-polygon (drawable gc &rest points) nil
-;;   (drawable drawable) (gc gc) 
-;;   (points (vector point))
-;;   ((length points) int))
-
-;; (defbinding draw-trapezoid (drawable gc &rest points) nil
-;;   (drawable drawable) (gc gc) 
-;;   (points (vector point))
-;;   ((length points) int))
-
-;; (defbinding %draw-layout-line () nil
-;;   (drawable drawable) (gc gc) 
-;;   (font pango:font)
-;;   (x int) (y int)
-;;   (line pango:layout-line))
-
-;; (defbinding %draw-layout-line-with-colors () nil
-;;   (drawable drawable) (gc gc) 
-;;   (font pango:font)
-;;   (x int) (y int)
-;;   (line pango:layout-line)
-;;   (foreground (or null color))
-;;   (background (or null color)))
-
-;; (defun draw-layout-line (drawable gc font x y line &optional foreground background)
-;;   (if (or foreground background)
-;;       (%draw-layout-line-with-colors drawable gc font x y line foreground background)
-;;     (%draw-layout-line drawable gc font x y line)))
-
 (defbinding %draw-layout () nil
   (drawable drawable) (gc gc) 
   (font pango:font)
@@ -730,7 +694,7 @@ (defbinding (keyval-is-lower-p "gdk_keyval_is_lower") () boolean
 
 ;;; Cairo interaction
 
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
 (progn
   (defbinding cairo-create () cairo:context
     (drawable drawable))
@@ -739,8 +703,7 @@   (defmacro with-cairo-context ((cr drawable) &body body)
     `(let ((,cr (cairo-create ,drawable)))
        (unwind-protect
 	   (progn ,@body)
-	 (unreference-foreign 'cairo:context (foreign-location ,cr))
-	 (invalidate-instance ,cr))))
+	 (invalidate-instance ,cr t))))
 
   (defbinding cairo-set-source-color () nil
     (cr cairo:context)
@@ -760,3 +723,41 @@   (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
+	   ,@body
+	 (threads-leave t)))))