;; 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.20 2006-02-08 22:20:22 espen Exp $
+;; $Id: gdk.lisp,v 1.27 2006-04-25 20:19:32 espen Exp $
(in-package "GDK")
;;; Cursor
-(defmethod initialize-instance ((cursor cursor) &key type mask fg bg
- (x 0) (y 0) (display (display-get-default)))
- (setf
- (foreign-location cursor)
- (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)
;;; 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-allocated-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)
+ &key (red 0.0) (green 0.0) (blue 0.0))
(declare (ignore initargs))
(call-next-method)
(with-slots ((%red red) (%green green) (%blue blue)) color
%green (%scale-value green)
%blue (%scale-value blue))))
+(defbinding %color-parse () boolean
+ (spec string)
+ (color color :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
(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))
;; (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)))))