GNOME.org
 

[gtkmm] Gdk: Regenerate gdk_docs.xml and the .defs files

commit d1fbc091ce6fea67e050ec3f18ac2eb2e7d4a4d8
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Sun Nov 6 17:05:48 2016 +0100

    Gdk: Regenerate gdk_docs.xml and the .defs files
    
    and in gdk_docs_override.xml, gdk_extra.defs and gdk_extra_objects.defs,
    remove entries for removed API.

 gdk/src/gdk_docs.xml           |  375 +++++++++-------------------------------
 gdk/src/gdk_docs_override.xml  |    5 -
 gdk/src/gdk_enums.defs         |   16 +-
 gdk/src/gdk_extra.defs         |   11 --
 gdk/src/gdk_extra_objects.defs |   12 --
 gdk/src/gdk_methods.defs       |   98 ++---------
 gdk/src/gdk_signals.defs       |   24 ++-
 7 files changed, 119 insertions(+), 422 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index e5ec77f..b62fa1e 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -1026,6 +1026,26 @@ Since: 3.20
 <return></return>
 </signal>
 
+<property name="GdkDisplay:composited">
+<description>
+%TRUE if the display properly composits the alpha channel.
+See gdk_display_is_composited() for details.
+
+Since: 3.90
+
+</description>
+</property>
+
+<property name="GdkDisplay:rgba">
+<description>
+%TRUE if the display supports an alpha channel. See gdk_display_is_rgba()
+for details.
+
+Since: 3.90
+
+</description>
+</property>
+
 <signal name="GdkDisplayManager::display-opened">
 <description>
 The ::display-opened signal is emitted when a display is opened.
@@ -2882,23 +2902,6 @@ Specifies the type of a property change for a #GdkEventProperty.
 </parameters>
 </enum>
 
-<signal name="GdkScreen::composited-changed">
-<description>
-The ::composited-changed signal is emitted when the composited
-status of the screen changes
-
-Since: 2.10
-
-</description>
-<parameters>
-<parameter name="screen">
-<parameter_description> the object on which the signal is emitted
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</signal>
-
 <signal name="GdkScreen::monitors-changed">
 <description>
 The ::monitors-changed signal is emitted when the number, size
@@ -3397,18 +3400,14 @@ Since: 3.90
 <enum name="GdkWindowAttributesType">
 <description>
 Used to indicate which fields in the #GdkWindowAttr struct should be honored.
-For example, if you filled in the “title” and “x” fields of #GdkWindowAttr,
-pass “@GDK_WA_X | @GDK_WA_TITLE” to gdk_window_new(). Fields in
+For example, if you filled in the “x” and “y” fields of #GdkWindowAttr,
+pass “@GDK_WA_X | @GDK_WA_Y” to gdk_window_new(). Fields in
 #GdkWindowAttr not covered by a bit in this enum are required; for example,
 the @width/@height, @wclass, and @window_type fields are required, they have
 no corresponding flag in #GdkWindowAttributesType.
 
 </description>
 <parameters>
-<parameter name="GDK_WA_TITLE">
-<parameter_description> Honor the title field
-</parameter_description>
-</parameter>
 <parameter name="GDK_WA_X">
 <parameter_description> Honor the X coordinate field
 </parameter_description>
@@ -3417,10 +3416,6 @@ no corresponding flag in #GdkWindowAttributesType.
 <parameter_description> Honor the Y coordinate field
 </parameter_description>
 </parameter>
-<parameter name="GDK_WA_NOREDIR">
-<parameter_description> Honor the override_redirect field
-</parameter_description>
-</parameter>
 <parameter name="GDK_WA_TYPE_HINT">
 <parameter_description> Honor the type_hint field
 </parameter_description>
@@ -4256,138 +4251,6 @@ bound context
 <return></return>
 </function>
 
-<function name="gdk_color_copy">
-<description>
-Makes a copy of a #GdkColor.
-
-The result must be freed using gdk_color_free().
-
-Deprecated: 3.14: Use #GdkRGBA
-
-</description>
-<parameters>
-<parameter name="color">
-<parameter_description> a #GdkColor
-</parameter_description>
-</parameter>
-</parameters>
-<return> a copy of @color
-
-</return>
-</function>
-
-<function name="gdk_color_equal">
-<description>
-Compares two colors.
-
-Deprecated: 3.14: Use #GdkRGBA
-
-</description>
-<parameters>
-<parameter name="colora">
-<parameter_description> a #GdkColor
-</parameter_description>
-</parameter>
-<parameter name="colorb">
-<parameter_description> another #GdkColor
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the two colors compare equal
-
-</return>
-</function>
-
-<function name="gdk_color_free">
-<description>
-Frees a #GdkColor created with gdk_color_copy().
-
-Deprecated: 3.14: Use #GdkRGBA
-
-</description>
-<parameters>
-<parameter name="color">
-<parameter_description> a #GdkColor
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gdk_color_hash">
-<description>
-A hash function suitable for using for a hash
-table that stores #GdkColors.
-
-Deprecated: 3.14: Use #GdkRGBA
-
-</description>
-<parameters>
-<parameter name="color">
-<parameter_description> a #GdkColor
-</parameter_description>
-</parameter>
-</parameters>
-<return> The hash function applied to @color
-
-</return>
-</function>
-
-<function name="gdk_color_parse">
-<description>
-Parses a textual specification of a color and fill in the
-@red, @green, and @blue fields of a #GdkColor.
-
-The string can either one of a large set of standard names
-(taken from the X11 `rgb.txt` file), or it can be a hexadecimal
-value in the form “\#rgb” “\#rrggbb”, “\#rrrgggbbb” or
-“\#rrrrggggbbbb” where “r”, “g” and “b” are hex digits of
-the red, green, and blue components of the color, respectively.
-(White in the four forms is “\#fff”, “\#ffffff”, “\#fffffffff”
-and “\#ffffffffffff”).
-
-Deprecated: 3.14: Use #GdkRGBA
-
-</description>
-<parameters>
-<parameter name="spec">
-<parameter_description> the string specifying the color
-</parameter_description>
-</parameter>
-<parameter name="color">
-<parameter_description> the #GdkColor to fill in
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the parsing succeeded
-
-</return>
-</function>
-
-<function name="gdk_color_to_string">
-<description>
-Returns a textual specification of @color in the hexadecimal
-form “\#rrrrggggbbbb” where “r”, “g” and “b” are hex digits
-representing the red, green and blue components respectively.
-
-The returned string can be parsed by gdk_color_parse().
-
-Since: 2.12
-
-Deprecated: 3.14: Use #GdkRGBA
-
-</description>
-<parameters>
-<parameter name="color">
-<parameter_description> a #GdkColor
-</parameter_description>
-</parameter>
-</parameters>
-<return> a newly-allocated text string
-
-</return>
-</function>
-
 <function name="gdk_cursor_get_cursor_type">
 <description>
 Returns the cursor type for this cursor.
@@ -6200,6 +6063,65 @@ Since: 2.22
 </return>
 </function>
 
+<function name="gdk_display_is_composited">
+<description>
+Returns whether windows can reasonably be expected to have
+their alpha channel drawn correctly on the screen. Check
+gdk_display_is_rgba() for wether the display supports an
+alpha channel.
+
+On X11 this function returns whether a compositing manager is
+compositing on @display.
+
+On modern displays, this value is always %TRUE.
+
+Since: 3.90
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+</parameters>
+<return> Whether windows with RGBA visuals can reasonably be
+expected to have their alpha channels drawn correctly on the screen.
+
+</return>
+</function>
+
+<function name="gdk_display_is_rgba">
+<description>
+Returns wether windows on this @display are created with an
+alpha channel.
+
+Even if a %TRUE is returned, it is possible that the
+window’s alpha channel won’t be honored when displaying the
+window on the screen: in particular, for X an appropriate
+windowing manager and compositing manager must be running to
+provide appropriate display. Use gdk_display_is_composited()
+to check if that is the case.
+
+For setting an overall opacity for a top-level window, see
+gdk_window_set_opacity().
+
+On modern displays, this value is always %TRUE.
+
+Since: 3.90
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if windows are created with an alpha channel or
+%FALSE if the display does not support this functionality.
+
+</return>
+</function>
+
 <function name="gdk_display_list_seats">
 <description>
 Returns the list of seats known to @display.
@@ -14422,38 +14344,6 @@ has been set.
 </return>
 </function>
 
-<function name="gdk_screen_get_rgba_visual">
-<description>
-Gets a visual to use for creating windows with an alpha channel.
-The windowing system on which GTK+ is running
-may not support this capability, in which case %NULL will
-be returned. Even if a non-%NULL value is returned, its
-possible that the window’s alpha channel won’t be honored
-when displaying the window on the screen: in particular, for
-X an appropriate windowing manager and compositing manager
-must be running to provide appropriate display.
-
-This functionality is not implemented in the Windows backend.
-
-For setting an overall opacity for a top-level window, see
-gdk_window_set_opacity().
-
-Since: 2.8
-
-</description>
-<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
-</parameter_description>
-</parameter>
-</parameters>
-<return> a visual to use for windows
-with an alpha channel or %NULL if the capability is not
-available.
-
-</return>
-</function>
-
 <function name="gdk_screen_get_root_window">
 <description>
 Gets the root window of @screen.
@@ -14503,26 +14393,6 @@ in @value, %FALSE otherwise.
 </return>
 </function>
 
-<function name="gdk_screen_get_system_visual">
-<description>
-Get the system’s default visual for @screen.
-This is the visual for the root window of the display.
-The return value should not be freed.
-
-Since: 2.2
-
-</description>
-<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen.
-</parameter_description>
-</parameter>
-</parameters>
-<return> the system visual
-
-</return>
-</function>
-
 <function name="gdk_screen_get_toplevel_windows">
 <description>
 Obtains a list of all toplevel windows known to GDK on the screen @screen.
@@ -14547,54 +14417,6 @@ list of toplevel windows, free with g_list_free()
 </return>
 </function>
 
-<function name="gdk_screen_is_composited">
-<description>
-Returns whether windows with an RGBA visual can reasonably
-be expected to have their alpha channel drawn correctly on
-the screen.
-
-On X11 this function returns whether a compositing manager is
-compositing @screen.
-
-Since: 2.10
-
-</description>
-<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
-</parameter_description>
-</parameter>
-</parameters>
-<return> Whether windows with RGBA visuals can reasonably be
-expected to have their alpha channels drawn correctly on the screen.
-
-</return>
-</function>
-
-<function name="gdk_screen_list_visuals">
-<description>
-Lists the available visuals for the specified @screen.
-A visual describes a hardware image data format.
-For example, a visual might support 24-bit color, or 8-bit color,
-and might expect pixels to be in a certain format.
-
-Call g_list_free() on the return value when you’re finished with it.
-
-Since: 2.2
-
-</description>
-<parameters>
-<parameter name="screen">
-<parameter_description> the relevant #GdkScreen.
-</parameter_description>
-</parameter>
-</parameters>
-<return>
-a list of visuals; the list must be freed, but not its contents
-
-</return>
-</function>
-
 <function name="gdk_screen_set_resolution">
 <description>
 Sets the resolution for font handling on the screen. This is a
@@ -18679,9 +18501,8 @@ constrain programatic resizing via gdk_window_resize() or
 gdk_window_move_resize().
 
 Note that on X11, this effect has no effect on windows
-of type %GDK_WINDOW_TEMP or windows where override redirect
-has been turned on via gdk_window_set_override_redirect()
-since these windows are not resizable by the user.
+of type %GDK_WINDOW_TEMP since these windows are not resizable
+by the user.
 
 Since you can’t count on the windowing system doing the
 constraints for programmatic resizes, you should generally
@@ -18885,10 +18706,6 @@ that the entire window is (potentially) non-opaque, and draw your content
 with alpha, or use gtk_widget_set_opacity() to set an overall opacity
 for your widgets.
 
-For child windows this function only works for non-native windows.
-
-For setting up per-pixel alpha topelevels, see gdk_screen_get_rgba_visual().
-
 Support for non-toplevel windows was added in 3.8.
 
 Since: 2.12
@@ -18939,32 +18756,6 @@ Since: 3.10
 <return></return>
 </function>
 
-<function name="gdk_window_set_override_redirect">
-<description>
-An override redirect window is not under the control of the window manager.
-This means it won’t have a titlebar, won’t be minimizable, etc. - it will
-be entirely under the control of the application. The window manager
-can’t see the override redirect window at all.
-
-Override redirect should only be used for short-lived temporary
-windows, such as popup menus. #GtkMenu uses an override redirect
-window in its implementation, for example.
-
-
-</description>
-<parameters>
-<parameter name="window">
-<parameter_description> a toplevel #GdkWindow
-</parameter_description>
-</parameter>
-<parameter name="override_redirect">
-<parameter_description> %TRUE if window should be override redirect
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="gdk_window_set_pass_through">
 <description>
 Sets whether input to the window is passed through to the window
diff --git a/gdk/src/gdk_docs_override.xml b/gdk/src/gdk_docs_override.xml
index 2a632c1..6b16b6d 100644
--- a/gdk/src/gdk_docs_override.xml
+++ b/gdk/src/gdk_docs_override.xml
@@ -56,11 +56,6 @@ invalidate the whole region.
 <return></return>
 </function>
 
-<function name="gdk_screen_make_display_name">
-<return> The name.
-</return>
-</function>
-
 <function name="gdk_drag_status">
     <mapping class="DragContext" />
 </function>
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 797a206..9efa820 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -1245,22 +1245,18 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GDK_WA_TITLE         = 1 << 1,
-;;   GDK_WA_X     = 1 << 2,
-;;   GDK_WA_Y     = 1 << 3,
-;;   GDK_WA_NOREDIR   = 1 << 4,
-;;   GDK_WA_TYPE_HINT = 1 << 5
+;;   GDK_WA_X     = 1 << 1,
+;;   GDK_WA_Y     = 1 << 2,
+;;   GDK_WA_TYPE_HINT = 1 << 3
 ;; } GdkWindowAttributesType;
 
 (define-flags-extended WindowAttributesType
   (in-module "Gdk")
   (c-name "GdkWindowAttributesType")
   (values
-    '("title" "GDK_WA_TITLE" "1 << 1")
-    '("x" "GDK_WA_X" "1 << 2")
-    '("y" "GDK_WA_Y" "1 << 3")
-    '("noredir" "GDK_WA_NOREDIR" "1 << 4")
-    '("type-hint" "GDK_WA_TYPE_HINT" "1 << 5")
+    '("x" "GDK_WA_X" "1 << 1")
+    '("y" "GDK_WA_Y" "1 << 2")
+    '("type-hint" "GDK_WA_TYPE_HINT" "1 << 3")
   )
 )
 
diff --git a/gdk/src/gdk_extra.defs b/gdk/src/gdk_extra.defs
index ee9e554..f7709d1 100644
--- a/gdk/src/gdk_extra.defs
+++ b/gdk/src/gdk_extra.defs
@@ -41,17 +41,6 @@
   )
 )
 
-(define-function gtk_drag_set_icon_stock
-  (c-name "gtk_drag_set_icon_stock")
-  (return-type "none")
-  (parameters
-    '("GdkDragContext*" "context")
-    '("const-gchar*" "stock_id")
-    '("gint" "hot_x")
-    '("gint" "hot_y")
-  )
-)
-
 (define-function gtk_drag_set_icon_name
   (c-name "gtk_drag_set_icon_name")
   (return-type "none")
diff --git a/gdk/src/gdk_extra_objects.defs b/gdk/src/gdk_extra_objects.defs
index 91a38cc..c8dee38 100644
--- a/gdk/src/gdk_extra_objects.defs
+++ b/gdk/src/gdk_extra_objects.defs
@@ -83,12 +83,6 @@
   (gtype-id "GDK_TYPE_KEYMAP")
 )
 
-(define-object OffscreenWindow
-  (in-module "Gdk")
-  (c-name "GdkOffscreenWindow")
-  (gtype-id "GDK_TYPE_OFFSCREEN_WINDOW")
-)
-
 (define-object Pixbuf
   (in-module "Gdk")
   (c-name "GdkPixbuf")
@@ -101,12 +95,6 @@
   (gtype-id "GDK_TYPE_PIXBUF_FORMAT")
 )
 
-(define-object Region
-  (in-module "Gdk")
-  (c-name "GdkRegion")
-  (gtype-id "GDK_TYPE_REGION")
-)
-
 (define-object RGBA
   (in-module "Gdk")
   (c-name "GdkRGBA")
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 5005560..1994033 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -616,10 +616,8 @@
   (c-name "GdkWindowAttributesType")
   (gtype-id "GDK_TYPE_WINDOW_ATTRIBUTES_TYPE")
   (values
-    '("title" "GDK_WA_TITLE")
     '("x" "GDK_WA_X")
     '("y" "GDK_WA_Y")
-    '("noredir" "GDK_WA_NOREDIR")
     '("type-hint" "GDK_WA_TYPE_HINT")
   )
 )
@@ -1428,6 +1426,18 @@
   (return-type "gboolean")
 )
 
+(define-method is_composited
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_is_composited")
+  (return-type "gboolean")
+)
+
+(define-method is_rgba
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_is_rgba")
+  (return-type "gboolean")
+)
+
 (define-method get_event
   (of-object "GdkDisplay")
   (c-name "gdk_display_get_event")
@@ -3463,24 +3473,6 @@
   (return-type "GType")
 )
 
-(define-method get_system_visual
-  (of-object "GdkScreen")
-  (c-name "gdk_screen_get_system_visual")
-  (return-type "GdkVisual*")
-)
-
-(define-method get_rgba_visual
-  (of-object "GdkScreen")
-  (c-name "gdk_screen_get_rgba_visual")
-  (return-type "GdkVisual*")
-)
-
-(define-method is_composited
-  (of-object "GdkScreen")
-  (c-name "gdk_screen_is_composited")
-  (return-type "gboolean")
-)
-
 (define-method get_root_window
   (of-object "GdkScreen")
   (c-name "gdk_screen_get_root_window")
@@ -3493,12 +3485,6 @@
   (return-type "GdkDisplay*")
 )
 
-(define-method list_visuals
-  (of-object "GdkScreen")
-  (c-name "gdk_screen_list_visuals")
-  (return-type "GList*")
-)
-
 (define-method get_toplevel_windows
   (of-object "GdkScreen")
   (c-name "gdk_screen_get_toplevel_windows")
@@ -4054,15 +4040,6 @@
   )
 )
 
-(define-method set_override_redirect
-  (of-object "GdkWindow")
-  (c-name "gdk_window_set_override_redirect")
-  (return-type "none")
-  (parameters
-    '("gboolean" "override_redirect")
-  )
-)
-
 (define-method get_accept_focus
   (of-object "GdkWindow")
   (c-name "gdk_window_get_accept_focus")
@@ -5070,54 +5047,3 @@
 ;; From stamp-gdkenumtypes.h
 
 
-
-;; From gdkcolor.h
-
-(define-function gdk_color_get_type
-  (c-name "gdk_color_get_type")
-  (return-type "GType")
-)
-
-(define-method copy
-  (of-object "GdkColor")
-  (c-name "gdk_color_copy")
-  (return-type "GdkColor*")
-)
-
-(define-method free
-  (of-object "GdkColor")
-  (c-name "gdk_color_free")
-  (return-type "none")
-)
-
-(define-method hash
-  (of-object "GdkColor")
-  (c-name "gdk_color_hash")
-  (return-type "guint")
-)
-
-(define-method equal
-  (of-object "GdkColor")
-  (c-name "gdk_color_equal")
-  (return-type "gboolean")
-  (parameters
-    '("const-GdkColor*" "colorb")
-  )
-)
-
-(define-function gdk_color_parse
-  (c-name "gdk_color_parse")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "spec")
-    '("GdkColor*" "color")
-  )
-)
-
-(define-method to_string
-  (of-object "GdkColor")
-  (c-name "gdk_color_to_string")
-  (return-type "gchar*")
-)
-
-
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index d1b7c48..558b2bd 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -287,6 +287,24 @@
   )
 )
 
+(define-property composited
+  (of-object "GdkDisplay")
+  (prop-type "GParamBoolean")
+  (docs "Composited")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property rgba
+  (of-object "GdkDisplay")
+  (prop-type "GParamBoolean")
+  (docs "RGBA")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GdkDisplayManager
 
 (define-signal display-opened
@@ -550,12 +568,6 @@
 
 ;; From GdkScreen
 
-(define-signal composited-changed
-  (of-object "GdkScreen")
-  (return-type "void")
-  (when "last")
-)
-
 (define-signal monitors-changed
   (of-object "GdkScreen")
   (return-type "void")
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]