;; 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
;; 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.19 2006-02-07 13:22:14 espen Exp $
+;; $Id: gdk.lisp,v 1.28 2006-04-25 22:27:13 espen Exp $
(in-package "GDK")
((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)
(root-y int)
(timestamp unsigned-int))
-;; komplett så langt
+;;
(defbinding window-set-user-data () nil
(window window)
;;; Cursor
-(defmethod initialize-instance ((cursor cursor) &key type mask fg bg
- (x 0) (y 0) (display (display-get-default)))
- (setf
- (slot-value cursor 'location)
- (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)))))
-
+(defmethod allocate-foreign ((cursor cursor) &key source mask fg bg
+ (x 0) (y 0) (display (display-get-default)))
+ (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 :type cursor args)))
(defbinding %cursor-new-for-display () pointer
(display display)
(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
(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))
(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 %color-copy () pointer
+ (location pointer))
+
+(defmethod allocate-foreign ((color color) &rest initargs)
+ (declare (ignore color initargs))
+ ;; Color structs are allocated as memory chunks by gdk, and since
+ ;; there is no gdk_color_new we have to use this hack to get a new
+ ;; color chunk
+ (with-memory (location #.(foreign-size (find-class 'color)))
+ (%color-copy location)))
+
(defun %scale-value (value)
(etypecase 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
%green (%scale-value green)
%blue (%scale-value blue))))
+(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)))))
-
+ (make-instance 'color
+ :red (svref color 0) :green (svref color 1) :blue (svref color 2)))))
+
-;;; Drawable
+;;; Drawable -- all the draw- functions are dprecated and will be
+;;; removed, use cairo for drawing instead.
(defbinding drawable-get-size () nil
(drawable drawable)
(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
(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)
(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)
(defbinding keyval-name () string
(keyval unsigned-int))
-(defbinding keyval-from-name () unsigned-int
+(defbinding %keyval-from-name () unsigned-int
(name string))
+(defun keyval-from-name (name)
+ "Returns the keysym value for the given key name or NIL if it is not a valid name."
+ (let ((keyval (%keyval-from-name name)))
+ (unless (zerop keyval)
+ keyval)))
+
(defbinding keyval-to-upper () unsigned-int
(keyval unsigned-int))
;;; Cairo interaction
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
(progn
(defbinding cairo-create () cairo:context
(drawable drawable))
`(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)
;; (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)))))
~mdw / clg / blobdiff