[gtkmm] Gdk: Regenerate docs.xml and .defs files



commit 3fd91f9cc2732330fedd8c78b772d9ea2678975c
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri May 27 16:05:44 2016 +0200

    Gdk: Regenerate docs.xml and .defs files
    
    * tools/extra_defs_gen/generate_defs_gdk.cc: Add GDK_TYPE_MONITOR.
    * gdk/src/gdk_extra_objects.defs: Add GdkMonitor
    * gdk/src/gdk_docs.xml:
    * gdk/src/gdk_enums.defs:
    * gdk/src/gdk_methods.defs:
    * gdk/src/gdk_pixbuf_methods.defs:
    * gdk/src/gdk_signals.defs: Regenerate.

 gdk/src/gdk_docs.xml                      |  910 ++++++++++++++++++++++++++++-
 gdk/src/gdk_enums.defs                    |  150 ++++-
 gdk/src/gdk_extra_objects.defs            |    7 +
 gdk/src/gdk_methods.defs                  |  327 ++++++++++-
 gdk/src/gdk_pixbuf_methods.defs           |   29 +
 gdk/src/gdk_signals.defs                  |  161 +++++
 tools/extra_defs_gen/generate_defs_gdk.cc |    1 +
 7 files changed, 1533 insertions(+), 52 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 62e3ace..7cd77f7 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -1,10 +1,61 @@
 <root>
+<enum name="GdkAxisFlags">
+<description>
+Flags describing the current capabilities of a device/tool.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="GDK_AXIS_FLAG_X">
+<parameter_description> X axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_Y">
+<parameter_description> Y axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_PRESSURE">
+<parameter_description> Pressure axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_XTILT">
+<parameter_description> X tilt axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_YTILT">
+<parameter_description> Y tilt axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_WHEEL">
+<parameter_description> Wheel axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_DISTANCE">
+<parameter_description> Distance axis is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_ROTATION">
+<parameter_description> Z-axis rotation is present
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_FLAG_SLIDER">
+<parameter_description> Slider axis is present
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
 <enum name="GdkAxisUse">
 <description>
 An enumeration describing the way in which a device
 axis (valuator) maps onto the predefined valuator
 types that GTK+ understands.
 
+Note that the X and Y axes are not really needed; pointer devices
+report their location via the x/y members of events regardless. Whether
+X and Y are present as axes depends on the GDK backend.
+
 </description>
 <parameters>
 <parameter name="GDK_AXIS_IGNORE">
@@ -35,6 +86,18 @@ types that GTK+ understands.
 <parameter_description> the axis is used for wheel information.
 </parameter_description>
 </parameter>
+<parameter name="GDK_AXIS_DISTANCE">
+<parameter_description> the axis is used for pen/tablet distance information. (Since: 3.22)
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_ROTATION">
+<parameter_description> the axis is used for pen rotation information. (Since: 3.22)
+</parameter_description>
+</parameter>
+<parameter name="GDK_AXIS_SLIDER">
+<parameter_description> the axis is used for pen slider information. (Since: 3.22)
+</parameter_description>
+</parameter>
 <parameter name="GDK_AXIS_LAST">
 <parameter_description> a constant equal to the numerically highest axis value.
 </parameter_description>
@@ -483,6 +546,27 @@ axes and keys.
 <return></return>
 </signal>
 
+<signal name="GdkDevice::tool-changed">
+<description>
+The ::tool-changed signal is emitted on pen/eraser
+#GdkDevice&lt;!-- --&gt;s whenever tools enter or leave proximity.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="device">
+<parameter_description> the #GdkDevice that changed.
+</parameter_description>
+</parameter>
+<parameter name="tool">
+<parameter_description> The new current tool
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
 <property name="GdkDevice:associated-device">
 <description>
 Associated pointer or keyboard with this device, if any. Devices of type #GDK_DEVICE_TYPE_MASTER
@@ -493,6 +577,15 @@ Since: 3.0
 </description>
 </property>
 
+<property name="GdkDevice:axes">
+<description>
+The axes currently available for this device.
+
+Since: 3.22
+
+</description>
+</property>
+
 <property name="GdkDevice:device-manager">
 <description>
 The #GdkDeviceManager the #GdkDevice pertains to.
@@ -662,6 +755,50 @@ is unplugged.
 <return></return>
 </signal>
 
+<enum name="GdkDeviceToolType">
+<description>
+Indicates the specific type of tool being used being a tablet. Such as an
+airbrush, pencil, etc.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="GDK_DEVICE_TOOL_TYPE_UNKNOWN">
+<parameter_description> Tool is of an unknown type.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_PEN">
+<parameter_description> Tool is a standard tablet stylus.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_ERASER">
+<parameter_description> Tool is standard tablet eraser.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_BRUSH">
+<parameter_description> Tool is a brush stylus.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_PENCIL">
+<parameter_description> Tool is a pencil stylus.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_AIRBRUSH">
+<parameter_description> Tool is an airbrush stylus.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_MOUSE">
+<parameter_description> Tool is a mouse.
+</parameter_description>
+</parameter>
+<parameter name="GDK_DEVICE_TOOL_TYPE_LENS">
+<parameter_description> Tool is a lens cursor.
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
 <enum name="GdkDeviceType">
 <description>
 Indicates the device type. See [above][GdkDeviceManager.description]
@@ -707,6 +844,48 @@ Since: 2.2
 <return></return>
 </signal>
 
+<signal name="GdkDisplay::monitor-added">
+<description>
+The ::monitor-added signal is emitted whenever a monitor is
+added.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> the objedct on which the signal is emitted
+</parameter_description>
+</parameter>
+<parameter name="monitor">
+<parameter_description> the monitor that was just added
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
+<signal name="GdkDisplay::monitor-removed">
+<description>
+The ::monitor-removed signal is emitted whenever a monitor is
+removed.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> the object on which the signal is emitted
+</parameter_description>
+</parameter>
+<parameter name="monitor">
+<parameter_description> the monitor that was just removed
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
 <signal name="GdkDisplay::opened">
 <description>
 The ::opened signal is emitted when the connection to the windowing
@@ -884,6 +1063,10 @@ Since: 3.20
 <parameter_description> The object on which the signal is emitted
 </parameter_description>
 </parameter>
+<parameter name="reason">
+<parameter_description> The reason the context was cancelled
+</parameter_description>
+</parameter>
 </parameters>
 <return></return>
 </signal>
@@ -2676,6 +2859,52 @@ Since: 3.20
 <return></return>
 </signal>
 
+<signal name="GdkSeat::tool-added">
+<description>
+The ::tool-added signal is emitted whenever a new tool
+is made known to the seat. The tool may later be assigned
+to a device (i.e. on proximity with a tablet). The device
+will emit the #GdkDevice::tool-changed signal accordingly.
+
+A same tool may be used by several devices.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="seat">
+<parameter_description> the object on which the signal is emitted
+</parameter_description>
+</parameter>
+<parameter name="tool">
+<parameter_description> the new #GdkDeviceTool known to the seat
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
+<signal name="GdkSeat::tool-removed">
+<description>
+This signal is emitted whenever a tool is no longer known
+to this @seat.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="seat">
+<parameter_description> the object on which the signal is emitted
+</parameter_description>
+</parameter>
+<parameter name="tool">
+<parameter_description> the just removed #GdkDeviceTool
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</signal>
+
 <property name="GdkSeat:display">
 <description>
 #GdkDisplay of this seat.
@@ -2746,6 +2975,42 @@ Specifies the kind of modification applied to a setting in a
 </parameters>
 </enum>
 
+<enum name="GdkSubpixelLayout">
+<description>
+This enumeration describes how the red, green and blue components
+of physical pixels on an output device are laid out.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="GDK_SUBPIXEL_LAYOUT_UNKNOWN">
+<parameter_description> The layout is not known
+</parameter_description>
+</parameter>
+<parameter name="GDK_SUBPIXEL_LAYOUT_NONE">
+<parameter_description> Not organized in this way
+</parameter_description>
+</parameter>
+<parameter name="GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB">
+<parameter_description> The layout is horizontal, the order is RGB
+</parameter_description>
+</parameter>
+<parameter name="GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR">
+<parameter_description> The layout is horizontal, the order is BGR
+</parameter_description>
+</parameter>
+<parameter name="GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB">
+<parameter_description> The layout is vertical, the order is RGB
+</parameter_description>
+</parameter>
+<parameter name="GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR">
+<parameter_description> The layout is vertical, the order is BGR
+</parameter_description>
+</parameter>
+</parameters>
+</enum>
+
 <enum name="GdkTouchpadGesturePhase">
 <description>
 Specifies the current state of a touchpad gesture. All gestures are
@@ -4252,7 +4517,7 @@ platforms can be found in the CSS specification:
 - ![](default_cursor.png) &quot;default&quot;
 - ![](help_cursor.png) &quot;help&quot;
 - ![](pointer_cursor.png) &quot;pointer&quot;
-- ![](pointer_cursor.png) &quot;context-menu&quot;
+- ![](context_menu_cursor.png) &quot;context-menu&quot;
 - ![](progress_cursor.png) &quot;progress&quot;
 - ![](wait_cursor.png) &quot;wait&quot;
 - ![](cell_cursor.png) &quot;cell&quot;
@@ -4261,8 +4526,8 @@ platforms can be found in the CSS specification:
 - ![](vertical_text_cursor.png) &quot;vertical-text&quot;
 - ![](alias_cursor.png) &quot;alias&quot;
 - ![](copy_cursor.png) &quot;copy&quot;
-- ![](move_cursor.png) &quot;move&quot;
 - ![](no_drop_cursor.png) &quot;no-drop&quot;
+- ![](move_cursor.png) &quot;move&quot;
 - ![](not_allowed_cursor.png) &quot;not-allowed&quot;
 - ![](grab_cursor.png) &quot;grab&quot;
 - ![](grabbing_cursor.png) &quot;grabbing&quot;
@@ -4473,6 +4738,22 @@ Since: 3.0
 </return>
 </function>
 
+<function name="gdk_device_get_axes">
+<description>
+Returns the axes currently available on the device.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="device">
+<parameter_description> a #GdkDevice
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gdk_device_get_axis">
 <description>
 Interprets an array of double as axis values for a given device,
@@ -5353,6 +5634,44 @@ by the input mode.
 </return>
 </function>
 
+<function name="gdk_device_tool_get_serial">
+<description>
+Gets the serial of this tool, this value can be used to identify a
+physical tool (eg. a tablet pen) across program executions.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="tool">
+<parameter_description> a #GdkDeviceTool
+</parameter_description>
+</parameter>
+</parameters>
+<return> The serial ID for this tool
+
+</return>
+</function>
+
+<function name="gdk_device_tool_get_tool_type">
+<description>
+Gets the #GdkDeviceToolType of the tool.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="tool">
+<parameter_description> a #GdkDeviceTool
+</parameter_description>
+</parameter>
+</parameters>
+<return> The physical type for this tool. This can be used to figure out what
+sort of pen is being used, such as an airbrush or a pencil.
+
+</return>
+</function>
+
 <function name="gdk_device_ungrab">
 <description>
 Release any grab on @device.
@@ -5688,6 +6007,97 @@ Since: 2.4
 <return></return>
 </function>
 
+<function name="gdk_display_get_monitor">
+<description>
+Gets a monitor associated with this display.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="monitor_num">
+<parameter_description> number of the monitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the #GdkMonitor, or %NULL if
+ monitor_num is not a valid monitor number
+</return>
+</function>
+
+<function name="gdk_display_get_monitor_at_point">
+<description>
+Gets the monitor in which the point (@x, @y) is located,
+or a nearby monitor if the point is not in any monitor.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> the x coordinate of the point
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> the y coordinate of the point
+</parameter_description>
+</parameter>
+</parameters>
+<return> the monitor containing the point
+</return>
+</function>
+
+<function name="gdk_display_get_monitor_at_window">
+<description>
+Gets the monitor in which the largest area of @window
+resides, or a monitor close to @window if it is outside
+of all monitors.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return> the monitor with the largest overlap with @window
+</return>
+</function>
+
+<function name="gdk_display_get_n_monitors">
+<description>
+Gets the number of monitors that belong to @display.
+
+The returned number is valid until the next emission of the
+#GdkDisplay::monitor-added or #GdkDisplay::monitor-removed signal.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+</parameters>
+<return> the number of monitors
+</return>
+</function>
+
 <function name="gdk_display_get_n_screens">
 <description>
 Gets the number of screen managed by the @display.
@@ -5763,6 +6173,29 @@ cursor is on, or %NULL.
 <return></return>
 </function>
 
+<function name="gdk_display_get_primary_monitor">
+<description>
+Gets the primary monitor for the display.
+
+The primary monitor is considered the monitor where the “main desktop”
+lives. While normal application windows typically allow the window
+manager to place the windows, specialized desktop applications
+such as panels should place themselves on the primary monitor.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+</parameters>
+<return> the primary monitor, or %NULL if no primary
+monitor is configured by the user
+</return>
+</function>
+
 <function name="gdk_display_get_screen">
 <description>
 Returns a screen object for one of the screens of the display.
@@ -7356,6 +7789,31 @@ Since: 3.0
 </return>
 </function>
 
+<function name="gdk_event_get_device_tool">
+<description>
+If the event was generated by a device that supports
+different tools (eg. a tablet), this function will
+return a #GdkDeviceTool representing the tool that
+caused the event. Otherwise, %NULL will be returned.
+
+Note: the #GdkDeviceTool&lt;!-- --&gt;s will be constant during
+the application lifetime, if settings must be stored
+persistently across runs, see gdk_device_tool_get_serial()
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a #GdkEvent
+</parameter_description>
+</parameter>
+</parameters>
+<return> The current device tool, or %NULL
+
+</return>
+</function>
+
 <function name="gdk_event_get_event_sequence">
 <description>
 If @event if of type %GDK_TOUCH_BEGIN, %GDK_TOUCH_UPDATE,
@@ -7398,6 +7856,8 @@ Since: 3.10
 <description>
 Extracts the hardware keycode from an event.
 
+Also see gdk_event_get_scancode().
+
 Since: 3.2
 
 </description>
@@ -7438,6 +7898,20 @@ Since: 3.2
 </return>
 </function>
 
+<function name="gdk_event_get_pointer_emulated">
+<description>
+#event: a #GdkEvent
+
+Since: 3.22
+
+</description>
+<parameters>
+</parameters>
+<return> %TRUE if this event is emulated
+
+</return>
+</function>
+
 <function name="gdk_event_get_root_coords">
 <description>
 Extract the root window relative x/y coordinates from an event.
@@ -7462,6 +7936,28 @@ Extract the root window relative x/y coordinates from an event.
 </return>
 </function>
 
+<function name="gdk_event_get_scancode">
+<description>
+Gets the keyboard low-level scancode of a key event.
+
+This is usually hardware_keycode. On Windows this is the high
+word of WM_KEY{DOWN,UP} lParam which contains the scancode and
+some extended flags.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a #GdkEvent
+</parameter_description>
+</parameter>
+</parameters>
+<return> The associated keyboard scancode or 0
+
+</return>
+</function>
+
 <function name="gdk_event_get_screen">
 <description>
 Returns the screen for the event. The screen is
@@ -7792,6 +8288,26 @@ Since: 3.0
 <return></return>
 </function>
 
+<function name="gdk_event_set_device_tool">
+<description>
+Sets the device tool for this event, should be rarely used.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a #GdkEvent
+</parameter_description>
+</parameter>
+<parameter name="tool">
+<parameter_description> tool to set on the event, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gdk_event_set_screen">
 <description>
 Sets the screen for @event to @screen. The event must
@@ -8555,6 +9071,24 @@ Since: 3.16
 </return>
 </function>
 
+<function name="gdk_gl_context_get_use_es">
+<description>
+Checks whether the @context is using an OpenGL or OpenGL ES profile.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkGLContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the #GdkGLContext is using an OpenGL ES profile
+
+</return>
+</function>
+
 <function name="gdk_gl_context_get_version">
 <description>
 Retrieves the OpenGL version of the @context.
@@ -8754,6 +9288,33 @@ Since: 3.16
 <return></return>
 </function>
 
+<function name="gdk_gl_context_set_use_es">
+<description>
+Requests that GDK create a OpenGL ES context instead of an OpenGL one,
+if the platform and windowing system allows it.
+
+The @context must not have been realized.
+
+You should check the return value of gdk_gl_context_get_use_es() after
+calling gdk_gl_context_realize() to decide whether to use the OpenGL or
+OpenGL ES API, extensions, or shaders.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkGLContext:
+</parameter_description>
+</parameter>
+<parameter name="use_es">
+<parameter_description> whether the context should use OpenGL ES instead of OpenGL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gdk_gl_get_flags">
 <description>
 Returns the currently active GL flags.
@@ -9216,7 +9777,7 @@ Since: 2.20
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE if no virtual modifiers were mapped to the
+<return> %FALSE if two virtual modifiers were mapped to the
 same non-virtual modifier. Note that %FALSE is also returned
 if a virtual modifier is mapped to a non-virtual modifier that
 was already set in @state.
@@ -9487,6 +10048,223 @@ a list of visuals; the list must be freed, but not its contents
 </return>
 </function>
 
+<function name="gdk_monitor_get_display">
+<description>
+Gets the display that this monitor belongs to.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the display
+</return>
+</function>
+
+<function name="gdk_monitor_get_geometry">
+<description>
+Retrieves the size and position of an individual monitor within the
+display coordinate space. The returned geometry is in  ”application pixels”,
+not in ”device pixels” (see gdk_monitor_get_scale_factor()).
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+<parameter name="geometry">
+<parameter_description> a #GdkRectangle to be filled wiht the monitor geometry
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gdk_monitor_get_height_mm">
+<description>
+Gets the height in millimeters of the monitor.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the physical height of the monitor
+</return>
+</function>
+
+<function name="gdk_monitor_get_manufacturer">
+<description>
+Gets the name of the monitor's manufacturer, if available.
+
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the name of the manufacturer, or %NULL
+</return>
+</function>
+
+<function name="gdk_monitor_get_model">
+<description>
+Gets the a string identifying the monitor model, if available.
+
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the monitor model, or %NULL
+</return>
+</function>
+
+<function name="gdk_monitor_get_refresh_rate">
+<description>
+Gets the refresh rate of the monitor, if available.
+
+The value is in milli-Hertz, so a refresh rate of 60Hz
+is returned as 60000.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the refresh rate in milli-Hertz, or 0
+</return>
+</function>
+
+<function name="gdk_monitor_get_scale_factor">
+<description>
+Gets the internal scale factor that maps from monitor coordinates
+to the actual device pixels. On traditional systems this is 1, but
+on very high density outputs this can be a higher value (often 2).
+
+This can be used if you want to create pixel based data for a
+particular monitor, but most of the time you’re drawing to a window
+where it is better to use gdk_window_get_scale_factor() instead.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the scale factor
+</return>
+</function>
+
+<function name="gdk_monitor_get_subpixel_layout">
+<description>
+Gets information about the layout of red, green and blue
+primaries for each pixel in this monitor, if available.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the subpixel layout
+</return>
+</function>
+
+<function name="gdk_monitor_get_width_mm">
+<description>
+Gets the width in millimeters of the monitor.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the physical width of the monitor
+
+</return>
+</function>
+
+<function name="gdk_monitor_get_workarea">
+<description>
+Retrieves the size and position of the “work area” on a monitor
+within the display coordinate space. The returned geometry is in
+”application pixels”, not in ”device pixels” (see
+gdk_monitor_get_scale_factor()).
+
+The work area should be considered when positioning menus and
+similar popups, to avoid placing them below panels, docks or other
+desktop components.
+
+Note that not all backends may have a concept of workarea. This
+function will return the monitor geometry if a workarea is not
+available, or does not apply.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+<parameter name="workarea">
+<parameter_description> a #GdkRectangle to be filled with
+the monitor workarea
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gdk_monitor_is_primary">
+<description>
+Gets whether this monitor should be considered primary
+(see gdk_display_get_primary_monitor()).
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="monitor">
+<parameter_description> a #GdkMonitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @monitor is primary
+</return>
+</function>
+
 <function name="gdk_notify_startup_complete">
 <description>
 Indicates to the GUI environment that the application has finished
@@ -9616,6 +10394,36 @@ changes to the screen’s font rendering settings.
 </return>
 </function>
 
+<function name="gdk_pango_context_get_for_display">
+<description>
+Creates a #PangoContext for @display.
+
+The context must be freed when you’re finished with it.
+
+When using GTK+, normally you should use gtk_widget_get_pango_context()
+instead of this function, to get the appropriate context for
+the widget you intend to render text onto.
+
+The newly created context will have the default font options
+(see #cairo_font_options_t) for the display; if these options
+change it will not be updated. Using gtk_widget_get_pango_context()
+is more convenient if you want to keep a context around and track
+changes to the font rendering settings.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> the #GdkDisplay for which the context is to be created
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #PangoContext for @display
+
+</return>
+</function>
+
 <function name="gdk_pango_context_get_for_screen">
 <description>
 Creates a #PangoContext for @screen.
@@ -12943,6 +13751,102 @@ Since: 2.24
 </return>
 </function>
 
+<function name="gdk_pixbuf_save_to_streamv">
+<description>
+Saves @pixbuf to an output stream.
+
+Supported file formats are currently &quot;jpeg&quot;, &quot;tiff&quot;, &quot;png&quot;, &quot;ico&quot; or
+&quot;bmp&quot;. See gdk_pixbuf_save_to_stream() for more details.
+
+Since: 2.36
+
+</description>
+<parameters>
+<parameter name="pixbuf">
+<parameter_description> a #GdkPixbuf
+</parameter_description>
+</parameter>
+<parameter name="stream">
+<parameter_description> a #GOutputStream to save the pixbuf to
+</parameter_description>
+</parameter>
+<parameter name="type">
+<parameter_description> name of file format
+</parameter_description>
+</parameter>
+<parameter name="option_keys">
+<parameter_description> name of options to set, %NULL-terminated
+</parameter_description>
+</parameter>
+<parameter name="option_values">
+<parameter_description> values for named options
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> return location for error, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the pixbuf was saved successfully, %FALSE if an
+error was set.
+
+</return>
+</function>
+
+<function name="gdk_pixbuf_save_to_streamv_async">
+<description>
+Saves @pixbuf to an output stream asynchronously.
+
+For more details see gdk_pixbuf_save_to_streamv(), which is the synchronous
+version of this function.
+
+When the operation is finished, @callback will be called in the main thread.
+You can then call gdk_pixbuf_save_to_stream_finish() to get the result of the operation.
+
+Since: 2.36
+
+</description>
+<parameters>
+<parameter name="pixbuf">
+<parameter_description> a #GdkPixbuf
+</parameter_description>
+</parameter>
+<parameter name="stream">
+<parameter_description> a #GOutputStream to which to save the pixbuf
+</parameter_description>
+</parameter>
+<parameter name="type">
+<parameter_description> name of file format
+</parameter_description>
+</parameter>
+<parameter name="option_keys">
+<parameter_description> name of options to set, %NULL-terminated
+</parameter_description>
+</parameter>
+<parameter name="option_values">
+<parameter_description> values for named options
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore
+</parameter_description>
+</parameter>
+<parameter name="callback">
+<parameter_description> a #GAsyncReadyCallback to call when the the pixbuf is loaded
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> the data to pass to the callback function
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="gdk_pixbuf_savev">
 <description>
 Saves pixbuf to a file in @type, which is currently &quot;jpeg&quot;, &quot;png&quot;, &quot;tiff&quot;, 
&quot;ico&quot; or &quot;bmp&quot;.
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 5e4a00c..d716b04 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -219,34 +219,6 @@
 )
 
 ;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_AXIS_IGNORE,
-;;   GDK_AXIS_X,
-;;   GDK_AXIS_Y,
-;;   GDK_AXIS_PRESSURE,
-;;   GDK_AXIS_XTILT,
-;;   GDK_AXIS_YTILT,
-;;   GDK_AXIS_WHEEL,
-;;   GDK_AXIS_LAST
-;; } GdkAxisUse;
-
-(define-enum-extended AxisUse
-  (in-module "Gdk")
-  (c-name "GdkAxisUse")
-  (values
-    '("ignore" "GDK_AXIS_IGNORE" "0")
-    '("x" "GDK_AXIS_X" "1")
-    '("y" "GDK_AXIS_Y" "2")
-    '("pressure" "GDK_AXIS_PRESSURE" "3")
-    '("xtilt" "GDK_AXIS_XTILT" "4")
-    '("ytilt" "GDK_AXIS_YTILT" "5")
-    '("wheel" "GDK_AXIS_WHEEL" "6")
-    '("last" "GDK_AXIS_LAST" "7")
-  )
-)
-
-;; Original typedef:
 ;; typedef enum {
 ;;   GDK_DEVICE_TYPE_MASTER,
 ;;   GDK_DEVICE_TYPE_SLAVE,
@@ -263,6 +235,35 @@
   )
 )
 
+;; From gdkdevicetool.h
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_DEVICE_TOOL_TYPE_UNKNOWN,
+;;   GDK_DEVICE_TOOL_TYPE_PEN,
+;;   GDK_DEVICE_TOOL_TYPE_ERASER,
+;;   GDK_DEVICE_TOOL_TYPE_BRUSH,
+;;   GDK_DEVICE_TOOL_TYPE_PENCIL,
+;;   GDK_DEVICE_TOOL_TYPE_AIRBRUSH,
+;;   GDK_DEVICE_TOOL_TYPE_MOUSE,
+;;   GDK_DEVICE_TOOL_TYPE_LENS,
+;; } GdkDeviceToolType;
+
+(define-enum-extended DeviceToolType
+  (in-module "Gdk")
+  (c-name "GdkDeviceToolType")
+  (values
+    '("unknown" "GDK_DEVICE_TOOL_TYPE_UNKNOWN" "0")
+    '("pen" "GDK_DEVICE_TOOL_TYPE_PEN" "1")
+    '("eraser" "GDK_DEVICE_TOOL_TYPE_ERASER" "2")
+    '("brush" "GDK_DEVICE_TOOL_TYPE_BRUSH" "3")
+    '("pencil" "GDK_DEVICE_TOOL_TYPE_PENCIL" "4")
+    '("airbrush" "GDK_DEVICE_TOOL_TYPE_AIRBRUSH" "5")
+    '("mouse" "GDK_DEVICE_TOOL_TYPE_MOUSE" "6")
+    '("lens" "GDK_DEVICE_TOOL_TYPE_LENS" "7")
+  )
+)
+
 ;; From gdkdnd.h
 
 ;; Original typedef:
@@ -775,7 +776,8 @@
 ;;   GDK_GL_SOFTWARE_DRAW_GL       = 1 << 2,
 ;;   GDK_GL_SOFTWARE_DRAW_SURFACE  = 1 << 3,
 ;;   GDK_GL_TEXTURE_RECTANGLE      = 1 << 4,
-;;   GDK_GL_LEGACY                 = 1 << 5
+;;   GDK_GL_LEGACY                 = 1 << 5,
+;;   GDK_GL_GLES                   = 1 << 6
 ;; } GdkGLFlags;
 
 (define-flags-extended GLFlags
@@ -788,6 +790,7 @@
     '("software-draw-surface" "GDK_GL_SOFTWARE_DRAW_SURFACE" "1 << 3")
     '("texture-rectangle" "GDK_GL_TEXTURE_RECTANGLE" "1 << 4")
     '("legacy" "GDK_GL_LEGACY" "1 << 5")
+    '("gles" "GDK_GL_GLES" "1 << 6")
   )
 )
 
@@ -844,6 +847,31 @@
   )
 )
 
+;; From gdkmonitor.h
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_SUBPIXEL_LAYOUT_UNKNOWN,
+;;   GDK_SUBPIXEL_LAYOUT_NONE,
+;;   GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB,
+;;   GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR,
+;;   GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB,
+;;   GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR
+;; } GdkSubpixelLayout;
+
+(define-enum-extended SubpixelLayout
+  (in-module "Gdk")
+  (c-name "GdkSubpixelLayout")
+  (values
+    '("unknown" "GDK_SUBPIXEL_LAYOUT_UNKNOWN" "0")
+    '("none" "GDK_SUBPIXEL_LAYOUT_NONE" "1")
+    '("horizontal-rgb" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB" "2")
+    '("horizontal-bgr" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR" "3")
+    '("vertical-rgb" "GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB" "4")
+    '("vertical-bgr" "GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR" "5")
+  )
+)
+
 ;; From gdkproperty.h
 
 ;; Original typedef:
@@ -1205,6 +1233,70 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_AXIS_IGNORE,
+;;   GDK_AXIS_X,
+;;   GDK_AXIS_Y,
+;;   GDK_AXIS_PRESSURE,
+;;   GDK_AXIS_XTILT,
+;;   GDK_AXIS_YTILT,
+;;   GDK_AXIS_WHEEL,
+;;   GDK_AXIS_DISTANCE,
+;;   GDK_AXIS_ROTATION,
+;;   GDK_AXIS_SLIDER,
+;;   GDK_AXIS_LAST
+;; } GdkAxisUse;
+
+(define-enum-extended AxisUse
+  (in-module "Gdk")
+  (c-name "GdkAxisUse")
+  (values
+    '("ignore" "GDK_AXIS_IGNORE" "0")
+    '("x" "GDK_AXIS_X" "1")
+    '("y" "GDK_AXIS_Y" "2")
+    '("pressure" "GDK_AXIS_PRESSURE" "3")
+    '("xtilt" "GDK_AXIS_XTILT" "4")
+    '("ytilt" "GDK_AXIS_YTILT" "5")
+    '("wheel" "GDK_AXIS_WHEEL" "6")
+    '("distance" "GDK_AXIS_DISTANCE" "7")
+    '("rotation" "GDK_AXIS_ROTATION" "8")
+    '("slider" "GDK_AXIS_SLIDER" "9")
+    '("last" "GDK_AXIS_LAST" "10")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_AXIS_FLAG_X        = 1 << GDK_AXIS_X,
+;;   GDK_AXIS_FLAG_Y        = 1 << GDK_AXIS_Y,
+;;   GDK_AXIS_FLAG_PRESSURE = 1 << GDK_AXIS_PRESSURE,
+;;   GDK_AXIS_FLAG_XTILT    = 1 << GDK_AXIS_XTILT,
+;;   GDK_AXIS_FLAG_YTILT    = 1 << GDK_AXIS_YTILT,
+;;   GDK_AXIS_FLAG_WHEEL    = 1 << GDK_AXIS_WHEEL,
+;;   GDK_AXIS_FLAG_DISTANCE = 1 << GDK_AXIS_DISTANCE,
+;;   GDK_AXIS_FLAG_ROTATION = 1 << GDK_AXIS_ROTATION,
+;;   GDK_AXIS_FLAG_SLIDER   = 1 << GDK_AXIS_SLIDER,
+;; } GdkAxisFlags;
+
+(define-flags-extended AxisFlags
+  (in-module "Gdk")
+  (c-name "GdkAxisFlags")
+  (values
+    '("x" "GDK_AXIS_FLAG_X" "1 << GDK_AXIS_X")
+    '("y" "GDK_AXIS_FLAG_Y" "1 << GDK_AXIS_Y")
+    '("pressure" "GDK_AXIS_FLAG_PRESSURE" "1 << GDK_AXIS_PRESSURE")
+    '("xtilt" "GDK_AXIS_FLAG_XTILT" "1 << GDK_AXIS_XTILT")
+    '("ytilt" "GDK_AXIS_FLAG_YTILT" "1 << GDK_AXIS_YTILT")
+    '("wheel" "GDK_AXIS_FLAG_WHEEL" "1 << GDK_AXIS_WHEEL")
+    '("distance" "GDK_AXIS_FLAG_DISTANCE" "1 << GDK_AXIS_DISTANCE")
+    '("rotation" "GDK_AXIS_FLAG_ROTATION" "1 << GDK_AXIS_ROTATION")
+    '("slider" "GDK_AXIS_FLAG_SLIDER" "1 << GDK_AXIS_SLIDER")
+  )
+)
+
 ;; From gdkvisual.h
 
 ;; Original typedef:
diff --git a/gdk/src/gdk_extra_objects.defs b/gdk/src/gdk_extra_objects.defs
index 4cff431..b4efd17 100644
--- a/gdk/src/gdk_extra_objects.defs
+++ b/gdk/src/gdk_extra_objects.defs
@@ -63,6 +63,13 @@
   (gtype-id "GDK_TYPE_GL_CONTEXT")
 )
 
+(define-object Monitor
+  (in-module "Gdk")
+  (parent "GObject")
+  (c-name "GdkMonitor")
+  (gtype-id "GDK_TYPE_MONITOR")
+)
+
 (define-object Keymap
   (in-module "Gdk")
   (parent "GObject")
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index e7a6b70..b3368d1 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -42,22 +42,6 @@
   )
 )
 
-(define-enum AxisUse
-  (in-module "Gdk")
-  (c-name "GdkAxisUse")
-  (gtype-id "GDK_TYPE_AXIS_USE")
-  (values
-    '("ignore" "GDK_AXIS_IGNORE")
-    '("x" "GDK_AXIS_X")
-    '("y" "GDK_AXIS_Y")
-    '("pressure" "GDK_AXIS_PRESSURE")
-    '("xtilt" "GDK_AXIS_XTILT")
-    '("ytilt" "GDK_AXIS_YTILT")
-    '("wheel" "GDK_AXIS_WHEEL")
-    '("last" "GDK_AXIS_LAST")
-  )
-)
-
 (define-enum DeviceType
   (in-module "Gdk")
   (c-name "GdkDeviceType")
@@ -69,6 +53,22 @@
   )
 )
 
+(define-enum DeviceToolType
+  (in-module "Gdk")
+  (c-name "GdkDeviceToolType")
+  (gtype-id "GDK_TYPE_DEVICE_TOOL_TYPE")
+  (values
+    '("unknown" "GDK_DEVICE_TOOL_TYPE_UNKNOWN")
+    '("pen" "GDK_DEVICE_TOOL_TYPE_PEN")
+    '("eraser" "GDK_DEVICE_TOOL_TYPE_ERASER")
+    '("brush" "GDK_DEVICE_TOOL_TYPE_BRUSH")
+    '("pencil" "GDK_DEVICE_TOOL_TYPE_PENCIL")
+    '("airbrush" "GDK_DEVICE_TOOL_TYPE_AIRBRUSH")
+    '("mouse" "GDK_DEVICE_TOOL_TYPE_MOUSE")
+    '("lens" "GDK_DEVICE_TOOL_TYPE_LENS")
+  )
+)
+
 (define-flags DragAction
   (in-module "Gdk")
   (c-name "GdkDragAction")
@@ -369,6 +369,7 @@
     '("software-draw-surface" "GDK_GL_SOFTWARE_DRAW_SURFACE")
     '("texture-rectangle" "GDK_GL_TEXTURE_RECTANGLE")
     '("legacy" "GDK_GL_LEGACY")
+    '("gles" "GDK_GL_GLES")
   )
 )
 
@@ -396,6 +397,20 @@
   )
 )
 
+(define-enum SubpixelLayout
+  (in-module "Gdk")
+  (c-name "GdkSubpixelLayout")
+  (gtype-id "GDK_TYPE_SUBPIXEL_LAYOUT")
+  (values
+    '("unknown" "GDK_SUBPIXEL_LAYOUT_UNKNOWN")
+    '("none" "GDK_SUBPIXEL_LAYOUT_NONE")
+    '("horizontal-rgb" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB")
+    '("horizontal-bgr" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR")
+    '("vertical-rgb" "GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB")
+    '("vertical-bgr" "GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR")
+  )
+)
+
 (define-enum PropMode
   (in-module "Gdk")
   (c-name "GdkPropMode")
@@ -591,6 +606,42 @@
   )
 )
 
+(define-enum AxisUse
+  (in-module "Gdk")
+  (c-name "GdkAxisUse")
+  (gtype-id "GDK_TYPE_AXIS_USE")
+  (values
+    '("ignore" "GDK_AXIS_IGNORE")
+    '("x" "GDK_AXIS_X")
+    '("y" "GDK_AXIS_Y")
+    '("pressure" "GDK_AXIS_PRESSURE")
+    '("xtilt" "GDK_AXIS_XTILT")
+    '("ytilt" "GDK_AXIS_YTILT")
+    '("wheel" "GDK_AXIS_WHEEL")
+    '("distance" "GDK_AXIS_DISTANCE")
+    '("rotation" "GDK_AXIS_ROTATION")
+    '("slider" "GDK_AXIS_SLIDER")
+    '("last" "GDK_AXIS_LAST")
+  )
+)
+
+(define-flags AxisFlags
+  (in-module "Gdk")
+  (c-name "GdkAxisFlags")
+  (gtype-id "GDK_TYPE_AXIS_FLAGS")
+  (values
+    '("x" "GDK_AXIS_FLAG_X")
+    '("y" "GDK_AXIS_FLAG_Y")
+    '("pressure" "GDK_AXIS_FLAG_PRESSURE")
+    '("xtilt" "GDK_AXIS_FLAG_XTILT")
+    '("ytilt" "GDK_AXIS_FLAG_YTILT")
+    '("wheel" "GDK_AXIS_FLAG_WHEEL")
+    '("distance" "GDK_AXIS_FLAG_DISTANCE")
+    '("rotation" "GDK_AXIS_FLAG_ROTATION")
+    '("slider" "GDK_AXIS_FLAG_SLIDER")
+  )
+)
+
 (define-enum VisualType
   (in-module "Gdk")
   (c-name "GdkVisualType")
@@ -1309,6 +1360,12 @@
   (return-type "GdkSeat*")
 )
 
+(define-method get_axes
+  (of-object "GdkDevice")
+  (c-name "gdk_device_get_axes")
+  (return-type "GdkAxisFlags")
+)
+
 
 
 ;; From gdkdevicemanager.h
@@ -1341,6 +1398,27 @@
 
 
 
+;; From gdkdevicetool.h
+
+(define-function gdk_device_tool_get_type
+  (c-name "gdk_device_tool_get_type")
+  (return-type "GType")
+)
+
+(define-method get_serial
+  (of-object "GdkDeviceTool")
+  (c-name "gdk_device_tool_get_serial")
+  (return-type "guint")
+)
+
+(define-method get_tool_type
+  (of-object "GdkDeviceTool")
+  (c-name "gdk_device_tool_get_tool_type")
+  (return-type "GdkDeviceToolType")
+)
+
+
+
 ;; From gdkdisplay.h
 
 (define-function gdk_display_get_type
@@ -1658,6 +1736,46 @@
   (return-type "GList*")
 )
 
+(define-method get_n_monitors
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_n_monitors")
+  (return-type "int")
+)
+
+(define-method get_monitor
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_monitor")
+  (return-type "GdkMonitor*")
+  (parameters
+    '("int" "monitor_num")
+  )
+)
+
+(define-method get_primary_monitor
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_primary_monitor")
+  (return-type "GdkMonitor*")
+)
+
+(define-method get_monitor_at_point
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_monitor_at_point")
+  (return-type "GdkMonitor*")
+  (parameters
+    '("int" "x")
+    '("int" "y")
+  )
+)
+
+(define-method get_monitor_at_window
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_monitor_at_window")
+  (return-type "GdkMonitor*")
+  (parameters
+    '("GdkWindow*" "window")
+  )
+)
+
 
 
 ;; From gdkdisplaymanager.h
@@ -1946,13 +2064,13 @@
   (return-type "GType")
 )
 
-(define-function gdk_axis_use_get_type
-  (c-name "gdk_axis_use_get_type")
+(define-function gdk_device_type_get_type
+  (c-name "gdk_device_type_get_type")
   (return-type "GType")
 )
 
-(define-function gdk_device_type_get_type
-  (c-name "gdk_device_type_get_type")
+(define-function gdk_device_tool_type_get_type
+  (c-name "gdk_device_tool_type_get_type")
   (return-type "GType")
 )
 
@@ -2026,6 +2144,11 @@
   (return-type "GType")
 )
 
+(define-function gdk_subpixel_layout_get_type
+  (c-name "gdk_subpixel_layout_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_frame_clock_phase_get_type
   (c-name "gdk_frame_clock_phase_get_type")
   (return-type "GType")
@@ -2086,6 +2209,16 @@
   (return-type "GType")
 )
 
+(define-function gdk_axis_use_get_type
+  (c-name "gdk_axis_use_get_type")
+  (return-type "GType")
+)
+
+(define-function gdk_axis_flags_get_type
+  (c-name "gdk_axis_flags_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_visual_type_get_type
   (c-name "gdk_visual_type_get_type")
   (return-type "GType")
@@ -2444,6 +2577,33 @@
   )
 )
 
+(define-method get_device_tool
+  (of-object "GdkEvent")
+  (c-name "gdk_event_get_device_tool")
+  (return-type "GdkDeviceTool*")
+)
+
+(define-method set_device_tool
+  (of-object "GdkEvent")
+  (c-name "gdk_event_set_device_tool")
+  (return-type "none")
+  (parameters
+    '("GdkDeviceTool*" "tool")
+  )
+)
+
+(define-method get_scancode
+  (of-object "GdkEvent")
+  (c-name "gdk_event_get_scancode")
+  (return-type "int")
+)
+
+(define-method get_pointer_emulated
+  (of-object "GdkEvent")
+  (c-name "gdk_event_get_pointer_emulated")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gdkframeclock.h
@@ -2682,6 +2842,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_use_es
+  (of-object "GdkGLContext")
+  (c-name "gdk_gl_context_set_use_es")
+  (return-type "none")
+  (parameters
+    '("gboolean" "use_es")
+  )
+)
+
+(define-method get_use_es
+  (of-object "GdkGLContext")
+  (c-name "gdk_gl_context_get_use_es")
+  (return-type "gboolean")
+)
+
 (define-method realize
   (of-object "GdkGLContext")
   (c-name "gdk_gl_context_realize")
@@ -2715,6 +2890,24 @@
 
 ;; From gdkinternals.h
 
+(define-method set_pointer_emulated
+  (of-object "GdkEvent")
+  (c-name "gdk_event_set_pointer_emulated")
+  (return-type "none")
+  (parameters
+    '("gboolean" "emulated")
+  )
+)
+
+(define-method set_scancode
+  (of-object "GdkEvent")
+  (c-name "gdk_event_set_scancode")
+  (return-type "none")
+  (parameters
+    '("guint16" "scancode")
+  )
+)
+
 (define-method set_seat
   (of-object "GdkEvent")
   (c-name "gdk_event_set_seat")
@@ -2741,6 +2934,7 @@
     '("guint" "texture_target")
     '("int" "n_quads")
     '("GdkTexturedQuad*" "quads")
+    '("gboolean" "flip_colors")
   )
 )
 
@@ -3199,6 +3393,87 @@
 
 
 
+;; From gdkmonitor.h
+
+(define-function gdk_monitor_get_type
+  (c-name "gdk_monitor_get_type")
+  (return-type "GType")
+)
+
+(define-method get_display
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_display")
+  (return-type "GdkDisplay*")
+)
+
+(define-method get_geometry
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_geometry")
+  (return-type "none")
+  (parameters
+    '("GdkRectangle*" "geometry")
+  )
+)
+
+(define-method get_workarea
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_workarea")
+  (return-type "none")
+  (parameters
+    '("GdkRectangle*" "workarea")
+  )
+)
+
+(define-method get_width_mm
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_width_mm")
+  (return-type "int")
+)
+
+(define-method get_height_mm
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_height_mm")
+  (return-type "int")
+)
+
+(define-method get_manufacturer
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_manufacturer")
+  (return-type "const-char*")
+)
+
+(define-method get_model
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_model")
+  (return-type "const-char*")
+)
+
+(define-method get_scale_factor
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_scale_factor")
+  (return-type "int")
+)
+
+(define-method get_refresh_rate
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_refresh_rate")
+  (return-type "int")
+)
+
+(define-method get_subpixel_layout
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_get_subpixel_layout")
+  (return-type "GdkSubpixelLayout")
+)
+
+(define-method is_primary
+  (of-object "GdkMonitor")
+  (c-name "gdk_monitor_is_primary")
+  (return-type "gboolean")
+)
+
+
+
 ;; From gdkpango.h
 
 (define-function gdk_pango_context_get_for_screen
@@ -3209,6 +3484,14 @@
   )
 )
 
+(define-function gdk_pango_context_get_for_display
+  (c-name "gdk_pango_context_get_for_display")
+  (return-type "PangoContext*")
+  (parameters
+    '("GdkDisplay*" "display")
+  )
+)
+
 (define-function gdk_pango_context_get
   (c-name "gdk_pango_context_get")
   (return-type "PangoContext*")
@@ -3394,6 +3677,10 @@
 
 
 
+;; From gdkresources.h
+
+
+
 ;; From gdkrgba.h
 
 (define-function gdk_rgba_get_type
diff --git a/gdk/src/gdk_pixbuf_methods.defs b/gdk/src/gdk_pixbuf_methods.defs
index 43903cd..dea6b62 100644
--- a/gdk/src/gdk_pixbuf_methods.defs
+++ b/gdk/src/gdk_pixbuf_methods.defs
@@ -687,6 +687,35 @@
   )
 )
 
+(define-method save_to_streamv_async
+  (of-object "GdkPixbuf")
+  (c-name "gdk_pixbuf_save_to_streamv_async")
+  (return-type "none")
+  (parameters
+    '("GOutputStream*" "stream")
+    '("const-gchar*" "type")
+    '("gchar**" "option_keys")
+    '("gchar**" "option_values")
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method save_to_streamv
+  (of-object "GdkPixbuf")
+  (c-name "gdk_pixbuf_save_to_streamv")
+  (return-type "gboolean")
+  (parameters
+    '("GOutputStream*" "stream")
+    '("const-char*" "type")
+    '("char**" "option_keys")
+    '("char**" "option_values")
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 (define-method add_alpha
   (of-object "GdkPixbuf")
   (c-name "gdk_pixbuf_add_alpha")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index 5236eda..9e106f9 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -52,6 +52,15 @@
   (when "last")
 )
 
+(define-signal tool-changed
+  (of-object "GdkDevice")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GdkDeviceTool*" "p0")
+  )
+)
+
 (define-property display
   (of-object "GdkDevice")
   (prop-type "GParamObject")
@@ -169,6 +178,24 @@
   (construct-only #t)
 )
 
+(define-property axes
+  (of-object "GdkDevice")
+  (prop-type "GParamFlags")
+  (docs "Axes")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property tool
+  (of-object "GdkDevice")
+  (prop-type "GParamObject")
+  (docs "The tool that is currently used with this device")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GdkDeviceManager
 
 (define-signal device-added
@@ -242,6 +269,24 @@
   )
 )
 
+(define-signal monitor-added
+  (of-object "GdkDisplay")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GdkMonitor*" "p0")
+  )
+)
+
+(define-signal monitor-removed
+  (of-object "GdkDisplay")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GdkMonitor*" "p0")
+  )
+)
+
 ;; From GdkDisplayManager
 
 (define-signal display-opened
@@ -262,6 +307,104 @@
   (construct-only #f)
 )
 
+;; From GdkMonitor
+
+(define-signal invalidate
+  (of-object "GdkMonitor")
+  (return-type "void")
+  (when "first")
+)
+
+(define-property display
+  (of-object "GdkMonitor")
+  (prop-type "GParamObject")
+  (docs "The display of the monitor")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property manufacturer
+  (of-object "GdkMonitor")
+  (prop-type "GParamString")
+  (docs "The manufacturer name")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property model
+  (of-object "GdkMonitor")
+  (prop-type "GParamString")
+  (docs "The model name")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property scale-factor
+  (of-object "GdkMonitor")
+  (prop-type "GParamInt")
+  (docs "The scale factor")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property geometry
+  (of-object "GdkMonitor")
+  (prop-type "GParamBoxed")
+  (docs "The geometry of the monitor")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property workarea
+  (of-object "GdkMonitor")
+  (prop-type "GParamBoxed")
+  (docs "The workarea of the monitor")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property width-mm
+  (of-object "GdkMonitor")
+  (prop-type "GParamInt")
+  (docs "The width of the monitor, in millimeters")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property height-mm
+  (of-object "GdkMonitor")
+  (prop-type "GParamInt")
+  (docs "The height of the monitor, in millimeters")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property refresh-rate
+  (of-object "GdkMonitor")
+  (prop-type "GParamInt")
+  (docs "The refresh rate, in millihertz")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property subpixel-layout
+  (of-object "GdkMonitor")
+  (prop-type "GParamEnum")
+  (docs "The subpixel layout")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GdkPixbuf
 
 (define-property colorspace
@@ -443,6 +586,24 @@
   )
 )
 
+(define-signal tool-added
+  (of-object "GdkSeat")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GdkDeviceTool*" "p0")
+  )
+)
+
+(define-signal tool-removed
+  (of-object "GdkSeat")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GdkDeviceTool*" "p0")
+  )
+)
+
 (define-property display
   (of-object "GdkSeat")
   (prop-type "GParamObject")
diff --git a/tools/extra_defs_gen/generate_defs_gdk.cc b/tools/extra_defs_gen/generate_defs_gdk.cc
index 96b7e6e..ebc7f0f 100644
--- a/tools/extra_defs_gen/generate_defs_gdk.cc
+++ b/tools/extra_defs_gen/generate_defs_gdk.cc
@@ -43,6 +43,7 @@ int main(int argc, char** argv)
 #if !defined(G_OS_WIN32)
             << get_defs( GDK_TYPE_DISPLAY_MANAGER )
 #endif /* G_OS_WIN32 */
+            << get_defs( GDK_TYPE_MONITOR )
             << get_defs( GDK_TYPE_PIXBUF )
             << get_defs( GDK_TYPE_PIXBUF_ANIMATION )
             << get_defs( GDK_TYPE_PIXBUF_LOADER )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]