X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gdk%2Fgdk.objects.lisp;h=aa2c59c1b90c8c601fb6030b182d05ced4153025;hb=402600a5af7e5ed830a4313eeb9cfb9c8fc4b0d3;hp=7dbcb755e0ac70986f0fb8d2a788d437f940e54a;hpb=5d32c53a9b28cf514deef28e69583301bc378287;p=cl-gtk2.git

diff --git a/gdk/gdk.objects.lisp b/gdk/gdk.objects.lisp
index 7dbcb75..aa2c59c 100644
--- a/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@ -21,6 +21,91 @@
   (:out 1)
   (:part 2))
 
+(define-g-flags "GdkGCValuesMask"
+    gc-values-mask
+    (:export t :type-initializer "gdk_gc_values_mask_get_type")
+  (:foreground 1)
+  (:background 2)
+  (:font 4)
+  (:function 8)
+  (:fill 16)
+  (:tile 32)
+  (:stipple 64)
+  (:clip-mask 128)
+  (:subwindow 256)
+  (:ts-x-origin 512)
+  (:ts-y-origin 1024)
+  (:clip-x-origin 2048)
+  (:clip-y-origin 4096)
+  (:exposures 8192)
+  (:line-width 16384)
+  (:line-style 32768)
+  (:cap-style 65536)
+  (:join-style 131072))
+
+(define-g-enum "GdkFunction"
+    gdk-function
+    (:export t :type-initializer "gdk_function_get_type")
+  (:copy 0)
+  (:invert 1)
+  (:xor 2)
+  (:clear 3)
+  (:and 4)
+  (:and-reverse 5)
+  (:and-invert 6)
+  (:noop 7)
+  (:or 8)
+  (:equiv 9)
+  (:or-reverse 10)
+  (:copy-invert 11)
+  (:or-invert 12)
+  (:nand 13)
+  (:nor 14)
+  (:set 15))
+
+(define-g-enum "GdkFill"
+    gdk-fill
+    (:export t :type-initializer "gdk_fill_get_type")
+  (:solid 0)
+  (:tiled 1)
+  (:stippled 2)
+  (:opaque-stippled 3))
+
+(define-g-enum "GdkSubwindowMode"
+    subwindow-mode
+    (:export t :type-initializer "gdk_subwindow_mode_get_type")
+  (:clip-by-children 0)
+  (:include-inferiors 1))
+
+(define-g-enum "GdkLineStyle"
+    line-style
+    (:export t :type-initializer "gdk_line_style_get_type")
+  (:solid 0)
+  (:on-off-dash 1)
+  (:double-dash 2))
+
+(define-g-enum "GdkCapStyle"
+    cap-style
+    (:export t :type-initializer "gdk_cap_style_get_type")
+  (:not-last 0)
+  (:butt 1)
+  (:round 2)
+  (:projecting 3))
+
+(define-g-enum "GdkJoinStyle"
+    join-style
+    (:export t :type-initializer "gdk_join_style_get_type")
+  (:miter 0)
+  (:round 1)
+  (:bevel 2))
+
+(define-g-enum "GdkRgbDither"
+    rgb-dither
+    (:export t :type-initializer "gdk_rgb_dither_get_type")
+  (:none 0)
+  (:normal 1)
+  (:max 2))
+
 (define-g-object-class "GdkDisplay" display ()
   ((:cffi name display-name (glib:g-string :free-from-foreign nil)
           "gdk_display_get_name" nil)
@@ -119,21 +204,106 @@
 (export (boxed-related-symbols 'region))
 
 (define-g-boxed-cstruct point nil
-  (x :int)
-  (y :int))
+  (x :int :initform 0)
+  (y :int :initform 0))
 
 (export (boxed-related-symbols 'point))
 
 (define-g-boxed-cstruct span nil
-  (x :int)
-  (y :int)
-  (width :int))
+  (x :int :initform 0)
+  (y :int :initform 0)
+  (width :int :initform 0))
 
 (export (boxed-related-symbols 'span))
 
-(define-g-object-class "GdkGC" graphics-context () ())
+(define-g-boxed-cstruct segment nil
+  (x1 :int :initform 0)
+  (y1 :int :initform 0)
+  (x2 :int :initform 0)
+  (y2 :int :initform 0))
+
+(export (boxed-related-symbols 'segment))
+
+(define-g-boxed-cstruct trapezoid nil
+  (y1 :double :initform 0d0)
+  (x11 :double :initform 0d0)
+  (x21 :double :initform 0d0)
+  (y2 :double :initform 0d0)
+  (x12 :double :initform 0d0)
+  (x22 :double :initform 0d0))
+
+(export (boxed-related-symbols 'trapezoid))
+
+(define-g-boxed-cstruct rectangle "GdkRectangle"
+  (x :int :initform 0)
+  (y :int :initform 0)
+  (width :int :initform 0)
+  (height :int :initform 0))
+
+(export (boxed-related-symbols 'rectangle))
+
+(define-g-boxed-opaque font "GdkFont"
+  :alloc (error "GDK:FONT objects may not be allocated directly"))
+
+(export (boxed-related-symbols 'font))
 
-(define-g-object-class "GdkDrawable" drawable () ())
+(define-g-boxed-cstruct color "GdkColor"
+  (pixel :uint32 :initform 0)
+  (red :uint16 :initform 0)
+  (green :uint16 :initform 0)
+  (blue :uint16 :initform 0))
+
+(export (boxed-related-symbols 'color))
+
+(define-g-object-class "GdkGC" graphics-context ()
+  ((:cffi screen graphics-context-screen (g-object screen)
+          "gdk_gc_get_screen" nil)
+   (:cffi foreground graphics-context-foreground (g-boxed-foreign color)
+          nil "gdk_gc_set_foreground")
+   (:cffi background graphics-context-background (g-boxed-foreign color)
+          nil "gdk_gc_set_background")
+   (:cffi rgb-fg-color graphics-context-rgb-fg-color (g-boxed-foreign color)
+          nil "gdk_gc_set_rgb_fg_color")
+   (:cffi rgb-bg-color graphics-context-rgb-bg-color (g-boxed-foreign color)
+          nil "gdk_gc_set_rgb_bg_color")
+   (:cffi font graphics-context-font (g-boxed-foreign font)
+          nil "gdk_gc_set_font")
+   (:cffi function graphics-context-function gdk-function
+          nil "gdk_gc_set_function")
+   (:cffi fill graphics-context-fill gdk-fill
+          nil "gdk_gc_set_fill")
+   (:cffi tile graphics-context-tile (g-object pixmap)
+          nil "gdk_gc_set_tile")
+   (:cffi stipple graphics-context-stipple (g-object pixmap)
+          nil "gdk_gc_set_stipple")
+   (:cffi clip-mask graphics-context-clip-mask (g-object pixmap)
+          nil "gdk_gc_set_clip_mask")
+   (:cffi clip-rectangle graphics-context-clip-rectangle (g-boxed-foreign rectangle)
+          nil "gdk_gc_set_clip_rectangle")
+   (:cffi clip-region graphics-context-clip-region (g-boxed-foreign region)
+          nil "gdk_gc_set_clip_region")
+   (:cffi subwindow graphics-context-subwindow subwindow-mode
+          nil "gdk_gc_set_subwindow")
+   (:cffi exposures graphics-context-exposures :boolean
+          nil "gdk_gc_set_exposures")
+   (:cffi colormap graphics-context-colormap (g-object colormap)
+          "gdk_gc_get_colormap" "gdk_gc_set_colormap")))
+
+(define-g-object-class "GdkDrawable" drawable ()
+  ((:cffi display drawable-display (g-object display)
+          "gdk_drawable_get_display" nil)
+   (:cffi screen drawable-screen (g-object screen)
+          "gdk_drawable_get_screen" nil)
+   (:cffi visual drawable-visual (g-object visual)
+          "gdk_drawable_get_visual" nil)
+   (:cffi colormap drawable-colormap (g-object colormap)
+          "gdk_drawable_get_colormap" "gdk_drawable_set_colormap")
+   (:cffi depth drawable-depth :int
+          "gdk_drawable_get_depth" nil)
+   (:cffi clip-region drawable-clip-region (g-boxed-foreign region :return)
+          "gdk_drawable_get_clip_region" nil)
+   (:cffi visible-region drawable-visible-region (g-boxed-foreign region :return)
+          "gdk_drawable_get_visible_region" nil)))
 
 (define-g-object-class "GdkPixmap" pixmap (:superclass drawable) ())
 
@@ -244,29 +414,6 @@
   :south-east
   :static)
 
-(define-g-boxed-cstruct rectangle "GdkRectangle"
-  (x :int :initform 0)
-  (y :int :initform 0)
-  (width :int :initform 0)
-  (height :int :initform 0))
-
-(export (boxed-related-symbols 'rectangle))
-
-(define-g-boxed-cstruct font "GdkFont"
-  (type font-type :initform :font)
-  (ascent :int :initform 0)
-  (descent :int :initform 0))
-
-(export (boxed-related-symbols 'font))
-
-(define-g-boxed-cstruct color "GdkColor"
-  (pixel :uint32 :initform 0)
-  (red :uint16 :initform 0)
-  (green :uint16 :initform 0)
-  (blue :uint16 :initform 0))
-
-(export (boxed-related-symbols 'color))
-
 (define-g-boxed-cstruct geometry "GdkGeometry"
   (min-width :int :initform 0)
   (min-height :int :initform 0)
@@ -514,4 +661,19 @@
   (:superclass g-object :export t :interfaces
                nil :type-initializer
                "gdk_image_get_type")
-  nil)
+  ((:cffi colormap gdk-image-colormap (g-object gdk-colormap)
+          "gdk_image_get_colormap" "gdk_image_set_colormap")))
+
+(define-g-enum "GdkImageType"
+    gdk-image-type
+    (:export t :type-initializer "gdk_image_type_get_type")
+  (:normal 0)
+  (:shared 1)
+  (:fastest 2))
+
+(define-g-enum "GdkPixbufAlphaMode"
+    pixbuf-alpha-mode
+    (:export t :type-initializer "gdk_pixbuf_alpha_mode_get_type")
+  (:bilevel 0)
+  (:full 1))
+