Per-glyph instance for color text as well

Doesn't quite work yet

NEWS

@@ -1,332 +1,3 @@
-Overview of Changes in GTK+ 3.93.0
-==================================
-
-Major changes:
-
-* GdkScreen has been removed. All screen-related APIs have equivalents
-  in GdkDisplay. This affects APIs in both GDK and GTK, for example,
-  the GtkWidget::screen-changed signal has been replaced by a new
-  ::display-changed signal. As part of this change, there is no longer
-  a GdkWindow representing the root window. The X11 backend has APIs
-  to get X screens and root windows.
-
-* GdkVisual has been removed.
-
-* GdkDeviceManager has been replaced by GdkSeat. 
-
-* Clipboard handling has been moved from GTK to GDK, and has been
-  modernized to provide an extensible, asynchronous, stream-based API.
-  This affects APIs in both GDK and GTK. GdkSelection has been replaced
-  by GdkContentFormats, GdkContentProvider, GdkContentSerializer and
-  GdkContentDeserializer. Selection-related events and APIs have
-  been removed.
-  This conversion is complete for copy-paste, the drag-and-drop APIs
-  are still in flux.
-
-* The GdkCursor API has been modernized. We no longer have the
-  GdkCursorType enumeration. Instead, can be created from names
-  or from GdkTextures. In GTK, we now have gtk_widget_set_cursor().
-
-* Settings and window-state changes have been converted from events
-  to signals on GdkDisplay and GdkWindow, respectively.
-
-* GdkEvent has been converted to an opaque GObject.
-
-* The GL renderer in GSK has been substantially completed, and is now
-  on par with the Vulkan renderer.
-
-* The use of GdkPixbuf in APIs has been reduced, and the GskTexture
-  object has been moved to GDK as GdkTexture, to take its place. This
-  change affects both GDK and GTK, for example the GtkAboutDialog::logo
-  property now accepts a GdkTexture. As part of these changes,
-  support for GdkPixbufAnimation has been dropped.
-
-* The handling of icon sizes has been changed. The GtkIconSize
-  enumeration allows selection normal or large icons now, and the
-  actual icon size is determined by the theme, using the -gtk-icon-size
-  CSS property. Among other things, this allows animating icon size changes.
-
-Smaller changes:
-
-* Build system:
- - Meson can now be used to build GTK+ on Windows
- - We install print backends again
- - libepoxy 1.4 is required
- - libcloudproviders 0.2.5 is required
-
-* GDK:
- - gdk_keymap_get_for_display has been renamed to gdk_display_get_keymap
- - We are no longer reading the GDK_DPI_SCALE environment variable
- - The GdkX11Display::xevent signal has been added (to eventually replace event filters)
- - gdk_pango_context_get_for_screen and gdk_pango_context_get have been dropped
- - Default-display wrappers like gdk_set_double_click_time, gdk_beep, gdk_flush or
-   gdk_notify_startup_complete have been dropped
- - gdk_display_set_program_class has been moved to the X11 backend
- - The gdk_error_trap_push/pop APIs have been dropped, the X11 backend still has them
-
-* Wayland:
- - The Wayland backend now implements the KDE server-side decoration protocol
-
-* Broadway:
- - Broadway has been ported to GSK
- - Only Unix domain sockets are supported now (we are passing fds to upload textures)
-
-* GSK:
- - We use cached textures for icons now
- - We also use cached textures for symbolic icons, and recolor using a shader
- - The glyph cache supports hi-dpi
- - Some render node APIs have been tweaked: cairo, text, transform nodes
- - GskRenderer::scale-factor and GskRenderer::viewport have been dropped
- - gsk_render_node_set_scaling_filters has been dropped
-
-* GTK:
- - A new event controller, GtkEventControllerMotion, is intended to replace
-   most remaining uses of ::motion-notify-event
- - New APIS: gtk_widget_contains and gtk_widget_pick
- - gtk_widget_get_content_size has been replaced by gtk_widget_get_width/height
- - The GtkWidget:parent-set signal has been dropped
- - GtkHeaderBar::show-close-button has been renamed to ::show-title-buttons
- - GtkFontButton::font-name has been replaced by GtkFontChooser::font
- - The GtkTextTag::event signal has been dropped
- - The text buffer serialization API has been removed
- - We longer install 'semi-private' headers like gtktextlayout.h or gtktextdisplay.h
- - gtk_application_is_inhibited has been dropped
-
-* Theming:
- - Focus rendering has been changed. Outlines are always rendered now, and
-   we set the :focus and :focus(visible) pseudo-classes on elements to allow
-   the theme control over where to render focus rectangles
- - The font-feature-settings CSS property is supported
- - The -gtk-icon-size custom CSS property allows theme control of icon sizes
-
-* Emoji:
- - We support Ctrl-. and Ctrl-; to pop up the Emoji chooser
- - The Emoji chooser is also available in GtkTextView
- - We avoid overly wide fallback rendering with some EmojiOne fonts
-
-* GtkInspector:
- - The inspector shows more render node details
- - The UI has been slightly reorganized
-
-* Bugs fixed:
- 668590 Need to check result of g_bus_get()
- 773299 Ensure GTK+-4.x builds and works on Windows (MSVC in particular)
- 775279 early calls to libepoxy cause all gtk3 programs to abort when ther...
- 777072 window shrinks when restored from maximized
- 779009 Missing property-change::accessible-description events when the to...
- 779862 Deprecate/rename gtk_header_bar_set_show_close_button() et. al.
- 783995 Monitor API inconsistencies across X11 & Wayland
- 784314 entry completion regression on wayland
- 785176 Add an item for favorite files in the GtkPlacesSidebar
- 785210 meson: Support build on Windows (using Visual Studio at least)
- 786123 GtkPlacesSidebar: Add support for libcloudproviders
- 787089 win32: GtkWindow of type GTK_WINDOW_POPUP/GDK_WINDOW_TEMP leaks me...
- 787128 Re-add FUSE network mounts in local-only mode
- 787142 Avoid assertion failed warnings from pango_layout_get_cursor_pos()...
- 787665 gdk_frame_clock_get_frame_time is irregular and causing stuttering
- 788841 Fix gtk_actionable_set_detailed_action_name API inconsistency
- 788898 Inspector: Default paned split position/ratio between tree and pro...
- 789054 Firefox crashes @gdk_window_begin_move_drag() on WM without _NET_W...
- 789134 gtk3-icon-browser: the copy button is not centred on the dialog
- 789149 GtkGestureZoom leaks the list of sequences while calculating the d...
- 789160 Add Windows compatible emoji shortcuts
- 789163 Fitzpatrick modifier selection requires lifting mouse button
- 789198 gdk: add accessor for GdkEventOwnerChange::reason
- 789213 Two Windows with GLAreas go horribly wrong
- 789327 appchooserwidget: Don't limit application list unconditionally
- 789357 Regression in 3.22.23: GDK_WINDOW_STATE_TILED flag is never set
- 789678 [GtkAboutDialog] GTK_LICENSE_AGPL_3_0 does not work
- 789733 Adwaita/HC: Fix entry.flat not being flat
- 789777 Resolving undefined reference to gdk_get_default_root_window
- 789870 gtk+4, GtkWindow: Several bugs when icon became a cairo_surface_t
- 790029 GtkTextView: Support gtk 3.22.19's emoji chooser
- 790031 GtkClipboardClearFunc is not being called
- 790171 gtk+4, GtkCssImageIconTheme: Don't unref a NULL pointer
- 790201 Settings in ~/.config/gtk-3.0/settings.ini ignored with GDK_BACKEN...
- 790287 gtk+4, GtkWindow: icon_from_list() does not scale down large icons
- 790489 broadway: Add missing dependency to build
- 790920 Add GdkSeat convenience API
- 790963 Thread safety issue in gtk_application_impl_dbus_startup
- 791062 Fix mapping window with complete xdg-foreign state
- 791176 GtkFileChooser: gtk4 defaults local_only to FALSE so docs need to ...
- 791281 Backport size allocation optimization from master to 3.22
- 791363 Shadow vertical offset is wrong when scaling is > 2
- 791549 gtklistbox: Crash on page-up on GtkListBox
- 791650 Do not warn about missing colord systemd service unit
- 791926 Cannot build gtk4 with documentation enabled
- 791927 Using '#!/usr/bin/perl' in scripts is not portable
-
-* Updated translations:
- Arabic
- Czech
- Polish
- Russian
- Serbian
-
-
-Overview of Changes in GTK+ 3.92.1, 重庆市
-==========================================
-
-The bulk of the preparation for this release was done during
-and after the fantastic GNOME.Asia Summit 2017 in Chongqing, China.
-
-* Drop autotools support. Meson 0.42.1 is now required
-
-* Implement most of CSS3 font-variant
-
-* Add an Emoji chooser to GtkEntry
-
-* Add new input hints for Emoji input
-
-* Remaining widgets have been ported to GtkSnapshot
-
-* GtkLabel and GtkEntry have been ported to use GSK
-
-* Add a way for GtkOverlay to blur behind children. This is has a
-  demo in gtk4-demo
-
-* Add support for native file choosers on older OS X versions
-
-* Add support for libcloudproviders in GtkPlacesSidebar
-
-* Non-windowed widgets are now allowed to have a size of 0x0
-
-* Allow tiled windows to be resized. Under wayland, this uses version 2
-  of the gtk-shell protocol. Under X, it uses the _GTK_EDGE_CONSTRAINTS
-  property
-
-* Input handling changes
- - GdkEvent has new accessors for fields
- - Traditional event signals (eg ::key-press-event) are now emitted from
-   an event controller
- - Most widgets inside gtk have stopped using traditional event signals
- - GDK_SEAT_CAPABILITY_ALL_POINTING now includes touch events
-
-* Scrollbars allow middle-click to jump to a position again
-
-* GSK changes:
- - Add gsk_text_node_new
- - Add a glyph cache for the Vulkan backend
- - Add gsk_blur_node_new
- - Add gsk_cross_fade_node_new
- - Implement blur for Vulkan
- - Implement repeat nodes for Vulkan
- - Add gsk_blend_mode_new
- - the vulkan backend now uses multiple render passes, avoiding many
-   fallbacks to cairo rendering
- - The profiling output for vulkan is now more useful, showing how many
-   pixels of fallback rendering and intermediate textures we consume
-
-* Inspector:
- - The recorder shows more useful information about render nodes
- - The general tab shows gsk and vulkan information
-
-* Removed apis
- - gdk_window_new_input
- - gtk_widget_set_redraw_on_alloc
- - gtk_widget_get_{border,content,margin}_allocation
- - gtk_container_propagate_draw
- - deprecated CSS properties and syntaxes
-
-* Bugs fixed:
- 639931 gtk_application_add_window() docs should mention window destruction
- 644248 stylecontext: add a raised style class
- 705640 GtkWindow incorrectly requires a default screen
- 766909 Tooltip of the eject button is a bit confusing - or just missing
- 773299 Ensure GTK+-4.x builds and works on Windows (MSVC in particular)
- 775074 GtkScrolledWindow does not disconnect all GtkAdjustment signal handl...
- 775126 memory leak in gdk_wayland_window_ensure_cairo_surface
- 778382 gtk_css_static_style_get_default doesn't check for a null setting
- 778811 Enter submenus when activating their parent item
- 780750 Shift + click in GtkEntry doesn't select
- 780758 flowbox: bind_model passes wrong reference to create_widget_func in...
- 781757 gdk_seat_grab() not working for touchscreen events
- 782981 meson fixes
- 783649 negative content width warning in GtkLevelbar
- 783669 Allow resizing tiled windows
- 784016 Crash in gnome-terminal due to calling a GdkDisplayClass vfunc on a...
- 784421 Tooltips: Fix docs/theming for custom tooltip windows
- 785210 meson: Support build on Windows (using Visual Studio at least)
- 785306 FileChooserNativeQuartz: two fixes
- 785736 textview: fix bug on DnD displaced limits of selection
- 786144 GtkInfoBar Example - Wrong at developer.gnome.org (looks like typo/...
- 786209 X11: GtkPopover positioning doesn't "avoid" CSD window shadows
- 786400 "Art pen" named "Grip pen" in the Gnome Control Center
- 786469 gdkwindow: Avoid re-setting the opaque region if it doesn't change
- 786485 Image upload broken on vulkan
- 786492 Incorrect scaling factor with Vulkan on Wayland
- 786553 Wrong example number in Gtk Tutorial
- 786613 Adwaita: provide a generic sidebar icon and label styling
- 786673 Wayland: Crash in GtkEntryCompletion
- 786885 Add explanatory tooltip to emoji icon
- 786931 rnc/rng files specify "class" as mandatory for objects, but the par...
- 786932 Let the "type-func" override the object's "class" attribute when ge...
- 786938 Emoji picker wrongly opens when clicking on primary icon too
- 786940 ::icon-pressed handler stays connected when setting :show-emoji-ico...
- 786956 EmojiChooser: Fix theming on Adwaita:dark, HighContrast, etc.
- 786960 Emoji chooser: don't show 'insert Emoji' item in emoji chooser cont...
- 786964 Emoji Chooser: Can't scroll clicking on the scroll bar
- 786966 Emoji chooser: unnecessary spacing b/w some rows in search result
- 787021 GtkFlowBox: the orthogonal orientation always requests the most siz...
- 787103 gtk3-widget-factory crashes on exit after inserting an emote on page3
- 787172 EmojiChooser: Improve selection of section buttons
- 787279 EmojiChooser: Hovered emoji become impossible to see in HighContras...
- 787302 gtk+-3.22.20/gtk/gtkmountoperation-x11.c:669:sanity check after use ?
- 787303 gtk+-3.22.20/gtk/gtknotebook.c: 2 * redundant conditions ?
- 787410 entry: fix memory leak
- 787416 build: Improve subproject support for builds
- 787444 The color-selection dialog which is opened by a GtkColorButton shou...
- 787531 The tick button is not/barely visible on light colors with Dark theme
- 787600 PlacesSidebar/SidebarRow: CloudProvider singleton/accounts are neve...
- 787757 Focus outline easily disappears around color chooser swatches
- 788230 Bump GLib version to 2.53.7
- 788458 (style) Array index 'i' is used before limits check.
- 701296 gtkfixed accepts toplevel windows into its children list after gtk_...
- 728452 gtk_tree_view_column_create_button creates button which is leaked
- 763517 Selected then unselected Label in ListBox gets wrong colour until h...
- 786794 Print dialogue has a printer called "printer"
- 787669 Middle mouse click on scrollbar is ignored
- 787866 Untranslated key labels in the Keyboard panel of Settings
- 788534 cairo-node-serialization: Adjust bytes when width bytes != stride
- 788573 HighContrast: titlebar separator is too wide and joined to buttons,...
- 788614 Trying to reuse a TreeViewColumn causes criticals and a segfault (e...
- 788787 gtktextview: Add a missing g_assert_not_reached() for switch defaul...
- 788905 GtkRange horizontal scrolling causes movement in the wrong direction
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Chinese (Taiwan)
- Croatian
- Czech
- Danish
- French
- Friulian
- Galician
- German
- Hungarian
- Indonesian
- Italian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Malayalam
- Nepali
- Persian
- Polish
- Romanian
- Russian
- Serbian
- Serbian Latin
- Slovak
- Slovenian
- Spanish
- Swedish
- Turkish
-
-
 Overview of Changes in GTK+ 3.91.2
 ==================================
 

config.h.meson

@@ -289,7 +289,3 @@
 #mesondefine GTK_LIBDIR
 
 #mesondefine GTK_PRINT_BACKENDS
-
-#mesondefine HAVE_HARFBUZZ
-
-#mesondefine HAVE_PANGOFT

demos/gtk-demo/application.c

@@ -469,33 +469,20 @@ demo_application_window_size_allocate (GtkWidget           *widget,
     gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
 }
 
-static void
-window_state_changed (GtkWidget *widget)
+static gboolean
+demo_application_window_state_event (GtkWidget           *widget,
+                                     GdkEventWindowState *event)
 {
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-  GdkWindowState new_state;
+  gboolean res = GDK_EVENT_PROPAGATE;
 
-  new_state = gdk_window_get_state (gtk_widget_get_window (widget));
-  window->maximized = (new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-  window->fullscreen = (new_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
-}
+  if (GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event)
+    res = GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event (widget, event);
 
-static void
-demo_application_window_realize (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);
+  window->maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  window->fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
 
-  g_signal_connect_swapped (gtk_widget_get_window (widget), "notify::state",
-                            G_CALLBACK (window_state_changed), widget);
-}
-
-static void
-demo_application_window_unrealize (GtkWidget *widget)
-{
-  g_signal_handlers_disconnect_by_func (gtk_widget_get_window (widget),
-                                        window_state_changed, widget);
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
+  return res;
 }
 
 static void
@@ -517,8 +504,7 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
   object_class->constructed = demo_application_window_constructed;
 
   widget_class->size_allocate = demo_application_window_size_allocate;
-  widget_class->realize = demo_application_window_realize;
-  widget_class->unrealize = demo_application_window_unrealize;
+  widget_class->window_state_event = demo_application_window_state_event;
   widget_class->destroy = demo_application_window_destroy;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");

demos/gtk-demo/assistant.c

@@ -144,11 +144,8 @@ static void
 create_page4 (GtkWidget *assistant)
 {
   progress_bar = gtk_progress_bar_new ();
-  gtk_widget_set_halign (progress_bar, GTK_ALIGN_FILL);
+  gtk_widget_set_halign (progress_bar, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (progress_bar, GTK_ALIGN_CENTER);
-  gtk_widget_set_hexpand (progress_bar, TRUE);
-  gtk_widget_set_margin_start (progress_bar, 40);
-  gtk_widget_set_margin_end (progress_bar, 40);
 
   gtk_widget_show (progress_bar);
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
@@ -170,8 +167,8 @@ do_assistant (GtkWidget *do_widget)
 
       gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
 
-      gtk_window_set_display (GTK_WINDOW (assistant),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (assistant),
+                             gtk_widget_get_screen (do_widget));
 
       create_page1 (assistant);
       create_page2 (assistant);

demos/gtk-demo/builder.c

@@ -61,8 +61,8 @@ do_builder (GtkWidget *do_widget)
 
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
       toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));

demos/gtk-demo/button_box.c

@@ -55,8 +55,8 @@ do_button_box (GtkWidget *do_widget)
   if (!window)
   {
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_display (GTK_WINDOW (window),
-                            gtk_widget_get_display (do_widget));
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
 
     g_signal_connect (window, "destroy",

demos/gtk-demo/changedisplay.c

@@ -101,16 +101,17 @@ button_release_event_cb (GtkWidget       *widget,
  * window under the pointer, or NULL, if there is none.
  */
 static GtkWidget *
-query_for_toplevel (GdkDisplay *display,
+query_for_toplevel (GdkScreen  *screen,
                     const char *prompt)
 {
+  GdkDisplay *display = gdk_screen_get_display (screen);
   GtkWidget *popup, *label, *frame;
   GdkCursor *cursor;
   GtkWidget *toplevel = NULL;
   GdkDevice *device;
 
   popup = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_display (GTK_WINDOW (popup), display);
+  gtk_window_set_screen (GTK_WINDOW (popup), screen);
   gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
   gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);
 
@@ -123,7 +124,7 @@ query_for_toplevel (GdkDisplay *display,
   gtk_container_add (GTK_CONTAINER (frame), label);
 
   gtk_widget_show (popup);
-  cursor = gdk_cursor_new_from_name ("crosshair", NULL);
+  cursor = gdk_cursor_new_from_name (display, "crosshair");
   device = gtk_get_current_event_device ();
 
   if (gdk_seat_grab (gdk_device_get_seat (device),
@@ -143,13 +144,14 @@ query_for_toplevel (GdkDisplay *display,
       while (!clicked)
         g_main_context_iteration (NULL, TRUE);
 
-      toplevel = find_toplevel_at_pointer (display);
+      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
       if (toplevel == popup)
         toplevel = NULL;
     }
 
   g_object_unref (cursor);
   gtk_widget_destroy (popup);
+  gdk_flush ();                 /* Really release the grab */
 
   return toplevel;
 }
@@ -160,17 +162,17 @@ query_for_toplevel (GdkDisplay *display,
 static void
 query_change_display (ChangeDisplayInfo *info)
 {
-  GdkDisplay *display = gtk_widget_get_display (info->window);
+  GdkScreen *screen = gtk_widget_get_screen (info->window);
   GtkWidget *toplevel;
 
-  toplevel = query_for_toplevel (display,
+  toplevel = query_for_toplevel (screen,
                                  "Please select the toplevel\n"
-                                 "to move to the new display");
+                                 "to move to the new screen");
 
   if (toplevel)
-    gtk_window_set_display (GTK_WINDOW (toplevel), info->current_display);
+    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_default_screen (info->current_display));
   else
-    gdk_display_beep (display);
+    gdk_display_beep (gdk_screen_get_display (screen));
 }
 
 /* Called when the user clicks on a button in our dialog or

demos/gtk-demo/clipboard.c

@@ -1,6 +1,6 @@
 /* Clipboard
  *
- * GdkClipboard is used for clipboard handling. This demo shows how to
+ * GtkClipboard is used for clipboard handling. This demo shows how to
  * copy and paste text to and from the clipboard.
  *
  * It also shows how to transfer images via the clipboard or via
@@ -13,104 +13,78 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-static GtkWidget *window = NULL;
-
 void
 copy_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
   GtkWidget *entry;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
 
   entry = GTK_WIDGET (user_data);
 
   /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);
 
   /* Set clipboard text */
-  gdk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)));
+  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
 }
 
 void
-paste_received (GObject      *source_object,
-                GAsyncResult *result,
+paste_received (GtkClipboard *clipboard,
+                const gchar  *text,
                 gpointer      user_data)
 {
-  GdkClipboard *clipboard;
   GtkWidget *entry;
-  char *text;
-  GError *error = NULL;
 
-  clipboard = GDK_CLIPBOARD (source_object);
   entry = GTK_WIDGET (user_data);
 
-  /* Get the resulting text of the read operation */
-  text = gdk_clipboard_read_text_finish (clipboard, result, &error);
-
-  if (text)
-    {
-      /* Set the entry text */
-      gtk_entry_set_text (GTK_ENTRY (entry), text);
-      g_free (text);
-    }
-  else
-    {
-      GtkWidget *dialog;
-
-      /* Show an error about why pasting failed.
-       * Usually you probably want to ignore such failures,
-       * but for demonstration purposes, we show the error.
-       */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Could not paste text: %s",
-                                       error->message);
-      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      gtk_widget_show (dialog);
-
-      g_error_free (error);
-    }
+  /* Set the entry text */
+  if(text)
+    gtk_entry_set_text (GTK_ENTRY (entry), text);
 }
 
 void
 paste_button_clicked (GtkWidget *button,
-                      gpointer   user_data)
+                     gpointer   user_data)
 {
   GtkWidget *entry;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
 
   entry = GTK_WIDGET (user_data);
 
   /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);
 
   /* Request the contents of the clipboard, contents_received will be
      called when we do get the contents.
    */
-  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
+  gtk_clipboard_request_text (clipboard,
+                              paste_received, entry);
 }
 
-static GdkTexture *
-get_image_texture (GtkImage *image)
+static GdkPixbuf *
+get_image_pixbuf (GtkImage *image)
 {
   const gchar *icon_name;
+  GtkIconSize size;
   GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
+  int width;
 
   switch (gtk_image_get_storage_type (image))
     {
-    case GTK_IMAGE_TEXTURE:
-      return g_object_ref (gtk_image_get_texture (image));
+    case GTK_IMAGE_PIXBUF:
+      return g_object_ref (gtk_image_get_pixbuf (image));
     case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-      if (icon_info == NULL)
-        return NULL;
-      return gtk_icon_info_load_texture (icon_info);
+      gtk_image_get_icon_name (image, &icon_name, &size);
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (image)));
+      gtk_icon_size_lookup (size, &width, NULL);
+      return gtk_icon_theme_load_icon (icon_theme,
+                                       icon_name,
+                                       width,
+                                       GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+                                       NULL);
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -123,11 +97,11 @@ drag_begin (GtkWidget      *widget,
             GdkDragContext *context,
             gpointer        data)
 {
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
 
-  texture = get_image_texture (GTK_IMAGE (widget));
-  if (texture)
-    gtk_drag_set_icon_texture (context, texture, -2, -2);
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+  g_object_unref (pixbuf);
 }
 
 void
@@ -138,27 +112,30 @@ drag_data_get (GtkWidget        *widget,
                guint             time,
                gpointer          data)
 {
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
 
-  texture = get_image_texture (GTK_IMAGE (widget));
-  if (texture)
-    gtk_selection_data_set_texture (selection_data, texture);
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
 drag_data_received (GtkWidget        *widget,
                     GdkDragContext   *context,
+                    gint              x,
+                    gint              y,
                     GtkSelectionData *selection_data,
+                    guint             info,
                     guint32           time,
                     gpointer          data)
 {
+  GdkPixbuf *pixbuf;
+
   if (gtk_selection_data_get_length (selection_data) > 0)
     {
-      GdkTexture *texture;
-
-      texture = gtk_selection_data_get_texture (selection_data);
-      gtk_image_set_from_texture (GTK_IMAGE (data), texture);
-      g_object_unref (texture);
+      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
     }
 }
 
@@ -166,59 +143,42 @@ static void
 copy_image (GtkMenuItem *item,
             gpointer     data)
 {
-  GdkClipboard *clipboard;
-  GdkTexture *texture;
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  texture = get_image_texture (GTK_IMAGE (data));
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
 
-  if (texture)
-    {
-      gdk_clipboard_set_texture (clipboard, texture);
-      g_object_unref (texture);
-    }
-}
-
-static void
-paste_image_received (GObject      *source,
-                      GAsyncResult *result,
-                      gpointer      data)
-{
-  GdkTexture *texture;
-
-  texture = gdk_clipboard_read_texture_finish (GDK_CLIPBOARD (source), result, NULL);
-  if (texture == NULL)
-    return;
-    
-  gtk_image_set_from_texture (GTK_IMAGE (data), texture);
-  g_object_unref (texture);
+  gtk_clipboard_set_image (clipboard, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
 paste_image (GtkMenuItem *item,
              gpointer     data)
 {
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard,
-                                    NULL,
-                                    paste_image_received,
-                                    data);
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = gtk_clipboard_wait_for_image (clipboard);
+
+  if (pixbuf)
+    {
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
+    }
 }
 
 static gboolean
 button_press (GtkWidget      *widget,
-              GdkEventButton *event,
+              GdkEventButton *button,
               gpointer        data)
 {
   GtkWidget *menu;
   GtkWidget *item;
-  guint button;
 
-  gdk_event_get_button ((GdkEvent *)event, &button);
-
-  if (button != GDK_BUTTON_SECONDARY)
+  if (button->button != GDK_BUTTON_SECONDARY)
     return FALSE;
 
   menu = gtk_menu_new ();
@@ -233,23 +193,26 @@ button_press (GtkWidget      *widget,
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) event);
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) button);
   return TRUE;
 }
 
 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
   if (!window)
     {
       GtkWidget *vbox, *hbox;
       GtkWidget *label;
       GtkWidget *entry, *button;
       GtkWidget *image;
+      GtkClipboard *clipboard;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
 
       g_signal_connect (window, "destroy",
@@ -303,11 +266,12 @@ do_clipboard (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create the first image */
-      image = gtk_image_new_from_icon_name ("dialog-warning");
+      image = gtk_image_new_from_icon_name ("dialog-warning",
+                                            GTK_ICON_SIZE_BUTTON);
       gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* make image a drag source */
-      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
       gtk_drag_source_add_image_targets (image);
       g_signal_connect (image, "drag-begin",
                         G_CALLBACK (drag_begin), image);
@@ -316,7 +280,7 @@ do_clipboard (GtkWidget *do_widget)
 
       /* accept drops on image */
       gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
-                         NULL, GDK_ACTION_COPY);
+                         NULL, 0, GDK_ACTION_COPY);
       gtk_drag_dest_add_image_targets (image);
       g_signal_connect (image, "drag-data-received",
                         G_CALLBACK (drag_data_received), image);
@@ -326,11 +290,12 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (button_press), image);
 
       /* Create the second image */
-      image = gtk_image_new_from_icon_name ("process-stop");
+      image = gtk_image_new_from_icon_name ("process-stop",
+                                            GTK_ICON_SIZE_BUTTON);
       gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* make image a drag source */
-      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
       gtk_drag_source_add_image_targets (image);
       g_signal_connect (image, "drag-begin",
                         G_CALLBACK (drag_begin), image);
@@ -339,7 +304,7 @@ do_clipboard (GtkWidget *do_widget)
 
       /* accept drops on image */
       gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
-                         NULL, GDK_ACTION_COPY);
+                         NULL, 0, GDK_ACTION_COPY);
       gtk_drag_dest_add_image_targets (image);
       g_signal_connect (image, "drag-data-received",
                         G_CALLBACK (drag_data_received), image);
@@ -347,6 +312,10 @@ do_clipboard (GtkWidget *do_widget)
       /* context menu on image */
       g_signal_connect (image, "button-press-event",
                         G_CALLBACK (button_press), image);
+
+      /* tell the clipboard manager to make the data persistent */
+      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+      gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/colorsel.c

@@ -70,10 +70,9 @@ do_colorsel (GtkWidget *do_widget)
       color.alpha = 1;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/combobox.c

@@ -311,8 +311,8 @@ do_combobox (GtkWidget *do_widget)
   if (!window)
   {
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_display (GTK_WINDOW (window),
-                            gtk_widget_get_display (do_widget));
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
 
     g_signal_connect (window, "destroy",

demos/gtk-demo/css_basics.c

@@ -47,6 +47,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/css_blendmodes.c

@@ -28,7 +28,7 @@ struct {
   { "Multiply", "multiply" },
   { "Normal", "normal" },
   { "Overlay", "overlay" },
-  { "Saturate", "saturation" },
+  { "Saturate", "saturate" },
   { "Screen", "screen" },
   { "Soft Light", "soft-light" },
   { NULL }
@@ -130,9 +130,9 @@ do_css_blendmodes (GtkWidget *do_widget)
       /* Setup the CSS provider for window */
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  provider,
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                                 provider,
+                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
       setup_listbox (builder, provider);
     }

demos/gtk-demo/css_multiplebgs.c

@@ -47,6 +47,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/css_pixbufs.c

@@ -46,6 +46,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/css_shadows.c

@@ -45,6 +45,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/cursors.c

@@ -1,44 +1,161 @@
 /* Cursors
  *
- * Demonstrates a useful set of available cursors. The cursors shown here are the ones
- * defined by CSS, which we assume to be available.
- *
- * The example shows creating cursors by name or from an image, with or without a fallback.
+ * Demonstrates a useful set of available cursors.
  */
-
 #include <gtk/gtk.h>
 
-static GtkWidget *window = NULL;
+static void
+set_cursor (GtkWidget *button, gpointer data)
+{
+  GtkWidget *toplevel;
+  GdkCursor *cursor = data;
+  GdkWindow *window;
+
+  toplevel = gtk_widget_get_toplevel (button);
+  window = gtk_widget_get_window (toplevel);
+  gdk_window_set_cursor (window, cursor);
+}
+
+static GtkWidget *
+add_section (GtkWidget   *box,
+             const gchar *heading)
+{
+  GtkWidget *label;
+  GtkWidget *section;
+
+  label = gtk_label_new (heading);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_widget_set_margin_top (label, 10);
+  gtk_widget_set_margin_bottom (label, 10);
+  gtk_box_pack_start (GTK_BOX (box), label);
+  section = gtk_flow_box_new ();
+  gtk_widget_set_halign (section, GTK_ALIGN_START);
+  gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE);
+  gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2);
+  gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20);
+  gtk_box_pack_start (GTK_BOX (box), section);
+
+  return section;
+}
 
 static void
-on_destroy (gpointer data)
+add_button (GtkWidget   *section,
+            const gchar *css_name)
 {
-  window = NULL;
+  GtkWidget *image, *button;
+  GdkDisplay *display;
+  GdkCursor *cursor;
+
+  display = gtk_widget_get_display (section);
+  cursor = gdk_cursor_new_from_name (display, css_name);
+  if (cursor == NULL)
+    image = gtk_image_new_from_icon_name ("image-missing", GTK_ICON_SIZE_MENU);
+  else
+    {
+      gchar *path;
+
+      path = g_strdup_printf ("/cursors/%s_cursor.png", css_name);
+      g_strdelimit (path, "-", '_');
+      image = gtk_image_new_from_resource (path);
+      g_free (path);
+    }
+  gtk_widget_set_size_request (image, 32, 32);
+  button = gtk_button_new ();
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
+  g_signal_connect (button, "clicked", G_CALLBACK (set_cursor), cursor);
+
+  gtk_widget_set_tooltip_text (button, css_name);
+  gtk_container_add (GTK_CONTAINER (section), button);
 }
 
 GtkWidget *
 do_cursors (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
   if (!window)
     {
-      GtkBuilder *builder;
+      GtkWidget *sw;
+      GtkWidget *box;
+      GtkWidget *section;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Cursors");
+      gtk_window_set_default_size (GTK_WINDOW (window), 500, 500);
 
-      builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &window);
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (window), sw);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      g_object_set (box,
+                    "margin-start", 20,
+                    "margin-end", 20,
+                    "margin-bottom", 10,
+                    NULL);
+      gtk_container_add (GTK_CONTAINER (sw), box);
+
+      section = add_section (box, "General");
+      add_button (section, "default");
+      add_button (section, "none");
+
+      section = add_section (box, "Link & Status");
+      add_button (section, "context-menu");
+      add_button (section, "help");
+      add_button (section, "pointer");
+      add_button (section, "progress");
+      add_button (section, "wait");
+
+      section = add_section (box, "Selection");
+      add_button (section, "cell");
+      add_button (section, "crosshair");
+      add_button (section, "text");
+      add_button (section, "vertical-text");
+
+      section = add_section (box, "Drag & Drop");
+      add_button (section, "alias");
+      add_button (section, "copy");
+      add_button (section, "move");
+      add_button (section, "no-drop");
+      add_button (section, "not-allowed");
+      add_button (section, "grab");
+      add_button (section, "grabbing");
+
+      section = add_section (box, "Resize & Scrolling");
+      add_button (section, "all-scroll");
+      add_button (section, "col-resize");
+      add_button (section, "row-resize");
+      add_button (section, "n-resize");
+      add_button (section, "e-resize");
+      add_button (section, "s-resize");
+      add_button (section, "w-resize");
+      add_button (section, "ne-resize");
+      add_button (section, "nw-resize");
+      add_button (section, "se-resize");
+      add_button (section, "sw-resize");
+      add_button (section, "ew-resize");
+      add_button (section, "ns-resize");
+      add_button (section, "nesw-resize");
+      add_button (section, "nwse-resize");
+
+      section = add_section (box, "Zoom");
+      add_button (section, "zoom-in");
+      add_button (section, "zoom-out");
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    {
-      gtk_widget_destroy (window);
-    }
+    gtk_widget_destroy (window);
+
 
   return window;
 }

demos/gtk-demo/demo.gresource.xml

@@ -57,7 +57,6 @@
     <file>reset.css</file>
   </gresource>
   <gresource prefix="/cursors">
-    <file>cursors.ui</file>
     <file>alias_cursor.png</file>
     <file>all_scroll_cursor.png</file>
     <file>cell_cursor.png</file>
@@ -68,7 +67,6 @@
     <file>default_cursor.png</file>
     <file>e_resize_cursor.png</file>
     <file>ew_resize_cursor.png</file>
-    <file>gtk_logo_cursor.png</file>
     <file>grabbing_cursor.png</file>
     <file>grab_cursor.png</file>
     <file>hand_cursor.png</file>
@@ -102,8 +100,8 @@
     <file>gtkfishbowl.h</file>
   </gresource>
   <gresource prefix="/iconview">
-    <file>gnome-fs-directory.png</file>
-    <file>gnome-fs-regular.png</file>
+    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
+    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
   </gresource>
   <gresource prefix="/stack">
     <file>stack.ui</file>
@@ -151,7 +149,6 @@
     <file>cursors.c</file>
     <file>dialog.c</file>
     <file>drawingarea.c</file>
-    <file>dnd.c</file>
     <file>editable_cells.c</file>
     <file>entry_buffer.c</file>
     <file>entry_completion.c</file>
@@ -163,7 +160,6 @@
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>
-    <file>fontplane.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
     <file>headerbar.c</file>
@@ -225,7 +221,6 @@
   </gresource>
   <gresource prefix="/font_features">
     <file>font-features.ui</file>
-    <file>fontplane.c</file>
   </gresource>
   <gresource prefix="/spinbutton">
     <file>spinbutton.ui</file>
@@ -237,9 +232,6 @@
     <file>decor1.png</file>
     <file>decor2.png</file>
   </gresource>
-  <gresource prefix="/transparent">
-    <file>portland-rose.jpg</file>
-  </gresource>
   <gresource prefix="/markup">
     <file>markup.txt</file>
   </gresource>
@@ -249,7 +241,4 @@
   <gresource prefix="/modelbutton">
     <file>modelbutton.ui</file>
   </gresource>
-  <gresource prefix="/dnd">
-    <file>dnd.css</file>
-  </gresource>
 </gresources>

demos/gtk-demo/dialog.c

@@ -58,8 +58,7 @@ interactive_dialog_clicked (GtkButton *button,
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_box_pack_start (GTK_BOX (content_area), hbox);
 
-  image = gtk_image_new_from_icon_name ("dialog-question");
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+  image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), image);
 
   table = gtk_grid_new ();
@@ -106,8 +105,8 @@ do_dialog (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/dnd.c

@@ -1,377 +0,0 @@
-/* Drag-and-Drop
- *
- * I can't believe its not glade!
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-typedef struct _GtkDemoWidget GtkDemoWidget;
-struct _GtkDemoWidget
-{
-  GType type;
-  union {
-    char *text;
-    gboolean active;
-  };
-};
-
-static gpointer
-copy_demo_widget (gpointer data)
-{
-  GtkDemoWidget *demo = g_memdup (data, sizeof (GtkDemoWidget));
-
-  if (demo->type == GTK_TYPE_LABEL)
-    demo->text = g_strdup (demo->text);
-
-  return demo;
-}
-
-static void
-free_demo_widget (gpointer data)
-{
-  GtkDemoWidget *demo = data;
-
-  if (demo->type == GTK_TYPE_LABEL)
-    g_free (demo->text);
-
-  g_free (demo);
-}
-
-#define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
-
-G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
-
-static GtkDemoWidget *
-serialize_widget (GtkWidget *widget)
-{
-  GtkDemoWidget *demo;
-
-  demo = g_new0 (GtkDemoWidget, 1);
-  demo->type = G_OBJECT_TYPE (widget);
-
-  if (GTK_IS_LABEL (widget))
-    {
-      demo->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
-    }
-  else if (GTK_IS_SPINNER (widget))
-    {
-      g_object_get (widget, "active", &demo->active, NULL);
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return demo;
-}
-
-static GtkWidget *
-deserialize_widget (GtkDemoWidget *demo)
-{
-  GtkWidget *widget = NULL;
-
-  if (demo->type == GTK_TYPE_LABEL)
-    {
-      widget = gtk_label_new (demo->text);
-    }
-  else if (demo->type == GTK_TYPE_SPINNER)
-    {
-      widget = g_object_new (demo->type, "active", demo->active, NULL);
-      gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return widget;
-}
-
-static double pos_x, pos_y;
-
-static void
-new_label_cb (GtkMenuItem *item,
-              gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_label_new ("Label");
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-}
-
-static void
-new_spinner_cb (GtkMenuItem *item,
-                gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_spinner_new ();
-  gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-  gtk_spinner_start (GTK_SPINNER (widget));
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-}
-
-static void
-copy_cb (GtkWidget *child)
-{
-  GdkClipboard *clipboard;
-  GtkDemoWidget *demo;
-
-  g_print ("Copy %s\n", G_OBJECT_TYPE_NAME (child));
-
-  demo = serialize_widget (child);
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
-}
-
-static void
-delete_cb (GtkWidget *child)
-{
-  gtk_widget_destroy (child);
-}
-
-static void
-cut_cb (GtkWidget *child)
-{
-  copy_cb (child);
-  delete_cb (child);
-}
-
-static void
-value_read (GObject      *source,
-            GAsyncResult *res,
-            gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  GError *error = NULL;
-  const GValue *value;
-  GtkDemoWidget *demo;
-  GtkWidget *widget = NULL;
-
-  value = gdk_clipboard_read_value_finish (clipboard, res, &error);
-
-  if (value == NULL)
-    {
-      g_print ("error: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (!G_VALUE_HOLDS (value, GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("can't handle clipboard contents\n");
-      return;
-    }
-
-  demo = g_value_get_boxed (value);
-  widget = deserialize_widget (demo);
-
-  gtk_fixed_put (GTK_FIXED (data), widget, pos_x, pos_y);
-}
-
-static void
-paste_cb (GtkWidget *fixed)
-{
-  GdkClipboard *clipboard;
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("Paste %s\n", g_type_name (GTK_TYPE_DEMO_WIDGET));
-      gdk_clipboard_read_value_async (clipboard, GTK_TYPE_DEMO_WIDGET, 0, NULL, value_read, fixed);
-    }
-  else
-    g_print ("Don't know how to handle clipboard contents\n");
-}
-
-static void
-edit_label_done (GtkWidget *entry, gpointer data)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (entry);
-  GtkWidget *label;
-  int x, y;
-
-  gtk_container_child_get (GTK_CONTAINER (fixed), entry, "x", &x, "y", &y, NULL);
-
-  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
-  gtk_label_set_text (GTK_LABEL (label), gtk_entry_get_text (GTK_ENTRY (entry)));
-
-  gtk_widget_destroy (entry);
-}
-
-static void
-edit_cb (GtkWidget *child)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (child);
-  int x, y;
-
-  gtk_container_child_get (GTK_CONTAINER (fixed), child, "x", &x, "y", &y, NULL);
-
-  if (GTK_IS_LABEL (child))
-    {
-      GtkWidget *entry = gtk_entry_new ();
-
-      g_object_set_data (G_OBJECT (entry), "label", child);
-
-      gtk_entry_set_text (GTK_ENTRY (entry), gtk_label_get_text (GTK_LABEL (child)));
-      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
-      gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
-      gtk_widget_grab_focus (entry);
-    }
-  else if (GTK_IS_SPINNER (child))
-    {
-      gboolean active;
-
-      g_object_get (child, "active", &active, NULL);
-      g_object_set (child, "active", !active, NULL);
-    }
-}
-
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            gpointer    data)
-{
-  GtkWidget *widget;
-  GtkWidget *child;
-
-  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y);
-
-  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
-    {
-      GdkRectangle rect;
-      GtkWidget *menu;
-      GtkWidget *item;
-      GdkClipboard *clipboard;
-
-      pos_x = x;
-      pos_y = y;
-
-      menu = gtk_menu_new ();
-      item = gtk_menu_item_new_with_label ("New Label");
-      g_signal_connect (item, "activate", G_CALLBACK (new_label_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("New Spinner");
-      g_signal_connect (item, "activate", G_CALLBACK (new_spinner_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_menu_item_new_with_label ("Edit");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_menu_item_new_with_label ("Cut");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (cut_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Copy");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (copy_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Paste");
-      clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-      gtk_widget_set_sensitive (item,
-                                gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (paste_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Delete");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      rect.x = x;
-      rect.y = y;
-      rect.width = 0;
-      rect.height = 0;
-
-      gtk_menu_popup_at_rect (GTK_MENU (menu),
-                              gtk_widget_get_window (widget),
-                              &rect,
-                              GDK_GRAVITY_NORTH_WEST,
-                              GDK_GRAVITY_NORTH_WEST,
-                              NULL);
-
-      return;
-    }
-}
-
-static void
-released_cb (GtkGesture *gesture,
-             int         n_press,
-             double      x,
-             double      y,
-             gpointer    data)
-{
-  GtkWidget *widget;
-  GtkWidget *child;
-
-  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y);
-
-  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
-    {
-      if (child != NULL && child != widget)
-        edit_cb (child);
-    }
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_dnd (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox, *fixed;
-      GtkGesture *multipress;
-      GtkCssProvider *provider;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Drag-and-drop");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      fixed = gtk_fixed_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), fixed);
-      gtk_widget_set_hexpand (fixed, TRUE);
-      gtk_widget_set_vexpand (fixed, TRUE);
-
-      multipress = gtk_gesture_multi_press_new (fixed);
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
-      g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
-      g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);
-
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  800);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/dnd.css

@@ -1,3 +0,0 @@
-spinner.demo {
-  opacity: 1;
-}

demos/gtk-demo/drawingarea.c

@@ -20,17 +20,22 @@ static GtkWidget *window = NULL;
 static cairo_surface_t *surface = NULL;
 
 /* Create a new surface of the appropriate size to store our scribbles */
-static void
-create_surface (GtkWidget *widget)
+static gboolean
+scribble_configure_event (GtkWidget         *widget,
+                          GdkEventConfigure *event,
+                          gpointer           data)
 {
+  GtkAllocation allocation;
   cairo_t *cr;
 
   if (surface)
     cairo_surface_destroy (surface);
 
-  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                        gtk_widget_get_width (widget),
-                                        gtk_widget_get_height (widget));
+  gtk_widget_get_allocation (widget, &allocation);
+  surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
+                                               CAIRO_CONTENT_COLOR,
+                                               allocation.width,
+                                               allocation.height);
 
   /* Initialize the surface to white */
   cr = cairo_create (surface);
@@ -39,12 +44,9 @@ create_surface (GtkWidget *widget)
   cairo_paint (cr);
 
   cairo_destroy (cr);
-}
 
-static void
-scribble_size_allocate (GtkWidget *widget)
-{
-  create_surface (widget);
+  /* We've handled the configure event, no need for further processing. */
+  return TRUE;
 }
 
 /* Redraw the screen from the surface */
@@ -68,11 +70,6 @@ draw_brush (GtkWidget *widget,
   GdkRectangle update_rect;
   cairo_t *cr;
 
-  if (surface == NULL ||
-      cairo_image_surface_get_width (surface) != gtk_widget_get_width (widget) ||
-      cairo_image_surface_get_height (surface) != gtk_widget_get_height (widget))
-    create_surface (widget);
-
   update_rect.x = x - 3;
   update_rect.y = y - 3;
   update_rect.width = 6;
@@ -86,41 +83,58 @@ draw_brush (GtkWidget *widget,
 
   cairo_destroy (cr);
 
-  gtk_widget_queue_draw_area (widget, update_rect.x, update_rect.y, update_rect.width, update_rect.height);
+  /* Now invalidate the affected region of the drawing area. */
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
+                              &update_rect,
+                              FALSE);
 }
 
-static double start_x;
-static double start_y;
-
-static void
-drag_begin (GtkGestureDrag *gesture,
-            double          x,
-            double          y,
-            GtkWidget      *area)
+static gboolean
+scribble_button_press_event (GtkWidget      *widget,
+                             GdkEventButton *event,
+                             gpointer        data)
 {
-  start_x = x;
-  start_y = y;
+  if (surface == NULL)
+    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
-  draw_brush (area, x, y);
+  if (event->button == GDK_BUTTON_PRIMARY)
+    draw_brush (widget, event->x, event->y);
+
+  /* We've handled the event, stop processing */
+  return TRUE;
 }
 
-static void
-drag_update (GtkGestureDrag *gesture,
-             double          x,
-             double          y,
-             GtkWidget      *area)
+static gboolean
+scribble_motion_notify_event (GtkWidget      *widget,
+                              GdkEventMotion *event,
+                              gpointer        data)
 {
-  draw_brush (area, start_x + x, start_y + y);
+  int x, y;
+  GdkModifierType state;
+
+  if (surface == NULL)
+    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
+
+  /* This call is very important; it requests the next motion event.
+   * If you don't call gdk_window_get_pointer() you'll only get
+   * a single motion event. The reason is that we specified
+   * GDK_POINTER_MOTION_HINT_MASK to gtk_widget_set_events().
+   * If we hadn't specified that, we could just use event->x, event->y
+   * as the pointer location. But we'd also get deluged in events.
+   * By requesting the next event as we handle the current one,
+   * we avoid getting a huge number of events faster than we
+   * can cope.
+   */
+
+  gdk_window_get_device_position (event->window, event->device, &x, &y, &state);
+
+  if (state & GDK_BUTTON1_MASK)
+    draw_brush (widget, x, y);
+
+  /* We've handled it, stop processing */
+  return TRUE;
 }
 
-static void
-drag_end (GtkGestureDrag *gesture,
-          double          x,
-          double          y,
-          GtkWidget      *area)
-{
-  draw_brush (area, start_x + x, start_y + y);
-}
 
 static void
 checkerboard_draw (GtkDrawingArea *da,
@@ -185,13 +199,12 @@ do_drawingarea (GtkWidget *do_widget)
   GtkWidget *vbox;
   GtkWidget *da;
   GtkWidget *label;
-  GtkGesture *drag;
 
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
 
       g_signal_connect (window, "destroy",
@@ -212,7 +225,6 @@ do_drawingarea (GtkWidget *do_widget)
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_vexpand (frame, TRUE);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
@@ -231,7 +243,6 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_widget_set_vexpand (frame, TRUE);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
@@ -241,16 +252,17 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      g_signal_connect (da, "size-allocate",
-                        G_CALLBACK (scribble_size_allocate), NULL);
+      /* Signals used to handle backing surface */
 
-      drag = gtk_gesture_drag_new (da);
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
-      g_object_set_data_full (G_OBJECT (da), "drag", drag, g_object_unref);
+      g_signal_connect (da,"configure-event",
+                        G_CALLBACK (scribble_configure_event), NULL);
 
-      g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);
-      g_signal_connect (drag, "drag-update", G_CALLBACK (drag_update), da);
-      g_signal_connect (drag, "drag-end", G_CALLBACK (drag_end), da);
+      /* Event signals */
+
+      g_signal_connect (da, "motion-notify-event",
+                        G_CALLBACK (scribble_motion_notify_event), NULL);
+      g_signal_connect (da, "button-press-event",
+                        G_CALLBACK (scribble_button_press_event), NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/editable_cells.c

@@ -346,8 +346,8 @@ do_editable_cells (GtkWidget *do_widget)
       GtkTreeModel *numbers_model;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -373,7 +373,6 @@ do_editable_cells (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (items_model);
-      gtk_widget_set_vexpand (treeview, TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_SINGLE);
 

demos/gtk-demo/entry_buffer.c

@@ -20,8 +20,8 @@ do_entry_buffer (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Buffer");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",

demos/gtk-demo/entry_completion.c

@@ -46,8 +46,8 @@ do_entry_completion (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 

demos/gtk-demo/event_axes.c

@@ -120,7 +120,6 @@ update_axes_from_event (GdkEvent  *event,
   GdkDevice *device, *source_device;
   GdkEventSequence *sequence;
   GdkDeviceTool *tool;
-  GdkEventType type;
   gdouble x, y;
   AxesInfo *info;
 
@@ -128,15 +127,14 @@ update_axes_from_event (GdkEvent  *event,
   source_device = gdk_event_get_source_device (event);
   sequence = gdk_event_get_event_sequence (event);
   tool = gdk_event_get_device_tool (event);
-  type = gdk_event_get_event_type (event);
 
-  if (type == GDK_TOUCH_END ||
-      type == GDK_TOUCH_CANCEL)
+  if (event->type == GDK_TOUCH_END ||
+      event->type == GDK_TOUCH_CANCEL)
     {
       g_hash_table_remove (data->touch_info, sequence);
       return;
     }
-  else if (type == GDK_LEAVE_NOTIFY)
+  else if (event->type == GDK_LEAVE_NOTIFY)
     {
       g_hash_table_remove (data->pointer_info, device);
       return;
@@ -174,24 +172,24 @@ update_axes_from_event (GdkEvent  *event,
 
   g_clear_pointer (&info->axes, g_free);
 
-  if (type == GDK_TOUCH_BEGIN ||
-      type == GDK_TOUCH_UPDATE)
+  if (event->type == GDK_TOUCH_BEGIN ||
+      event->type == GDK_TOUCH_UPDATE)
     {
-      gboolean emulating_pointer;
-
-      gdk_event_get_touch_emulating_pointer (event, &emulating_pointer);
-      if (sequence && emulating_pointer)
+      if (sequence && event->touch.emulating_pointer)
         g_hash_table_remove (data->pointer_info, device);
     }
-  if (type == GDK_MOTION_NOTIFY ||
-      type == GDK_BUTTON_PRESS ||
-      type == GDK_BUTTON_RELEASE)
+  if (event->type == GDK_MOTION_NOTIFY)
     {
-      gdouble *axes;
-      guint n_axes;
-
-      gdk_event_get_axes (event, &axes, &n_axes);
-      info->axes = g_memdup (axes, sizeof (double) * n_axes);
+      info->axes =
+      g_memdup (event->motion.axes,
+                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
+    }
+  else if (event->type == GDK_BUTTON_PRESS ||
+           event->type == GDK_BUTTON_RELEASE)
+    {
+      info->axes =
+      g_memdup (event->button.axes,
+                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
     }
 
   if (gdk_event_get_coords (event, &x, &y))

demos/gtk-demo/filtermodel.c

@@ -124,8 +124,8 @@ do_filtermodel (GtkWidget *do_widget)
       builder = gtk_builder_new_from_resource ("/filtermodel/filtermodel.ui");
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/fishbowl.c

@@ -160,8 +160,8 @@ do_fishbowl (GtkWidget *do_widget)
       gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), TRUE);
       info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
       allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/fishbowl.ui

@@ -6,7 +6,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
         <property name="visible">True</property>
-        <property name="show-title-buttons">True</property>
+        <property name="show-close-button">True</property>
         <child>
           <object class="GtkLabel" id="info_label">
             <property name="visible">True</property>

demos/gtk-demo/flowbox.c

@@ -720,8 +720,8 @@ do_flowbox (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
 

demos/gtk-demo/fontplane.c

@@ -1,315 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "fontplane.h"
-
-#include "gtk.h"
-
-enum {
-  PROP_0,
-  PROP_WEIGHT_ADJUSTMENT,
-  PROP_WIDTH_ADJUSTMENT
-};
-
-G_DEFINE_TYPE (GtkFontPlane, gtk_font_plane, GTK_TYPE_WIDGET)
-
-static double
-adjustment_get_normalized_value (GtkAdjustment *adj)
-{
-  return (gtk_adjustment_get_value (adj) - gtk_adjustment_get_lower (adj)) /
-        (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj));
-}
-
-static void
-val_to_xy (GtkFontPlane *plane,
-           gint          *x,
-           gint          *y)
-{
-  gdouble u, v;
-  gint width, height;
-
-  width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
-  height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
-
-  u = adjustment_get_normalized_value (plane->width_adj);
-  v = adjustment_get_normalized_value (plane->weight_adj);
-
-  *x = CLAMP (width * u, 0, width - 1);
-  *y = CLAMP (height * (1 - v), 0, height - 1);
-}
-
-static void
-plane_snapshot (GtkWidget   *widget,
-                GtkSnapshot *snapshot)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (widget);
-  gint x, y;
-  gint width, height;
-  cairo_t *cr;
-
-  val_to_xy (plane, &x, &y);
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
-
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                  "FontPlane");
-
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_paint (cr);
-
-  cairo_move_to (cr, 0,     y + 0.5);
-  cairo_line_to (cr, width, y + 0.5);
-
-  cairo_move_to (cr, x + 0.5, 0);
-  cairo_line_to (cr, x + 0.5, height);
-
-  if (gtk_widget_has_visible_focus (widget))
-    {
-      cairo_set_line_width (cr, 3.0);
-      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.6);
-      cairo_stroke_preserve (cr);
-
-      cairo_set_line_width (cr, 1.0);
-      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      cairo_set_line_width (cr, 1.0);
-      cairo_set_source_rgba (cr, 0.8, 0.8, 0.8, 0.8);
-      cairo_stroke (cr);
-    }
-
-  cairo_destroy (cr);
-}
-
-static void
-set_cross_cursor (GtkWidget *widget,
-                  gboolean   enabled)
-{
-  if (enabled)
-    gtk_widget_set_cursor_from_name (widget, "crosshair");
-  else
-    gtk_widget_set_cursor (widget, NULL);
-}
-
-static void
-adj_changed (GtkFontPlane *plane)
-{
-  gtk_widget_queue_draw (GTK_WIDGET (plane));
-}
-
-static void
-adjustment_set_normalized_value (GtkAdjustment *adj,
-                                 double         val)
-{
-  gtk_adjustment_set_value (adj,
-      gtk_adjustment_get_lower (adj) +
-          val * (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj)));
-}
-
-static void
-update_value (GtkFontPlane *plane,
-              gint           x,
-              gint           y)
-{
-  GtkWidget *widget = GTK_WIDGET (plane);
-  gdouble u, v;
-
-  u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
-  v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
-
-  adjustment_set_normalized_value (plane->width_adj, u);
-  adjustment_set_normalized_value (plane->weight_adj, v);
-
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-hold_action (GtkGestureLongPress *gesture,
-             gdouble              x,
-             gdouble              y,
-             GtkFontPlane       *plane)
-{
-  gboolean handled;
-
-  g_signal_emit_by_name (plane, "popup-menu", &handled);
-}
-
-static void
-plane_drag_gesture_begin (GtkGestureDrag *gesture,
-                          gdouble         start_x,
-                          gdouble         start_y,
-                          GtkFontPlane  *plane)
-{
-  guint button;
-
-  button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
-
-  if (button == GDK_BUTTON_SECONDARY)
-    {
-      gboolean handled;
-
-      g_signal_emit_by_name (plane, "popup-menu", &handled);
-    }
-
-  if (button != GDK_BUTTON_PRIMARY)
-    {
-      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
-      return;
-    }
-
-  set_cross_cursor (GTK_WIDGET (plane), TRUE);
-  update_value (plane, start_x, start_y);
-  gtk_widget_grab_focus (GTK_WIDGET (plane));
-  gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
-}
-
-static void
-plane_drag_gesture_update (GtkGestureDrag *gesture,
-                           gdouble         offset_x,
-                           gdouble         offset_y,
-                           GtkFontPlane  *plane)
-{
-  gdouble start_x, start_y;
-
-  gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture),
-                                    &start_x, &start_y);
-  update_value (plane, start_x + offset_x, start_y + offset_y);
-}
-
-static void
-plane_drag_gesture_end (GtkGestureDrag *gesture,
-                        gdouble         offset_x,
-                        gdouble         offset_y,
-                        GtkFontPlane  *plane)
-{
-  set_cross_cursor (GTK_WIDGET (plane), FALSE);
-}
-
-static void
-gtk_font_plane_init (GtkFontPlane *plane)
-{
-  gtk_widget_set_has_window (GTK_WIDGET (plane), FALSE);
-  gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
-
-  plane->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (plane));
-  g_signal_connect (plane->drag_gesture, "drag-begin",
-		    G_CALLBACK (plane_drag_gesture_begin), plane);
-  g_signal_connect (plane->drag_gesture, "drag-update",
-		    G_CALLBACK (plane_drag_gesture_update), plane);
-  g_signal_connect (plane->drag_gesture, "drag-end",
-		    G_CALLBACK (plane_drag_gesture_end), plane);
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (plane->drag_gesture), 0);
-
-  plane->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (plane));
-  g_signal_connect (plane->long_press_gesture, "pressed",
-                    G_CALLBACK (hold_action), plane);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->long_press_gesture),
-                                     TRUE);
-}
-
-static void
-plane_finalize (GObject *object)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (object);
-
-  g_clear_object (&plane->weight_adj);
-  g_clear_object (&plane->width_adj);
-
-  g_clear_object (&plane->drag_gesture);
-  g_clear_object (&plane->long_press_gesture);
-
-  G_OBJECT_CLASS (gtk_font_plane_parent_class)->finalize (object);
-}
-
-static void
-plane_set_property (GObject      *object,
-		    guint         prop_id,
-		    const GValue *value,
-		    GParamSpec   *pspec)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (object);
-  GtkAdjustment *adjustment;
-
-  switch (prop_id)
-    {
-    case PROP_WEIGHT_ADJUSTMENT:
-      adjustment = GTK_ADJUSTMENT (g_value_get_object (value));
-      if (adjustment)
-	{
-	  plane->weight_adj = g_object_ref_sink (adjustment);
-	  g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (adj_changed), plane);
-	}
-      break;
-    case PROP_WIDTH_ADJUSTMENT:
-      adjustment = GTK_ADJUSTMENT (g_value_get_object (value));
-      if (adjustment)
-	{
-	  plane->width_adj = g_object_ref_sink (adjustment);
-	  g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (adj_changed), plane);
-	}
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_font_plane_class_init (GtkFontPlaneClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->finalize = plane_finalize;
-  object_class->set_property = plane_set_property;
-
-  widget_class->snapshot = plane_snapshot;
-
-  g_object_class_install_property (object_class,
-                                   PROP_WEIGHT_ADJUSTMENT,
-                                   g_param_spec_object ("weight-adjustment",
-                                                        NULL,
-                                                        NULL,
-							GTK_TYPE_ADJUSTMENT,
-							G_PARAM_WRITABLE |
-							G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class,
-                                   PROP_WIDTH_ADJUSTMENT,
-                                   g_param_spec_object ("width-adjustment",
-                                                        NULL,
-                                                        NULL,
-							GTK_TYPE_ADJUSTMENT,
-							G_PARAM_WRITABLE |
-							G_PARAM_CONSTRUCT_ONLY));
-}
-
-GtkWidget *
-gtk_font_plane_new (GtkAdjustment *weight_adj,
-                     GtkAdjustment *width_adj)
-{
-  return g_object_new (GTK_TYPE_FONT_PLANE,
-                       "weight-adjustment", weight_adj,
-                       "width-adjustment", width_adj,
-                       NULL);
-}

demos/gtk-demo/fontplane.h

@@ -1,65 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_FONT_PLANE_H__
-#define __GTK_FONT_PLANE_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FONT_PLANE            (gtk_font_plane_get_type ())
-#define GTK_FONT_PLANE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_PLANE, GtkFontPlane))
-#define GTK_FONT_PLANE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_PLANE, GtkFontPlaneClass))
-#define GTK_IS_FONT_PLANE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_PLANE))
-#define GTK_IS_FONT_PLANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_PLANE))
-#define GTK_FONT_PLANE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_PLANE, GtkFontPlaneClass))
-
-
-typedef struct _GtkFontPlane         GtkFontPlane;
-typedef struct _GtkFontPlaneClass    GtkFontPlaneClass;
-
-struct _GtkFontPlane
-{
-  GtkWidget parent_instance;
-
-  GtkAdjustment *weight_adj;
-  GtkAdjustment *width_adj;
-
-  GtkGesture *drag_gesture;
-  GtkGesture *long_press_gesture;
-};
-
-struct _GtkFontPlaneClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType       gtk_font_plane_get_type (void) G_GNUC_CONST;
-GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
-                                     GtkAdjustment *weight_adj);
-
-G_END_DECLS
-
-#endif /* __GTK_FONT_PLANE_H__ */

demos/gtk-demo/foreigndrawing.c

@@ -830,7 +830,6 @@ draw_spinbutton (GtkWidget *widget,
   GtkIconTheme *icon_theme;
   GtkIconInfo *icon_info;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   gint icon_width, icon_height, icon_size;
   gint button_width;
   gint contents_x, contents_y, contents_width, contents_height;
@@ -851,33 +850,30 @@ draw_spinbutton (GtkWidget *widget,
   draw_style_common (spin_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
   draw_style_common (entry_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
 
-  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
 
   gtk_style_context_get (up_context,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
   pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  gtk_render_icon (up_context, cr, pixbuf, contents_x, contents_y + (contents_height - icon_size) / 2);
   g_object_unref (pixbuf);
-  g_object_unref (texture);
+
 
   gtk_style_context_get (down_context,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
   pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  gtk_render_icon (down_context, cr, pixbuf, contents_x, contents_y + (contents_height - icon_size) / 2);
   g_object_unref (pixbuf);
-  g_object_unref (texture);
 
   g_object_unref (down_context);
   g_object_unref (up_context);
@@ -964,8 +960,8 @@ do_foreigndrawing (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_title (GTK_WINDOW (window), "Foreign drawing");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/geninclude.pl.in

@@ -0,0 +1,164 @@
+#!@PERL@ -w
+
+print <<EOT;
+typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
+
+typedef struct _Demo Demo;
+
+struct _Demo 
+{
+  gchar *name;
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+  Demo *children;
+};
+
+EOT
+
+for $file (@ARGV) {
+    my %demo;
+    
+    ($basename = $file) =~ s/\.c$//;
+
+    open INFO_FILE, $file or die "Cannot open '$file'\n";
+    $title = <INFO_FILE>;
+    $title =~ s@^\s*/\*\s*@@;
+    $title =~ s@\s*$@@;
+
+    close INFO_FILE;
+
+    print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
+
+    push @demos, {"name" => $basename, "title" => $title, "file" => $file,
+		  "func"  => "do_$basename"};
+}
+
+# generate a list of 'parent names'
+foreach $href (@demos) {
+    if ($href->{"title"} =~ m|^([-\w\s]+)/[-\w\s]+$|) {
+	my $parent_name = $1;
+	my $do_next = 0;
+
+	# parent detected
+	if (@parents) {
+	    foreach $foo (@parents) {
+		if ($foo eq $parent_name) {
+		    $do_next = 1;
+		}
+	    }
+	    
+	    if ($do_next) {
+		next;
+	    }
+	}
+
+	push @parents, $parent_name;
+
+	$tmp = (@child_arrays)?($#child_arrays + 1):0;
+	push @child_arrays, "child$tmp";
+
+	push @demos, {"name" => "NULL", "title" => $parent_name, "file" => "NULL",
+		      "func" => "NULL"};
+    }
+}
+
+if (@parents) {
+    $i = 0;
+    for ($i = 0; $i <= $#parents; $i++) {
+	$first = 1;
+	
+	print "\nDemo ", $child_arrays[$i], "[] = {\n";
+	
+	$j = 0;
+	for ($j = 0; $j <= $#demos; $j++) {
+	    $href = $demos[$j];
+	    
+	    if (!$demos[$j]) {
+		next;
+	    }
+	    
+	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([-\w\s]+)$|) {
+		if ($first) {
+		    $first = 0;
+		} else {
+		    print ",\n";
+		}
+		
+		print qq (  { "$demos[$j]{name}", "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
+
+		# hack ... ugly
+		$demos[$j]{"title"} = "foo";
+	    }
+	}
+
+	print ",\n";
+	print qq (  { NULL } );
+	print "\n};\n";
+    }   
+}
+
+# sort @demos
+@demos_old = @demos;
+
+@demos = sort {
+    $a->{"title"} cmp $b->{"title"};
+} @demos_old;
+
+# sort the child arrays
+if (@child_arrays) {
+    for ($i = 0; $i <= $#child_arrays; $i++) {
+	@foo_old = @{$child_arrays[$i]};
+
+	@{$child_arrays[$i]} = sort {
+	    $a->{"title"} cmp $b->{"title"};
+	} @foo_old;
+    }
+}
+
+# toplevel
+print "\nDemo gtk_demos[] = {\n";
+
+$first = 1;
+foreach $href (@demos) {
+    $handled = 0;
+
+    # ugly evil hack
+    if ($href->{title} eq "foo") {
+	next;
+    }
+
+    if ($first) {
+	$first = 0;
+    } else {
+	print ", \n";
+    }
+
+    if (@parents) {
+	for ($i = 0; $i <= $#parents; $i++) {
+	    if ($parents[$i] eq $href->{title}) {
+
+		if ($href->{file} eq 'NULL') {
+		    print qq (  { NULL, "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
+		} else {
+		    print qq (  { "$href->{name}", "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
+		}
+		
+		$handled = 1;
+		last;
+	    }
+	}
+    }
+    
+    if ($handled) {
+	next;
+    }
+    
+    print qq (  { "$href->{name}", "$href->{title}", "$href->{file}", $href->{func}, NULL });
+}
+
+print ",\n";
+print qq (  { NULL } );
+print "\n};\n";
+
+exit 0;

demos/gtk-demo/glarea.c

@@ -390,7 +390,7 @@ create_glarea_window (GtkWidget *do_widget)
   int i;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
+  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
   gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

demos/gtk-demo/gtkfishbowl.c

@@ -106,18 +106,7 @@ gtk_fishbowl_measure (GtkWidget      *widget,
       if (!gtk_widget_get_visible (child->widget))
         continue;
 
-
-      if (orientation == GTK_ORIENTATION_HORIZONTAL)
-        {
-          gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
-        }
-      else
-        {
-          int min_width;
-
-          gtk_widget_measure (child->widget, GTK_ORIENTATION_HORIZONTAL, -1, &min_width, NULL, NULL, NULL);
-          gtk_widget_measure (child->widget, orientation, min_width, &child_min, &child_nat, NULL, NULL);
-        }
+      gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
 
       *minimum = MAX (*minimum, child_min);
       *natural = MAX (*natural, child_nat);
@@ -422,10 +411,8 @@ gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
       GtkWidget *new_widget;
 
       if (priv->use_icons)
-        {
-          new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
-          gtk_image_set_icon_size (GTK_IMAGE (new_widget), GTK_ICON_SIZE_LARGE);
-        }
+        new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()),
+                                                   GTK_ICON_SIZE_DIALOG);
       else
         new_widget = g_object_new (get_random_widget_type (), NULL);
 

demos/gtk-demo/headerbar.c

@@ -24,19 +24,19 @@ do_headerbar (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
       header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Welcome to Facebook - Log in, sign up or learn more");
       gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (header), FALSE);
 
       button = gtk_button_new ();
       icon = g_themed_icon_new ("mail-send-receive-symbolic");
-      image = gtk_image_new_from_gicon (icon);
+      image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_BUTTON);
       g_object_unref (icon);
       gtk_container_add (GTK_CONTAINER (button), image);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
@@ -44,10 +44,10 @@ do_headerbar (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON));
       gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
+      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic", GTK_ICON_SIZE_BUTTON));
       gtk_container_add (GTK_CONTAINER (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

demos/gtk-demo/hypertext.c

@@ -110,11 +110,8 @@ key_press_event (GtkWidget *text_view,
 {
   GtkTextIter iter;
   GtkTextBuffer *buffer;
-  guint keyval;
 
-  gdk_event_get_keyval ((GdkEvent *)event, &keyval);
-
-  switch (keyval)
+  switch (event->keyval)
     {
       case GDK_KEY_Return:
       case GDK_KEY_KP_Enter:
@@ -140,27 +137,31 @@ event_after (GtkWidget *text_view,
   GtkTextIter start, end, iter;
   GtkTextBuffer *buffer;
   gdouble ex, ey;
-  int x, y;
-  GdkEventType type;
+  gint x, y;
 
-  type = gdk_event_get_event_type (ev);
-
-  if (type == GDK_BUTTON_RELEASE)
+  if (ev->type == GDK_BUTTON_RELEASE)
     {
-      guint button;
+      GdkEventButton *event;
 
-      gdk_event_get_button (ev, &button);
-      if (button != GDK_BUTTON_PRIMARY)
+      event = (GdkEventButton *)ev;
+      if (event->button != GDK_BUTTON_PRIMARY)
         return FALSE;
+
+      ex = event->x;
+      ey = event->y;
     }
-  else if (type == GDK_TOUCH_END)
+  else if (ev->type == GDK_TOUCH_END)
     {
+      GdkEventTouch *event;
+
+      event = (GdkEventTouch *)ev;
+
+      ex = event->x;
+      ey = event->y;
     }
   else
     return FALSE;
 
-  gdk_event_get_coords (ev, &ex, &ey);
-
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
 
   /* we shouldn't follow a link if the user has selected something */
@@ -179,6 +180,8 @@ event_after (GtkWidget *text_view,
 }
 
 static gboolean hovering_over_link = FALSE;
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *regular_cursor = NULL;
 
 /* Looks at all tags covering the position (x, y) in the text view,
  * and if one of them is a link, change the cursor to the "hands" cursor
@@ -214,9 +217,9 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
       hovering_over_link = hovering;
 
       if (hovering_over_link)
-        gtk_widget_set_cursor_from_name (GTK_WIDGET (text_view), "pointer");
+        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), hand_cursor);
       else
-        gtk_widget_set_cursor_from_name (GTK_WIDGET (text_view), "text");
+        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
     }
 
   if (tags)
@@ -229,13 +232,11 @@ static gboolean
 motion_notify_event (GtkWidget      *text_view,
                      GdkEventMotion *event)
 {
-  gdouble ex, ey;
   gint x, y;
 
-  gdk_event_get_coords ((GdkEvent *)event, &ex, &ey);
   gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
                                          GTK_TEXT_WINDOW_WIDGET,
-                                         ex, ey, &x, &y);
+                                         event->x, event->y, &x, &y);
 
   set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
 
@@ -252,11 +253,16 @@ do_hypertext (GtkWidget *do_widget)
       GtkWidget *view;
       GtkWidget *sw;
       GtkTextBuffer *buffer;
+      GdkDisplay *display;
+
+      display = gtk_widget_get_display (do_widget);
+      hand_cursor = gdk_cursor_new_from_name (display, "pointer");
+      regular_cursor = gdk_cursor_new_from_name (display, "text");
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/iconview.c

@@ -253,8 +253,8 @@ do_iconview (GtkWidget *do_widget)
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Icon View Basics");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/iconview_edit.c

@@ -108,8 +108,8 @@ do_iconview_edit (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/images.c

@@ -54,8 +54,17 @@ progressive_updated_callback (GdkPixbufLoader *loader,
 
   image = GTK_WIDGET (data);
 
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+  /* We know the pixbuf inside the GtkImage has changed, but the image
+   * itself doesn't know this; so give it a hint by setting the pixbuf
+   * again. Queuing a redraw used to be sufficient, but nowadays GtkImage
+   * uses GtkIconHelper which caches the pixbuf state and will just redraw
+   * from the cache.
+   */
+
+  pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
+  g_object_ref (pixbuf);
   gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static gint
@@ -329,8 +338,8 @@ do_images (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
 
       g_signal_connect (window, "destroy",
@@ -353,8 +362,7 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
-      image = gtk_image_new_from_icon_name ("gtk3-demo");
-      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+      image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
@@ -390,8 +398,7 @@ do_images (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
-      image = gtk_image_new_from_gicon (gicon);
-      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 

demos/gtk-demo/infobar.c

@@ -54,8 +54,8 @@ do_infobar (GtkWidget *do_widget)
       actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/language-names.c

@@ -1,233 +0,0 @@
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <dirent.h>
-#include <locale.h>
-#include <langinfo.h>
-#include <sys/stat.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <hb-ot.h>
-
-#include "language-names.h"
-
-#define ISO_CODES_PREFIX "/usr"
-#define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
-#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-
-static GHashTable *language_map;
-
-static char *
-get_first_item_in_semicolon_list (const char *list)
-{
-  char **items;
-  char  *item;
-
-  items = g_strsplit (list, "; ", 2);
-
-  item = g_strdup (items[0]);
-  g_strfreev (items);
-
-  return item;
-}
-
-static char *
-capitalize_utf8_string (const char *str)
-{
-  char first[8] = { 0 };
-
-  if (!str)
-    return NULL;
-
-  g_unichar_to_utf8 (g_unichar_totitle (g_utf8_get_char (str)), first);
-
-  return g_strconcat (first, g_utf8_offset_to_pointer (str, 1), NULL);
-}
-
-static char *
-get_display_name (const char *language)
-{
-  const char  *translated;
-  char *tmp;
-  char *name;
-
-  translated = dgettext ("iso_639", language);
-
-  tmp = get_first_item_in_semicolon_list (translated);
-  name = capitalize_utf8_string (tmp);
-  g_free (tmp);
-
-  return name;
-}
-
-static void
-languages_parse_start_tag (GMarkupParseContext  *ctx,
-                           const char           *element_name,
-                           const char          **attr_names,
-                           const char          **attr_values,
-                           gpointer              user_data,
-                           GError              **error)
-{
-  const char *ccode_longB;
-  const char *ccode_longT;
-  const char *ccode;
-  const char *ccode_id;
-  const char *lang_name;
-  char *display_name;
-
-  if (!(g_str_equal (element_name, "iso_639_entry") ||
-        g_str_equal (element_name, "iso_639_3_entry")) ||
-        attr_names == NULL ||
-        attr_values == NULL)
-    return;
-
-  ccode = NULL;
-  ccode_longB = NULL;
-  ccode_longT = NULL;
-  ccode_id = NULL;
-  lang_name = NULL;
-
-  while (*attr_names && *attr_values)
-    {
-      if (g_str_equal (*attr_names, "iso_639_1_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 2)
-                return;
-              ccode = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "iso_639_2B_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 3)
-                return;
-              ccode_longB = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "iso_639_2T_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 3)
-                return;
-              ccode_longT = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "id"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 2 &&
-                  strlen (*attr_values) != 3)
-                return;
-              ccode_id = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "name"))
-        {
-          lang_name = *attr_values;
-        }
-
-      ++attr_names;
-      ++attr_values;
-    }
-
-  if (lang_name == NULL)
-    return;
-
-  display_name = get_display_name (lang_name);
-
-  if (ccode != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode),
-                         g_strdup (display_name));
-
-  if (ccode_longB != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_longB),
-                         g_strdup (display_name));
-
-  if (ccode_longT != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_longT),
-                         g_strdup (display_name));
-
-  if (ccode_id != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_id),
-                         g_strdup (display_name));
-
-  g_free (display_name);
-}
-
-static void
-languages_variant_init (const char *variant)
-{
-  gboolean res;
-  gsize    buf_len;
-  g_autofree char *buf = NULL;
-  g_autofree char *filename = NULL;
-  g_autoptr (GError) error = NULL;
-
-  bindtextdomain (variant, ISO_CODES_LOCALESDIR);
-  bind_textdomain_codeset (variant, "UTF-8");
-
-  error = NULL;
-  filename = g_strconcat (ISO_CODES_DATADIR, "/", variant, ".xml", NULL);
-  res = g_file_get_contents (filename, &buf, &buf_len, &error);
-  if (res)
-    {
-      g_autoptr (GMarkupParseContext) ctx = NULL;
-      GMarkupParser parser = { languages_parse_start_tag, NULL, NULL, NULL, NULL };
-
-      ctx = g_markup_parse_context_new (&parser, 0, NULL, NULL);
-
-      error = NULL;
-      res = g_markup_parse_context_parse (ctx, buf, buf_len, &error);
-
-      if (!res)
-        g_warning ("Failed to parse '%s': %s\n", filename, error->message);
-    }
-  else
-    g_warning ("Failed to load '%s': %s\n", filename, error->message);
-}
-
-static void
-languages_init (void)
-{
-  if (language_map)
-    return;
-
-  language_map = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-  languages_variant_init ("iso_639");
-  languages_variant_init ("iso_639_3");
-}
-
-const char *
-get_language_name (PangoLanguage *language)
-{
-  languages_init ();
-
-  return (const char *) g_hash_table_lookup (language_map, language);
-}
-
-const char *
-get_language_name_for_tag (guint32 tag)
-{
-  hb_language_t lang;
-  const char *s;
-
-  lang = hb_ot_tag_to_language (tag);
-  s = hb_language_to_string (lang);
-
-  return get_language_name (pango_language_from_string (s));
-}

demos/gtk-demo/language-names.h

@@ -1,13 +0,0 @@
-#ifndef LANGUAGE_NAMES_H
-#define LANGUAGE_NAMES_H
-
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-const char * get_language_name (PangoLanguage *language);
-const char * get_language_name_for_tag (guint32 tag);
-
-G_END_DECLS
-
-#endif

demos/gtk-demo/links.c

@@ -53,8 +53,8 @@ do_links (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/list_store.c

@@ -256,8 +256,8 @@ do_list_store (GtkWidget *do_widget)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Store");
 
       g_signal_connect (window, "destroy",
@@ -283,7 +283,6 @@ do_list_store (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
-      gtk_widget_set_vexpand (treeview, TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
                                        COLUMN_DESCRIPTION);
 

demos/gtk-demo/listbox.c

@@ -197,10 +197,7 @@ gtk_message_row_update (GtkMessageRow *row)
     gtk_button_set_label (GTK_BUTTON (priv->resent_by_button), priv->message->resent_by);
 
   if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0)
-    {
-      gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo");
-      gtk_image_set_icon_size (priv->avatar_image, GTK_ICON_SIZE_LARGE);
-    }
+    gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo", GTK_ICON_SIZE_DND);
   else
     gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_other);
 
@@ -348,8 +345,8 @@ do_listbox (GtkWidget *do_widget)
       avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL);
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Box");
       gtk_window_set_default_size (GTK_WINDOW (window),
                                    400, 600);

demos/gtk-demo/main.c

@@ -256,7 +256,7 @@ static gchar *types[] =
   "GtkTreeIter ",
   "GtkTreeViewColumn ",
   "GdkDisplayManager ",
-  "GdkClipboard ",
+  "GtkClipboard ",
   "GtkIconSize ",
   "GtkImage ",
   "GdkDragContext ",
@@ -300,6 +300,7 @@ static gchar *types[] =
   "GdkEvent ",
   "GdkEventKey ",
   "GtkTextView ",
+  "GdkEventVisibility ",
   "GdkBitmap ",
   "GtkTextChildAnchor ",
   "GArray ",
@@ -555,7 +556,8 @@ add_data_tab (const gchar *demoname)
       resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);
 
       widget = gtk_image_new_from_resource (resource_name);
-      if (gtk_image_get_surface (GTK_IMAGE (widget)) == NULL)
+      if (gtk_image_get_pixbuf (GTK_IMAGE (widget)) == NULL &&
+          gtk_image_get_animation (GTK_IMAGE (widget)) == NULL)
         {
           GBytes *bytes;
 
@@ -590,17 +592,6 @@ add_data_tab (const gchar *demoname)
           g_bytes_unref (bytes);
         }
 
-      if (GTK_IS_IMAGE (widget))
-        {
-          GtkWidget *sw;
-
-          gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
-          gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-          sw = gtk_scrolled_window_new (NULL, NULL);
-          gtk_container_add (GTK_CONTAINER (sw), widget);
-          widget = sw;
-        }
-
       label = gtk_label_new (resources[i]);
       gtk_widget_show (label);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
@@ -956,7 +947,7 @@ start_cb (GtkMenuItem *item, GtkWidget *scrollbar)
 {
   GtkAdjustment *adj;
 
-  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  adj = gtk_range_get_adjustment (GTK_RANGE (scrollbar));
   gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
 }
 
@@ -965,7 +956,7 @@ end_cb (GtkMenuItem *item, GtkWidget *scrollbar)
 {
   GtkAdjustment *adj;
 
-  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  adj = gtk_range_get_adjustment (GTK_RANGE (scrollbar));
   gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
 }
 

demos/gtk-demo/main.ui

@@ -24,7 +24,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">1</property>
-        <property name="show-title-buttons">1</property>
+        <property name="show-close-button">1</property>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>

demos/gtk-demo/markup.c

@@ -53,8 +53,8 @@ do_markup (GtkWidget *do_widget)
       GtkWidget *show_source;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -68,7 +68,7 @@ do_markup (GtkWidget *do_widget)
       g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack);
 
       header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 

demos/gtk-demo/menus.c

@@ -96,8 +96,8 @@ do_menus (GtkWidget *do_widget)
       GtkAccelGroup *accel_group;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Menus");
       g_signal_connect (window, "destroy",
                         G_CALLBACK(gtk_widget_destroyed), &window);

demos/gtk-demo/meson.build

@@ -18,7 +18,6 @@ demos = files([
   'cursors.c',
   'dialog.c',
   'drawingarea.c',
-  'dnd.c',
   'editable_cells.c',
   'entry_buffer.c',
   'entry_completion.c',
@@ -94,7 +93,7 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
                                             source_dir: '.')
 
 executable('gtk4-demo',
-           'main.c', 'gtkfishbowl.c', 'fontplane.c', 'script-names.c', 'language-names.c', demos, demos_h, gtkdemo_resources,
+           'main.c', 'gtkfishbowl.c', demos, demos_h, gtkdemo_resources,
            c_args: gtkdemo_args,
            dependencies: gtkdemo_deps,
            include_directories: confinc,

demos/gtk-demo/modelbutton.c

@@ -43,8 +43,8 @@ do_modelbutton (GtkWidget *do_widget)
       gtk_builder_add_callback_symbol (builder, "tool_clicked", G_CALLBACK (tool_clicked));
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/modelbutton.ui

@@ -5,7 +5,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <property name="visible">1</property>
-        <property name="show-title-buttons">1</property>
+        <property name="show-close-button">1</property>
         <property name="title" translatable="yes">Model Button</property>
       </object>
     </child>

demos/gtk-demo/overlay.c

@@ -64,15 +64,11 @@ do_overlay (GtkWidget *do_widget)
       label = gtk_label_new ("<span foreground='blue' weight='ultrabold' font='40'>Numbers</span>");
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       gtk_widget_set_margin_top (label, 8);
-      gtk_widget_set_margin_bottom (label, 50);
+      gtk_widget_set_margin_bottom (label, 8);
       gtk_box_pack_start (GTK_BOX (vbox), label);
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
-      gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
       gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
-      gtk_widget_set_margin_top (entry, 50);
+      gtk_widget_set_margin_top (entry, 8);
       gtk_widget_set_margin_bottom (entry, 8);
       gtk_box_pack_start (GTK_BOX (vbox), entry);
 

demos/gtk-demo/panes.c

@@ -135,8 +135,8 @@ do_panes (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/pickers.c

@@ -15,8 +15,8 @@ do_pickers (GtkWidget *do_widget)
   if (!window)
   {
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_display (GTK_WINDOW (window),
-                            gtk_widget_get_display (do_widget));
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Pickers");
 
     g_signal_connect (window, "destroy",

demos/gtk-demo/pixbufs.c

@@ -175,8 +175,8 @@ do_pixbufs (GtkWidget *do_widget)
       GError *error;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 

demos/gtk-demo/popover.c

@@ -97,20 +97,21 @@ day_selected_cb (GtkCalendar *calendar,
                  gpointer     user_data)
 {
   cairo_rectangle_int_t rect;
+  GtkAllocation allocation;
   GtkWidget *popover;
   GdkEvent *event;
-  gdouble x, y;
 
   event = gtk_get_current_event ();
 
-  if (gdk_event_get_event_type (event) != GDK_BUTTON_PRESS)
+  if (event->type != GDK_BUTTON_PRESS)
     return;
 
-  gdk_event_get_coords (event, &x, &y);
-  gtk_widget_translate_coordinates (gtk_get_event_widget (event),
-                                    GTK_WIDGET (calendar),
-                                    x, y,
-                                    &rect.x, &rect.y);
+  gdk_window_coords_to_parent (event->button.window,
+                               event->button.x, event->button.y,
+                               &event->button.x, &event->button.y);
+  gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+  rect.x = event->button.x - allocation.x;
+  rect.y = event->button.y - allocation.y;
   rect.width = rect.height = 1;
 
   popover = create_popover (GTK_WIDGET (calendar),

demos/gtk-demo/revealer.c

@@ -71,8 +71,8 @@ do_revealer (GtkWidget *do_widget)
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
       g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);

demos/gtk-demo/revealer.ui

@@ -19,7 +19,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -37,7 +37,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -55,7 +55,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -72,7 +72,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -90,7 +90,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -108,7 +108,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -126,7 +126,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -143,7 +143,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>
@@ -161,7 +161,7 @@
               <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">6</property>
               </object>
             </child>
           </object>

demos/gtk-demo/rotated_text.c

@@ -179,8 +179,8 @@ do_rotated_text (GtkWidget *do_widget)
       PangoAttrList *attrs;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
       gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
       g_signal_connect (window, "destroy",

demos/gtk-demo/scale.c

@@ -20,8 +20,8 @@ do_scale (GtkWidget *do_widget)
       builder = gtk_builder_new_from_resource ("/scale/scale.ui");
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/script-names.c

@@ -1,184 +0,0 @@
-#include "config.h"
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <hb-ot.h>
-
-#include "script-names.h"
-
-static struct {
-  GUnicodeScript script;
-  hb_script_t hb_script;
-  const char *name;
-} scripts[] =
-{
-  { G_UNICODE_SCRIPT_COMMON, HB_SCRIPT_COMMON,  NULL },
-  { G_UNICODE_SCRIPT_INHERITED, HB_SCRIPT_INHERITED,  NULL },
-  { G_UNICODE_SCRIPT_ARABIC, HB_SCRIPT_ARABIC,  NC_("Script", "Arabic") },
-  { G_UNICODE_SCRIPT_ARMENIAN, HB_SCRIPT_ARMENIAN,  NC_("Script", "Armenian") },
-  { G_UNICODE_SCRIPT_BENGALI, HB_SCRIPT_BENGALI,  NC_("Script", "Bengali") },
-  { G_UNICODE_SCRIPT_BOPOMOFO, HB_SCRIPT_BOPOMOFO,  NC_("Script", "Bopomofo") },
-  { G_UNICODE_SCRIPT_CHEROKEE, HB_SCRIPT_CHEROKEE,  NC_("Script", "Cherokee") },
-  { G_UNICODE_SCRIPT_COPTIC, HB_SCRIPT_COPTIC,  NC_("Script", "Coptic") },
-  { G_UNICODE_SCRIPT_CYRILLIC, HB_SCRIPT_CYRILLIC,  NC_("Script", "Cyrillic") },
-  { G_UNICODE_SCRIPT_DESERET, HB_SCRIPT_DESERET,  NC_("Script", "Deseret") },
-  { G_UNICODE_SCRIPT_DEVANAGARI, HB_SCRIPT_DEVANAGARI,  NC_("Script", "Devanagari") },
-  { G_UNICODE_SCRIPT_ETHIOPIC, HB_SCRIPT_ETHIOPIC,  NC_("Script", "Ethiopic") },
-  { G_UNICODE_SCRIPT_GEORGIAN, HB_SCRIPT_GEORGIAN,  NC_("Script", "Georgian") },
-  { G_UNICODE_SCRIPT_GOTHIC, HB_SCRIPT_GOTHIC,  NC_("Script", "Gothic") },
-  { G_UNICODE_SCRIPT_GREEK, HB_SCRIPT_GREEK,  NC_("Script", "Greek") },
-  { G_UNICODE_SCRIPT_GUJARATI, HB_SCRIPT_GUJARATI,  NC_("Script", "Gujarati") },
-  { G_UNICODE_SCRIPT_GURMUKHI, HB_SCRIPT_GURMUKHI,  NC_("Script", "Gurmukhi") },
-  { G_UNICODE_SCRIPT_HAN, HB_SCRIPT_HAN,  NC_("Script", "Han") },
-  { G_UNICODE_SCRIPT_HANGUL, HB_SCRIPT_HANGUL,  NC_("Script", "Hangul") },
-  { G_UNICODE_SCRIPT_HEBREW, HB_SCRIPT_HEBREW,  NC_("Script", "Hebrew") },
-  { G_UNICODE_SCRIPT_HIRAGANA, HB_SCRIPT_HIRAGANA,  NC_("Script", "Hiragana") },
-  { G_UNICODE_SCRIPT_KANNADA, HB_SCRIPT_KANNADA,  NC_("Script", "Kannada") },
-  { G_UNICODE_SCRIPT_KATAKANA, HB_SCRIPT_KATAKANA,  NC_("Script", "Katakana") },
-  { G_UNICODE_SCRIPT_KHMER, HB_SCRIPT_KHMER,  NC_("Script", "Khmer") },
-  { G_UNICODE_SCRIPT_LAO, HB_SCRIPT_LAO,  NC_("Script", "Lao") },
-  { G_UNICODE_SCRIPT_LATIN, HB_SCRIPT_LATIN,  NC_("Script", "Latin") },
-  { G_UNICODE_SCRIPT_MALAYALAM, HB_SCRIPT_MALAYALAM,  NC_("Script", "Malayalam") },
-  { G_UNICODE_SCRIPT_MONGOLIAN, HB_SCRIPT_MONGOLIAN,  NC_("Script", "Mongolian") },
-  { G_UNICODE_SCRIPT_MYANMAR, HB_SCRIPT_MYANMAR,  NC_("Script", "Myanmar") },
-  { G_UNICODE_SCRIPT_OGHAM, HB_SCRIPT_OGHAM,  NC_("Script", "Ogham") },
-  { G_UNICODE_SCRIPT_OLD_ITALIC, HB_SCRIPT_OLD_ITALIC,  NC_("Script", "Old Italic") },
-  { G_UNICODE_SCRIPT_ORIYA, HB_SCRIPT_ORIYA,  NC_("Script", "Oriya") },
-  { G_UNICODE_SCRIPT_RUNIC, HB_SCRIPT_RUNIC,  NC_("Script", "Runic") },
-  { G_UNICODE_SCRIPT_SINHALA, HB_SCRIPT_SINHALA,  NC_("Script", "Sinhala") },
-  { G_UNICODE_SCRIPT_SYRIAC, HB_SCRIPT_SYRIAC,  NC_("Script", "Syriac") },
-  { G_UNICODE_SCRIPT_TAMIL, HB_SCRIPT_TAMIL,  NC_("Script", "Tamil") },
-  { G_UNICODE_SCRIPT_TELUGU, HB_SCRIPT_TELUGU,  NC_("Script", "Telugu") },
-  { G_UNICODE_SCRIPT_THAANA, HB_SCRIPT_THAANA,  NC_("Script", "Thaana") },
-  { G_UNICODE_SCRIPT_THAI, HB_SCRIPT_THAI,  NC_("Script", "Thai") },
-  { G_UNICODE_SCRIPT_TIBETAN, HB_SCRIPT_TIBETAN,  NC_("Script", "Tibetan") },
-  { G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, HB_SCRIPT_CANADIAN_ABORIGINAL,  NC_("Script", "Canadian Aboriginal") },
-  { G_UNICODE_SCRIPT_YI, HB_SCRIPT_YI,  NC_("Script", "Yi") },
-  { G_UNICODE_SCRIPT_TAGALOG, HB_SCRIPT_TAGALOG,  NC_("Script", "Tagalog") },
-  { G_UNICODE_SCRIPT_HANUNOO, HB_SCRIPT_HANUNOO,  NC_("Script", "Hanunoo") },
-  { G_UNICODE_SCRIPT_BUHID, HB_SCRIPT_BUHID,  NC_("Script", "Buhid") },
-  { G_UNICODE_SCRIPT_TAGBANWA, HB_SCRIPT_TAGBANWA,  NC_("Script", "Tagbanwa") },
-  { G_UNICODE_SCRIPT_BRAILLE, HB_SCRIPT_BRAILLE,  NC_("Script", "Braille") },
-  { G_UNICODE_SCRIPT_CYPRIOT, HB_SCRIPT_CYPRIOT,  NC_("Script", "Cypriot") },
-  { G_UNICODE_SCRIPT_LIMBU, HB_SCRIPT_LIMBU,  NC_("Script", "Limbu") },
-  { G_UNICODE_SCRIPT_OSMANYA, HB_SCRIPT_OSMANYA,  NC_("Script", "Osmanya") },
-  { G_UNICODE_SCRIPT_SHAVIAN, HB_SCRIPT_SHAVIAN,  NC_("Script", "Shavian") },
-  { G_UNICODE_SCRIPT_LINEAR_B, HB_SCRIPT_LINEAR_B,  NC_("Script", "Linear B") },
-  { G_UNICODE_SCRIPT_TAI_LE, HB_SCRIPT_TAI_LE,  NC_("Script", "Tai Le") },
-  { G_UNICODE_SCRIPT_UGARITIC, HB_SCRIPT_UGARITIC,  NC_("Script", "Ugaritic") },
-  { G_UNICODE_SCRIPT_NEW_TAI_LUE, HB_SCRIPT_NEW_TAI_LUE,  NC_("Script", "New Tai Lue") },
-  { G_UNICODE_SCRIPT_BUGINESE, HB_SCRIPT_BUGINESE,  NC_("Script", "Buginese") },
-  { G_UNICODE_SCRIPT_GLAGOLITIC, HB_SCRIPT_GLAGOLITIC,  NC_("Script", "Glagolitic") },
-  { G_UNICODE_SCRIPT_TIFINAGH, HB_SCRIPT_TIFINAGH,  NC_("Script", "Tifinagh") },
-  { G_UNICODE_SCRIPT_SYLOTI_NAGRI, HB_SCRIPT_SYLOTI_NAGRI,  NC_("Script", "Syloti Nagri") },
-  { G_UNICODE_SCRIPT_OLD_PERSIAN, HB_SCRIPT_OLD_PERSIAN,  NC_("Script", "Old Persian") },
-  { G_UNICODE_SCRIPT_KHAROSHTHI, HB_SCRIPT_KHAROSHTHI,  NC_("Script", "Kharoshthi") },
-  { G_UNICODE_SCRIPT_UNKNOWN, HB_SCRIPT_UNKNOWN,  NC_("Script", "Unknown") },
-  { G_UNICODE_SCRIPT_BALINESE, HB_SCRIPT_BALINESE,  NC_("Script", "Balinese") },
-  { G_UNICODE_SCRIPT_CUNEIFORM, HB_SCRIPT_CUNEIFORM,  NC_("Script", "Cuneiform") },
-  { G_UNICODE_SCRIPT_PHOENICIAN, HB_SCRIPT_PHOENICIAN,  NC_("Script", "Phoenician") },
-  { G_UNICODE_SCRIPT_PHAGS_PA, HB_SCRIPT_PHAGS_PA,  NC_("Script", "Phags-pa") },
-  { G_UNICODE_SCRIPT_NKO, HB_SCRIPT_NKO,  NC_("Script", "N'Ko") },
-  { G_UNICODE_SCRIPT_KAYAH_LI, HB_SCRIPT_KAYAH_LI,  NC_("Script", "Kayah Li") },
-  { G_UNICODE_SCRIPT_LEPCHA, HB_SCRIPT_LEPCHA,  NC_("Script", "Lepcha") },
-  { G_UNICODE_SCRIPT_REJANG, HB_SCRIPT_REJANG,  NC_("Script", "Rejang") },
-  { G_UNICODE_SCRIPT_SUNDANESE, HB_SCRIPT_SUNDANESE,  NC_("Script", "Sundanese") },
-  { G_UNICODE_SCRIPT_SAURASHTRA, HB_SCRIPT_SAURASHTRA,  NC_("Script", "Saurashtra") },
-  { G_UNICODE_SCRIPT_CHAM, HB_SCRIPT_CHAM,  NC_("Script", "Cham") },
-  { G_UNICODE_SCRIPT_OL_CHIKI, HB_SCRIPT_OL_CHIKI,  NC_("Script", "Ol Chiki") },
-  { G_UNICODE_SCRIPT_VAI, HB_SCRIPT_VAI,  NC_("Script", "Vai") },
-  { G_UNICODE_SCRIPT_CARIAN, HB_SCRIPT_CARIAN,  NC_("Script", "Carian") },
-  { G_UNICODE_SCRIPT_LYCIAN, HB_SCRIPT_LYCIAN,  NC_("Script", "Lycian") },
-  { G_UNICODE_SCRIPT_LYDIAN, HB_SCRIPT_LYDIAN,  NC_("Script", "Lydian") },
-  { G_UNICODE_SCRIPT_AVESTAN, HB_SCRIPT_AVESTAN,  NC_("Script", "Avestan") },
-  { G_UNICODE_SCRIPT_BAMUM, HB_SCRIPT_BAMUM,  NC_("Script", "Bamum") },
-  { G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS, HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,  NC_("Script", "Egyptian Hieroglpyhs") },
-  { G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC, HB_SCRIPT_IMPERIAL_ARAMAIC,  NC_("Script", "Imperial Aramaic") },
-  { G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI, HB_SCRIPT_INSCRIPTIONAL_PAHLAVI,  NC_("Script", "Inscriptional Pahlavi") },
-  { G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, HB_SCRIPT_INSCRIPTIONAL_PARTHIAN,  NC_("Script", "Inscriptional Parthian") },
-  { G_UNICODE_SCRIPT_JAVANESE, HB_SCRIPT_JAVANESE,  NC_("Script", "Javanese") },
-  { G_UNICODE_SCRIPT_KAITHI, HB_SCRIPT_KAITHI,  NC_("Script", "Kaithi") },
-  { G_UNICODE_SCRIPT_LISU, HB_SCRIPT_LISU,  NC_("Script", "Lisu") },
-  { G_UNICODE_SCRIPT_MEETEI_MAYEK, HB_SCRIPT_MEETEI_MAYEK,  NC_("Script", "Meetei Mayek") },
-  { G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN, HB_SCRIPT_OLD_SOUTH_ARABIAN,  NC_("Script", "Old South Arabian") },
-  { G_UNICODE_SCRIPT_OLD_TURKIC, HB_SCRIPT_OLD_TURKIC,  NC_("Script", "Old Turkic") },
-  { G_UNICODE_SCRIPT_SAMARITAN, HB_SCRIPT_SAMARITAN,  NC_("Script", "Samaritan") },
-  { G_UNICODE_SCRIPT_TAI_THAM, HB_SCRIPT_TAI_THAM,  NC_("Script", "Tai Tham") },
-  { G_UNICODE_SCRIPT_TAI_VIET, HB_SCRIPT_TAI_VIET,  NC_("Script", "Tai Viet") },
-  { G_UNICODE_SCRIPT_BATAK, HB_SCRIPT_BATAK,  NC_("Script", "Batak") },
-  { G_UNICODE_SCRIPT_BRAHMI, HB_SCRIPT_BRAHMI,  NC_("Script", "Brahmi") },
-  { G_UNICODE_SCRIPT_MANDAIC, HB_SCRIPT_MANDAIC,  NC_("Script", "Mandaic") },
-  { G_UNICODE_SCRIPT_CHAKMA, HB_SCRIPT_CHAKMA,  NC_("Script", "Chakma") },
-  { G_UNICODE_SCRIPT_MEROITIC_CURSIVE, HB_SCRIPT_MEROITIC_CURSIVE,  NC_("Script", "Meroitic Cursive") },
-  { G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS, HB_SCRIPT_MEROITIC_HIEROGLYPHS,  NC_("Script", "Meroitic Hieroglyphs") },
-  { G_UNICODE_SCRIPT_MIAO, HB_SCRIPT_MIAO,  NC_("Script", "Miao") },
-  { G_UNICODE_SCRIPT_SHARADA, HB_SCRIPT_SHARADA,  NC_("Script", "Sharada") },
-  { G_UNICODE_SCRIPT_SORA_SOMPENG, HB_SCRIPT_SORA_SOMPENG,  NC_("Script", "Sora Sompeng") },
-  { G_UNICODE_SCRIPT_TAKRI, HB_SCRIPT_TAKRI,  NC_("Script", "Takri") },
-  { G_UNICODE_SCRIPT_BASSA_VAH, HB_SCRIPT_BASSA_VAH,  NC_("Script", "Bassa") },
-  { G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN, HB_SCRIPT_CAUCASIAN_ALBANIAN,  NC_("Script", "Caucasian Albanian") },
-  { G_UNICODE_SCRIPT_DUPLOYAN, HB_SCRIPT_DUPLOYAN,  NC_("Script", "Duployan") },
-  { G_UNICODE_SCRIPT_ELBASAN, HB_SCRIPT_ELBASAN,  NC_("Script", "Elbasan") },
-  { G_UNICODE_SCRIPT_GRANTHA, HB_SCRIPT_GRANTHA,  NC_("Script", "Grantha") },
-  { G_UNICODE_SCRIPT_KHOJKI, HB_SCRIPT_KHOJKI,  NC_("Script", "Kjohki") },
-  { G_UNICODE_SCRIPT_KHUDAWADI, HB_SCRIPT_KHUDAWADI,  NC_("Script", "Khudawadi, Sindhi") },
-  { G_UNICODE_SCRIPT_LINEAR_A, HB_SCRIPT_LINEAR_A,  NC_("Script", "Linear A") },
-  { G_UNICODE_SCRIPT_MAHAJANI, HB_SCRIPT_MAHAJANI,  NC_("Script", "Mahajani") },
-  { G_UNICODE_SCRIPT_MANICHAEAN, HB_SCRIPT_MANICHAEAN,  NC_("Script", "Manichaean") },
-  { G_UNICODE_SCRIPT_MENDE_KIKAKUI, HB_SCRIPT_MENDE_KIKAKUI,  NC_("Script", "Mende Kikakui") },
-  { G_UNICODE_SCRIPT_MODI, HB_SCRIPT_MODI,  NC_("Script", "Modi") },
-  { G_UNICODE_SCRIPT_MRO, HB_SCRIPT_MRO,  NC_("Script", "Mro") },
-  { G_UNICODE_SCRIPT_NABATAEAN, HB_SCRIPT_NABATAEAN,  NC_("Script", "Nabataean") },
-  { G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN, HB_SCRIPT_OLD_NORTH_ARABIAN,  NC_("Script", "Old North Arabian") },
-  { G_UNICODE_SCRIPT_OLD_PERMIC, HB_SCRIPT_OLD_PERMIC,  NC_("Script", "Old Permic") },
-  { G_UNICODE_SCRIPT_PAHAWH_HMONG, HB_SCRIPT_PAHAWH_HMONG,  NC_("Script", "Pahawh Hmong") },
-  { G_UNICODE_SCRIPT_PALMYRENE, HB_SCRIPT_PALMYRENE,  NC_("Script", "Palmyrene") },
-  { G_UNICODE_SCRIPT_PAU_CIN_HAU, HB_SCRIPT_PAU_CIN_HAU,  NC_("Script", "Pau Cin Hau") },
-  { G_UNICODE_SCRIPT_PSALTER_PAHLAVI, HB_SCRIPT_PSALTER_PAHLAVI,  NC_("Script", "Psalter Pahlavi") },
-  { G_UNICODE_SCRIPT_SIDDHAM, HB_SCRIPT_SIDDHAM,  NC_("Script", "Siddham") },
-  { G_UNICODE_SCRIPT_TIRHUTA, HB_SCRIPT_TIRHUTA,  NC_("Script", "Tirhuta") },
-  { G_UNICODE_SCRIPT_WARANG_CITI, HB_SCRIPT_WARANG_CITI,  NC_("Script", "Warang Citi") },
-  { G_UNICODE_SCRIPT_AHOM, HB_SCRIPT_AHOM,  NC_("Script", "Ahom") },
-  { G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS, HB_SCRIPT_ANATOLIAN_HIEROGLYPHS,  NC_("Script", "Anatolian Hieroglyphs") },
-  { G_UNICODE_SCRIPT_HATRAN, HB_SCRIPT_HATRAN,  NC_("Script", "Hatran") },
-  { G_UNICODE_SCRIPT_MULTANI, HB_SCRIPT_MULTANI,  NC_("Script", "Multani") },
-  { G_UNICODE_SCRIPT_OLD_HUNGARIAN, HB_SCRIPT_OLD_HUNGARIAN,  NC_("Script", "Old Hungarian") },
-  { G_UNICODE_SCRIPT_SIGNWRITING, HB_SCRIPT_SIGNWRITING,  NC_("Script", "Signwriting") },
-  { G_UNICODE_SCRIPT_ADLAM, HB_SCRIPT_ADLAM,  NC_("Script", "Adlam") },
-  { G_UNICODE_SCRIPT_BHAIKSUKI, HB_SCRIPT_BHAIKSUKI,  NC_("Script", "Bhaiksuki") },
-  { G_UNICODE_SCRIPT_MARCHEN, HB_SCRIPT_MARCHEN,  NC_("Script", "Marchen") },
-  { G_UNICODE_SCRIPT_NEWA, HB_SCRIPT_NEWA,  NC_("Script", "Newa") },
-  { G_UNICODE_SCRIPT_OSAGE, HB_SCRIPT_OSAGE,  NC_("Script", "Osage") },
-  { G_UNICODE_SCRIPT_TANGUT, HB_SCRIPT_TANGUT,  NC_("Script", "Tangut") },
-  { G_UNICODE_SCRIPT_MASARAM_GONDI, HB_SCRIPT_INVALID,  NC_("Script", "Masaram Gondi") },
-  { G_UNICODE_SCRIPT_NUSHU, HB_SCRIPT_INVALID,  NC_("Script", "Nushu") },
-  { G_UNICODE_SCRIPT_SOYOMBO, HB_SCRIPT_INVALID,  NC_("Script", "Soyombo") },
-  { G_UNICODE_SCRIPT_ZANABAZAR_SQUARE, HB_SCRIPT_INVALID,  NC_("Script", "Zanabazar Square") },
-};
-
-const char *
-get_script_name (GUnicodeScript script)
-{
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (scripts); i++)
-    {
-      if (scripts[i].script == script)
-        return g_dpgettext2 (GETTEXT_PACKAGE, "Script", scripts[i].name);
-    }
-
-  return NULL;
-}
-
-const char *
-get_script_name_for_tag (guint32 tag)
-{
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (scripts); i++)
-    {
-      if (scripts[i].hb_script == hb_script_from_iso15924_tag (tag))
-        return g_dpgettext2 (GETTEXT_PACKAGE, "Script", scripts[i].name);
-    }
-
-  return NULL;
-}

demos/gtk-demo/script-names.h

@@ -1,13 +0,0 @@
-#ifndef SCRIPT_NAMES_H
-#define SCRIPT_NAMES_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-const char * get_script_name (GUnicodeScript script);
-const char * get_script_name_for_tag (guint32 tag);
-
-G_END_DECLS
-
-#endif

demos/gtk-demo/search_entry.c

@@ -229,7 +229,7 @@ do_search_entry (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Search Entry");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",

demos/gtk-demo/shortcuts.c

@@ -97,8 +97,8 @@ do_shortcuts (GtkWidget *do_widget)
                                         NULL);
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/sidebar.c

@@ -40,7 +40,7 @@ do_sidebar (GtkWidget *do_widget)
       gtk_widget_set_size_request (window, 500, 350);
 
       header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR(header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header), TRUE);
       gtk_window_set_titlebar (GTK_WINDOW(window), header);
       gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar");
 
@@ -65,7 +65,7 @@ do_sidebar (GtkWidget *do_widget)
         {
           if (i == 0)
             {
-              widget = gtk_image_new_from_icon_name ("help-about");
+              widget = gtk_image_new_from_icon_name ("help-about", GTK_ICON_SIZE_MENU);
               gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
             }
           else

demos/gtk-demo/sizegroup.c

@@ -101,7 +101,7 @@ do_sizegroup (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Size Groups");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",

demos/gtk-demo/spinbutton.c

@@ -201,8 +201,8 @@ do_spinbutton (GtkWidget *do_widget)
                                       NULL);
     gtk_builder_connect_signals (builder, NULL);
     window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-    gtk_window_set_display (GTK_WINDOW (window),
-                            gtk_widget_get_display (do_widget));
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Spin Buttons");
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
     g_signal_connect (window, "destroy",

demos/gtk-demo/stack.c

@@ -20,8 +20,8 @@ do_stack (GtkWidget *do_widget)
       builder = gtk_builder_new_from_resource ("/stack/stack.ui");
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/tabs.c

@@ -20,8 +20,8 @@ do_tabs (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_title (GTK_WINDOW (window), "Tabs");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/textview.c

@@ -129,7 +129,6 @@ insert_text (GtkTextBuffer *buffer)
   GtkTextIter iter;
   GtkTextIter start, end;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   GtkIconTheme *icon_theme;
 
   icon_theme = gtk_icon_theme_get_default ();
@@ -139,7 +138,6 @@ insert_text (GtkTextBuffer *buffer)
                                      GTK_ICON_LOOKUP_GENERIC_FALLBACK,
                                      NULL);
   g_assert (pixbuf);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
 
   /* get start of buffer; each insertion will revalidate the
    * iterator to point to just after the inserted text.
@@ -234,9 +232,9 @@ insert_text (GtkTextBuffer *buffer)
                                             "heading", NULL);
 
   gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
-  gtk_text_buffer_insert_texture (buffer, &iter, texture);
-  gtk_text_buffer_insert_texture (buffer, &iter, texture);
-  gtk_text_buffer_insert_texture (buffer, &iter, texture);
+  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
+  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
+  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
   gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);
 
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Spacing. ", -1,
@@ -365,6 +363,8 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, " and a scale: ", -1);
   gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_insert (buffer, &iter, " and an animation: ", -1);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, " finally a text entry: ", -1);
   gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
@@ -380,7 +380,6 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);
 
   g_object_unref (pixbuf);
-  g_object_unref (texture);
 }
 
 static gboolean
@@ -436,6 +435,10 @@ attach_widgets (GtkTextView *text_view)
           gtk_widget_set_size_request (widget, 70, -1);
         }
       else if (i == 3)
+        {
+          widget = gtk_image_new_from_resource ("/textview/floppybuddy.gif");
+        }
+      else if (i == 4)
         {
           widget = gtk_entry_new ();
         }
@@ -467,8 +470,8 @@ do_textview (GtkWidget *do_widget)
       GtkTextBuffer *buffer;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
                                    450, 450);
 

demos/gtk-demo/theming.ui

@@ -55,7 +55,7 @@
             <property name="label" translatable="yes">Raised</property>
             <property name="use_underline">1</property>
             <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="icon_name">edit-find-symbolic</property>
             <style>
               <class name="raised"/>
             </style>
@@ -70,7 +70,7 @@
             <property name="label" translatable="yes">Raised Active</property>
             <property name="use_underline">1</property>
             <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="icon_name">edit-find-symbolic</property>
             <property name="active">1</property>
             <style>
               <class name="raised"/>

demos/gtk-demo/theming_style_classes.c

@@ -21,8 +21,8 @@ do_theming_style_classes (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Style Classes");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",

demos/gtk-demo/toolpalette.c

@@ -39,12 +39,14 @@ canvas_item_new (GtkWidget     *widget,
   const gchar *icon_name;
   GdkPixbuf *pixbuf;
   GtkIconTheme *icon_theme;
+  int width;
 
   icon_name = gtk_tool_button_get_icon_name (button);
-  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
+  gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, NULL);
   pixbuf = gtk_icon_theme_load_icon (icon_theme,
                                      icon_name,
-                                     48,
+                                     width,
                                      GTK_ICON_LOOKUP_GENERIC_FALLBACK,
                                      NULL);
 
@@ -166,6 +168,7 @@ palette_drag_data_received (GtkWidget        *widget,
                             gint              x,
                             gint              y,
                             GtkSelectionData *selection,
+                            guint             info,
                             guint             time,
                             gpointer          data)
 {
@@ -209,6 +212,7 @@ passive_canvas_drag_data_received (GtkWidget        *widget,
                                    gint              x,
                                    gint              y,
                                    GtkSelectionData *selection,
+                                   guint             info,
                                    guint             time,
                                    gpointer          data)
 {
@@ -283,6 +287,7 @@ interactive_canvas_drag_data_received (GtkWidget        *widget,
                                        gint              x,
                                        gint              y,
                                        GtkSelectionData *selection,
+                                       guint             info,
                                        guint             time,
                                        gpointer          data)
 
@@ -322,7 +327,7 @@ interactive_canvas_drag_data_received (GtkWidget        *widget,
       canvas_items = g_list_append (canvas_items, item);
       drop_item = NULL;
 
-      gtk_drag_finish (context, TRUE, time);
+      gtk_drag_finish (context, TRUE, FALSE, time);
     } else
     {
       drop_item = item;
@@ -431,8 +436,8 @@ do_toolpalette (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Tool Palette");
       gtk_window_set_default_size (GTK_WINDOW (window), 200, 600);
 
@@ -563,8 +568,8 @@ do_toolpalette (GtkWidget *do_widget)
       contents = gtk_drawing_area_new ();
 
       g_object_connect (contents,
-                        "draw", canvas_draw, NULL,
-                        "drag-data-received", passive_canvas_drag_data_received, NULL,
+                        "signal::draw", canvas_draw, NULL,
+                        "signal::drag-data-received", passive_canvas_drag_data_received, NULL,
                         NULL);
 
       gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
@@ -589,11 +594,11 @@ do_toolpalette (GtkWidget *do_widget)
       contents = gtk_drawing_area_new ();
 
       g_object_connect (contents,
-                        "draw", canvas_draw, NULL,
-                        "drag-motion", interactive_canvas_drag_motion, NULL,
-                        "drag-data-received", interactive_canvas_drag_data_received, NULL,
-                        "drag-leave", interactive_canvas_drag_leave, contents,
-                        "drag-drop", interactive_canvas_drag_drop, NULL,
+                        "signal::draw", canvas_draw, NULL,
+                        "signal::drag-motion", interactive_canvas_drag_motion, NULL,
+                        "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
+                        "signal::drag-leave", interactive_canvas_drag_leave, contents,
+                        "signal::drag-drop", interactive_canvas_drag_drop, NULL,
                         NULL);
 
       gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
@@ -633,7 +638,7 @@ load_icon_items (GtkToolPalette *palette)
   GList *l;
   GtkIconTheme *icon_theme;
 
-  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (palette)));
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (palette)));
 
   contexts = gtk_icon_theme_list_contexts (icon_theme);
   for (l = contexts; l; l = l->next)

demos/gtk-demo/transparent.c

@@ -1,10 +1,184 @@
 /* Overlay/Transparency
  *
- * Blur the background behind an overlay.
+ * Use transparent background on GdkWindows to create a shadow effect on a GtkOverlay widget.
  */
 
 #include <gtk/gtk.h>
 
+#define SHADOW_OFFSET_X 7
+#define SHADOW_OFFSET_Y 7
+#define SHADOW_RADIUS 5
+
+static void
+draw_shadow_box (cairo_t   *cr,
+                 GdkRectangle rect,
+                 double radius,
+                 double transparency)
+{
+  cairo_pattern_t *pattern;
+  double x0, x1, x2, x3;
+  double y0, y1, y2, y3;
+
+  x0 = rect.x;
+  x1 = rect.x + radius;
+  x2 = rect.x + rect.width - radius;
+  x3 = rect.x + rect.width;
+
+  y0 = rect.y;
+  y1 = rect.y + radius;
+  y2 = rect.y + rect.height - radius;
+  y3 = rect.y + rect.height;
+
+   /* Fill non-border part */
+  cairo_set_source_rgba (cr, 0, 0, 0, transparency);
+  cairo_rectangle (cr,
+                   x1, y1, x2 - x1, y2 - y1);
+  cairo_fill (cr);
+
+  /* Upper border */
+
+  pattern = cairo_pattern_create_linear (0, y0, 0, y1);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, 0.0);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, transparency);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x1, y0,
+                   x2 - x1, y1 - y0);
+  cairo_fill (cr);
+
+  /* Bottom border */
+
+  pattern = cairo_pattern_create_linear (0, y2, 0, y3);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x1, y2,
+                   x2 - x1, y3 - y2);
+  cairo_fill (cr);
+
+  /* Left border */
+
+  pattern = cairo_pattern_create_linear (x0, 0, x1, 0);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, 0.0);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, transparency);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x0, y1,
+                   x1 - x0, y2 - y1);
+  cairo_fill (cr);
+
+  /* Right border */
+
+  pattern = cairo_pattern_create_linear (x2, 0, x3, 0);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x2, y1,
+                   x3 - x2, y2 - y1);
+  cairo_fill (cr);
+
+  /* NW corner */
+
+  pattern = cairo_pattern_create_radial (x1, y1, 0,
+                                         x1, y1, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x0, y0,
+                   x1 - x0, y1 - y0);
+  cairo_fill (cr);
+
+  /* NE corner */
+
+  pattern = cairo_pattern_create_radial (x2, y1, 0,
+                                         x2, y1, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x2, y0,
+                   x3 - x2, y1 - y0);
+  cairo_fill (cr);
+
+  /* SW corner */
+
+  pattern = cairo_pattern_create_radial (x1, y2, 0,
+                                         x1, y2, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x0, y2,
+                   x1 - x0, y3 - y2);
+  cairo_fill (cr);
+
+  /* SE corner */
+
+  pattern = cairo_pattern_create_radial (x2, y2, 0,
+                                         x2, y2, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_rectangle (cr,
+                   x2, y2,
+                   x3 - x2, y3 - y2);
+  cairo_fill (cr);
+}
+
+static gboolean
+draw_callback (GtkWidget *widget,
+               cairo_t   *cr,
+               gpointer   data)
+{
+  GdkRectangle rect;
+
+  gtk_widget_get_allocation (widget, &rect);
+  rect.x += SHADOW_OFFSET_X;
+  rect.y += SHADOW_OFFSET_Y;
+  rect.width -= SHADOW_OFFSET_X;
+  rect.height -= SHADOW_OFFSET_Y;
+
+  draw_shadow_box (cr,
+                   rect, SHADOW_RADIUS, 0.4);
+
+  return FALSE;
+}
+
 GtkWidget *
 do_transparent (GtkWidget *do_widget)
 {
@@ -12,16 +186,16 @@ do_transparent (GtkWidget *do_widget)
 
   if (!window)
     {
+      GtkWidget *view;
       GtkWidget *sw;
       GtkWidget *overlay;
-      GtkWidget *button;
-      GtkWidget *label;
-      GtkWidget *box;
-      GtkWidget *image;
+      GtkWidget *entry;
+      GtkCssProvider *provider;
+      gchar *css;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
 
       g_signal_connect (window, "destroy",
@@ -29,42 +203,33 @@ do_transparent (GtkWidget *do_widget)
 
       gtk_window_set_title (GTK_WINDOW (window), "Transparency");
 
-      overlay = gtk_overlay_new ();
-      gtk_container_add (GTK_CONTAINER (window), overlay);
-
-      button = gtk_button_new_with_label ("Don't click this button!");
-      label = gtk_bin_get_child (GTK_BIN (button));
-      g_object_set (label, "margin", 50, NULL);
-
-      gtk_widget_set_opacity (button, 0.7);
-      gtk_widget_set_halign (button, GTK_ALIGN_FILL);
-      gtk_widget_set_valign (button, GTK_ALIGN_START);
-
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), button);
-      gtk_container_child_set (GTK_CONTAINER (overlay), button, "blur", 5.0, NULL);
-
-      button = gtk_button_new_with_label ("Maybe this one?");
-      label = gtk_bin_get_child (GTK_BIN (button));
-      g_object_set (label, "margin", 50, NULL);
-
-      gtk_widget_set_opacity (button, 0.7);
-      gtk_widget_set_halign (button, GTK_ALIGN_FILL);
-      gtk_widget_set_valign (button, GTK_ALIGN_END);
-
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), button);
-      gtk_container_child_set (GTK_CONTAINER (overlay), button, "blur", 5.0, NULL);
+      view = gtk_text_view_new ();
 
       sw = gtk_scrolled_window_new (NULL, NULL);
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (overlay), sw);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (sw), box);
-      image = gtk_image_new_from_resource ("/transparent/portland-rose.jpg");
+      gtk_container_add (GTK_CONTAINER (sw), view);
 
-      gtk_container_add (GTK_CONTAINER (box), image);
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (overlay), sw);
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+
+      entry = gtk_entry_new ();
+      provider = gtk_css_provider_new ();
+      css = g_strdup_printf ("* { border-width: 0px %dpx %dpx 0px; }",
+                             SHADOW_OFFSET_X, SHADOW_OFFSET_Y);
+      gtk_css_provider_load_from_data (provider, css, -1);
+      g_free (css);
+      gtk_style_context_add_provider (gtk_widget_get_style_context (entry),
+                                      GTK_STYLE_PROVIDER (provider),
+                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+      g_signal_connect (entry, "draw", G_CALLBACK (draw_callback), NULL);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+
+      gtk_widget_show (overlay);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/tree_store.c

@@ -391,8 +391,8 @@ do_tree_store (GtkWidget *do_widget)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Tree Store");
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -417,7 +417,6 @@ do_tree_store (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
-      gtk_widget_set_vexpand (treeview, TRUE);
       g_object_unref (model);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_MULTIPLE);

demos/gtk-demo/widgetbowl.c

@@ -9,122 +9,12 @@
 
 #include "gtkfishbowl.h"
 
-const char *const css =
-".blurred-button {"
-"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
-"}"
-"";
-
-GtkWidget *fishbowl;
-
-static GtkWidget *
-create_button (void)
-{
-  return gtk_button_new_with_label ("Button");
-}
-static GtkWidget *
-create_blurred_button (void)
-{
-  GtkWidget *w = gtk_button_new ();
-
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
-
-  return w;
-}
-
-static GtkWidget *
-create_font_button (void)
-{
-  return gtk_font_button_new ();
-}
-
-static GtkWidget *
-create_level_bar (void)
-{
-  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
-
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
-
-  /* Force them to be a bit larger */
-  gtk_widget_set_size_request (w, 200, -1);
-
-  return w;
-}
-
-static GtkWidget *
-create_spinner (void)
-{
-  GtkWidget *w = gtk_spinner_new ();
-
-  gtk_spinner_start (GTK_SPINNER (w));
-
-  return w;
-}
-
-static GtkWidget *
-create_spinbutton (void)
-{
-  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
-
-  return w;
-}
-
-static GtkWidget *
-create_label (void)
-{
-  GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
-
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
-
-  return w;
-}
-
-static const struct {
-  const char *name;
-  GtkWidget * (*create_func) (void);
-} widget_types[] = {
-  { "Button",     create_button         },
-  { "Blurbutton", create_blurred_button },
-  { "Fontbutton", create_font_button    },
-  { "Levelbar"  , create_level_bar      },
-  { "Label"     , create_label          },
-  { "Spinner"   , create_spinner        },
-  { "Spinbutton", create_spinbutton     },
-};
-
-static int selected_widget_type = -1;
-static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
+GtkWidget *allow_changes;
 
 #define N_STATS 5
 
 #define STATS_UPDATE_TIME G_USEC_PER_SEC
 
-static void
-set_widget_type (GtkWidget *headerbar,
-                 int        widget_type_index)
-{
-  GList *children, *l;
-
-  if (widget_type_index == selected_widget_type)
-    return;
-
-  /* Remove everything */
-  children = gtk_container_get_children (GTK_CONTAINER (fishbowl));
-  for (l = children; l; l = l->next)
-    {
-      gtk_container_remove (GTK_CONTAINER (fishbowl), (GtkWidget*)l->data);
-    }
-
-  g_list_free (children);
-
-  selected_widget_type = widget_type_index;
-
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
-                            widget_types[selected_widget_type].name);
-}
-
-
 typedef struct _Stats Stats;
 struct _Stats {
   gint64 last_stats;
@@ -179,7 +69,7 @@ do_stats (GtkWidget *widget,
         {
           n_frames += stats->frame_counter[i];
         }
-
+      
       new_label = g_strdup_printf ("widgets - %.1f fps",
                                    (double) G_USEC_PER_SEC * n_frames
                                        / (N_STATS * STATS_UPDATE_TIME));
@@ -206,7 +96,7 @@ do_stats (GtkWidget *widget,
       stats->frame_counter[stats->stats_index] = 0;
       stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
       stats->last_stats = frame_time;
-
+      
       if (suggested_change)
         *suggested_change = stats->last_suggestion;
       else
@@ -239,142 +129,44 @@ move_fish (GtkWidget     *bowl,
            gpointer       info_label)
 {
   gint suggested_change = 0;
+  
+  do_stats (bowl,
+            info_label,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
 
-  do_stats (bowl, info_label, &suggested_change);
-
-  if (suggested_change > 0)
-    {
-      int i;
-
-      for (i = 0; i < suggested_change; i ++)
-        {
-          GtkWidget *new_widget = widget_types[selected_widget_type].create_func ();
-
-          gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
-
-        }
-    }
-  else if (suggested_change < 0)
-    {
-      GList *children, *l;
-      int n_removed = 0;
-
-      children = gtk_container_get_children (GTK_CONTAINER (fishbowl));
-      for (l = children; l; l = l->next)
-        {
-          gtk_container_remove (GTK_CONTAINER (fishbowl), (GtkWidget *)l->data);
-          n_removed ++;
-
-          if (n_removed >= (-suggested_change))
-            break;
-        }
-
-      g_list_free (children);
-    }
-
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
   stats_update (bowl);
 
   return G_SOURCE_CONTINUE;
 }
 
-static void
-next_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkWidget *headerbar = user_data;
-  int new_index;
-
-  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
-  else
-    new_index = selected_widget_type + 1;
-
-  set_widget_type (headerbar, new_index);
-}
-
-static void
-prev_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkWidget *headerbar = user_data;
-  int new_index;
-
-  if (selected_widget_type - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected_widget_type - 1;
-
-  set_widget_type (headerbar, new_index);
-}
-
 GtkWidget *
 do_widgetbowl (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  static GtkCssProvider *provider = NULL;
-
-  gtk_init ();
-
-  if (provider == NULL)
-    {
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1);
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
 
   if (!window)
     {
-      GtkWidget *info_label;
-      GtkWidget *count_label;
-      GtkWidget *titlebar;
-      GtkWidget *title_box;
-      GtkWidget *left_box;
-      GtkWidget *next_button;
-      GtkWidget *prev_button;
+      GtkBuilder *builder;
+      GtkWidget *bowl, *info_label;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      titlebar = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (titlebar), TRUE);
-      info_label = gtk_label_new ("widget - 00.0 fps");
-      count_label = gtk_label_new ("0");
-      fishbowl = gtk_fishbowl_new ();
-      title_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-      prev_button = gtk_button_new_from_icon_name ("pan-start-symbolic");
-      next_button = gtk_button_new_from_icon_name ("pan-end-symbolic");
-      left_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      g_type_ensure (GTK_TYPE_FISHBOWL);
 
-      g_object_bind_property (fishbowl, "count", count_label, "label", 0);
-      g_signal_connect (next_button, "clicked", G_CALLBACK (next_button_clicked_cb), titlebar);
-      g_signal_connect (prev_button, "clicked", G_CALLBACK (prev_button_clicked_cb), titlebar);
-
-      gtk_fishbowl_set_animating (GTK_FISHBOWL (fishbowl), TRUE);
-
-      gtk_widget_set_hexpand (title_box, TRUE);
-      gtk_widget_set_halign (title_box, GTK_ALIGN_END);
-
-      gtk_window_set_titlebar (GTK_WINDOW (window), titlebar);
-      gtk_container_add (GTK_CONTAINER (title_box), count_label);
-      gtk_container_add (GTK_CONTAINER (title_box), info_label);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (titlebar), title_box);
-      gtk_container_add (GTK_CONTAINER (window), fishbowl);
-
-
-      gtk_style_context_add_class (gtk_widget_get_style_context (left_box), "linked");
-      gtk_container_add (GTK_CONTAINER (left_box), prev_button);
-      gtk_container_add (GTK_CONTAINER (left_box), next_button);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), left_box);
-
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_connect_signals (builder, NULL);
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), FALSE);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
-      gtk_widget_add_tick_callback (fishbowl, move_fish, info_label, NULL);
-
-      set_widget_type (titlebar, 0);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/icon-browser/icon.list

@@ -287,6 +287,7 @@ emblem-system=The icon used as an emblem for directories that contain system lib
 avatar-default=The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar
 emblem-synchronizing=The icon used as an emblem to indicate that a a synchronizing operation is in process
 emblem-shared=The icon used as an emblem for files and directories that are shared to other users
+folder-download=The icon representing the location in the file system where downloaded files are stored
 help-browser=The icon used for the desktop's help browsing application
 
 [other]
@@ -428,9 +429,10 @@ emblem-urgent=
 emblem-videos=
 emblem-web=
 folder-documents=
-folder-download=The icon representing the location in the file system where downloaded files are stored
+folder-download=
 folder-music=
 folder-pictures=
+folder-documents=
 folder-publicshare=
 folder-remote=The icon used for normal directories on a remote filesystem
 folder-saved-search=

demos/icon-browser/iconbrowserwin.c

@@ -4,11 +4,6 @@
 #include "iconstore.h"
 #include <gtk/gtk.h>
 
-/* Drag 'n Drop */
-static const char *target_table[] = {
-  "text/uri-list"
-};
-
 typedef struct
 {
   gchar *id;
@@ -51,8 +46,6 @@ struct _IconBrowserWindow
   GtkWidget *image3;
   GtkWidget *image4;
   GtkWidget *image5;
-  GtkWidget *image6;
-  GtkWidget *label6;
   GtkWidget *description;
 };
 
@@ -94,9 +87,13 @@ get_icon (GtkWidget *image, const gchar *name, gint size)
 static void
 set_image (GtkWidget *image, const gchar *name, gint size)
 {
-  gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
+  GdkPixbuf *pixbuf;
+
+  gtk_image_set_from_icon_name (GTK_IMAGE (image), name, 1);
   gtk_image_set_pixel_size (GTK_IMAGE (image), size);
-  gtk_drag_source_set_icon_name (image, name);
+  pixbuf = get_icon (image, name, size);
+  gtk_drag_source_set_icon_pixbuf (image, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
@@ -130,17 +127,6 @@ item_activated (GtkIconView *icon_view, GtkTreePath *path, IconBrowserWindow *wi
   set_image (win->image3, name, 32);
   set_image (win->image4, name, 48);
   set_image (win->image5, name, 64);
-  if (win->symbolic)
-    {
-      gtk_widget_show (win->image6);
-      gtk_widget_show (win->label6);
-      set_image (win->image6, name, 64);
-    }
-  else
-    {
-      gtk_widget_hide (win->image6);
-      gtk_widget_hide (win->label6);
-    }
   if (description && description[0])
     {
       gtk_label_set_text (GTK_LABEL (win->description), description);
@@ -299,10 +285,10 @@ static void
 copy_to_clipboard (GtkButton         *button,
                    IconBrowserWindow *win)
 {
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (win));
-  gdk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)));
+  clipboard = gtk_clipboard_get_default (gdk_display_get_default ());
+  gtk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)), -1);
 }
 
 static gboolean
@@ -386,7 +372,7 @@ get_image_data (GtkWidget        *widget,
 
   image = gtk_bin_get_child (GTK_BIN (widget));
 
-  name = gtk_image_get_icon_name (GTK_IMAGE (image));
+  gtk_image_get_icon_name (GTK_IMAGE (image), &name, NULL);
   size = gtk_image_get_pixel_size (GTK_IMAGE (image));
 
   pixbuf = get_icon (image, name, size);
@@ -394,80 +380,40 @@ get_image_data (GtkWidget        *widget,
   g_object_unref (pixbuf);
 }
 
-static void
-get_scalable_image_data (GtkWidget        *widget,
-                         GdkDragContext   *context,
-                         GtkSelectionData *selection,
-                         guint             target_info,
-                         guint             time,
-                         gpointer          data)
-{
-  gchar *uris[2];
-  GtkIconInfo *info;
-  GtkWidget *image;
-  GFile *file;
-  const gchar *name;
-
-  image = gtk_bin_get_child (GTK_BIN (widget));
-  name = gtk_image_get_icon_name (GTK_IMAGE (image));
-
-  info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, -1, 0);
-  file = g_file_new_for_path (gtk_icon_info_get_filename (info));
-  uris[0] = g_file_get_uri (file);
-  uris[1] = NULL;
-
-  gtk_selection_data_set_uris (selection, uris);
-
-  g_free (uris[0]);
-  g_object_unref (info);
-  g_object_unref (file);
-}
-
 static void
 setup_image_dnd (GtkWidget *image)
 {
-  gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+  gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
   gtk_drag_source_add_image_targets (image);
   g_signal_connect (image, "drag-data-get", G_CALLBACK (get_image_data), NULL);
 }
 
-static void
-setup_scalable_image_dnd (GtkWidget *image)
-{
-  GtkWidget *parent;
-  GdkContentFormats *targets;
-
-  parent = gtk_widget_get_parent (image);
-  targets = gdk_content_formats_new (target_table, G_N_ELEMENTS (target_table));
-  gtk_drag_source_set (parent, GDK_BUTTON1_MASK,
-                       targets,
-                       GDK_ACTION_COPY);
-  gdk_content_formats_unref (targets);
-
-  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_scalable_image_data), NULL);
-}
-
 static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
-  GdkContentFormats *list;
+  GtkTargetList *list;
+  GtkTargetEntry *targets;
+  gint n_targets;
 
   gtk_widget_init_template (GTK_WIDGET (win));
 
-  list = gdk_content_formats_new (NULL, 0);
-  list = gtk_content_formats_add_text_targets (list);
+  list = gtk_target_list_new (NULL, 0);
+  gtk_target_list_add_text_targets (list, 0);
+  targets = gtk_target_table_new_from_list (list, &n_targets);
+  gtk_target_list_unref (list);
+
   gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (win->list),
                                           GDK_BUTTON1_MASK,
-                                          list,
+                                          targets, n_targets,
                                           GDK_ACTION_COPY);
-  gdk_content_formats_unref (list);
+
+  gtk_target_table_free (targets, n_targets);
 
   setup_image_dnd (win->image1);
   setup_image_dnd (win->image2);
   setup_image_dnd (win->image3);
   setup_image_dnd (win->image4);
   setup_image_dnd (win->image5);
-  setup_scalable_image_dnd (win->image6);
 
   win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);
 
@@ -507,8 +453,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image3);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image4);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image5);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image6);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, label6);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);
 
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);

demos/icon-browser/window.ui

@@ -15,7 +15,7 @@
       <object class="GtkHeaderBar" id="header">
         <property name="visible">True</property>
         <property name="title" translatable="yes">Icon Browser</property>
-        <property name="show-title-buttons">True</property>
+        <property name="show-close-button">True</property>
         <child type="title">
           <object class="GtkBox">
             <property name="visible">True</property>
@@ -50,6 +50,7 @@
               <object class="GtkImage" id="search-icon">
                 <property name="visible">True</property>
                 <property name="icon-name">edit-find-symbolic</property>
+                <property name="icon-size">1</property>
               </object>
             </child>
           </object>
@@ -149,7 +150,6 @@
             <property name="margin">10</property>
             <property name="row-spacing">18</property>
             <property name="column-spacing">18</property>
-            <property name="halign">center</property>
             <child>
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
@@ -205,17 +205,6 @@
                 <property name="top-attach">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkImage" id="image6">
-                <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">end</property>
-              </object>
-              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
 
             <child>
               <object class="GtkLabel" id="label1">
@@ -293,39 +282,34 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label6">
+              <object class="GtkLabel" id="description">
                 <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">baseline</property>
-                <property name="label">scalable</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <property name="wrap">True</property>
+                <property name="max-width-chars">60</property>
+                <property name="xalign">0</property>
+                <property name="valign">start</property>
               </object>
               <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">2</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+                <property name="width">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Copy to Clipboard</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin">20</property>
+                <signal name="clicked" handler="copy_to_clipboard"/>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
+                <property name="width">5</property>
               </packing>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Copy to Clipboard</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="margin">20</property>
-            <signal name="clicked" handler="copy_to_clipboard"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="description">
-            <property name="margin">10</property>
-            <property name="visible">True</property>
-            <property name="wrap">True</property>
-            <property name="max-width-chars">60</property>
-            <property name="valign">start</property>
           </object>
         </child>
       </object>

demos/widget-factory/widget-factory.c

@@ -80,7 +80,7 @@ get_busy (GSimpleAction *action,
   GtkApplication *app = gtk_window_get_application (GTK_WINDOW (window));
 
   g_application_mark_busy (G_APPLICATION (app));
-  cursor = gdk_cursor_new_from_name ("wait", NULL);
+  cursor = gdk_cursor_new_from_name (gtk_widget_get_display (window), "wait");
   gdk_window_set_cursor (gtk_widget_get_window (window), cursor);
   g_object_unref (cursor);
   g_timeout_add (5000, get_idle, window);
@@ -1232,10 +1232,10 @@ static void
 handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
 {
   GtkTextBuffer *buffer;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
   const gchar *id;
 
-  clipboard = gtk_widget_get_clipboard (textview);
+  clipboard = gtk_widget_get_clipboard (textview, GDK_SELECTION_CLIPBOARD);
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
   id = gtk_buildable_get_name (GTK_BUILDABLE (button));
 
@@ -1250,13 +1250,13 @@ handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
 }
 
 static void
-clipboard_formats_notify (GdkClipboard *clipboard, GdkEvent *event, GtkWidget *button)
+clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, GtkWidget *button)
 {
   const gchar *id;
   gboolean has_text;
 
   id = gtk_buildable_get_name (GTK_BUILDABLE (button));
-  has_text = gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_TEXT_BUFFER);
+  has_text = gtk_clipboard_wait_is_text_available (clipboard);
 
   if (strcmp (id, "pastebutton") == 0)
     gtk_widget_set_sensitive (button, has_text);
@@ -1278,13 +1278,8 @@ textbuffer_notify_selection (GObject *object, GParamSpec *pspec, GtkWidget *butt
 }
 
 static gboolean
-osd_frame_pressed (GtkGestureMultiPress *gesture,
-                   int                   press,
-                   double                x,
-                   double                y,
-                   gpointer              data)
+osd_frame_button_press (GtkWidget *frame, GdkEventButton *event, gpointer data)
 {
-  GtkWidget *frame = data;
   GtkWidget *osd;
   gboolean visible;
 
@@ -1528,17 +1523,17 @@ g_test_permission_class_init (GTestPermissionClass *class)
   permission_class->release_finish = release_finish;
 }
 
+static int icon_sizes[] = {0, 1, 2, 3, 4, 5, 6};
+
 static void
-update_buttons (GtkWidget *iv, GtkIconSize size)
+update_buttons (GtkWidget *iv, int pos)
 {
   GtkWidget *button;
 
   button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "increase_button"));
-  gtk_widget_set_sensitive (button, size != GTK_ICON_SIZE_LARGE);
+  gtk_widget_set_sensitive (button, pos + 1 < G_N_ELEMENTS (icon_sizes));
   button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "decrease_button"));
-  gtk_widget_set_sensitive (button, size != GTK_ICON_SIZE_NORMAL);
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "reset_button"));
-  gtk_widget_set_sensitive (button, size != GTK_ICON_SIZE_INHERIT);
+  gtk_widget_set_sensitive (button, pos > 0);
 }
 
 static void
@@ -1546,14 +1541,17 @@ increase_icon_size (GtkWidget *iv)
 {
   GList *cells;
   GtkCellRendererPixbuf *cell;
+  GtkIconSize size;
 
   cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
   cell = cells->data;
   g_list_free (cells);
 
-  g_object_set (cell, "icon-size", GTK_ICON_SIZE_LARGE, NULL);
+  g_object_get (cell, "stock-size", &size, NULL);
+  size = MIN (size + 1, G_N_ELEMENTS (icon_sizes) - 1);
+  g_object_set (cell, "stock-size", size, NULL);
 
-  update_buttons (iv, GTK_ICON_SIZE_LARGE);
+  update_buttons (iv, size);
 
   gtk_widget_queue_resize (iv);
 }
@@ -1563,14 +1561,17 @@ decrease_icon_size (GtkWidget *iv)
 {
   GList *cells;
   GtkCellRendererPixbuf *cell;
+  GtkIconSize size;
 
   cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
   cell = cells->data;
   g_list_free (cells);
 
-  g_object_set (cell, "icon-size", GTK_ICON_SIZE_NORMAL, NULL);
+  g_object_get (cell, "stock-size", &size, NULL);
+  size  = MAX (size - 1, 1);
+  g_object_set (cell, "stock-size", size, NULL);
 
-  update_buttons (iv, GTK_ICON_SIZE_NORMAL);
+  update_buttons (iv, size);
 
   gtk_widget_queue_resize (iv);
 }
@@ -1585,9 +1586,9 @@ reset_icon_size (GtkWidget *iv)
   cell = cells->data;
   g_list_free (cells);
 
-  g_object_set (cell, "icon-size", GTK_ICON_SIZE_INHERIT, NULL);
+  g_object_set (cell, "stock-size", 2, NULL);
 
-  update_buttons (iv, GTK_ICON_SIZE_INHERIT);
+  update_buttons (iv, 2);
 
   gtk_widget_queue_resize (iv);
 }
@@ -1655,15 +1656,14 @@ activate (GApplication *app)
   gint i;
   GPermission *permission;
   GAction *action;
-  GtkGesture *gesture;
 
   g_type_ensure (my_text_view_get_type ());
 
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_USER);
+  gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                             GTK_STYLE_PROVIDER (provider),
+                                             GTK_STYLE_PROVIDER_PRIORITY_USER);
   g_object_unref (provider);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");
@@ -1674,6 +1674,7 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "on_page_combo_changed", (GCallback)on_page_combo_changed);
   gtk_builder_add_callback_symbol (builder, "on_range_from_changed", (GCallback)on_range_from_changed);
   gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
+  gtk_builder_add_callback_symbol (builder, "osd_frame_button_press", (GCallback)osd_frame_button_press);
   gtk_builder_add_callback_symbol (builder, "tab_close_cb", (GCallback)tab_close_cb);
   gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
   gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
@@ -1694,14 +1695,12 @@ activate (GApplication *app)
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
-  action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
-  g_action_map_add_action (G_ACTION_MAP (window), action);
-  g_object_unref (G_OBJECT (action));
+  g_action_map_add_action (G_ACTION_MAP (window),
+                           G_ACTION (g_property_action_new ("statusbar", widget, "visible")));
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
-  action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
-  g_action_map_add_action (G_ACTION_MAP (window), action);
-  g_object_unref (G_OBJECT (action));
+  g_action_map_add_action (G_ACTION_MAP (window),
+                           G_ACTION (g_property_action_new ("toolbar", widget, "visible")));
 
   adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment1");
 
@@ -1842,8 +1841,8 @@ activate (GApplication *app)
                     G_CALLBACK (textbuffer_notify_selection), widget);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
   g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect_object (gtk_widget_get_clipboard (widget2), "notify::formats",
-                           G_CALLBACK (clipboard_formats_notify), widget, 0);
+  g_signal_connect_object (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
+                           G_CALLBACK (clipboard_owner_change), widget, 0);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "totem_like_osd");
@@ -1887,9 +1886,6 @@ activate (GApplication *app)
   g_object_set_data (G_OBJECT (widget), "increase_button", widget2);
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "decrease_button");
   g_object_set_data (G_OBJECT (widget), "decrease_button", widget2);
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "reset_button");
-  g_object_set_data (G_OBJECT (widget), "reset_button", widget2);
-  reset_icon_size (widget);
 
   adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment3");
   widget = (GtkWidget *)gtk_builder_get_object (builder, "progressbar1");
@@ -1897,10 +1893,6 @@ activate (GApplication *app)
   g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget);
   g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget2);
 
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
-  gesture = gtk_gesture_multi_press_new (widget);
-  g_signal_connect (gesture, "pressed", G_CALLBACK (osd_frame_pressed), widget);
-
   gtk_widget_show (GTK_WIDGET (window));
 
   g_object_unref (builder);

demos/widget-factory/widget-factory.css

@@ -2,25 +2,3 @@
   padding: 0;
   outline-width: 0;
 }
-
-.border-inset {
-  border-style: inset;
-}
-
-.border-outset {
-  border-style: outset;
-}
-
-.border-groove {
-  border-style: groove;
-}
-
-.border-ridge {
-  border-style: ridge;
-}
-
-/* These effects use 2 lines, so show them */
-.border-groove,
-.border-ridge {
-  border-width: 2px;
-}

demos/widget-factory/widget-factory.ui

@@ -400,7 +400,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     <property name="title">GTK+ Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
-        <property name="show-title-buttons">1</property>
+        <property name="show-close-button">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
             <property name="stack">toplevel_stack</property>
@@ -424,7 +424,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
         <property name="margin">10</property>
         <child>
           <object class="GtkStack" id="toplevel_stack">
-            <property name="transition-duration">30000</property>
+            <property name="transition-duration">1000</property>
             <child>
               <object class="GtkBox" id="page1">
                 <property name="orientation">vertical</property>
@@ -1157,12 +1157,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="hexpand">1</property>
                         <child>
                           <object class="GtkFrame" id="frame1">
-                            <style>
-                              <class name="border-inset"/>
-                            </style>
+                            <property name="shadow_type">in</property>
                             <child type="label">
                               <object class="GtkLabel" id="label1">
-                                <property name="label" translatable="yes">&lt;b&gt;Inset&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;In&lt;/b&gt;</property>
                                 <property name="use_markup">1</property>
                               </object>
                             </child>
@@ -1170,12 +1168,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame2">
-                            <style>
-                              <class name="border-outset"/>
-                            </style>
+                            <property name="shadow_type">out</property>
                             <child type="label">
                               <object class="GtkLabel" id="label2">
-                                <property name="label" translatable="yes">&lt;b&gt;Outset&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Out&lt;/b&gt;</property>
                                 <property name="use_markup">1</property>
                               </object>
                             </child>
@@ -1186,12 +1182,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame3">
-                            <style>
-                              <class name="border-groove"/>
-                            </style>
                             <child type="label">
                               <object class="GtkLabel" id="label17">
-                                <property name="label" translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Etched in&lt;/b&gt;</property>
                                 <property name="use_markup">1</property>
                               </object>
                             </child>
@@ -1202,12 +1195,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame4">
-                            <style>
-                              <class name="border-ridge"/>
-                            </style>
+                            <property name="shadow_type">etched-out</property>
                             <child type="label">
                               <object class="GtkLabel" id="label18">
-                                <property name="label" translatable="yes">&lt;b&gt;Ridge&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Etched out&lt;/b&gt;</property>
                                 <property name="use_markup">1</property>
                               </object>
                             </child>
@@ -1851,6 +1842,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <child>
                                           <object class="GtkImage" id="listboxrow3image">
                                             <property name="icon-name">object-select-symbolic</property>
+                                            <property name="icon-size">1</property>
                                             <property name="halign">end</property>
                                             <property name="valign">center</property>
                                             <property name="margin-top">6</property>
@@ -1880,6 +1872,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <child>
                                           <object class="GtkImage">
                                             <property name="icon-name">object-select-symbolic</property>
+                                            <property name="icon-size">1</property>
                                             <property name="halign">end</property>
                                             <property name="valign">center</property>
                                             <property name="margin-top">6</property>
@@ -2400,6 +2393,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="model">iconsmodel</property>
                                         <child>
                                           <object class="GtkCellRendererPixbuf" id="iconviewcell">
+                                            <property name="stock-size">2</property>
                                           </object>
                                           <attributes>
                                             <attribute name="icon-name">0</attribute>
@@ -2411,6 +2405,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkToolbar">
+                                    <property name="icon-size">1</property>
                                     <property name="toolbar-style">icons</property>
                                     <style>
                                       <class name="inline-toolbar"/>
@@ -2418,21 +2413,21 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkToolButton" id="decrease_button">
                                         <property name="icon-name">zoom-out-symbolic</property>
-                                        <property name="tooltip-text">Normal icons</property>
+                                        <property name="label">Remove item</property>
                                         <signal name="clicked" handler="decrease_icon_size" object="iconview1" swapped="yes"/>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkToolButton" id="increase_button">
                                         <property name="icon-name">zoom-in-symbolic</property>
-                                        <property name="tooltip-text">Large icons</property>
+                                        <property name="label">Add item</property>
                                         <signal name="clicked" handler="increase_icon_size" object="iconview1" swapped="yes"/>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkToolButton" id="reset_button">
                                         <property name="icon-name">zoom-original-symbolic</property>
-                                        <property name="tooltip-text">Inherited icon size</property>
+                                        <property name="label">Refresh</property>
                                         <signal name="clicked" handler="reset_icon_size" object="iconview1" swapped="yes"/>
                                       </object>
                                     </child>
@@ -2896,6 +2891,7 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkToolbar">
                                 <property name="orientation">vertical</property>
                                 <property name="toolbar-style">icons</property>
+                                <property name="icon-size">1</property>
                                 <child>
                                   <object class="GtkToolButton" id="toolbutton1">
                                     <property name="icon-name">document-open-symbolic</property>
@@ -3032,6 +3028,7 @@ microphone-sensitivity-medium-symbolic</property>
                         </child>
                         <child>
                           <object class="GtkFrame" id="osd_frame">
+                            <signal name="button-press-event" handler="osd_frame_button_press"/>
                             <child>
                               <object class="GtkPaned">
                                 <property name="wide-handle">1</property>

docs/reference/gdk/gdk4-docs.xml

@@ -21,37 +21,39 @@
     <xi:include href="xml/general.xml" />
     <xi:include href="xml/gdkdisplaymanager.xml" />
     <xi:include href="xml/gdkdisplay.xml" />
+    <xi:include href="xml/gdkscreen.xml" />
     <xi:include href="xml/gdkseat.xml" />
+    <xi:include href="xml/gdkmonitor.xml" />
     <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/gdkdevicepad.xml" />
-    <xi:include href="xml/gdkmonitor.xml" />
     <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/textures.xml" />
+    <xi:include href="xml/pixbufs.xml" />
     <xi:include href="xml/rgba_colors.xml" />
+    <xi:include href="xml/visuals.xml" />
     <xi:include href="xml/cursors.xml" />
     <xi:include href="xml/windows.xml" />
     <xi:include href="xml/gdkframeclock.xml" />
     <xi:include href="xml/gdkframetimings.xml" />
     <xi:include href="xml/gdkdrawingcontext.xml" />
-    <xi:include href="xml/gdkdrawcontext.xml" />
     <xi:include href="xml/gdkglcontext.xml" />
     <xi:include href="xml/gdkvulkancontext.xml" />
     <xi:include href="xml/events.xml" />
+    <xi:include href="xml/event_structs.xml" />
     <xi:include href="xml/keys.xml" />
-    <xi:include href="xml/gdkclipboard.xml" />
+    <xi:include href="xml/selections.xml" />
     <xi:include href="xml/dnd.xml" />
-    <xi:include href="xml/gdkcontentformats.xml" />
-    <xi:include href="xml/gdkcontentprovider.xml" />
-    <xi:include href="xml/gdkcontentserializer.xml" />
-    <xi:include href="xml/gdkcontentdeserializer.xml" />
     <xi:include href="xml/properties.xml" />
     <xi:include href="xml/threads.xml" />
-    <xi:include href="xml/gdkapplaunchcontext.xml" />
-    <xi:include href="xml/pixbufs.xml" />
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />
     <xi:include href="xml/wayland_interaction.xml" />
+    <xi:include href="xml/gdkapplaunchcontext.xml" />
+  </reference>
+
+  <reference>
+    <title>Deprecated</title>
+    <xi:include href="xml/gdkdevicemanager.xml" />
   </reference>
 
   <index id="api-index-full">

docs/reference/gdk/gdk4-sections.txt

@@ -4,6 +4,30 @@
 <SECTION>
 <TITLE>General</TITLE>
 <FILE>general</FILE>
+gdk_get_display_arg_name
+gdk_notify_startup_complete
+gdk_notify_startup_complete_with_id
+gdk_set_allowed_backends
+
+<SUBSECTION>
+gdk_get_program_class
+gdk_set_program_class
+
+<SUBSECTION>
+gdk_flush
+
+
+<SUBSECTION>
+GdkGrabStatus
+gdk_set_double_click_time
+
+<SUBSECTION>
+gdk_beep
+
+<SUBSECTION>
+gdk_error_trap_push
+gdk_error_trap_pop
+gdk_error_trap_pop_ignored
 
 <SUBSECTION>
 GDK_WINDOWING_X11
@@ -20,13 +44,6 @@ GDK_VERSION_3_8
 GDK_VERSION_3_10
 GDK_VERSION_3_12
 GDK_VERSION_3_14
-GDK_VERSION_3_16
-GDK_VERSION_3_18
-GDK_VERSION_3_20
-GDK_VERSION_3_22
-GDK_VERSION_3_90
-GDK_VERSION_3_92
-GDK_VERSION_3_94
 GDK_VERSION_MIN_REQUIRED
 GDK_VERSION_MAX_ALLOWED
 GDK_DISABLE_DEPRECATION_WARNINGS
@@ -56,11 +73,13 @@ gdk_input_source_get_type
 gdk_modifier_intent_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
+gdk_property_state_get_type
 gdk_prop_mode_get_type
 gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
 gdk_visibility_state_get_type
+gdk_visual_type_get_type
 gdk_window_attributes_type_get_type
 gdk_window_edge_get_type
 gdk_window_hints_get_type
@@ -69,51 +88,6 @@ gdk_window_type_get_type
 gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
-GDK_AVAILABLE_IN_3_0
-GDK_AVAILABLE_IN_3_10
-GDK_AVAILABLE_IN_3_12
-GDK_AVAILABLE_IN_3_14
-GDK_AVAILABLE_IN_3_16
-GDK_AVAILABLE_IN_3_18
-GDK_AVAILABLE_IN_3_2
-GDK_AVAILABLE_IN_3_20
-GDK_AVAILABLE_IN_3_22
-GDK_AVAILABLE_IN_3_4
-GDK_AVAILABLE_IN_3_6
-GDK_AVAILABLE_IN_3_8
-GDK_AVAILABLE_IN_3_90
-GDK_AVAILABLE_IN_3_92
-GDK_AVAILABLE_IN_3_94
-GDK_AVAILABLE_IN_ALL
-GDK_UNAVAILABLE
-GDK_DEPRECATED
-GDK_DEPRECATED_FOR
-GDK_DEPRECATED_IN_3_0
-GDK_DEPRECATED_IN_3_0_FOR
-GDK_DEPRECATED_IN_3_10
-GDK_DEPRECATED_IN_3_10_FOR
-GDK_DEPRECATED_IN_3_12
-GDK_DEPRECATED_IN_3_12_FOR
-GDK_DEPRECATED_IN_3_14
-GDK_DEPRECATED_IN_3_14_FOR
-GDK_DEPRECATED_IN_3_16
-GDK_DEPRECATED_IN_3_16_FOR
-GDK_DEPRECATED_IN_3_18
-GDK_DEPRECATED_IN_3_18_FOR
-GDK_DEPRECATED_IN_3_2
-GDK_DEPRECATED_IN_3_20
-GDK_DEPRECATED_IN_3_20_FOR
-GDK_DEPRECATED_IN_3_22
-GDK_DEPRECATED_IN_3_22_FOR
-GDK_DEPRECATED_IN_3_2_FOR
-GDK_DEPRECATED_IN_3_4
-GDK_DEPRECATED_IN_3_4_FOR
-GDK_DEPRECATED_IN_3_6
-GDK_DEPRECATED_IN_3_6_FOR
-GDK_DEPRECATED_IN_3_8
-GDK_DEPRECATED_IN_3_8_FOR
-GDK_VERSION_CUR_STABLE
-GDK_VERSION_PREV_STABLE
 </SECTION>
 
 <SECTION>
@@ -123,6 +97,8 @@ GdkDisplay
 gdk_display_open
 gdk_display_get_default
 gdk_display_get_name
+gdk_display_get_default_screen
+gdk_display_get_device_manager
 gdk_display_device_is_grabbed
 gdk_display_beep
 gdk_display_sync
@@ -133,6 +109,8 @@ gdk_display_get_event
 gdk_display_peek_event
 gdk_display_put_event
 gdk_display_has_pending
+gdk_display_set_double_click_time
+gdk_display_set_double_click_distance
 gdk_display_is_rgba
 gdk_display_is_composited
 gdk_display_supports_cursor_color
@@ -140,6 +118,10 @@ gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
 gdk_display_get_maximal_cursor_size
 gdk_display_get_default_group
+gdk_display_supports_selection_notification
+gdk_display_request_selection_notification
+gdk_display_supports_clipboard_persistence
+gdk_display_store_clipboard
 gdk_display_supports_shapes
 gdk_display_supports_input_shapes
 gdk_display_get_app_launch_context
@@ -151,10 +133,6 @@ gdk_display_get_monitor
 gdk_display_get_primary_monitor
 gdk_display_get_monitor_at_point
 gdk_display_get_monitor_at_window
-gdk_display_get_clipboard
-gdk_display_get_primary_clipboard
-gdk_display_get_setting
-gdk_display_get_keymap
 
 <SUBSECTION Standard>
 GDK_DISPLAY
@@ -180,9 +158,6 @@ gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
 gdk_display_manager_open_display
 
-<SUBSECTION>
-gdk_set_allowed_backends
-
 <SUBSECTION Standard>
 GDK_DISPLAY_MANAGER
 GDK_DISPLAY_MANAGER_CLASS
@@ -194,6 +169,30 @@ GdkDisplayManagerClass
 gdk_display_manager_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gdkscreen</FILE>
+<TITLE>GdkScreen</TITLE>
+GdkScreen
+gdk_screen_get_default
+gdk_screen_get_root_window
+gdk_screen_get_display
+gdk_screen_get_toplevel_windows
+gdk_screen_get_setting
+gdk_screen_get_resolution
+gdk_screen_set_resolution
+
+<SUBSECTION Standard>
+GDK_SCREEN
+GDK_IS_SCREEN
+GDK_TYPE_SCREEN
+GDK_SCREEN_CLASS
+GDK_IS_SCREEN_CLASS
+GDK_SCREEN_GET_CLASS
+<SUBSECTION Private>
+GdkScreenClass
+gdk_screen_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
@@ -220,19 +219,46 @@ GDK_TYPE_RGBA
 gdk_rgba_get_type
 </SECTION>
 
+<SECTION>
+<TITLE>Visuals</TITLE>
+<FILE>visuals</FILE>
+GdkVisual
+GdkVisualType
+GdkByteOrder
+gdk_visual_get_blue_pixel_details
+gdk_visual_get_depth
+gdk_visual_get_green_pixel_details
+gdk_visual_get_red_pixel_details
+gdk_visual_get_visual_type
+gdk_visual_get_screen
+
+<SUBSECTION Standard>
+GDK_TYPE_BYTE_ORDER
+GDK_TYPE_VISUAL_TYPE
+GDK_TYPE_VISUAL
+GDK_IS_VISUAL
+GDK_IS_VISUAL_CLASS
+GDK_VISUAL
+GDK_VISUAL_CLASS
+GDK_VISUAL_GET_CLASS
+
+<SUBSECTION Private>
+GdkVisualClass
+gdk_visual_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Windows</TITLE>
 <FILE>windows</FILE>
 GdkWindow
 GdkWindowType
-GdkWindowClass
+GdkWindowWindowClass
 GdkWindowHints
 GdkGeometry
 GdkGravity
 GdkAnchorHints
 GdkWindowEdge
 GdkWindowTypeHint
-GdkWindowState
 gdk_window_new_toplevel
 gdk_window_new_popup
 gdk_window_new_temp
@@ -240,6 +266,7 @@ gdk_window_new_child
 gdk_window_destroy
 gdk_window_get_window_type
 gdk_window_get_display
+gdk_window_get_screen
 gdk_window_show
 gdk_window_show_unraised
 gdk_window_hide
@@ -289,6 +316,7 @@ gdk_window_get_scale_factor
 gdk_window_set_opaque_region
 gdk_window_create_gl_context
 gdk_window_create_vulkan_context
+gdk_window_mark_paint_from_clip
 
 <SUBSECTION>
 gdk_window_get_clip_region
@@ -368,6 +396,7 @@ gdk_window_get_decorations
 GdkWMDecoration
 gdk_window_set_functions
 GdkWMFunction
+gdk_get_default_root_window
 
 <SUBSECTION>
 gdk_window_get_support_multidevice
@@ -376,6 +405,10 @@ gdk_window_get_device_cursor
 gdk_window_set_device_cursor
 gdk_window_get_device_events
 gdk_window_set_device_events
+gdk_window_get_source_events
+gdk_window_set_source_events
+gdk_window_get_event_compression
+gdk_window_set_event_compression
 
 <SUBSECTION>
 gdk_window_coords_from_parent
@@ -398,7 +431,6 @@ GDK_TYPE_WINDOW_TYPE
 GDK_TYPE_WINDOW_TYPE_HINT
 GDK_TYPE_WM_DECORATION
 GDK_TYPE_WM_FUNCTION
-GDK_TYPE_WINDOW_STATE
 
 <SUBSECTION Private>
 gdk_window_get_type
@@ -412,53 +444,53 @@ gdk_fullscreen_mode_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gdkcontentformats</FILE>
-<TITLE>Content Formats</TITLE>
-gdk_intern_mime_type
-
-<SUBSECTION>
-GdkContentFormats
-gdk_content_formats_new
-gdk_content_formats_new_for_gtype
-gdk_content_formats_ref
-gdk_content_formats_unref
-gdk_content_formats_print
-gdk_content_formats_to_string
-gdk_content_formats_get_gtypes
-gdk_content_formats_get_mime_types
-gdk_content_formats_union
-gdk_content_formats_match
-gdk_content_formats_match_gtype
-gdk_content_formats_match_mime_type
-gdk_content_formats_contain_gtype
-gdk_content_formats_contain_mime_type
-
-<SUBSECTION>
-gdk_content_formats_union_serialize_gtypes
-gdk_content_formats_union_deserialize_gtypes
-gdk_content_formats_union_serialize_mime_types
-gdk_content_formats_union_deserialize_mime_types
-
-<SUBSECTION>
-GdkContentFormatsBuilder
-gdk_content_formats_builder_new
-gdk_content_formats_builder_free
-gdk_content_formats_builder_add_formats
-gdk_content_formats_builder_add_gtype
-gdk_content_formats_builder_add_mime_type
-
-<SUBSECTION Private>
-GDK_TYPE_FILE_LIST
-gdk_file_list_get_type
-gdk_content_formats_get_type
+<TITLE>Selections</TITLE>
+<FILE>selections</FILE>
+GDK_SELECTION_PRIMARY
+GDK_SELECTION_SECONDARY
+GDK_SELECTION_CLIPBOARD
+GDK_TARGET_BITMAP
+GDK_TARGET_COLORMAP
+GDK_TARGET_DRAWABLE
+GDK_TARGET_PIXMAP
+GDK_TARGET_STRING
+GDK_SELECTION_TYPE_ATOM
+GDK_SELECTION_TYPE_BITMAP
+GDK_SELECTION_TYPE_COLORMAP
+GDK_SELECTION_TYPE_DRAWABLE
+GDK_SELECTION_TYPE_INTEGER
+GDK_SELECTION_TYPE_PIXMAP
+GDK_SELECTION_TYPE_WINDOW
+GDK_SELECTION_TYPE_STRING
+gdk_selection_owner_set
+gdk_selection_owner_set_for_display
+gdk_selection_owner_get
+gdk_selection_owner_get_for_display
+gdk_selection_convert
+gdk_selection_property_get
+gdk_selection_send_notify
+gdk_selection_send_notify_for_display
 </SECTION>
 
 <SECTION>
 <TITLE>Properties and Atoms</TITLE>
 <FILE>properties</FILE>
 GdkAtom
+GDK_ATOM_TO_POINTER
+GDK_POINTER_TO_ATOM
+GDK_NONE
 gdk_text_property_to_utf8_list_for_display
 gdk_utf8_to_string_target
+gdk_atom_intern
+gdk_atom_intern_static_string
+gdk_atom_name
+gdk_property_get
+gdk_property_change
+GdkPropMode
+gdk_property_delete
+
+<SUBSECTION Standard>
+GDK_TYPE_PROP_MODE
 </SECTION>
 
 <SECTION>
@@ -466,6 +498,9 @@ gdk_utf8_to_string_target
 <FILE>pango_interaction</FILE>
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
+gdk_pango_context_get
+gdk_pango_context_get_for_screen
+gdk_pango_context_get_for_display
 </SECTION>
 
 <SECTION>
@@ -522,6 +557,8 @@ gdk_threads_add_timeout_seconds_full
 <FILE>keys</FILE>
 GdkKeymap
 GdkKeymapKey
+gdk_keymap_get_default
+gdk_keymap_get_for_display
 gdk_keymap_lookup_key
 gdk_keymap_translate_keyboard_state
 gdk_keymap_get_entries_for_keyval
@@ -634,8 +671,6 @@ GDK_DEVICE_GET_CLASS
 GDK_IS_DEVICE
 GDK_IS_DEVICE_CLASS
 GDK_TYPE_DEVICE
-GDK_DEVICE_TOOL
-GDK_IS_DEVICE_TOOL
 
 <SUBSECTION Private>
 GdkDeviceClass
@@ -660,7 +695,6 @@ gdk_device_pad_get_feature_group
 GDK_TYPE_DEVICE_PAD
 GDK_DEVICE_PAD
 GDK_IS_DEVICE_PAD
-GDK_DEVICE_PAD_GET_IFACE
 
 <SUBSECTION Private>
 gdk_device_pad_get_type
@@ -671,7 +705,6 @@ gdk_device_pad_get_type
 <FILE>gdkseat</FILE>
 GdkSeat
 GdkSeatCapabilities
-GdkGrabStatus
 GdkSeatGrabPrepareFunc
 gdk_seat_get_display
 gdk_seat_grab
@@ -680,7 +713,6 @@ gdk_seat_get_capabilities
 gdk_seat_get_pointer
 gdk_seat_get_keyboard
 gdk_seat_get_slaves
-gdk_seat_get_master_pointers
 
 <SUBSECTION Standard>
 GDK_SEAT
@@ -693,15 +725,32 @@ gdk_seat_get_type
 gdk_seat_capabilities_get_type
 </SECTION>
 
+<SECTION>
+<TITLE>GdkDeviceManager</TITLE>
+<FILE>gdkdevicemanager</FILE>
+GdkDeviceManager
+gdk_disable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+
+<SUBSECTION Standard>
+GDK_DEVICE_MANAGER
+GDK_DEVICE_MANAGER_CLASS
+GDK_DEVICE_MANAGER_GET_CLASS
+GDK_IS_DEVICE_MANAGER
+GDK_IS_DEVICE_MANAGER_CLASS
+GDK_TYPE_DEVICE_MANAGER
+
+<SUBSECTION Private>
+GdkDeviceManagerClass
+gdk_device_manager_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Events</TITLE>
 <FILE>events</FILE>
-GdkEvent
 GdkEventType
 GdkEventMask
-GdkScrollDirection
-GdkCrossingMode
-GdkNotifyType
 GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW
@@ -712,10 +761,14 @@ GDK_BUTTON_MIDDLE
 GDK_BUTTON_SECONDARY
 
 <SUBSECTION>
+gdk_events_pending
+gdk_event_peek
+gdk_event_get
+gdk_event_put
 gdk_event_new
 gdk_event_copy
 gdk_event_free
-gdk_event_get_axes
+gdk_event_get_axis
 gdk_event_get_button
 gdk_event_get_click_count
 gdk_event_get_coords
@@ -731,6 +784,7 @@ gdk_event_get_window
 gdk_event_get_event_type
 GdkEventSequence
 gdk_event_get_event_sequence
+gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
@@ -738,25 +792,7 @@ gdk_event_triggers_context_menu
 gdk_event_get_seat
 gdk_event_get_scancode
 gdk_event_get_pointer_emulated
-gdk_event_get_crossing_detail
-gdk_event_get_crossing_mode
-gdk_event_get_drag_context
-gdk_event_get_focus_in
-gdk_event_get_grab_window
-gdk_event_get_history
-gdk_event_get_key_group
-gdk_event_get_key_is_modifier
-gdk_event_get_pad_axis_value
-gdk_event_get_pad_button
-gdk_event_get_pad_group_mode
-gdk_event_get_string
-gdk_event_get_touch_emulating_pointer
-gdk_event_get_touchpad_angle_delta
-gdk_event_get_touchpad_deltas
-gdk_event_get_touchpad_gesture_n_fingers
-gdk_event_get_touchpad_gesture_phase
-gdk_event_get_touchpad_scale
-gdk_event_is_sent
+
 <SUBSECTION>
 gdk_event_handler_set
 GdkEventFunc
@@ -764,8 +800,8 @@ GdkEventFunc
 <SUBSECTION>
 gdk_get_show_events
 gdk_set_show_events
-gdk_event_set_display
-gdk_event_get_display
+gdk_event_set_screen
+gdk_event_get_screen
 gdk_event_get_device
 gdk_event_set_device
 gdk_event_get_source_device
@@ -773,53 +809,88 @@ gdk_event_set_source_device
 gdk_event_get_device_tool
 gdk_event_set_device_tool
 
+<SUBSECTION>
+gdk_setting_get
+
 <SUBSECTION Standard>
-GDK_TYPE_EVENT
 GDK_TYPE_EVENT_MASK
 GDK_TYPE_EVENT_TYPE
-GDK_TYPE_CROSSING_MODE
-GDK_TYPE_SCROLL_DIRECTION
-GDK_TYPE_NOTIFY_TYPE
-GDK_IS_EVENT
-gdk_event_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>Textures</TITLE>
-<FILE>textures</FILE>
-GdkTexture
-gdk_texture_new_for_data
-gdk_texture_new_for_pixbuf
-gdk_texture_new_from_resource
-gdk_texture_new_from_file
-gdk_texture_get_width
-gdk_texture_get_height
-gdk_texture_download
+<TITLE>Event Structures</TITLE>
+<FILE>event_structs</FILE>
+GdkEvent
+
+<SUBSECTION>
+GdkEventAny
+GdkEventKey
+GdkEventButton
+GdkEventTouch
+GdkEventScroll
+GdkEventMotion
+GdkEventExpose
+GdkEventVisibility
+GdkEventCrossing
+GdkEventFocus
+GdkEventConfigure
+GdkEventProperty
+GdkEventSelection
+GdkEventDND
+GdkEventProximity
+GdkEventWindowState
+GdkEventSetting
+GdkEventOwnerChange
+GdkEventGrabBroken
+GdkEventTouchpadSwipe
+GdkEventTouchpadPinch
+GdkEventPadButton
+GdkEventPadAxis
+GdkEventPadGroupMode
+
+<SUBSECTION>
+GdkScrollDirection
+GdkVisibilityState
+GdkCrossingMode
+GdkNotifyType
+GdkPropertyState
+GdkWindowState
+GdkSettingAction
+GdkOwnerChange
 
 <SUBSECTION Standard>
-GdkTextureClass
-gdk_texture_get_type
-GDK_TYPE_TEXTURE
-GDK_IS_TEXTURE
-GDK_TEXTURE
+GDK_TYPE_CROSSING_MODE
+GDK_TYPE_EVENT
+GDK_TYPE_NOTIFY_TYPE
+GDK_TYPE_PROPERTY_STATE
+GDK_TYPE_SCROLL_DIRECTION
+GDK_TYPE_SETTING_ACTION
+GDK_TYPE_VISIBILITY_STATE
+GDK_TYPE_WINDOW_STATE
+GDK_TYPE_OWNER_CHANGE
+
+<SUBSECTION Private>
+gdk_event_get_type
+gdk_owner_change_get_type
 </SECTION>
 
 <SECTION>
 <TITLE>Cursors</TITLE>
 <FILE>cursors</FILE>
 GdkCursor
-gdk_cursor_new_from_texture
+GdkCursorType
+gdk_cursor_new_from_pixbuf
+gdk_cursor_new_from_surface
 gdk_cursor_new_from_name
-gdk_cursor_get_fallback
-gdk_cursor_get_name
-gdk_cursor_get_texture
-gdk_cursor_get_hotspot_x
-gdk_cursor_get_hotspot_y
+gdk_cursor_new_for_display
+gdk_cursor_get_display
+gdk_cursor_get_image
+gdk_cursor_get_surface
+gdk_cursor_get_cursor_type
 
 <SUBSECTION Standard>
+GDK_TYPE_CURSOR_TYPE
 GDK_TYPE_CURSOR
-GDK_CURSOR
-GDK_IS_CURSOR
 
 <SUBSECTION Private>
 gdk_cursor_get_type
@@ -831,24 +902,35 @@ gdk_cursor_get_type
 <FILE>dnd</FILE>
 GdkDragContext
 GdkDragCancelReason
+gdk_drag_get_selection
+gdk_drag_abort
 gdk_drop_reply
+gdk_drag_drop
 gdk_drag_drop_done
+gdk_drag_find_window_for_screen
 gdk_drag_begin
+gdk_drag_begin_for_device
+gdk_drag_begin_from_point
+gdk_drag_motion
 gdk_drop_finish
+GdkDragProtocol
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
+gdk_window_get_drag_protocol
 
-gdk_drag_context_get_display
 gdk_drag_context_get_actions
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
-gdk_drag_context_get_formats
+gdk_drag_context_list_targets
 gdk_drag_context_get_device
+gdk_drag_context_set_device
 gdk_drag_context_get_source_window
 gdk_drag_context_get_dest_window
+gdk_drag_context_get_protocol
 gdk_drag_context_get_drag_window
 gdk_drag_context_set_hotspot
+gdk_drag_context_manage_dnd
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -869,25 +951,25 @@ gdk_drag_context_get_type
 <INCLUDE>gdk/gdkx.h</INCLUDE>
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
+GDK_ROOT_WINDOW
 GDK_WINDOW_XID
 GDK_DISPLAY_XDISPLAY
+GDK_SCREEN_XDISPLAY
+GDK_SCREEN_XNUMBER
+GDK_SCREEN_XSCREEN
+GDK_CURSOR_XCURSOR
+GDK_CURSOR_XDISPLAY
 GDK_POINTER_TO_XID
 GDK_XID_TO_POINTER
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
 gdk_x11_device_get_id
 gdk_x11_device_manager_lookup
-gdk_disable_multidevice
-gdk_x11_display_open
-gdk_x11_display_set_program_class
 gdk_x11_display_get_user_time
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id
 gdk_x11_display_set_startup_notification_id
 gdk_x11_display_get_xdisplay
-gdk_x11_display_get_xscreen
-gdk_x11_display_get_xrootwindow
-gdk_x11_display_get_xcursor
 gdk_x11_display_grab
 gdk_x11_display_ungrab
 gdk_x11_display_error_trap_push
@@ -908,6 +990,7 @@ 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_hide_titlebar_when_maximized
 gdk_x11_window_set_theme_variant
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
@@ -916,12 +999,23 @@ gdk_x11_window_get_desktop
 gdk_x11_window_set_utf8_property
 gdk_x11_window_set_frame_extents
 gdk_x11_window_set_frame_sync_enabled
+gdk_x11_get_default_root_xwindow
+gdk_x11_get_default_screen
+gdk_x11_get_default_xdisplay
+gdk_x11_grab_server
+gdk_x11_ungrab_server
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
 gdk_x11_keymap_get_group_for_state
 gdk_x11_keymap_key_is_modifier
 gdk_x11_visual_get_xvisual
+gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
+gdk_x11_xatom_to_atom
 gdk_x11_xatom_to_atom_for_display
+gdk_x11_get_xatom_by_name
 gdk_x11_get_xatom_by_name_for_display
+gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
 gdk_x11_set_sm_client_id
 gdk_x11_display_text_property_to_text_list
@@ -937,6 +1031,12 @@ GDK_X11_APP_LAUNCH_CONTEXT_CLASS
 GDK_IS_X11_APP_LAUNCH_CONTEXT
 GDK_IS_X11_APP_LAUNCH_CONTEXT_CLASS
 GDK_X11_APP_LAUNCH_CONTEXT_GET_CLASS
+GDK_TYPE_X11_CURSOR
+GDK_X11_CURSOR
+GDK_X11_CURSOR_CLASS
+GDK_IS_X11_CURSOR
+GDK_IS_X11_CURSOR_CLASS
+GDK_X11_CURSOR_GET_CLASS
 GDK_TYPE_X11_DEVICE_CORE
 GDK_X11_DEVICE_CORE
 GDK_X11_DEVICE_CORE_CLASS
@@ -1044,6 +1144,7 @@ gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
+gdk_wayland_display_get_xdg_shell
 gdk_wayland_window_new_subsurface
 gdk_wayland_window_get_wl_surface
 gdk_wayland_window_set_use_custom_surface
@@ -1090,6 +1191,7 @@ gdk_wayland_window_get_type
 <TITLE>Application launching</TITLE>
 <FILE>gdkapplaunchcontext</FILE>
 GdkAppLaunchContext
+gdk_app_launch_context_set_screen
 gdk_app_launch_context_set_desktop
 gdk_app_launch_context_set_timestamp
 gdk_app_launch_context_set_icon
@@ -1120,21 +1222,9 @@ gdk_frame_clock_get_history_start
 gdk_frame_clock_get_timings
 gdk_frame_clock_get_current_timings
 gdk_frame_clock_get_refresh_info
-
 <SUBSECTION Private>
-GDK_FRAME_CLOCK
-GDK_FRAME_CLOCK_CLASS
-GDK_FRAME_CLOCK_GET_CLASS
-GDK_FRAME_CLOCK_IDLE
-GDK_FRAME_CLOCK_IDLE_CLASS
-GDK_FRAME_CLOCK_IDLE_GET_CLASS
-GDK_IS_FRAME_CLOCK
-GDK_IS_FRAME_CLOCK_CLASS
-GDK_IS_FRAME_CLOCK_IDLE
-GDK_IS_FRAME_CLOCK_IDLE_CLASS
 GdkFrameClockPrivate
 gdk_frame_clock_get_type
-gdk_frame_clock_idle_get_type
 </SECTION>
 
 <SECTION>
@@ -1150,7 +1240,7 @@ gdk_frame_timings_get_presentation_time
 gdk_frame_timings_get_refresh_interval
 gdk_frame_timings_get_predicted_presentation_time
 <SUBSECTION Private>
-gdk_frame_timings_get_type
+gdk_frame_get_type
 </SECTION>
 
 <SECTION>
@@ -1225,7 +1315,6 @@ gdk_monitor_get_refresh_rate
 GdkSubpixelLayout
 gdk_monitor_get_subpixel_layout
 gdk_monitor_is_primary
-gdk_monitor_is_valid
 
 <SUBSECTION Standard>
 gdk_monitor_get_type
@@ -1242,15 +1331,11 @@ gdk_drawing_context_get_window
 gdk_drawing_context_get_clip
 gdk_drawing_context_get_cairo_context
 gdk_drawing_context_is_valid
-gdk_drawing_context_get_paint_context
 
 <SUBSECTION Standard>
 gdk_drawing_context_get_type
 GdkDrawingContextClass
 GDK_TYPE_DRAWING_CONTEXT
-GDK_DRAWING_CONTEXT_CLASS
-GDK_DRAWING_CONTEXT_GET_CLASS
-GDK_IS_DRAWING_CONTEXT_CLASS
 GDK_DRAWING_CONTEXT
 GDK_IS_DRAWING_CONTEXT
 </SECTION>
@@ -1258,7 +1343,6 @@ GDK_IS_DRAWING_CONTEXT
 <SECTION>
 <FILE>gdkvulkancontext</FILE>
 GdkVulkanContext
-GdkVulkanError
 gdk_vulkan_context_get_device
 gdk_vulkan_context_get_draw_index
 gdk_vulkan_context_get_draw_semaphore
@@ -1275,112 +1359,3 @@ gdk_vulkan_context_get_type
 gdk_vulkan_error_quark
 gdk_vulkan_strerror
 </SECTION>
-
-<SECTION>
-<FILE>gdkclipboard</FILE>
-GdkClipboard
-gdk_clipboard_get_display
-gdk_clipboard_get_formats
-gdk_clipboard_is_local
-gdk_clipboard_get_content
-gdk_clipboard_store_async
-gdk_clipboard_store_finish
-gdk_clipboard_read_async
-gdk_clipboard_read_finish
-gdk_clipboard_read_value_async
-gdk_clipboard_read_value_finish
-gdk_clipboard_read_texture_async
-gdk_clipboard_read_texture_finish
-gdk_clipboard_read_text_async
-gdk_clipboard_read_text_finish
-gdk_clipboard_set_content
-gdk_clipboard_set
-gdk_clipboard_set_valist
-gdk_clipboard_set_value
-gdk_clipboard_set_text
-gdk_clipboard_set_texture
-
-<SUBSECTION Standard>
-GDK_TYPE_CLIPBOARD
-GDK_CLIPBOARD
-GDK_IS_CLIPBOARD
-gdk_clipboard_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gdkcontentprovider</FILE>
-GdkContentProvider
-gdk_content_provider_new_for_value
-gdk_content_provider_new_for_bytes
-gdk_content_provider_ref_formats
-gdk_content_provider_ref_storable_formats
-gdk_content_provider_content_changed
-gdk_content_provider_write_mime_type_async
-gdk_content_provider_write_mime_type_finish
-gdk_content_provider_get_value
-
-<SUBSECTION Standard>
-GDK_CONTENT_PROVIDER
-GDK_CONTENT_PROVIDER_CLASS
-GDK_CONTENT_PROVIDER_GET_CLASS
-GDK_IS_CONTENT_PROVIDER
-GDK_IS_CONTENT_PROVIDER_CLASS
-GdkContentProviderClass
-gdk_content_provider_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gdkcontentserializer</FILE>
-GdkContentSerializer
-GdkContentSerializeFunc
-gdk_content_serializer_get_mime_type
-gdk_content_serializer_get_gtype
-gdk_content_serializer_get_value
-gdk_content_serializer_get_output_stream
-gdk_content_serializer_get_priority
-gdk_content_serializer_get_cancellable
-gdk_content_serializer_get_user_data
-gdk_content_serializer_set_task_data
-gdk_content_serializer_get_task_data
-gdk_content_serializer_return_success
-gdk_content_serializer_return_error
-
-<SUBSECTION>
-gdk_content_register_serializer
-gdk_content_serialize_async
-gdk_content_serialize_finish
-
-<SUBSECTION Standard>
-GDK_TYPE_CONTENT_SERIALIZER
-GDK_CONTENT_SERIALIZER
-GDK_IS_CONTENT_SERIALIZER
-gdk_content_serializer_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gdkcontentdeserializer</FILE>
-GdkContentDeserializer
-GdkContentDeserializeFunc
-gdk_content_deserializer_get_mime_type
-gdk_content_deserializer_get_gtype
-gdk_content_deserializer_get_value
-gdk_content_deserializer_get_input_stream
-gdk_content_deserializer_get_priority
-gdk_content_deserializer_get_cancellable
-gdk_content_deserializer_get_user_data
-gdk_content_deserializer_set_task_data
-gdk_content_deserializer_get_task_data
-gdk_content_deserializer_return_success
-gdk_content_deserializer_return_error
-
-<SUBSECTION>
-gdk_content_register_deserializer
-gdk_content_deserialize_async
-gdk_content_deserialize_finish
-
-<SUBSECTION Standard>
-GDK_TYPE_CONTENT_DESERIALIZER
-GDK_CONTENT_DESERIALIZER
-GDK_IS_CONTENT_DESERIALIZER
-gdk_content_deserializer_get_type
-</SECTION>

docs/reference/gdk/gdk4.types

@@ -1,6 +1,7 @@
 gdk_app_launch_context_get_type
 gdk_cursor_get_type
 gdk_device_get_type
+gdk_device_manager_get_type
 gdk_device_pad_get_type
 gdk_display_get_type
 gdk_display_manager_get_type
@@ -10,9 +11,7 @@ gdk_frame_clock_get_type
 gdk_gl_context_get_type
 gdk_keymap_get_type
 gdk_monitor_get_type
+gdk_screen_get_type
 gdk_seat_get_type
+gdk_visual_get_type
 gdk_window_get_type
-gdk_content_serializer_get_type
-gdk_content_deserializer_get_type
-gdk_clipboard_get_type
-gdk_content_formats_get_type