GNOME.org
 

[gtkmm: 8/10] Gdk, Gtk: Regenerate docs.xml and .defs files


commit a032bcc9932be7298f43cf7c284cf2fda7399cc6
Author: Andreas Persson <andreasp56 outlook com>
Date:   Thu Jul 30 20:59:32 2020 +0200

    Gdk, Gtk: Regenerate docs.xml and .defs files

 gdk/src/gdk_docs.xml     | 120 +++++++----------------------------------------
 gdk/src/gdk_enums.defs   |  17 -------
 gdk/src/gdk_methods.defs |  38 +--------------
 gdk/src/gdk_signals.defs |  19 --------
 gtk/src/gtk_docs.xml     |   5 +-
 5 files changed, 24 insertions(+), 175 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index a82e2101..33e05e13 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -348,15 +348,6 @@ The ::tool-changed signal is emitted on pen/eraser
 <return></return>
 </signal>
 
-<property name="GdkDevice:associated-device">
-<description>
-Associated pointer or keyboard with this device, if any. Devices of
-type #GDK_DEVICE_TYPE_LOGICAL always come in keyboard/pointer pairs.
-Other device types will have a %NULL associated device.
-
-</description>
-</property>
-
 <property name="GdkDevice:display">
 <description>
 The #GdkDisplay the #GdkDevice pertains to.
@@ -366,8 +357,7 @@ The #GdkDisplay the #GdkDevice pertains to.
 
 <property name="GdkDevice:has-cursor">
 <description>
-Whether the device is represented by a cursor on the screen. Devices of type
-%GDK_DEVICE_TYPE_LOGICAL will have %TRUE here.
+Whether the device is represented by a cursor on the screen.
 
 </description>
 </property>
@@ -416,13 +406,6 @@ Source type for the device.
 </description>
 </property>
 
-<property name="GdkDevice:type">
-<description>
-Device role in the device manager.
-
-</description>
-</property>
-
 <property name="GdkDevice:vendor-id">
 <description>
 Vendor ID of this device, see gdk_device_get_vendor_id().
@@ -493,29 +476,6 @@ airbrush, pencil, etc.
 </parameters>
 </enum>
 
-<enum name="GdkDeviceType">
-<description>
-Indicates the device type.
-
-</description>
-<parameters>
-<parameter name="GDK_DEVICE_TYPE_LOGICAL">
-<parameter_description> Device is a logical device. There will
-be an associated focus indicator on the screen.
-</parameter_description>
-</parameter>
-<parameter name="GDK_DEVICE_TYPE_PHYSICAL">
-<parameter_description> Device is a physical device.
-</parameter_description>
-</parameter>
-<parameter name="GDK_DEVICE_TYPE_FLOATING">
-<parameter_description> Device is a physical device, currently
-not attached to any seat.
-</parameter_description>
-</parameter>
-</parameters>
-</enum>
-
 <signal name="GdkDisplay::closed">
 <description>
 The ::closed signal is emitted when the connection to the windowing
@@ -4998,30 +4958,6 @@ this one cannot be supported
 </return>
 </function>
 
-<function name="gdk_device_get_associated_device">
-<description>
-Returns the #GdkDevice associated to @device:
-
-- if @device is of type %GDK_DEVICE_TYPE_LOGICAL, it will return
-the paired pointer or keyboard.
-- if @device is of type %GDK_DEVICE_TYPE_PHYSICAL, it will return
-the logical device to which @device is attached to.
-- if @device is of type %GDK_DEVICE_TYPE_FLOATING, %NULL will be
-returned, as there is no associated device.
-
-
-</description>
-<parameters>
-<parameter name="device">
-<parameter_description> a #GdkDevice
-</parameter_description>
-</parameter>
-</parameters>
-<return> The associated device, or
-%NULL
-</return>
-</function>
-
 <function name="gdk_device_get_axis">
 <description>
 Interprets an array of double as axis values for a given device,
@@ -5104,22 +5040,6 @@ Retrieves the #GdkDeviceTool associated to @device.
 </return>
 </function>
 
-<function name="gdk_device_get_device_type">
-<description>
-Returns the device type for @device.
-
-
-</description>
-<parameters>
-<parameter name="device">
-<parameter_description> a #GdkDevice
-</parameter_description>
-</parameter>
-</parameters>
-<return> the #GdkDeviceType for @device.
-</return>
-</function>
-
 <function name="gdk_device_get_direction">
 <description>
 Returns the direction of effective layout of the keyboard,
@@ -5332,10 +5252,6 @@ Obtains the surface underneath @device, returning the location of the device in
 double precision. Returns %NULL if the surface tree under @device is not known to GDK (for example,
 belongs to another application).
 
-As a physical device coordinates are those of its logical pointer, this
-function may not be called on devices of type %GDK_DEVICE_TYPE_PHYSICAL,
-unless there is an ongoing grab on them, see gdk_seat_grab().
-
 
 </description>
 <parameters>
@@ -14340,9 +14256,9 @@ Returns the capabilities this #GdkSeat currently has.
 </return>
 </function>
 
-<function name="gdk_seat_get_display">
+<function name="gdk_seat_get_devices">
 <description>
-Returns the #GdkDisplay this seat belongs to.
+Returns the devices that match the given capabilities.
 
 
 </description>
@@ -14351,15 +14267,20 @@ Returns the #GdkDisplay this seat belongs to.
 <parameter_description> a #GdkSeat
 </parameter_description>
 </parameter>
+<parameter name="capabilities">
+<parameter_description> capabilities to get devices for
+</parameter_description>
+</parameter>
 </parameters>
-<return> a #GdkDisplay. This object is owned by GTK
-and must not be freed.
+<return> A list of #GdkDevices.
+The list must be freed with g_list_free(), the elements are owned
+by GDK and must not be freed.
 </return>
 </function>
 
-<function name="gdk_seat_get_keyboard">
+<function name="gdk_seat_get_display">
 <description>
-Returns the logical device that routes keyboard events.
+Returns the #GdkDisplay this seat belongs to.
 
 
 </description>
@@ -14369,14 +14290,14 @@ Returns the logical device that routes keyboard events.
 </parameter_description>
 </parameter>
 </parameters>
-<return> a logical #GdkDevice with keyboard
-capabilities. This object is owned by GTK and must not be freed.
+<return> a #GdkDisplay. This object is owned by GTK
+and must not be freed.
 </return>
 </function>
 
-<function name="gdk_seat_get_physical_devices">
+<function name="gdk_seat_get_keyboard">
 <description>
-Returns the physical devices that match the given capabilities.
+Returns the logical device that routes keyboard events.
 
 
 </description>
@@ -14385,14 +14306,9 @@ Returns the physical devices that match the given capabilities.
 <parameter_description> a #GdkSeat
 </parameter_description>
 </parameter>
-<parameter name="capabilities">
-<parameter_description> capabilities to get devices for
-</parameter_description>
-</parameter>
 </parameters>
-<return> A list of #GdkDevices.
-The list must be freed with g_list_free(), the elements are owned
-by GDK and must not be freed.
+<return> a logical #GdkDevice with keyboard
+capabilities. This object is owned by GTK and must not be freed.
 </return>
 </function>
 
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index b6e7d54c..b78415c2 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -26,23 +26,6 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GDK_DEVICE_TYPE_LOGICAL,
-;;   GDK_DEVICE_TYPE_PHYSICAL,
-;;   GDK_DEVICE_TYPE_FLOATING
-;; } GdkDeviceType;
-
-(define-enum-extended DeviceType
-  (in-module "Gdk")
-  (c-name "GdkDeviceType")
-  (values
-    '("logical" "GDK_DEVICE_TYPE_LOGICAL" "0")
-    '("physical" "GDK_DEVICE_TYPE_PHYSICAL" "1")
-    '("floating" "GDK_DEVICE_TYPE_FLOATING" "2")
-  )
-)
-
 ;; From gdkdevicepad.h
 
 ;; Original typedef:
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 5d52c55a..8d4e98d2 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -24,17 +24,6 @@
   )
 )
 
-(define-enum DeviceType
-  (in-module "Gdk")
-  (c-name "GdkDeviceType")
-  (gtype-id "GDK_TYPE_DEVICE_TYPE")
-  (values
-    '("logical" "GDK_DEVICE_TYPE_LOGICAL")
-    '("physical" "GDK_DEVICE_TYPE_PHYSICAL")
-    '("floating" "GDK_DEVICE_TYPE_FLOATING")
-  )
-)
-
 (define-enum DevicePadFeature
   (in-module "Gdk")
   (c-name "GdkDevicePadFeature")
@@ -1440,24 +1429,6 @@
   (return-type "GdkDisplay*")
 )
 
-(define-method get_associated_device
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_associated_device")
-  (return-type "GdkDevice*")
-)
-
-(define-method list_physical_devices
-  (of-object "GdkDevice")
-  (c-name "gdk_device_list_physical_devices")
-  (return-type "GList*")
-)
-
-(define-method get_device_type
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_device_type")
-  (return-type "GdkDeviceType")
-)
-
 (define-method get_vendor_id
   (of-object "GdkDevice")
   (c-name "gdk_device_get_vendor_id")
@@ -3520,9 +3491,9 @@
   (return-type "GdkSeatCapabilities")
 )
 
-(define-method get_physical_devices
+(define-method get_devices
   (of-object "GdkSeat")
-  (c-name "gdk_seat_get_physical_devices")
+  (c-name "gdk_seat_get_devices")
   (return-type "GList*")
   (parameters
     '("GdkSeatCapabilities" "capabilities")
@@ -4201,11 +4172,6 @@
   (return-type "GType")
 )
 
-(define-function gdk_device_type_get_type
-  (c-name "gdk_device_type_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_device_pad_feature_get_type
   (c-name "gdk_device_pad_feature_get_type")
   (return-type "GType")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index cd55a2ad..94031c5d 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -166,25 +166,6 @@
   (default-value "")
 )
 
-(define-property associated-device
-  (of-object "GdkDevice")
-  (prop-type "GParamObject")
-  (docs "Associated pointer or keyboard with this device")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property type
-  (of-object "GdkDevice")
-  (prop-type "GParamEnum")
-  (docs "Device role in the device manager")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-  (default-value "GDK_DEVICE_TYPE_LOGICAL")
-)
-
 (define-property source
   (of-object "GdkDevice")
   (prop-type "GParamEnum")
diff --git a/gtk/src/gtk_docs.xml b/gtk/src/gtk_docs.xml
index 84eaddce..c6dc4810 100644
--- a/gtk/src/gtk_docs.xml
+++ b/gtk/src/gtk_docs.xml
@@ -16,7 +16,10 @@ Emitted when the attributes of the accessible for the
 </parameter>
 <parameter name="changed_properties">
 <parameter_description> flags for the changed properties
-@changed_relations,
+</parameter_description>
+</parameter>
+<parameter name="changed_relations">
+<parameter_description>
 </parameter_description>
 </parameter>
 <parameter name="states">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]