X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=glib%2Fgobject.structs.lisp;h=1af1e69127cf903545dc9a017c246b18d997c50d;hb=6ee86a7254b0a8c1aa6e39795593a40966e4a3d9;hp=6f5014fb26738b21860eb6ef081b4a612b987996;hpb=d698b1bf570296ce54a543fdae4233d731f42f72;p=cl-gtk2.git

diff --git a/glib/gobject.structs.lisp b/glib/gobject.structs.lisp
index 6f5014f..1af1e69 100644
--- a/glib/gobject.structs.lisp
+++ b/glib/gobject.structs.lisp
@@ -1,285 +1,18 @@
 (in-package :gobject)
 
-(defctype g-type gsize)
+(defun g-type-from-object (object)
+  "Returns the GType of an @code{object}
 
-(defcstruct g-type-interface
-  (type g-type)
-  (instance-type g-type))
+@arg[object]{C pointer to an object}
+@return{GType designator (see @class{g-type-designator})}"
+  (g-type-from-instance object))
 
-(defcstruct g-type-class
-  (type g-type))
+(defun g-type-from-class (g-class)
+  (g-type-name (foreign-slot-value g-class 'g-type-class :type)))
 
-(defcstruct g-type-instance
-  (class (:pointer g-type-class)))
+(defun g-type-from-instance (type-instance)
+  (g-type-from-class (foreign-slot-value type-instance 'g-type-instance :class)))
 
-(defcstruct g-type-info
-  (class-size :uint16)
-  (base-init-fn :pointer)
-  (base-finalize-fn :pointer)
-  (class-init-fn :pointer)
-  (class-finalize-fn :pointer)
-  (class-data :pointer)
-  (instance-size :uint16)
-  (n-preallocs :uint16)
-  (instance-init-fn :pointer)
-  (value-table :pointer))
+(defun g-type-from-interface (type-interface)
+  (g-type-name (foreign-slot-value type-interface 'g-type-interface :type)))
 
-(defcstruct g-type-query
-  (type g-type)
-  (type-name (:string :free-from-foreign nil))
-  (class-size :uint)
-  (instance-size :uint))
-
-(defbitfield g-type-fundamental-flags
-  :classed
-  :instantiatable
-  :derivable
-  :deep-derivable)
-
-(defcstruct g-type-fundamental-info
-  (type-flags g-type-fundamental-flags))
-
-(defcstruct g-interface-info
-  (interface-init :pointer)
-  (interface-finalize :pointer)
-  (interface-data :pointer))
-
-(defcstruct g-type-value-table
-  (value-init :pointer)
-  (value-free :pointer)
-  (value-copy :pointer)
-  (value-peek-pointer :pointer)
-  (collect-format (:string :free-from-foreign nil :free-to-foreign nil))
-  (collect-value :pointer)
-  (lcopy-format (:string :free-from-foreign nil :free-to-foreign nil))
-  (lcopy-value :pointer))
-
-(defbitfield g-type-flags
-  (:abstract #. (ash 1 4))
-  :value-abstract)
-
-(eval-when (:load-toplevel :compile-toplevel)
-  (defun gtype-make-fundamental-type (x)
-    (ash x 2)))
-
-(defconstant +g-type-invalid+ (gtype-make-fundamental-type 0))
-(defconstant +g-type-void+ (gtype-make-fundamental-type 1))
-(defconstant +g-type-interface+ (gtype-make-fundamental-type 2))
-(defconstant +g-type-char+ (gtype-make-fundamental-type 3))
-(defconstant +g-type-uchar+ (gtype-make-fundamental-type 4))
-(defconstant +g-type-boolean+ (gtype-make-fundamental-type 5))
-(defconstant +g-type-int+ (gtype-make-fundamental-type 6))
-(defconstant +g-type-uint+ (gtype-make-fundamental-type 7))
-(defconstant +g-type-long+ (gtype-make-fundamental-type 8))
-(defconstant +g-type-ulong+ (gtype-make-fundamental-type 9))
-(defconstant +g-type-int64+ (gtype-make-fundamental-type 10))
-(defconstant +g-type-uint64+ (gtype-make-fundamental-type 11))
-(defconstant +g-type-enum+ (gtype-make-fundamental-type 12))
-(defconstant +g-type-flags+ (gtype-make-fundamental-type 13))
-(defconstant +g-type-float+ (gtype-make-fundamental-type 14))
-(defconstant +g-type-double+ (gtype-make-fundamental-type 15))
-(defconstant +g-type-string+ (gtype-make-fundamental-type 16))
-(defconstant +g-type-pointer+ (gtype-make-fundamental-type 17))
-(defconstant +g-type-boxed+ (gtype-make-fundamental-type 18))
-(defconstant +g-type-param+ (gtype-make-fundamental-type 19))
-(defconstant +g-type-object+ (gtype-make-fundamental-type 20))
-
-(defcstruct %g-object
-  (type-instance g-type-instance)
-  (ref-count :uint)
-  (data :pointer))
-
-(defcstruct g-object-class
-  (type-class g-type-class)
-  (construct-properties :pointer)
-  (constructor :pointer)
-  (set-property :pointer)
-  (get-property :pointer)
-  (dispose :pointer)
-  (finalize :pointer)
-  (dispatch-properties-changed :pointer)
-  (notify :pointer)
-  (constructed :pointer)
-  (pdummy :pointer :count 7))
-
-(defbitfield g-param-flags
-  :readable
-  :writable
-  :construct
-  :construct-only
-  :lax-validation
-  :static-name
-  :nick
-  :blurb)
-
-(defcstruct g-param-spec
-  (type-instance g-type-instance)
-  (name (:string :free-from-foreign nil :free-to-foreign nil))
-  (flags g-param-flags)
-  (value-type g-type)
-  (owner-type g-type))
-
-(defcunion g-value-data
-  (int :int)
-  (uint :uint)
-  (long :long)
-  (ulong :ulong)
-  (int64 :int64)
-  (uint64 :uint64)
-  (float :float)
-  (double :double)
-  (pointer :pointer))
-
-(defcstruct g-value
-  (type g-type)
-  (data g-value-data :count 2))
-
-(defcstruct g-object-construct-param
-  (param-spec (:pointer g-param-spec))
-  (value (:pointer g-value)))
-
-(defcstruct g-parameter
-  (name (:string :free-from-foreign nil :free-to-foreign nil))
-  (value g-value))
-
-(defcstruct g-enum-value
-  (value :int)
-  (name (:string :free-from-foreign nil :free-to-foreign nil))
-  (nick (:string :free-from-foreign nil :free-to-foreign nil)))
-
-(defcstruct g-enum-class
-  (type-class g-type-class)
-  (minimum :int)
-  (maximum :int)
-  (n-values :uint)
-  (values (:pointer g-enum-value)))
-
-(defcstruct g-flags-value
-  (value :uint)
-  (name (:string :free-from-foreign nil :free-to-foreign nil))
-  (nick (:string :free-from-foreign nil :free-to-foreign nil)))
-
-(defcstruct g-flags-class
-  (type-class g-type-class)
-  (mask :uint)
-  (n-values :uint)
-  (values (:pointer g-flags-value)))
-
-(defcstruct g-param-spec-boolean
-  (parent-instance g-param-spec)
-  (default-value :boolean))
-
-(defcstruct g-param-spec-char
-  (parent-instance g-param-spec)
-  (minimum :int8)
-  (maximum :int8)
-  (default-value :int8))
-
-(defcstruct g-param-spec-uchar
-  (parent-instance g-param-spec)
-  (minimum :uint8)
-  (maximum :uint8)
-  (default-value :uint8))
-
-(defcstruct g-param-spec-int
-  (parent-instance g-param-spec)
-  (minimum :int)
-  (maximum :int)
-  (default-value :int))
-
-(defcstruct g-param-spec-uint
-  (parent-instance g-param-spec)
-  (minimum :uint)
-  (maximum :uint)
-  (default-value :uint))
-
-(defcstruct g-param-spec-long
-  (parent-instance g-param-spec)
-  (minimum :long)
-  (maximum :long)
-  (default-value :ulong))
-
-(defcstruct g-param-spec-ulong
-  (parent-instance g-param-spec)
-  (minimum :ulong)
-  (maximum :ulong)
-  (default-value :ulong))
-
-(defcstruct g-param-spec-int64
-  (parent-instance g-param-spec)
-  (minimum :uint64)
-  (maximum :uint64)
-  (default-value :uint64))
-
-(defcstruct g-param-spec-uint64
-  (parent-instance g-param-spec)
-  (minimum :uint64)
-  (maximum :uint64)
-  (default-value :uint64))
-
-(defcstruct g-param-spec-float
-  (parent-instance g-param-spec)
-  (minimum :float)
-  (maximum :float)
-  (default-value :float)
-  (epsilon :float))
-
-(defcstruct g-param-spec-double
-  (parent-instance g-param-spec)
-  (minimum :double)
-  (maximum :double)
-  (default-value :double)
-  (epsilon :double))
-
-(defcstruct g-param-spec-enum
-  (parent-instance g-param-spec)
-  (enum-class (:pointer g-enum-class))
-  (default-value :int))
-
-(defcstruct g-param-spec-flags
-  (parent-instance g-param-spec)
-  (flags-class (:pointer g-flags-class))
-  (default-value :uint))
-
-(defcstruct g-param-spec-string
-  (parent-instance g-param-spec)
-  (default-value (:string :free-to-foreign nil :free-from-foreign nil))
-  (cset-first (:string :free-to-foreign nil :free-from-foreign nil))
-  (cset-nth (:string :free-to-foreign nil :free-from-foreign nil))
-  (substitutor :char)
-  (flags-for-null :uint))
-
-(defcstruct g-param-spec-param
-  (parent-instance g-param-spec))
-
-(defcstruct g-param-spec-boxed
-  (parent-instance g-param-spec))
-
-(defcstruct g-param-spec-pointer
-  (parent-instance g-param-spec))
-
-(defcstruct g-param-spec-object
-  (parent-instance g-param-spec))
-
-(defcstruct g-param-spec-value-array
-  (parent-instance g-param-spec)
-  (element-spec (:pointer g-param-spec))
-  (fixed-n-elements :uint))
-
-(defcstruct g-param-spec-g-type
-  (parent-instance g-param-spec)
-  (types-root g-type))
-
-(defcstruct g-param-spec-class
-  (type-class g-type-class)
-  (value-type g-type)
-  (finalize :pointer)
-  (value-set-default :pointer)
-  (value-validate :pointer)
-  (values-cmp :pointer))
-
-(defcstruct g-closure
-  (private-data :uint32)
-  (marshal :pointer)
-  (data :pointer)
-  (notifiers :pointer))
\ No newline at end of file