X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gdk%2Fgdk.objects.lisp;h=c95d800983a5f55423237e6a9c4724ce1e62553b;hb=e6ec5def79916d6ecf3b1ea9aaecbbc295fdad95;hp=0886286a7bb2a8f0dae2bea8b70949388d74fbc3;hpb=b7495006a41b43e590f7f7e7b4eb130c3cce4c6a;p=cl-gtk2.git diff --git a/gdk/gdk.objects.lisp b/gdk/gdk.objects.lisp index 0886286..c95d800 100644 --- a/gdk/gdk.objects.lisp +++ b/gdk/gdk.objects.lisp @@ -2,14 +2,90 @@ (define-g-enum "GdkGrabStatus" grab-status () :success :already-grabbed :invalid-time :not-viewable :frozen) -(define-g-object-class "GdkDisplay" display () ()) +(defcenum crossing-mode :normal :grab :ungrab :gtk-grab :gtk-ungrab :state-changed) +(export 'crossing-mode) + +(defcenum notify-type (:ancestor 0) :virtual :inferior :nonlinear :nonlinear-virtual :unknown) +(export 'notify-type) + +(define-g-object-class "GdkDisplay" display () + ((:cffi name display-name (glib:g-string :free-from-foreign nil) + "gdk_display_get_name" nil) + (:cffi n-screens display-n-screens :int + "gdk_display_get_n_screens" nil) + (:cffi default-screen display-default-screen (g-object screen) + "gdk_display_get_default_screen" nil))) + +;gdk_display_get_screen (define-g-object-class "GdkDisplayManager" display-manager () ((default-display display-manager-default-display "default-display" "GdkDisplay" t t))) +(define-g-object-class "GdkVisual" visual () ()) + +(define-g-object-class "GdkColormap" gdk-colormap + (:superclass g-object :export t :interfaces + nil :type-initializer + "gdk_colormap_get_type") + nil) + (define-g-object-class "GdkScreen" screen () ((font-options screen-font-options "font-options" "gpointer" t t) - (resolution screen-resolution "resolution" "gdouble" t t))) + (resolution screen-resolution "resolution" "gdouble" t t) + (:cffi default-colormap screen-default-colormap (g-object colormap) + "gdk_screen_get_default_colormap" "gdk_screen_set_default_colormap") + (:cffi system-colormap screen-system-colormap (g-object colormap) + "gdk_screen_get_system_colormap" nil) + (:cffi system-visual screen-system-visual (g-object visual) + "gdk_screen_get_system_visual" nil) + (:cffi rgb-colormap screen-rgb-colormap (g-object colormap) + "gdk_screen_get_rgb_colormap" nil) + (:cffi rgb-visual screen-visual (g-object visual) + "gdk_screen_get_rgb_visual" nil) + (:cffi rgba-colormap screen-rgba-colormap (g-object colormap) + "gdk_screen_get_rgba_colormap" nil) + (:cffi rgba-visual screen-rgba-visual (g-object visual) + "gdk_screen_get_rgba_visual" nil) + (:cffi composited-p screen-composited-p :boolean + "gdk_screen_is_composited" nil) + (:cffi root-window screen-root-window (g-object gdk-window) + "gdk_screen_get_root_window" nil) + (:cffi display screen-display (g-object display) + "gdk_screen_get_display" nil) + (:cffi number screen-number :int + "gdk_screen_get_number" nil) + (:cffi width screen-widget :int + "gdk_screen_get_width" nil) + (:cffi height screen-height :int + "gdk_screen_get_height" nil) + (:cffi width-mm screen-width-mm :int + "gdk_screen_get_width_mm" nil) + (:cffi height-mm screen-height-mm :int + "gdk_screen_get_height_mm" nil) + (:cffi visuals screen-visuals (glib:glist (g-object visual) :free-from-foreign t) + "gdk_screen_list_visuals" nil) + (:cffi toplevel-windows screen-toplevel-windows (glib:glist (g-object gdk-window) :free-from-foreign t) + "gdk_screen_get_toplevel_windows" nil) + (:cffi display-name screen-display-name (glib:g-string :free-from-foreign t) + "gdk_screen_make_display_name" nil) + (:cffi n-monitors screen-n-monitors :int + "gdk_screen_get_n_monitors" nil) + (:cffi active-window screen-active-window (g-object gdk-window) + "gdk_screen_get_active_window" nil) + (:cffi window-stack screen-window-stack (glib:glist (g-object gdk-window) :free-from-foreign t) + "gdk_screen_get_window_stack" nil))) + +;gdk_screen_get_monitor_geometry +;gdk_screen_get_monitor_at_point +;gdk_screen_get_monitor_at_window +;gdk_screen_get_monitor_height_mm +;gdk_screen_get_monitor_width_mm +;gdk_screen_get_monitor_plug_name +;gdk_screen_broadcast_client_message +;gdk_screen_get_setting +;gdk_spawn_on_screen +;gdk_spawn_on_screen_with_pipes +;gdk_spawn_command_line_on_screen (define-g-object-class "GdkGC" graphics-context () ()) @@ -162,6 +238,46 @@ (export (boxed-related-symbols 'geometry)) +(glib:at-init () (foreign-funcall-pointer (foreign-symbol-pointer "gdk_cursor_get_type") () :int)) + +(gobject:define-g-enum "GdkCursorType" cursor-type (:export t :type-initializer "gdk_cursor_type_get_type") + (:x-cursor 0) (:arrow 2) (:based-arrow-down 4) + (:based-arrow-up 6) (:boat 8) (:bogosity 10) + (:bottom-left-corner 12) (:bottom-right-corner 14) + (:bottom-side 16) (:bottom-tee 18) (:box-spiral 20) + (:center-ptr 22) (:circle 24) (:clock 26) + (:coffee-mug 28) (:cross 30) (:cross-reverse 32) + (:crosshair 34) (:diamond-cross 36) (:dot 38) + (:dotbox 40) (:double-arrow 42) (:draft-large 44) + (:draft-small 46) (:draped-box 48) (:exchange 50) + (:fleur 52) (:gobbler 54) (:gumby 56) (:hand1 58) + (:hand2 60) (:heart 62) (:icon 64) (:iron-cross 66) + (:left-ptr 68) (:left-side 70) (:left-tee 72) + (:leftbutton 74) (:ll-angle 76) (:lr-angle 78) + (:man 80) (:middlebutton 82) (:mouse 84) + (:pencil 86) (:pirate 88) (:plus 90) + (:question-arrow 92) (:right-ptr 94) + (:right-side 96) (:right-tee 98) (:rightbutton 100) + (:rtl-logo 102) (:sailboat 104) + (:sb-down-arrow 106) (:sb-h-double-arrow 108) + (:sb-left-arrow 110) (:sb-right-arrow 112) + (:sb-up-arrow 114) (:sb-v-double-arrow 116) + (:shuttle 118) (:sizing 120) (:spider 122) + (:spraycan 124) (:star 126) (:target 128) + (:tcross 130) (:top-left-arrow 132) + (:top-left-corner 134) (:top-right-corner 136) + (:top-side 138) (:top-tee 140) (:trek 142) + (:ul-angle 144) (:umbrella 146) (:ur-angle 148) + (:watch 150) (:xterm 152) (:last-cursor 153) + (:blank-cursor -2) (:cursor-is-pixmap -1)) + +(export 'cursor-type) + +(define-g-boxed-cstruct cursor "GdkCursor" + (type cursor-type)) + +(export (boxed-related-symbols 'cursor)) + (defctype gdk-atom :pointer) (define-foreign-type gdk-atom-as-string-type () @@ -178,6 +294,25 @@ ;;;FIXME: Check correct type (defctype native-window :uint32) +(define-foreign-type fixed-array () + ((element-type :reader fixed-array-element-type :initarg :element-type :initform (error "Element type must be specified")) + (array-size :reader fixed-array-array-size :initarg :array-size :initform (error "Array size must be specified"))) + (:actual-type :pointer) + (:documentation + "CFFI foreign type for an array of a fixed length. Slot @code{element-type}@see-slot{fixed-array-element-type} specifies the type of elements and slot @code{array-size}@see-slot{fixed-array-array-size} specifies the size of array (in elements).")) + +(define-parse-method fixed-array (element-type array-size) + (make-instance 'fixed-array :element-type element-type :array-size array-size)) + +(defmethod translate-from-foreign (ptr (type fixed-array)) + (when (not (null-pointer-p ptr)) + (let ((result (make-array (fixed-array-array-size type))) + (el-type (fixed-array-element-type type))) + (loop + for i from 0 below (fixed-array-array-size type) + do (setf (aref result i) (mem-aref ptr el-type i))) + result))) + (define-g-boxed-variant-cstruct event "GdkEvent" (type event-type) (window (g-object gdk-window)) @@ -193,14 +328,14 @@ (hardware-keycode :uint16) (group :uint8) (is-modifier :uint)) - ((:button-prees + ((:button-press :2button-press :3button-press :button-release) event-button (time :uint32) (x :double) (y :double) - (axes :double :count 2) + (axes (fixed-array :double 2)) (state :uint) (button :uint) (device (g-object device)) @@ -219,9 +354,9 @@ (time :uint32) (x :double) (y :double) - (axes :double :count 2) + (axes (fixed-array :double 2)) (state modifier-type) - (is-hint :int) + (is-hint :int16) (device (g-object device)) (x-root :double) (y-root :double)) @@ -237,7 +372,11 @@ (x :double) (y :double) (x-root :double) - (y-root :double)) + (y-root :double) + (mode crossing-mode) + (detail notify-type) + (focus :boolean) + (state :uint)) ((:focus-change) event-focus (in :int16)) ((:configure) event-configure @@ -262,7 +401,7 @@ :drag-motion :drag-status :drop-start - :drop-finished) event-drag + :drop-finished) event-dnd (drag-context :pointer) (time :uint32) (x-root :short)