X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/afd573069d64ef0065bb477a3b8ba48ffa999f8b..14021fee579226a95bc524bcc0e24eccd517c2cc:/gdk/gdktypes.lisp diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp index f461140..7a0783e 100644 --- a/gdk/gdktypes.lisp +++ b/gdk/gdktypes.lisp @@ -1,54 +1,52 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 2000-2006 Espen S. Johnsen ;; -;; 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.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_") - (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_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 :accessor color-green - :type unsigned-short) + :type (unsigned 16)) (blue :allocation :alien :accessor color-blue - :type unsigned-short)) + :type (unsigned 16))) (:metaclass boxed-class) - (:alien-name "GdkColor")) + (:packed t)) (deftype point () '(vector int 2)) @@ -79,8 +77,45 @@ (defclass rectangle (boxed) :accessor rectangle-height :initarg :height :type int)) - (:metaclass boxed-class) - (:alien-name "GdkRectangle")) + (: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" @@ -96,10 +131,32 @@ (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 + + ("GdkAppLaunchContext" :ignore t) ; needs GIO + + + ("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))))) + + ;; TODO: add unbound options ("GdkDrawable" :slots ((display @@ -171,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) @@ -190,7 +267,8 @@ (defclass cursor (boxed) :reader cursor-display :type display)) (:metaclass boxed-class) - (:alien-name "GdkCursor")) + (:ref %cursor-ref) + (:unref %cursor-unref)) (defclass geometry (struct) @@ -250,3 +328,5 @@ (defclass geometry (struct) :initarg :gravity :type gravity)) (:metaclass struct-class)) + +(deftype native-window () '(unsigned 32))