X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/7abdba43523dd39f28caab7d728d2a2821e30e89..cc74b2c987edc3e2bc85413e92f33e2690a32b1c:/gdk/gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index 57c6db4..6528895 100644
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2005 Espen S. Johnsen <espen@users@sf.net>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; 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.15 2005-02-27 12:37:45 espen Exp $
+;; $Id: gdk.lisp,v 1.20 2006-02-08 22:20:22 espen Exp $
 
 
 (in-package "GDK")
@@ -130,12 +135,6 @@ (defbinding screen-height () int)
 (defbinding screen-width-mm () int)
 (defbinding screen-height-mm () int)
 
-(defun %grab-time (time-or-event)
-  (etypecase time-or-event
-    (null 0)
-    (timed-event (event-time time-or-event))
-    (integer time-or-event)))
-
 (defbinding pointer-grab 
     (window &key owner-events events confine-to cursor time) grab-status
   (window window)
@@ -143,12 +142,12 @@ (defbinding pointer-grab
   (events event-mask)
   (confine-to (or null window))
   (cursor (or null cursor))
-  ((%grab-time time) (unsigned 32)))
+  ((or time 0) (unsigned 32)))
 
 (defbinding (pointer-ungrab "gdk_display_pointer_ungrab")
-    (&optional (display (display-get-default)) time) nil
+    (&optional time (display (display-get-default))) nil
   (display display)
-  ((%grab-time time) (unsigned 32)))
+  ((or time 0) (unsigned 32)))
 
 (defbinding (pointer-is-grabbed-p "gdk_display_pointer_is_grabbed") 
     (&optional (display (display-get-default))) boolean)
@@ -156,12 +155,12 @@ (defbinding (pointer-is-grabbed-p "gdk_display_pointer_is_grabbed")
 (defbinding keyboard-grab (window &key owner-events time) grab-status
   (window window)
   (owner-events boolean)
-  ((%grab-time time) (unsigned 32)))
+  ((or time 0) (unsigned 32)))
 
 (defbinding (keyboard-ungrab "gdk_display_keyboard_ungrab")
-    (&optional (display (display-get-default)) time) nil
+    (&optional time (display (display-get-default))) nil
   (display display)
-  ((%grab-time time) (unsigned 32)))
+  ((or time 0) (unsigned 32)))
 
 
 
@@ -426,7 +425,7 @@ (defbinding rgb-init () nil)
 (defmethod initialize-instance ((cursor cursor) &key type mask fg bg 
 				(x 0) (y 0) (display (display-get-default)))
   (setf 
-   (slot-value cursor 'location)
+   (foreign-location cursor)
    (etypecase type
      (keyword (%cursor-new-for-display display type))
      (pixbuf (%cursor-new-from-pixbuf display type x y))
@@ -706,3 +705,35 @@ (defbinding (keyval-is-upper-p "gdk_keyval_is_upper") () boolean
 (defbinding (keyval-is-lower-p "gdk_keyval_is_lower") () boolean
   (keyval unsigned-int))
 
+;;; Cairo interaction
+
+#+gtk2.8
+(progn
+  (defbinding cairo-create () cairo:context
+    (drawable drawable))
+
+  (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))))
+
+  (defbinding cairo-set-source-color () nil
+    (cr cairo:context)
+    (color color))
+
+  (defbinding cairo-set-source-pixbuf () nil
+    (cr cairo:context)
+    (pixbuf pixbuf)
+    (x double-float)
+    (y double-float))
+ 
+  (defbinding cairo-rectangle () nil
+    (cr cairo:context)
+    (rectangle rectangle))
+ 
+;;   (defbinding cairo-region () nil
+;;     (cr cairo:context)
+;;     (region region))
+)