diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/developers.txt | 16 | ||||
| -rw-r--r-- | docs/dnd_internals.txt | 8 | ||||
| -rw-r--r-- | docs/reference/gdk/gdk4-sections.txt | 386 | ||||
| -rw-r--r-- | docs/reference/gdk/gdk4.types | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/drawing-model.xml | 26 | ||||
| -rw-r--r-- | docs/reference/gtk/glossary.xml | 16 | ||||
| -rw-r--r-- | docs/reference/gtk/input-handling.xml | 16 | ||||
| -rw-r--r-- | docs/reference/gtk/migrating-3to4.xml | 22 | ||||
| -rw-r--r-- | docs/reference/gtk/question_index.sgml | 4 | ||||
| -rw-r--r-- | docs/tools/shooter.c | 8 | ||||
| -rw-r--r-- | docs/widget_system.txt | 18 |
11 files changed, 261 insertions, 261 deletions
diff --git a/docs/developers.txt b/docs/developers.txt index 66e1d9309b..9e242e681c 100644 --- a/docs/developers.txt +++ b/docs/developers.txt @@ -26,13 +26,13 @@ Refer to the file widget_system.txt which covers widget flags and the resulting invariants in a detailed way. -GdkWindow pointers may be NULL in GdkEvents +GdkSurface pointers may be NULL in GdkEvents ------------------------------------------- The notification nature of the signal mechanism might cause events to -be emitted that have their GdkWindow pointer set to NULL. +be emitted that have their GdkSurface pointer set to NULL. This is due to the fact that certain events need to be emitted after the -real GdkWindow of a widget is not any longer pertinent. +real GdkSurface of a widget is not any longer pertinent. It's up to the signal handling function (application) to check for the window field of the event structure to be != NULL, if it is going to perform any operations through Gdk calls on it. @@ -51,10 +51,10 @@ GDK_EXPOSE GtkWidget::expose_event Writing Gdk functions --------------------- -When writing Gdk functions that operate on GdkWindow structures in any -meaningful sense, that is casting to a GdkWindowPrivate structure for -access to fields other then GdkWindow.user_data, the programmer is -recommended to check for the GdkWindowPrivate.destroyed field to be == -FALSE, especially if the GdkWindowPrivate.xwindow field is used. +When writing Gdk functions that operate on GdkSurface structures in any +meaningful sense, that is casting to a GdkSurfacePrivate structure for +access to fields other then GdkSurface.user_data, the programmer is +recommended to check for the GdkSurfacePrivate.destroyed field to be == +FALSE, especially if the GdkSurfacePrivate.xwindow field is used. Silent abortion of the Gdk function is the correct behaviour if this condition isn't met. diff --git a/docs/dnd_internals.txt b/docs/dnd_internals.txt index fc5afcecc0..4e8929f87a 100644 --- a/docs/dnd_internals.txt +++ b/docs/dnd_internals.txt @@ -81,19 +81,19 @@ GdkAtom gdk_drag_get_selection (GdkDragContext *context); /* Source side */ -GdkDragContext * gdk_drag_begin (GdkWindow *window, +GdkDragContext * gdk_drag_begin (GdkSurface *window, GList *targets, GdkDragAction actions); gboolean gdk_drag_get_protocol (guint32 xid, GdkDragProtocol *protocol); void gdk_drag_find_window (GdkDragContext *context, - GdkWindow *drag_window, + GdkSurface *drag_window, gint x_root, gint y_root, - GdkWindow **dest_window, + GdkSurface **dest_window, GdkDragProtocol *protocol); gboolean gdk_drag_motion (GdkDragContext *context, - GdkWindow *dest_window, + GdkSurface *dest_window, GdkDragProtocol protocol, gint x_root, gint y_root, diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index c63a170560..215350d448 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -47,12 +47,12 @@ gdk_scroll_direction_get_type gdk_setting_action_get_type gdk_status_get_type gdk_visibility_state_get_type -gdk_window_attributes_type_get_type -gdk_window_edge_get_type -gdk_window_hints_get_type -gdk_window_state_get_type -gdk_window_type_get_type -gdk_window_type_hint_get_type +gdk_surface_attributes_type_get_type +gdk_surface_edge_get_type +gdk_surface_hints_get_type +gdk_surface_state_get_type +gdk_surface_type_get_type +gdk_surface_type_hint_get_type gdk_wm_decoration_get_type gdk_wm_function_get_type GDK_AVAILABLE_IN_4_0 @@ -169,186 +169,186 @@ gdk_rgba_get_type <SECTION> <TITLE>Windows</TITLE> <FILE>windows</FILE> -GdkWindow -GdkWindowType -GdkWindowClass -GdkWindowHints +GdkSurface +GdkSurfaceType +GdkSurfaceClass +GdkSurfaceHints GdkGeometry GdkGravity GdkAnchorHints -GdkWindowEdge -GdkWindowTypeHint -GdkWindowState -gdk_window_new_toplevel -gdk_window_new_popup -gdk_window_new_temp -gdk_window_new_child -gdk_window_destroy -gdk_window_get_window_type -gdk_window_get_display -gdk_window_show -gdk_window_show_unraised -gdk_window_hide -gdk_window_is_destroyed -gdk_window_is_visible -gdk_window_is_viewable -gdk_window_is_input_only -gdk_window_is_shaped -gdk_window_get_state -gdk_window_withdraw -gdk_window_iconify -gdk_window_deiconify -gdk_window_stick -gdk_window_unstick -gdk_window_maximize -gdk_window_unmaximize -gdk_window_fullscreen -gdk_window_fullscreen_on_monitor -gdk_window_unfullscreen +GdkSurfaceEdge +GdkSurfaceTypeHint +GdkSurfaceState +gdk_surface_new_toplevel +gdk_surface_new_popup +gdk_surface_new_temp +gdk_surface_new_child +gdk_surface_destroy +gdk_surface_get_window_type +gdk_surface_get_display +gdk_surface_show +gdk_surface_show_unraised +gdk_surface_hide +gdk_surface_is_destroyed +gdk_surface_is_visible +gdk_surface_is_viewable +gdk_surface_is_input_only +gdk_surface_is_shaped +gdk_surface_get_state +gdk_surface_withdraw +gdk_surface_iconify +gdk_surface_deiconify +gdk_surface_stick +gdk_surface_unstick +gdk_surface_maximize +gdk_surface_unmaximize +gdk_surface_fullscreen +gdk_surface_fullscreen_on_monitor +gdk_surface_unfullscreen GdkFullscreenMode -gdk_window_get_fullscreen_mode -gdk_window_set_fullscreen_mode -gdk_window_set_keep_above -gdk_window_set_keep_below -gdk_window_set_opacity -gdk_window_set_pass_through -gdk_window_get_pass_through -gdk_window_move -gdk_window_resize -gdk_window_move_resize -gdk_window_scroll -gdk_window_move_region -gdk_window_has_native -gdk_window_raise -gdk_window_lower -gdk_window_restack -gdk_window_focus -gdk_window_register_dnd -gdk_window_begin_resize_drag -gdk_window_begin_resize_drag_for_device -gdk_window_begin_move_drag -gdk_window_begin_move_drag_for_device -gdk_window_show_window_menu -gdk_window_constrain_size -gdk_window_beep -gdk_window_get_scale_factor -gdk_window_set_opaque_region -gdk_window_create_gl_context -gdk_window_create_vulkan_context +gdk_surface_get_fullscreen_mode +gdk_surface_set_fullscreen_mode +gdk_surface_set_keep_above +gdk_surface_set_keep_below +gdk_surface_set_opacity +gdk_surface_set_pass_through +gdk_surface_get_pass_through +gdk_surface_move +gdk_surface_resize +gdk_surface_move_resize +gdk_surface_scroll +gdk_surface_move_region +gdk_surface_has_native +gdk_surface_raise +gdk_surface_lower +gdk_surface_restack +gdk_surface_focus +gdk_surface_register_dnd +gdk_surface_begin_resize_drag +gdk_surface_begin_resize_drag_for_device +gdk_surface_begin_move_drag +gdk_surface_begin_move_drag_for_device +gdk_surface_show_window_menu +gdk_surface_constrain_size +gdk_surface_beep +gdk_surface_get_scale_factor +gdk_surface_set_opaque_region +gdk_surface_create_gl_context +gdk_surface_create_vulkan_context <SUBSECTION> -gdk_window_get_clip_region -gdk_window_begin_draw_frame -gdk_window_end_draw_frame -gdk_window_get_visible_region +gdk_surface_get_clip_region +gdk_surface_begin_draw_frame +gdk_surface_end_draw_frame +gdk_surface_get_visible_region <SUBSECTION> -gdk_window_invalidate_rect -gdk_window_invalidate_region -GdkWindowChildFunc -gdk_window_invalidate_maybe_recurse -gdk_window_get_update_area -gdk_window_freeze_updates -gdk_window_thaw_updates -gdk_window_get_frame_clock +gdk_surface_invalidate_rect +gdk_surface_invalidate_region +GdkSurfaceChildFunc +gdk_surface_invalidate_maybe_recurse +gdk_surface_get_update_area +gdk_surface_freeze_updates +gdk_surface_thaw_updates +gdk_surface_get_frame_clock <SUBSECTION> -gdk_window_set_user_data -gdk_window_set_accept_focus -gdk_window_get_accept_focus -gdk_window_set_focus_on_map -gdk_window_get_focus_on_map -gdk_window_shape_combine_region -gdk_window_set_child_shapes -gdk_window_merge_child_shapes -gdk_window_input_shape_combine_region -gdk_window_set_child_input_shapes -gdk_window_merge_child_input_shapes -gdk_window_set_title +gdk_surface_set_user_data +gdk_surface_set_accept_focus +gdk_surface_get_accept_focus +gdk_surface_set_focus_on_map +gdk_surface_get_focus_on_map +gdk_surface_shape_combine_region +gdk_surface_set_child_shapes +gdk_surface_merge_child_shapes +gdk_surface_input_shape_combine_region +gdk_surface_set_child_input_shapes +gdk_surface_merge_child_input_shapes +gdk_surface_set_title GDK_PARENT_RELATIVE -gdk_window_set_cursor -gdk_window_get_cursor -gdk_window_get_user_data -gdk_window_get_geometry -gdk_window_set_geometry_hints -gdk_window_get_width -gdk_window_get_height -gdk_window_set_icon_list -gdk_window_set_modal_hint -gdk_window_get_modal_hint -gdk_window_set_type_hint -gdk_window_get_type_hint -gdk_window_set_shadow_width -gdk_window_set_skip_taskbar_hint -gdk_window_set_skip_pager_hint -gdk_window_set_urgency_hint -gdk_window_get_position -gdk_window_get_root_origin -gdk_window_get_frame_extents -gdk_window_get_origin -gdk_window_get_root_coords -gdk_window_get_device_position -gdk_window_get_device_position_double +gdk_surface_set_cursor +gdk_surface_get_cursor +gdk_surface_get_user_data +gdk_surface_get_geometry +gdk_surface_set_geometry_hints +gdk_surface_get_width +gdk_surface_get_height +gdk_surface_set_icon_list +gdk_surface_set_modal_hint +gdk_surface_get_modal_hint +gdk_surface_set_type_hint +gdk_surface_get_type_hint +gdk_surface_set_shadow_width +gdk_surface_set_skip_taskbar_hint +gdk_surface_set_skip_pager_hint +gdk_surface_set_urgency_hint +gdk_surface_get_position +gdk_surface_get_root_origin +gdk_surface_get_frame_extents +gdk_surface_get_origin +gdk_surface_get_root_coords +gdk_surface_get_device_position +gdk_surface_get_device_position_double GdkModifierType GdkModifierIntent -gdk_window_get_parent -gdk_window_get_toplevel -gdk_window_get_children -gdk_window_get_children_with_user_data -gdk_window_peek_children -gdk_window_get_events -gdk_window_set_events -gdk_window_set_icon_name -gdk_window_set_transient_for -gdk_window_set_role -gdk_window_set_startup_id -gdk_window_set_group -gdk_window_get_group -gdk_window_set_decorations -gdk_window_get_decorations +gdk_surface_get_parent +gdk_surface_get_toplevel +gdk_surface_get_children +gdk_surface_get_children_with_user_data +gdk_surface_peek_children +gdk_surface_get_events +gdk_surface_set_events +gdk_surface_set_icon_name +gdk_surface_set_transient_for +gdk_surface_set_role +gdk_surface_set_startup_id +gdk_surface_set_group +gdk_surface_get_group +gdk_surface_set_decorations +gdk_surface_get_decorations GdkWMDecoration -gdk_window_set_functions +gdk_surface_set_functions GdkWMFunction <SUBSECTION> -gdk_window_get_support_multidevice -gdk_window_set_support_multidevice -gdk_window_get_device_cursor -gdk_window_set_device_cursor -gdk_window_get_device_events -gdk_window_set_device_events +gdk_surface_get_support_multidevice +gdk_surface_set_support_multidevice +gdk_surface_get_device_cursor +gdk_surface_set_device_cursor +gdk_surface_get_device_events +gdk_surface_set_device_events <SUBSECTION> -gdk_window_coords_from_parent -gdk_window_coords_to_parent +gdk_surface_coords_from_parent +gdk_surface_coords_to_parent <SUBSECTION Standard> -GDK_WINDOW -GDK_WINDOW_GET_CLASS -GDK_TYPE_WINDOW -GDK_IS_WINDOW -GDK_WINDOW_CLASS -GDK_IS_WINDOW_CLASS +GDK_SURFACE +GDK_SURFACE_GET_CLASS +GDK_TYPE_SURFACE +GDK_IS_SURFACE +GDK_SURFACE_CLASS +GDK_IS_SURFACE_CLASS GDK_TYPE_FILTER_RETURN GDK_TYPE_GRAVITY GDK_TYPE_MODIFIER_TYPE -GDK_TYPE_WINDOW_ATTRIBUTES_TYPE -GDK_TYPE_WINDOW_EDGE -GDK_TYPE_WINDOW_HINTS -GDK_TYPE_WINDOW_TYPE -GDK_TYPE_WINDOW_TYPE_HINT +GDK_TYPE_SURFACE_ATTRIBUTES_TYPE +GDK_TYPE_SURFACE_EDGE +GDK_TYPE_SURFACE_HINTS +GDK_TYPE_SURFACE_TYPE +GDK_TYPE_SURFACE_TYPE_HINT GDK_TYPE_WM_DECORATION GDK_TYPE_WM_FUNCTION -GDK_TYPE_WINDOW_STATE +GDK_TYPE_SURFACE_STATE <SUBSECTION Private> -gdk_window_get_type -gdk_window_window_class_get_type -GdkWindowClass -GdkWindowImpl -GdkWindowImplClass -GdkWindowRedirect -gdk_window_impl_get_type +gdk_surface_get_type +gdk_surface_window_class_get_type +GdkSurfaceClass +GdkSurfaceImpl +GdkSurfaceImplClass +GdkSurfaceRedirect +gdk_surface_impl_get_type gdk_fullscreen_mode_get_type </SECTION> @@ -417,8 +417,8 @@ gdk_pango_layout_line_get_clip_region <SECTION> <TITLE>Cairo Interaction</TITLE> <FILE>cairo_interaction</FILE> -gdk_window_create_similar_surface -gdk_window_create_similar_image_surface +gdk_surface_create_similar_surface +gdk_surface_create_similar_image_surface gdk_cairo_get_clip_rectangle gdk_cairo_get_drawing_context gdk_cairo_set_source_rgba @@ -828,7 +828,7 @@ gdk_drag_context_get_type <INCLUDE>gdk/gdkx.h</INCLUDE> <TITLE>X Window System Interaction</TITLE> <FILE>x_interaction</FILE> -GDK_WINDOW_XID +GDK_SURFACE_XID GDK_DISPLAY_XDISPLAY GDK_POINTER_TO_XID GDK_XID_TO_POINTER @@ -864,16 +864,16 @@ gdk_x11_screen_lookup_visual gdk_x11_screen_supports_net_wm_hint gdk_x11_screen_get_number_of_desktops gdk_x11_screen_get_current_desktop -gdk_x11_window_foreign_new_for_display -gdk_x11_window_lookup_for_display -gdk_x11_window_get_xid -gdk_x11_window_set_theme_variant -gdk_x11_window_set_user_time -gdk_x11_window_move_to_current_desktop -gdk_x11_window_move_to_desktop -gdk_x11_window_get_desktop -gdk_x11_window_set_utf8_property -gdk_x11_window_set_frame_sync_enabled +gdk_x11_surface_foreign_new_for_display +gdk_x11_surface_lookup_for_display +gdk_x11_surface_get_xid +gdk_x11_surface_set_theme_variant +gdk_x11_surface_set_user_time +gdk_x11_surface_move_to_current_desktop +gdk_x11_surface_move_to_desktop +gdk_x11_surface_get_desktop +gdk_x11_surface_set_utf8_property +gdk_x11_surface_set_frame_sync_enabled gdk_x11_keymap_get_group_for_state gdk_x11_keymap_key_is_modifier gdk_x11_visual_get_xvisual @@ -966,12 +966,12 @@ GDK_X11_VISUAL_CLASS GDK_IS_X11_VISUAL GDK_IS_X11_VISUAL_CLASS GDK_X11_VISUAL_GET_CLASS -GDK_TYPE_X11_WINDOW -GDK_X11_WINDOW -GDK_X11_WINDOW_CLASS -GDK_IS_X11_WINDOW -GDK_IS_X11_WINDOW_CLASS -GDK_X11_WINDOW_GET_CLASS +GDK_TYPE_X11_SURFACE +GDK_X11_SURFACE +GDK_X11_SURFACE_CLASS +GDK_IS_X11_SURFACE +GDK_IS_X11_SURFACE_CLASS +GDK_X11_SURFACE_GET_CLASS <SUBSECTION Private> gdk_x11_app_launch_context_get_type @@ -988,8 +988,8 @@ gdk_x11_drag_context_get_type gdk_x11_keymap_get_type gdk_x11_screen_get_type gdk_x11_visual_get_type -gdk_x11_window_get_type -gdk_window_impl_x11_get_type +gdk_x11_surface_get_type +gdk_surface_impl_x11_get_type </SECTION> <SECTION> @@ -1003,13 +1003,13 @@ gdk_wayland_device_get_wl_seat gdk_wayland_display_get_wl_compositor gdk_wayland_display_get_wl_display gdk_wayland_display_query_registry -gdk_wayland_window_new_subsurface -gdk_wayland_window_get_wl_surface -gdk_wayland_window_set_use_custom_surface -GdkWaylandWindowExported -gdk_wayland_window_export_handle -gdk_wayland_window_unexport_handle -gdk_wayland_window_set_transient_for_exported +gdk_wayland_surface_new_subsurface +gdk_wayland_surface_get_wl_surface +gdk_wayland_surface_set_use_custom_surface +GdkWaylandSurfaceExported +gdk_wayland_surface_export_handle +gdk_wayland_surface_unexport_handle +gdk_wayland_surface_set_transient_for_exported <SUBSECTION Standard> GDK_TYPE_WAYLAND_DEVICE @@ -1030,18 +1030,18 @@ GDK_WAYLAND_DISPLAY_MANAGER_CLASS GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS GDK_IS_WAYLAND_DISPLAY_MANAGER GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS -GDK_TYPE_WAYLAND_WINDOW -GDK_WAYLAND_WINDOW -GDK_WAYLAND_WINDOW_CLASS -GDK_WAYLAND_WINDOW_GET_CLASS -GDK_IS_WAYLAND_WINDOW -GDK_IS_WAYLAND_WINDOW_CLASS +GDK_TYPE_WAYLAND_SURFACE +GDK_WAYLAND_SURFACE +GDK_WAYLAND_SURFACE_CLASS +GDK_WAYLAND_SURFACE_GET_CLASS +GDK_IS_WAYLAND_SURFACE +GDK_IS_WAYLAND_SURFACE_CLASS <SUBSECTION Private> gdk_wayland_device_get_type gdk_wayland_display_get_type gdk_wayland_display_manager_get_type -gdk_wayland_window_get_type +gdk_wayland_surface_get_type </SECTION> diff --git a/docs/reference/gdk/gdk4.types b/docs/reference/gdk/gdk4.types index 4367e448ba..1aba9be875 100644 --- a/docs/reference/gdk/gdk4.types +++ b/docs/reference/gdk/gdk4.types @@ -11,7 +11,7 @@ gdk_gl_context_get_type gdk_keymap_get_type gdk_monitor_get_type gdk_seat_get_type -gdk_window_get_type +gdk_surface_get_type gdk_content_serializer_get_type gdk_content_deserializer_get_type gdk_clipboard_get_type diff --git a/docs/reference/gtk/drawing-model.xml b/docs/reference/gtk/drawing-model.xml index a608e75a09..c19fffc2b6 100644 --- a/docs/reference/gtk/drawing-model.xml +++ b/docs/reference/gtk/drawing-model.xml @@ -90,7 +90,7 @@ <link linkend="GdkEvent"><structname>GdkEvent</structname></link> structures and sends them on to the GTK layer. In turn, the GTK layer finds the widget that corresponds to a particular - <classname>GdkWindow</classname> and emits the corresponding event + <classname>GdkSurface</classname> and emits the corresponding event signals on that widget. </para> @@ -207,17 +207,17 @@ <para> Normally, there is only a single cairo context which is used in - the entire repaint, rather than one per GdkWindow. This means you + the entire repaint, rather than one per GdkSurface. This means you have to respect (and not reset) existing clip and transformations set on it. </para> <para> - Most widgets, including those that create their own GdkWindows have + Most widgets, including those that create their own GdkSurfaces have a transparent background, so they draw on top of whatever widgets are below them. This was not the case in GTK+ 2 where the theme set the background of most widgets to the default background color. (In - fact, transparent GdkWindows used to be impossible.) + fact, transparent GdkSurfaces used to be impossible.) </para> <para> @@ -263,10 +263,10 @@ <para> Two basic functions in GDK form the core of the double-buffering mechanism: <link - linkend="gdk_window_begin_paint_region"><function>gdk_window_begin_paint_region()</function></link> + linkend="gdk_surface_begin_paint_region"><function>gdk_surface_begin_paint_region()</function></link> and <link - linkend="gdk_window_end_paint"><function>gdk_window_end_paint()</function></link>. - The first function tells a <classname>GdkWindow</classname> to + linkend="gdk_surface_end_paint"><function>gdk_surface_end_paint()</function></link>. + The first function tells a <classname>GdkSurface</classname> to create a temporary off-screen buffer for drawing. All subsequent drawing operations to this window get automatically redirected to that buffer. The second function actually paints @@ -278,16 +278,16 @@ <para> It would be inconvenient for all widgets to call - <function>gdk_window_begin_paint_region()</function> and - <function>gdk_window_end_paint()</function> at the beginning + <function>gdk_surface_begin_paint_region()</function> and + <function>gdk_surface_end_paint()</function> at the beginning and end of their draw handlers. </para> <para> To make this easier, GTK+ normally calls - <function>gdk_window_begin_paint_region()</function> + <function>gdk_surface_begin_paint_region()</function> before emitting the #GtkWidget::draw signal, and - then it calls <function>gdk_window_end_paint()</function> + then it calls <function>gdk_surface_end_paint()</function> after the signal has been emitted. This is convenient for most widgets, as they do not need to worry about creating their own temporary drawing buffers or about calling those @@ -335,8 +335,8 @@ my_widget_init (MyWidget *widget) <para> Even if you turn off double buffering on a widget, you can still call - <function>gdk_window_begin_paint_region()</function> and - <function>gdk_window_end_paint()</function> by hand to use + <function>gdk_surface_begin_paint_region()</function> and + <function>gdk_surface_end_paint()</function> by hand to use temporary drawing buffers. </para> </refsect2> diff --git a/docs/reference/gtk/glossary.xml b/docs/reference/gtk/glossary.xml index 7c7488424e..b6ae350581 100644 --- a/docs/reference/gtk/glossary.xml +++ b/docs/reference/gtk/glossary.xml @@ -137,7 +137,7 @@ <para> This is the step in a <glossterm linkend="widget">widget's</glossterm> life cycle where it - actually shows the GdkWindows it created when it was + actually shows the GdkSurfaces it created when it was <glossterm linkend="realization">realized</glossterm>. When a widget is mapped, it must turn on its %GTK_MAPPED <link linkend="GtkWidgetFlags">flag</link>. @@ -146,7 +146,7 @@ <para> Note that due to the asynchronous nature of the X window system, a widget's window may not appear on the screen - immediatly after one calls gdk_window_show(): + immediatly after one calls gdk_surface_show(): you must wait for the corresponding map <glossterm linkend="event">event</glossterm> to be received. You can do this with the <link @@ -193,7 +193,7 @@ <glossterm>no-window widget</glossterm> <glossdef> <para> - A widget that does not have a GdkWindow of its own on which to + A widget that does not have a GdkSurface of its own on which to draw its contents, but rather shares its <glossterm linkend="parent">parent's</glossterm>. This can be tested with the gtk_widget_get_has_window() function. @@ -218,20 +218,20 @@ <para> This is the step in a <glossterm linkend="widget">widget's</glossterm> life cycle where it - creates its own GdkWindow, or otherwise associates itself with + creates its own GdkSurface, or otherwise associates itself with its <glossterm linkend="parent">parent's</glossterm> - GdkWindow. If the widget has its own window, then it must + GdkSurface. If the widget has its own window, then it must also attach a <glossterm linkend="style">style</glossterm> to it. A widget becomes unrealized by destroying its associated - GdkWindow. When a widget is realized, it must turn on its + GdkSurface. When a widget is realized, it must turn on its %GTK_REALIZED <link linkend="GtkWidgetFlags">flag</link>. </para> <para> - Widgets that don't own the GdkWindow on which they draw are + Widgets that don't own the GdkSurface on which they draw are called <glossterm linkend="no-window">no-window widgets</glossterm>. This can be tested with the gtk_widget_get_has_window() function. Normally, - these widgets draw on their parent's GdkWindow. + these widgets draw on their parent's GdkSurface. </para> <para> diff --git a/docs/reference/gtk/input-handling.xml b/docs/reference/gtk/input-handling.xml index f8e653a1f4..dec479626e 100644 --- a/docs/reference/gtk/input-handling.xml +++ b/docs/reference/gtk/input-handling.xml @@ -91,7 +91,7 @@ <title>Event propagation</title> <para> - For widgets which have a #GdkWindow set, events are received from the + For widgets which have a #GdkSurface set, events are received from the windowing system and passed to gtk_main_do_event(). See its documentation for details of what it does: compression of enter/leave events, identification of the widget receiving the event, pushing the event onto a @@ -101,11 +101,11 @@ <para> When a GDK backend produces an input event, it is tied to a #GdkDevice and - a #GdkWindow, which in turn represents a windowing system surface in the + a #GdkSurface, which in turn represents a windowing system surface in the backend. If a widget has grabbed the current input device, or all input devices, the event is propagated to that #GtkWidget. Otherwise, it is propagated to the the #GtkWidget which called gtk_widget_register_window() - on the #GdkWindow receiving the event. + on the #GdkSurface receiving the event. </para> <para> @@ -113,7 +113,7 @@ specific input device (gtk_device_grab_add()), is sent events in preference to a global grab (gtk_grab_add()). Input grabs only have effect within the #GtkWindowGroup containing the #GtkWidget which registered the - event’s #GdkWindow. If this #GtkWidget is a child of the grab widget, the + event’s #GdkSurface. If this #GtkWidget is a child of the grab widget, the event is propagated to the child — this is the basis for propagating events within modal dialogs. </para> @@ -186,15 +186,15 @@ Each widget instance has a basic event mask and another per input device, which determine the types of input event it receives. Each event mask set on a widget is added to the corresponding (basic or per-device) event mask - for the widget’s #GdkWindow, and all child #GdkWindows. + for the widget’s #GdkSurface, and all child #GdkSurfaces. </para> <para> - Filtering events against event masks happens inside #GdkWindow, which + Filtering events against event masks happens inside #GdkSurface, which exposes event masks to the windowing system to reduce the number of events GDK receives from it. On receiving an event, it is filtered against the - #GdkWindow’s mask for the input device, if set. Otherwise, it is filtered - against the #GdkWindow’s basic event mask. + #GdkSurface’s mask for the input device, if set. Otherwise, it is filtered + against the #GdkSurface’s basic event mask. </para> <para> diff --git a/docs/reference/gtk/migrating-3to4.xml b/docs/reference/gtk/migrating-3to4.xml index a162b5e5f0..4d27d27cbe 100644 --- a/docs/reference/gtk/migrating-3to4.xml +++ b/docs/reference/gtk/migrating-3to4.xml @@ -79,13 +79,13 @@ <title>Review your window creation flags</title> <para> GTK+ 4 removes the GDK_WA_CURSOR flag. Instead, just use - gdk_window_set_cursor() to set a cursor on the window after + gdk_surface_set_cursor() to set a cursor on the window after creating it. </para> <para> GTK+ 4 also removes the GDK_WA_VISUAL flag, and always uses an RGBA visual for windows. To prepare your code for this, - use gdk_window_set_visual (gdk_screen_get_rgba_visual ()) after + use gdk_surface_set_visual (gdk_screen_get_rgba_visual ()) after creating your window. </para> <para> @@ -194,7 +194,7 @@ <title>Stop using the root window</title> <para> The root window is an X11-centric concept that is no longer exposed in the - backend-neutral GDK API. gdk_window_get_parent() will return %NULL for toplevel + backend-neutral GDK API. gdk_surface_get_parent() will return %NULL for toplevel windows. If you need to interact with the X11 root window, you can use gdk_x11_display_get_xrootwindow() to get its XID. </para> @@ -217,12 +217,12 @@ </section> <section> - <title>Adapt to GdkWindow API changes</title> + <title>Adapt to GdkSurface API changes</title> <para> - The gdk_window_new() function has been replaced by a number of more - specialized constructors: gdk_window_new_toplevel(), gdk_window_new_popup(), - gdk_window_new_temp(), gdk_window_new_child(), gdk_window_new_input(), - gdk_wayland_window_new_subsurface(). Use the appropriate ones to create + The gdk_surface_new() function has been replaced by a number of more + specialized constructors: gdk_surface_new_toplevel(), gdk_surface_new_popup(), + gdk_surface_new_temp(), gdk_surface_new_child(), gdk_surface_new_input(), + gdk_wayland_surface_new_subsurface(). Use the appropriate ones to create your windows. </para> <para> @@ -230,7 +230,7 @@ complicating the code and could not be supported across backends. </para> <para> - gdk_window_reparent() is no longer available. + gdk_surface_reparent() is no longer available. </para> </section> @@ -244,7 +244,7 @@ </section> <section> - <title>Stop using gdk_window_set_event_compression</title> + <title>Stop using gdk_surface_set_event_compression</title> <para> Event compression is now always enabled. If you need to see the uncoalesced motion history, use gdk_event_get_motion_history(). @@ -367,7 +367,7 @@ </section> <section> - <title>Stop using APIs to query GdkWindows</title> + <title>Stop using APIs to query GdkSurfaces</title> <para> A number of APIs for querying special-purpose windows have been removed, since these windows are no longer publically available: diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml index 4f1bf02e2d..28a470dd1c 100644 --- a/docs/reference/gtk/question_index.sgml +++ b/docs/reference/gtk/question_index.sgml @@ -391,14 +391,14 @@ This comes up when using bitfields; in C you can write the following code: <informalexample> <programlisting> - gdk_window_set_events (gdk_window, + gdk_surface_set_events (gdk_surface, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); </programlisting> </informalexample> while in C++ you must write: <informalexample> <programlisting> - gdk_window_set_events (gdk_window, + gdk_surface_set_events (gdk_surface, (GdkEventMask) GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); </programlisting> </informalexample> diff --git a/docs/tools/shooter.c b/docs/tools/shooter.c index d61eb394c8..4e8e02f863 100644 --- a/docs/tools/shooter.c +++ b/docs/tools/shooter.c @@ -211,20 +211,20 @@ static GList *toplevels; static guint shot_id; static gboolean -window_is_csd (GdkWindow *window) +window_is_csd (GdkSurface *window) { gboolean set; GdkWMDecoration decorations = 0; /* FIXME: is this accurate? */ - set = gdk_window_get_decorations (window, &decorations); + set = gdk_surface_get_decorations (window, &decorations); return (set && (decorations == 0)); } static gboolean shoot_one (WidgetInfo *info) { - GdkWindow *window; + GdkSurface *window; XID id; GdkPixbuf *screenshot = NULL; DecorationType decor = DECOR_FRAME; @@ -236,7 +236,7 @@ shoot_one (WidgetInfo *info) } window = gtk_widget_get_window (info->window); - id = gdk_x11_window_get_xid (window); + id = gdk_x11_surface_get_xid (window); if (window_is_csd (window)) decor = (info->include_decorations) ? DECOR_NONE : DECOR_WINDOW_FRAME; screenshot = take_window_shot (id, decor); diff --git a/docs/widget_system.txt b/docs/widget_system.txt index 9463f10db9..04f80834e3 100644 --- a/docs/widget_system.txt +++ b/docs/widget_system.txt @@ -62,23 +62,23 @@ GtkWidget, public flags: GTK_TOPLEVEL: Widgets without a real parent, as there are GtkWindows and GtkMenus have this flag set throughout their lifetime. - Toplevel widgets always contain their own GdkWindow. + Toplevel widgets always contain their own GdkSurface. GTK_NO_WINDOW: This flag is indicative for a widget that does not provide - its own GdkWindow. Visible action (e.g. drawing) is performed - on the parent's GdkWindow. + its own GdkSurface. Visible action (e.g. drawing) is performed + on the parent's GdkSurface. GTK_REALIZED: Set by gtk_widget_realize, unset by gtk_widget_unrealize. Relies on ((widget->parent && widget->parent->window) || GTK_WIDGET_TOPLEVEL (widget)); - Means: widget has an associated GdkWindow (XWindow). + Means: widget has an associated GdkSurface (XWindow). GTK_MAPPED: Set by gtk_widget_map, unset by gtk_widget_unmap. May only be set if GTK_WIDGET_REALIZED (widget). - Means: gdk_window_show() has been called on the widgets window(s). + Means: gdk_surface_show() has been called on the widgets window(s). GTK_VISIBLE: Set by gtk_widget_show. @@ -382,7 +382,7 @@ The Map signal -------------- 1) Set the MAPPED flag - 2) If the widget has any windows, gdk_window_show those windows + 2) If the widget has any windows, gdk_surface_show those windows 3) call gtk_widget_map for all child widgets that are VISIBLE, CHILD_VISIBLE and !MAPPED. (A widget will only be !CHILD_VISIBLE if the container set it that way, so @@ -395,7 +395,7 @@ The Unmap signal When a widget receives the unmap signal, it must: - 1) If the widget has a window, gdk_window_hide that window, + 1) If the widget has a window, gdk_surface_hide that window, 2) If the widget does not have a window, unmap all child widgets 3) Do any other functions related to taking the widget offscreen (for instance, removing popup windows...) @@ -409,8 +409,8 @@ When a widget receives the unrealize signal, it must 1) For any windows other than widget->window do: - gdk_window_set_user_data (window, NULL); - gdk_window_destroy (window); + gdk_surface_set_user_data (window, NULL); + gdk_surface_destroy (window); 2) Call the parent's unrealize handler |