X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/4b2733dcc4042e3d3ca108df5486a72065520116..14021fee579226a95bc524bcc0e24eccd517c2cc:/gdk/gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 84383a5..7a0783e 100644
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.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,36 +20,33 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gdktypes.lisp,v 1.22 2006-02-26 23:47:50 espen Exp $
+;; $Id: gdktypes.lisp,v 1.29 2008-10-27 18:42:01 espen Exp $
 
 (in-package "GDK")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library #.(concatenate 'string
-			    (pkg-config:pkg-variable "gtk+-2.0" "libdir")
-			    "/libgdk-x11-2.0.so") :prefix ("gdk_" "_gdk_"))
-  (init-types-in-library #.(concatenate 'string
-			    (pkg-config:pkg-variable "gtk+-2.0" "libdir")
-			    "/libgdk_pixbuf-2.0.so") :prefix "gdk_"))
+  (init-types-in-library gdk "libgdk-2.0" :prefix ("gdk_" "_gdk_"))
+  (init-types-in-library gdk "libgdk_pixbuf-2.0" :prefix "gdk_"))
 
 
 (defclass color (boxed)
   ((pixel
     :allocation :alien
-    :type unsigned-long)
+    :type (unsigned 32))
    (red
     :allocation :alien
     :accessor color-red
-    :type unsigned-short)
+    :type (unsigned 16))
    (green
-    :allocation :alien :offset 6
+    :allocation :alien
     :accessor color-green
-    :type unsigned-short)
+    :type (unsigned 16))
    (blue
-    :allocation :alien  :offset 8
+    :allocation :alien
     :accessor color-blue
-    :type unsigned-short))
-  (:metaclass boxed-class))
+    :type (unsigned 16)))
+  (:metaclass boxed-class)
+  (:packed t))
 
 
 (deftype point () '(vector int 2))
@@ -82,8 +79,44 @@ (defclass rectangle (boxed)
     :type int))
   (:metaclass boxed-class))
 
+(defclass region (struct)
+  ()
+  (:metaclass struct-class)
+  (:ref %region-copy)
+  (:unref %region-destroy))
 
 
+(register-type 'event-mask '|gdk_event_mask_get_type|)
+(define-flags-type event-mask
+  (:exposure 2)
+  :pointer-motion
+  :pointer-motion-hint
+  :button-motion
+  :button1-motion
+  :button2-motion
+  :button3-motion
+  :button-press
+  :button-release
+  :key-press
+  :key-release
+  :enter-notify
+  :leave-notify
+  :focus-change
+  :structure
+  :property-change
+  :visibility-notify
+  :proximity-in
+  :proximity-out
+  :substructure
+  :scroll
+  (:all-events #x3FFFFE))
+
+(register-type 'modifier-type '|gdk_modifier_type_get_type|)
+(define-flags-type modifier-type
+  :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5 
+  :button1 :button2 :button3 :button4 :button5
+  (:release #.(ash 1 30)))
+
 
 (define-types-by-introspection "Gdk"
   ("GdkFunction" :type gc-function)
@@ -104,6 +137,9 @@ (define-types-by-introspection "Gdk"
   ("GdkEventMask" :ignore t) ; manually defined
   ("GdkModifierType" :ignore t) ; manually defined
 
+  ("GdkAppLaunchContext" :ignore t) ; needs GIO
+
+
   ("GdkDisplay"
    :slots
    ((name
@@ -120,6 +156,7 @@ (define-types-by-introspection "Gdk"
      :reader display-devices
      :type (copy-of (glist device)))))
 
+  ;; TODO: add unbound options
   ("GdkDrawable"
    :slots
    ((display
@@ -191,7 +228,27 @@ (define-types-by-introspection "Gdk"
      :setter "gdk_window_set_group"
      :unbound nil
      :accessor window-group
-     :type window))))
+     :type window)
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+    (type-hint
+     :allocation :virtual
+     :getter "gdk_window_get_type_hint"
+     :setter "gdk_window_set_type_hint"
+     :accessor window-type-hint
+     :type window-type-hint)
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+    (type-hint
+     :allocation :virtual
+     :getter "gdk_window_get_type_hint"
+     :accessor window-type-hint
+     :type window-type-hint)
+    (decorations
+     :allocation :virtual
+     :getter %window-decoration-getter
+     :setter "gdk_window_set_decoration"
+     :boundp %window-decoration-boundp
+     :accessor window-decorations
+     :type wm-decoration))))
 
 
 (deftype bitmap () 'pixmap)
@@ -209,7 +266,9 @@ (defclass cursor (boxed)
     :getter "gdk_cursor_get_display"
     :reader cursor-display
     :type display))
-  (:metaclass boxed-class))
+  (:metaclass boxed-class)
+  (:ref %cursor-ref)
+  (:unref %cursor-unref))  
 
 
 (defclass geometry (struct)
@@ -270,9 +329,4 @@ (defclass geometry (struct)
     :type gravity))
   (:metaclass struct-class))
 
-(define-flags-type modifier-type
-  :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5 
-  :button1 :button2 :button3 :button4 :button5
-  (:release #.(ash 1 30)))
-
 (deftype native-window () '(unsigned 32))