Bug fix

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index f461140b9f71c322b5d3285f91f4317b8900b4e5..420c9efb701a3046a55c664cde96cdac0975f19b 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -1,31 +1,33 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; 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: gdktypes.lisp,v 1.13 2005-02-10 00:22:35 espen Exp $
+;; $Id: gdktypes.lisp,v 1.20 2005-04-24 13:29:36 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_")
-  (init-types-in-library #.(concatenate 'string
-                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
-                           "/libgdk-x11-2.0.so") :prefix "_gdk_")
+                           "/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_"))
@@ -47,8 +49,7 @@ (defclass color (boxed)
     :allocation :alien
     :accessor color-blue
     :type unsigned-short))
-  (:metaclass boxed-class)
-  (:alien-name "GdkColor"))
+  (:metaclass boxed-class))
 
 
 (deftype point () '(vector int 2))
@@ -79,8 +80,9 @@ (defclass rectangle (boxed)
     :accessor rectangle-height
     :initarg :height
     :type int))
-  (:metaclass boxed-class)
-  (:alien-name "GdkRectangle"))
+  (:metaclass boxed-class))
+
+
 
 
 (define-types-by-introspection "Gdk"
@@ -99,7 +101,25 @@ (define-types-by-introspection "Gdk"
   ("GdkRectngle" :ignore t)
   ("GdkCursor" :ignore t)
   ("GdkFont" :ignore t) ; deprecated
-  
+  ("GdkEventMask" :ignore t) ; manually defined
+  ("GdkModifierType" :ignore t) ; manually defined
+
+  ("GdkDisplay"
+   :slots
+   ((name
+     :allocation :virtual
+     :getter "gdk_display_get_name"
+     :reader display-name
+     :type (copy-of string))
+    (screens
+     :allocation :virtual
+     :getter display-screens)
+    (devices
+     :allocation :virtual
+     :getter "gdk_display_list_devices"
+     :reader display-devices
+     :type (copy-of (glist device)))))
+
   ("GdkDrawable"
    :slots
    ((display
@@ -189,8 +209,7 @@ (defclass cursor (boxed)
     :getter "gdk_cursor_get_display"
     :reader cursor-display
     :type display))
-  (:metaclass boxed-class)
-  (:alien-name "GdkCursor"))
+  (:metaclass boxed-class))
 
 
 (defclass geometry (struct)
@@ -250,3 +269,8 @@ (defclass geometry (struct)
     :initarg :gravity
     :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)))