Definition of EVENT-MASK moved to gdktypes.lisp and some other minor changes

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 8564ad26595fef11fad550656a087c65f8475330..07a303b3709eba3d7a65f96b78160ca3b913b330 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -1,21 +1,26 @@
-;; 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.18 2005-03-11 16:48:08 espen Exp $
+;; $Id: gdktypes.lisp,v 1.23 2006-04-10 18:16:24 espen Exp $
 
 (in-package "GDK")
 
@@ -31,19 +36,19 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
 (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
+    :allocation :alien :offset 6
     :accessor color-green
-    :type unsigned-short)
+    :type (unsigned 16))
    (blue
-    :allocation :alien
+    :allocation :alien  :offset 8
     :accessor color-blue
-    :type unsigned-short))
+    :type (unsigned 16)))
   (:metaclass boxed-class))
 
 
@@ -78,6 +83,8 @@ (defclass rectangle (boxed)
   (:metaclass boxed-class))
 
 
+
+
 (define-types-by-introspection "Gdk"
   ("GdkFunction" :type gc-function)
   ("GdkWMDecoration" :type wm-decoration)
@@ -91,10 +98,11 @@ (define-types-by-introspection "Gdk"
   ("GdkGCX11" :ignore t)
   ("GdkColor" :ignore t)
   ("GdkEvent" :ignore t)
-  ("GdkRectngle" :ignore t)
+  ("GdkRectangle" :ignore t)
   ("GdkCursor" :ignore t)
   ("GdkFont" :ignore t) ; deprecated
   ("GdkEventMask" :ignore t) ; manually defined
+  ("GdkModifierType" :ignore t) ; manually defined
 
   ("GdkDisplay"
    :slots
@@ -261,3 +269,10 @@ (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)))
+
+(deftype native-window () '(unsigned 32))