diff options
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.c | 2 | ||||
| -rw-r--r-- | gdk/gdkdevice.c | 4 | ||||
| -rw-r--r-- | gdk/gdkdisplay.c | 7 | ||||
| -rw-r--r-- | gdk/gdkevents.c | 6 | ||||
| -rw-r--r-- | gdk/gdkkeys.c | 10 | ||||
| -rw-r--r-- | gdk/gdkrectangle.c | 2 | ||||
| -rw-r--r-- | gdk/gdkselection.c | 7 | ||||
| -rw-r--r-- | gdk/gdkvisual.c | 3 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 40 | ||||
| -rw-r--r-- | gdk/x11/gdkselection-x11.c | 15 |
10 files changed, 53 insertions, 43 deletions
@@ -268,7 +268,7 @@ gdk_pre_parse_libgtk_only (void) /** * gdk_parse_args: * @argc: the number of command line arguments. - * @argv: the array of command line arguments. + * @argv: (inout) (array length=argc): the array of command line arguments. * * Parse command line arguments, and store for future * use by calls to gdk_display_open(). diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index a9119233c0..3f7168af25 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -697,8 +697,8 @@ gdk_device_get_n_keys (GdkDevice *device) * gdk_device_get_key: * @device: a #GdkDevice. * @index_: the index of the macro button to get. - * @keyval: return value for the keyval. - * @modifiers: return value for modifiers. + * @keyval: (out): return value for the keyval. + * @modifiers: (out): return value for modifiers. * * If @index_ has a valid keyval, this function will return %TRUE * and fill in @keyval and @modifiers with the keyval settings. diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 0cbf3879be..32f2b94429 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -597,7 +597,7 @@ _gdk_display_enable_motion_hints (GdkDisplay *display, /** * gdk_display_get_pointer: * @display: a #GdkDisplay - * @screen: (allow-none): location to store the screen that the + * @screen: (out) (allow-none): location to store the screen that the * cursor is on, or %NULL. * @x: (out) (allow-none): location to store root window X coordinate of pointer, or %NULL. * @y: (out) (allow-none): location to store root window Y coordinate of pointer, or %NULL. @@ -1571,7 +1571,8 @@ gdk_display_supports_clipboard_persistence (GdkDisplay *display) * @display: a #GdkDisplay * @clipboard_window: a #GdkWindow belonging to the clipboard owner * @time_: a timestamp - * @targets: an array of targets that should be saved, or %NULL + * @targets: (array length=n_targets): an array of targets + * that should be saved, or %NULL * if all available targets should be saved. * @n_targets: length of the @targets array * @@ -1771,7 +1772,7 @@ gdk_display_get_app_launch_context (GdkDisplay *display) * gdk_drag_get_protocol_for_display: * @display: the #GdkDisplay where the destination window resides * @xid: the windowing system id of the destination window. - * @protocol: location where the supported DND protocol is returned. + * @protocol: (out): location where the supported DND protocol is returned. * * Finds out the DND protocol supported by a window. * diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 5fa240fe9d..f4d4eff3f8 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -918,7 +918,7 @@ gdk_event_get_root_coords (const GdkEvent *event, /** * gdk_event_get_axis: * @event: a #GdkEvent - * @axis_use: (out): the axis use to look for + * @axis_use: the axis use to look for * @value: (out): location to store the value found * * Extract the axis value for a particular axis use from @@ -1261,7 +1261,7 @@ gdk_events_get_axis_distances (GdkEvent *event1, * gdk_events_get_distance: * @event1: first #GdkEvent * @event2: second #GdkEvent - * @distance: return location for the distance + * @distance: (out): return location for the distance * * If both events have X/Y information, the distance between both coordinates * (as in a straight line going from @event1 to @event2) will be returned. @@ -1284,7 +1284,7 @@ gdk_events_get_distance (GdkEvent *event1, * gdk_events_get_angle: * @event1: first #GdkEvent * @event2: second #GdkEvent - * @angle: return location for the relative angle between both events + * @angle: (out): return location for the relative angle between both events * * If both events contain X/Y information, this function will return %TRUE * and return in @angle the relative angle from @event1 to @event2. The rotation diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c index 59f8784802..74d8329710 100644 --- a/gdk/gdkkeys.c +++ b/gdk/gdkkeys.c @@ -397,8 +397,10 @@ gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap, * gdk_keymap_get_entries_for_keycode: * @keymap: a #GdkKeymap * @hardware_keycode: a keycode - * @keys: (out): return location for array of #GdkKeymapKey, or %NULL - * @keyvals: (out): return location for array of keyvals, or %NULL + * @keys: (out) (array length=n_entries) (transfer full): return + * location for array of #GdkKeymapKey, or %NULL + * @keyvals: (out) (array length=n_entries) (transfer full): return + * location for array of keyvals, or %NULL * @n_entries: length of @keys and @keyvals * * Returns the keyvals bound to @hardware_keycode. @@ -532,7 +534,7 @@ gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, /** * gdk_keymap_add_virtual_modifiers: * @keymap: a #GdkKeymap - * @state: pointer to the modifier mask to change + * @state: (out): pointer to the modifier mask to change * * Adds virtual modifiers (i.e. Super, Hyper and Meta) which correspond * to the real modifiers (i.e Mod2, Mod3, ...) in @modifiers. @@ -558,7 +560,7 @@ gdk_keymap_add_virtual_modifiers (GdkKeymap *keymap, /** * gdk_keymap_map_virtual_modifiers: * @keymap: a #GdkKeymap - * @state: pointer to the modifier state to map + * @state: (out): pointer to the modifier state to map * * Maps the virtual modifiers (i.e. Super, Hyper and Meta) which * are set in @state to their non-virtual counterparts (i.e. Mod2, diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index ff68aa53ac..2e104c33dc 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -53,7 +53,7 @@ * gdk_rectangle_union: * @src1: a #GdkRectangle * @src2: a #GdkRectangle - * @dest: return location for the union of @src1 and @src2 + * @dest: (out): return location for the union of @src1 and @src2 * * Calculates the union of two rectangles. * The union of rectangles @src1 and @src2 is the smallest rectangle which diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c index 27adfdf7d5..8a5972309d 100644 --- a/gdk/gdkselection.c +++ b/gdk/gdkselection.c @@ -282,10 +282,11 @@ gdk_selection_convert (GdkWindow *requestor, * @display: a #GdkDisplay * @encoding: an atom representing the encoding of the text * @format: the format of the property - * @text: the text to convert + * @text: (array length=length): the text to convert * @length: the length of @text, in bytes - * @list: location to store the list of strings or %NULL. The - * list should be freed with g_strfreev(). + * @list: (out) (array zero-terminated=1): location to store the list + * of strings or %NULL. The list should be freed with + * g_strfreev(). * * Converts a text property in the given encoding to * a list of UTF-8 strings. diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c index 4a25402313..a2338a94d5 100644 --- a/gdk/gdkvisual.c +++ b/gdk/gdkvisual.c @@ -241,7 +241,8 @@ gdk_query_depths (gint **depths, /** * gdk_query_visual_types: - * @visual_types: return location for the available visual types + * @visual_types: (out) (array length=count) (transfer none): return + * location for the available visual types * @count: return location for the number of available visual types * * This function returns the available visual types for the default diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 0ea4d40a60..51b1fd2ca7 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -406,8 +406,10 @@ gdk_window_class_init (GdkWindowClass *klass) * @window: the offscreen window on which the signal is emitted * @offscreen-x: x coordinate in the offscreen window * @offscreen-y: y coordinate in the offscreen window - * @embedder-x: return location for the x coordinate in the embedder window - * @embedder-y: return location for the y coordinate in the embedder window + * @embedder-x: (out) (type double): return location for the x + * coordinate in the embedder window + * @embedder-y: (out) (type double): return location for the y + * coordinate in the embedder window * * The ::to-embedder signal is emitted to translate coordinates * in an offscreen window to its embedder. @@ -435,8 +437,10 @@ gdk_window_class_init (GdkWindowClass *klass) * @window: the offscreen window on which the signal is emitted * @embedder-x: x coordinate in the embedder window * @embedder-y: y coordinate in the embedder window - * @offscreen-x: return location for the x coordinate in the offscreen window - * @offscreen-y: return location for the y coordinate in the offscreen window + * @offscreen-x: (out) (type double): return location for the x + * coordinate in the offscreen window + * @offscreen-y: (out) (type double): return location for the y + * coordinate in the offscreen window * * The ::from-embedder signal is emitted to translate coordinates * in the embedder of an offscreen window to the offscreen window. @@ -2076,7 +2080,7 @@ gdk_window_set_user_data (GdkWindow *window, /** * gdk_window_get_user_data: * @window: a #GdkWindow - * @data: return location for user data + * @data: (out): return location for user data * * Retrieves the user data for @window, which is normally the widget * that @window belongs to. See gdk_window_set_user_data(). @@ -4781,8 +4785,8 @@ gdk_window_set_debug_updates (gboolean setting) * @flags: a mask indicating what portions of @geometry are set * @width: desired width of window * @height: desired height of the window - * @new_width: location to store resulting width - * @new_height: location to store resulting height + * @new_width: (out): location to store resulting width + * @new_height: (out): location to store resulting height * * Constrains a desired width and height according to a * set of geometry hints (such as minimum and maximum size). @@ -6924,8 +6928,8 @@ gdk_window_get_origin (GdkWindow *window, * @window: a #GdkWindow * @x: X coordinate in window * @y: Y coordinate in window - * @root_x: return location for X coordinate - * @root_y: return location for Y coordinate + * @root_x: (out): return location for X coordinate + * @root_y: (out): return location for Y coordinate * * Obtains the position of a window position in root * window coordinates. This is similar to @@ -10063,8 +10067,8 @@ gdk_window_set_transient_for (GdkWindow *window, /** * gdk_window_get_root_origin: * @window: a toplevel #GdkWindow - * @x: return location for X position of window frame - * @y: return location for Y position of window frame + * @x: (out): return location for X position of window frame + * @y: (out): return location for Y position of window frame * * Obtains the top-left corner of the window manager frame in root * window coordinates. @@ -10487,7 +10491,7 @@ gdk_window_set_decorations (GdkWindow *window, /** * gdk_window_get_decorations: * @window: The toplevel #GdkWindow to get the decorations from - * @decorations: The window decorations will be written here + * @decorations: (out): The window decorations will be written here * * Returns the decorations set on the GdkWindow with * gdk_window_set_decorations(). @@ -10837,9 +10841,9 @@ gdk_test_simulate_button (GdkWindow *window, * when rounded up). * @pdelete: if %TRUE, delete the property after retrieving the * data. - * @actual_property_type: location to store the actual type of -* the property. - * @actual_format: location to store the actual return format of the + * @actual_property_type: (out) (transfer none): location to store the + * actual type of the property. + * @actual_format: (out): location to store the actual return format of the * data; either 8, 16 or 32 bits. * @actual_length: location to store the length of the retrieved data, in * bytes. Data returned in the 32 bit format is stored @@ -10847,9 +10851,9 @@ gdk_test_simulate_button (GdkWindow *window, * elements should be be calculated via * @actual_length / sizeof(glong) to ensure portability to * 64 bit systems. - * @data: location to store a pointer to the data. The retrieved - * data should be freed with g_free() when you are finished - * using it. + * @data: (out) (array length=actual_length) (transfer full): location + * to store a pointer to the data. The retrieved data should be + * freed with g_free() when you are finished using it. * * Retrieves a portion of the contents of a property. If the * property does not exist, then the function returns %FALSE, diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index f13207b955..66ddd21beb 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -576,11 +576,12 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display, * gdk_x11_display_string_to_compound_text: * @display: the #GdkDisplay where the encoding is defined * @str: a nul-terminated string - * @encoding: location to store the encoding atom + * @encoding: (out) (transfer none): location to store the encoding atom * (to be used as the type for the property) - * @format: location to store the format of the property - * @ctext: location to store newly allocated data for the property - * @length: the length of @text, in bytes + * @format: (out): location to store the format of the property + * @ctext: (out) (array length=length): location to store newly + * allocated data for the property + * @length: the length of @ctext, in bytes * * Convert a string from the encoding of the current * locale into a form suitable for storing in a window property. @@ -696,9 +697,9 @@ _gdk_x11_display_utf8_to_string_target (GdkDisplay *display, * gdk_x11_display_utf8_to_compound_text: * @display: a #GdkDisplay * @str: a UTF-8 string - * @encoding: location to store resulting encoding - * @format: location to store format of the result - * @ctext: location to store the data of the result + * @encoding: (out): location to store resulting encoding + * @format: (out): location to store format of the result + * @ctext: (out) (array length=length): location to store the data of the result * @length: location to store the length of the data * stored in @ctext * |