[gtkmm] Regenerate gdk .defs.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Regenerate gdk .defs.
- Date: Sat, 10 Sep 2016 11:09:24 +0000 (UTC)
commit ca8b97d94bb9f1848c5104ebc16cd46a801fbfb3
Author: Murray Cumming <murrayc murrayc com>
Date: Sat Sep 10 11:08:14 2016 +0200
Regenerate gdk .defs.
gdk/src/gdk_enums.defs | 37 ++++++++++++++++++-
gdk/src/gdk_methods.defs | 74 ++++++++++++++++++++++++++++++++++++++-
gdk/src/gdk_pixbuf_methods.defs | 47 +++++++++++++++++++-----
3 files changed, 145 insertions(+), 13 deletions(-)
---
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 234523b..983bdf8 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -184,7 +184,8 @@
;; GDK_SOURCE_KEYBOARD,
;; GDK_SOURCE_TOUCHSCREEN,
;; GDK_SOURCE_TOUCHPAD,
-;; GDK_SOURCE_TRACKPOINT
+;; GDK_SOURCE_TRACKPOINT,
+;; GDK_SOURCE_TABLET_PAD
;; } GdkInputSource;
(define-enum-extended InputSource
@@ -199,6 +200,7 @@
'("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "5")
'("touchpad" "GDK_SOURCE_TOUCHPAD" "6")
'("trackpoint" "GDK_SOURCE_TRACKPOINT" "7")
+ '("tablet-pad" "GDK_SOURCE_TABLET_PAD" "8")
)
)
@@ -237,6 +239,25 @@
)
)
+;; From gdkdevicepad.h
+
+;; Original typedef:
+;; typedef enum {
+;; GDK_DEVICE_PAD_FEATURE_BUTTON,
+;; GDK_DEVICE_PAD_FEATURE_RING,
+;; GDK_DEVICE_PAD_FEATURE_STRIP
+;; } GdkDevicePadFeature;
+
+(define-enum-extended DevicePadFeature
+ (in-module "Gdk")
+ (c-name "GdkDevicePadFeature")
+ (values
+ '("button" "GDK_DEVICE_PAD_FEATURE_BUTTON" "0")
+ '("ring" "GDK_DEVICE_PAD_FEATURE_RING" "1")
+ '("strip" "GDK_DEVICE_PAD_FEATURE_STRIP" "2")
+ )
+)
+
;; From gdkdevicetool.h
;; Original typedef:
@@ -406,6 +427,11 @@
;; GDK_TOUCH_CANCEL = 40,
;; GDK_TOUCHPAD_SWIPE = 41,
;; GDK_TOUCHPAD_PINCH = 42,
+;; GDK_PAD_BUTTON_PRESS = 43,
+;; GDK_PAD_BUTTON_RELEASE = 44,
+;; GDK_PAD_RING = 45,
+;; GDK_PAD_STRIP = 46,
+;; GDK_PAD_GROUP_MODE = 47,
;; GDK_EVENT_LAST /* helper variable for decls */
;; } GdkEventType;
@@ -458,7 +484,12 @@
'("touch-cancel" "GDK_TOUCH_CANCEL" "40")
'("touchpad-swipe" "GDK_TOUCHPAD_SWIPE" "41")
'("touchpad-pinch" "GDK_TOUCHPAD_PINCH" "42")
- '("event-last" "GDK_EVENT_LAST" "43")
+ '("pad-button-press" "GDK_PAD_BUTTON_PRESS" "43")
+ '("pad-button-release" "GDK_PAD_BUTTON_RELEASE" "44")
+ '("pad-ring" "GDK_PAD_RING" "45")
+ '("pad-strip" "GDK_PAD_STRIP" "46")
+ '("pad-group-mode" "GDK_PAD_GROUP_MODE" "47")
+ '("event-last" "GDK_EVENT_LAST" "48")
)
)
@@ -981,6 +1012,7 @@
;; GDK_TOUCH_MASK = 1 << 22,
;; GDK_SMOOTH_SCROLL_MASK = 1 << 23,
;; GDK_TOUCHPAD_GESTURE_MASK = 1 << 24,
+;; GDK_TABLET_PAD_MASK = 1 << 25,
;; GDK_ALL_EVENTS_MASK = 0xFFFFFE
;; } GdkEventMask;
@@ -1012,6 +1044,7 @@
'("touch-mask" "GDK_TOUCH_MASK" "1 << 22")
'("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK" "1 << 23")
'("touchpad-gesture-mask" "GDK_TOUCHPAD_GESTURE_MASK" "1 << 24")
+ '("tablet-pad-mask" "GDK_TABLET_PAD_MASK" "1 << 25")
'("all-events-mask" "GDK_ALL_EVENTS_MASK" "0xFFFFFE")
)
)
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index dd7a965..0d566c3 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -29,6 +29,7 @@
'("touchscreen" "GDK_SOURCE_TOUCHSCREEN")
'("touchpad" "GDK_SOURCE_TOUCHPAD")
'("trackpoint" "GDK_SOURCE_TRACKPOINT")
+ '("tablet-pad" "GDK_SOURCE_TABLET_PAD")
)
)
@@ -54,6 +55,17 @@
)
)
+(define-enum DevicePadFeature
+ (in-module "Gdk")
+ (c-name "GdkDevicePadFeature")
+ (gtype-id "GDK_TYPE_DEVICE_PAD_FEATURE")
+ (values
+ '("button" "GDK_DEVICE_PAD_FEATURE_BUTTON")
+ '("ring" "GDK_DEVICE_PAD_FEATURE_RING")
+ '("strip" "GDK_DEVICE_PAD_FEATURE_STRIP")
+ )
+)
+
(define-enum DeviceToolType
(in-module "Gdk")
(c-name "GdkDeviceToolType")
@@ -172,6 +184,11 @@
'("touch-cancel" "GDK_TOUCH_CANCEL")
'("touchpad-swipe" "GDK_TOUCHPAD_SWIPE")
'("touchpad-pinch" "GDK_TOUCHPAD_PINCH")
+ '("pad-button-press" "GDK_PAD_BUTTON_PRESS")
+ '("pad-button-release" "GDK_PAD_BUTTON_RELEASE")
+ '("pad-ring" "GDK_PAD_RING")
+ '("pad-strip" "GDK_PAD_STRIP")
+ '("pad-group-mode" "GDK_PAD_GROUP_MODE")
'("event-last" "GDK_EVENT_LAST")
)
)
@@ -480,6 +497,7 @@
'("touch-mask" "GDK_TOUCH_MASK")
'("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK")
'("touchpad-gesture-mask" "GDK_TOUCHPAD_GESTURE_MASK")
+ '("tablet-pad-mask" "GDK_TABLET_PAD_MASK")
'("all-events-mask" "GDK_ALL_EVENTS_MASK")
)
)
@@ -1334,6 +1352,49 @@
+;; From gdkdevicepad.h
+
+(define-function gdk_device_pad_get_type
+ (c-name "gdk_device_pad_get_type")
+ (return-type "GType")
+)
+
+(define-method get_n_groups
+ (of-object "GdkDevicePad")
+ (c-name "gdk_device_pad_get_n_groups")
+ (return-type "gint")
+)
+
+(define-method get_group_n_modes
+ (of-object "GdkDevicePad")
+ (c-name "gdk_device_pad_get_group_n_modes")
+ (return-type "gint")
+ (parameters
+ '("gint" "group_idx")
+ )
+)
+
+(define-method get_n_features
+ (of-object "GdkDevicePad")
+ (c-name "gdk_device_pad_get_n_features")
+ (return-type "gint")
+ (parameters
+ '("GdkDevicePadFeature" "feature")
+ )
+)
+
+(define-method get_feature_group
+ (of-object "GdkDevicePad")
+ (c-name "gdk_device_pad_get_feature_group")
+ (return-type "gint")
+ (parameters
+ '("GdkDevicePadFeature" "feature")
+ '("gint" "feature_idx")
+ )
+)
+
+
+
;; From gdkdevicetool.h
(define-function gdk_device_tool_get_type
@@ -1344,7 +1405,13 @@
(define-method get_serial
(of-object "GdkDeviceTool")
(c-name "gdk_device_tool_get_serial")
- (return-type "guint")
+ (return-type "guint64")
+)
+
+(define-method get_hardware_id
+ (of-object "GdkDeviceTool")
+ (c-name "gdk_device_tool_get_hardware_id")
+ (return-type "guint64")
)
(define-method get_tool_type
@@ -2038,6 +2105,11 @@
(return-type "GType")
)
+(define-function gdk_device_pad_feature_get_type
+ (c-name "gdk_device_pad_feature_get_type")
+ (return-type "GType")
+)
+
(define-function gdk_device_tool_type_get_type
(c-name "gdk_device_tool_type_get_type")
(return-type "GType")
diff --git a/gdk/src/gdk_pixbuf_methods.defs b/gdk/src/gdk_pixbuf_methods.defs
index 9866a15..cdfed8e 100644
--- a/gdk/src/gdk_pixbuf_methods.defs
+++ b/gdk/src/gdk_pixbuf_methods.defs
@@ -760,6 +760,16 @@
(return-type "GdkPixbuf*")
)
+(define-method set_option
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_set_option")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "key")
+ '("const-gchar*" "value")
+ )
+)
+
(define-method get_option
(of-object "GdkPixbuf")
(c-name "gdk_pixbuf_get_option")
@@ -769,12 +779,30 @@
)
)
+(define-method remove_option
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_remove_option")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "key")
+ )
+)
+
(define-method get_options
(of-object "GdkPixbuf")
(c-name "gdk_pixbuf_get_options")
(return-type "GHashTable*")
)
+(define-method copy_options
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_copy_options")
+ (return-type "gboolean")
+ (parameters
+ '("GdkPixbuf*" "dest_pixbuf")
+ )
+)
+
;; From gdk-pixbuf-enum-types.h
@@ -850,6 +878,15 @@
(return-type "gchar**")
)
+(define-method is_save_option_supported
+ (of-object "GdkPixbufFormat")
+ (c-name "gdk_pixbuf_format_is_save_option_supported")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "option_key")
+ )
+)
+
(define-method is_writable
(of-object "GdkPixbufFormat")
(c-name "gdk_pixbuf_format_is_writable")
@@ -927,16 +964,6 @@
(return-type "none")
)
-(define-method set_option
- (of-object "GdkPixbuf")
- (c-name "gdk_pixbuf_set_option")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "key")
- '("const-gchar*" "value")
- )
-)
-
;; From gdk-pixbuf-loader.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]