X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/06cb4af7956e055823cb946d0f3240b7edf5927d..c046c2f653233b4e09830f672159ae205f59c6f6:/gdk/gdktypes.lisp diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp index cdbff54..8564ad2 100644 --- a/gdk/gdktypes.lisp +++ b/gdk/gdktypes.lisp @@ -15,17 +15,14 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gdktypes.lisp,v 1.9 2004-12-20 00:31:01 espen Exp $ +;; $Id: gdktypes.lisp,v 1.18 2005-03-11 16:48:08 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,14 +44,13 @@ (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)) (deftype segment () '(vector int 4)) (deftype trapezoid () '(vector double-float 6)) - +(deftype atom () 'unsigned-int) ;; Could this just as well have been a vector? @@ -79,107 +75,120 @@ (defclass rectangle (boxed) :accessor rectangle-height :initarg :height :type int)) - (:metaclass boxed-class) - (:alien-name "GdkRectangle")) + (:metaclass boxed-class)) -(eval-when (:compile-toplevel :load-toplevel :execute) - (define-types-by-introspection "Gdk" - ("GdkFunction" :type gc-function) - ("GdkWMDecoration" :type wm-decoration) - ("GdkWMFunction" :type wm-function) - ("GdkGC" :type gc) - ("GdkGCX11" :type gc-x11) - ("GdkGCValuesMask" :type gc-values-mask) - ("GdkDrawableImplX11" :ignore t) - ("GdkWindowImplX11" :ignore t) - ("GdkPixmapImplX11" :ignore t) - ("GdkGCX11" :ignore t) - ("GdkColor" :ignore t) - ("GdkEvent" :ignore t) - ("GdkRectngle" :ignore t) - ("GdkFont" :ignore t) ; deprecated - - ("GdkDrawable" - :slots - ((display - :allocation :virtual - :getter "gdk_drawable_get_display" - :reader drawable-display - :type display) - (screen - :allocation :virtual - :getter "gdk_drawable_get_screen" - :reader drawable-screen - :type screen) - (visual - :allocation :virtual - :getter "gdk_drawable_get_visual" - :reader drawable-visual - :type visual) - (colormap - :allocation :virtual - :getter "gdk_drawable_get_colormap" - :setter "gdk_drawable_set_colormap" - :unbound nil - :accessor drawable-colormap - :initarg :colormap - :type colormap) - (depth - :allocation :virtual - :getter "gdk_drawable_get_depth" - :reader drawable-depth - :type int) - (with - :allocation :virtual - :getter drawable-width) - (height - :allocation :virtual - :getter drawable-height))) - - ("GdkWindow" - :slots - ((state - :allocation :virtual - :getter "gdk_window_get_state" - :reader window-state - :type window-state) - (parent - :allocation :virtual - :getter "gdk_window_get_parent" - :reader window-parent - :type window) - (toplevel - :allocation :virtual - :getter "gdk_window_get_toplevel" - :reader window-toplevel - :type window) - (children - :allocation :virtual - :getter "gdk_window_get_children" - :reader window-children - :type (glist window)) - (events - :allocation :virtual - :getter "gdk_window_get_events" - :setter "gdk_window_set_events" - :accessor window-events - :type event-mask) - (group - :allocation :virtual - :getter "gdk_window_get_group" - :setter "gdk_window_set_group" - :unbound nil - :accessor window-group - :type window) - - )) -)) +(define-types-by-introspection "Gdk" + ("GdkFunction" :type gc-function) + ("GdkWMDecoration" :type wm-decoration) + ("GdkWMFunction" :type wm-function) + ("GdkGC" :type gc) + ("GdkGCX11" :type gc-x11) + ("GdkGCValuesMask" :type gc-values-mask) + ("GdkDrawableImplX11" :ignore t) + ("GdkWindowImplX11" :ignore t) + ("GdkPixmapImplX11" :ignore t) + ("GdkGCX11" :ignore t) + ("GdkColor" :ignore t) + ("GdkEvent" :ignore t) + ("GdkRectngle" :ignore t) + ("GdkCursor" :ignore t) + ("GdkFont" :ignore t) ; deprecated + ("GdkEventMask" :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 + :allocation :virtual + :getter "gdk_drawable_get_display" + :reader drawable-display + :type display) + (screen + :allocation :virtual + :getter "gdk_drawable_get_screen" + :reader drawable-screen + :type screen) + (visual + :allocation :virtual + :getter "gdk_drawable_get_visual" + :reader drawable-visual + :type visual) + (colormap + :allocation :virtual + :getter "gdk_drawable_get_colormap" + :setter "gdk_drawable_set_colormap" + :unbound nil + :accessor drawable-colormap + :initarg :colormap + :type colormap) + (depth + :allocation :virtual + :getter "gdk_drawable_get_depth" + :reader drawable-depth + :type int) + (with + :allocation :virtual + :getter drawable-width) + (height + :allocation :virtual + :getter drawable-height))) + + ("GdkWindow" + :slots + ((state + :allocation :virtual + :getter "gdk_window_get_state" + :reader window-state + :type window-state) + (parent + :allocation :virtual + :getter "gdk_window_get_parent" + :reader window-parent + :type window) + (toplevel + :allocation :virtual + :getter "gdk_window_get_toplevel" + :reader window-toplevel + :type window) + (children + :allocation :virtual + :getter "gdk_window_get_children" + :reader window-children + :type (glist window)) + (events + :allocation :virtual + :getter "gdk_window_get_events" + :setter "gdk_window_set_events" + :accessor window-events + :type event-mask) + (group + :allocation :virtual + :getter "gdk_window_get_group" + :setter "gdk_window_set_group" + :unbound nil + :accessor window-group + :type window)))) (deftype bitmap () 'pixmap) -(defclass cursor (struct) +(defclass cursor (boxed) ((type :allocation :alien :reader cursor-type @@ -192,8 +201,63 @@ (defclass cursor (struct) :getter "gdk_cursor_get_display" :reader cursor-display :type display)) - (:metaclass struct-class)) + (:metaclass boxed-class)) -(defclass device (struct) - () + +(defclass geometry (struct) + ((min-width + :allocation :alien + :accessor geometry-min-width + :initarg :min-width + :type int) + (min-height + :allocation :alien + :accessor geometry-min-height + :initarg :min-height + :type int) + (max-width + :allocation :alien + :accessor geometry-max-width + :initarg :max-width + :type int) + (max-height + :allocation :alien + :accessor geometry-max-height + :initarg :max-height + :type int) + (base-width + :allocation :alien + :accessor geometry-base-width + :initarg :base-width + :type int) + (base-height + :allocation :alien + :accessor geometry-base-height + :initarg :base-height + :type int) + (width-inc + :allocation :alien + :accessor geometry-width-inc + :initarg :width-inc + :type int) + (height-inc + :allocation :alien + :accessor geometry-height-inc + :initarg :height-inc + :type int) + (min-aspect + :allocation :alien + :accessor geometry-min-aspect + :initarg :min-aspect + :type double-float) + (max-aspect + :allocation :alien + :accessor geometry-max-aspect + :initarg :max-aspect + :type double-float) + (gravity + :allocation :alien + :accessor geometry-gravity + :initarg :gravity + :type gravity)) (:metaclass struct-class))