gtkmm r1109 - in trunk: . gdk/src gtk/src tools/m4
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkmm r1109 - in trunk: . gdk/src gtk/src tools/m4
- Date: Mon, 9 Mar 2009 11:54:12 +0000 (UTC)
Author: murrayc
Date: Mon Mar 9 11:54:12 2009
New Revision: 1109
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1109&view=rev
Log:
2009-03-09 Murray Cumming <murrayc murrayc com>
* gdk/src/gdk_docs.xml:
* gtk/src/gtk_docs.xml: Regenerated with docextract_to_xml.py
* gdk/src/gdk_methods.defs:
* gdk/src/gdk_pixbuf.defs:
* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
* gdk/src/drawable.hg:
* gdk/src/gc.hg:
* tools/m4/convert_gdk.m4:
* gdk/src/region.hg:
* gdk/src/window.hg:
* gtk/src/activatable.hg:
* gtk/src/entry.hg: Added conversions to deal with GTK+ making some
function parameters const.
Modified:
trunk/ChangeLog
trunk/gdk/src/drawable.hg
trunk/gdk/src/gc.hg
trunk/gdk/src/gdk_docs.xml
trunk/gdk/src/gdk_methods.defs
trunk/gdk/src/gdk_pixbuf.defs
trunk/gdk/src/region.hg
trunk/gdk/src/window.hg
trunk/gtk/src/activatable.hg
trunk/gtk/src/entry.hg
trunk/gtk/src/gtk_docs.xml
trunk/gtk/src/gtk_methods.defs
trunk/tools/m4/convert_gdk.m4
Modified: trunk/gdk/src/drawable.hg
==============================================================================
--- trunk/gdk/src/drawable.hg (original)
+++ trunk/gdk/src/drawable.hg Mon Mar 9 11:54:12 2009
@@ -91,6 +91,8 @@
_WRAP_METHOD(void draw_image(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Image>& image, int xsrc, int ysrc, int xdest, int ydest, int width = -1, int height = -1), gdk_draw_image)
//segs is an array, and this function will be used so little that it doesn't seem worth wrapping it to use a container of C++ types.
+ //Note: The segs parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
+#m4 _CONVERSION(`GdkSegment*',`const GdkSegment*',`($3)')
_WRAP_METHOD(void draw_segments(const Glib::RefPtr<const GC>& gc, GdkSegment* segs, int nsegs), gdk_draw_segments) // TODO
//glyphs is not an array. I went down to pango_xft_render in pango and saw that PangoGlyphString here is not an array. -Bryan
@@ -102,6 +104,8 @@
_WRAP_METHOD(void draw_layout(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::Layout>& layout), gdk_draw_layout)
_WRAP_METHOD(void draw_layout(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::Layout>& layout, const Color& foreground, const Color& background), gdk_draw_layout_with_colors)
+//Note: The pixbuf parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
+#m4 _CONVERSION(`const Glib::RefPtr<Pixbuf>&',`const GdkPixbuf*',`Glib::unwrap($3)')
_WRAP_METHOD(void draw_pixbuf(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<Pixbuf>& pixbuf,
int src_x, int src_y, int dest_x, int dest_y,
int width, int height,
Modified: trunk/gdk/src/gc.hg
==============================================================================
--- trunk/gdk/src/gc.hg (original)
+++ trunk/gdk/src/gc.hg Mon Mar 9 11:54:12 2009
@@ -77,9 +77,12 @@
_WRAP_METHOD(void set_clip_origin(int x, int y), gdk_gc_set_clip_origin)
_WRAP_METHOD(void set_clip_mask(const Glib::RefPtr<Bitmap>& mask), gdk_gc_set_clip_mask)
+//Note: The rectangle parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
+#m4 _CONVERSION(`Rectangle&',`const GdkRectangle*',`($3).gobj()')
/** @deprecated Use set_clip_rectangle(const Rectangle& rectangle) instead.
*/
_WRAP_METHOD(void set_clip_rectangle(Rectangle& rectangle), gdk_gc_set_clip_rectangle)
+
_WRAP_METHOD(void set_clip_rectangle(const Rectangle& rectangle), gdk_gc_set_clip_rectangle)
_WRAP_METHOD(void set_clip_region(const Region& region), gdk_gc_set_clip_region)
Modified: trunk/gdk/src/gdk_docs.xml
==============================================================================
--- trunk/gdk/src/gdk_docs.xml (original)
+++ trunk/gdk/src/gdk_docs.xml Mon Mar 9 11:54:12 2009
@@ -33,7 +33,7 @@
<parameters>
<parameter name="message_type">
<parameter_description> the type of ClientMessage events to receive. This will be
-checked against the &lt;structfield&gt;message_type&lt;/structfield&gt; field of the
+checked against the <structfield>message_type</structfield> field of the
XClientMessage event struct.
</parameter_description>
</parameter>
@@ -80,7 +80,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Screen*&lt;/type&gt;
+<return> an Xlib <type>Screen*</type>
the screen of a #GdkScreen.
Since: 2.2
@@ -124,32 +124,35 @@
<return></return>
</function>
-<function name="gdk_window_move_region">
+<function name="gdk_window_constrain_size">
<description>
-Move the part of @window indicated by @region by @dy pixels in the Y
-direction and @dx pixels in the X direction. The portions of @region
-that not covered by the new position of @region are invalidated.
-
-Child windows are not moved.
-
-Since: 2.8
+Constrains a desired width and height according to a
+set of geometry hints (such as minimum and maximum size).
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="geometry">
+<parameter_description> a #GdkGeometry structure
</parameter_description>
</parameter>
-<parameter name="region">
-<parameter_description> The #GdkRegion to move
+<parameter name="flags">
+<parameter_description> a mask indicating what portions of @geometry are set
</parameter_description>
</parameter>
-<parameter name="dx">
-<parameter_description> Amount to move in the X direction
+<parameter name="width">
+<parameter_description> desired width of window
</parameter_description>
</parameter>
-<parameter name="dy">
-<parameter_description> Amount to move in the Y direction
+<parameter name="height">
+<parameter_description> desired height of the window
+</parameter_description>
+</parameter>
+<parameter name="new_width">
+<parameter_description> location to store resulting width
+</parameter_description>
+</parameter>
+<parameter name="new_height">
+<parameter_description> location to store resulting height
</parameter_description>
</parameter>
</parameters>
@@ -170,7 +173,7 @@
<function name="gdk_gc_get_values">
<description>
Retrieves the current values from a graphics context. Note that
-only the pixel values of the @values-&gt;foreground and @values-&gt;background
+only the pixel values of the @values->foreground and @values->background
are filled, use gdk_colormap_query_color() to obtain the rgb values
if you need them.
@@ -232,7 +235,7 @@
</parameter_description>
</parameter>
<parameter name="planes">
-<parameter_description> the plane masks for all planes to free, OR'd together.
+<parameter_description> the plane masks for all planes to free, OR'd together.
</parameter_description>
</parameter>
</parameters>
@@ -241,7 +244,7 @@
<function name="gdk_x11_cursor_get_xcursor">
<description>
-Return value: an Xlib &lt;type&gt;Cursor&lt;/type&gt;.
+Return value: an Xlib <type>Cursor</type>.
</description>
<parameters>
@@ -250,7 +253,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Cursor&lt;/type&gt;.
+<return> an Xlib <type>Cursor</type>.
</return>
</function>
@@ -296,11 +299,8 @@
buggy. On servers without the shape extension, this function
will do nothing.
-On the Win32 platform the functionality is always present.
-
This function works on both toplevel and child windows.
-
</description>
<parameters>
<parameter name="window">
@@ -437,13 +437,11 @@
<function name="gdk_window_set_cursor">
<description>
-Sets the mouse pointer for a #GdkWindow. Use gdk_cursor_new() or
-gdk_cursor_new_from_pixmap() to create the cursor.
-To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
-a cursor with no pixels in it. Passing %NULL for the @cursor argument
-to gdk_window_set_cursor() means that @window will use the cursor of
-its parent window. Most windows should use this default.
-
+Sets the mouse pointer for a #GdkWindow. Use gdk_cursor_new_for_display()
+or gdk_cursor_new_from_pixmap() to create the cursor. To make the cursor
+invisible, use %GDK_BLANK_CURSOR. Passing %NULL for the @cursor argument
+to gdk_window_set_cursor() means that @window will use the cursor of its
+parent window. Most windows should use this default.
</description>
<parameters>
@@ -478,7 +476,7 @@
Sets the GC the renderer draws with. Note that the GC must not be
modified until it is unset by calling the function again with
%NULL for the @gc parameter, since GDK may make internal copies
-of the GC which won't be updated to follow changes to the
+of the GC which won't be updated to follow changes to the
original GC.
Since: 2.6
@@ -515,16 +513,16 @@
</parameter_description>
</parameter>
<parameter name="working_directory">
-<parameter_description> child's current working directory, or %NULL to
-inherit parent's
+<parameter_description> child's current working directory, or %NULL to
+inherit parent's
</parameter_description>
</parameter>
<parameter name="argv">
-<parameter_description> child's argument vector
+<parameter_description> child's argument vector
</parameter_description>
</parameter>
<parameter name="envp">
-<parameter_description> child's environment, or %NULL to inherit parent's
+<parameter_description> child's environment, or %NULL to inherit parent's
</parameter_description>
</parameter>
<parameter name="flags">
@@ -545,16 +543,16 @@
</parameter>
<parameter name="standard_input">
<parameter_description> return location for file descriptor to write to
-child's stdin, or %NULL
+child's stdin, or %NULL
</parameter_description>
</parameter>
<parameter name="standard_output">
-<parameter_description> return location for file descriptor to read child's
+<parameter_description> return location for file descriptor to read child's
stdout, or %NULL
</parameter_description>
</parameter>
<parameter name="standard_error">
-<parameter_description> return location for file descriptor to read child's
+<parameter_description> return location for file descriptor to read child's
stderr, or %NULL
</parameter_description>
</parameter>
@@ -592,8 +590,8 @@
Creates a new pixbuf loader object that always attempts to parse
image data as if it were an image of type @image_type, instead of
identifying the type automatically. Useful if you want an error if
-the image isn't the expected type, for loading image formats
-that can't be reliably identified by looking at the data, or if
+the image isn't the expected type, for loading image formats
+that can't be reliably identified by looking at the data, or if
the user manually forces a specific type.
The list of supported image formats depends on what image loaders
@@ -657,14 +655,13 @@
</return>
</function>
-<function name="gdk_window_get_update_area">
+<function name="gdk_window_clear_area_e">
<description>
-Transfers ownership of the update area from @window to the caller
-of the function. That is, after calling this function, @window will
-no longer have an invalid/dirty region; the update area is removed
-from @window and handed to you. If a window has no update area,
-gdk_window_get_update_area() returns %NULL. You are responsible for
-calling gdk_region_destroy() on the returned region if it's non-%NULL.
+Like gdk_window_clear_area(), but also generates an expose event for
+the cleared area.
+
+This function has a stupid name because it dates back to the mists
+time, pre-GDK-1.0.
</description>
@@ -673,9 +670,24 @@
<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
+<parameter name="x">
+<parameter_description> x coordinate of rectangle to clear
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> y coordinate of rectangle to clear
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> width of rectangle to clear
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> height of rectangle to clear
+</parameter_description>
+</parameter>
</parameters>
-<return> the update area for @window
-</return>
+<return></return>
</function>
<function name="gdk_colormap_ref">
@@ -717,7 +729,7 @@
#GdkWindow is returned.
For example in the X backend, a native window handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -733,7 +745,7 @@
</parameters>
<return> a #GdkWindow wrapper for the native window or
%NULL if the window has been destroyed. The wrapper will be
-newly created, if one doesn't exist already.
+newly created, if one doesn't exist already.
Since: 2.2
</return>
@@ -741,7 +753,7 @@
<function name="_gdk_x11_display_screen_for_xrootwin">
<description>
-Given the root window ID of one of the screen's of a #GdkDisplay,
+Given the root window ID of one of the screen's of a #GdkDisplay,
finds the screen.
@@ -752,7 +764,7 @@
</parameter_description>
</parameter>
<parameter name="xrootwin">
-<parameter_description> window ID for one of of the screen's of the display.
+<parameter_description> window ID for one of of the screen's of the display.
</parameter_description>
</parameter>
</parameters>
@@ -780,7 +792,7 @@
<function name="gdk_x11_drawable_get_xdisplay">
<description>
-Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+Return value: an Xlib <type>Display*</type>.
</description>
<parameters>
@@ -789,13 +801,13 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+<return> an Xlib <type>Display*</type>.
</return>
</function>
<function name="gdk_utf8_to_string_target">
<description>
-Converts an UTF-8 string into the best possible representation
+Convert an UTF-8 string into the best possible representation
as a STRING. The representation of characters not in STRING
is not specified; it may be as pseudo-escape sequences
\x{ABCD}, or it may be in some other form of approximation.
@@ -808,10 +820,9 @@
</parameter_description>
</parameter>
</parameters>
-<return> the newly-allocated string, or %NULL if the
+<return> the newly allocated string, or %NULL if the
conversion failed. (It should not fail for
-any properly formed UTF-8 string unless system
-limits like memory or file descriptors are exceeded.)
+any properly formed UTF-8 string.)
</return>
</function>
@@ -832,6 +843,21 @@
</return>
</function>
+<function name="gdk_x11_font_get_xfont">
+<description>
+Return value: an Xlib <type>XFontStruct*</type> or an <type>XFontSet</type>.
+
+</description>
+<parameters>
+<parameter name="font">
+<parameter_description> a #GdkFont.
+</parameter_description>
+</parameter>
+</parameters>
+<return> an Xlib <type>XFontStruct*</type> or an <type>XFontSet</type>.
+</return>
+</function>
+
<function name="gdk_pixbuf_get_formats">
<description>
Obtains the available information about the image formats supported
@@ -841,7 +867,7 @@
</description>
<parameters>
</parameters>
-<return> A list of #GdkPixbufFormat&lt;!-- --&gt;s describing the supported
+<return> A list of #GdkPixbufFormat<!-- -->s describing the supported
image formats. The list should be freed when it is no longer needed,
but the structures themselves are owned by #GdkPixbuf and should not be
freed.
@@ -850,36 +876,48 @@
</return>
</function>
-<function name="gdk_colormap_query_color">
+<function name="gdk_set_pointer_hooks">
<description>
-Locates the RGB color in @colormap corresponding to the given
-hardware pixel @pixel. @pixel must be a valid pixel in the
-colormap; it's a programmer error to call this function with a
-pixel which is not in the colormap. Hardware pixels are normally
-obtained from gdk_colormap_alloc_colors(), or from a #GdkImage. (A
-#GdkImage contains image data in hardware format, a #GdkPixbuf
-contains image data in a canonical 24-bit RGB format.)
+This function allows for hooking into the operation
+of getting the current location of the pointer. This
+is only useful for such low-level tools as an
+event recorder. Applications should never have any
+reason to use this facility.
-This function is rarely useful; it's used for example to
-implement the eyedropper feature in #GtkColorSelection.
+This function is not multihead safe. For multihead operation,
+see gdk_display_set_pointer_hooks().
</description>
<parameters>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap
-</parameter_description>
-</parameter>
-<parameter name="pixel">
-<parameter_description> pixel value in hardware display format
+<parameter name="new_hooks">
+<parameter_description> a table of pointers to functions for getting
+quantities related to the current pointer position,
+or %NULL to restore the default table.
</parameter_description>
</parameter>
-<parameter name="result">
-<parameter_description> #GdkColor with red, green, blue fields initialized
+</parameters>
+<return> the previous pointer hook table
+</return>
+</function>
+
+<function name="gdk_screen_get_font_options">
+<description>
+Gets any options previously set with gdk_screen_set_font_options().
+
+
+</description>
+<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the current font options, or %NULL if no default
+font options have been set.
+
+Since: 2.10
+</return>
</function>
<function name="gdk_display_set_double_click_distance">
@@ -887,7 +925,7 @@
Sets the double click distance (two clicks within this distance
count as a double click and result in a #GDK_2BUTTON_PRESS event).
See also gdk_display_set_double_click_time().
-Applications should &lt;emphasis&gt;not&lt;/emphasis&gt; set this, it is a global
+Applications should <emphasis>not</emphasis> set this, it is a global
user-configured setting.
Since: 2.4
@@ -925,6 +963,26 @@
</return>
</function>
+<function name="_gdk_event_queue_prepend">
+<description>
+Prepends an event before the head of the event queue.
+
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="event">
+<parameter_description> Event to prepend.
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly prepended list node.
+</return>
+</function>
+
<function name="gdk_colormap_free_colors">
<description>
Frees previously allocated colors.
@@ -939,7 +997,7 @@
<parameter_description> the colors to free.
</parameter_description>
</parameter>
-<parameter name="ncolors">
+<parameter name="n_colors">
<parameter_description> the number of colors in @colors.
</parameter_description>
</parameter>
@@ -953,7 +1011,7 @@
"png", "tiff", "ico" or "bmp". This is a convenience function that uses
gdk_pixbuf_save_to_callback() to do the real work. Note that the buffer
is not nul-terminated and may contain embedded nuls.
-If @error is set, %FALSE will be returned and @string will be set to
+If @error is set, %FALSE will be returned and @buffer will be set to
%NULL. Possible errors include those in the #GDK_PIXBUF_ERROR
domain.
@@ -1010,6 +1068,55 @@
<return></return>
</function>
+<function name="gdk_test_simulate_key">
+<description>
+This function is intended to be used in Gtk+ test programs.
+If (@x,@y) are > (-1,-1), it will warp the mouse pointer to
+the given (@x,@y) corrdinates within @window and simulate a
+key press or release event.
+When the mouse pointer is warped to the target location, use
+of this function outside of test programs that run in their
+own virtual windowing system (e.g. Xvfb) is not recommended.
+If (@x,@y) are passed as (-1,-1), the mouse pointer will not
+be warped and @window origin will be used as mouse pointer
+location for the event.
+Also, gtk_test_simulate_key() is a fairly low level function,
+for most testing purposes, gtk_test_widget_send_key() is the
+right function to call which will generate a key press event
+followed by its accompanying key release event.
+
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> Gdk window to simulate a key event for.
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> x coordinate within @window for the key event.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> y coordinate within @window for the key event.
+</parameter_description>
+</parameter>
+<parameter name="keyval">
+<parameter_description> A Gdk keyboard value.
+</parameter_description>
+</parameter>
+<parameter name="modifiers">
+<parameter_description> Keyboard modifiers the event is setup with.
+</parameter_description>
+</parameter>
+<parameter name="key_pressrelease">
+<parameter_description> either %GDK_KEY_PRESS or %GDK_KEY_RELEASE
+</parameter_description>
+</parameter>
+</parameters>
+<return> wether all actions neccessary for a key event simulation were carried out successfully.
+</return>
+</function>
+
<function name="gdk_x11_window_set_user_time">
<description>
The application can use this call to update the _NET_WM_USER_TIME
@@ -1064,31 +1171,21 @@
<return></return>
</function>
-<function name="gdk_window_set_background">
+<function name="gdk_screen_get_n_monitors">
<description>
-Sets the background color of @window. (However, when using GTK+,
-set the background of a widget with gtk_widget_modify_bg() - if
-you're an application - or gtk_style_set_background() - if you're
-implementing a custom widget.)
-
-The @color must be allocated; gdk_rgb_find_color() is the best way
-to allocate a color.
-
-See also gdk_window_set_back_pixmap().
-
+Returns: number of monitors which @screen consists of.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
-</parameter_description>
-</parameter>
-<parameter name="color">
-<parameter_description> an allocated #GdkColor
+<parameter name="screen">
+<parameter_description> a #GdkScreen.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> number of monitors which @screen consists of.
+
+Since: 2.2
+</return>
</function>
<function name="gdk_screen_get_setting">
@@ -1139,25 +1236,18 @@
</return>
</function>
-<function name="gdk_font_equal">
+<function name="gdk_font_id">
<description>
-Compares two fonts for equality. Single fonts compare equal
-if they have the same X font ID. This operation does
-not currently work correctly for fontsets.
-
+Return value: the numeric X Font ID
</description>
<parameters>
-<parameter name="fonta">
+<parameter name="font">
<parameter_description> a #GdkFont.
</parameter_description>
</parameter>
-<parameter name="fontb">
-<parameter_description> another #GdkFont.
-</parameter_description>
-</parameter>
</parameters>
-<return> %TRUE if the fonts are equal.
+<return> the numeric X Font ID
</return>
</function>
@@ -1183,7 +1273,7 @@
<function name="gdk_x11_gc_get_xgc">
<description>
-Return value: an Xlib &lt;type&gt;GC&lt;/type&gt;.
+Return value: an Xlib <type>GC</type>.
</description>
<parameters>
@@ -1192,7 +1282,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;GC&lt;/type&gt;.
+<return> an Xlib <type>GC</type>.
</return>
</function>
@@ -1225,8 +1315,8 @@
Begins a window move operation (for a toplevel window). You might
use this function to implement a "window move grip," for
example. The function works best with window managers that support
-the &lt;ulink url="http://www.freedesktop.org/Standards/wm-spec"&gt;Extended
-Window Manager Hints&lt;/ulink&gt;, but has a fallback implementation for
+the <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended
+Window Manager Hints</ulink>, but has a fallback implementation for
other window managers.
@@ -1280,7 +1370,11 @@
Try to use gdk_pixbuf_scale_simple() first, this function is
the industrial-strength power tool you can fall back to if
-gdk_pixbuf_scale_simple() isn't powerful enough.
+gdk_pixbuf_scale_simple() isn't powerful enough.
+
+If the source rectangle overlaps the destination rectangle on the
+same pixbuf, it will be overwritten during the scaling which
+results in rendering artifacts.
</description>
<parameters>
@@ -1332,30 +1426,6 @@
<return></return>
</function>
-<function name="gdk_colors_store">
-<description>
-Changes the value of the first @ncolors colors in
-a private colormap. This function is obsolete and
-should not be used. See gdk_color_change().
-
-</description>
-<parameters>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap.
-</parameter_description>
-</parameter>
-<parameter name="colors">
-<parameter_description> the new color values.
-</parameter_description>
-</parameter>
-<parameter name="ncolors">
-<parameter_description> the number of colors to change.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_font_from_description_for_display">
<description>
Loads a #GdkFont based on a Pango font description for use on @display.
@@ -1388,7 +1458,7 @@
Set the double click time for the default display. See
gdk_display_set_double_click_time().
See also gdk_display_set_double_click_distance().
-Applications should &lt;emphasis&gt;not&lt;/emphasis&gt; set this, it is a
+Applications should <emphasis>not</emphasis> set this, it is a
global user-configured setting.
</description>
@@ -1529,9 +1599,10 @@
</return>
</function>
-<function name="gdk_display_supports_shapes">
+<function name="gdk_display_get_name">
<description>
-Returns: %TRUE if shaped windows are supported
+Gets the name of the display.
+
</description>
<parameters>
@@ -1540,9 +1611,10 @@
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if shaped windows are supported
+<return> a string representing the display name. This string is owned
+by GDK and should not be modified or freed.
-Since: 2.10
+Since: 2.2
</return>
</function>
@@ -1634,7 +1706,7 @@
<description>
Sets whether a trace of received events is output.
Note that GTK+ must be compiled with debugging (that is,
-configured using the &lt;option&gt;--enable-debug&lt;/option&gt; option)
+configured using the <option>--enable-debug</option> option)
to use this option.
</description>
@@ -1684,7 +1756,7 @@
current window position, regardless of which events have been
received or processed.
-The position coordinates are relative to the window's parent window.
+The position coordinates are relative to the window's parent window.
</description>
@@ -1763,11 +1835,16 @@
<function name="gdk_pixbuf_new_from_file_at_size">
<description>
-Creates a new pixbuf by loading an image from a file. The file format is
-detected automatically. If %NULL is returned, then @error will be set.
-Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains.
+Creates a new pixbuf by loading an image from a file.
+The file format is detected automatically. If %NULL is returned, then
+ error will be set. Possible errors are in the #GDK_PIXBUF_ERROR and
+#G_FILE_ERROR domains.
+
The image will be scaled to fit in the requested size, preserving
-the image's aspect ratio.
+the image's aspect ratio. Note that the returned pixbuf may be smaller
+than @width x @height, if the aspect ratio requires it. To load
+and image at the requested size, regardless of aspect ratio, use
+gdk_pixbuf_new_from_file_at_scale().
</description>
@@ -1791,7 +1868,7 @@
</parameters>
<return> A newly-created pixbuf with a reference count of 1, or
%NULL if any of several error conditions occurred: the file could not
-be opened, there was no loader for the file's format, there was not
+be opened, there was no loader for the file's format, there was not
enough memory to allocate the image buffer, or the image file contained
invalid data.
@@ -1802,14 +1879,14 @@
<function name="gdk_draw_layout_with_colors">
<description>
Render a #PangoLayout onto a #GdkDrawable, overriding the
-layout's normal colors with @foreground and/or @background.
+layout's normal colors with @foreground and/or @background.
@foreground and @background need not be allocated.
-If the layout's #PangoContext has a transformation matrix set, then
+If the layout's #PangoContext has a transformation matrix set, then
@x and @y specify the position of the top left corner of the
bounding box (in device space) of the transformed layout.
-If you're using GTK+, the ususal way to obtain a #PangoLayout
+If you're using GTK+, the ususal way to obtain a #PangoLayout
is gtk_widget_create_pango_layout().
</description>
@@ -1867,7 +1944,7 @@
</parameter_description>
</parameter>
<parameter name="cmap">
-<parameter_description> A colormap if @src doesn't have one set.
+<parameter_description> A colormap if @src doesn't have one set.
</parameter_description>
</parameter>
<parameter name="src_x">
@@ -1900,25 +1977,43 @@
</return>
</function>
-<function name="gdk_window_get_children">
+<function name="_gdk_image_get_scratch">
<description>
-Gets the list of children of @window known to GDK.
-This function only returns children created via GDK,
-so for example it's useless when used with the root window;
-it only returns windows an application created itself.
-
-The returned list must be freed, but the elements in the
-list need not be.
+Allocates an image of size width/height, up to a maximum
+of GDK_SCRATCH_IMAGE_WIDTHxGDK_SCRATCH_IMAGE_HEIGHT that is
+suitable to use on @screen.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="screen">
+<parameter_description> a #GdkScreen
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> desired width
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> desired height
+</parameter_description>
+</parameter>
+<parameter name="depth">
+<parameter_description> depth of image
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> X location within returned image of scratch image
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> Y location within returned image of scratch image
</parameter_description>
</parameter>
</parameters>
-<return> list of child windows inside @window
+<return> a scratch image. This must be used by a
+call to gdk_image_put() before any other calls to
+_gdk_image_get_scratch()
</return>
</function>
@@ -2021,21 +2116,22 @@
</return>
</function>
-<function name="gdk_x11_display_ungrab">
+<function name="gdk_x11_lookup_xdisplay">
<description>
-Ungrab @display after it has been grabbed with
-gdk_x11_display_grab().
+Find the #GdkDisplay corresponding to @display, if any exists.
-Since: 2.2
</description>
<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
+<parameter name="xdisplay">
+<parameter_description> a pointer to an X Display
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the #GdkDisplay, if found, otherwise %NULL.
+
+Since: 2.2
+</return>
</function>
<function name="gdk_x11_display_get_user_time">
@@ -2057,7 +2153,7 @@
<function name="gdk_x11_image_get_xdisplay">
<description>
-Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+Return value: an Xlib <type>Display*</type>.
</description>
<parameters>
@@ -2066,7 +2162,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+<return> an Xlib <type>Display*</type>.
</return>
</function>
@@ -2157,7 +2253,7 @@
</parameters>
<return> A newly-created pixbuf with a reference count of 1, or %NULL if
any of several error conditions occurred: the file could not be opened,
-there was no loader for the file's format, there was not enough memory to
+there was no loader for the file's format, there was not enough memory to
allocate the image buffer, or the image file contained invalid data.
</return>
</function>
@@ -2195,16 +2291,28 @@
</return>
</function>
-<function name="gdk_screen_height_mm">
+<function name="gdk_colors_store">
<description>
-Return value: the height of the default screen in millimeters,
+Changes the value of the first @ncolors colors in
+a private colormap. This function is obsolete and
+should not be used. See gdk_color_change().
</description>
<parameters>
+<parameter name="colormap">
+<parameter_description> a #GdkColormap.
+</parameter_description>
+</parameter>
+<parameter name="colors">
+<parameter_description> the new color values.
+</parameter_description>
+</parameter>
+<parameter name="ncolors">
+<parameter_description> the number of colors to change.
+</parameter_description>
+</parameter>
</parameters>
-<return> the height of the default screen in millimeters,
-though it is not always correct.
-</return>
+<return></return>
</function>
<function name="gdk_gc_set_font">
@@ -2249,8 +2357,8 @@
<function name="gdk_mbstowcs">
<description>
Converts a multi-byte string to a wide character string.
-(The function name comes from an acronym of 'Multi-Byte String TO Wide
-Character String').
+(The function name comes from an acronym of 'Multi-Byte String TO Wide
+Character String').
</description>
@@ -2305,10 +2413,10 @@
<function name="gdk_draw_layout_line_with_colors">
<description>
Render a #PangoLayoutLine onto a #GdkDrawable, overriding the
-layout's normal colors with @foreground and/or @background.
+layout's normal colors with @foreground and/or @background.
@foreground and @background need not be allocated.
-If the layout's #PangoContext has a transformation matrix set, then
+If the layout's #PangoContext has a transformation matrix set, then
@x and @y specify the position of the left edge of the baseline
(left is in before-tranform user coordinates) in after-transform
device coordinates.
@@ -2499,21 +2607,27 @@
<return></return>
</function>
-<function name="gdk_window_withdraw">
+<function name="gdk_x11_atom_to_xatom_for_display">
<description>
-Withdraws a window (unmaps it and asks the window manager to forget about it).
-This function is not really useful as gdk_window_hide() automatically
-withdraws toplevel windows before hiding them.
+Converts from a #GdkAtom to the X atom for a #GdkDisplay
+with the same string value.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a toplevel #GdkWindow
+<parameter name="display">
+<parameter_description> A #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="atom">
+<parameter_description> A #GdkAtom
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the X atom corresponding to @atom.
+
+Since: 2.2
+</return>
</function>
<function name="gdk_window_get_internal_paint_info">
@@ -2559,7 +2673,7 @@
<function name="gdk_gc_set_foreground">
<description>
Sets the foreground color for a graphics context.
-Note that this function uses @color-&gt;pixel, use
+Note that this function uses @color->pixel, use
gdk_gc_set_rgb_fg_color() to specify the foreground
color as red, green, blue components.
@@ -2593,26 +2707,25 @@
</return>
</function>
-<function name="gdk_event_get_time">
+<function name="gdk_screen_get_default">
<description>
-returns #GDK_CURRENT_TIME. If @event is %NULL, returns #GDK_CURRENT_TIME.
-Return value: time stamp field from @event
+Gets the default screen for the default display. (See
+gdk_display_get_default ()).
+
</description>
<parameters>
-<parameter name="event">
-<parameter_description> a #GdkEvent
-</parameter_description>
-</parameter>
</parameters>
-<return> time stamp field from @event
+<return> a #GdkScreen, or %NULL if there is no default display.
+
+Since: 2.2
</return>
</function>
<function name="gdk_color_hash">
<description>
A hash function suitable for using for a hash
-table that stores #GdkColor's.
+table that stores #GdkColor's.
</description>
@@ -2648,35 +2761,6 @@
<return></return>
</function>
-<function name="gdk_pango_renderer_set_stipple">
-<description>
-Sets the stipple for one render part (foreground, background, underline,
-etc.) Note that this is overwritten when iterating through the individual
-styled runs of a #PangoLayout or #PangoLayoutLine. This function is thus
-only useful when you call low level functions like pango_renderer_draw_glyphs()
-directly, or in the 'prepare_run' virtual function of a subclass of
-#GdkPangoRenderer.
-
-Since: 2.6
-
-</description>
-<parameters>
-<parameter name="gdk_renderer">
-<parameter_description> a #GdkPangoRenderer
-</parameter_description>
-</parameter>
-<parameter name="part">
-<parameter_description> the part to render with the stipple
-</parameter_description>
-</parameter>
-<parameter name="stipple">
-<parameter_description> the new stipple value.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_event_get_axis">
<description>
Extract the axis value for a particular axis use from
@@ -2754,7 +2838,7 @@
<description>
Creates a #PangoContext for the default GDK screen.
-The context must be freed when you're finished with it.
+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
@@ -2764,7 +2848,7 @@
#cairo_font_options_t) for the default screen; 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 screen's font rendering settings.
+changes to the screen's font rendering settings.
</description>
@@ -2793,13 +2877,14 @@
</return>
</function>
-<function name="gdk_window_clear_area_e">
+<function name="gdk_window_get_update_area">
<description>
-Like gdk_window_clear_area(), but also generates an expose event for
-the cleared area.
-
-This function has a stupid name because it dates back to the mists
-time, pre-GDK-1.0.
+Transfers ownership of the update area from @window to the caller
+of the function. That is, after calling this function, @window will
+no longer have an invalid/dirty region; the update area is removed
+from @window and handed to you. If a window has no update area,
+gdk_window_get_update_area() returns %NULL. You are responsible for
+calling gdk_region_destroy() on the returned region if it's non-%NULL.
</description>
@@ -2808,31 +2893,16 @@
<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
-<parameter name="x">
-<parameter_description> x coordinate of rectangle to clear
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> y coordinate of rectangle to clear
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> width of rectangle to clear
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> height of rectangle to clear
-</parameter_description>
-</parameter>
</parameters>
-<return></return>
+<return> the update area for @window
+</return>
</function>
<function name="gdk_pixbuf_loader_get_pixbuf">
<description>
Queries the #GdkPixbuf that a pixbuf loader is currently creating.
In general it only makes sense to call this function after the
-"area_prepared" signal has been emitted by the loader; this means
+"area-prepared" signal has been emitted by the loader; this means
that enough data has been read to know the size of the image that
will be allocated. If the loader has not received enough data via
gdk_pixbuf_loader_write(), then this function returns %NULL. The
@@ -2993,19 +3063,38 @@
</return>
</function>
-<function name="gdk_font_id">
+<function name="gdk_display_get_pointer">
<description>
-Return value: the numeric X Font ID
+Gets the current location of the pointer and the current modifier
+mask for a given display.
+
+Since: 2.2
</description>
<parameters>
-<parameter name="font">
-<parameter_description> a #GdkFont.
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="screen">
+<parameter_description> location to store the screen that the
+cursor is on, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> location to store root window X coordinate of pointer, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> location to store root window Y coordinate of pointer, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="mask">
+<parameter_description> location to store current modifier mask, or %NULL
</parameter_description>
</parameter>
</parameters>
-<return> the numeric X Font ID
-</return>
+<return></return>
</function>
<function name="gdk_window_lookup">
@@ -3013,7 +3102,7 @@
Looks up the #GdkWindow that wraps the given native window handle.
For example in the X backend, a native window handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -3033,7 +3122,7 @@
Used to determine how to respond to the area_updated signal on
#GdkPixbufLoader when loading an animation. area_updated is emitted
for an area of the frame currently streaming in to the loader. So if
-you're on the currently loading frame, you need to redraw the screen for
+you're on the currently loading frame, you need to redraw the screen for
the updated area.
@@ -3044,7 +3133,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the frame we're on is partially loaded, or the last frame
+<return> %TRUE if the frame we're on is partially loaded, or the last frame
</return>
</function>
@@ -3139,8 +3228,8 @@
On X11, asks the window manager to keep @window above, if the window
manager supports this operation. Not all window managers support
-this, and some deliberately ignore it or don't have a concept of
-"keep above"; so you can't rely on the window being kept above.
+this, and some deliberately ignore it or don't have a concept of
+"keep above"; so you can't rely on the window being kept above.
But it will happen with most standard window managers,
and GDK makes a best effort to get it to happen.
@@ -3174,10 +3263,10 @@
if you are redrawing the same region 400 times you may never
notice, aside from noticing a speed problem. Enabling update
debugging causes GTK to flicker slowly and noticeably, so you can
-see exactly what's being redrawn when, in what order.
+see exactly what's being redrawn when, in what order.
The --gtk-debug=updates command line option passed to GTK+ programs
-enables this debug option at application startup time. That's
+enables this debug option at application startup time. That's
usually more useful than calling gdk_window_set_debug_updates()
yourself, though you might want to use this function to enable
updates sometime after application startup time.
@@ -3207,17 +3296,25 @@
<return></return>
</function>
-<function name="gdk_get_default_root_window">
+<function name="gdk_colormap_change">
<description>
-Obtains the root window (parent all other windows are inside)
-for the default display and screen.
-
+Changes the value of the first @ncolors in a private colormap
+to match the values in the <structfield>colors</structfield>
+array in the colormap. This function is obsolete and
+should not be used. See gdk_color_change().
</description>
<parameters>
+<parameter name="colormap">
+<parameter_description> a #GdkColormap.
+</parameter_description>
+</parameter>
+<parameter name="ncolors">
+<parameter_description> the number of colors to change.
+</parameter_description>
+</parameter>
</parameters>
-<return> the default root window
-</return>
+<return></return>
</function>
<function name="_gdk_gc_get_stipple">
@@ -3244,7 +3341,6 @@
means the window should report button press events. The event mask
is the bitwise OR of values from the #GdkEventMask enumeration.
-
</description>
<parameters>
<parameter name="window">
@@ -3262,7 +3358,7 @@
<function name="gdk_query_visual_types">
<description>
This function returns the available visual types for the default
-screen. It's equivalent to listing the visuals
+screen. It's equivalent to listing the visuals
(gdk_list_visuals()) and then looking at the type field in each
visual, removing duplicates.
@@ -3303,6 +3399,28 @@
<return></return>
</function>
+<function name="gdk_screen_get_monitor_height_mm">
+<description>
+Gets the height in millimeters of the specified monitor.
+
+
+</description>
+<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
+</parameter_description>
+</parameter>
+<parameter name="monitor_num">
+<parameter_description> number of the monitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the height of the monitor, or -1 if not available
+
+Since: 2.14
+</return>
+</function>
+
<function name="gdk_display_close">
<description>
Closes the connection to the windowing system for the given display,
@@ -3320,28 +3438,52 @@
<return></return>
</function>
-<function name="gdk_query_depths">
+<function name="gdk_event_get_root_coords">
<description>
-This function returns the available bit depths for the default
-screen. It's equivalent to listing the visuals
-(gdk_list_visuals()) and then looking at the depth field in each
-visual, removing duplicates.
-
-The array returned by this function should not be freed.
+Extract the root window relative x/y coordinates from an event.
</description>
<parameters>
-<parameter name="depths">
-<parameter_description> return location for available depths
+<parameter name="event">
+<parameter_description> a #GdkEvent
</parameter_description>
</parameter>
-<parameter name="count">
-<parameter_description> return location for number of available depths
+<parameter name="x_root">
+<parameter_description> location to put root window x coordinate
+</parameter_description>
+</parameter>
+<parameter name="y_root">
+<parameter_description> location to put root window y coordinate
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the event delivered root window coordinates
+</return>
+</function>
+
+<function name="gdk_query_depths">
+<description>
+This function returns the available bit depths for the default
+screen. It's equivalent to listing the visuals
+(gdk_list_visuals()) and then looking at the depth field in each
+visual, removing duplicates.
+
+The array returned by this function should not be freed.
+
+
+</description>
+<parameters>
+<parameter name="depths">
+<parameter_description> return location for available depths
+</parameter_description>
+</parameter>
+<parameter name="count">
+<parameter_description> return location for number of available depths
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
</function>
<function name="gdk_char_measure">
@@ -3384,16 +3526,16 @@
</parameter_description>
</parameter>
<parameter name="working_directory">
-<parameter_description> child's current working directory, or %NULL to
-inherit parent's
+<parameter_description> child's current working directory, or %NULL to
+inherit parent's
</parameter_description>
</parameter>
<parameter name="argv">
-<parameter_description> child's argument vector
+<parameter_description> child's argument vector
</parameter_description>
</parameter>
<parameter name="envp">
-<parameter_description> child's environment, or %NULL to inherit parent's
+<parameter_description> child's environment, or %NULL to inherit parent's
</parameter_description>
</parameter>
<parameter name="flags">
@@ -3446,7 +3588,7 @@
This may fail if the pixmap has been destroyed.
For example in the X backend, a native pixmap handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
This function is an alternative to gdk_pixmap_foreign_new_for_display()
for cases where the dimensions of the pixmap are known. For the X
@@ -3483,35 +3625,52 @@
</return>
</function>
-<function name="gdk_pixbuf_loader_get_format">
+<function name="gdk_pixbuf_new_from_stream">
<description>
-Obtains the available information about the format of the
-currently loading image file.
+Creates a new pixbuf by loading an image from an input stream.
+
+The file format is detected automatically. If %NULL is returned, then
+ error will be set. The @cancellable can be used to abort the operation
+from another thread. If the operation was cancelled, the error
+%GIO_ERROR_CANCELLED will be returned. Other possible errors are in
+the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains.
+
+The stream is not closed.
</description>
<parameters>
-<parameter name="loader">
-<parameter_description> A pixbuf loader.
+<parameter name="stream">
+<parameter_description> a #GInputStream to load the pixbuf from
+</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 an error
</parameter_description>
</parameter>
</parameters>
-<return> A #GdkPixbufFormat or %NULL. The return value is owned
-by GdkPixbuf and should not be freed.
+<return> A newly-created pixbuf, or %NULL if any of several error
+conditions occurred: the file could not be opened, the image format is
+not supported, there was not enough memory to allocate the image buffer,
+the stream contained invalid data, or the operation was cancelled.
-Since: 2.2
+Since: 2.14
</return>
</function>
<function name="gdk_set_sm_client_id">
<description>
-Sets the &lt;literal&gt;SM_CLIENT_ID&lt;/literal&gt; property on the application's leader window so that
-the window manager can save the application's state using the X11R6 ICCCM
+Sets the <literal>SM_CLIENT_ID</literal> property on the application's leader window so that
+the window manager can save the application's state using the X11R6 ICCCM
session management protocol.
See the X Session Management Library documentation for more information on
session management and the Inter-Client Communication Conventions Manual
-(ICCCM) for information on the &lt;literal&gt;WM_CLIENT_LEADER&lt;/literal&gt; property.
+(ICCCM) for information on the <literal>WM_CLIENT_LEADER</literal> property.
(Both documents are part of the X Window System distribution.)
</description>
@@ -3580,7 +3739,7 @@
<function name="gdk_visual_get_system">
<description>
-Get the system'sdefault visual for the default GDK screen.
+Get the system'sdefault visual for the default GDK screen.
This is the visual for the root window of the display.
The return value should not be freed.
@@ -3592,18 +3751,42 @@
</return>
</function>
-<function name="_gdk_event_queue_remove_link">
+<function name="gdk_draw_glyphs">
<description>
-Removes a specified list node from the event queue.
+This is a low-level function; 99% of text rendering should be done
+using gdk_draw_layout() instead.
+
+A glyph is a single image in a font. This function draws a sequence of
+glyphs. To obtain a sequence of glyphs you have to understand a
+lot about internationalized text handling, which you don't want to
+understand; thus, use gdk_draw_layout() instead of this function,
+gdk_draw_layout() handles the details.
+
</description>
<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable
</parameter_description>
</parameter>
-<parameter name="node">
-<parameter_description> node to remove
+<parameter name="gc">
+<parameter_description> a #GdkGC
+</parameter_description>
+</parameter>
+<parameter name="font">
+<parameter_description> font to be used
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> X coordinate of baseline origin
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> Y coordinate of baseline origin
+</parameter_description>
+</parameter>
+<parameter name="glyphs">
+<parameter_description> the glyph string to draw
</parameter_description>
</parameter>
</parameters>
@@ -3627,36 +3810,6 @@
</return>
</function>
-<function name="_gdk_window_destroy_hierarchy">
-<description>
-Internal function to destroy a window. Like gdk_window_destroy(),
-but does not drop the reference count created by gdk_window_new().
-
-</description>
-<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
-</parameter_description>
-</parameter>
-<parameter name="recursing">
-<parameter_description> If TRUE, then this is being called because a parent
-was destroyed. This generally means that the call to the
-windowing system to destroy the window can be omitted, since
-it will be destroyed as a result of the parent being destroyed.
-Unless @foreign_destroy.
-</parameter_description>
-</parameter>
-<parameter name="foreign_destroy">
-<parameter_description> If TRUE, the window or a parent was destroyed by some
-external agency. The window has already been destroyed and no
-windowing system calls should be made. (This may never happen
-for some windowing systems.)
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_gc_set_clip_mask">
<description>
Sets the clip mask for a graphics context from a bitmap.
@@ -3695,32 +3848,40 @@
</return>
</function>
-<function name="gdk_draw_trapezoids">
+<function name="gdk_draw_text">
<description>
-Draws a set of anti-aliased trapezoids. The trapezoids are
-combined using saturation addition, then drawn over the background
-as a set. This is low level functionality used internally to implement
-rotated underlines and backgrouds when rendering a PangoLayout and is
-likely not useful for applications.
+Draws a number of characters in the given font or fontset.
-Since: 2.6
+Deprecated: Use gdk_draw_layout() instead.
</description>
<parameters>
<parameter name="drawable">
-<parameter_description> a #GdkDrawable
+<parameter_description> a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+</parameter_description>
+</parameter>
+<parameter name="font">
+<parameter_description> a #GdkFont.
</parameter_description>
</parameter>
<parameter name="gc">
-<parameter_description> a #GdkGC
+<parameter_description> a #GdkGC.
</parameter_description>
</parameter>
-<parameter name="trapezoids">
-<parameter_description> an array of #GdkTrapezoid structures
+<parameter name="x">
+<parameter_description> the x coordinate of the left edge of the text.
</parameter_description>
</parameter>
-<parameter name="n_trapezoids">
-<parameter_description> the number of trapezoids to draw
+<parameter name="y">
+<parameter_description> the y coordinate of the baseline of the text.
+</parameter_description>
+</parameter>
+<parameter name="text">
+<parameter_description> the characters to draw.
+</parameter_description>
+</parameter>
+<parameter name="text_length">
+<parameter_description> the number of characters of @text to draw.
</parameter_description>
</parameter>
</parameters>
@@ -3744,11 +3905,11 @@
</parameter_description>
</parameter>
<parameter name="width">
-<parameter_description> location to store drawable's width, or %NULL
+<parameter_description> location to store drawable's width, or %NULL
</parameter_description>
</parameter>
<parameter name="height">
-<parameter_description> location to store drawable's height, or %NULL
+<parameter_description> location to store drawable's height, or %NULL
</parameter_description>
</parameter>
</parameters>
@@ -3757,8 +3918,8 @@
<function name="gdk_x11_font_get_name">
<description>
-Return the X Logical Font Description (for font-&gt;type == GDK_FONT_FONT)
-or comma separated list of XLFDs (for font-&gt;type == GDK_FONT_FONTSET)
+Return the X Logical Font Description (for font->type == GDK_FONT_FONT)
+or comma separated list of XLFDs (for font->type == GDK_FONT_FONTSET)
that was used to load the font. If the same font was loaded
via multiple names, which name is returned is undefined.
@@ -3775,38 +3936,70 @@
</return>
</function>
-<function name="gdk_window_get_toplevel">
+<function name="gdk_app_launch_context_new">
<description>
-Gets the toplevel window that's an ancestor of @window.
+Creates a new #GdkAppLaunchContext.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
-</parameter_description>
-</parameter>
</parameters>
-<return> the toplevel window containing @window
+<return> a new #GdkAppLaunchContext
+
+Since: 2.14
</return>
</function>
-<function name="gdk_region_offset">
+<function name="gdk_window_begin_paint_region">
<description>
-Moves a region the specified distance.
+Indicates that you are beginning the process of redrawing @region.
+A backing store (offscreen buffer) large enough to contain @region
+will be created. The backing store will be initialized with the
+background color or background pixmap for @window. Then, all
+drawing operations performed on @window will be diverted to the
+backing store. When you call gdk_window_end_paint(), the backing
+store will be copied to @window, making it visible onscreen. Only
+the part of @window contained in @region will be modified; that is,
+drawing operations are clipped to @region.
+
+The net result of all this is to remove flicker, because the user
+sees the finished product appear all at once when you call
+gdk_window_end_paint(). If you draw to @window directly without
+calling gdk_window_begin_paint_region(), the user may see flicker
+as individual drawing operations are performed in sequence. The
+clipping and background-initializing features of
+gdk_window_begin_paint_region() are conveniences for the
+programmer, so you can avoid doing that work yourself.
+
+When using GTK+, the widget system automatically places calls to
+gdk_window_begin_paint_region() and gdk_window_end_paint() around
+emissions of the expose_event signal. That is, if you're writing an
+expose event handler, you can assume that the exposed area in
+#GdkEventExpose has already been cleared to the window background,
+is already set as the clip region, and already has a backing store.
+Therefore in most cases, application code need not call
+gdk_window_begin_paint_region(). (You can disable the automatic
+calls around expose events on a widget-by-widget basis by calling
+gtk_widget_set_double_buffered().)
+
+If you call this function multiple times before calling the
+matching gdk_window_end_paint(), the backing stores are pushed onto
+a stack. gdk_window_end_paint() copies the topmost backing store
+onscreen, subtracts the topmost region from all other regions in
+the stack, and pops the stack. All drawing operations affect only
+the topmost backing store in the stack. One matching call to
+gdk_window_end_paint() is required for each call to
+gdk_window_begin_paint_region().
+
</description>
<parameters>
-<parameter name="region">
-<parameter_description> a #GdkRegion
-</parameter_description>
-</parameter>
-<parameter name="dx">
-<parameter_description> the distance to move the region horizontally
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
-<parameter name="dy">
-<parameter_description> the distance to move the region vertically
+<parameter name="region">
+<parameter_description> region you intend to draw to
</parameter_description>
</parameter>
</parameters>
@@ -3835,7 +4028,7 @@
<description>
Obtains the parent of @window, as known to GDK. Does not query the
X server; thus this returns the parent as passed to gdk_window_new(),
-not the actual parent. This should never matter unless you're using
+not the actual parent. This should never matter unless you're using
Xlib calls mixed with GDK calls on the X11 platform. It may also
matter for toplevel windows, because the window manager may choose
to reparent them.
@@ -3904,7 +4097,7 @@
<function name="gdk_window_get_geometry">
<description>
Any of the return location arguments to this function may be %NULL,
-if you aren't interested in getting the value of that field.
+if you aren't interested in getting the value of that field.
The X and Y coordinates returned are relative to the parent window
of @window, which for toplevels usually means relative to the
@@ -3917,14 +4110,14 @@
#GdkEventConfigure. gdk_window_get_position() in contrast gets the
position from the most recent configure event.
-&lt;note&gt;
-If @window is not a toplevel, it is &lt;emphasis&gt;much&lt;/emphasis&gt; better
-to call gdk_window_get_position() and gdk_drawable_get_size() instead,
-because it avoids the roundtrip to the X server and because
+<note>
+If @window is not a toplevel, it is <emphasis>much</emphasis> better
+to call gdk_window_get_position() and gdk_drawable_get_size() instead,
+because it avoids the roundtrip to the X server and because
gdk_drawable_get_size() supports the full 32-bit coordinate space,
whereas gdk_window_get_geometry() is restricted to the 16-bit
coordinates of X11.
-&lt;/note&gt;
+</note>
</description>
<parameters>
@@ -3968,7 +4161,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> A pointer to the pixbuf's pixel data. Please see &lt;xref linkend="image-data"/&gt;
+<return> A pointer to the pixbuf's pixel data. Please see <xref linkend="image-data"/>
for information about how the pixel data is stored in
memory.
</return>
@@ -4001,7 +4194,6 @@
request to move the window in the Z-order, gdk_window_raise() only
requests the restack, does not guarantee it.
-
</description>
<parameters>
<parameter name="window">
@@ -4012,51 +4204,106 @@
<return></return>
</function>
-<function name="gdk_window_set_urgency_hint">
+<function name="gdk_window_set_hints">
<description>
-Toggles whether a window needs the user's
-urgent attention.
+This function is broken and useless and you should ignore it.
+If using GTK+, use functions such as gtk_window_resize(), gtk_window_set_size_request(),
+gtk_window_move(), gtk_window_parse_geometry(), and gtk_window_set_geometry_hints(),
+depending on what you're trying to do.
+
+If using GDK directly, use gdk_window_set_geometry_hints().
-Since: 2.8
</description>
<parameters>
<parameter name="window">
-<parameter_description> a toplevel #GdkWindow
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
-<parameter name="urgent">
-<parameter_description> %TRUE if the window is urgent
+<parameter name="x">
+<parameter_description> ignored field, does not matter
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> ignored field, does not matter
+</parameter_description>
+</parameter>
+<parameter name="min_width">
+<parameter_description> minimum width hint
+</parameter_description>
+</parameter>
+<parameter name="min_height">
+<parameter_description> minimum height hint
+</parameter_description>
+</parameter>
+<parameter name="max_width">
+<parameter_description> max width hint
+</parameter_description>
+</parameter>
+<parameter name="max_height">
+<parameter_description> max height hint
+</parameter_description>
+</parameter>
+<parameter name="flags">
+<parameter_description> logical OR of GDK_HINT_POS, GDK_HINT_MIN_SIZE, and/or GDK_HINT_MAX_SIZE
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="gdk_window_lower">
+<function name="gdk_threads_add_timeout_seconds">
<description>
-Lowers @window to the bottom of the Z-order (stacking order), so that
-other windows with the same parent window appear above @window.
-This is true whether or not the other windows are visible.
-
-If @window is a toplevel, the window manager may choose to deny the
-request to move the window in the Z-order, gdk_window_lower() only
-requests the restack, does not guarantee it.
+A wrapper for the common usage of gdk_threads_add_timeout_seconds_full()
+assigning the default priority, #G_PRIORITY_DEFAULT.
-Note that gdk_window_show() raises the window again, so don't call this
-function before gdk_window_show(). (Try gdk_window_show_unraised().)
+For details, see gdk_threads_add_timeout_full().
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="interval">
+<parameter_description> the time between calls to the function, in seconds
</parameter_description>
</parameter>
-</parameters>
-<return></return>
-</function>
-
+<parameter name="function">
+<parameter_description> function to call
+</parameter_description>
+</parameter>
+<parameter name="data">
+<parameter_description> data to pass to @function
+</parameter_description>
+</parameter>
+</parameters>
+<return> the ID (greater than 0) of the event source.
+
+Since: 2.14
+</return>
+</function>
+
+<function name="gdk_window_lower">
+<description>
+Lowers @window to the bottom of the Z-order (stacking order), so that
+other windows with the same parent window appear above @window.
+This is true whether or not the other windows are visible.
+
+If @window is a toplevel, the window manager may choose to deny the
+request to move the window in the Z-order, gdk_window_lower() only
+requests the restack, does not guarantee it.
+
+Note that gdk_window_show() raises the window again, so don't call this
+function before gdk_window_show(). (Try gdk_window_show_unraised().)
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_keymap_get_default">
<description>
@@ -4145,31 +4392,31 @@
<description>
Create a #GdkPixbuf from a flat representation that is suitable for
storing as inline data in a program. This is useful if you want to
-ship a program with images, but don't want to depend on any
+ship a program with images, but don't want to depend on any
external files.
-GTK+ ships with a program called &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;
+GTK+ ships with a program called <command>gdk-pixbuf-csource</command>
which allows for conversion of #GdkPixbufs into such a inline representation.
-In almost all cases, you should pass the &lt;option&gt;--raw&lt;/option&gt; flag to
-&lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;. A sample invocation would be:
+In almost all cases, you should pass the <option>--raw</option> flag to
+<command>gdk-pixbuf-csource</command>. A sample invocation would be:
-&lt;informalexample&gt;&lt;programlisting&gt;
+<informalexample><programlisting>
gdk-pixbuf-csource --raw --name=myimage_inline myimage.png
-&lt;/programlisting&gt;&lt;/informalexample&gt;
+</programlisting></informalexample>
For the typical case where the inline pixbuf is read-only static data,
-you don't need to copy the pixel data unless you intend to write to
+you don't need to copy the pixel data unless you intend to write to
it, so you can pass %FALSE for @copy_pixels. (If you pass
-&lt;option&gt;--rle&lt;/option&gt; to &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;, a copy
+<option>--rle</option> to <command>gdk-pixbuf-csource</command>, a copy
will be made even if @copy_pixels is %FALSE, so using this option is
generally a bad idea.)
If you create a pixbuf from const inline data compiled into your
-program, it's probably safe to ignore errors and disable length checks,
+program, it's probably safe to ignore errors and disable length checks,
since things will always succeed:
-&lt;informalexample&gt;&lt;programlisting&gt;
+<informalexample><programlisting>
pixbuf = gdk_pixbuf_new_from_inline (-1, myimage_inline, FALSE, NULL);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
+</programlisting></informalexample>
For non-const inline data, you could get out of memory. For untrusted
inline data located at runtime, you could have corrupt inline data in
@@ -4230,11 +4477,11 @@
</parameter_description>
</parameter>
<parameter name="x">
-<parameter_description> the horizontal offset of the 'hotspot' of the cursor.
+<parameter_description> the horizontal offset of the 'hotspot' of the cursor.
</parameter_description>
</parameter>
<parameter name="y">
-<parameter_description> the vertical offset of the 'hotspot' of the cursor.
+<parameter_description> the vertical offset of the 'hotspot' of the cursor.
</parameter_description>
</parameter>
</parameters>
@@ -4260,6 +4507,23 @@
<return></return>
</function>
+<function name="gdk_test_render_sync">
+<description>
+This function retrives a pixel from @window to force the windowing
+system to carry out any pending rendering commands.
+This function is intended to be used to syncronize with rendering
+pipelines, to benchmark windowing system rendering operations.
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a mapped GdkWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_window_set_user_data">
<description>
For most purposes this function is deprecated in favor of
@@ -4309,9 +4573,6 @@
Determines if keyboard layouts for both right-to-left and left-to-right
languages are in use.
- Returns: %TRUE if there are layouts in both directions, %FALSE otherwise
-
-Since: 2.12
</description>
<parameters>
@@ -4320,7 +4581,10 @@
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if there are layouts in both directions, %FALSE otherwise
+
+Since: 2.12
+</return>
</function>
<function name="gdk_pointer_grab_info_libgtk_only">
@@ -4331,10 +4595,6 @@
</description>
<parameters>
-<parameter name="display">
-<parameter_description> the #GdkDisplay for which to get the grab information
-</parameter_description>
-</parameter>
<parameter name="grab_window">
<parameter_description> location to store current grab window
</parameter_description>
@@ -4481,22 +4741,44 @@
</return>
</function>
-<function name="gdk_drawable_get_depth">
+<function name="gdk_pixbuf_render_pixmap_and_mask">
<description>
-Obtains the bit depth of the drawable, that is, the number of bits
-that make up a pixel in the drawable's visual. Examples are 8 bits
-per pixel, 24 bits per pixel, etc.
+Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
+and @mask_return arguments, respectively, and renders a pixbuf and its
+corresponding thresholded alpha mask to them. This is merely a convenience
+function; applications that need to render pixbufs with dither offsets or to
+given drawables should use gdk_draw_pixbuf() and gdk_pixbuf_render_threshold_alpha().
+
+The pixmap that is created is created for the colormap returned
+by gdk_rgb_get_colormap(). You normally will want to instead use
+the actual colormap for a widget, and use
+gdk_pixbuf_render_pixmap_and_mask_for_colormap().
+If the pixbuf does not have an alpha channel, then * mask_return will be set
+to %NULL.
</description>
<parameters>
-<parameter name="drawable">
-<parameter_description> a #GdkDrawable
+<parameter name="pixbuf">
+<parameter_description> A pixbuf.
+</parameter_description>
+</parameter>
+<parameter name="pixmap_return">
+<parameter_description> Location to store a pointer to the created pixmap,
+or %NULL if the pixmap is not needed.
+</parameter_description>
+</parameter>
+<parameter name="mask_return">
+<parameter_description> Location to store a pointer to the created mask,
+or %NULL if the mask is not needed.
+</parameter_description>
+</parameter>
+<parameter name="alpha_threshold">
+<parameter_description> Threshold value for opacity values.
</parameter_description>
</parameter>
</parameters>
-<return> number of bits per pixel
-</return>
+<return></return>
</function>
<function name="gdk_display_manager_list_displays">
@@ -4534,36 +4816,27 @@
</return>
</function>
-<function name="gdk_event_send_client_message_for_display">
+<function name="gdk_window_merge_child_input_shapes">
<description>
-On X11, sends an X ClientMessage event to a given window. On
-Windows, sends a message registered with the name
-GDK_WIN32_CLIENT_MESSAGE.
+Merges the input shape masks for any child windows into the
+input shape mask for @window. i.e. the union of all input masks
+for @window and its children will become the new input mask
+for @window. See gdk_window_input_shape_combine_mask().
-This could be used for communicating between different
-applications, though the amount of data is limited to 20 bytes on
-X11, and to just four bytes on Windows.
+This function is distinct from gdk_window_set_child_input_shapes()
+because it includes @window's input shape mask in the set of
+shapes to be merged.
+Since: 2.10
</description>
<parameters>
-<parameter name="display">
-<parameter_description> the #GdkDisplay for the window where the message is to be sent.
-</parameter_description>
-</parameter>
-<parameter name="event">
-<parameter_description> the #GdkEvent to send, which should be a #GdkEventClient.
-</parameter_description>
-</parameter>
-<parameter name="winid">
-<parameter_description> the window to send the client message to.
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> non-zero on success.
-
-Since: 2.2
-</return>
+<return></return>
</function>
<function name="gdk_window_begin_resize_drag">
@@ -4571,7 +4844,7 @@
Begins a window resize operation (for a toplevel window).
You might use this function to implement a "window resize grip," for
example; in fact #GtkStatusbar uses it. The function works best
-with window managers that support the &lt;ulink url="http://www.freedesktop.org/Standards/wm-spec"&gt;Extended Window Manager Hints&lt;/ulink&gt;, but has a
+with window managers that support the <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended Window Manager Hints</ulink>, but has a
fallback implementation for other window managers.
@@ -4608,7 +4881,7 @@
<function name="gdk_window_set_accept_focus">
<description>
Setting @accept_focus to %FALSE hints the desktop environment that the
-window doesn't want to receive input focus.
+window doesn't want to receive input focus.
On X, it is the responsibility of the window manager to interpret this
hint. ICCCM-compliant window manager usually respect it.
@@ -4629,20 +4902,25 @@
<return></return>
</function>
-<function name="gdk_cursor_get_display">
+<function name="gdk_drag_begin">
<description>
-Returns: the #GdkDisplay associated to @cursor
+Starts a drag and creates a new drag context for it.
+
+This function is called by the drag source.
+
</description>
<parameters>
-<parameter name="cursor">
-<parameter_description> a #GdkCursor.
+<parameter name="window">
+<parameter_description> the source window for this drag.
+</parameter_description>
+</parameter>
+<parameter name="targets">
+<parameter_description> the list of offered targets.
</parameter_description>
</parameter>
</parameters>
-<return> the #GdkDisplay associated to @cursor
-
-Since: 2.2
+<return> a newly created #GdkDragContext.
</return>
</function>
@@ -4724,78 +5002,73 @@
</return>
</function>
-<function name="gdk_window_set_composited">
+<function name="gdk_pixbuf_loader_get_format">
<description>
-Sets a #GdkWindow as composited, or unsets it. Composited
-windows do not automatically have their contents drawn to
-the screen. Drawing is redirected to an offscreen buffer
-and an expose event is emitted on the parent of the composited
-window. It is the responsibility of the parent's expose handler
-to manually merge the off-screen content onto the screen in
-whatever way it sees fit. See &lt;xref linkend="composited-window-example"/&gt;
-for an example.
+Obtains the available information about the format of the
+currently loading image file.
-It only makes sense for child windows to be composited; see
-gdk_window_set_opacity() if you need translucent toplevel
-windows.
-An additional effect of this call is that the area of this
-window is no longer clipped from regions marked for
-invalidation on its parent. Draws done on the parent
-window are also no longer clipped by the child.
+</description>
+<parameters>
+<parameter name="loader">
+<parameter_description> A pixbuf loader.
+</parameter_description>
+</parameter>
+</parameters>
+<return> A #GdkPixbufFormat or %NULL. The return value is owned
+by GdkPixbuf and should not be freed.
-This call is only supported on some systems (currently,
-only X11 with new enough Xcomposite and Xdamage extensions).
-You must call gdk_display_supports_composite() to check if
-setting a window as composited is supported before
-attempting to do so.
+Since: 2.2
+</return>
+</function>
-Since: 2.12
+<function name="gdk_draw_point">
+<description>
+Draws a point, using the foreground color and other attributes of
+the #GdkGC.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
</parameter_description>
</parameter>
-<parameter name="composited">
-<parameter_description> %TRUE to set the window as composited
+<parameter name="gc">
+<parameter_description> a #GdkGC.
+</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></return>
</function>
-<function name="gdk_spawn_command_line_on_screen">
+<function name="gdk_window_set_icon_name">
<description>
-Like g_spawn_command_line_async(), except the child process is
-spawned in such an environment that on calling gdk_display_open()
-it would be returned a #GdkDisplay with @screen as the default
-screen.
-
-This is useful for applications which wish to launch an application
-on a specific screen.
+Windows may have a name used while minimized, distinct from the
+name they display in their titlebar. Most of the time this is a bad
+idea from a user interface standpoint. But you can set such a name
+with this function, if you like.
</description>
<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
-</parameter_description>
-</parameter>
-<parameter name="command_line">
-<parameter_description> a command line
+<parameter name="window">
+<parameter_description> a toplevel #GdkWindow
</parameter_description>
</parameter>
-<parameter name="error">
-<parameter_description> return location for errors
+<parameter name="name">
+<parameter_description> name of window while iconified (minimized)
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE on success, %FALSE if error is set.
-
-Since: 2.4
-</return>
+<return></return>
</function>
<function name="gdk_pixbuf_from_pixdata">
@@ -4886,7 +5159,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> 0 upon sucess, non-zero upon failure.
+<return> 0 upon success, non-zero upon failure.
Since: 2.2
</return>
@@ -4986,7 +5259,7 @@
window manager to do things like center @window on @parent and
keep @window above @parent.
-See gtk_window_set_transient_for() if you're using #GtkWindow or
+See gtk_window_set_transient_for() if you're using #GtkWindow or
#GtkDialog.
@@ -5006,9 +5279,9 @@
<function name="gdk_window_destroy">
<description>
-Destroys the window system resources associated with @window and decrements @window's
+Destroys the window system resources associated with @window and decrements @window's
reference count. The window system resources for all children of @window are also
-destroyed, but the children's reference counts are not decremented.
+destroyed, but the children's reference counts are not decremented.
Note that a window will not be destroyed automatically when its reference count
reaches zero. You must call this function yourself before that happens.
@@ -5024,6 +5297,18 @@
<return></return>
</function>
+<function name="gdk_events_pending">
+<description>
+Checks if any events are ready to be processed for any display.
+
+
+</description>
+<parameters>
+</parameters>
+<return> %TRUE if any events are pending.
+</return>
+</function>
+
<function name="gdk_gc_set_exposures">
<description>
Sets whether copying non-visible portions of a drawable
@@ -5095,47 +5380,55 @@
<return></return>
</function>
-<function name="gdk_drag_get_protocol_for_display">
+<function name="_gdk_window_destroy_hierarchy">
<description>
-Finds out the DND protocol supported by a window.
-
-Since: 2.2
+Internal function to destroy a window. Like gdk_window_destroy(),
+but does not drop the reference count created by gdk_window_new().
</description>
<parameters>
-<parameter name="display">
-<parameter_description> the #GdkDisplay where the destination window resides
-</parameter_description>
-</parameter>
-<parameter name="xid">
-<parameter_description> the X id of the destination window.
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
-<parameter name="protocol">
-<parameter_description> location where the supported DND protocol is returned.
+<parameter name="recursing">
+<parameter_description> If TRUE, then this is being called because a parent
+was destroyed. This generally means that the call to the
+windowing system to destroy the window can be omitted, since
+it will be destroyed as a result of the parent being destroyed.
+Unless @foreign_destroy.
+</parameter_description>
+</parameter>
+<parameter name="foreign_destroy">
+<parameter_description> If TRUE, the window or a parent was destroyed by some
+external agency. The window has already been destroyed and no
+windowing system calls should be made. (This may never happen
+for some windowing systems.)
</parameter_description>
</parameter>
</parameters>
-<return> the X id of the window where the drop should happen. This
-may be @xid or the X id of a proxy window, or None if @xid doesn't
-support Drag and Drop.
-</return>
+<return></return>
</function>
-<function name="gdk_font_ref">
+<function name="gdk_app_launch_context_set_display">
<description>
-Increases the reference count of a font by one.
+Sets the display on which applications will be launched when
+using this context. See also gdk_app_launch_context_set_screen().
+Since: 2.14
</description>
<parameters>
-<parameter name="font">
-<parameter_description> a #GdkFont
+<parameter name="context">
+<parameter_description> a #GdkAppLaunchContext
+</parameter_description>
+</parameter>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
</parameter_description>
</parameter>
</parameters>
-<return> @font
-</return>
+<return></return>
</function>
<function name="gdk_keyboard_grab_info_libgtk_only">
@@ -5146,10 +5439,6 @@
</description>
<parameters>
-<parameter name="display">
-<parameter_description> the display for which to get the grab information
-</parameter_description>
-</parameter>
<parameter name="grab_window">
<parameter_description> location to store current grab window
</parameter_description>
@@ -5170,7 +5459,7 @@
Looks up the #GdkPixmap that wraps the given native pixmap handle.
For example in the X backend, a native pixmap handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -5185,29 +5474,35 @@
</return>
</function>
-<function name="gdk_draw_lines">
+<function name="gdk_draw_layout_line">
<description>
-Draws a series of lines connecting the given points.
-The way in which joins between lines are draw is determined by the
-#GdkCapStyle value in the #GdkGC. This can be set with
-gdk_gc_set_line_attributes().
+Render a #PangoLayoutLine onto an GDK drawable
+
+If the layout's #PangoContext has a transformation matrix set, then
+ x and @y specify the position of the left edge of the baseline
+(left is in before-tranform user coordinates) in after-transform
+device coordinates.
</description>
<parameters>
<parameter name="drawable">
-<parameter_description> a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+<parameter_description> the drawable on which to draw the line
</parameter_description>
</parameter>
<parameter name="gc">
-<parameter_description> a #GdkGC.
+<parameter_description> base graphics to use
</parameter_description>
</parameter>
-<parameter name="points">
-<parameter_description> an array of #GdkPoint structures specifying the endpoints of the
+<parameter name="x">
+<parameter_description> the x position of start of string (in pixels)
</parameter_description>
</parameter>
-<parameter name="npoints">
-<parameter_description> the size of the @points array.
+<parameter name="y">
+<parameter_description> the y position of baseline (in pixels)
+</parameter_description>
+</parameter>
+<parameter name="line">
+<parameter_description> a #PangoLayoutLine
</parameter_description>
</parameter>
</parameters>
@@ -5216,7 +5511,7 @@
<function name="gdk_display_peek_event">
<description>
-Gets a copy of the first #GdkEvent in the @display's event queue, without
+Gets a copy of the first #GdkEvent in the @display's event queue, without
removing the event from the queue. (Note that this function will
not get more events from the windowing system. It only checks the events
that have already been moved to the GDK event queue.)
@@ -5269,7 +5564,7 @@
anyway, instead of using GDK functions. For child windows,
the move will reliably succeed.
-If you're also planning to resize the window, use gdk_window_move_resize()
+If you're also planning to resize the window, use gdk_window_move_resize()
to both move and resize simultaneously, for a nicer visual effect.
</description>
@@ -5279,11 +5574,11 @@
</parameter_description>
</parameter>
<parameter name="x">
-<parameter_description> X coordinate relative to window's parent
+<parameter_description> X coordinate relative to window's parent
</parameter_description>
</parameter>
<parameter name="y">
-<parameter_description> Y coordinate relative to window's parent
+<parameter_description> Y coordinate relative to window's parent
</parameter_description>
</parameter>
</parameters>
@@ -5294,8 +5589,8 @@
<description>
Moves the window to the correct workspace when running under a
window manager that supports multiple workspaces, as described
-in the &lt;ulink url="http://www.freedesktop.org/Standards/wm-spec"&gt;Extended
-Window Manager Hints&lt;/ulink&gt;. Will not do anything if the
+in the <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended
+Window Manager Hints</ulink>. Will not do anything if the
window is already on all workspaces.
Since: 2.8
@@ -5333,6 +5628,10 @@
Copies a rectangular area from @src_pixbuf to @dest_pixbuf. Conversion of
pixbuf formats is done automatically.
+If the source rectangle overlaps the destination rectangle on the
+same pixbuf, it will be overwritten during the copy operation.
+Therefore, you can not use this function to scroll a pixbuf.
+
</description>
<parameters>
<parameter name="src_pixbuf">
@@ -5432,6 +5731,24 @@
<return></return>
</function>
+<function name="gdk_window_thaw_toplevel_updates_libgtk_only">
+<description>
+Thaws a window frozen with
+gdk_window_freeze_toplevel_updates_libgtk_only().
+
+This function is not part of the GDK public API and is only
+for use by GTK+.
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_window_maximize">
<description>
Maximizes the window. If the window was already maximized, then
@@ -5439,8 +5756,8 @@
On X11, asks the window manager to maximize @window, if the window
manager supports this operation. Not all window managers support
-this, and some deliberately ignore it or don't have a concept of
-"maximized"; so you can't rely on the maximization actually
+this, and some deliberately ignore it or don't have a concept of
+"maximized"; so you can't rely on the maximization actually
happening. But it will happen with most standard window managers,
and GDK makes a best effort to get it to happen.
@@ -5457,29 +5774,29 @@
<return></return>
</function>
-<function name="gdk_rectangle_intersect">
+<function name="gdk_app_launch_context_set_screen">
<description>
-Calculates the intersection of two rectangles.
-It is allowed for @dest to be the same as either @src1 or @src2.
+Sets the screen on which applications will be launched when
+using this context. See also gdk_app_launch_context_set_display().
+If both @screen and @display are set, the @screen takes priority.
+If neither @screen or @display are set, the default screen and
+display are used.
+
+Since: 2.14
</description>
<parameters>
-<parameter name="src1">
-<parameter_description> a #GdkRectangle
-</parameter_description>
-</parameter>
-<parameter name="src2">
-<parameter_description> a #GdkRectangle
+<parameter name="context">
+<parameter_description> a #GdkAppLaunchContext
</parameter_description>
</parameter>
-<parameter name="dest">
-<parameter_description> return location for the intersection of @src1 and @src2
+<parameter name="screen">
+<parameter_description> a #GdkScreen
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the rectangles intersect.
-</return>
+<return></return>
</function>
<function name="gdk_window_process_all_updates">
@@ -5499,9 +5816,9 @@
Toggles whether a window should appear in a pager (workspace
switcher, or other desktop utility program that displays a small
thumbnail representation of the windows on the desktop). If a
-window's semantic type as specified with gdk_window_set_type_hint()
+window's semantic type as specified with gdk_window_set_type_hint()
already fully describes the window, this function should
-&lt;emphasis&gt;not&lt;/emphasis&gt; be called in addition, instead you should
+<emphasis>not</emphasis> be called in addition, instead you should
allow the window to be treated according to standard policy for
its semantic type.
@@ -5562,33 +5879,46 @@
<function name="gdk_colormap_get_system_size">
<description>
-Return value: the size of the system's default colormap.
+Return value: the size of the system's default colormap.
</description>
<parameters>
</parameters>
-<return> the size of the system's default colormap.
+<return> the size of the system's default colormap.
</return>
</function>
-<function name="gdk_gc_set_stipple">
+<function name="gdk_colormap_alloc_color">
<description>
-Set the stipple bitmap for a graphics context. The
-stipple will only be used if the fill mode is
-%GDK_STIPPLED or %GDK_OPAQUE_STIPPLED.
+Allocates a single color from a colormap.
+
</description>
<parameters>
-<parameter name="gc">
-<parameter_description> a #GdkGC.
+<parameter name="colormap">
+<parameter_description> a #GdkColormap.
</parameter_description>
</parameter>
-<parameter name="stipple">
-<parameter_description> the new stipple bitmap.
+<parameter name="color">
+<parameter_description> the color to allocate. On return the
+<structfield>pixel</structfield> field will be
+filled in if allocation succeeds.
+</parameter_description>
+</parameter>
+<parameter name="writeable">
+<parameter_description> If %TRUE, the color is allocated writeable
+(their values can later be changed using gdk_color_change()).
+Writeable colors cannot be shared between applications.
+</parameter_description>
+</parameter>
+<parameter name="best_match">
+<parameter_description> If %TRUE, GDK will attempt to do matching against
+existing colors if the color cannot be allocated as requested.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the allocation succeeded.
+</return>
</function>
<function name="gdk_window_beep">
@@ -5644,7 +5974,7 @@
Gets a "preferred visual" chosen by GdkRGB for rendering image data
on @screen. In previous versions of
GDK, this was the only visual GdkRGB could use for rendering. In
-current versions, it's simply the visual GdkRGB would have chosen as
+current versions, it's simply the visual GdkRGB would have chosen as
the optimal one in those previous versions. GdkRGB can now render to
drawables with any visual.
@@ -5665,8 +5995,8 @@
<function name="gdk_pixbuf_fill">
<description>
Clears a pixbuf to the given RGBA value, converting the RGBA value into
-the pixbuf's pixel format. The alpha will be ignored if the pixbuf
-doesn't have an alpha channel.
+the pixbuf's pixel format. The alpha will be ignored if the pixbuf
+doesn't have an alpha channel.
</description>
@@ -5688,7 +6018,7 @@
<description>
Creates a #PangoContext for @screen.
-The context must be freed when you're finished with it.
+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
@@ -5698,7 +6028,7 @@
(see #cairo_font_options_t) for the screen; 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 screen's font rendering settings.
+changes to the screen's font rendering settings.
</description>
@@ -5735,44 +6065,32 @@
</return>
</function>
-<function name="gdk_pixbuf_add_alpha">
+<function name="gdk_app_launch_context_set_desktop">
<description>
-Takes an existing pixbuf and adds an alpha channel to it.
-If the existing pixbuf already had an alpha channel, the channel
-values are copied from the original; otherwise, the alpha channel
-is initialized to 255 (full opacity).
-
-If @substitute_color is %TRUE, then the color specified by (@r, @g, @b) will be
-assigned zero opacity. That is, if you pass (255, 255, 255) for the
-substitute color, all white pixels will become fully transparent.
+Sets the workspace on which applications will be launched when
+using this context when running under a window manager that
+supports multiple workspaces, as described in the
+<ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended
+Window Manager Hints</ulink>.
+
+When the workspace is not specified or @desktop is set to -1,
+it is up to the window manager to pick one, typically it will
+be the current workspace.
+Since: 2.14
</description>
<parameters>
-<parameter name="pixbuf">
-<parameter_description> A #GdkPixbuf.
-</parameter_description>
-</parameter>
-<parameter name="substitute_color">
-<parameter_description> Whether to set a color to zero opacity. If this
-is %FALSE, then the (@r, @g, @b) arguments will be ignored.
-</parameter_description>
-</parameter>
-<parameter name="r">
-<parameter_description> Red value to substitute.
-</parameter_description>
-</parameter>
-<parameter name="g">
-<parameter_description> Green value to substitute.
+<parameter name="context">
+<parameter_description> a #GdkAppLaunchContext
</parameter_description>
</parameter>
-<parameter name="b">
-<parameter_description> Blue value to substitute.
+<parameter name="desktop">
+<parameter_description> the number of a workspace, or -1
</parameter_description>
</parameter>
</parameters>
-<return> A newly-created pixbuf with a reference count of 1.
-</return>
+<return></return>
</function>
<function name="gdk_colormap_unref">
@@ -5856,9 +6174,35 @@
<return></return>
</function>
+<function name="gdk_drawable_set_colormap">
+<description>
+Sets the colormap associated with @drawable. Normally this will
+happen automatically when the drawable is created; you only need to
+use this function if the drawable-creating function did not have a
+way to determine the colormap, and you then use drawable operations
+that require a colormap. The colormap for all drawables and
+graphics contexts you intend to use together should match. i.e.
+when using a #GdkGC to draw to a drawable, or copying one drawable
+to another, the colormaps should match.
+
+
+</description>
+<parameters>
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable
+</parameter_description>
+</parameter>
+<parameter name="colormap">
+<parameter_description> a #GdkColormap
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_draw_arc">
<description>
-Draws an arc or a filled 'pie slice'. The arc is defined by the bounding
+Draws an arc or a filled 'pie slice'. The arc is defined by the bounding
rectangle of the entire ellipse, and the start and end angles of the part
of the ellipse to be drawn.
@@ -5873,7 +6217,7 @@
</parameter_description>
</parameter>
<parameter name="filled">
-<parameter_description> %TRUE if the arc should be filled, producing a 'pie slice'.
+<parameter_description> %TRUE if the arc should be filled, producing a 'pie slice'.
</parameter_description>
</parameter>
<parameter name="x">
@@ -5893,7 +6237,7 @@
</parameter_description>
</parameter>
<parameter name="angle1">
-<parameter_description> the start angle of the arc, relative to the 3 o'clock position,
+<parameter_description> the start angle of the arc, relative to the 3 o'clock position,
counter-clockwise, in 1/64ths of a degree.
</parameter_description>
</parameter>
@@ -5908,7 +6252,7 @@
<function name="gdk_x11_cursor_get_xdisplay">
<description>
-Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+Return value: an Xlib <type>Display*</type>.
</description>
<parameters>
@@ -5917,7 +6261,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+<return> an Xlib <type>Display*</type>.
</return>
</function>
@@ -5926,7 +6270,7 @@
Obtains a clip region which contains the areas where the given ranges
of text would be drawn. @x_origin and @y_origin are the same position
you would pass to gdk_draw_layout_line(). @index_ranges should contain
-ranges of bytes in the layout's text.
+ranges of bytes in the layout's text.
Note that the regions returned correspond to logical extents of the text
ranges, not ink extents. So the drawn layout may in fact touch areas out of
@@ -5965,7 +6309,7 @@
<description>
Indicates to the GUI environment that the application has finished
loading. If the applications opens windows, this function is
-normally called after opening the application's initial set of
+normally called after opening the application's initial set of
windows.
GTK+ will call this function automatically after opening the first
@@ -5987,18 +6331,18 @@
installed. The list of all writable formats can be determined in the
following way:
-&lt;informalexample&gt;&lt;programlisting&gt;
+|[
void add_if_writable (GdkPixbufFormat *data, GSList **list)
{
if (gdk_pixbuf_format_is_writable (data))
*list = g_slist_prepend (*list, data);
}
-&lt;!-- --&gt;
-GSList *formats = gdk_pixbuf_get_formats (&lt;!-- --&gt;);
+
+GSList *formats = gdk_pixbuf_get_formats ();
GSList *writable_formats = NULL;
-g_slist_foreach (formats, add_if_writable, &amp;writable_formats);
+g_slist_foreach (formats, add_if_writable, &writable_formats);
g_slist_free (formats);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
+]|
If @error is set, %FALSE will be returned. Possible errors include
those in the #GDK_PIXBUF_ERROR domain and those in the #G_FILE_ERROR domain.
@@ -6006,10 +6350,10 @@
The variable argument list should be %NULL-terminated; if not empty,
it should contain pairs of strings that modify the save
parameters. For example:
-&lt;informalexample&gt;&lt;programlisting&gt;
-gdk_pixbuf_save (pixbuf, handle, "jpeg", &amp;error,
+<informalexample><programlisting>
+gdk_pixbuf_save (pixbuf, handle, "jpeg", &error,
"quality", "100", NULL);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
+</programlisting></informalexample>
Currently only few parameters exist. JPEG images can be saved with a
"quality" parameter; its value should be in the range [0,100].
@@ -6017,7 +6361,7 @@
Text chunks can be attached to PNG images by specifying parameters of
the form "tEXt::key", where key is an ASCII string of length 1-79.
The values are UTF-8 encoded strings. The PNG compression level can
-be specified using the "compression" parameter; it's value is in an
+be specified using the "compression" parameter; it's value is in an
integer in the range of [0,9].
ICO images can be saved in depth 16, 24, or 32, by using the "depth"
@@ -6084,10 +6428,10 @@
Informs a pixbuf loader that no further writes with
gdk_pixbuf_loader_write() will occur, so that it can free its
internal loading structures. Also, tries to parse any data that
-hasn't yet been parsed; if the remaining data is partial or
+hasn't yet been parsed; if the remaining data is partial or
corrupt, an error will be returned. If %FALSE is returned, @error
will be set to an error from the #GDK_PIXBUF_ERROR or #G_FILE_ERROR
-domains. If you're just cancelling a load rather than expecting it
+domains. If you're just cancelling a load rather than expecting it
to be finished, passing %NULL for @error to ignore it is
reasonable.
@@ -6141,7 +6485,7 @@
Windows may not be resized below 1x1.
-If you're also planning to move the window, use gdk_window_move_resize()
+If you're also planning to move the window, use gdk_window_move_resize()
to both move and resize simultaneously, for a nicer visual effect.
</description>
@@ -6164,10 +6508,13 @@
<function name="GdkScreen">
<description>
-The ::composited_changed signal is emitted when the composited
-status of the screen changes
+The ::monitors-changed signal is emitted when the number, size
+or position of the monitors attached to the screen change.
-Since: 2.10
+Only for X for now. Future implementations for Win32 and
+OS X may be a possibility.
+
+Since: 2.14
</description>
<parameters>
@@ -6251,9 +6598,9 @@
A rectangle drawn filled is 1 pixel smaller in both dimensions than a
rectangle outlined. Calling
-&lt;literal&gt;gdk_draw_rectangle (window, gc, TRUE, 0, 0, 20, 20)&lt;/literal&gt;
+<literal>gdk_draw_rectangle (window, gc, TRUE, 0, 0, 20, 20)</literal>
results in a filled rectangle 20 pixels wide and 20 pixels high. Calling
-&lt;literal&gt;gdk_draw_rectangle (window, gc, FALSE, 0, 0, 20, 20)&lt;/literal&gt;
+<literal>gdk_draw_rectangle (window, gc, FALSE, 0, 0, 20, 20)</literal>
results in an outlined rectangle with corners at (0, 0), (0, 20), (20, 20),
and (20, 0), which makes it 21 pixels wide and 21 pixels high.
@@ -6355,31 +6702,22 @@
<return></return>
</function>
-<function name="gdk_draw_point">
+<function name="gdk_colormap_get_screen">
<description>
-Draws a point, using the foreground color and other attributes of
-the #GdkGC.
+Gets the screen for which this colormap was created.
+
</description>
<parameters>
-<parameter name="drawable">
-<parameter_description> a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
-</parameter_description>
-</parameter>
-<parameter name="gc">
-<parameter_description> a #GdkGC.
-</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 name="cmap">
+<parameter_description> a #GdkColormap
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the screen for which this colormap was created.
+
+Since: 2.2
+</return>
</function>
<function name="gdk_display_store_clipboard">
@@ -6387,8 +6725,8 @@
Issues a request to the clipboard manager to store the
clipboard data. On X11, this is a special program that works
according to the freedesktop clipboard specification, available at
-&lt;ulink url="http://www.freedesktop.org/Standards/clipboard-manager-spec"&gt;
-http://www.freedesktop.org/Standards/clipboard-manager-spec&lt;/ulink&gt;.
+<ulink url="http://www.freedesktop.org/Standards/clipboard-manager-spec">
+http://www.freedesktop.org/Standards/clipboard-manager-spec</ulink>.
Since: 2.6
@@ -6421,7 +6759,7 @@
<function name="gdk_x11_font_get_xdisplay">
<description>
-Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+Return value: an Xlib <type>Display*</type>.
</description>
<parameters>
@@ -6430,7 +6768,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+<return> an Xlib <type>Display*</type>.
</return>
</function>
@@ -6455,40 +6793,32 @@
</return>
</function>
-<function name="gdk_draw_text">
+<function name="gdk_draw_trapezoids">
<description>
-Draws a number of characters in the given font or fontset.
+Draws a set of anti-aliased trapezoids. The trapezoids are
+combined using saturation addition, then drawn over the background
+as a set. This is low level functionality used internally to implement
+rotated underlines and backgrouds when rendering a PangoLayout and is
+likely not useful for applications.
-Deprecated: Use gdk_draw_layout() instead.
+Since: 2.6
</description>
<parameters>
<parameter name="drawable">
-<parameter_description> a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
-</parameter_description>
-</parameter>
-<parameter name="font">
-<parameter_description> a #GdkFont.
+<parameter_description> a #GdkDrawable
</parameter_description>
</parameter>
<parameter name="gc">
-<parameter_description> a #GdkGC.
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> the x coordinate of the left edge of the text.
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> the y coordinate of the baseline of the text.
+<parameter_description> a #GdkGC
</parameter_description>
</parameter>
-<parameter name="text">
-<parameter_description> the characters to draw.
+<parameter name="trapezoids">
+<parameter_description> an array of #GdkTrapezoid structures
</parameter_description>
</parameter>
-<parameter name="text_length">
-<parameter_description> the number of characters of @text to draw.
+<parameter name="n_trapezoids">
+<parameter_description> the number of trapezoids to draw
</parameter_description>
</parameter>
</parameters>
@@ -6529,7 +6859,7 @@
</parameter>
</parameters>
<return> the #GdkVisual (owned by the screen object), or %NULL
-if the visual ID wasn't found.
+if the visual ID wasn't found.
Since: 2.2
</return>
@@ -6587,7 +6917,7 @@
<function name="gdk_win32_hdc_release">
<description>
This function deallocates the Windows device context allocated by
-&lt;funcion&gt;gdk_win32_hdc_get()&lt;/function&gt;. It should be called with
+<funcion>gdk_win32_hdc_get()</function>. It should be called with
the same parameters.
</description>
@@ -6626,15 +6956,40 @@
</return>
</function>
-<function name="gdk_screen_get_display">
+<function name="gdk_drop_reply">
<description>
-Gets the display to which the @screen belongs.
+Accepts or rejects a drop.
+This function is called by the drag destination in response
+to a drop initiated by the drag source.
</description>
<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
+<parameter name="context">
+<parameter_description> a #GdkDragContext.
+</parameter_description>
+</parameter>
+<parameter name="ok">
+<parameter_description> %TRUE if the drop is accepted.
+</parameter_description>
+</parameter>
+<parameter name="time_">
+<parameter_description> the timestamp for this operation.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gdk_screen_get_display">
+<description>
+Gets the display to which the @screen belongs.
+
+
+</description>
+<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
</parameter_description>
</parameter>
</parameters>
@@ -6647,7 +7002,7 @@
<function name="gdk_rgb_find_color">
<description>
@colormap should be the colormap for the graphics context and
-drawable you're using to draw. If you're drawing to a #GtkWidget,
+drawable you're using to draw. If you're drawing to a #GtkWidget,
call gtk_widget_get_colormap().
@color should have its %red, %green, and %blue fields initialized;
@@ -6659,7 +7014,7 @@
In many cases, you can avoid this whole issue by calling
gdk_gc_set_rgb_fg_color() or gdk_gc_set_rgb_bg_color(), which
do not expect %pixel to be initialized in advance. If you use those
-functions, there's no need for gdk_rgb_find_color().
+functions, there's no need for gdk_rgb_find_color().
</description>
@@ -6676,21 +7031,19 @@
<return></return>
</function>
-<function name="gdk_x11_screen_get_screen_number">
+<function name="gdk_window_get_window_type">
<description>
+Gets the type of the window. See #GdkWindowType.
+
</description>
<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen.
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> the position of @screen among the screens of
-its display.
-the index of a #GdkScreen.
-
-Since: 2.2
+<return> type of window
</return>
</function>
@@ -6706,37 +7059,37 @@
running in thread A and accessing @self after it has been finalized
in thread B:
-&lt;informalexample&gt;&lt;programlisting&gt;
+|[
static gboolean
idle_callback (gpointer data)
{
-// gdk_threads_enter(); would be needed for g_idle_add()
+/* gdk_threads_enter(); would be needed for g_idle_add() */
SomeWidget *self = data;
-/&lt;!-- --&gt;* do stuff with self *&lt;!-- --&gt;/
+/* do stuff with self */
-self-&gt;idle_id = 0;
+self->idle_id = 0;
-// gdk_threads_leave(); would be needed for g_idle_add()
+/* gdk_threads_leave(); would be needed for g_idle_add() */
return FALSE;
}
static void
some_widget_do_stuff_later (SomeWidget *self)
{
-self-&gt;idle_id = gdk_threads_add_idle (idle_callback, self)
-// using g_idle_add() here would require thread protection in the callback
+self->idle_id = gdk_threads_add_idle (idle_callback, self)
+/* using g_idle_add() here would require thread protection in the callback */
}
static void
some_widget_finalize (GObject *object)
{
SomeWidget *self = SOME_WIDGET (object);
-if (self-&gt;idle_id)
-g_source_remove (self-&gt;idle_id);
-G_OBJECT_CLASS (parent_class)-&gt;finalize (object);
+if (self->idle_id)
+g_source_remove (self->idle_id);
+G_OBJECT_CLASS (parent_class)->finalize (object);
}
-&lt;/programlisting&gt;&lt;/informalexample&gt;
+]|
</description>
@@ -6785,18 +7138,28 @@
<return></return>
</function>
-<function name="gdk_x11_font_get_xfont">
+<function name="gdk_fontset_load_for_display">
<description>
-Return value: an Xlib &lt;type&gt;XFontStruct*&lt;/type&gt; or an &lt;type&gt;XFontSet&lt;/type&gt;.
+Loads a fontset for use on @display.
+
+The fontset may be newly loaded or looked up in a cache.
+You should make no assumptions about the initial reference count.
+
+Since: 2.2
</description>
<parameters>
-<parameter name="font">
-<parameter_description> a #GdkFont.
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="fontset_name">
+<parameter_description> a comma-separated list of XLFDs describing
+the component fonts of the fontset to load.
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;XFontStruct*&lt;/type&gt; or an &lt;type&gt;XFontSet&lt;/type&gt;.
+<return> a #GdkFont, or %NULL if the fontset could not be loaded.
</return>
</function>
@@ -6824,7 +7187,7 @@
this function returns that image. If the animation is an animation,
this function returns a reasonable thing to display as a static
unanimated image, which might be the first frame, or something more
-sophisticated. If an animation hasn't loaded any frames yet, this
+sophisticated. If an animation hasn't loaded any frames yet, this
function will return %NULL.
@@ -6839,6 +7202,30 @@
</return>
</function>
+<function name="gdk_x11_screen_get_monitor_output">
+<description>
+Gets the XID of the specified output/monitor.
+If the X server does not support version 1.2 of the RANDR
+extension, 0 is returned.
+
+
+</description>
+<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
+</parameter_description>
+</parameter>
+<parameter name="monitor_num">
+<parameter_description> number of the monitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> the XID of the monitor
+
+Since: 2.14
+</return>
+</function>
+
<function name="gdk_notify_startup_complete_with_id">
<description>
Indicates to the GUI environment that the application has finished
@@ -6862,6 +7249,60 @@
<return></return>
</function>
+<function name="gdk_window_redirect_to_drawable">
+<description>
+Redirects drawing into @window so that drawing to the
+window in the rectangle specified by @src_x, @src_y,
+ width and @height is also drawn into @drawable at
+ dest_x, @dest_y.
+
+Only drawing between gdk_window_begin_paint_region() or
+gdk_window_begin_paint_rect() and gdk_window_end_paint() is
+redirected.
+
+Redirection is active until gdk_window_remove_redirection()
+is called.
+
+Since: 2.14
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable
+</parameter_description>
+</parameter>
+<parameter name="src_x">
+<parameter_description> x position in @window
+</parameter_description>
+</parameter>
+<parameter name="src_y">
+<parameter_description> y position in @window
+</parameter_description>
+</parameter>
+<parameter name="dest_x">
+<parameter_description> x position in @drawable
+</parameter_description>
+</parameter>
+<parameter name="dest_y">
+<parameter_description> y position in @drawable
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> width of redirection
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> height of redirection
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_x11_display_grab">
<description>
Call XGrabServer() on @display.
@@ -6922,15 +7363,15 @@
<function name="gdk_window_stick">
<description>
-"Pins" a window such that it's on all workspaces and does not scroll
+"Pins" a window such that it's on all workspaces and does not scroll
with viewports, for window managers that have scrollable viewports.
(When using #GtkWindow, gtk_window_stick() may be more useful.)
On the X11 platform, this function depends on window manager
support, so may have no effect with many window managers. However,
GDK will do the best it can to convince the window manager to stick
-the window. For window managers that don't support this operation,
-there's nothing you can do to force it to happen.
+the window. For window managers that don't support this operation,
+there's nothing you can do to force it to happen.
</description>
@@ -6945,7 +7386,7 @@
<function name="gdk_screen_get_system_colormap">
<description>
-Gets the system's default colormap for @screen
+Gets the system's default colormap for @screen
</description>
@@ -6986,13 +7427,13 @@
<function name="gdk_window_unmaximize">
<description>
-Unmaximizes the window. If the window wasn't maximized, then this
+Unmaximizes the window. If the window wasn't maximized, then this
function does nothing.
On X11, asks the window manager to unmaximize @window, if the
window manager supports this operation. Not all window managers
-support this, and some deliberately ignore it or don't have a
-concept of "maximized"; so you can't rely on the unmaximization
+support this, and some deliberately ignore it or don't have a
+concept of "maximized"; so you can't rely on the unmaximization
actually happening. But it will happen with most standard window
managers, and GDK makes a best effort to get it to happen.
@@ -7013,11 +7454,11 @@
<description>
Render a #PangoLayout onto a GDK drawable
-If the layout's #PangoContext has a transformation matrix set, then
+If the layout's #PangoContext has a transformation matrix set, then
@x and @y specify the position of the top left corner of the
bounding box (in device space) of the transformed layout.
-If you're using GTK+, the usual way to obtain a #PangoLayout
+If you're using GTK+, the usual way to obtain a #PangoLayout
is gtk_widget_create_pango_layout().
</description>
@@ -7046,16 +7487,26 @@
<return></return>
</function>
-<function name="gdk_cursor_unref">
+<function name="gdk_window_process_updates">
<description>
-Removes a reference from @cursor, deallocating the cursor
-if no references remain.
+Sends one or more expose events to @window. The areas in each
+expose event will cover the entire update area for the window (see
+gdk_window_invalidate_region() for details). Normally GDK calls
+gdk_window_process_all_updates() on your behalf, so there's no
+need to call this function unless you want to force expose events
+to be delivered immediately and synchronously (vs. the usual
+case, where GDK delivers them in an idle handler). Occasionally
+this is useful to produce nicer scrolling behavior, for example.
</description>
<parameters>
-<parameter name="cursor">
-<parameter_description> a #GdkCursor
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="update_children">
+<parameter_description> whether to also process updates for child windows
</parameter_description>
</parameter>
</parameters>
@@ -7114,7 +7565,7 @@
end points of the lines to be drawn.
</parameter_description>
</parameter>
-<parameter name="nsegs">
+<parameter name="n_segs">
<parameter_description> the number of line segments to draw, i.e. the size of the
@segs array.
</parameter_description>
@@ -7123,56 +7574,22 @@
<return></return>
</function>
-<function name="gdk_window_begin_paint_region">
+<function name="gdk_region_offset">
<description>
-Indicates that you are beginning the process of redrawing @region.
-A backing store (offscreen buffer) large enough to contain @region
-will be created. The backing store will be initialized with the
-background color or background pixmap for @window. Then, all
-drawing operations performed on @window will be diverted to the
-backing store. When you call gdk_window_end_paint(), the backing
-store will be copied to @window, making it visible onscreen. Only
-the part of @window contained in @region will be modified; that is,
-drawing operations are clipped to @region.
-
-The net result of all this is to remove flicker, because the user
-sees the finished product appear all at once when you call
-gdk_window_end_paint(). If you draw to @window directly without
-calling gdk_window_begin_paint_region(), the user may see flicker
-as individual drawing operations are performed in sequence. The
-clipping and background-initializing features of
-gdk_window_begin_paint_region() are conveniences for the
-programmer, so you can avoid doing that work yourself.
-
-When using GTK+, the widget system automatically places calls to
-gdk_window_begin_paint_region() and gdk_window_end_paint() around
-emissions of the expose_event signal. That is, if you're writing an
-expose event handler, you can assume that the exposed area in
-#GdkEventExpose has already been cleared to the window background,
-is already set as the clip region, and already has a backing store.
-Therefore in most cases, application code need not call
-gdk_window_begin_paint_region(). (You can disable the automatic
-calls around expose events on a widget-by-widget basis by calling
-gtk_widget_set_double_buffered().)
-
-If you call this function multiple times before calling the
-matching gdk_window_end_paint(), the backing stores are pushed onto
-a stack. gdk_window_end_paint() copies the topmost backing store
-onscreen, subtracts the topmost region from all other regions in
-the stack, and pops the stack. All drawing operations affect only
-the topmost backing store in the stack. One matching call to
-gdk_window_end_paint() is required for each call to
-gdk_window_begin_paint_region().
-
+Moves a region the specified distance.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="region">
+<parameter_description> a #GdkRegion
</parameter_description>
</parameter>
-<parameter name="region">
-<parameter_description> region you intend to draw to
+<parameter name="dx">
+<parameter_description> the distance to move the region horizontally
+</parameter_description>
+</parameter>
+<parameter name="dy">
+<parameter_description> the distance to move the region vertically
</parameter_description>
</parameter>
</parameters>
@@ -7187,7 +7604,7 @@
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.
+Call g_list_free() on the return value when you're finished with it.
</description>
@@ -7197,46 +7614,58 @@
</return>
</function>
-<function name="gdk_drag_drop_succeeded">
+<function name="gdk_window_get_frame_extents">
<description>
-Return value: %TRUE if the drop was successful.
+Obtains the bounding box of the window, including window manager
+titlebar/borders if any. The frame position is given in root window
+coordinates. To get the position of the window itself (rather than
+the frame) in root window coordinates, use gdk_window_get_origin().
+
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="rect">
+<parameter_description> rectangle to fill with bounding box of the window frame
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the drop was successful.
-
-Since: 2.6
-</return>
+<return></return>
</function>
-<function name="gdk_set_pointer_hooks">
+<function name="gdk_colormap_query_color">
<description>
-This function allows for hooking into the operation
-of getting the current location of the pointer. This
-is only useful for such low-level tools as an
-event recorder. Applications should never have any
-reason to use this facility.
+Locates the RGB color in @colormap corresponding to the given
+hardware pixel @pixel. @pixel must be a valid pixel in the
+colormap; it's a programmer error to call this function with a
+pixel which is not in the colormap. Hardware pixels are normally
+obtained from gdk_colormap_alloc_colors(), or from a #GdkImage. (A
+#GdkImage contains image data in hardware format, a #GdkPixbuf
+contains image data in a canonical 24-bit RGB format.)
-This function is not multihead safe. For multihead operation,
-see gdk_display_set_pointer_hooks().
+This function is rarely useful; it's used for example to
+implement the eyedropper feature in #GtkColorSelection.
</description>
<parameters>
-<parameter name="new_hooks">
-<parameter_description> a table of pointers to functions for getting
-quantities related to the current pointer position,
-or %NULL to restore the default table.
+<parameter name="colormap">
+<parameter_description> a #GdkColormap
+</parameter_description>
+</parameter>
+<parameter name="pixel">
+<parameter_description> pixel value in hardware display format
+</parameter_description>
+</parameter>
+<parameter name="result">
+<parameter_description> #GdkColor with red, green, blue fields initialized
</parameter_description>
</parameter>
</parameters>
-<return> the previous pointer hook table
-</return>
+<return></return>
</function>
<function name="gdk_directfb_visual_by_format">
@@ -7247,7 +7676,7 @@
At startup, only those visuals that can be blitted
hardware-accelerated are registered. By using
gdk_directfb_visual_by_format() you can retrieve visuals that
-don't match this criteria since this function will try to create
+don't match this criteria since this function will try to create
a new visual for the desired @pixel_format for you.
@@ -7337,7 +7766,7 @@
<description>
If the event contains a "state" field, puts that field in @state. Otherwise
stores an empty state (0). Returns %TRUE if there was a state field
-in the event. @event may be %NULL, in which case it's treated
+in the event. @event may be %NULL, in which case it's treated
as if the event had no state field.
@@ -7388,7 +7817,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the colormap of @gc, or %NULL if @gc doesn't have one.
+<return> the colormap of @gc, or %NULL if @gc doesn't have one.
</return>
</function>
@@ -7417,12 +7846,12 @@
</description>
<parameters>
<parameter name="xatom">
-<parameter_description> an X atom for GDK's default display
+<parameter_description> an X atom for GDK's default display
</parameter_description>
</parameter>
</parameters>
<return> name of the X atom; this string is owned by GTK+,
-so it shouldn't be modifed or freed.
+so it shouldn't be modifed or freed.
</return>
</function>
@@ -7475,11 +7904,11 @@
</parameter_description>
</parameter>
<parameter name="keys">
-<parameter_description> return location for array of #GdkKeymapKey, or %NULL
+<parameter_description> return location for array of #GdkKeymapKey, or NULL
</parameter_description>
</parameter>
<parameter name="keyvals">
-<parameter_description> return location for array of keyvals, or %NULL
+<parameter_description> return location for array of keyvals, or NULL
</parameter_description>
</parameter>
<parameter name="n_entries">
@@ -7521,7 +7950,7 @@
<function name="gdk_pixbuf_animation_new_from_file">
<description>
Creates a new animation by loading it from a file. The file format is
-detected automatically. If the file's format does not support multi-frame
+detected automatically. If the file's format does not support multi-frame
images, then an animation with a single frame will be created. Possible errors
are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains.
@@ -7539,24 +7968,26 @@
</parameters>
<return> A newly-created animation with a reference count of 1, or %NULL
if any of several error conditions ocurred: the file could not be opened,
-there was no loader for the file's format, there was not enough memory to
+there was no loader for the file's format, there was not enough memory to
allocate the image buffer, or the image file contained invalid data.
</return>
</function>
-<function name="gdk_window_get_window_type">
+<function name="gdk_x11_screen_get_screen_number">
<description>
-Gets the type of the window. See #GdkWindowType.
-
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="screen">
+<parameter_description> a #GdkScreen.
</parameter_description>
</parameter>
</parameters>
-<return> type of window
+<return> the position of @screen among the screens of
+its display.
+the index of a #GdkScreen.
+
+Since: 2.2
</return>
</function>
@@ -7596,7 +8027,7 @@
values for allocated colors will be filled in.
</parameter_description>
</parameter>
-<parameter name="ncolors">
+<parameter name="n_colors">
<parameter_description> The number of colors in @colors.
</parameter_description>
</parameter>
@@ -7626,7 +8057,7 @@
<function name="gdk_screen_set_font_options">
<description>
Sets the default font options for the screen. These
-options will be set on any #PangoContext's newly created
+options will be set on any #PangoContext's newly created
with gdk_pango_context_get_for_screen(). Changing the
default set of font options does not affect contexts that
have already been created.
@@ -7674,8 +8105,8 @@
<function name="gdk_event_put">
<description>
Appends a copy of the given event onto the front of the event
-queue for event-&gt;any.window's display, or the default event
-queue if event-&gt;any.window is %NULL. See gdk_display_put_event().
+queue for event->any.window's display, or the default event
+queue if event->any.window is %NULL. See gdk_display_put_event().
</description>
<parameters>
@@ -7689,7 +8120,7 @@
<function name="gdk_colormap_get_system">
<description>
-Gets the system's default colormap for the default screen. (See
+Gets the system's default colormap for the default screen. (See
gdk_colormap_get_system_for_screen ())
@@ -7784,7 +8215,7 @@
<function name="gdk_gc_set_background">
<description>
Sets the background color for a graphics context.
-Note that this function uses @color-&gt;pixel, use
+Note that this function uses @color->pixel, use
gdk_gc_set_rgb_bg_color() to specify the background
color as red, green, blue components.
@@ -7807,7 +8238,7 @@
Equivalent to calling gdk_window_move() and gdk_window_resize(),
except that both operations are performed at once, avoiding strange
visual effects. (i.e. the user may be able to see the window first
-move, then resize, if you don't use gdk_window_move_resize().)
+move, then resize, if you don't use gdk_window_move_resize().)
</description>
<parameters>
@@ -7816,11 +8247,11 @@
</parameter_description>
</parameter>
<parameter name="x">
-<parameter_description> new X position relative to window's parent
+<parameter_description> new X position relative to window's parent
</parameter_description>
</parameter>
<parameter name="y">
-<parameter_description> new Y position relative to window's parent
+<parameter_description> new Y position relative to window's parent
</parameter_description>
</parameter>
<parameter name="width">
@@ -7839,62 +8270,62 @@
<description>
Creates a new cursor from the set of builtin cursors.
Some useful ones are:
-&lt;itemizedlist&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="right_ptr.png"&gt;&lt;/inlinegraphic&gt; #GDK_RIGHT_PTR (right-facing arrow)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="crosshair.png"&gt;&lt;/inlinegraphic&gt; #GDK_CROSSHAIR (crosshair)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="xterm.png"&gt;&lt;/inlinegraphic&gt; #GDK_XTERM (I-beam)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="watch.png"&gt;&lt;/inlinegraphic&gt; #GDK_WATCH (busy)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="fleur.png"&gt;&lt;/inlinegraphic&gt; #GDK_FLEUR (for moving objects)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="hand1.png"&gt;&lt;/inlinegraphic&gt; #GDK_HAND1 (a right-pointing hand)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="hand2.png"&gt;&lt;/inlinegraphic&gt; #GDK_HAND2 (a left-pointing hand)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="left_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_LEFT_SIDE (resize left side)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="right_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_RIGHT_SIDE (resize right side)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="top_left_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_TOP_LEFT_CORNER (resize northwest corner)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="top_right_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_TOP_RIGHT_CORNER (resize northeast corner)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="bottom_left_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_BOTTOM_LEFT_CORNER (resize southwest corner)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="bottom_right_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="top_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_TOP_SIDE (resize top side)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="bottom_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_BOTTOM_SIDE (resize bottom side)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"&gt;&lt;/inlinegraphic&gt; #GDK_SB_H_DOUBLE_ARROW (move vertical splitter)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;listitem&gt;&lt;para&gt;
-&lt;inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"&gt;&lt;/inlinegraphic&gt; #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter)
-&lt;/para&gt;&lt;/listitem&gt;
-&lt;/itemizedlist&gt;
-
-To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
-a cursor with no pixels in it.
+<itemizedlist>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="right_ptr.png"></inlinegraphic> #GDK_RIGHT_PTR (right-facing arrow)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="crosshair.png"></inlinegraphic> #GDK_CROSSHAIR (crosshair)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic> #GDK_XTERM (I-beam)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic> #GDK_WATCH (busy)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="fleur.png"></inlinegraphic> #GDK_FLEUR (for moving objects)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="hand1.png"></inlinegraphic> #GDK_HAND1 (a right-pointing hand)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="hand2.png"></inlinegraphic> #GDK_HAND2 (a left-pointing hand)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="left_side.png"></inlinegraphic> #GDK_LEFT_SIDE (resize left side)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="right_side.png"></inlinegraphic> #GDK_RIGHT_SIDE (resize right side)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="top_left_corner.png"></inlinegraphic> #GDK_TOP_LEFT_CORNER (resize northwest corner)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="top_right_corner.png"></inlinegraphic> #GDK_TOP_RIGHT_CORNER (resize northeast corner)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="bottom_left_corner.png"></inlinegraphic> #GDK_BOTTOM_LEFT_CORNER (resize southwest corner)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="bottom_right_corner.png"></inlinegraphic> #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="top_side.png"></inlinegraphic> #GDK_TOP_SIDE (resize top side)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="bottom_side.png"></inlinegraphic> #GDK_BOTTOM_SIDE (resize bottom side)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"></inlinegraphic> #GDK_SB_H_DOUBLE_ARROW (move vertical splitter)
+</para></listitem>
+<listitem><para>
+<inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"></inlinegraphic> #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter)
+</para></listitem>
+<listitem><para>
+#GDK_BLANK_CURSOR (Blank cursor). Since 2.16
+</para></listitem>
+</itemizedlist>
</description>
@@ -7914,29 +8345,21 @@
</return>
</function>
-<function name="gdk_fontset_load_for_display">
+<function name="gdk_window_set_child_shapes">
<description>
-Loads a fontset for use on @display.
-
-The fontset may be newly loaded or looked up in a cache.
-You should make no assumptions about the initial reference count.
-
-Since: 2.2
+Sets the shape mask of @window to the union of shape masks
+for all children of @window, ignoring the shape mask of @window
+itself. Contrast with gdk_window_merge_child_shapes() which includes
+the shape mask of @window in the masks to be merged.
</description>
<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
-</parameter_description>
-</parameter>
-<parameter name="fontset_name">
-<parameter_description> a comma-separated list of XLFDs describing
-the component fonts of the fontset to load.
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> a #GdkFont, or %NULL if the fontset could not be loaded.
-</return>
+<return></return>
</function>
<function name="gdk_pointer_ungrab">
@@ -8016,7 +8439,7 @@
<function name="gdk_x11_colormap_get_xdisplay">
<description>
-Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+Return value: an Xlib <type>Display*</type>.
</description>
<parameters>
@@ -8025,7 +8448,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+<return> an Xlib <type>Display*</type>.
</return>
</function>
@@ -8085,21 +8508,30 @@
<return></return>
</function>
-<function name="gdk_screen_get_n_monitors">
+<function name="gdk_window_set_background">
<description>
-Returns: number of monitors which @screen consists of.
+Sets the background color of @window. (However, when using GTK+,
+set the background of a widget with gtk_widget_modify_bg() - if
+you're an application - or gtk_style_set_background() - if you're
+implementing a custom widget.)
+
+The @color must be allocated; gdk_rgb_find_color() is the best way
+to allocate a color.
+
+See also gdk_window_set_back_pixmap().
</description>
<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen.
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> an allocated #GdkColor
</parameter_description>
</parameter>
</parameters>
-<return> number of monitors which @screen consists of.
-
-Since: 2.2
-</return>
+<return></return>
</function>
<function name="GdkPixbuf">
@@ -8117,7 +8549,7 @@
<function name="gdk_pixbuf_format_set_disabled">
<description>
Disables or enables an image format. If a format is disabled,
-gdk-pixbuf won't use the image loader for this format to load
+gdk-pixbuf won't use the image loader for this format to load
images. Applications can use this to avoid using image loaders
with an inappropriate license, see gdk_pixbuf_format_get_license().
@@ -8209,7 +8641,7 @@
GDK will call gdk_window_process_all_updates() on your behalf
whenever your program returns to the main loop and becomes idle, so
-normally there's no need to do that manually, you just need to
+normally there's no need to do that manually, you just need to
invalidate regions that you know should be redrawn.
The @invalidate_children parameter controls whether the region of
@@ -8280,7 +8712,7 @@
Looks up the #GdkPixmap that wraps the given native pixmap handle.
For example in the X backend, a native pixmap handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -8303,12 +8735,14 @@
<function name="gdk_window_set_back_pixmap">
<description>
-Sets the background pixmap of @window. May also be used to set a background of
-"None" on @window, by setting a background pixmap of %NULL.
-A background pixmap will be tiled, positioning the first tile at the origin of
- window, or if @parent_relative is %TRUE, the tiling will be done based on the
-origin of the parent window (useful to align tiles in a parent with tiles
-in a child).
+Sets the background pixmap of @window. May also be used to set a
+background of "None" on @window, by setting a background pixmap
+of %NULL.
+
+A background pixmap will be tiled, positioning the first tile at
+the origin of @window, or if @parent_relative is %TRUE, the tiling
+will be done based on the origin of the parent window (useful to
+align tiles in a parent with tiles in a child).
A background pixmap of %NULL means that the window will have no
background. A window with no background will never have its
@@ -8320,7 +8754,6 @@
when the window is obscured then exposed, and when you call
gdk_window_clear().
-
</description>
<parameters>
<parameter name="window">
@@ -8332,60 +8765,42 @@
</parameter_description>
</parameter>
<parameter name="parent_relative">
-<parameter_description> whether the tiling origin is at the origin of @window's parent
+<parameter_description> whether the tiling origin is at the origin of
+ window's parent
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="gdk_x11_screen_supports_net_wm_hint">
+<function name="gdk_screen_get_rgba_colormap">
<description>
-This function is specific to the X11 backend of GDK, and indicates
-whether the window manager supports a certain hint from the
-Extended Window Manager Hints Specification. You can find this
-specification on
-&lt;ulink url="http://www.freedesktop.org"&gt;http://www.freedesktop.org&lt;/ulink&gt;.
+Gets a colormap to use for creating windows or pixmaps 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.
-When using this function, keep in mind that the window manager
-can change over time; so you shouldn't use this function in
-a way that impacts persistent application state. A common bug
-is that your application can start up before the window manager
-does when the user logs in, and before the window manager starts
-gdk_x11_screen_supports_net_wm_hint() will return %FALSE for every property.
-You can monitor the window_manager_changed signal on #GdkScreen to detect
-a window manager change.
+This functionality is not implemented in the Windows backend.
+
+For setting an overall opacity for a top-level window, see
+gdk_window_set_opacity().
</description>
<parameters>
<parameter name="screen">
-<parameter_description> the relevant #GdkScreen.
-</parameter_description>
-</parameter>
-<parameter name="property">
-<parameter_description> a property atom.
+<parameter_description> a #GdkScreen.
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the window manager supports @property
-
-Since: 2.2
-</return>
-</function>
-
-<function name="gdk_screen_get_default">
-<description>
-Gets the default screen for the default display. (See
-gdk_display_get_default ()).
-
-
-</description>
-<parameters>
-</parameters>
-<return> a #GdkScreen, or %NULL if there is no default display.
+<return> a colormap to use for windows with an alpha channel
+or %NULL if the capability is not available.
-Since: 2.2
+Since: 2.8
</return>
</function>
@@ -8457,6 +8872,28 @@
<return></return>
</function>
+<function name="gdk_font_equal">
+<description>
+Compares two fonts for equality. Single fonts compare equal
+if they have the same X font ID. This operation does
+not currently work correctly for fontsets.
+
+
+</description>
+<parameters>
+<parameter name="fonta">
+<parameter_description> a #GdkFont.
+</parameter_description>
+</parameter>
+<parameter name="fontb">
+<parameter_description> another #GdkFont.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the fonts are equal.
+</return>
+</function>
+
<function name="gdk_pango_context_set_colormap">
<description>
This function used to set the colormap to be used for drawing with
@@ -8493,33 +8930,26 @@
<return></return>
</function>
-<function name="gdk_x11_atom_to_xatom_for_display">
+<function name="gdk_window_withdraw">
<description>
-Converts from a #GdkAtom to the X atom for a #GdkDisplay
-with the same string value.
-
+Withdraws a window (unmaps it and asks the window manager to forget about it).
+This function is not really useful as gdk_window_hide() automatically
+withdraws toplevel windows before hiding them.
</description>
<parameters>
-<parameter name="display">
-<parameter_description> A #GdkDisplay
-</parameter_description>
-</parameter>
-<parameter name="atom">
-<parameter_description> A #GdkAtom
+<parameter name="window">
+<parameter_description> a toplevel #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> the X atom corresponding to @atom.
-
-Since: 2.2
-</return>
+<return></return>
</function>
<function name="gdk_image_set_colormap">
<description>
Sets the colormap for the image to the given colormap. Normally
-there's no need to use this function, images are created with the
+there's no need to use this function, images are created with the
correct colormap if you get the image from a drawable. If you
create the image from scratch, use the colormap of the drawable you
intend to render the image to.
@@ -8559,41 +8989,37 @@
<return></return>
</function>
-<function name="_gdk_gc_update_context">
+<function name="gdk_cursor_get_display">
<description>
-Set the attributes of a cairo context to match those of a #GdkGC
-as far as possible. Some aspects of a #GdkGC, such as clip masks
-and functions other than %GDK_COPY are not currently handled.
+Returns: the #GdkDisplay associated to @cursor
</description>
<parameters>
-<parameter name="gc">
-<parameter_description> a #GdkGC
-</parameter_description>
-</parameter>
-<parameter name="cr">
-<parameter_description> a #cairo_t
-</parameter_description>
-</parameter>
-<parameter name="override_foreground">
-<parameter_description> a foreground color to use to override the
-foreground color of the GC
-</parameter_description>
-</parameter>
-<parameter name="override_stipple">
-<parameter_description> a stipple pattern to use to override the
-stipple from the GC. If this is present and the fill mode
-of the GC isn't %GDK_STIPPLED or %GDK_OPAQUE_STIPPLED
-the fill mode will be forced to %GDK_STIPPLED
+<parameter name="cursor">
+<parameter_description> a #GdkCursor.
</parameter_description>
</parameter>
-<parameter name="gc_changed">
-<parameter_description> pass %FALSE if the @gc has not changed since the
-last call to this function
+</parameters>
+<return> the #GdkDisplay associated to @cursor
+
+Since: 2.2
+</return>
+</function>
+
+<function name="gdk_drawable_get_visual">
+<description>
+Gets the #GdkVisual describing the pixel format of @drawable.
+
+
+</description>
+<parameters>
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> a #GdkVisual
+</return>
</function>
<function name="gdk_visual_get_best_with_depth">
@@ -8739,6 +9165,26 @@
</return>
</function>
+<function name="gdk_gc_set_colormap">
+<description>
+Sets the colormap for the GC to the given colormap. The depth
+of the colormap's visual must match the depth of the drawable
+for which the GC was created.
+
+</description>
+<parameters>
+<parameter name="gc">
+<parameter_description> a #GdkGC
+</parameter_description>
+</parameter>
+<parameter name="colormap">
+<parameter_description> a #GdkColormap
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_event_free">
<description>
Frees a #GdkEvent, freeing or decrementing any resources associated with it.
@@ -8798,11 +9244,11 @@
</parameter_description>
</parameter>
<parameter name="width">
-<parameter_description> Width of the image in pixels, must be &gt; 0
+<parameter_description> Width of the image in pixels, must be > 0
</parameter_description>
</parameter>
<parameter name="height">
-<parameter_description> Height of the image in pixels, must be &gt; 0
+<parameter_description> Height of the image in pixels, must be > 0
</parameter_description>
</parameter>
<parameter name="rowstride">
@@ -8810,7 +9256,7 @@
</parameter_description>
</parameter>
<parameter name="destroy_fn">
-<parameter_description> Function used to free the data when the pixbuf's reference count
+<parameter_description> Function used to free the data when the pixbuf's reference count
drops to zero, or %NULL if the data should not be freed
</parameter_description>
</parameter>
@@ -8826,8 +9272,8 @@
<function name="gdk_window_set_focus_on_map">
<description>
Setting @focus_on_map to %FALSE hints the desktop environment that the
-window doesn't want to receive input focus when it is mapped.
-focus_on_map should be turned off for windows that aren't triggered
+window doesn't want to receive input focus when it is mapped.
+focus_on_map should be turned off for windows that aren't triggered
interactively (such as popups from network activity).
On X, it is the responsibility of the window manager to interpret
@@ -8861,7 +9307,7 @@
the returned pixbuf will become invalid when the iterator advances
to the next frame, which may happen anytime you call
gdk_pixbuf_animation_iter_advance(). Copy the pixbuf to keep it
-(don't just add a reference), as it may get recycled as you advance
+(don't just add a reference), as it may get recycled as you advance
the iterator.
@@ -8894,28 +9340,6 @@
</return>
</function>
-<function name="gdk_drag_begin">
-<description>
-Starts a drag and creates a new drag context for it.
-
-This function is called by the drag source.
-
-
-</description>
-<parameters>
-<parameter name="window">
-<parameter_description> the source window for this drag.
-</parameter_description>
-</parameter>
-<parameter name="targets">
-<parameter_description> the list of offered targets.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a newly created #GdkDragContext.
-</return>
-</function>
-
<function name="gdk_screen_get_root_window">
<description>
Gets the root window of @screen.
@@ -8969,15 +9393,25 @@
</return>
</function>
-<function name="gdk_events_pending">
+<function name="gdk_screen_get_monitor_width_mm">
<description>
-Checks if any events are ready to be processed for any display.
+Gets the width in millimeters of the specified monitor, if available.
</description>
<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
+</parameter_description>
+</parameter>
+<parameter name="monitor_num">
+<parameter_description> number of the monitor
+</parameter_description>
+</parameter>
</parameters>
-<return> %TRUE if any events are pending.
+<return>the width of the monitor, or -1 if not available
+
+Since: 2.14
</return>
</function>
@@ -9108,7 +9542,7 @@
</parameters>
<return> the #GdkColormap object for @xcolormap.
Free with g_object_unref(). Note that for colormap created
-with gdk_x11_colormap_foreign_new(), unref'ing the last
+with gdk_x11_colormap_foreign_new(), unref'ing the last
reference to the object will only free the #GdkColoramp
object and not call XFreeColormap()
@@ -9116,82 +9550,53 @@
</return>
</function>
-<function name="gdk_cairo_set_source_pixbuf">
+<function name="gdk_color_equal">
<description>
-Sets the given pixbuf as the source pattern for the Cairo context.
-The pattern has an extend mode of %CAIRO_EXTEND_NONE and is aligned
-so that the origin of @pixbuf is @pixbuf_x, @pixbuf_y
+Compares two colors.
-Since: 2.8
</description>
<parameters>
-<parameter name="cr">
-<parameter_description> a #Cairo context
-</parameter_description>
-</parameter>
-<parameter name="pixbuf">
-<parameter_description> a #GdkPixbuf
-</parameter_description>
-</parameter>
-<parameter name="pixbuf_x">
-<parameter_description> X coordinate of location to place upper left corner of @pixbuf
+<parameter name="colora">
+<parameter_description> a #GdkColor.
</parameter_description>
</parameter>
-<parameter name="pixbuf_y">
-<parameter_description> Y coordinate of location to place upper left corner of @pixbuf
+<parameter name="colorb">
+<parameter_description> another #GdkColor.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the two colors compare equal
+</return>
</function>
-<function name="gdk_window_set_hints">
+<function name="gdk_rectangle_intersect">
<description>
-This function is broken and useless and you should ignore it.
-If using GTK+, use functions such as gtk_window_resize(), gtk_window_set_size_request(),
-gtk_window_move(), gtk_window_parse_geometry(), and gtk_window_set_geometry_hints(),
-depending on what you're trying to do.
-
-If using GDK directly, use gdk_window_set_geometry_hints().
+Calculates the intersection of two rectangles. It is allowed for
+ dest to be the same as either @src1 or @src2. If the rectangles
+do not intersect, @dest's width and height is set to 0 and its x
+and y values are undefined. If you are only interested in whether
+the rectangles intersect, but not in the intersecting area itself,
+pass %NULL for @dest.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> ignored field, does not matter
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> ignored field, does not matter
-</parameter_description>
-</parameter>
-<parameter name="min_width">
-<parameter_description> minimum width hint
-</parameter_description>
-</parameter>
-<parameter name="min_height">
-<parameter_description> minimum height hint
-</parameter_description>
-</parameter>
-<parameter name="max_width">
-<parameter_description> max width hint
+<parameter name="src1">
+<parameter_description> a #GdkRectangle
</parameter_description>
</parameter>
-<parameter name="max_height">
-<parameter_description> max height hint
+<parameter name="src2">
+<parameter_description> a #GdkRectangle
</parameter_description>
</parameter>
-<parameter name="flags">
-<parameter_description> logical OR of GDK_HINT_POS, GDK_HINT_MIN_SIZE, and/or GDK_HINT_MAX_SIZE
+<parameter name="dest">
+<parameter_description> return location for the intersection of @src1 and @src2, or %NULL
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the rectangles intersect.
+</return>
</function>
<function name="gdk_cairo_rectangle">
@@ -9219,8 +9624,7 @@
Creates a new cursor from the set of builtin cursors for the default display.
See gdk_cursor_new_for_display().
-To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
-a cursor with no pixels in it.
+To make the cursor invisible, use %GDK_BLANK_CURSOR.
</description>
@@ -9245,7 +9649,7 @@
iterator, you should immediately display the pixbuf returned by
gdk_pixbuf_animation_iter_get_pixbuf(). Then, you should install a
timeout (with g_timeout_add()) or by some other mechanism ensure
-that you'll update the image after
+that you'll update the image after
gdk_pixbuf_animation_iter_get_delay_time() milliseconds. Each time
the image is updated, you should reinstall the timeout with the new,
possibly-changed delay time.
@@ -9257,7 +9661,7 @@
gdk_pixbuf_animation_iter_get_pixbuf() to a new frame of the animation),
call gdk_pixbuf_animation_iter_advance().
-If you're using #GdkPixbufLoader, in addition to updating the image
+If you're using #GdkPixbufLoader, in addition to updating the image
after the delay time, you should also update it whenever you
receive the area_updated signal and
gdk_pixbuf_animation_iter_on_currently_loading_frame() returns
@@ -9324,7 +9728,7 @@
<function name="gdk_x11_register_standard_event_type">
<description>
Registers interest in receiving extension events with type codes
-between @event_base and &lt;literal&gt;event_base + n_events - 1&lt;/literal&gt;.
+between @event_base and <literal>event_base + n_events - 1</literal>.
The registered events must have the window field in the same place
as core X events (this is not the case for e.g. XKB extension events).
@@ -9374,7 +9778,7 @@
</parameter>
<parameter name="propagate">
<parameter_description> %TRUE if the event should be propagated if the target window
-doesn't handle it.
+doesn't handle it.
</parameter_description>
</parameter>
<parameter name="event_mask">
@@ -9391,26 +9795,6 @@
</return>
</function>
-<function name="gdk_cairo_set_source_color">
-<description>
-Sets the specified #GdkColor as the source color of @cr.
-
-Since: 2.8
-
-</description>
-<parameters>
-<parameter name="cr">
-<parameter_description> a #cairo_t
-</parameter_description>
-</parameter>
-<parameter name="color">
-<parameter_description> a #GdkColor
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_region_union">
<description>
Sets the area of @source1 to the union of the areas of @source1 and
@@ -9461,7 +9845,7 @@
<parameter_description> an array of #GdkPoint structures.
</parameter_description>
</parameter>
-<parameter name="npoints">
+<parameter name="n_points">
<parameter_description> the number of points to be drawn.
</parameter_description>
</parameter>
@@ -9471,7 +9855,7 @@
<function name="gdk_x11_drawable_get_xid">
<description>
-Return value: the ID of @drawable's X resource.
+Return value: the ID of @drawable's X resource.
</description>
<parameters>
@@ -9480,7 +9864,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the ID of @drawable's X resource.
+<return> the ID of @drawable's X resource.
</return>
</function>
@@ -9536,9 +9920,9 @@
<function name="gdk_image_new_bitmap">
<description>
Creates a new #GdkImage with a depth of 1 from the given data.
-&lt;warning&gt;&lt;para&gt;THIS FUNCTION IS INCREDIBLY BROKEN. The passed-in data must
+<warning><para>THIS FUNCTION IS INCREDIBLY BROKEN. The passed-in data must
be allocated by malloc() (NOT g_malloc()) and will be freed when the
-image is freed.&lt;/para&gt;&lt;/warning&gt;
+image is freed.</para></warning>
</description>
@@ -9593,28 +9977,24 @@
</return>
</function>
-<function name="gdk_event_get_root_coords">
+<function name="gdk_cairo_set_source_color">
<description>
-Extract the root window relative x/y coordinates from an event.
+Sets the specified #GdkColor as the source color of @cr.
+Since: 2.8
</description>
<parameters>
-<parameter name="event">
-<parameter_description> a #GdkEvent
-</parameter_description>
-</parameter>
-<parameter name="x_root">
-<parameter_description> location to put root window x coordinate
+<parameter name="cr">
+<parameter_description> a #cairo_t
</parameter_description>
</parameter>
-<parameter name="y_root">
-<parameter_description> location to put root window y coordinate
+<parameter name="color">
+<parameter_description> a #GdkColor
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the event delivered root window coordinates
-</return>
+<return></return>
</function>
<function name="gdk_window_get_root_origin">
@@ -9641,26 +10021,16 @@
<return></return>
</function>
-<function name="gdk_window_process_updates">
+<function name="gdk_cursor_unref">
<description>
-Sends one or more expose events to @window. The areas in each
-expose event will cover the entire update area for the window (see
-gdk_window_invalidate_region() for details). Normally GDK calls
-gdk_window_process_all_updates() on your behalf, so there's no
-need to call this function unless you want to force expose events
-to be delivered immediately and synchronously (vs. the usual
-case, where GDK delivers them in an idle handler). Occasionally
-this is useful to produce nicer scrolling behavior, for example.
+Removes a reference from @cursor, deallocating the cursor
+if no references remain.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
-</parameter_description>
-</parameter>
-<parameter name="update_children">
-<parameter_description> whether to also process updates for child windows
+<parameter name="cursor">
+<parameter_description> a #GdkCursor
</parameter_description>
</parameter>
</parameters>
@@ -9727,7 +10097,7 @@
up the polygon.
</parameter_description>
</parameter>
-<parameter name="npoints">
+<parameter name="n_points">
<parameter_description> the number of points.
</parameter_description>
</parameter>
@@ -9839,7 +10209,7 @@
<description>
Sets the icon of @window as a pixmap or window. If using GTK+, investigate
gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list()
-and gtk_window_set_icon(). If those don't meet your needs, look at
+and gtk_window_set_icon(). If those don't meet your needs, look at
gdk_window_set_icon_list(). Only if all those are too high-level do you
want to fall back to gdk_window_set_icon().
@@ -9925,7 +10295,7 @@
On X11, asks the window manager to move @window out of the fullscreen
state, if the window manager supports this operation. Not all
window managers support this, and some deliberately ignore it or
-don't have a concept of "fullscreen"; so you can't rely on the
+don't have a concept of "fullscreen"; so you can't rely on the
unfullscreenification actually happening. But it will happen with
most standard window managers, and GDK makes a best effort to get
it to happen.
@@ -9945,7 +10315,7 @@
<function name="gdk_pixbuf_new_from_xpm_data">
<description>
Creates a new pixbuf by parsing XPM data in memory. This data is commonly
-the result of including an XPM file into a program's C source.
+the result of including an XPM file into a program's C source.
</description>
@@ -9961,7 +10331,7 @@
<function name="gdk_window_freeze_updates">
<description>
-Temporarily freezes a window such that it won't receive expose
+Temporarily freezes a window such that it won't receive expose
events. The window will begin receiving expose events again when
gdk_window_thaw_updates() is called. If gdk_window_freeze_updates()
has been called more than once, gdk_window_thaw_updates() must be called
@@ -10007,7 +10377,7 @@
</parameter>
<parameter name="color">
<parameter_description> The color to allocate. On return, the
-&lt;structfield&gt;pixel&lt;/structfield&gt; field will be filled in.
+<structfield>pixel</structfield> field will be filled in.
</parameter_description>
</parameter>
</parameters>
@@ -10057,31 +10427,76 @@
</return>
</function>
-<function name="gdk_screen_get_font_options">
+<function name="gdk_input_add">
<description>
-Gets any options previously set with gdk_screen_set_font_options().
+Establish a callback when a condition becomes true on
+a file descriptor.
</description>
<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
+<parameter name="source">
+<parameter_description> a file descriptor.
+</parameter_description>
+</parameter>
+<parameter name="condition">
+<parameter_description> the condition.
+</parameter_description>
+</parameter>
+<parameter name="function">
+<parameter_description> the callback function.
+</parameter_description>
+</parameter>
+<parameter name="data">
+<parameter_description> callback data passed to @function.
</parameter_description>
</parameter>
</parameters>
-<return> the current font options, or %NULL if no default
-font options have been set.
+<return> a tag that can later be used as an argument to
+gdk_input_remove().
-Since: 2.10
+Deprecated: Use g_io_add_watch() on a #GIOChannel
</return>
</function>
+<function name="gdk_window_move_region">
+<description>
+Move the part of @window indicated by @region by @dy pixels in the Y
+direction and @dx pixels in the X direction. The portions of @region
+that not covered by the new position of @region are invalidated.
+
+Child windows are not moved.
+
+Since: 2.8
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="region">
+<parameter_description> The #GdkRegion to move
+</parameter_description>
+</parameter>
+<parameter name="dx">
+<parameter_description> Amount to move in the X direction
+</parameter_description>
+</parameter>
+<parameter name="dy">
+<parameter_description> Amount to move in the Y direction
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_screen_get_rgb_colormap">
<description>
Gets the preferred colormap for rendering image data on @screen.
Not a very useful function; historically, GDK could only render RGB
image data to one colormap and visual, but in the current version
-it can render to any colormap and visual. So there's no need to
+it can render to any colormap and visual. So there's no need to
call this function.
@@ -10098,6 +10513,23 @@
</return>
</function>
+<function name="gdk_window_remove_redirection">
+<description>
+Removes any active redirection started by
+gdk_window_redirect_to_drawable().
+
+Since: 2.14
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_display_open_default_libgtk_only">
<description>
Opens the default display specified by command line arguments or
@@ -10131,9 +10563,9 @@
<function name="gdk_window_set_skip_taskbar_hint">
<description>
Toggles whether a window should appear in a task list or window
-list. If a window's semantic type as specified with
+list. If a window's semantic type as specified with
gdk_window_set_type_hint() already fully describes the window, this
-function should &lt;emphasis&gt;not&lt;/emphasis&gt; be called in addition,
+function should <emphasis>not</emphasis> be called in addition,
instead you should allow the window to be treated according to
standard policy for its semantic type.
@@ -10153,53 +10585,59 @@
<return></return>
</function>
-<function name="gdk_screen_get_width_mm">
+<function name="gdk_font_ref">
<description>
-Gets the width of @screen in millimeters.
-Note that on some X servers this value will not be correct.
+Increases the reference count of a font by one.
</description>
<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
+<parameter name="font">
+<parameter_description> a #GdkFont
</parameter_description>
</parameter>
</parameters>
-<return> the width of @screen in millimeters.
-
-Since: 2.2
+<return> @font
</return>
</function>
-<function name="gdk_display_get_pointer">
+<function name="gdk_window_set_geometry_hints">
<description>
-Gets the current location of the pointer and the current modifier
-mask for a given display.
+Sets the geometry hints for @window. Hints flagged in @geom_mask
+are set, hints not flagged in @geom_mask are unset.
+To unset all hints, use a @geom_mask of 0 and a @geometry of %NULL.
+
+This function provides hints to the windowing system about
+acceptable sizes for a toplevel window. The purpose of
+this is to constrain user resizing, but the windowing system
+will typically (but is not required to) also constrain the
+current size of the window to the provided values and
+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.
+
+Since you can't count on the windowing system doing the
+constraints for programmatic resizes, you should generally
+call gdk_window_constrain_size() yourself to determine
+appropriate sizes.
-Since: 2.2
</description>
<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
-</parameter_description>
-</parameter>
-<parameter name="screen">
-<parameter_description> location to store the screen that the
-cursor is on, or %NULL.
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> location to store root window X coordinate of pointer, or %NULL.
+<parameter name="window">
+<parameter_description> a toplevel #GdkWindow
</parameter_description>
</parameter>
-<parameter name="y">
-<parameter_description> location to store root window Y coordinate of pointer, or %NULL.
+<parameter name="geometry">
+<parameter_description> geometry hints
</parameter_description>
</parameter>
-<parameter name="mask">
-<parameter_description> location to store current modifier mask, or %NULL
+<parameter name="geom_mask">
+<parameter_description> bitmask indicating fields of @geometry to pay attention to
</parameter_description>
</parameter>
</parameters>
@@ -10229,49 +10667,54 @@
</return>
</function>
-<function name="gdk_x11_display_set_cursor_theme">
+<function name="gdk_colors_alloc">
<description>
-Sets the cursor theme from which the images for cursor
-should be taken.
-
-If the windowing system supports it, existing cursors created
-with gdk_cursor_new(), gdk_cursor_new_for_display() and
-gdk_cursor_new_for_name() are updated to reflect the theme
-change. Custom cursors constructed with gdk_cursor_new_from_pixmap()
-or gdk_cursor_new_from_pixbuf() will have to be handled
-by the application (GTK+ applications can learn about
-cursor theme changes by listening for change notification
-for the corresponding #GtkSetting).
+Allocates colors from a colormap. This function
+is obsolete. See gdk_colormap_alloc_colors().
+For full documentation of the fields, see
+the Xlib documentation for <function>XAllocColorCells()</function>.
-Since: 2.8
</description>
<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
+<parameter name="colormap">
+<parameter_description> a #GdkColormap.
</parameter_description>
</parameter>
-<parameter name="theme">
-<parameter_description> the name of the cursor theme to use, or %NULL to unset
-a previously set value
+<parameter name="contiguous">
+<parameter_description> if %TRUE, the colors should be allocated
+in contiguous color cells.
</parameter_description>
</parameter>
-<parameter name="size">
-<parameter_description> the cursor size to use, or 0 to keep the previous size
+<parameter name="planes">
+<parameter_description> an array in which to store the plane masks.
</parameter_description>
</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="gdk_window_hide">
-<description>
-For toplevel windows, withdraws them, so they will no longer be
+<parameter name="nplanes">
+<parameter_description> the number of planes to allocate. (Or zero,
+to indicate that the color allocation should not be planar.)
+</parameter_description>
+</parameter>
+<parameter name="pixels">
+<parameter_description> an array into which to store allocated pixel values.
+</parameter_description>
+</parameter>
+<parameter name="npixels">
+<parameter_description> the number of pixels in each plane to allocate.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the allocation was successful
+</return>
+</function>
+
+<function name="gdk_window_hide">
+<description>
+For toplevel windows, withdraws them, so they will no longer be
known to the window manager; for all windows, unmaps them, so
-they won't be displayed. Normally done automatically as
+they won't be displayed. Normally done automatically as
part of gtk_widget_hide().
-
</description>
<parameters>
<parameter name="window">
@@ -10348,6 +10791,52 @@
</return>
</function>
+<function name="gdk_test_simulate_button">
+<description>
+This function is intended to be used in Gtk+ test programs.
+It will warp the mouse pointer to the given (@x,@y) corrdinates
+within @window and simulate a button press or release event.
+Because the mouse pointer needs to be warped to the target
+location, use of this function outside of test programs that
+run in their own virtual windowing system (e.g. Xvfb) is not
+recommended.
+Also, gtk_test_simulate_button() is a fairly low level function,
+for most testing purposes, gtk_test_widget_click() is the right
+function to call which will generate a button press event followed
+by its accompanying button release event.
+
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> Gdk window to simulate a button event for.
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> x coordinate within @window for the button event.
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> y coordinate within @window for the button event.
+</parameter_description>
+</parameter>
+<parameter name="button">
+<parameter_description> Number of the pointer button for the event, usually 1, 2 or 3.
+</parameter_description>
+</parameter>
+<parameter name="modifiers">
+<parameter_description> Keyboard modifiers the event is setup with.
+</parameter_description>
+</parameter>
+<parameter name="button_pressrelease">
+<parameter_description> either %GDK_BUTTON_PRESS or %GDK_BUTTON_RELEASE
+</parameter_description>
+</parameter>
+</parameters>
+<return> wether all actions neccessary for a button event simulation were carried out successfully.
+</return>
+</function>
+
<function name="gdk_window_deiconify">
<description>
Attempt to deiconify (unminimize) @window. On X11 the window manager may
@@ -10486,7 +10975,7 @@
<function name="gdk_window_set_title">
<description>
Sets the title of a toplevel window, to be displayed in the titlebar.
-If you haven't explicitly set the icon name for the window
+If you haven't explicitly set the icon name for the window
(using gdk_window_set_icon_name()), the icon name will be set to
@title as well. @title must be in UTF-8 encoding (as with all
user-readable strings in GDK/GTK+). @title may not be %NULL.
@@ -10551,22 +11040,44 @@
</return>
</function>
-<function name="gdk_colormap_get_screen">
+<function name="gdk_threads_set_lock_functions">
<description>
-Gets the screen for which this colormap was created.
+Allows the application to replace the standard method that
+GDK uses to protect its data structures. Normally, GDK
+creates a single #GMutex that is locked by gdk_threads_enter(),
+and released by gdk_threads_leave(); using this function an
+application provides, instead, a function @enter_fn that is
+called by gdk_threads_enter() and a function @leave_fn that is
+called by gdk_threads_leave().
+
+The functions must provide at least same locking functionality
+as the default implementation, but can also do extra application
+specific processing.
+
+As an example, consider an application that has its own recursive
+lock that when held, holds the GTK+ lock as well. When GTK+ unlocks
+the GTK+ lock when entering a recursive main loop, the application
+must temporarily release its lock as well.
+
+Most threaded GTK+ apps won't need to use this method.
+
+This method must be called before gdk_threads_init(), and cannot
+be called multiple times.
+Since: 2.4
</description>
<parameters>
-<parameter name="cmap">
-<parameter_description> a #GdkColormap
+<parameter name="enter_fn">
+<parameter_description> function called to guard GDK
+</parameter_description>
+</parameter>
+<parameter name="leave_fn">
+<parameter_description> function called to release the guard
</parameter_description>
</parameter>
</parameters>
-<return> the screen for which this colormap was created.
-
-Since: 2.2
-</return>
+<return></return>
</function>
<function name="gdk_display_get_event">
@@ -10589,26 +11100,21 @@
</return>
</function>
-<function name="gdk_window_get_frame_extents">
+<function name="gdk_drag_drop_succeeded">
<description>
-Obtains the bounding box of the window, including window manager
-titlebar/borders if any. The frame position is given in root window
-coordinates. To get the position of the window itself (rather than
-the frame) in root window coordinates, use gdk_window_get_origin().
-
+Return value: %TRUE if the drop was successful.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a toplevel #GdkWindow
-</parameter_description>
-</parameter>
-<parameter name="rect">
-<parameter_description> rectangle to fill with bounding box of the window frame
+<parameter name="context">
+<parameter_description> a #GdkDragContext
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the drop was successful.
+
+Since: 2.6
+</return>
</function>
<function name="gdk_gc_set_fill">
@@ -10629,10 +11135,9 @@
<return></return>
</function>
-<function name="gdk_display_get_name">
+<function name="gdk_display_supports_shapes">
<description>
-Gets the name of the display.
-
+Returns: %TRUE if shaped windows are supported
</description>
<parameters>
@@ -10641,10 +11146,9 @@
</parameter_description>
</parameter>
</parameters>
-<return> a string representing the display name. This string is owned
-by GDK and should not be modified or freed.
+<return> %TRUE if shaped windows are supported
-Since: 2.2
+Since: 2.10
</return>
</function>
@@ -10653,7 +11157,7 @@
Gets a "preferred visual" chosen by GdkRGB for rendering image data
on the default screen. In previous versions of GDK, this was the
only visual GdkRGB could use for rendering. In current versions,
-it's simply the visual GdkRGB would have chosen as the optimal one
+it's simply the visual GdkRGB would have chosen as the optimal one
in those previous versions. GdkRGB can now render to drawables with
any visual.
@@ -10768,7 +11272,7 @@
<function name="gdk_screen_get_system_visual">
<description>
-Get the system's default visual for @screen.
+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.
@@ -10792,7 +11296,7 @@
This may fail if the pixmap has been destroyed.
For example in the X backend, a native pixmap handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -10813,6 +11317,28 @@
</return>
</function>
+<function name="gdk_screen_get_monitor_plug_name">
+<description>
+Returns: a newly-allocated string containing the name of the monitor,
+
+</description>
+<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
+</parameter_description>
+</parameter>
+<parameter name="monitor_num">
+<parameter_description> number of the monitor
+</parameter_description>
+</parameter>
+</parameters>
+<return> a newly-allocated string containing the name of the monitor,
+or %NULL if the name cannot be determined
+
+Since: 2.14
+</return>
+</function>
+
<function name="gdk_drawable_set_data">
<description>
This function is equivalent to g_object_set_data(),
@@ -10841,9 +11367,44 @@
<return></return>
</function>
+<function name="gdk_x11_display_set_cursor_theme">
+<description>
+Sets the cursor theme from which the images for cursor
+should be taken.
+
+If the windowing system supports it, existing cursors created
+with gdk_cursor_new(), gdk_cursor_new_for_display() and
+gdk_cursor_new_for_name() are updated to reflect the theme
+change. Custom cursors constructed with gdk_cursor_new_from_pixmap()
+or gdk_cursor_new_from_pixbuf() will have to be handled
+by the application (GTK+ applications can learn about
+cursor theme changes by listening for change notification
+for the corresponding #GtkSetting).
+
+Since: 2.8
+
+</description>
+<parameters>
+<parameter name="display">
+<parameter_description> a #GdkDisplay
+</parameter_description>
+</parameter>
+<parameter name="theme">
+<parameter_description> the name of the cursor theme to use, or %NULL to unset
+a previously set value
+</parameter_description>
+</parameter>
+<parameter name="size">
+<parameter_description> the cursor size to use, or 0 to keep the previous size
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_x11_colormap_get_xcolormap">
<description>
-Return value: an Xlib &lt;type&gt;Colormap&lt;/type&gt;.
+Return value: an Xlib <type>Colormap</type>.
</description>
<parameters>
@@ -10852,48 +11413,26 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Colormap&lt;/type&gt;.
+<return> an Xlib <type>Colormap</type>.
</return>
</function>
-<function name="gdk_pixbuf_render_pixmap_and_mask">
+<function name="gdk_drawable_get_depth">
<description>
-Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
-and @mask_return arguments, respectively, and renders a pixbuf and its
-corresponding thresholded alpha mask to them. This is merely a convenience
-function; applications that need to render pixbufs with dither offsets or to
-given drawables should use gdk_draw_pixbuf() and gdk_pixbuf_render_threshold_alpha().
-
-The pixmap that is created is created for the colormap returned
-by gdk_rgb_get_colormap(). You normally will want to instead use
-the actual colormap for a widget, and use
-gdk_pixbuf_render_pixmap_and_mask_for_colormap().
+Obtains the bit depth of the drawable, that is, the number of bits
+that make up a pixel in the drawable's visual. Examples are 8 bits
+per pixel, 24 bits per pixel, etc.
-If the pixbuf does not have an alpha channel, then * mask_return will be set
-to %NULL.
</description>
<parameters>
-<parameter name="pixbuf">
-<parameter_description> A pixbuf.
-</parameter_description>
-</parameter>
-<parameter name="pixmap_return">
-<parameter_description> Location to store a pointer to the created pixmap,
-or %NULL if the pixmap is not needed.
-</parameter_description>
-</parameter>
-<parameter name="mask_return">
-<parameter_description> Location to store a pointer to the created mask,
-or %NULL if the mask is not needed.
-</parameter_description>
-</parameter>
-<parameter name="alpha_threshold">
-<parameter_description> Threshold value for opacity values.
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> number of bits per pixel
+</return>
</function>
<function name="_gdk_win32_drawable_finish">
@@ -10966,6 +11505,62 @@
</return>
</function>
+<function name="gdk_pixbuf_new_from_stream_at_scale">
+<description>
+Creates a new pixbuf by loading an image from an input stream.
+
+The file format is detected automatically. If %NULL is returned, then
+ error will be set. The @cancellable can be used to abort the operation
+from another thread. If the operation was cancelled, the error
+%GIO_ERROR_CANCELLED will be returned. Other possible errors are in
+the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains.
+
+The image will be scaled to fit in the requested size, optionally
+preserving the image's aspect ratio. When preserving the aspect ratio,
+a @width of -1 will cause the image to be scaled to the exact given
+height, and a @height of -1 will cause the image to be scaled to the
+exact given width. When not preserving aspect ratio, a @width or
+ height of -1 means to not scale the image at all in that dimension.
+
+The stream is not closed.
+
+
+</description>
+<parameters>
+<parameter name="stream">
+<parameter_description> a #GInputStream to load the pixbuf from
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> The width the image should have or -1 to not constrain the width
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> The height the image should have or -1 to not constrain the height
+</parameter_description>
+</parameter>
+<parameter name="preserve_aspect_ratio">
+<parameter_description> %TRUE to preserve the image's aspect ratio
+</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 an error
+</parameter_description>
+</parameter>
+</parameters>
+<return> A newly-created pixbuf, or %NULL if any of several error
+conditions occurred: the file could not be opened, the image format is
+not supported, there was not enough memory to allocate the image buffer,
+the stream contained invalid data, or the operation was cancelled.
+
+Since: 2.14
+</return>
+</function>
+
<function name="gdk_pixbuf_composite_color">
<description>
Creates a transformation of the source image @src by scaling by
@@ -11056,8 +11651,8 @@
<function name="gdk_wcstombs">
<description>
Converts a wide character string to a multi-byte string.
-(The function name comes from an acronym of 'Wide Character String TO
-Multi-Byte String').
+(The function name comes from an acronym of 'Wide Character String TO
+Multi-Byte String').
</description>
@@ -11073,28 +11668,63 @@
</return>
</function>
-<function name="gdk_display_get_default">
+<function name="gdk_input_add_full">
<description>
-Gets the default #GdkDisplay. This is a convenience
-function for:
-&lt;programlisting&gt;
-gdk_display_manager_get_default_display (gdk_display_manager_get ())
-&lt;/programlisting&gt;
+Establish a callback when a condition becomes true on
+a file descriptor.
</description>
<parameters>
+<parameter name="source">
+<parameter_description> a file descriptor.
+</parameter_description>
+</parameter>
+<parameter name="condition">
+<parameter_description> the condition.
+</parameter_description>
+</parameter>
+<parameter name="function">
+<parameter_description> the callback function.
+</parameter_description>
+</parameter>
+<parameter name="data">
+<parameter_description> callback data passed to @function.
+</parameter_description>
+</parameter>
+<parameter name="destroy">
+<parameter_description> callback function to call with @data when the input
+handler is removed.
+</parameter_description>
+</parameter>
</parameters>
-<return> a #GdkDisplay, or %NULL if there is no default
-display.
+<return> a tag that can later be used as an argument to
+gdk_input_remove().
-Since: 2.2
+Deprecated: Use g_io_add_watch_full() on a #GIOChannel
</return>
</function>
-<function name="gdk_text_height">
+<function name="gdk_display_get_default">
<description>
-Determines the total height of a given string.
+Gets the default #GdkDisplay. This is a convenience
+function for
+<literal>gdk_display_manager_get_default_display (gdk_display_manager_get ())</literal>.
+
+
+</description>
+<parameters>
+</parameters>
+<return> a #GdkDisplay, or %NULL if there is no default
+display.
+
+Since: 2.2
+</return>
+</function>
+
+<function name="gdk_text_height">
+<description>
+Determines the total height of a given string.
This value is not generally useful, because you cannot
determine how this total height will be drawn in
relation to the baseline. See gdk_text_extents().
@@ -11140,6 +11770,7 @@
<function name="gdk_keymap_get_direction">
<description>
+Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL
</description>
<parameters>
@@ -11148,10 +11779,9 @@
</parameter_description>
</parameter>
</parameters>
-<return>the direction of effective layout of the keymap.
-
- Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL if determines the
-direction. %PANGO_DIRECTION_NEUTRAL otherwise.
+<return> %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL
+if it can determine the direction. %PANGO_DIRECTION_NEUTRAL
+otherwise.
</return>
</function>
@@ -11159,7 +11789,7 @@
<description>
Sets the double click time (two clicks within this time interval
count as a double click and result in a #GDK_2BUTTON_PRESS event).
-Applications should &lt;emphasis&gt;not&lt;/emphasis&gt; set this, it is a global
+Applications should <emphasis>not</emphasis> set this, it is a global
user-configured setting.
Since: 2.2
@@ -11183,8 +11813,8 @@
Creates a new pixbuf loader object that always attempts to parse
image data as if it were an image of mime type @mime_type, instead of
identifying the type automatically. Useful if you want an error if
-the image isn't the expected mime type, for loading image formats
-that can't be reliably identified by looking at the data, or if
+the image isn't the expected mime type, for loading image formats
+that can't be reliably identified by looking at the data, or if
the user manually forces a specific mime type.
The list of supported mime types depends on what image loaders
@@ -11270,27 +11900,36 @@
</return>
</function>
-<function name="gdk_window_merge_child_input_shapes">
+<function name="gdk_event_send_client_message_for_display">
<description>
-Merges the input shape masks for any child windows into the
-input shape mask for @window. i.e. the union of all input masks
-for @window and its children will become the new input mask
-for @window. See gdk_window_input_shape_combine_mask().
+On X11, sends an X ClientMessage event to a given window. On
+Windows, sends a message registered with the name
+GDK_WIN32_CLIENT_MESSAGE.
-This function is distinct from gdk_window_set_child_input_shapes()
-because it includes @window's input shape mask in the set of
-shapes to be merged.
+This could be used for communicating between different
+applications, though the amount of data is limited to 20 bytes on
+X11, and to just four bytes on Windows.
-Since: 2.10
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="display">
+<parameter_description> the #GdkDisplay for the window where the message is to be sent.
+</parameter_description>
+</parameter>
+<parameter name="event">
+<parameter_description> the #GdkEvent to send, which should be a #GdkEventClient.
+</parameter_description>
+</parameter>
+<parameter name="winid">
+<parameter_description> the window to send the client message to.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> non-zero on success.
+
+Since: 2.2
+</return>
</function>
<function name="gdk_region_destroy">
@@ -11329,7 +11968,7 @@
<function name="gdk_event_copy">
<description>
Copies a #GdkEvent, copying or incrementing the reference count of the
-resources associated with it (e.g. #GdkWindow's and strings).
+resources associated with it (e.g. #GdkWindow's and strings).
</description>
@@ -11376,7 +12015,7 @@
<description>
Modifies saturation and optionally pixelates @src, placing the result in
@dest. @src and @dest may be the same pixbuf with no ill effects. If
- saturation is 1.0 then saturation is not changed. If it's less than 1.0,
+ saturation is 1.0 then saturation is not changed. If it's less than 1.0,
saturation is reduced (the image turns toward grayscale); if greater than
1.0, saturation is increased (the image gets more vivid colors). If @pixelate
is %TRUE, then pixels are faded in a checkerboard pattern to create a
@@ -11414,8 +12053,7 @@
On the X11 platform, in Xlib terms, this function calls
XMapWindow() (it also updates some internal GDK state, which means
-that you can't really use XMapWindow() directly on a GDK window).
-
+that you can't really use XMapWindow() directly on a GDK window).
</description>
<parameters>
@@ -11473,24 +12111,21 @@
</return>
</function>
-<function name="gdk_gc_set_colormap">
+<function name="gdk_keymap_get_caps_lock_state">
<description>
-Sets the colormap for the GC to the given colormap. The depth
-of the colormap's visual must match the depth of the drawable
-for which the GC was created.
+Returns: %TRUE if Caps Lock is on
</description>
<parameters>
-<parameter name="gc">
-<parameter_description> a #GdkGC
-</parameter_description>
-</parameter>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap
+<parameter name="keymap">
+<parameter_description> a #GdkKeymap
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if Caps Lock is on
+
+Since: 2.16
+</return>
</function>
<function name="gdk_cursor_new_from_pixmap">
@@ -11500,12 +12135,12 @@
The standard cursor size is 16 by 16 pixels. You can create a bitmap
from inline data as in the below example.
-&lt;example&gt;&lt;title&gt;Creating a custom cursor&lt;/title&gt;
-&lt;programlisting&gt;
-/&lt;!-- --&gt;* This data is in X bitmap format, and can be created with the 'bitmap'
-utility. *&lt;!-- --&gt;/
-&num;define cursor1_width 16
-&num;define cursor1_height 16
+<example><title>Creating a custom cursor</title>
+<programlisting>
+/<!-- -->* This data is in X bitmap format, and can be created with the 'bitmap'
+utility. *<!-- -->/
+#define cursor1_width 16
+#define cursor1_height 16
static unsigned char cursor1_bits[] = {
0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20,
0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10,
@@ -11519,22 +12154,22 @@
GdkCursor *cursor;
GdkPixmap *source, *mask;
-GdkColor fg = { 0, 65535, 0, 0 }; /&lt;!-- --&gt;* Red. *&lt;!-- --&gt;/
-GdkColor bg = { 0, 0, 0, 65535 }; /&lt;!-- --&gt;* Blue. *&lt;!-- --&gt;/
+GdkColor fg = { 0, 65535, 0, 0 }; /<!-- -->* Red. *<!-- -->/
+GdkColor bg = { 0, 0, 0, 65535 }; /<!-- -->* Blue. *<!-- -->/
source = gdk_bitmap_create_from_data (NULL, cursor1_bits,
cursor1_width, cursor1_height);
mask = gdk_bitmap_create_from_data (NULL, cursor1mask_bits,
cursor1_width, cursor1_height);
-cursor = gdk_cursor_new_from_pixmap (source, mask, &amp;fg, &amp;bg, 8, 8);
+cursor = gdk_cursor_new_from_pixmap (source, mask, &fg, &bg, 8, 8);
gdk_pixmap_unref (source);
gdk_pixmap_unref (mask);
-gdk_window_set_cursor (widget-&gt;window, cursor);
-&lt;/programlisting&gt;
-&lt;/example&gt;
+gdk_window_set_cursor (widget->window, cursor);
+</programlisting>
+</example>
</description>
@@ -11559,11 +12194,11 @@
</parameter_description>
</parameter>
<parameter name="x">
-<parameter_description> the horizontal offset of the 'hotspot' of the cursor.
+<parameter_description> the horizontal offset of the 'hotspot' of the cursor.
</parameter_description>
</parameter>
<parameter name="y">
-<parameter_description> the vertical offset of the 'hotspot' of the cursor.
+<parameter_description> the vertical offset of the 'hotspot' of the cursor.
</parameter_description>
</parameter>
</parameters>
@@ -11608,11 +12243,11 @@
<function name="gdk_window_get_deskrelative_origin">
<description>
This gets the origin of a #GdkWindow relative to
-an Enlightenment-window-manager desktop. As long as you don't
-assume that the user's desktop/workspace covers the entire
-root window (i.e. you don't assume that the desktop begins
+an Enlightenment-window-manager desktop. As long as you don't
+assume that the user's desktop/workspace covers the entire
+root window (i.e. you don't assume that the desktop begins
at root window coordinate 0,0) this function is not necessary.
-It's deprecated for that reason.
+It's deprecated for that reason.
</description>
@@ -11634,25 +12269,29 @@
</return>
</function>
-<function name="gdk_drop_reply">
+<function name="gdk_pango_renderer_set_stipple">
<description>
-Accepts or rejects a drop.
+Sets the stipple for one render part (foreground, background, underline,
+etc.) Note that this is overwritten when iterating through the individual
+styled runs of a #PangoLayout or #PangoLayoutLine. This function is thus
+only useful when you call low level functions like pango_renderer_draw_glyphs()
+directly, or in the 'prepare_run' virtual function of a subclass of
+#GdkPangoRenderer.
-This function is called by the drag destination in response
-to a drop initiated by the drag source.
+Since: 2.6
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #GdkDragContext.
+<parameter name="gdk_renderer">
+<parameter_description> a #GdkPangoRenderer
</parameter_description>
</parameter>
-<parameter name="ok">
-<parameter_description> %TRUE if the drop is accepted.
+<parameter name="part">
+<parameter_description> the part to render with the stipple
</parameter_description>
</parameter>
-<parameter name="time_">
-<parameter_description> the timestamp for this operation.
+<parameter name="stipple">
+<parameter_description> the new stipple value.
</parameter_description>
</parameter>
</parameters>
@@ -11687,47 +12326,63 @@
</return>
</function>
-<function name="gdk_window_set_geometry_hints">
+<function name="gdk_screen_get_width_mm">
<description>
-Sets the geometry hints for @window. Hints flagged in @geom_mask
-are set, hints not flagged in @geom_mask are unset.
-To unset all hints, use a @geom_mask of 0 and a @geometry of %NULL.
+Gets the width of @screen in millimeters.
+Note that on some X servers this value will not be correct.
-This function provides hints to the windowing system about
-acceptable sizes for a toplevel window. The purpose of
-this is to constrain user resizing, but the windowing system
-will typically (but is not required to) also constrain the
-current size of the window to the provided values and
-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.
+</description>
+<parameters>
+<parameter name="screen">
+<parameter_description> a #GdkScreen
+</parameter_description>
+</parameter>
+</parameters>
+<return> the width of @screen in millimeters.
-Since you can't count on the windowing system doing the
-constraints for programmatic resizes, you should generally
-call gdk_window_constrain_size() yourself to determine
-appropriate sizes.
+Since: 2.2
+</return>
+</function>
+
+<function name="gdk_pixbuf_add_alpha">
+<description>
+Takes an existing pixbuf and adds an alpha channel to it.
+If the existing pixbuf already had an alpha channel, the channel
+values are copied from the original; otherwise, the alpha channel
+is initialized to 255 (full opacity).
+
+If @substitute_color is %TRUE, then the color specified by (@r, @g, @b) will be
+assigned zero opacity. That is, if you pass (255, 255, 255) for the
+substitute color, all white pixels will become fully transparent.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a toplevel #GdkWindow
+<parameter name="pixbuf">
+<parameter_description> A #GdkPixbuf.
</parameter_description>
</parameter>
-<parameter name="geometry">
-<parameter_description> geometry hints
+<parameter name="substitute_color">
+<parameter_description> Whether to set a color to zero opacity. If this
+is %FALSE, then the (@r, @g, @b) arguments will be ignored.
</parameter_description>
</parameter>
-<parameter name="geom_mask">
-<parameter_description> bitmask indicating fields of @geometry to pay attention to
+<parameter name="r">
+<parameter_description> Red value to substitute.
+</parameter_description>
+</parameter>
+<parameter name="g">
+<parameter_description> Green value to substitute.
+</parameter_description>
+</parameter>
+<parameter name="b">
+<parameter_description> Blue value to substitute.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> A newly-created pixbuf with a reference count of 1.
+</return>
</function>
<function name="gdk_screen_set_resolution">
@@ -11741,7 +12396,7 @@
</parameter_description>
</parameter>
<parameter name="dpi">
-<parameter_description> the resolution in "dots per inch". (Physical inches aren't actually
+<parameter_description> the resolution in "dots per inch". (Physical inches aren't actually
involved; the terminology is conventional.)
Sets the resolution for font handling on the screen. This is a
@@ -11767,7 +12422,7 @@
The @functions argument is the logical OR of values from the
#GdkWMFunction enumeration. If the bitmask includes #GDK_FUNC_ALL,
then the other bits indicate which functions to disable; if
-it doesn't include #GDK_FUNC_ALL, it indicates which functions to
+it doesn't include #GDK_FUNC_ALL, it indicates which functions to
enable.
@@ -11805,6 +12460,22 @@
<return></return>
</function>
+<function name="gdk_event_get_time">
+<description>
+returns #GDK_CURRENT_TIME. If @event is %NULL, returns #GDK_CURRENT_TIME.
+Return value: time stamp field from @event
+
+</description>
+<parameters>
+<parameter name="event">
+<parameter_description> a #GdkEvent
+</parameter_description>
+</parameter>
+</parameters>
+<return> time stamp field from @event
+</return>
+</function>
+
<function name="gdk_keyval_to_unicode">
<description>
Convert from a GDK key symbol to the corresponding ISO10646 (Unicode)
@@ -11867,11 +12538,8 @@
buggy. On servers without the shape extension, this function
will do nothing.
-On the Win32 platform, this functionality is always present.
-
This function works on both toplevel and child windows.
-
</description>
<parameters>
<parameter name="window">
@@ -11899,7 +12567,7 @@
Looks up the #GdkWindow that wraps the given native window handle.
For example in the X backend, a native window handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -11942,11 +12610,11 @@
</parameter_description>
</parameter>
<parameter name="width">
-<parameter_description> Width of image in pixels, must be &gt; 0
+<parameter_description> Width of image in pixels, must be > 0
</parameter_description>
</parameter>
<parameter name="height">
-<parameter_description> Height of image in pixels, must be &gt; 0
+<parameter_description> Height of image in pixels, must be > 0
</parameter_description>
</parameter>
</parameters>
@@ -11964,15 +12632,15 @@
must be greater than or equal to the time passed to
gdk_pixbuf_animation_get_iter(), and must increase or remain
unchanged each time gdk_pixbuf_animation_iter_get_pixbuf() is
-called. That is, you can't go backward in time; animations only
+called. That is, you can't go backward in time; animations only
play forward.
As a shortcut, pass %NULL for the current time and g_get_current_time()
will be invoked on your behalf. So you only need to explicitly pass
- current_time if you're doing something odd like playing the animation
+ current_time if you're doing something odd like playing the animation
at double speed.
-If this function returns %FALSE, there's no need to update the animation
+If this function returns %FALSE, there's no need to update the animation
display, assuming the display had been rendered prior to advancing;
if %TRUE, you need to call gdk_animation_iter_get_pixbuf() and update the
display with the new pixbuf.
@@ -11994,6 +12662,55 @@
</return>
</function>
+<function name="gdk_drawable_copy_to_image">
+<description>
+Copies a portion of @drawable into the client side image structure
+ image If @image is %NULL, creates a new image of size @width x @height
+and copies into that. See gdk_drawable_get_image() for further details.
+
+
+</description>
+<parameters>
+<parameter name="drawable">
+<parameter_description> a #GdkDrawable
+</parameter_description>
+</parameter>
+<parameter name="image">
+<parameter_description> a #GdkDrawable, or %NULL if a new @image should be created.
+</parameter_description>
+</parameter>
+<parameter name="src_x">
+<parameter_description> x coordinate on @drawable
+</parameter_description>
+</parameter>
+<parameter name="src_y">
+<parameter_description> y coordinate on @drawable
+</parameter_description>
+</parameter>
+<parameter name="dest_x">
+<parameter_description> x coordinate within @image. Must be 0 if @image is %NULL
+</parameter_description>
+</parameter>
+<parameter name="dest_y">
+<parameter_description> y coordinate within @image. Must be 0 if @image is %NULL
+</parameter_description>
+</parameter>
+<parameter name="width">
+<parameter_description> width of region to get
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> height or region to get
+</parameter_description>
+</parameter>
+</parameters>
+<return> @image, or a new a #GdkImage containing the contents
+of @drawable
+
+Since: 2.4
+</return>
+</function>
+
<function name="gdk_pango_renderer_new">
<description>
Creates a new #PangoRenderer for @screen. Normally you can use the
@@ -12032,34 +12749,38 @@
</return>
</function>
-<function name="gdk_screen_get_rgba_colormap">
+<function name="gdk_x11_screen_supports_net_wm_hint">
<description>
-Gets a colormap to use for creating windows or pixmaps 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.
+This function is specific to the X11 backend of GDK, and indicates
+whether the window manager supports a certain hint from the
+Extended Window Manager Hints Specification. You can find this
+specification on
+<ulink url="http://www.freedesktop.org">http://www.freedesktop.org</ulink>.
-For setting an overall opacity for a top-level window, see
-gdk_window_set_opacity().
+When using this function, keep in mind that the window manager
+can change over time; so you shouldn't use this function in
+a way that impacts persistent application state. A common bug
+is that your application can start up before the window manager
+does when the user logs in, and before the window manager starts
+gdk_x11_screen_supports_net_wm_hint() will return %FALSE for every property.
+You can monitor the window_manager_changed signal on #GdkScreen to detect
+a window manager change.
</description>
<parameters>
<parameter name="screen">
-<parameter_description> a #GdkScreen.
+<parameter_description> the relevant #GdkScreen.
+</parameter_description>
+</parameter>
+<parameter name="property">
+<parameter_description> a property atom.
</parameter_description>
</parameter>
</parameters>
-<return> a colormap to use for windows with an alpha channel
-or %NULL if the capability is not available.
+<return> %TRUE if the window manager supports @property
-Since: 2.8
+Since: 2.2
</return>
</function>
@@ -12082,7 +12803,7 @@
Note that this function is identical to gdk_atom_intern() except
that if a new #GdkAtom is created the string itself is used rather
than a copy. This saves memory, but can only be used if the string
-will &lt;emphasis&gt;always&lt;/emphasis&gt; exist. It can be used with statically
+will <emphasis>always</emphasis> exist. It can be used with statically
allocated strings in the main program, but not with statically
allocated memory in dynamically loaded modules, if you expect to
ever unload the module again (e.g. do not use this function in
@@ -12117,33 +12838,124 @@
<parameter_description> a #GdkDisplay.
</parameter_description>
</parameter>
-<parameter name="selection">
-<parameter_description> an atom indentifying a selection.
+<parameter name="selection">
+<parameter_description> an atom indentifying a selection.
+</parameter_description>
+</parameter>
+</parameters>
+<return> if there is a selection owner for this window, and it is a
+window known to the current process, the #GdkWindow that owns the
+selection, otherwise %NULL.
+
+Since: 2.2
+</return>
+</function>
+
+<function name="gdk_pixbuf_get_n_channels">
+<description>
+Queries the number of channels of a pixbuf.
+
+
+</description>
+<parameters>
+<parameter name="pixbuf">
+<parameter_description> A pixbuf.
+</parameter_description>
+</parameter>
+</parameters>
+<return> Number of channels.
+</return>
+</function>
+
+<function name="gdk_pixbuf_save_to_stream">
+<description>
+Saves @pixbuf to an output stream.
+
+Supported file formats are currently "jpeg", "tiff", "png", "ico" or
+"bmp". See gdk_pixbuf_save_to_buffer() for more details.
+
+The @cancellable can be used to abort the operation from another
+thread. If the operation was cancelled, the error %GIO_ERROR_CANCELLED
+will be returned. Other possible errors are in the #GDK_PIXBUF_ERROR
+and %G_IO_ERROR domains.
+
+The stream is not closed.
+
+
+</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="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>
+<parameter name="Varargs">
+<parameter_description> list of key-value save options
</parameter_description>
</parameter>
</parameters>
-<return> if there is a selection owner for this window, and it is a
-window known to the current process, the #GdkWindow that owns the
-selection, otherwise %NULL.
+<return> %TRUE if the pixbuf was saved successfully, %FALSE if an
+error was set.
-Since: 2.2
+Since: 2.14
</return>
</function>
-<function name="gdk_pixbuf_get_n_channels">
+<function name="gdk_window_set_composited">
<description>
-Queries the number of channels of a pixbuf.
+Sets a #GdkWindow as composited, or unsets it. Composited
+windows do not automatically have their contents drawn to
+the screen. Drawing is redirected to an offscreen buffer
+and an expose event is emitted on the parent of the composited
+window. It is the responsibility of the parent's expose handler
+to manually merge the off-screen content onto the screen in
+whatever way it sees fit. See <xref linkend="composited-window-example"/>
+for an example.
+
+It only makes sense for child windows to be composited; see
+gdk_window_set_opacity() if you need translucent toplevel
+windows.
+
+An additional effect of this call is that the area of this
+window is no longer clipped from regions marked for
+invalidation on its parent. Draws done on the parent
+window are also no longer clipped by the child.
+
+This call is only supported on some systems (currently,
+only X11 with new enough Xcomposite and Xdamage extensions).
+You must call gdk_display_supports_composite() to check if
+setting a window as composited is supported before
+attempting to do so.
+Since: 2.12
</description>
<parameters>
-<parameter name="pixbuf">
-<parameter_description> A pixbuf.
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="composited">
+<parameter_description> %TRUE to set the window as composited
</parameter_description>
</parameter>
</parameters>
-<return> Number of channels.
-</return>
+<return></return>
</function>
<function name="gdk_device_get_history">
@@ -12328,9 +13140,9 @@
<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
+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.
+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
@@ -12423,47 +13235,6 @@
<return></return>
</function>
-<function name="gdk_colors_alloc">
-<description>
-Allocates colors from a colormap. This function
-is obsolete. See gdk_colormap_alloc_colors().
-For full documentation of the fields, see
-the Xlib documentation for &lt;function&gt;XAllocColorCells()&lt;/function&gt;.
-
-
-</description>
-<parameters>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap.
-</parameter_description>
-</parameter>
-<parameter name="contiguous">
-<parameter_description> if %TRUE, the colors should be allocated
-in contiguous color cells.
-</parameter_description>
-</parameter>
-<parameter name="planes">
-<parameter_description> an array in which to store the plane masks.
-</parameter_description>
-</parameter>
-<parameter name="nplanes">
-<parameter_description> the number of planes to allocate. (Or zero,
-to indicate that the color allocation should not be planar.)
-</parameter_description>
-</parameter>
-<parameter name="pixels">
-<parameter_description> an array into which to store allocated pixel values.
-</parameter_description>
-</parameter>
-<parameter name="npixels">
-<parameter_description> the number of pixels in each plane to allocate.
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the allocation was successful
-</return>
-</function>
-
<function name="GdkDisplay">
<description>
The ::closed signal is emitted when the connection to the windowing
@@ -12491,7 +13262,7 @@
This may fail if the window has been destroyed.
For example in the X backend, a native window handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -12537,18 +13308,18 @@
Note that the fill style, tile, stipple, and tile and stipple
origins in the @gc are ignored by this function. (In general, tiles
-and stipples can't be implemented directly on Win32; you need to do
+and stipples can't be implemented directly on Win32; you need to do
multiple pass drawing and blitting to implement tiles or
stipples. GDK does just that when you call the GDK drawing
functions with a GC that asks for tiles or stipples.)
When the HDC is no longer used, it should be released by calling
-&lt;function&gt;gdk_win32_hdc_release()&lt;/function&gt; with the same
+<function>gdk_win32_hdc_release()</function> with the same
parameters.
-If you modify the HDC by calling &lt;function&gt;SelectObject&lt;/function&gt;
+If you modify the HDC by calling <function>SelectObject</function>
you should undo those modifications before calling
-&lt;function&gt;gdk_win32_hdc_release()&lt;/function&gt;.
+<function>gdk_win32_hdc_release()</function>.
</description>
@@ -12572,7 +13343,7 @@
<function name="gdk_x11_get_xatom_by_name">
<description>
-Return value: a X atom for GDK's default display.
+Return value: a X atom for GDK's default display.
</description>
<parameters>
@@ -12581,7 +13352,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> a X atom for GDK's default display.
+<return> a X atom for GDK's default display.
</return>
</function>
@@ -12633,10 +13404,39 @@
</return>
</function>
+<function name="gdk_window_freeze_toplevel_updates_libgtk_only">
+<description>
+Temporarily freezes a window and all its descendants such that it won't
+receive expose events. The window will begin receiving expose events
+again when gdk_window_thaw_toplevel_updates_libgtk_only() is called. If
+gdk_window_freeze_toplevel_updates_libgtk_only()
+has been called more than once,
+gdk_window_thaw_toplevel_updates_libgtk_only() must be called
+an equal number of times to begin processing exposes.
+
+This function is not part of the GDK public API and is only
+for use by GTK+.
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_cairo_create">
<description>
Creates a Cairo context for drawing to @drawable.
+<note><para>
+Note that due to double-buffering, Cairo contexts created
+in a GTK+ expose event handler cannot be cached and reused
+between different expose events.
+</para></note>
+
</description>
<parameters>
@@ -12652,26 +13452,36 @@
</return>
</function>
-<function name="gdk_window_set_icon_name">
+<function name="gdk_spawn_command_line_on_screen">
<description>
-Windows may have a name used while minimized, distinct from the
-name they display in their titlebar. Most of the time this is a bad
-idea from a user interface standpoint. But you can set such a name
-with this function, if you like.
+Like g_spawn_command_line_async(), except the child process is
+spawned in such an environment that on calling gdk_display_open()
+it would be returned a #GdkDisplay with @screen as the default
+screen.
+
+This is useful for applications which wish to launch an application
+on a specific screen.
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a toplevel #GdkWindow
+<parameter name="screen">
+<parameter_description> a #GdkScreen
</parameter_description>
</parameter>
-<parameter name="name">
-<parameter_description> name of window while iconified (minimized)
+<parameter name="command_line">
+<parameter_description> a command line
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> return location for errors
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE on success, %FALSE if error is set.
+
+Since: 2.4
+</return>
</function>
<function name="gdk_event_peek">
@@ -12760,7 +13570,7 @@
Get the preferred colormap for rendering image data. Not a
very useful function; historically, GDK could only render RGB image
data to one colormap and visual, but in the current version it can
-render to any colormap and visual. So there's no need to call this
+render to any colormap and visual. So there's no need to call this
function.
@@ -12824,7 +13634,7 @@
<function name="gdk_x11_gc_get_xdisplay">
<description>
-Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+Return value: an Xlib <type>Display*</type>.
</description>
<parameters>
@@ -12833,7 +13643,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Display*&lt;/type&gt;.
+<return> an Xlib <type>Display*</type>.
</return>
</function>
@@ -12850,10 +13660,10 @@
image, the data at the edges of the source image is replicated
to infinity.
-&lt;figure id="pixbuf-composite-diagram"&gt;
-&lt;title&gt;Compositing of pixbufs&lt;/title&gt;
-&lt;graphic fileref="composite.png" format="PNG"/&gt;
-&lt;/figure&gt;
+<figure id="pixbuf-composite-diagram">
+<title>Compositing of pixbufs</title>
+<graphic fileref="composite.png" format="PNG"/>
+</figure>
</description>
<parameters>
@@ -12950,29 +13760,12 @@
<return></return>
</function>
-<function name="gdk_pixbuf_format_is_scalable">
-<description>
-Return value: whether this image format is scalable.
-
-</description>
-<parameters>
-<parameter name="format">
-<parameter_description> a #GdkPixbufFormat
-</parameter_description>
-</parameter>
-</parameters>
-<return> whether this image format is scalable.
-
-Since: 2.6
-</return>
-</function>
-
<function name="gdk_pango_layout_line_get_clip_region">
<description>
Obtains a clip region which contains the areas where the given
ranges of text would be drawn. @x_origin and @y_origin are the same
position you would pass to gdk_draw_layout_line(). @index_ranges
-should contain ranges of bytes in the layout's text. The clip
+should contain ranges of bytes in the layout's text. The clip
region will include space to the left or right of the line (to the
layout bounding box) if you have indexes above or below the indexes
contained inside the line. This is to draw the selection all the way
@@ -13023,7 +13816,7 @@
GDK will call gdk_window_process_all_updates() on your behalf
whenever your program returns to the main loop and becomes idle, so
-normally there's no need to do that manually, you just need to
+normally there's no need to do that manually, you just need to
invalidate regions that you know should be redrawn.
The @child_func parameter controls whether the region of
@@ -13149,50 +13942,50 @@
actually used for the translation; some keys such as Enter are not
affected by the active keyboard group. The @level is derived from
@state. For convenience, #GdkEventKey already contains the translated
-keyval, so this function isn't as useful as you might think.
+keyval, so this function isn't as useful as you might think.
-&lt;note&gt;&lt;para&gt;
+<note><para>
@consumed_modifiers gives modifiers that should be masked out
from @state when comparing this key press to a hot key. For
-instance, on a US keyboard, the &lt;literal&gt;plus&lt;/literal&gt;
+instance, on a US keyboard, the <literal>plus</literal>
symbol is shifted, so when comparing a key press to a
-&lt;literal&gt;&lt;Control&gt;plus&lt;/literal&gt; accelerator &lt;Shift&gt; should
+<literal><Control>plus</literal> accelerator <Shift> should
be masked out.
-&lt;/para&gt;
-&lt;informalexample&gt;&lt;programlisting&gt;
-&sol;* We want to ignore irrelevant modifiers like ScrollLock *&sol;
-&num;define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
-gdk_keymap_translate_keyboard_state (keymap, event-&gt;hardware_keycode,
-event-&gt;state, event-&gt;group,
-&amp;keyval, NULL, NULL, &amp;consumed);
+</para>
+<informalexample><programlisting>
+// We want to ignore irrelevant modifiers like ScrollLock.
+#define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
+gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode,
+event->state, event->group,
+&keyval, NULL, NULL, &consumed);
if (keyval == GDK_PLUS &&
-(event-&gt;state &amp; ~consumed &amp; ALL_ACCELS_MASK) == GDK_CONTROL_MASK)
-&sol;* Control was pressed *&sol;
-&lt;/programlisting&gt;&lt;/informalexample&gt;
-&lt;para&gt;
+(event->state & ~consumed & ALL_ACCELS_MASK) == GDK_CONTROL_MASK)
+// Control was pressed
+</programlisting></informalexample>
+<para>
An older interpretation @consumed_modifiers was that it contained
all modifiers that might affect the translation of the key;
this allowed accelerators to be stored with irrelevant consumed
-modifiers, by doing:&lt;/para&gt;
-&lt;informalexample&gt;&lt;programlisting&gt;
-&sol;* XXX Don't do this XXX *&sol;
+modifiers, by doing:</para>
+<informalexample><programlisting>
+// XXX Don't do this XXX
if (keyval == accel_keyval &&
-(event-&gt;state &amp; ~consumed &amp; ALL_ACCELS_MASK) == (accel_mods &amp; ~consumed))
-&sol;* Accelerator was pressed *&sol;
-&lt;/programlisting&gt;&lt;/informalexample&gt;
-&lt;para&gt;
+(event->state & ~consumed & ALL_ACCELS_MASK) == (accel_mods & ~consumed))
+//Accelerator was pressed
+</programlisting></informalexample>
+<para>
However, this did not work if multi-modifier combinations were
-used in the keymap, since, for instance, &lt;literal&gt;&lt;Control&gt;&lt;/literal&gt;
-would be masked out even if only &lt;literal&gt;&lt;Control&gt;&lt;Alt&gt;&lt;/literal&gt;
+used in the keymap, since, for instance, <literal><Control></literal>
+would be masked out even if only <literal><Control><Alt></literal>
was used in the keymap. To support this usage as well as well as
-possible, all &lt;emphasis&gt;single modifier&lt;/emphasis&gt; combinations
+possible, all <emphasis>single modifier</emphasis> combinations
that could affect the key for any combination of modifiers will
be returned in @consumed_modifiers; multi-modifier combinations
are returned only when actually found in @state. When you store
accelerators, you should always store them with consumed modifiers
-removed. Store &lt;literal&gt;&lt;Control&gt;plus&lt;/literal&gt;,
-not &lt;literal&gt;&lt;Control&gt;&lt;Shift&gt;plus&lt;/literal&gt;,
-&lt;/para&gt;&lt;/note&gt;
+removed. Store <literal><Control>plus</literal>,
+not <literal><Control><Shift>plus</literal>,
+</para></note>
</description>
@@ -13235,15 +14028,19 @@
</return>
</function>
-<function name="gdk_drag_context_new">
+<function name="gdk_region_copy">
<description>
-Creates a new #GdkDragContext.
+Copies @region, creating an identical new region.
</description>
<parameters>
+<parameter name="region">
+<parameter_description> a #GdkRegion
+</parameter_description>
+</parameter>
</parameters>
-<return> the newly created #GdkDragContext.
+<return> a new region identical to @region
</return>
</function>
@@ -13289,6 +14086,33 @@
<return></return>
</function>
+<function name="gdk_app_launch_context_set_icon_name">
+<description>
+Sets the icon for applications that are launched with this context.
+The @icon_name will be interpreted in the same way as the Icon field
+in desktop files. See also gdk_app_launch_context_set_icon().
+
+If both @icon and @icon_name are set, the @icon_name takes priority.
+If neither @icon or @icon_name is set, the icon is taken from either
+the file that is passed to launched application or from the #GAppInfo
+for the launched application itself.
+
+Since: 2.14
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkAppLaunchContext
+</parameter_description>
+</parameter>
+<parameter name="icon_name">
+<parameter_description> an icon name, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_draw_drawable">
<description>
Copies the @width x @height region of @src at coordinates (@xsrc,
@@ -13314,7 +14138,7 @@
</parameter_description>
</parameter>
<parameter name="gc">
-<parameter_description> a #GdkGC sharing the drawable's visual and colormap
+<parameter_description> a #GdkGC sharing the drawable's visual and colormap
</parameter_description>
</parameter>
<parameter name="src">
@@ -13365,48 +14189,26 @@
</return>
</function>
-<function name="gdk_window_end_paint">
+<function name="gdk_x11_display_ungrab">
<description>
-Indicates that the backing store created by the most recent call to
-gdk_window_begin_paint_region() should be copied onscreen and
-deleted, leaving the next-most-recent backing store or no backing
-store at all as the active paint region. See
-gdk_window_begin_paint_region() for full details. It is an error to
-call this function without a matching
-gdk_window_begin_paint_region() first.
+Ungrab @display after it has been grabbed with
+gdk_x11_display_grab().
+Since: 2.2
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="display">
+<parameter_description> a #GdkDisplay
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="gdk_x11_lookup_xdisplay">
-<description>
-Find the #GdkDisplay corresponding to @display, if any exists.
-
-
-</description>
-<parameters>
-<parameter name="xdisplay">
-<parameter_description> a pointer to an X Display
-</parameter_description>
-</parameter>
-</parameters>
-<return> the #GdkDisplay, if found, otherwise %NULL.
-
-Since: 2.2
-</return>
-</function>
-
<function name="gdk_x11_visual_get_xvisual">
<description>
-Return value: an Xlib &lt;type&gt;Visual*&lt;/type&gt;.
+Return value: an Xlib <type>Visual*</type>.
</description>
<parameters>
@@ -13415,7 +14217,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an Xlib &lt;type&gt;Visual*&lt;/type&gt;.
+<return> an Xlib <type>Visual*</type>.
</return>
</function>
@@ -13447,6 +14249,32 @@
</return>
</function>
+<function name="gdk_app_launch_context_set_icon">
+<description>
+Sets the icon for applications that are launched with this
+context.
+
+Window Managers can use this information when displaying startup
+notification.
+
+See also gdk_app_launch_context_set_icon_name().
+
+Since: 2.14
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkAppLaunchContext
+</parameter_description>
+</parameter>
+<parameter name="icon">
+<parameter_description> a #GIcon, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_gc_set_line_attributes">
<description>
Sets various attributes of how lines are drawn. See
@@ -13519,53 +14347,35 @@
</parameter_description>
</parameter>
<parameter name="color">
-<parameter_description> a #GdkColor, with the color to change
-in the &lt;structfield&gt;pixel&lt;/structfield&gt; field,
-and the new value in the remaining fields.
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the color was successfully changed.
-</return>
-</function>
-
-<function name="_gdk_image_get_scratch">
-<description>
-Allocates an image of size width/height, up to a maximum
-of GDK_SCRATCH_IMAGE_WIDTHxGDK_SCRATCH_IMAGE_HEIGHT that is
-suitable to use on @screen.
-
-
-</description>
-<parameters>
-<parameter name="screen">
-<parameter_description> a #GdkScreen
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> desired width
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> desired height
-</parameter_description>
-</parameter>
-<parameter name="depth">
-<parameter_description> depth of image
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> X location within returned image of scratch image
+<parameter_description> a #GdkColor, with the color to change
+in the <structfield>pixel</structfield> field,
+and the new value in the remaining fields.
</parameter_description>
</parameter>
-<parameter name="y">
-<parameter_description> Y location within returned image of scratch image
+</parameters>
+<return> %TRUE if the color was successfully changed.
+</return>
+</function>
+
+<function name="gdk_window_get_children">
+<description>
+Gets the list of children of @window known to GDK.
+This function only returns children created via GDK,
+so for example it's useless when used with the root window;
+it only returns windows an application created itself.
+
+The returned list must be freed, but the elements in the
+list need not be.
+
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> a scratch image. This must be used by a
-call to gdk_image_put() before any other calls to
-_gdk_image_get_scratch()
+<return> list of child windows inside @window
</return>
</function>
@@ -13577,7 +14387,7 @@
</description>
<parameters>
<parameter name="xid">
-<parameter_description> the X id of the destination window.
+<parameter_description> the windowing system id of the destination window.
</parameter_description>
</parameter>
<parameter name="protocol">
@@ -13585,9 +14395,9 @@
</parameter_description>
</parameter>
</parameters>
-<return> the X id of the window where the drop should happen. This
-may be @xid or the X id of a proxy window, or None if @xid doesn't
-support Drag and Drop.
+<return> the windowing system specific id for the window where
+the drop should happen. This may be @xid or the id of a proxy
+window, or zero if @xid doesn't support Drag and Drop.
</return>
</function>
@@ -13690,7 +14500,7 @@
This may fail if the pixmap has been destroyed.
For example in the X backend, a native pixmap handle is an Xlib
-&lt;type&gt;XID&lt;/type&gt;.
+<type>XID</type>.
</description>
@@ -13731,7 +14541,7 @@
<function name="gdk_x11_image_get_ximage">
<description>
-Return value: an &lt;type&gt;XImage*&lt;/type&gt;.
+Return value: an <type>XImage*</type>.
</description>
<parameters>
@@ -13740,7 +14550,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> an &lt;type&gt;XImage*&lt;/type&gt;.
+<return> an <type>XImage*</type>.
</return>
</function>
@@ -13793,7 +14603,7 @@
</parameters>
<return> the window containing the pointer (as with
gdk_window_at_pointer()), or %NULL if the window containing the
-pointer isn't known to GDK
+pointer isn't known to GDK
</return>
</function>
@@ -13938,25 +14748,17 @@
<return></return>
</function>
-<function name="gdk_colormap_change">
+<function name="gdk_get_default_root_window">
<description>
-Changes the value of the first @ncolors in a private colormap
-to match the values in the &lt;structfield&gt;colors&lt;/structfield&gt;
-array in the colormap. This function is obsolete and
-should not be used. See gdk_color_change().
+Obtains the root window (parent all other windows are inside)
+for the default display and screen.
+
</description>
<parameters>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap.
-</parameter_description>
-</parameter>
-<parameter name="ncolors">
-<parameter_description> the number of colors to change.
-</parameter_description>
-</parameter>
</parameters>
-<return></return>
+<return> the default root window
+</return>
</function>
<function name="gdk_cairo_region">
@@ -14018,42 +14820,18 @@
<return></return>
</function>
-<function name="gdk_draw_glyphs">
+<function name="_gdk_event_queue_remove_link">
<description>
-This is a low-level function; 99% of text rendering should be done
-using gdk_draw_layout() instead.
-
-A glyph is a single image in a font. This function draws a sequence of
-glyphs. To obtain a sequence of glyphs you have to understand a
-lot about internationalized text handling, which you don't want to
-understand; thus, use gdk_draw_layout() instead of this function,
-gdk_draw_layout() handles the details.
-
+Removes a specified list node from the event queue.
</description>
<parameters>
-<parameter name="drawable">
-<parameter_description> a #GdkDrawable
-</parameter_description>
-</parameter>
-<parameter name="gc">
-<parameter_description> a #GdkGC
-</parameter_description>
-</parameter>
-<parameter name="font">
-<parameter_description> font to be used
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> X coordinate of baseline origin
-</parameter_description>
-</parameter>
-<parameter name="y">
-<parameter_description> Y coordinate of baseline origin
+<parameter name="display">
+<parameter_description> a #GdkDisplay
</parameter_description>
</parameter>
-<parameter name="glyphs">
-<parameter_description> the glyph string to draw
+<parameter name="node">
+<parameter_description> node to remove
</parameter_description>
</parameter>
</parameters>
@@ -14084,35 +14862,25 @@
</return>
</function>
-<function name="gdk_drawable_set_colormap">
+<function name="gdk_window_get_toplevel">
<description>
-Sets the colormap associated with @drawable. Normally this will
-happen automatically when the drawable is created; you only need to
-use this function if the drawable-creating function did not have a
-way to determine the colormap, and you then use drawable operations
-that require a colormap. The colormap for all drawables and
-graphics contexts you intend to use together should match. i.e.
-when using a #GdkGC to draw to a drawable, or copying one drawable
-to another, the colormaps should match.
+Gets the toplevel window that's an ancestor of @window.
</description>
<parameters>
-<parameter name="drawable">
-<parameter_description> a #GdkDrawable
-</parameter_description>
-</parameter>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the toplevel window containing @window
+</return>
</function>
<function name="_gdk_x11_drawable_update_size">
<description>
-Updates the state of the drawable (in particular the drawable's
+Updates the state of the drawable (in particular the drawable's
cairo surface) when its size has changed.
</description>
@@ -14128,9 +14896,9 @@
<function name="gdk_display_get_window_at_pointer">
<description>
Obtains the window underneath the mouse pointer, returning the location
-of that window in @win_x, @win_y for @screen. Returns %NULL if the window
-under the mouse pointer is not known to GDK (for example, belongs to
-another application).
+of the pointer in that window in @win_x, @win_y for @screen. Returns %NULL
+if the window under the mouse pointer is not known to GDK (for example,
+belongs to another application).
</description>
@@ -14140,11 +14908,13 @@
</parameter_description>
</parameter>
<parameter name="win_x">
-<parameter_description> return location for origin of the window under the pointer
+<parameter_description> return location for x coordinate of the pointer location relative
+to the window origin, or %NULL
</parameter_description>
</parameter>
<parameter name="win_y">
-<parameter_description> return location for origin of the window under the pointer
+<parameter_description> return location for y coordinate of the pointer location relative
+ & to the window origin, or %NULL
</parameter_description>
</parameter>
</parameters>
@@ -14290,7 +15060,7 @@
<parameter_description> an array of #GdkPoint structs
</parameter_description>
</parameter>
-<parameter name="npoints">
+<parameter name="n_points">
<parameter_description> the number of elements in the @points array
</parameter_description>
</parameter>
@@ -14309,7 +15079,7 @@
Set the bit gravity of the given window to static, and flag it so
all children get static subwindow gravity. This is used if you are
implementing scary features that involve deep knowledge of the
-windowing system. Don't worry about it unless you have to.
+windowing system. Don't worry about it unless you have to.
</description>
@@ -14345,37 +15115,50 @@
</return>
</function>
-<function name="gdk_colormap_alloc_color">
+<function name="gdk_gc_set_stipple">
<description>
-Allocates a single color from a colormap.
-
+Set the stipple bitmap for a graphics context. The
+stipple will only be used if the fill mode is
+%GDK_STIPPLED or %GDK_OPAQUE_STIPPLED.
</description>
<parameters>
-<parameter name="colormap">
-<parameter_description> a #GdkColormap.
+<parameter name="gc">
+<parameter_description> a #GdkGC.
</parameter_description>
</parameter>
-<parameter name="color">
-<parameter_description> the color to allocate. On return the
-&lt;structfield&gt;pixel&lt;/structfield&gt; field will be
-filled in if allocation succeeds.
+<parameter name="stipple">
+<parameter_description> the new stipple bitmap.
</parameter_description>
</parameter>
-<parameter name="writeable">
-<parameter_description> If %TRUE, the color is allocated writeable
-(their values can later be changed using gdk_color_change()).
-Writeable colors cannot be shared between applications.
+</parameters>
+<return></return>
+</function>
+
+<function name="gdk_app_launch_context_set_timestamp">
+<description>
+Sets the timestamp of @context. The timestamp should ideally
+be taken from the event that triggered the launch.
+
+Window managers can use this information to avoid moving the
+focus to the newly launched application when the user is busy
+typing in another window. This is also known as 'focus stealing
+prevention'.
+
+Since: 2.14
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkAppLaunchContext
</parameter_description>
</parameter>
-<parameter name="best_match">
-<parameter_description> If %TRUE, GDK will attempt to do matching against
-existing colors if the color cannot be allocated as requested.
+<parameter name="timestamp">
+<parameter_description> a timestamp
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the allocation succeeded.
-</return>
+<return></return>
</function>
<function name="gdk_screen_set_default_colormap">
@@ -14414,7 +15197,7 @@
</parameter>
</parameters>
<return> name of the X atom; this string is owned by GDK,
-so it shouldn't be modifed or freed.
+so it shouldn't be modifed or freed.
Since: 2.2
</return>
@@ -14469,10 +15252,10 @@
Causes the image to be scaled while it is loaded. The desired
image size can be determined relative to the original size of
the image by calling gdk_pixbuf_loader_set_size() from a
-signal handler for the ::size_prepared signal.
+signal handler for the ::size-prepared signal.
Attempts to set the desired image size are ignored after the
-emission of the ::size_prepared signal.
+emission of the ::size-prepared signal.
Since: 2.2
@@ -14494,11 +15277,23 @@
<return></return>
</function>
+<function name="gdk_screen_height_mm">
+<description>
+Return value: the height of the default screen in millimeters,
+
+</description>
+<parameters>
+</parameters>
+<return> the height of the default screen in millimeters,
+though it is not always correct.
+</return>
+</function>
+
<function name="gdk_window_add_filter">
<description>
Adds an event filter to @window, allowing you to intercept events
before they reach GDK. This is a low-level operation and makes it
-easy to break GDK and/or GTK+, so you have to know what you're
+easy to break GDK and/or GTK+, so you have to know what you're
doing. Pass %NULL for @window to get all events for all windows,
instead of events for a specific window.
@@ -14554,7 +15349,7 @@
On X11, asks the window manager to put @window in a fullscreen
state, if the window manager supports this operation. Not all
window managers support this, and some deliberately ignore it or
-don't have a concept of "fullscreen"; so you can't rely on the
+don't have a concept of "fullscreen"; so you can't rely on the
fullscreenification actually happening. But it will happen with
most standard window managers, and GDK makes a best effort to get
it to happen.
@@ -14579,7 +15374,7 @@
Any arguments used by GDK are removed from the array and @argc and @argv are
updated accordingly.
-You shouldn't call this function explicitely if you are using
+You shouldn't call this function explicitely if you are using
gtk_init(), gtk_init_check(), gdk_init(), or gdk_init_check().
Since: 2.2
@@ -14607,14 +15402,15 @@
core pointer. Coordinate extraction, processing and requesting more
motion events from a %GDK_MOTION_NOTIFY event usually works like this:
-&lt;informalexample&gt;&lt;programlisting&gt;
-{ // motion_event handler
-x = motion_event-&gt;x;
-y = motion_event-&gt;y;
-; // handle (x,y) motion
-gdk_event_request_motions (motion_event); // handles is_hint events
+|[
+{
+/* motion_event handler */
+x = motion_event->x;
+y = motion_event->y;
+/* handle (x,y) motion */
+gdk_event_request_motions (motion_event); /* handles is_hint events */
}
-&lt;/programlisting&gt;&lt;/informalexample&gt;
+]|
Since: 2.12
@@ -14628,71 +15424,56 @@
<return></return>
</function>
-<function name="gdk_threads_set_lock_functions">
+<function name="gdk_pixbuf_format_is_scalable">
<description>
-Allows the application to replace the standard method that
-GDK uses to protect its data structures. Normally, GDK
-creates a single #GMutex that is locked by gdk_threads_enter(),
-and released by gdk_threads_leave(); using this function an
-application provides, instead, a function @enter_fn that is
-called by gdk_threads_enter() and a function @leave_fn that is
-called by gdk_threads_leave().
-
-The functions must provide at least same locking functionality
-as the default implementation, but can also do extra application
-specific processing.
-
-As an example, consider an application that has its own recursive
-lock that when held, holds the GTK+ lock as well. When GTK+ unlocks
-the GTK+ lock when entering a recursive main loop, the application
-must temporarily release its lock as well.
-
-Most threaded GTK+ apps won't need to use this method.
-
-This method must be called before gdk_threads_init(), and cannot
-be called multiple times.
-
-Since: 2.4
+Return value: whether this image format is scalable.
</description>
<parameters>
-<parameter name="enter_fn">
-<parameter_description> function called to guard GDK
-</parameter_description>
-</parameter>
-<parameter name="leave_fn">
-<parameter_description> function called to release the guard
+<parameter name="format">
+<parameter_description> a #GdkPixbufFormat
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> whether this image format is scalable.
+
+Since: 2.6
+</return>
</function>
-<function name="gdk_image_get_colormap">
+<function name="gdk_drag_get_protocol_for_display">
<description>
-Retrieves the colormap for a given image, if it exists. An image
-will have a colormap if the drawable from which it was created has
-a colormap, or if a colormap was set explicitely with
-gdk_image_set_colormap().
+Finds out the DND protocol supported by a window.
+Since: 2.2
</description>
<parameters>
-<parameter name="image">
-<parameter_description> a #GdkImage
+<parameter name="display">
+<parameter_description> the #GdkDisplay where the destination window resides
+</parameter_description>
+</parameter>
+<parameter name="xid">
+<parameter_description> the windowing system id of the destination window.
+</parameter_description>
+</parameter>
+<parameter name="protocol">
+<parameter_description> location where the supported DND protocol is returned.
</parameter_description>
</parameter>
</parameters>
-<return> colormap for the image
+<return> the windowing system id of the window where the drop should happen. This
+may be @xid or the id of a proxy window, or zero if @xid doesn't
+support Drag and Drop.
</return>
</function>
<function name="gdk_pixbuf_loader_get_animation">
<description>
Queries the #GdkPixbufAnimation that a pixbuf loader is currently creating.
-In general it only makes sense to call this function after the "area_prepared"
-signal has been emitted by the loader. If the loader doesn't have enough
-bytes yet (hasn't emitted the "area_prepared" signal) this function will
+In general it only makes sense to call this function after the "area-prepared"
+signal has been emitted by the loader. If the loader doesn't have enough
+bytes yet (hasn't emitted the "area-prepared" signal) this function will
return %NULL.
@@ -14739,7 +15520,7 @@
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.
+Call g_list_free() on the return value when you're finished with it.
</description>
@@ -14850,20 +15631,41 @@
</return>
</function>
-<function name="gdk_drawable_get_visual">
+<function name="_gdk_gc_update_context">
<description>
-Gets the #GdkVisual describing the pixel format of @drawable.
-
+Set the attributes of a cairo context to match those of a #GdkGC
+as far as possible. Some aspects of a #GdkGC, such as clip masks
+and functions other than %GDK_COPY are not currently handled.
</description>
<parameters>
-<parameter name="drawable">
-<parameter_description> a #GdkDrawable
+<parameter name="gc">
+<parameter_description> a #GdkGC
+</parameter_description>
+</parameter>
+<parameter name="cr">
+<parameter_description> a #cairo_t
+</parameter_description>
+</parameter>
+<parameter name="override_foreground">
+<parameter_description> a foreground color to use to override the
+foreground color of the GC
+</parameter_description>
+</parameter>
+<parameter name="override_stipple">
+<parameter_description> a stipple pattern to use to override the
+stipple from the GC. If this is present and the fill mode
+of the GC isn't %GDK_STIPPLED or %GDK_OPAQUE_STIPPLED
+the fill mode will be forced to %GDK_STIPPLED
+</parameter_description>
+</parameter>
+<parameter name="gc_changed">
+<parameter_description> pass %FALSE if the @gc has not changed since the
+last call to this function
</parameter_description>
</parameter>
</parameters>
-<return> a #GdkVisual
-</return>
+<return></return>
</function>
<function name="gdk_pixbuf_get_bits_per_sample">
@@ -14899,7 +15701,7 @@
</parameter_description>
</parameter>
</parameters>
-<return>: %TRUE if the setting existed and a value was stored
+<return> %TRUE if the setting existed and a value was stored
in @value, %FALSE otherwise.
</return>
</function>
@@ -14928,24 +15730,34 @@
</return>
</function>
-<function name="gdk_color_equal">
+<function name="gdk_cairo_set_source_pixbuf">
<description>
-Compares two colors.
+Sets the given pixbuf as the source pattern for the Cairo context.
+The pattern has an extend mode of %CAIRO_EXTEND_NONE and is aligned
+so that the origin of @pixbuf is @pixbuf_x, @pixbuf_y
+Since: 2.8
</description>
<parameters>
-<parameter name="colora">
-<parameter_description> a #GdkColor.
+<parameter name="cr">
+<parameter_description> a #Cairo context
</parameter_description>
</parameter>
-<parameter name="colorb">
-<parameter_description> another #GdkColor.
+<parameter name="pixbuf">
+<parameter_description> a #GdkPixbuf
+</parameter_description>
+</parameter>
+<parameter name="pixbuf_x">
+<parameter_description> X coordinate of location to place upper left corner of @pixbuf
+</parameter_description>
+</parameter>
+<parameter name="pixbuf_y">
+<parameter_description> Y coordinate of location to place upper left corner of @pixbuf
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the two colors compare equal
-</return>
+<return></return>
</function>
<function name="gdk_pixbuf_new_subpixbuf">
@@ -14987,14 +15799,9 @@
<function name="gdk_window_scroll">
<description>
-Scroll the contents of @window, both pixels and children, by the given
-amount. @window itself does not move. Portions of the window that the scroll
-operation brings in from offscreen areas are invalidated. The invalidated
-region may be bigger than what would strictly be necessary. (For X11, a
-minimum area will be invalidated if the window has no subwindows, or if the
-edges of the window's parent do not extend beyond the edges of the window. In
-other cases, a multi-step process is used to scroll the window which may
-produce temporary visual artifacts and unnecessary invalidations.)
+Scroll the contents of its window, both pixels and children, by
+the given amount. Portions of the window that the scroll operation
+brings in from offscreen areas are invalidated.
</description>
<parameters>
@@ -15051,7 +15858,7 @@
<function name="gdk_screen_get_window_stack">
<description>
-Return value: a list of #GdkWindow&lt;!-- --&gt;s for the current window stack,
+Return value: a list of #GdkWindow<!-- -->s for the current window stack,
</description>
<parameters>
@@ -15060,7 +15867,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> a list of #GdkWindow&lt;!-- --&gt;s for the current window stack,
+<return> a list of #GdkWindow<!-- -->s for the current window stack,
or %NULL.
Since: 2.10
@@ -15150,18 +15957,39 @@
<return></return>
</function>
+<function name="gdk_window_set_urgency_hint">
+<description>
+Toggles whether a window needs the user's
+urgent attention.
+
+Since: 2.8
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a toplevel #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="urgent">
+<parameter_description> %TRUE if the window is urgent
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_window_set_role">
<description>
When using GTK+, typically you should use gtk_window_set_role() instead
of this low-level function.
-The window manager and session manager use a window's role to
+The window manager and session manager use a window's role to
distinguish it from other kinds of window in the same application.
When an application is restarted after being saved in a previous
session, all windows with the same title and role are treated as
interchangeable. So if you have two windows with the same title
that should be distinguished for session management purposes, you
-should set the role on those windows. It doesn't matter what string
+should set the role on those windows. It doesn't matter what string
you use for the role, as long as you have a different role for each
non-interchangeable kind of window.
@@ -15185,7 +16013,7 @@
Generates C source code suitable for compiling images directly
into programs.
-GTK+ ships with a program called &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;
+GTK+ ships with a program called <command>gdk-pixbuf-csource</command>
which offers a command line interface to this function.
@@ -15212,10 +16040,11 @@
<function name="GdkKeymap">
<description>
-The ::keys_changed signal is emitted when the mapping represented by
- keymap changes.
+The ::state-changed signal is emitted when the state of the
+keyboard changes, e.g when Caps Lock is turned on or off.
+See gdk_keymap_get_caps_lock_state().
-Since: 2.2
+Since: 2.16
</description>
<parameters>
@@ -15247,7 +16076,7 @@
for @window. See gdk_window_shape_combine_mask().
This function is distinct from gdk_window_set_child_shapes()
-because it includes @window's shape mask in the set of shapes to
+because it includes @window's shape mask in the set of shapes to
be merged.
</description>
@@ -15266,7 +16095,7 @@
detected automatically. If %NULL is returned, then @error will be set.
Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains.
The image will be scaled to fit in the requested size, optionally preserving
-the image's aspect ratio.
+the image's aspect ratio.
When preserving the aspect ratio, a @width of -1 will cause the image
to be scaled to the exact given height, and a @height of -1 will cause
@@ -15291,7 +16120,7 @@
</parameter_description>
</parameter>
<parameter name="preserve_aspect_ratio">
-<parameter_description> %TRUE to preserve the image's aspect ratio
+<parameter_description> %TRUE to preserve the image's aspect ratio
</parameter_description>
</parameter>
<parameter name="error">
@@ -15301,7 +16130,7 @@
</parameters>
<return> A newly-created pixbuf with a reference count of 1, or %NULL
if any of several error conditions occurred: the file could not be opened,
-there was no loader for the file's format, there was not enough memory to
+there was no loader for the file's format, there was not enough memory to
allocate the image buffer, or the image file contained invalid data.
Since: 2.6
@@ -15313,7 +16142,7 @@
Obtains the window underneath the mouse pointer, returning the
location of that window in @win_x, @win_y. Returns %NULL if the
window under the mouse pointer is not known to GDK (if the window
-belongs to another application and a #GdkWindow hasn't been created
+belongs to another application and a #GdkWindow hasn't been created
for it with gdk_window_foreign_new())
NOTE: For multihead-aware widgets or applications use
@@ -15395,35 +16224,29 @@
</return>
</function>
-<function name="gdk_draw_layout_line">
+<function name="gdk_draw_lines">
<description>
-Render a #PangoLayoutLine onto an GDK drawable
-
-If the layout's #PangoContext has a transformation matrix set, then
- x and @y specify the position of the left edge of the baseline
-(left is in before-tranform user coordinates) in after-transform
-device coordinates.
+Draws a series of lines connecting the given points.
+The way in which joins between lines are draw is determined by the
+#GdkCapStyle value in the #GdkGC. This can be set with
+gdk_gc_set_line_attributes().
</description>
<parameters>
<parameter name="drawable">
-<parameter_description> the drawable on which to draw the line
+<parameter_description> a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
</parameter_description>
</parameter>
<parameter name="gc">
-<parameter_description> base graphics to use
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> the x position of start of string (in pixels)
+<parameter_description> a #GdkGC.
</parameter_description>
</parameter>
-<parameter name="y">
-<parameter_description> the y position of baseline (in pixels)
+<parameter name="points">
+<parameter_description> an array of #GdkPoint structures specifying the endpoints of the
</parameter_description>
</parameter>
-<parameter name="line">
-<parameter_description> a #PangoLayoutLine
+<parameter name="n_points">
+<parameter_description> the size of the @points array.
</parameter_description>
</parameter>
</parameters>
@@ -15488,53 +16311,25 @@
<return></return>
</function>
-<function name="gdk_drawable_copy_to_image">
+<function name="gdk_window_end_paint">
<description>
-Copies a portion of @drawable into the client side image structure
- image If @image is %NULL, creates a new image of size @width x @height
-and copies into that. See gdk_drawable_get_image() for further details.
+Indicates that the backing store created by the most recent call to
+gdk_window_begin_paint_region() should be copied onscreen and
+deleted, leaving the next-most-recent backing store or no backing
+store at all as the active paint region. See
+gdk_window_begin_paint_region() for full details. It is an error to
+call this function without a matching
+gdk_window_begin_paint_region() first.
</description>
<parameters>
-<parameter name="drawable">
-<parameter_description> a #GdkDrawable
-</parameter_description>
-</parameter>
-<parameter name="image">
-<parameter_description> a #GdkDrawable, or %NULL if a new @image should be created.
-</parameter_description>
-</parameter>
-<parameter name="src_x">
-<parameter_description> x coordinate on @drawable
-</parameter_description>
-</parameter>
-<parameter name="src_y">
-<parameter_description> y coordinate on @drawable
-</parameter_description>
-</parameter>
-<parameter name="dest_x">
-<parameter_description> x coordinate within @image. Must be 0 if @image is %NULL
-</parameter_description>
-</parameter>
-<parameter name="dest_y">
-<parameter_description> y coordinate within @image. Must be 0 if @image is %NULL
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> width of region to get
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> height or region to get
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> @image, or a new a #GdkImage containing the contents
-of @drawable
-
-Since: 2.4
-</return>
+<return></return>
</function>
<function name="gdk_gc_set_dashes">
@@ -15603,18 +16398,21 @@
</return>
</function>
-<function name="gdk_window_thaw_updates">
+<function name="_gdk_event_queue_find_first">
<description>
-Thaws a window frozen with gdk_window_freeze_updates().
+Find the first event on the queue that is not still
+being filled in.
+
</description>
<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
+<parameter name="display">
+<parameter_description> a #GdkDisplay
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> Pointer to the list node for that event, or NULL.
+</return>
</function>
<function name="gdk_region_new">
@@ -15644,6 +16442,45 @@
<parameters>
</parameters>
<return> list of toplevel windows, free with g_list_free()
+
+Deprecated: 2.16: Use gdk_screen_get_toplevel_windows() instead.
+</return>
+</function>
+
+<function name="gdk_threads_add_timeout_seconds_full">
+<description>
+A variant of gdk_threads_add_timout_full() with second-granularity.
+See g_timeout_add_seconds_full() for a discussion of why it is
+a good idea to use this function if you don't need finer granularity.
+
+
+</description>
+<parameters>
+<parameter name="priority">
+<parameter_description> the priority of the timeout source. Typically this will be in the
+range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE.
+</parameter_description>
+</parameter>
+<parameter name="interval">
+<parameter_description> the time between calls to the function, in seconds
+</parameter_description>
+</parameter>
+<parameter name="function">
+<parameter_description> function to call
+</parameter_description>
+</parameter>
+<parameter name="data">
+<parameter_description> data to pass to @function
+</parameter_description>
+</parameter>
+<parameter name="notify">
+<parameter_description> function to call when the timeout is removed, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> the ID (greater than 0) of the event source.
+
+Since: 2.14
</return>
</function>
@@ -15715,17 +16552,18 @@
<function name="gdk_color_parse">
<description>
-Parses a textual specification of a color and fill in
-the &lt;structfield&gt;red&lt;/structfield&gt;,
-&lt;structfield&gt;green&lt;/structfield&gt;, and
-&lt;structfield&gt;blue&lt;/structfield&gt; fields of a
-#GdkColor structure. The color is &lt;emphasis&gt;not&lt;/emphasis&gt;
-allocated, you must call gdk_colormap_alloc_color() yourself.
-The text string can be in any of the forms accepted
-by &lt;function&gt;XParseColor&lt;/function&gt;; these include
-name for a color from &lt;filename&gt;rgb.txt&lt;/filename&gt;, such as
-&lt;literal&gt;DarkSlateGray&lt;/literal&gt;, or a hex specification
-such as &lt;literal&gt;&num;3050b2&lt;/literal&gt; or &lt;literal&gt;&num;35b&lt;/literal&gt;.
+Parses a textual specification of a color and fill in the
+<structfield>red</structfield>, <structfield>green</structfield>,
+and <structfield>blue</structfield> fields of a #GdkColor
+structure. The color is <emphasis>not</emphasis> allocated, you
+must call gdk_colormap_alloc_color() yourself. The string can
+either one of a large set of standard names. (Taken from the X11
+<filename>rgb.txt</filename> file), or it can be a hex 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')
</description>
@@ -15771,9 +16609,9 @@
</description>
<parameters>
</parameters>
-<return> the Xlib &lt;type&gt;Display*&lt;/type&gt; for the display
-specified in the &lt;option&gt;--display&lt;/option&gt; command line option
-or the &lt;envar&gt;DISPLAY&lt;/envar&gt; environment variable.
+<return> the Xlib <type>Display*</type> for the display
+specified in the <option>--display</option> command line option
+or the <envar>DISPLAY</envar> environment variable.
</return>
</function>
@@ -15837,7 +16675,7 @@
most cases you should use gdk_pixbuf_get_from_drawable() instead of
this lower-level function. A #GdkPixbuf contains image data in a
canonicalized RGB format, rather than a display-dependent format.
-Of course, there's a convenience vs. speed tradeoff here, so you'll
+Of course, there's a convenience vs. speed tradeoff here, so you'll
want to think about what makes sense for your application.
@x, @y, @width, and @height define the region of @drawable to
@@ -15890,7 +16728,7 @@
<description>
Sets attributes of a graphics context in bulk. For each flag set in
@values_mask, the corresponding field will be read from @values and
-set as the new value for @gc. If you're only setting a few values
+set as the new value for @gc. If you're only setting a few values
on @gc, calling individual "setter" functions is likely more
convenient.
@@ -15913,27 +16751,11 @@
<return></return>
</function>
-<function name="gdk_window_set_child_shapes">
-<description>
-Sets the shape mask of @window to the union of shape masks
-for all children of @window, ignoring the shape mask of @window
-itself. Contrast with gdk_window_merge_child_shapes() which includes
-the shape mask of @window in the masks to be merged.
-
-</description>
-<parameters>
-<parameter name="window">
-<parameter_description> a #GdkWindow
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_pixbuf_save_to_bufferv">
<description>
Saves pixbuf to a new buffer in format @type, which is currently "jpeg",
-"tiff", "png", "ico" or "bmp". See gdk_pixbuf_save_to_buffer() for more details.
+"tiff", "png", "ico" or "bmp". See gdk_pixbuf_save_to_buffer()
+for more details.
</description>
@@ -16009,6 +16831,25 @@
</return>
</function>
+<function name="gdk_image_get_colormap">
+<description>
+Retrieves the colormap for a given image, if it exists. An image
+will have a colormap if the drawable from which it was created has
+a colormap, or if a colormap was set explicitely with
+gdk_image_set_colormap().
+
+
+</description>
+<parameters>
+<parameter name="image">
+<parameter_description> a #GdkImage
+</parameter_description>
+</parameter>
+</parameters>
+<return> colormap for the image
+</return>
+</function>
+
<function name="gdk_pango_renderer_get_default">
<description>
Gets the default #PangoRenderer for a screen. This default renderer
@@ -16036,19 +16877,15 @@
</return>
</function>
-<function name="gdk_region_copy">
+<function name="gdk_drag_context_new">
<description>
-Copies @region, creating an identical new region.
+Creates a new #GdkDragContext.
</description>
<parameters>
-<parameter name="region">
-<parameter_description> a #GdkRegion
-</parameter_description>
-</parameter>
</parameters>
-<return> a new region identical to @region
+<return> the newly created #GdkDragContext.
</return>
</function>
@@ -16058,13 +16895,12 @@
top of the window stack (moves the window to the front of the
Z-order).
-This function maps a window so it's visible onscreen. Its opposite
+This function maps a window so it's visible onscreen. Its opposite
is gdk_window_hide().
-When implementing a #GtkWidget, you should call this function on the widget's
+When implementing a #GtkWidget, you should call this function on the widget's
#GdkWindow as part of the "map" method.
-
</description>
<parameters>
<parameter name="window">
@@ -16097,41 +16933,6 @@
<return></return>
</function>
-<function name="gdk_window_constrain_size">
-<description>
-Constrains a desired width and height according to a
-set of geometry hints (such as minimum and maximum size).
-
-</description>
-<parameters>
-<parameter name="geometry">
-<parameter_description> a #GdkGeometry structure
-</parameter_description>
-</parameter>
-<parameter name="flags">
-<parameter_description> a mask indicating what portions of @geometry are set
-</parameter_description>
-</parameter>
-<parameter name="width">
-<parameter_description> desired width of window
-</parameter_description>
-</parameter>
-<parameter name="height">
-<parameter_description> desired height of the window
-</parameter_description>
-</parameter>
-<parameter name="new_width">
-<parameter_description> location to store resulting width
-</parameter_description>
-</parameter>
-<parameter name="new_height">
-<parameter_description> location to store resulting height
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gdk_threads_add_timeout">
<description>
A wrapper for the common usage of gdk_threads_add_timeout_full()
@@ -16162,21 +16963,18 @@
</return>
</function>
-<function name="_gdk_event_queue_find_first">
+<function name="gdk_window_thaw_updates">
<description>
-Find the first event on the queue that is not still
-being filled in.
-
+Thaws a window frozen with gdk_window_freeze_updates().
</description>
<parameters>
-<parameter name="display">
-<parameter_description> a #GdkDisplay
+<parameter name="window">
+<parameter_description> a #GdkWindow
</parameter_description>
</parameter>
</parameters>
-<return> Pointer to the list node for that event, or NULL.
-</return>
+<return></return>
</function>
<function name="gdk_pixdata_deserialize">
@@ -16223,7 +17021,7 @@
</description>
<parameters>
</parameters>
-<return> an Xlib &lt;type&gt;Window&lt;/type&gt;.
+<return> an Xlib <type>Window</type>.
</return>
</function>
@@ -16258,9 +17056,9 @@
This is a convenience function for use by code that implements the
freedesktop startup notification specification. Applications should
-not normally need to call it directly. See the &lt;ulink
-url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt"&gt;Startup
-Notification Protocol specification&lt;/ulink&gt; for
+not normally need to call it directly. See the <ulink
+url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup
+Notification Protocol specification</ulink> for
definitions of the message types and keys that can be used.
Since: 2.12
@@ -16307,7 +17105,7 @@
</parameter>
</parameters>
<return> A #GdkPixbufFormat describing the image format of the file
-or %NULL if the image format wasn't recognized. The return value
+or %NULL if the image format wasn't recognized. The return value
is owned by GdkPixbuf and should not be freed.
Since: 2.4
@@ -16321,8 +17119,8 @@
On X11, asks the window manager to keep @window below, if the window
manager supports this operation. Not all window managers support
-this, and some deliberately ignore it or don't have a concept of
-"keep below"; so you can't rely on the window being kept below.
+this, and some deliberately ignore it or don't have a concept of
+"keep below"; so you can't rely on the window being kept below.
But it will happen with most standard window managers,
and GDK makes a best effort to get it to happen.
Modified: trunk/gdk/src/gdk_methods.defs
==============================================================================
--- trunk/gdk/src/gdk_methods.defs (original)
+++ trunk/gdk/src/gdk_methods.defs Mon Mar 9 11:54:12 2009
@@ -49,6 +49,12 @@
(gtype-id "GDK_TYPE_KEYMAP")
)
+(define-object Paintable
+ (in-module "Gdk")
+ (c-name "GdkPaintable")
+ (gtype-id "GDK_TYPE_PAINTABLE")
+)
+
(define-object PangoRenderer
(in-module "Gdk")
(parent "PangoRenderer")
@@ -70,6 +76,12 @@
(gtype-id "GDK_TYPE_SCREEN")
)
+(define-object WindowImpl
+ (in-module "Gdk")
+ (c-name "GdkWindowImpl")
+ (gtype-id "GDK_TYPE_WINDOW_IMPL")
+)
+
(define-object WindowObject
(in-module "Gdk")
(parent "GdkDrawable")
@@ -298,8 +310,8 @@
(c-name "GdkFontType")
(gtype-id "GDK_TYPE_FONT_TYPE")
(values
- '("t" "GDK_FONT_FONT")
- '("tset" "GDK_FONT_FONTSET")
+ '("font" "GDK_FONT_FONT")
+ '("fontset" "GDK_FONT_FONTSET")
)
)
@@ -470,6 +482,61 @@
)
)
+(define-flags ColorInfoFlags
+ (in-module "Gdk")
+ (c-name "GdkColorInfoFlags")
+ (gtype-id "GDK_TYPE_COLOR_INFO_FLAGS")
+ (values
+ '("writeable" "GDK_COLOR_WRITEABLE")
+ )
+)
+
+(define-flags DebugFlag
+ (in-module "Gdk")
+ (c-name "GdkDebugFlag")
+ (gtype-id "GDK_TYPE_DEBUG_FLAG")
+ (values
+ '("misc" "GDK_DEBUG_MISC")
+ '("events" "GDK_DEBUG_EVENTS")
+ '("dnd" "GDK_DEBUG_DND")
+ '("xim" "GDK_DEBUG_XIM")
+ '("nograbs" "GDK_DEBUG_NOGRABS")
+ '("colormap" "GDK_DEBUG_COLORMAP")
+ '("gdkrgb" "GDK_DEBUG_GDKRGB")
+ '("gc" "GDK_DEBUG_GC")
+ '("pixmap" "GDK_DEBUG_PIXMAP")
+ '("image" "GDK_DEBUG_IMAGE")
+ '("input" "GDK_DEBUG_INPUT")
+ '("cursor" "GDK_DEBUG_CURSOR")
+ '("multihead" "GDK_DEBUG_MULTIHEAD")
+ '("xinerama" "GDK_DEBUG_XINERAMA")
+ '("draw" "GDK_DEBUG_DRAW")
+ '("eventloop" "GDK_DEBUG_EVENTLOOP")
+ )
+)
+
+(define-enum ArgType
+ (in-module "Gdk")
+ (c-name "GdkArgType")
+ (gtype-id "GDK_TYPE_ARG_TYPE")
+ (values
+ '("string" "GDK_ARG_STRING")
+ '("int" "GDK_ARG_INT")
+ '("bool" "GDK_ARG_BOOL")
+ '("nobool" "GDK_ARG_NOBOOL")
+ '("callback" "GDK_ARG_CALLBACK")
+ )
+)
+
+(define-flags EventFlags
+ (in-module "Gdk")
+ (c-name "GdkEventFlags")
+ (gtype-id "GDK_TYPE_EVENT_FLAGS")
+ (values
+ '("pending" "GDK_EVENT_PENDING")
+ )
+)
+
(define-enum PropMode
(in-module "Gdk")
(c-name "GdkPropMode")
@@ -605,8 +672,8 @@
(c-name "GdkWindowClass")
(gtype-id "GDK_TYPE_WINDOW_CLASS")
(values
- '("utput" "GDK_INPUT_OUTPUT")
- '("nly" "GDK_INPUT_ONLY")
+ '("output" "GDK_INPUT_OUTPUT")
+ '("only" "GDK_INPUT_ONLY")
)
)
@@ -744,6 +811,10 @@
)
+;; From gdkalias.h
+
+
+
;; From gdkapplaunchcontext.h
(define-function gdk_app_launch_context_get_type
@@ -837,7 +908,7 @@
(return-type "none")
(parameters
'("cairo_t*" "cr")
- '("GdkPixbuf*" "pixbuf")
+ '("const-GdkPixbuf*" "pixbuf")
'("double" "pixbuf_x")
'("double" "pixbuf_y")
)
@@ -859,7 +930,7 @@
(return-type "none")
(parameters
'("cairo_t*" "cr")
- '("GdkRectangle*" "rectangle")
+ '("const-GdkRectangle*" "rectangle")
)
)
@@ -868,7 +939,7 @@
(return-type "none")
(parameters
'("cairo_t*" "cr")
- '("GdkRegion*" "region")
+ '("const-GdkRegion*" "region")
)
)
@@ -1097,6 +1168,10 @@
+;; From gdkconfig.h
+
+
+
;; From gdkcursor.h
(define-function gdk_cursor_get_type
@@ -1912,7 +1987,7 @@
(parameters
'("GdkDrawable*" "drawable")
'("GdkGC*" "gc")
- '("GdkSegment*" "segs")
+ '("const-GdkSegment*" "segs")
'("gint" "n_segs")
)
)
@@ -1934,7 +2009,7 @@
(parameters
'("GdkDrawable*" "drawable")
'("GdkGC*" "gc")
- '("GdkPixbuf*" "pixbuf")
+ '("const-GdkPixbuf*" "pixbuf")
'("gint" "src_x")
'("gint" "src_y")
'("gint" "dest_x")
@@ -2875,7 +2950,7 @@
(c-name "gdk_gc_set_clip_rectangle")
(return-type "none")
(parameters
- '("GdkRectangle*" "rectangle")
+ '("const-GdkRectangle*" "rectangle")
)
)
@@ -2884,7 +2959,7 @@
(c-name "gdk_gc_set_clip_region")
(return-type "none")
(parameters
- '("GdkRegion*" "region")
+ '("const-GdkRegion*" "region")
)
)
@@ -3228,7 +3303,7 @@
(c-name "gdk_rectangle_intersect")
(return-type "gboolean")
(parameters
- '("GdkRectangle*" "src2")
+ '("const-GdkRectangle*" "src2")
'("GdkRectangle*" "dest")
)
)
@@ -3238,7 +3313,7 @@
(c-name "gdk_rectangle_union")
(return-type "none")
(parameters
- '("GdkRectangle*" "src2")
+ '("const-GdkRectangle*" "src2")
'("GdkRectangle*" "dest")
)
)
@@ -3602,6 +3677,24 @@
+;; From gdkinternals.h
+
+(define-function gdk_synthesize_window_state
+ (c-name "gdk_synthesize_window_state")
+ (return-type "none")
+ (parameters
+ '("GdkWindow*" "window")
+ '("GdkWindowState" "unset_flags")
+ '("GdkWindowState" "set_flags")
+ )
+)
+
+
+
+;; From gdkintl.h
+
+
+
;; From gdkkeys.h
(define-function gdk_keymap_get_type
@@ -3681,6 +3774,12 @@
(return-type "gboolean")
)
+(define-method get_caps_lock_state
+ (of-object "GdkKeymap")
+ (c-name "gdk_keymap_get_caps_lock_state")
+ (return-type "gboolean")
+)
+
(define-function gdk_keyval_name
(c-name "gdk_keyval_name")
(return-type "gchar*")
@@ -3761,6 +3860,14 @@
+;; From gdkmarshalers.h
+
+
+
+;; From gdkmedialib.h
+
+
+
;; From gdkpango.h
(define-function gdk_pango_renderer_get_type
@@ -4151,6 +4258,10 @@
+;; From gdkpoly-generic.h
+
+
+
;; From gdkprivate.h
(define-method destroy_notify
@@ -4362,6 +4473,10 @@
+;; From gdkregion-generic.h
+
+
+
;; From gdkregion.h
(define-function gdk_region_new
@@ -4390,7 +4505,7 @@
(c-name "gdk_region_rectangle")
(return-type "GdkRegion*")
(parameters
- '("GdkRectangle*" "rectangle")
+ '("const-GdkRectangle*" "rectangle")
)
)
@@ -4430,7 +4545,7 @@
(c-name "gdk_region_equal")
(return-type "gboolean")
(parameters
- '("GdkRegion*" "region2")
+ '("const-GdkRegion*" "region2")
)
)
@@ -4449,7 +4564,7 @@
(c-name "gdk_region_rect_in")
(return-type "GdkOverlapType")
(parameters
- '("GdkRectangle*" "rectangle")
+ '("const-GdkRectangle*" "rectangle")
)
)
@@ -4478,7 +4593,7 @@
(c-name "gdk_region_union_with_rect")
(return-type "none")
(parameters
- '("GdkRectangle*" "rect")
+ '("const-GdkRectangle*" "rect")
)
)
@@ -4487,7 +4602,7 @@
(c-name "gdk_region_intersect")
(return-type "none")
(parameters
- '("GdkRegion*" "source2")
+ '("const-GdkRegion*" "source2")
)
)
@@ -4496,7 +4611,7 @@
(c-name "gdk_region_union")
(return-type "none")
(parameters
- '("GdkRegion*" "source2")
+ '("const-GdkRegion*" "source2")
)
)
@@ -4505,7 +4620,7 @@
(c-name "gdk_region_subtract")
(return-type "none")
(parameters
- '("GdkRegion*" "source2")
+ '("const-GdkRegion*" "source2")
)
)
@@ -4514,7 +4629,7 @@
(c-name "gdk_region_xor")
(return-type "none")
(parameters
- '("GdkRegion*" "source2")
+ '("const-GdkRegion*" "source2")
)
)
@@ -4523,7 +4638,7 @@
(c-name "gdk_region_spans_intersect_foreach")
(return-type "none")
(parameters
- '("GdkSpan*" "spans")
+ '("const-GdkSpan*" "spans")
'("int" "n_spans")
'("gboolean" "sorted")
'("GdkSpanFunc" "function")
@@ -5487,7 +5602,7 @@
(c-name "gdk_window_move_region")
(return-type "none")
(parameters
- '("GdkRegion*" "region")
+ '("const-GdkRegion*" "region")
'("gint" "dx")
'("gint" "dy")
)
@@ -5509,7 +5624,7 @@
(c-name "gdk_window_shape_combine_region")
(return-type "none")
(parameters
- '("GdkRegion*" "shape_region")
+ '("const-GdkRegion*" "shape_region")
'("gint" "offset_x")
'("gint" "offset_y")
)
@@ -5552,7 +5667,7 @@
(c-name "gdk_window_input_shape_combine_region")
(return-type "none")
(parameters
- '("GdkRegion*" "shape_region")
+ '("const-GdkRegion*" "shape_region")
'("gint" "offset_x")
'("gint" "offset_y")
)
@@ -5703,7 +5818,7 @@
(c-name "gdk_window_set_geometry_hints")
(return-type "none")
(parameters
- '("GdkGeometry*" "geometry")
+ '("const-GdkGeometry*" "geometry")
'("GdkWindowHints" "geom_mask")
)
)
@@ -5721,7 +5836,7 @@
(c-name "gdk_window_begin_paint_rect")
(return-type "none")
(parameters
- '("GdkRectangle*" "rectangle")
+ '("const-GdkRectangle*" "rectangle")
)
)
@@ -5730,7 +5845,7 @@
(c-name "gdk_window_begin_paint_region")
(return-type "none")
(parameters
- '("GdkRegion*" "region")
+ '("const-GdkRegion*" "region")
)
)
@@ -6118,7 +6233,7 @@
(c-name "gdk_window_invalidate_rect")
(return-type "none")
(parameters
- '("GdkRectangle*" "rect")
+ '("const-GdkRectangle*" "rect")
'("gboolean" "invalidate_children")
)
)
@@ -6128,7 +6243,7 @@
(c-name "gdk_window_invalidate_region")
(return-type "none")
(parameters
- '("GdkRegion*" "region")
+ '("const-GdkRegion*" "region")
'("gboolean" "invalidate_children")
)
)
@@ -6255,3 +6370,13 @@
(return-type "none")
)
+
+
+;; From gdkwindowimpl.h
+
+(define-function gdk_window_impl_get_type
+ (c-name "gdk_window_impl_get_type")
+ (return-type "GType")
+)
+
+
Modified: trunk/gdk/src/gdk_pixbuf.defs
==============================================================================
--- trunk/gdk/src/gdk_pixbuf.defs (original)
+++ trunk/gdk/src/gdk_pixbuf.defs Mon Mar 9 11:54:12 2009
@@ -14,13 +14,6 @@
(gtype-id "GDK_TYPE_PIXBUF_ANIMATION")
)
-(define-object PixbufAniAnim
- (in-module "Gdk")
- (parent "GdkPixbufAnimation")
- (c-name "GdkPixbufAniAnim")
- (gtype-id "GDK_TYPE_PIXBUF_ANI_ANIM")
-)
-
(define-object PixbufAnimationIter
(in-module "Gdk")
(parent "GObject")
@@ -28,27 +21,6 @@
(gtype-id "GDK_TYPE_PIXBUF_ANIMATION_ITER")
)
-(define-object PixbufAniAnimIter
- (in-module "Gdk")
- (parent "GdkPixbufAnimationIter")
- (c-name "GdkPixbufAniAnimIter")
- (gtype-id "GDK_TYPE_PIXBUF_ANI_ANIM_ITER")
-)
-
-(define-object PixbufGifAnim
- (in-module "Gdk")
- (parent "GdkPixbufAnimation")
- (c-name "GdkPixbufGifAnim")
- (gtype-id "GDK_TYPE_PIXBUF_GIF_ANIM")
-)
-
-(define-object PixbufGifAnimIter
- (in-module "Gdk")
- (parent "GdkPixbufAnimationIter")
- (c-name "GdkPixbufGifAnimIter")
- (gtype-id "GDK_TYPE_PIXBUF_GIF_ANIM_ITER")
-)
-
(define-object PixbufLoader
(in-module "Gdk")
(parent "GObject")
@@ -73,7 +45,7 @@
(c-name "GdkColorspace")
(gtype-id "GDK_TYPE_COLORSPACE")
(values
- '("b" "GDK_COLORSPACE_RGB")
+ '("rgb" "GDK_COLORSPACE_RGB")
)
)
@@ -158,23 +130,12 @@
)
)
-(define-enum PixbufFrameAction
- (in-module "Gdk")
- (c-name "GdkPixbufFrameAction")
- (gtype-id "GDK_TYPE_PIXBUF_FRAME_ACTION")
- (values
- '("retain" "GDK_PIXBUF_FRAME_RETAIN")
- '("dispose" "GDK_PIXBUF_FRAME_DISPOSE")
- '("revert" "GDK_PIXBUF_FRAME_REVERT")
- )
-)
-
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-alias.h
+;; From gdk-pixbuf-alias.h
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-animation.h
+;; From gdk-pixbuf-animation.h
(define-function gdk_pixbuf_animation_get_type
(c-name "gdk_pixbuf_animation_get_type")
@@ -267,6 +228,11 @@
)
)
+(define-function gdk_pixbuf_non_anim_get_type
+ (c-name "gdk_pixbuf_non_anim_get_type")
+ (return-type "GType")
+)
+
(define-method non_anim_new
(of-object "GdkPixbuf")
(c-name "gdk_pixbuf_non_anim_new")
@@ -275,7 +241,7 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-core.h
+;; From gdk-pixbuf-core.h
(define-function gdk_pixbuf_error_quark
(c-name "gdk_pixbuf_error_quark")
@@ -533,6 +499,42 @@
)
)
+(define-function gdk_pixbuf_new_from_stream
+ (c-name "gdk_pixbuf_new_from_stream")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GInputStream*" "stream")
+ '("GCancellable*" "cancellable")
+ '("GError**" "error")
+ )
+)
+
+(define-function gdk_pixbuf_new_from_stream_at_scale
+ (c-name "gdk_pixbuf_new_from_stream_at_scale")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GInputStream*" "stream")
+ '("gint" "width")
+ '("gint" "height")
+ '("gboolean" "preserve_aspect_ratio")
+ '("GCancellable*" "cancellable")
+ '("GError**" "error")
+ )
+)
+
+(define-method save_to_stream
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_save_to_stream")
+ (return-type "gboolean")
+ (parameters
+ '("GOutputStream*" "stream")
+ '("const-char*" "type")
+ '("GCancellable*" "cancellable")
+ '("GError**" "error")
+ )
+ (varargs #t)
+)
+
(define-method add_alpha
(of-object "GdkPixbuf")
(c-name "gdk_pixbuf_add_alpha")
@@ -571,6 +573,12 @@
)
)
+(define-method apply_embedded_orientation
+ (of-object "GdkPixbuf")
+ (c-name "gdk_pixbuf_apply_embedded_orientation")
+ (return-type "GdkPixbuf*")
+)
+
(define-method get_option
(of-object "GdkPixbuf")
(c-name "gdk_pixbuf_get_option")
@@ -582,7 +590,7 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-enum-types.h
+;; From gdk-pixbuf-enum-types.h
(define-function gdk_pixbuf_alpha_mode_get_type
(c-name "gdk_pixbuf_alpha_mode_get_type")
@@ -611,19 +619,19 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-features.h
+;; From gdk-pixbuf-features.h
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf.h
+;; From gdk-pixbuf.h
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-i18n.h
+;; From gdk-pixbuf-i18n.h
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-io.h
+;; From gdk-pixbuf-io.h
(define-function gdk_pixbuf_get_formats
(c-name "gdk_pixbuf_get_formats")
@@ -709,7 +717,7 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-loader.h
+;; From gdk-pixbuf-loader.h
(define-function gdk_pixbuf_loader_get_type
(c-name "gdk_pixbuf_loader_get_type")
@@ -790,15 +798,29 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-marshal.h
+;; From gdk-pixbuf-marshal.h
+
+;; From gdk-pixbuf-private.h
+
+
+
+;; From gdk-pixbuf-scaled-anim.h
+
+(define-function gdk_pixbuf_scaled_anim_get_type
+ (c-name "gdk_pixbuf_scaled_anim_get_type")
+ (return-type "GType")
+)
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-private.h
+(define-function gdk_pixbuf_scaled_anim_iter_get_type
+ (c-name "gdk_pixbuf_scaled_anim_iter_get_type")
+ (return-type "GType")
+)
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-simple-anim.h
+;; From gdk-pixbuf-simple-anim.h
(define-function gdk_pixbuf_simple_anim_get_type
(c-name "gdk_pixbuf_simple_anim_get_type")
@@ -832,7 +854,7 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-transform.h
+;; From gdk-pixbuf-transform.h
(define-method scale
(of-object "GdkPixbuf")
@@ -941,7 +963,7 @@
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixdata.h
+;; From gdk-pixdata.h
(define-method serialize
(of-object "GdkPixdata")
@@ -994,48 +1016,3 @@
)
-
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/io-ani-animation.h
-
-(define-function gdk_pixbuf_ani_anim_get_type
- (c-name "gdk_pixbuf_ani_anim_get_type")
- (return-type "GType")
-)
-
-(define-function gdk_pixbuf_ani_anim_iter_get_type
- (c-name "gdk_pixbuf_ani_anim_iter_get_type")
- (return-type "GType")
-)
-
-
-
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/io-gif-animation.h
-
-(define-function gdk_pixbuf_gif_anim_get_type
- (c-name "gdk_pixbuf_gif_anim_get_type")
- (return-type "GType")
-)
-
-(define-function gdk_pixbuf_gif_anim_iter_get_type
- (c-name "gdk_pixbuf_gif_anim_iter_get_type")
- (return-type "GType")
-)
-
-(define-method frame_composite
- (of-object "GdkPixbufGifAnim")
- (c-name "gdk_pixbuf_gif_anim_frame_composite")
- (return-type "none")
- (parameters
- '("GdkPixbufFrame*" "frame")
- )
-)
-
-
-
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/stamp-gdk-pixbuf-marshal.h
-
-
-
-;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/xpm-color-table.h
-
-
Modified: trunk/gdk/src/region.hg
==============================================================================
--- trunk/gdk/src/region.hg (original)
+++ trunk/gdk/src/region.hg Mon Mar 9 11:54:12 2009
@@ -62,6 +62,10 @@
_WRAP_METHOD(void union_(const Region& source2), gdk_region_union) //union is a keyword.
_WRAP_METHOD(void subtract(const Region& source2), gdk_region_subtract)
_WRAP_METHOD(void xor_(const Region& source2), gdk_region_xor) //xor is a keyword
+
+
+//Note: The spans parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
+#m4 _CONVERSION(`GdkSpan*',`const GdkSpan*',`($3)')
_WRAP_METHOD(void spans_intersect_foreach(GdkSpan* spans, int n_spans, bool sorted, GdkSpanFunc function, gpointer data), gdk_region_spans_intersect_foreach)
#m4begin
Modified: trunk/gdk/src/window.hg
==============================================================================
--- trunk/gdk/src/window.hg (original)
+++ trunk/gdk/src/window.hg Mon Mar 9 11:54:12 2009
@@ -123,7 +123,9 @@
_WRAP_METHOD(static void set_sm_client_id(const Glib::ustring& sm_client_id), gdk_set_sm_client_id)
static void unset_sm_client_id();
- _WRAP_METHOD(void begin_paint_rect(Rectangle&rectangle), gdk_window_begin_paint_rect)
+ //Note: The rectangle parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
+ #m4 _CONVERSION(`Rectangle&',`const GdkRectangle*',`($3).gobj()')
+ _WRAP_METHOD(void begin_paint_rect(Rectangle& rectangle), gdk_window_begin_paint_rect)
_WRAP_METHOD(void begin_paint_region(const Region& region), gdk_window_begin_paint_region)
_WRAP_METHOD(void end_paint(), gdk_window_end_paint)
_WRAP_METHOD(void set_title(const Glib::ustring& title), gdk_window_set_title)
Modified: trunk/gtk/src/activatable.hg
==============================================================================
--- trunk/gtk/src/activatable.hg (original)
+++ trunk/gtk/src/activatable.hg Mon Mar 9 11:54:12 2009
@@ -51,7 +51,7 @@
#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
_WRAP_VFUNC(void update(const Glib::RefPtr<Action>& action, const Glib::ustring& property_name), update)
- _WRAP_VFUNC(void sync_action_properties(const Glib::RefPtr<Action>& action), reset)
+ _WRAP_VFUNC(void sync_action_properties(const Glib::RefPtr<Action>& action), sync_action_properties)
};
} // namespace Gtk
Modified: trunk/gtk/src/entry.hg
==============================================================================
--- trunk/gtk/src/entry.hg (original)
+++ trunk/gtk/src/entry.hg Mon Mar 9 11:54:12 2009
@@ -159,6 +159,7 @@
_IGNORE_SIGNAL("backspace")
//TODO: Wrap the icon-release and icon-press signals? Or are they just useless activate signals? murrayc.
+ //See bug http://bugzilla.gnome.org/show_bug.cgi?id=574622
_WRAP_PROPERTY("cursor-position", int)
_WRAP_PROPERTY("selection-bound", int)
Modified: trunk/gtk/src/gtk_docs.xml
==============================================================================
--- trunk/gtk/src/gtk_docs.xml (original)
+++ trunk/gtk/src/gtk_docs.xml Mon Mar 9 11:54:12 2009
@@ -9302,7 +9302,8 @@
should be ignored by the #GtkActivatable when this property is %FALSE.
<note><para>#GtkActivatable implementors need to handle this property
-and call gtk_activatable_reset() on the activatable widget when it changes.</para></note>
+and call gtk_activatable_sync_action_properties() on the activatable
+widget when it changes.</para></note>
Since: 2.16
@@ -9340,7 +9341,7 @@
Since: 2.4
-Deprecated 2.16: activatables are now responsible for activating the
+Deprecated: 2.16: activatables are now responsible for activating the
action directly so this doesnt apply anymore.
</description>
@@ -11456,8 +11457,6 @@
return (gchar*)g_dpgettext2 (GETTEXT_PACKAGE, msgctxt, msgid);
}
-/* ... &ast/
-
gtk_stock_add (items, G_N_ELEMENTS (items));
gtk_stock_set_translate_func ("odd-item-domain", my_translate_func, "odd items");
gtk_stock_set_translate_func ("even-item-domain", my_translate_func, "even items");
@@ -12080,7 +12079,7 @@
Since: 2.4
-Deprecated 2.16: Use gtk_activatable_set_related_action() instead.
+Deprecated: 2.16: Use gtk_activatable_set_related_action() instead.
</description>
<parameters>
@@ -13361,7 +13360,7 @@
Since: 2.4
-Deprecated 2.16: Use gtk_activatable_set_related_action() instead.
+Deprecated: 2.16: Use gtk_activatable_set_related_action() instead.
</description>
<parameters>
@@ -14586,7 +14585,7 @@
{
GtkEntry *entry = GTK_ENTRY (editable);
-/* ... create a GtkEntryCompletion */
+// ... create a GtkEntryCompletion
gtk_entry_set_completion (entry, completion);
}
@@ -14688,7 +14687,7 @@
Since: 2.10
-Deprecated 2.16: Use gtk_activatable_get_related_action() instead.
+Deprecated: 2.16: Use gtk_activatable_get_related_action() instead.
</return>
</function>
@@ -19832,6 +19831,19 @@
</return>
</function>
+<function name="gtk_window_get_default_icon_name">
+<description>
+Returns: the fallback icon name for windows
+
+</description>
+<parameters>
+</parameters>
+<return> the fallback icon name for windows
+
+Since: 2.16
+</return>
+</function>
+
<function name="gtk_menu_bar_get_pack_direction">
<description>
Retrieves the current pack direction of the menubar.
@@ -23351,7 +23363,7 @@
GtkTreeIter *iter,
gpointer data)
{
-/* Visible if row is non-empty and first column is "HI" */
+// Visible if row is non-empty and first column is "HI".
gchar *str;
gboolean visible = FALSE;
@@ -24618,7 +24630,7 @@
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
if (GTK_WIDGET_TOPLEVEL (toplevel))
{
- ... Perform action on toplevel. ...
+ // Perform action on toplevel.
}
]|
@@ -28707,7 +28719,7 @@
static void
fill_with_content (GtkWidget *vbox)
{
- ... fill with content ...
+ // fill with content...
}
int
@@ -29644,6 +29656,29 @@
<return></return>
</function>
+<function name="gtk_activatable_sync_action_properties">
+<description>
+This is called to update the activatable completely, this is called
+internally when the #GtkActivatable::related-action property is set
+or unset and by the implementing class when
+#GtkActivatable::use-action-appearance changes.
+
+Since: 2.16
+
+</description>
+<parameters>
+<parameter name="activatable">
+<parameter_description> a #GtkActivatable
+</parameter_description>
+</parameter>
+<parameter name="action">
+<parameter_description> the related #GtkAction or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gtk_text_view_move_visually">
<description>
Move the iterator a given number of characters visually, treating
@@ -31796,12 +31831,14 @@
|[
if (document_is_new)
{
-gtk_file_chooser_set_current_folder (chooser, default_folder_for_saving);
-gtk_file_chooser_set_current_name (chooser, "Untitled document");
+ // The user just created a new document.
+ gtk_file_chooser_set_current_folder (chooser, default_folder_for_saving);
+ gtk_file_chooser_set_current_name (chooser, "Untitled document");
}
else
{
-gtk_file_chooser_set_filename (chooser, existing_filename);
+ //The user edited an existing document.
+ gtk_file_chooser_set_filename (chooser, existing_filename);
}
]|
@@ -31970,22 +32007,24 @@
</return>
</function>
-<function name="gtk_activatable_reset">
+<function name="gtk_print_settings_set_double">
<description>
-This is called to update the activatable completely, this is called internally when
-the #GtkActivatable::related-action property is set or unset and by the implementing
-class when #GtkActivatable::use-action-appearance changes.
+Sets @key to a double value.
-Since: 2.16
+Since: 2.10
</description>
<parameters>
-<parameter name="activatable">
-<parameter_description> a #GtkActivatable
+<parameter name="settings">
+<parameter_description> a #GtkPrintSettings
</parameter_description>
</parameter>
-<parameter name="action">
-<parameter_description> the related #GtkAction or %NULL
+<parameter name="key">
+<parameter_description> a key
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> a double value
</parameter_description>
</parameter>
</parameters>
@@ -42587,8 +42626,6 @@
Override or install a new key binding for @keyval with @modifiers on
@binding_set.
-Deprecated: 2.12: Use gtk_binding_entry_add_signal() instead.
-
</description>
<parameters>
<parameter name="binding_set">
@@ -47664,11 +47701,13 @@
<function name="gtk_activatable_set_use_action_appearance">
<description>
-Sets whether this activatable should reset its layout and appearance
-when setting the related action or when the action changes appearance
+Sets whether this activatable should reset its layout and appearance
+when setting the related action or when the action changes appearance
-<note><para>#GtkActivatable implementors need to handle the #GtkActivatable:use-action-appearance
-property and call gtk_activatable_reset() to update @activatable if needed.</para></note>
+<note><para>#GtkActivatable implementors need to handle the
+#GtkActivatable:use-action-appearance property and call
+gtk_activatable_sync_action_properties() to update @activatable
+if needed.</para></note>
Since: 2.16
@@ -53858,30 +53897,6 @@
</return>
</function>
-<function name="gtk_print_settings_set_double">
-<description>
-Sets @key to a double value.
-
-Since: 2.10
-
-</description>
-<parameters>
-<parameter name="settings">
-<parameter_description> a #GtkPrintSettings
-</parameter_description>
-</parameter>
-<parameter name="key">
-<parameter_description> a key
-</parameter_description>
-</parameter>
-<parameter name="value">
-<parameter_description> a double value
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="gtk_text_view_set_border_window_size">
<description>
Sets the width of %GTK_TEXT_WINDOW_LEFT or %GTK_TEXT_WINDOW_RIGHT,
@@ -54706,12 +54721,14 @@
|[
if (document_is_new)
{
-gtk_file_chooser_set_current_folder_uri (chooser, default_folder_for_saving);
-gtk_file_chooser_set_current_name (chooser, "Untitled document");
+ // The user just created a new document.
+ gtk_file_chooser_set_current_folder_uri (chooser, default_folder_for_saving);
+ gtk_file_chooser_set_current_name (chooser, "Untitled document");
}
else
{
-gtk_file_chooser_set_uri (chooser, existing_uri);
+ // The user edited an existing document.
+ gtk_file_chooser_set_uri (chooser, existing_uri);
}
]|
@@ -56817,7 +56834,7 @@
Since: 2.4
-Deprecated 2.16: activatables are now responsible for activating the
+Deprecated: 2.16: activatables are now responsible for activating the
action directly so this doesnt apply anymore.
</description>
@@ -61759,12 +61776,14 @@
|[
if (document_is_new)
{
-gtk_file_chooser_set_current_folder_file (chooser, default_file_for_saving);
-gtk_file_chooser_set_current_name (chooser, "Untitled document");
+ // The user just created a new document.
+ gtk_file_chooser_set_current_folder_file (chooser, default_file_for_saving);
+ gtk_file_chooser_set_current_name (chooser, "Untitled document");
}
else
{
-gtk_file_chooser_set_file (chooser, existing_file);
+ // The user edited an existing document.
+ gtk_file_chooser_set_file (chooser, existing_file);
}
]|
Modified: trunk/gtk/src/gtk_methods.defs
==============================================================================
--- trunk/gtk/src/gtk_methods.defs (original)
+++ trunk/gtk/src/gtk_methods.defs Mon Mar 9 11:54:12 2009
@@ -1056,6 +1056,13 @@
(gtype-id "GTK_TYPE_SCALE_BUTTON")
)
+(define-object VolumeButton
+ (in-module "Gtk")
+ (parent "GtkScaleButton")
+ (c-name "GtkVolumeButton")
+ (gtype-id "GTK_TYPE_VOLUME_BUTTON")
+)
+
(define-object OptionMenu
(in-module "Gtk")
(parent "GtkButton")
@@ -4273,9 +4280,9 @@
(return-type "GType")
)
-(define-method reset
+(define-method sync_action_properties
(of-object "GtkActivatable")
- (c-name "gtk_activatable_reset")
+ (c-name "gtk_activatable_sync_action_properties")
(return-type "none")
(parameters
'("GtkAction*" "action")
@@ -4949,18 +4956,6 @@
)
)
-(define-function gtk_binding_entry_add_signall
- (c-name "gtk_binding_entry_add_signall")
- (return-type "none")
- (parameters
- '("GtkBindingSet*" "binding_set")
- '("guint" "keyval")
- '("GdkModifierType" "modifiers")
- '("const-gchar*" "signal_name")
- '("GSList*" "binding_args")
- )
-)
-
(define-function gtk_binding_parse_binding
(c-name "gtk_binding_parse_binding")
(return-type "guint")
@@ -4992,6 +4987,18 @@
(varargs #t)
)
+(define-function gtk_binding_entry_add_signall
+ (c-name "gtk_binding_entry_add_signall")
+ (return-type "none")
+ (parameters
+ '("GtkBindingSet*" "binding_set")
+ '("guint" "keyval")
+ '("GdkModifierType" "modifiers")
+ '("const-gchar*" "signal_name")
+ '("GSList*" "binding_args")
+ )
+)
+
(define-function gtk_binding_entry_remove
(c-name "gtk_binding_entry_remove")
(return-type "none")
@@ -33693,6 +33700,11 @@
)
)
+(define-function gtk_window_get_default_icon_name
+ (c-name "gtk_window_get_default_icon_name")
+ (return-type "const-gchar*")
+)
+
(define-function gtk_window_set_default_icon_from_file
(c-name "gtk_window_set_default_icon_from_file")
(return-type "gboolean")
Modified: trunk/tools/m4/convert_gdk.m4
==============================================================================
--- trunk/tools/m4/convert_gdk.m4 (original)
+++ trunk/tools/m4/convert_gdk.m4 Mon Mar 9 11:54:12 2009
@@ -72,9 +72,11 @@
_CONVERSION(`const Color&',`const GdkColor*',`($3).gobj()')
_CONVERSION(`Rectangle&',`GdkRectangle*',($3).gobj())
_CONVERSION(`Gdk::Rectangle&',`GdkRectangle*',($3).gobj())
+_CONVERSION(`const Rectangle&',`const GdkRectangle*',($3).gobj())
_CONVERSION(`const Gdk::Rectangle&',`const GdkRectangle*',($3).gobj())
_CONVERSION(`Font&',`GdkFont*',($3).gobj())
#_CONVERSION(`Region&',`GdkRegion*',($3).gobj())
+_CONVERSION(`const Region&',`const GdkRegion*',($3).gobj())
_CONVERSION(`const Gdk::Region&',`const GdkRegion*',($3).gobj())
_CONVERSION(`const Region&',`GdkRegion*',const_cast<$2>(($3).gobj()))
_CONVERSION(`const Gdk::Region&',`GdkRegion*',const_cast<$2>(($3).gobj()))
@@ -118,6 +120,7 @@
_CONVERSION(const Color&,GdkColor*,__CFR2P)
_CONVERSION(const Gdk::Rectangle&,GdkRectangle*,__CFR2P)
_CONVERSION(const Rectangle&,GdkRectangle*,__CFR2P)
+_CONVERSION(const Geometry&,const GdkGeometry*,&($3))
_CONVERSION(const Gdk::Geometry&,GdkGeometry*,const_cast<$2>(&($3)))
_CONVERSION(const Geometry&,GdkGeometry*,const_cast<$2>(&($3)))
_CONVERSION(const RgbCmap&,GdkRgbCmap*,__CFR2P)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
