xim: Stop using gdk_surface_get_user_data

Use gtk_root_get_for_surface instead.

.gitlab-ci.yml

@@ -13,7 +13,7 @@ stages:
     - subprojects/pango/
 
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v3
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -64,7 +64,7 @@ flatpak:widget-factory:
   <<: *flatpak-defaults
 
 pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v3
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
   stage: deploy 
   script:
     - meson -Ddocumentation=true _build .

.gitlab-ci/Dockerfile

@@ -70,7 +70,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.50.0
+RUN pip3 install meson==0.49.0
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v3"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

.gitlab-ci/test-docker.sh

@@ -26,9 +26,7 @@ ccache --show-stats
 
 xvfb-run -a -s "-screen 0 1024x768x24" \
     meson test \
-        --timeout-multiplier 2 \
         --print-errorlogs \
         --suite=gtk \
         --no-suite=gtk:gsk \
-        --no-suite=gtk:reftest \
         --no-suite=gtk:a11y

.gitlab/issue_templates/Bug.md

@@ -23,7 +23,7 @@
 
 ## Version information
 <!--
- - Which version of GTK you are using
+ - Which version of GTK+ you are using
  - What operating system and version
   - For Linux, which distribution
  - If you built GTK+ yourself, the list of options used to configure the build

.gitlab/issue_templates/Crash.md

@@ -13,7 +13,7 @@
 
 ## Version information
 <!--
- - Which version of GTK you are using
+ - Which version of GTK+ you are using
  - What operating system and version
   - for Linux, which distribution
  - If you built GTK+ yourself, the list of options used to configure the build

build-aux/meson/post-install.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 import os
 import sys
@@ -7,8 +7,8 @@ import subprocess
 if 'DESTDIR' not in os.environ:
     gtk_api_version = sys.argv[1]
     gtk_abi_version = sys.argv[2]
-    gtk_libdir = sys.argv[3]
-    gtk_datadir = sys.argv[4]
+    gtk_libdir = sys.argv[3].replace('/', os.sep)
+    gtk_datadir = sys.argv[4].replace('/', os.sep)
 
     gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
     gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
@@ -23,9 +23,11 @@ if 'DESTDIR' not in os.environ:
                     os.path.join(gtk_datadir, 'icons', 'hicolor')])
 
     print('Updating module cache for print backends...')
-    os.makedirs(gtk_printmodule_dir, exist_ok=True)
+    if not os.path.isdir(gtk_printmodule_dir):
+        os.mkdir(gtk_printmodule_dir)
     subprocess.call(['gio-querymodules', gtk_printmodule_dir])
 
     print('Updating module cache for input methods...')
-    os.makedirs(gtk_immodule_dir, exist_ok=True)
+    if not os.path.isdir(gtk_immodule_dir):
+        os.mkdir(gtk_immodule_dir)
     subprocess.call(['gio-querymodules', gtk_immodule_dir])

demos/gtk-demo/assistant.c

@@ -80,7 +80,7 @@ on_entry_changed (GtkWidget *widget, gpointer data)
 
   page_number = gtk_assistant_get_current_page (assistant);
   current_page = gtk_assistant_get_nth_page (assistant, page_number);
-  text = gtk_editable_get_text (GTK_EDITABLE (widget));
+  text = gtk_entry_get_text (GTK_ENTRY (widget));
 
   if (text && *text)
     gtk_assistant_set_page_complete (assistant, current_page, TRUE);

demos/gtk-demo/changedisplay.c

@@ -71,12 +71,20 @@ find_toplevel_at_pointer (GdkDisplay *display)
   GdkSurface *pointer_window;
   GtkWidget *widget = NULL;
 
-  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
+  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (),
+                                                      NULL, NULL);
 
+  /* The user data field of a GdkSurface is used to store a pointer
+   * to the widget that created it.
+   */
   if (pointer_window)
-    widget = GTK_WIDGET (gtk_root_get_for_surface (pointer_window));
+    {
+      gpointer widget_ptr;
+      gdk_surface_get_user_data (pointer_window, &widget_ptr);
+      widget = widget_ptr;
+    }
 
-  return widget;
+  return widget ? gtk_widget_get_toplevel (widget) : NULL;
 }
 
 static void

demos/gtk-demo/clipboard.c

@@ -28,7 +28,7 @@ copy_button_clicked (GtkWidget *button,
   clipboard = gtk_widget_get_clipboard (entry);
 
   /* Set clipboard text */
-  gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
+  gdk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)));
 }
 
 void
@@ -50,7 +50,7 @@ paste_received (GObject      *source_object,
   if (text)
     {
       /* Set the entry text */
-      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      gtk_entry_set_text (GTK_ENTRY (entry), text);
       g_free (text);
     }
   else

demos/gtk-demo/combobox.c

@@ -256,7 +256,7 @@ mask_entry_set_background (MaskEntry *entry)
 {
   if (entry->mask)
     {
-      if (!g_regex_match_simple (entry->mask, gtk_editable_get_text (GTK_EDITABLE (entry)), 0, 0))
+      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
         {
           PangoAttrList *attrs;
 

demos/gtk-demo/demo.gresource.xml

@@ -189,7 +189,6 @@
     <file>paintable_animated.c</file>
     <file>paintable_mediastream.c</file>
     <file>panes.c</file>
-    <file>password_entry.c</file>
     <file>pickers.c</file>
     <file>pixbufs.c</file>
     <file>popover.c</file>
@@ -207,7 +206,6 @@
     <file>spinbutton.c</file>
     <file>spinner.c</file>
     <file>tabs.c</file>
-    <file>tagged_entry.c</file>
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>
@@ -219,9 +217,6 @@
   <gresource prefix="/textview">
     <file>floppybuddy.gif</file>
   </gresource>
-  <gresource prefix="/tagged_entry">
-    <file>tagstyle.css</file>
-  </gresource>
   <gresource prefix="/listbox">
     <file>listbox.ui</file>
     <file>messages.txt</file>
@@ -266,10 +261,6 @@
   <gresource prefix="/dnd">
     <file>dnd.css</file>
   </gresource>
-  <gresource prefix="/tagged_entry">
-    <file>demotaggedentry.c</file>
-    <file>demotaggedentry.h</file>
-  </gresource>
   <gresource prefix="/org/gtk/Demo">
     <file>icons/16x16/actions/application-exit.png</file>
     <file>icons/16x16/actions/document-new.png</file>

demos/gtk-demo/demotaggedentry.c

@@ -1,493 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * Authors:
- * - Matthias Clasen <mclasen@redhat.com>
- *
- * 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 "demotaggedentry.h"
-
-#include <gtk/gtk.h>
-#include <gtk/gtk-a11y.h>
-
-typedef struct {
-  GtkWidget *box;
-  GtkWidget *entry;
-} DemoTaggedEntryPrivate;
-
-static void demo_tagged_entry_editable_init (GtkEditableInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
-                         G_ADD_PRIVATE (DemoTaggedEntry)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, demo_tagged_entry_editable_init))
-
-static void
-demo_tagged_entry_init (DemoTaggedEntry *entry)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_set_has_surface (GTK_WIDGET (entry), FALSE);
-
-  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
-
-  priv->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (priv->entry, TRUE);
-  gtk_widget_set_vexpand (priv->entry, TRUE);
-  gtk_widget_set_hexpand (priv->box, FALSE);
-  gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
-  gtk_editable_init_delegate (GTK_EDITABLE (entry));
-}
-
-static void
-demo_tagged_entry_dispose (GObject *object)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  if (priv->entry)
-    gtk_editable_finish_delegate (GTK_EDITABLE (entry));
-
-  g_clear_pointer (&priv->entry, gtk_widget_unparent);
-  g_clear_pointer (&priv->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
-}
-
-static void
-demo_tagged_entry_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->finalize (object);
-}
-
-static void
-demo_tagged_entry_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  if (gtk_editable_delegate_set_property (object, prop_id, value, pspec))
-    return;
-
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-}
-
-static void
-demo_tagged_entry_get_property (GObject    *object,
-                                guint       prop_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  if (gtk_editable_delegate_get_property (object, prop_id, value, pspec))
-    return;
-
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-}
-
-static void
-demo_tagged_entry_measure (GtkWidget      *widget,
-                           GtkOrientation  orientation,
-                           int             for_size,
-                           int            *minimum,
-                           int            *natural,
-                           int            *minimum_baseline,
-                           int            *natural_baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_measure (priv->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_size_allocate (GtkWidget *widget,
-                                 int        width,
-                                 int        height,
-                                 int        baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_size_allocate (priv->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
-static void
-demo_tagged_entry_grab_focus (GtkWidget *widget)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_grab_focus (priv->entry);
-}
-
-static void
-demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = demo_tagged_entry_dispose;
-  object_class->finalize = demo_tagged_entry_finalize;
-  object_class->get_property = demo_tagged_entry_get_property;
-  object_class->set_property = demo_tagged_entry_set_property;
-
-  widget_class->measure = demo_tagged_entry_measure;
-  widget_class->size_allocate = demo_tagged_entry_size_allocate;
-  widget_class->grab_focus = demo_tagged_entry_grab_focus;
- 
-  gtk_editable_install_properties (object_class, 1);
-
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "entry");
-}
-
-static GtkEditable *
-demo_tagged_entry_get_delegate (GtkEditable *editable)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (editable);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  return GTK_EDITABLE (priv->entry);
-}
-
-static void
-demo_tagged_entry_editable_init (GtkEditableInterface *iface)
-{
-  iface->get_delegate = demo_tagged_entry_get_delegate;
-}
-
-GtkWidget *
-demo_tagged_entry_new (void)
-{
-  return GTK_WIDGET (g_object_new (DEMO_TYPE_TAGGED_ENTRY, NULL));
-}
-
-void
-demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
-                           GtkWidget       *tag)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  gtk_container_add (GTK_CONTAINER (priv->box), tag);
-}
-
-void
-demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
-                                    GtkWidget       *tag,
-                                    GtkWidget       *sibling)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  if (sibling == NULL)
-    gtk_container_add (GTK_CONTAINER (priv->box), tag);
-  else
-    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
-}
-
-void
-demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
-                              GtkWidget       *tag)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
-}
-
-struct _DemoTaggedEntryTag
-{
-  GtkWidget parent;
-  GtkWidget *box;
-  GtkWidget *label;
-  GtkWidget *button;
-
-  gboolean has_close_button;
-  char *style;
-};
-
-struct _DemoTaggedEntryTagClass
-{
-  GtkWidgetClass parent_class;
-};
-
-enum {
-  PROP_0,
-  PROP_LABEL,
-  PROP_HAS_CLOSE_BUTTON,
-};
-
-enum {
-  SIGNAL_CLICKED,
-  SIGNAL_BUTTON_CLICKED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, GTK_TYPE_WIDGET)
-
-static void
-on_released (GtkGestureMultiPress *gesture,
-             int                   n_press,
-             double                x,
-             double                y,
-             DemoTaggedEntryTag          *tag)
-{
-  g_signal_emit (tag, signals[SIGNAL_CLICKED], 0);
-}
-
-static void
-demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
-{
-  GtkGesture *gesture;
-  GtkCssProvider *provider;
-
-  gtk_widget_set_has_surface (GTK_WIDGET (tag), FALSE);
-
-  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
-  tag->label = gtk_label_new ("");
-  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);
-
-  gesture = gtk_gesture_multi_press_new ();
-  g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
-  gtk_widget_add_controller (GTK_WIDGET (tag), GTK_EVENT_CONTROLLER (gesture));
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/tagged_entry/tagstyle.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);
-  g_object_unref (provider);
-}
-
-static void
-demo_tagged_entry_tag_dispose (GObject *object)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  g_clear_pointer (&tag->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_tagged_entry_tag_parent_class)->dispose (object);
-}
-
-static void
-demo_tagged_entry_tag_finalize (GObject *object)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  g_clear_pointer (&tag->box, gtk_widget_unparent);
-  g_clear_pointer (&tag->style, g_free);
-
-  G_OBJECT_CLASS (demo_tagged_entry_tag_parent_class)->finalize (object);
-}
-
-static void
-demo_tagged_entry_tag_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  switch (prop_id)
-    {
-    case PROP_LABEL:
-      demo_tagged_entry_tag_set_label (tag, g_value_get_string (value));
-      break;
-
-    case PROP_HAS_CLOSE_BUTTON:
-      demo_tagged_entry_tag_set_has_close_button (tag, g_value_get_boolean (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_tagged_entry_tag_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  switch (prop_id)
-    {
-    case PROP_LABEL:
-      g_value_set_string (value, demo_tagged_entry_tag_get_label (tag));
-      break;
-
-    case PROP_HAS_CLOSE_BUTTON:
-      g_value_set_boolean (value, demo_tagged_entry_tag_get_has_close_button (tag));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_tagged_entry_tag_measure (GtkWidget      *widget,
-                               GtkOrientation  orientation,
-                               int             for_size,
-                               int            *minimum,
-                               int            *natural,
-                               int            *minimum_baseline,
-                               int            *natural_baseline)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (widget);
-
-  gtk_widget_measure (tag->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_tag_size_allocate (GtkWidget *widget,
-                                     int        width,
-                                     int        height,
-                                     int        baseline)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (widget);
-
-  gtk_widget_size_allocate (tag->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
-static void
-demo_tagged_entry_tag_class_init (DemoTaggedEntryTagClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo_tagged_entry_tag_dispose;
-  object_class->finalize = demo_tagged_entry_tag_finalize;
-  object_class->set_property = demo_tagged_entry_tag_set_property;
-  object_class->get_property = demo_tagged_entry_tag_get_property;
-
-  widget_class->measure = demo_tagged_entry_tag_measure;
-  widget_class->size_allocate = demo_tagged_entry_tag_size_allocate;
-
-  signals[SIGNAL_CLICKED] =
-      g_signal_new ("clicked",
-                    DEMO_TYPE_TAGGED_ENTRY_TAG,
-                    G_SIGNAL_RUN_FIRST,
-                    0, NULL, NULL, NULL,
-                    G_TYPE_NONE, 0);
-  signals[SIGNAL_BUTTON_CLICKED] =
-      g_signal_new ("button-clicked",
-                    DEMO_TYPE_TAGGED_ENTRY_TAG,
-                    G_SIGNAL_RUN_FIRST,
-                    0, NULL, NULL, NULL,
-                    G_TYPE_NONE, 0);
-
-  g_object_class_install_property (object_class, PROP_LABEL,
-      g_param_spec_string ("label", "Label", "Label",
-                           NULL, G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, PROP_HAS_CLOSE_BUTTON,
-      g_param_spec_boolean ("has-close-button", "Has close button", "Whether this tag has a close button",
-                            FALSE, G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
-
-  gtk_widget_class_set_css_name (widget_class, "tag");
-}
-
-DemoTaggedEntryTag *
-demo_tagged_entry_tag_new (const char *label)
-{
-  return DEMO_TAGGED_ENTRY_TAG (g_object_new (DEMO_TYPE_TAGGED_ENTRY_TAG,
-                                              "label", label,
-                                              NULL));
-}
-
-const char *
-demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag)
-{
-  g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), NULL);
-
-  return gtk_label_get_label (GTK_LABEL (tag->label));
-}
-
-void
-demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag,
-                                 const char         *label)
-{
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag));
-
-  gtk_label_set_label (GTK_LABEL (tag->label), label);
-}
-
-static void
-on_button_clicked (GtkButton          *button,
-                   DemoTaggedEntryTag *tag)
-{
-  g_signal_emit (tag, signals[SIGNAL_BUTTON_CLICKED], 0);
-}
-
-void
-demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
-                                            gboolean            has_close_button)
-{
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag));
-
-  if ((tag->button != NULL) == has_close_button)
-    return;
-
-  if (!has_close_button && tag->button)
-    {
-      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
-      tag->button = NULL;
-    }
-  else if (has_close_button && tag->button == NULL)
-    {
-      GtkWidget *image;
-
-      image = gtk_image_new_from_icon_name ("window-close-symbolic");
-      tag->button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (tag->button), image);
-      gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
-      gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
-      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
-      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
-    }
-
-  g_object_notify (G_OBJECT (tag), "has-close-button");
-}
-
-gboolean
-demo_tagged_entry_tag_get_has_close_button (DemoTaggedEntryTag *tag)
-{
-  g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), FALSE);
-
-  return tag->button != NULL;
-}

demos/gtk-demo/demotaggedentry.h

@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * Authors:
- * - Matthias Clasen <mclasen@redhat.com>
- *
- * 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 __DEMO_TAGGED_ENTRY_H__
-#define __DEMO_TAGGED_ENTRY_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define DEMO_TYPE_TAGGED_ENTRY                 (demo_tagged_entry_get_type ())
-#define DEMO_TAGGED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntry))
-#define DEMO_TAGGED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-#define DEMO_IS_TAGGED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_IS_TAGGED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_TAGGED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-
-typedef struct _DemoTaggedEntry       DemoTaggedEntry;
-typedef struct _DemoTaggedEntryClass  DemoTaggedEntryClass;
-
-struct _DemoTaggedEntry
-{
-  GtkWidget parent;
-};
-
-struct _DemoTaggedEntryClass
-{
-  GtkWidgetClass parent_class;
-};
-
-#define DEMO_TYPE_TAGGED_ENTRY_TAG                (demo_tagged_entry_tag_get_type ())
-#define DEMO_TAGGED_ENTRY_TAG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_TAGGED_ENTRY_TAG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_IS_TAGGED_ENTRY_TAG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_IS_TAGGED_ENTRY_TAG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_TAGGED_ENTRY_TAG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTagClass))
-
-typedef struct _DemoTaggedEntryTag       DemoTaggedEntryTag;
-typedef struct _DemoTaggedEntryTagClass  DemoTaggedEntryTagClass;
-
-
-GType           demo_tagged_entry_get_type (void) G_GNUC_CONST;
-GType           demo_tagged_entry_tag_get_type (void) G_GNUC_CONST;
-
-GtkWidget *     demo_tagged_entry_new     (void);
-
-void            demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
-                                           GtkWidget       *tag);
-
-void            demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
-                                                    GtkWidget       *tag,
-                                                    GtkWidget       *sibling);
-
-void            demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
-                                              GtkWidget       *tag);
-
-DemoTaggedEntryTag *
-                demo_tagged_entry_tag_new (const char *label);
-
-const char *    demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag);
-
-void            demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag,
-                                                 const char         *label);
-
-gboolean        demo_tagged_entry_tag_get_has_close_button (DemoTaggedEntryTag *tag);
-
-void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
-                                                            gboolean            has_close_button);
-
-G_END_DECLS
-
-#endif /* __DEMO_TAGGED_ENTRY_H__ */

demos/gtk-demo/dialog.c

@@ -69,7 +69,7 @@ interactive_dialog_clicked (GtkButton *button,
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   local_entry1 = gtk_entry_new ();
-  gtk_editable_set_text (GTK_EDITABLE (local_entry1), gtk_editable_get_text (GTK_EDITABLE (entry1)));
+  gtk_entry_set_text (GTK_ENTRY (local_entry1), gtk_entry_get_text (GTK_ENTRY (entry1)));
   gtk_grid_attach (GTK_GRID (table), local_entry1, 1, 0, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1);
 
@@ -77,7 +77,7 @@ interactive_dialog_clicked (GtkButton *button,
   gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
 
   local_entry2 = gtk_entry_new ();
-  gtk_editable_set_text (GTK_EDITABLE (local_entry2), gtk_editable_get_text (GTK_EDITABLE (entry2)));
+  gtk_entry_set_text (GTK_ENTRY (local_entry2), gtk_entry_get_text (GTK_ENTRY (entry2)));
   gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
 
@@ -85,8 +85,8 @@ interactive_dialog_clicked (GtkButton *button,
 
   if (response == GTK_RESPONSE_OK)
     {
-      gtk_editable_set_text (GTK_EDITABLE (entry1), gtk_editable_get_text (GTK_EDITABLE (local_entry1)));
-      gtk_editable_set_text (GTK_EDITABLE (entry2), gtk_editable_get_text (GTK_EDITABLE (local_entry2)));
+      gtk_entry_set_text (GTK_ENTRY (entry1), gtk_entry_get_text (GTK_ENTRY (local_entry1)));
+      gtk_entry_set_text (GTK_ENTRY (entry2), gtk_entry_get_text (GTK_ENTRY (local_entry2)));
     }
 
   gtk_widget_destroy (dialog);

demos/gtk-demo/dnd.c

@@ -196,10 +196,10 @@ edit_label_done (GtkWidget *entry, gpointer data)
   GtkWidget *label;
   int x, y;
 
-  gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &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_editable_get_text (GTK_EDITABLE (entry)));
+  gtk_label_set_text (GTK_LABEL (label), gtk_entry_get_text (GTK_ENTRY (entry)));
 
   gtk_widget_destroy (entry);
 }
@@ -210,7 +210,7 @@ edit_cb (GtkWidget *child)
   GtkWidget *fixed = gtk_widget_get_parent (child);
   int x, y;
 
-  gtk_fixed_get_child_position (GTK_FIXED (fixed), child, &x, &y);
+  gtk_container_child_get (GTK_CONTAINER (fixed), child, "x", &x, "y", &y, NULL);
 
   if (GTK_IS_LABEL (child))
     {
@@ -218,7 +218,7 @@ edit_cb (GtkWidget *child)
 
       g_object_set_data (G_OBJECT (entry), "label", child);
 
-      gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_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);

demos/gtk-demo/fishbowl.ui

@@ -23,46 +23,58 @@
             </child>
           </object>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkLabel">
             <property name="label">fps</property>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkLabel">
             <property name="label" bind-source="bowl" bind-property="framerate"/>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkLabel">
             <property name="label">Icons, </property>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkLabel">
             <property name="label" bind-source="bowl" bind-property="count"/>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkToggleButton" id="changes_allow">
             <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean"/>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean"/>
+            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">1</property>
+            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">0</property>
             <property name="icon-name">changes-prevent</property>
             <property name="relief">none</property>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
       </object>
     </child>
@@ -70,7 +82,7 @@
       <object class="GtkFishbowl" id="bowl">
         <property name="visible">True</property>
         <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
+        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">1</property>
       </object>
     </child>
   </object>

demos/gtk-demo/font_features.c

@@ -305,7 +305,7 @@ update_display (void)
   char *font_desc;
   char *features;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (GTK_ENTRY (entry));
 
   if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound))
     {
@@ -728,7 +728,7 @@ adjustment_changed (GtkAdjustment *adjustment,
   char *str;
 
   str = g_strdup_printf ("%g", gtk_adjustment_get_value (adjustment));
-  gtk_editable_set_text (GTK_EDITABLE (entry), str);
+  gtk_entry_set_text (GTK_ENTRY (entry), str);
   g_free (str);
 
   update_display ();
@@ -741,7 +741,7 @@ entry_activated (GtkEntry *entry,
   gdouble value;
   gchar *err = NULL;
 
-  value = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err);
+  value = g_strtod (gtk_entry_get_text (entry), &err);
   if (err != NULL)
     gtk_adjustment_set_value (adjustment, value);
 }
@@ -821,7 +821,7 @@ add_axis (FT_Var_Axis *ax, FT_Fixed value, int i)
   gtk_grid_attach (GTK_GRID (variations_grid), axis_scale, 1, i, 1, 1);
   axis_entry = gtk_entry_new ();
   gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE);
-  gtk_editable_set_width_chars (GTK_EDITABLE (axis_entry), 4);
+  gtk_entry_set_width_chars (GTK_ENTRY (axis_entry), 4);
   gtk_grid_attach (GTK_GRID (variations_grid), axis_entry, 2, i, 1, 1);
 
   axis = g_new (Axis, 1);
@@ -1639,7 +1639,7 @@ static char *text;
 static void
 switch_to_entry (void)
 {
-  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry)));
+  text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
   gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry");
   gtk_widget_grab_focus (entry);
 }
@@ -1677,7 +1677,7 @@ entry_key_press (GtkEventController *controller,
 {
   if (keyval == GDK_KEY_Escape)
     {
-      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      gtk_entry_set_text (GTK_ENTRY (entry), text);
       stop_edit ();
       return GDK_EVENT_STOP;
     }

demos/gtk-demo/meson.build

@@ -47,7 +47,6 @@ demos = files([
   'paintable_animated.c',
   'paintable_mediastream.c',
   'panes.c',
-  'password_entry.c',
   'pickers.c',
   'pixbufs.c',
   'popover.c',
@@ -65,7 +64,6 @@ demos = files([
   'spinner.c',
   'stack.c',
   'tabs.c',
-  'tagged_entry.c',
   'textmask.c',
   'textview.c',
   'textscroll.c',
@@ -77,13 +75,7 @@ demos = files([
 
 gtkdemo_deps = [ libgtk_dep, ]
 
-extra_demo_sources = files(['main.c',
-                            'gtkfishbowl.c',
-                            'fontplane.c',
-                            'gtkgears.c',
-                            'puzzlepiece.c',
-                            'bluroverlay.c',
-                            'demotaggedentry.c'])
+extra_demo_sources = files(['main.c', 'gtkfishbowl.c', 'fontplane.c', 'gtkgears.c', 'puzzlepiece.c', 'bluroverlay.c'])
 
 if harfbuzz_dep.found() and pangoft_dep.found()
   demos += files('font_features.c')

demos/gtk-demo/org.gtk.Demo.appdata.xml

@@ -30,11 +30,4 @@
   <translation type="gettext">gtk-4.0</translation>
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
-  <releases>
-    <release version="3.94.0" date="2018-06-25">
-      <description>
-        <p>A new developers snapshot towards GTK 4.0.</p>
-      </description>
-    </release>
-  </releases>
 </component>

demos/gtk-demo/overlay.c

@@ -12,7 +12,7 @@
 static void
 do_number (GtkButton *button, GtkEntry *entry)
 {
-  gtk_editable_set_text (GTK_EDITABLE (entry), gtk_button_get_label (button));
+  gtk_entry_set_text (entry, gtk_button_get_label (button));
 }
 
 GtkWidget *

demos/gtk-demo/password_entry.c

@@ -1,89 +0,0 @@
-/* Entry/Password Entry
- *
- * GtkPasswordEntry provides common functionality of
- * entries that are used to enter passwords and other
- * secrets.
- *
- * It will display a warning if CapsLock is on, and it
- * can optionally provide a way to see the text.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *entry;
-static GtkWidget *entry2;
-static GtkWidget *button;
-
-static void
-update_button (GObject    *object,
-               GParamSpec *pspec,
-               gpointer    data)
-{
-  const char *text = gtk_editable_get_text (GTK_EDITABLE (entry));
-  const char *text2 = gtk_editable_get_text (GTK_EDITABLE (entry2));
-
-  gtk_widget_set_sensitive (button,
-                            text[0] != '\0' && g_str_equal (text, text2));
-}
-
-GtkWidget *
-do_password_entry (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *box;
-  GtkWidget *header;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Choose a Password");
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      gtk_window_set_deletable (GTK_WINDOW (window), FALSE);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-      g_object_set (box, "margin", 18, NULL);
-      gtk_container_add (GTK_CONTAINER (window), box);
-
-      entry = gtk_password_entry_new ();
-      gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry), TRUE);
-      g_object_set (entry,
-                    "placeholder-text", "Password",
-                    "activates-default", TRUE,
-                    NULL);
-      g_signal_connect (entry, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_container_add (GTK_CONTAINER (box), entry);
-
-      entry2 = gtk_password_entry_new ();
-      gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry2), TRUE);
-      g_object_set (entry2,
-                    "placeholder-text", "Confirm",
-                    "activates-default", TRUE,
-                    NULL);
-      g_signal_connect (entry2, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_container_add (GTK_CONTAINER (box), entry2);
-
-      button = gtk_button_new_with_mnemonic ("_Done");
-      gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action");
-      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-      gtk_widget_set_sensitive (button, FALSE);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
-
-      gtk_widget_set_can_default (button, TRUE);
-      gtk_window_set_default (GTK_WINDOW (window), button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/search_entry.c

@@ -85,7 +85,7 @@ stop_search (GtkButton *button,
 static void
 clear_entry (GtkEntry *entry)
 {
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
+  gtk_entry_set_text (entry, "");
 }
 
 static void
@@ -246,10 +246,7 @@ do_search_entry (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create our entry */
-      entry = gtk_entry_new ();
-      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                                         GTK_ENTRY_ICON_PRIMARY,
-                                         "edit-find-symbolic");
+      entry = gtk_search_entry_new ();
       gtk_container_add (GTK_CONTAINER (hbox), entry);
 
       /* Create the find and cancel buttons */

demos/gtk-demo/spinbutton.c

@@ -19,7 +19,7 @@ hex_spin_input (GtkSpinButton *spin_button,
   gchar *err;
   gdouble res;
 
-  buf = gtk_editable_get_text (GTK_EDITABLE (spin_button));
+  buf = gtk_spin_button_get_text (spin_button);
   res = strtol (buf, &err, 16);
   *new_val = res;
   if (*err)
@@ -41,8 +41,8 @@ hex_spin_output (GtkSpinButton *spin_button)
     buf = g_strdup ("0x00");
   else
     buf = g_strdup_printf ("0x%.2X", (gint) val);
-  if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button))))
-    gtk_editable_set_text (GTK_EDITABLE (spin_button), buf);
+  if (strcmp (buf, gtk_spin_button_get_text (spin_button)))
+    gtk_spin_button_set_text (spin_button, buf);
   g_free (buf);
 
   return TRUE;
@@ -60,7 +60,7 @@ time_spin_input (GtkSpinButton *spin_button,
   gchar *endh;
   gchar *endm;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (spin_button));
+  text = gtk_spin_button_get_text (spin_button);
   str = g_strsplit (text, ":", 2);
 
   if (g_strv_length (str) == 2)
@@ -99,8 +99,8 @@ time_spin_output (GtkSpinButton *spin_button)
   hours = gtk_adjustment_get_value (adjustment) / 60.0;
   minutes = (hours - floor (hours)) * 60.0;
   buf = g_strdup_printf ("%02.0f:%02.0f", floor (hours), floor (minutes + 0.5));
-  if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button))))
-    gtk_editable_set_text (GTK_EDITABLE (spin_button), buf);
+  if (strcmp (buf, gtk_spin_button_get_text (spin_button)))
+    gtk_spin_button_set_text (spin_button, buf);
   g_free (buf);
 
   return TRUE;
@@ -132,7 +132,7 @@ month_spin_input (GtkSpinButton *spin_button,
   for (i = 1; i <= 12; i++)
     {
       tmp1 = g_ascii_strup (month[i - 1], -1);
-      tmp2 = g_ascii_strup (gtk_editable_get_text (GTK_EDITABLE (spin_button)), -1);
+      tmp2 = g_ascii_strup (gtk_spin_button_get_text (spin_button), -1);
       if (strstr (tmp1, tmp2) == tmp1)
         found = TRUE;
       g_free (tmp1);
@@ -162,8 +162,8 @@ month_spin_output (GtkSpinButton *spin_button)
   for (i = 1; i <= 12; i++)
     if (fabs (value - (double)i) < 1e-5)
       {
-        if (strcmp (month[i-1], gtk_editable_get_text (GTK_EDITABLE (spin_button))))
-          gtk_editable_set_text (GTK_EDITABLE (spin_button), month[i-1]);
+        if (strcmp (month[i-1], gtk_spin_button_get_text (spin_button)))
+          gtk_spin_button_set_text (spin_button, month[i-1]);
       }
 
   return TRUE;

demos/gtk-demo/tagged_entry.c

@@ -1,112 +0,0 @@
-/* Entry/Tagged Entry
- *
- * This example shows how to build a complex composite
- * entry using GtkText, outside of GTK.
- *
- * This tagged entry can display tags and other widgets
- * inside the entry area.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include "demotaggedentry.h"
-
-static GtkWidget *spinner = NULL;
-
-static void
-closed_cb (DemoTaggedEntryTag *tag, DemoTaggedEntry *entry)
-{
-  demo_tagged_entry_remove_tag (entry, GTK_WIDGET (tag));
-}
-
-static void
-add_tag (GtkButton *button, DemoTaggedEntry *entry)
-{
-  DemoTaggedEntryTag *tag;
-
-  tag = demo_tagged_entry_tag_new ("Blue");
-  gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tag)), "blue");
-  demo_tagged_entry_tag_set_has_close_button (tag, TRUE);
-  g_signal_connect (tag, "button-clicked", G_CALLBACK (closed_cb), entry);
-
-  if (spinner == NULL)
-    demo_tagged_entry_add_tag (entry, GTK_WIDGET (tag));
-  else
-    demo_tagged_entry_insert_tag_after (entry, GTK_WIDGET (tag), gtk_widget_get_prev_sibling (spinner));
-}
-
-static void
-toggle_spinner (GtkCheckButton *button, DemoTaggedEntry *entry)
-{
-  if (spinner)
-    {
-      demo_tagged_entry_remove_tag (entry, spinner);
-      spinner = NULL; 
-    }
-  else
-    {
-      spinner = gtk_spinner_new ();
-      gtk_spinner_start (GTK_SPINNER (spinner));
-      demo_tagged_entry_add_tag (entry, spinner);
-    }
-}
-
-GtkWidget *
-do_tagged_entry (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *box;
-  GtkWidget *box2;
-  GtkWidget *header;
-  GtkWidget *entry;
-  GtkWidget *button;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "A tagged entry");
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_deletable (GTK_WINDOW (window), FALSE);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-      g_object_set (box, "margin", 18, NULL);
-      gtk_container_add (GTK_CONTAINER (window), box);
-
-      entry = demo_tagged_entry_new ();
-      gtk_container_add (GTK_CONTAINER (box), entry);
-
-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-      gtk_widget_set_halign (box2, GTK_ALIGN_END);
-      gtk_container_add (GTK_CONTAINER (box), box2);
-
-      button = gtk_button_new_with_mnemonic ("Add _Tag");
-      g_signal_connect (button, "clicked", G_CALLBACK (add_tag), entry);
-      gtk_container_add (GTK_CONTAINER (box2), button);
-
-      button = gtk_check_button_new_with_mnemonic ("_Spinner");
-      g_signal_connect (button, "toggled", G_CALLBACK (toggle_spinner), entry);
-      gtk_container_add (GTK_CONTAINER (box2), button);
-      
-      button = gtk_button_new_with_mnemonic ("_Done");
-      gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action");
-      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
-
-      gtk_widget_set_can_default (button, TRUE);
-      gtk_window_set_default (GTK_WINDOW (window), button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/tagstyle.css

@@ -1,19 +0,0 @@
-tag {
-  margin: 4px;
-  padding: 4px;
-  border-radius: 4px;
-  background: lightskyblue;
-}
-tag box {
-  border-spacing: 4px;
-}
-tag label,
-tag image {
-  color: white;
-}
-tag button {
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  border: 1px solid white;
-}

demos/gtk-demo/theming.ui

@@ -11,36 +11,41 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
             <property name="icon-name">edit-find</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
             <property name="icon-name">edit-find</property>
             <property name="active">1</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
             <property name="icon-name">edit-find</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Raised</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
@@ -49,10 +54,12 @@
               <class name="raised"/>
             </style>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Raised Active</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
@@ -62,10 +69,12 @@
               <class name="raised"/>
             </style>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
             <property name="use-underline">1</property>
@@ -73,6 +82,9 @@
             <property name="is-important">1</property>
             <property name="active">1</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToolItem">
@@ -137,56 +149,68 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-add-symbolic</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-add-symbolic</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-remove-symbolic</property>
             <property name="active">1</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-remove-symbolic</property>
             <property name="active">1</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
             <property name="use-underline">1</property>
             <property name="icon-name">edit-find-symbolic</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
             <property name="use-underline">1</property>
             <property name="icon-name">go-up-symbolic</property>
             <property name="active">1</property>
           </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
         </child>
       </object>
     </child>

demos/icon-browser/iconbrowserwin.c

@@ -68,7 +68,7 @@ search_text_changed (GtkEntry *entry, IconBrowserWindow *win)
 {
   const gchar *text;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
 
   if (text[0] == '\0')
     return;
@@ -322,7 +322,7 @@ icon_visible_func (GtkTreeModel *model,
   gboolean visible;
 
   search = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (win->search));
-  search_text = gtk_editable_get_text (GTK_EDITABLE (win->searchentry));
+  search_text = gtk_entry_get_text (GTK_ENTRY (win->searchentry));
 
   if (win->symbolic)
     column = ICON_STORE_SYMBOLIC_NAME_COLUMN;

demos/icon-browser/window.ui

@@ -35,7 +35,7 @@
             </child>
           </object>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkToggleButton" id="search">
             <style>
               <class name="image-button"/>
@@ -46,7 +46,9 @@
               </object>
             </child>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
       </object>
     </child>

demos/widget-factory/org.gtk.WidgetFactory.appdata.xml

@@ -31,11 +31,4 @@
   <translation type="gettext">gtk-4.0</translation>
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
-  <releases>
-    <release version="3.94.0" date="2018-06-25">
-      <description>
-        <p>A new developers snapshot towards GTK 4.0.</p>
-      </description>
-    </release>
-  </releases>
 </component>

demos/widget-factory/widget-factory.c

@@ -48,7 +48,7 @@ change_transition_state (GSimpleAction *action,
   GtkStackTransitionType transition;
 
   if (g_variant_get_boolean (state))
-    transition = GTK_STACK_TRANSITION_TYPE_ROTATE_LEFT_RIGHT;
+    transition = GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT;
   else
     transition = GTK_STACK_TRANSITION_TYPE_NONE;
 
@@ -1406,7 +1406,7 @@ open_popover_text_changed (GtkEntry *entry, GParamSpec *pspec, GtkWidget *button
 {
   const gchar *text;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
   gtk_widget_set_sensitive (button, strlen (text) > 0);
 }
 

demos/widget-factory/widget-factory.ui

@@ -411,12 +411,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
             <property name="stack">toplevel_stack</property>
           </object>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkMenuButton" id="gear_menu_button">
             <property name="valign">center</property>
             <property name="menu-model">gear_menu</property>
             <property name="icon-name">open-menu-symbolic</property>
           </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
       </object>
     </child>
@@ -426,7 +429,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">1000</property>
+            <property name="transition-duration">30000</property>
             <child>
               <object class="GtkStackPage">
                 <property name="name">page1</property>
@@ -1429,7 +1432,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                   <object class="GtkOverlay" id="page2">
                     <child type="overlay">
                       <object class="GtkRevealer" id="page2revealer">
-                        <property name="transition-type">swing-down</property>
                         <property name="halign">center</property>
                         <property name="valign">start</property>
                         <child>
@@ -1585,13 +1587,16 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">center</property>
                                           </object>
                                         </child>
-                                        <child type="end">
+                                        <child>
                                           <object class="GtkMenuButton">
                                             <property name="menu-model">dinner_menu</property>
                                             <property name="halign">center</property>
                                             <property name="valign">center</property>
                                             <property name="icon-name">emblem-system-symbolic</property>
                                           </object>
+                                          <packing>
+                                            <property name="pack-type">end</property>
+                                          </packing>
                                         </child>
                                       </object>
                                     </child>
@@ -2842,7 +2847,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkToolItem">
-                                    <property name="expand-item">1</property>
                                     <child>
                                       <object class="GtkScale">
                                         <property name="draw-value">0</property>
@@ -2850,6 +2854,9 @@ microphone-sensitivity-medium-symbolic</property>
                                       </object>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">1</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkToolItem">

docs/reference/gdk/gdk4-sections.txt

@@ -213,7 +213,6 @@ gdk_surface_get_pass_through
 gdk_surface_move
 gdk_surface_resize
 gdk_surface_move_resize
-gdk_surface_move_to_rect
 gdk_surface_has_native
 gdk_surface_raise
 gdk_surface_lower
@@ -241,6 +240,7 @@ gdk_surface_thaw_updates
 gdk_surface_get_frame_clock
 
 <SUBSECTION>
+gdk_surface_set_user_data
 gdk_surface_set_accept_focus
 gdk_surface_get_accept_focus
 gdk_surface_set_focus_on_map
@@ -252,6 +252,7 @@ gdk_surface_set_title
 GDK_PARENT_RELATIVE
 gdk_surface_set_cursor
 gdk_surface_get_cursor
+gdk_surface_get_user_data
 gdk_surface_get_geometry
 gdk_surface_set_geometry_hints
 gdk_surface_get_width
@@ -271,14 +272,17 @@ gdk_surface_get_frame_extents
 gdk_surface_get_origin
 gdk_surface_get_root_coords
 gdk_surface_get_device_position
+gdk_surface_get_device_position_double
 GdkModifierType
 GdkModifierIntent
 gdk_surface_get_parent
 gdk_surface_get_toplevel
 gdk_surface_get_children
+gdk_surface_get_children_with_user_data
 gdk_surface_peek_children
 gdk_surface_set_icon_name
 gdk_surface_set_transient_for
+gdk_surface_set_role
 gdk_surface_set_startup_id
 gdk_surface_set_group
 gdk_surface_get_group
@@ -373,7 +377,6 @@ gdk_content_formats_builder_to_formats
 GDK_TYPE_FILE_LIST
 gdk_file_list_get_type
 gdk_content_formats_get_type
-gdk_content_formats_builder_get_type
 </SECTION>
 
 <SECTION>
@@ -439,7 +442,6 @@ gdk_keymap_get_modifier_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
 gdk_keymap_get_modifier_mask
-gdk_keymap_get_display
 
 <SUBSECTION>
 gdk_keyval_name
@@ -500,6 +502,7 @@ gdk_device_get_has_cursor
 gdk_device_get_n_axes
 gdk_device_get_n_keys
 gdk_device_get_axes
+gdk_device_warp
 gdk_device_get_seat
 
 <SUBSECTION>
@@ -509,7 +512,9 @@ gdk_device_ungrab
 <SUBSECTION>
 gdk_device_get_state
 gdk_device_get_position
+gdk_device_get_position_double
 gdk_device_get_surface_at_position
+gdk_device_get_surface_at_position_double
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
@@ -617,7 +622,6 @@ GDK_BUTTON_SECONDARY
 gdk_event_new
 gdk_event_copy
 gdk_event_get_axes
-gdk_event_get_axis
 gdk_event_get_button
 gdk_event_get_click_count
 gdk_event_get_coords
@@ -680,7 +684,6 @@ GDK_TYPE_SCROLL_DIRECTION
 GDK_TYPE_NOTIFY_TYPE
 GDK_IS_EVENT
 gdk_event_get_type
-gdk_event_sequence_get_type
 </SECTION>
 
 <SECTION>
@@ -776,6 +779,7 @@ GDK_ACTION_ALL
 
 gdk_drag_get_display
 gdk_drag_get_actions
+gdk_drag_get_suggested_action
 gdk_drag_get_selected_action
 gdk_drag_get_formats
 gdk_drag_get_device

docs/reference/gdk/meson.build

@@ -15,9 +15,7 @@ private_headers = [
   'gdkdisplaymanagerprivate.h',
   'gdkdisplayprivate.h',
   'gdkdndprivate.h',
-  'gdkdragprivate.h',
   'gdkdrawcontextprivate.h',
-  'gdkdropprivate.h',
   'gdkeventsprivate.h',
   'gdkframeclockidleprivate.h',
   'gdkframeclockprivate.h',

docs/reference/gsk/gsk4-docs.xml

@@ -18,8 +18,6 @@
     <title>API Reference</title>
     <xi:include href="xml/GskRenderer.xml" />
     <xi:include href="xml/GskRenderNode.xml" />
-    <xi:include href="xml/GskRoundedRect.xml" />
-    <xi:include href="xml/GskTransform.xml" />
   </reference>
 
   <index id="api-index-full">

docs/reference/gsk/gsk4-sections.txt

@@ -2,9 +2,9 @@
 <FILE>GskRenderer</FILE>
 gsk_renderer_new_for_surface
 gsk_renderer_get_surface
+gsk_renderer_get_display
 gsk_renderer_realize
 gsk_renderer_unrealize
-gsk_renderer_is_realized
 gsk_renderer_render
 gsk_renderer_render_texture
 <SUBSECTION Standard>
@@ -67,7 +67,11 @@ gsk_container_node_get_n_children
 gsk_container_node_get_child
 gsk_transform_node_new
 gsk_transform_node_get_child
-gsk_transform_node_get_transform
+gsk_transform_node_peek_transform
+gsk_offset_node_new
+gsk_offset_node_get_child
+gsk_offset_node_get_x_offset
+gsk_offset_node_get_y_offset
 gsk_opacity_node_new
 gsk_opacity_node_get_child
 gsk_opacity_node_get_opacity
@@ -140,40 +144,3 @@ gsk_rounded_rect_contains_point
 gsk_rounded_rect_contains_rect
 gsk_rounded_rect_intersects_rect
 </SECTION>
-
-<SECTION>
-<FILE>GskTransform</FILE>
-GskTransform
-gsk_transform_ref
-gsk_transform_unref
-<SUBSECTION>
-GskTransformCategory
-gsk_transform_get_category
-<SUBSECTION>
-gsk_transform_print
-gsk_transform_to_string
-gsk_transform_to_matrix
-gsk_transform_to_2d
-gsk_transform_to_affine
-gsk_transform_to_translate
-<SUBSECTION>
-gsk_transform_transform
-gsk_transform_invert
-gsk_transform_matrix
-gsk_transform_translate
-gsk_transform_translate_3d
-gsk_transform_rotate
-gsk_transform_rotate_3d
-gsk_transform_scale
-gsk_transform_scale_3d
-gsk_transform_perspective
-<SUBSECTION>
-gsk_transform_equal
-<SUBSECTION>
-gsk_transform_transform_bounds
-<SUBSECTION Private>
-GSK_TYPE_TRANSFORM
-gsk_transform_get_type
-gsk_transform_new
-</SECTION>
-

docs/reference/gtk/css-overview.xml

@@ -546,7 +546,7 @@ checkbutton:indeterminate {
       GTK adds several additional ways to specify colors.
     </para>
 
-<literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉</code>
+<literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉 | 〈win32 color〉</code>
 </literallayout>
 
     <para>
@@ -592,6 +592,13 @@ checkbutton:indeterminate {
 
 <literallayout><code>〈color expression〉 = lighter( 〈color〉 ) | darker( 〈color〉 ) | shade( 〈color〉, 〈number〉 ) |</code>
 <code>                     alpha( 〈color〉, 〈number〉 ) | mix( 〈color〉, 〈color〉, 〈number〉 )</code>
+</literallayout>
+
+    <para>
+      On Windows, GTK allows to refer to system colors, as follows:
+    </para>
+
+<literallayout><code>〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉 )</code>
 </literallayout>
 
   </refsect2>
@@ -730,7 +737,7 @@ label {
       GTK extends the CSS syntax for images and also uses it for specifying icons.
     </para>
 
-<literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉</code>
+<literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉</code>
 </literallayout>
 
     <para>
@@ -808,6 +815,13 @@ arrow {
 }
 ]]></programlisting>
     </example>
+    <para>
+      On Windows, GTK allows to refer to system theme parts as images, as follows:
+    </para>
+
+<literallayout><code>〈win32 theme part〉 = -gtk-win32-theme-part( 〈name〉, 〈integer〉 〈integer〉</code>
+<code>                                              [ , [ over( 〈integer〉 〈integer〉 [ , 〈alpha value〉 ]? ) | margins( 〈integer〉{1,4} ) ] ]* )</code>
+</literallayout>
 
   </refsect2>
 

docs/reference/gtk/css-properties.xml

@@ -65,6 +65,20 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
       not quite the same as the CSS definition of rem.
     </para>
 
+    <para>
+      Whereever a number is allowed, GTK also accepts a Windows-specific
+      theme size:
+    </para>
+
+<literallayout>
+<code>〈win32 theme size〉 = 〈win32 size〉 | 〈win32 part size〉</code>
+<code>〈win32 size〉 = -gtk-win32-size ( 〈theme name〉, 〈metric id〉 )</code>
+<code>〈win32 part size〉 = [ -gtk-win32-part-width | -gtk-win32-part-height |</code>
+<code>                      -gtk-win32-part-border-top | -gtk-win32-part-border-right |</code>
+<code>                      -gtk-win32-part-border-bottom | -gtk-win32-part-border-left ]</code>
+<code>                    ( 〈theme name〉 , 〈integer〉 , 〈integer〉 )</code>
+</literallayout>
+
 <literallayout><code>〈calc expression〉 = calc( 〈calc sum〉 )</code>
 <code>〈calc sum〉 = 〈calc product〉 [ [ + | - ] 〈calc product〉 ]*</code>
 <code>〈calc product〉 = 〈calc value〉 [ * 〈calc value〉 | / 〈number〉 ]*</code>

docs/reference/gtk/drawing-model.xml

@@ -45,7 +45,7 @@
         windows gets raised to the top, then the application has to
         repaint it, so the previously obscured area can be shown.
         When the windowing system asks an application to redraw
-        a window, it sends a <firstterm>frame event</firstterm>
+        a window, it sends an <firstterm>frame event</firstterm>
         (<firstterm>expose event</firstterm> in X11 terminology)
         for that window.
       </para>
@@ -64,14 +64,16 @@
         tell the underlying surface that it needs to repaint itself.  The
         drawing cycle can also be initiated when a widget itself decides
         that it needs to update its display.  For example, when the user
-        types a character in an entry widget, the entry asks GTK to queue
-        a redraw operation for itself.
+        types a character in a <link
+        linkend="GtkEntry"><classname>GtkEntry</classname></link>
+        widget, the entry asks GTK to queue a redraw operation for
+        itself.
       </para>
 
       <para>
         The windowing system generates frame events for surfaces. The GDK
         interface to the windowing system translates such events into
-        emissions of the ::render signal on the affected surfaces.
+        emissions of the #GtkSurface::render signal on the affected surfaces.
         The GTK toplevel window connects to that signal, and reacts appropriately.
       </para>
 
@@ -203,21 +205,21 @@
       <title>Hierarchical drawing</title>
 
       <para>
-        During the Paint phase GTK receives a single ::render signal on the toplevel
+        During the Paint phase we will send a single ::render signal the toplevel
         window. The signal handler will create a snapshot object (which is a
         helper for creating a scene graph) and emit a GtkWidget::snapshot() signal,
-        which will propagate down the widget hierarchy. This lets each widget
+        which will propagate down the entire widget hierarchy. This lets each widget
         snapshot its content at the right place and time, correctly handling things
         like partial transparencies and overlapping widgets.
       </para>
 
       <para>
         To avoid excessive work when generating scene graphs, GTK caches render nodes.
-        Each widget keeps a reference to its render node (which in turn, will refer to
+        GtkWidget keeps a reference to its render node (which in turn, will refer to
         the render nodes of children, and grandchildren, and so on), and will reuse
-        that node during the Paint phase. Invalidating a widget (by calling
-        gtk_widget_queue_draw()) discards the cached render node, forcing the widget
-        to regenerate it the next time it needs to handle a ::snapshot.
+        that node during the Paint phase. Invalidating a widget (e.g. by calling
+        gtk_widget_queue_draw) discards the cached render node, forcing GTK to
+        regenerate it the next time it needs to snapshot the widget.
       </para>
     </refsect2>
 

docs/reference/gtk/getting_started.xml.in

@@ -827,7 +827,7 @@ search_text_changed (GtkEntry         *entry,
   GtkTextBuffer *buffer;
   GtkTextIter start, match_start, match_end;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
 
   if (text[0] == '\0')
     return;

docs/reference/gtk/gtk4-docs.xml

@@ -68,7 +68,6 @@
 
     <chapter id="WindowWidgets">
       <title>Windows</title>
-      <xi:include href="xml/gtkroot.xml" />
       <xi:include href="xml/gtkwindow.xml" />
       <xi:include href="xml/gtkdialog.xml" />
       <xi:include href="xml/gtkmessagedialog.xml" />
@@ -100,13 +99,6 @@
       <xi:include href="xml/gtkfixed.xml" />
     </chapter>
 
-    <chapter id="LayoutManagers">
-      <title>Layout Managers</title>
-      <xi:include href="xml/gtklayoutmanager.xml" />
-      <xi:include href="xml/gtklayoutchild.xml" />
-      <xi:include href="xml/gtkboxlayout.xml" />
-    </chapter>
-
     <chapter id="DisplayWidgets">
       <title>Display Widgets</title>
       <xi:include href="xml/gtklabel.xml" />
@@ -352,6 +344,7 @@
     <xi:include href="xml/gtkselection.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
+    <xi:include href="xml/gtktransform.xml" />
   </part>
 
   <part id="theming">

docs/reference/gtk/gtk4-sections.txt

@@ -424,7 +424,6 @@ gtk_selection_model_select_range
 gtk_selection_model_unselect_range
 gtk_selection_model_select_all
 gtk_selection_model_unselect_all
-gtk_selection_model_query_range
 <SUBSECTION>
 gtk_selection_model_selection_changed
 <SUBSECTION Standard>
@@ -676,6 +675,12 @@ gtk_combo_box_new
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
 gtk_combo_box_new_with_model_and_entry
+gtk_combo_box_get_wrap_width
+gtk_combo_box_set_wrap_width
+gtk_combo_box_get_row_span_column
+gtk_combo_box_set_row_span_column
+gtk_combo_box_get_column_span_column
+gtk_combo_box_set_column_span_column
 gtk_combo_box_get_active
 gtk_combo_box_set_active
 gtk_combo_box_get_active_iter
@@ -690,7 +695,6 @@ gtk_combo_box_popdown
 gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_set_row_separator_func
-GtkSensitivityType
 gtk_combo_box_set_button_sensitivity
 gtk_combo_box_get_button_sensitivity
 gtk_combo_box_get_has_entry
@@ -919,6 +923,8 @@ gtk_entry_new
 gtk_entry_new_with_buffer
 gtk_entry_get_buffer
 gtk_entry_set_buffer
+gtk_entry_set_text
+gtk_entry_get_text
 gtk_entry_get_text_length
 gtk_entry_set_visibility
 gtk_entry_get_visibility
@@ -931,6 +937,10 @@ gtk_entry_set_activates_default
 gtk_entry_get_activates_default
 gtk_entry_set_has_frame
 gtk_entry_get_has_frame
+gtk_entry_set_width_chars
+gtk_entry_get_width_chars
+gtk_entry_set_max_width_chars
+gtk_entry_get_max_width_chars
 gtk_entry_set_alignment
 gtk_entry_get_alignment
 gtk_entry_set_placeholder_text
@@ -996,8 +1006,6 @@ gtk_entry_get_type
 <TITLE>GtkPasswordEntry</TITLE>
 GtkPasswordEntry
 gtk_password_entry_new
-gtk_password_entry_set_show_peek_icon
-gtk_password_entry_get_show_peek_icon
 <SUBSECTION Private>
 gtk_password_entry_get_type
 </SECTION>
@@ -1298,8 +1306,6 @@ gtk_file_filter_get_type
 <TITLE>GtkFilterListModel</TITLE>
 GtkFilterListModel
 gtk_filter_list_model_new
-gtk_filter_list_model_new_for_type
-gtk_filter_list_model_set_model
 gtk_filter_list_model_get_model
 gtk_filter_list_model_set_filter_func
 gtk_filter_list_model_has_filter
@@ -1389,7 +1395,6 @@ gtk_font_chooser_set_font
 gtk_font_chooser_get_font_desc
 gtk_font_chooser_set_font_desc
 gtk_font_chooser_get_font_features
-gtk_font_chooser_get_language
 gtk_font_chooser_set_language
 gtk_font_chooser_get_preview_text
 gtk_font_chooser_set_preview_text
@@ -1814,6 +1819,7 @@ gtk_menu_new
 gtk_menu_new_from_model
 gtk_menu_set_display
 gtk_menu_reorder_child
+gtk_menu_attach
 gtk_menu_popup_at_rect
 gtk_menu_popup_at_widget
 gtk_menu_popup_at_pointer
@@ -1835,6 +1841,7 @@ gtk_menu_attach_to_widget
 gtk_menu_detach
 gtk_menu_get_attach_widget
 gtk_menu_get_for_attach_widget
+GtkMenuPositionFunc
 GtkMenuDetachFunc
 <SUBSECTION Standard>
 GTK_MENU
@@ -2274,6 +2281,11 @@ gtk_range_set_increments
 gtk_range_set_range
 gtk_range_get_round_digits
 gtk_range_set_round_digits
+GtkSensitivityType
+gtk_range_set_lower_stepper_sensitivity
+gtk_range_get_lower_stepper_sensitivity
+gtk_range_set_upper_stepper_sensitivity
+gtk_range_get_upper_stepper_sensitivity
 gtk_range_get_flippable
 gtk_range_set_flippable
 gtk_range_get_range_rect
@@ -2706,6 +2718,12 @@ gtk_spin_button_get_snap_to_ticks
 gtk_spin_button_get_update_policy
 gtk_spin_button_get_value
 gtk_spin_button_get_wrap
+gtk_spin_button_set_text
+gtk_spin_button_get_text
+gtk_spin_button_set_max_width_chars
+gtk_spin_button_get_max_width_chars
+gtk_spin_button_set_width_chars
+gtk_spin_button_get_width_chars
 GTK_INPUT_ERROR
 <SUBSECTION Standard>
 GTK_SPIN_BUTTON
@@ -4382,9 +4400,6 @@ gtk_snapshot_push_clip
 gtk_snapshot_push_rounded_clip
 gtk_snapshot_push_cross_fade
 gtk_snapshot_push_blend
-gtk_snapshot_push_blur
-gtk_snapshot_push_shadow
-gtk_snapshot_push_debug
 gtk_snapshot_pop
 gtk_snapshot_save
 gtk_snapshot_restore
@@ -4396,7 +4411,6 @@ gtk_snapshot_rotate
 gtk_snapshot_rotate_3d
 gtk_snapshot_scale
 gtk_snapshot_scale_3d
-gtk_snapshot_perspective
 gtk_snapshot_append_node
 gtk_snapshot_append_cairo
 gtk_snapshot_append_texture
@@ -4412,8 +4426,6 @@ gtk_snapshot_render_frame
 gtk_snapshot_render_focus
 gtk_snapshot_render_layout
 gtk_snapshot_render_insertion_cursor
-<SUBSECTION Private>
-gtk_snapshot_get_type
 </SECTION>
 
 <SECTION>
@@ -4481,7 +4493,6 @@ gtk_widget_set_parent
 gtk_widget_set_parent_surface
 gtk_widget_get_parent_surface
 gtk_widget_get_toplevel
-gtk_widget_get_root
 gtk_widget_get_ancestor
 gtk_widget_is_ancestor
 gtk_widget_translate_coordinates
@@ -4504,6 +4515,7 @@ gtk_widget_get_cursor
 gtk_widget_set_cursor
 gtk_widget_set_cursor_from_name
 gtk_widget_mnemonic_activate
+gtk_widget_send_focus_change
 gtk_widget_class_set_accessible_type
 gtk_widget_class_set_accessible_role
 gtk_widget_get_accessible
@@ -4541,6 +4553,7 @@ gtk_widget_get_allocated_width
 gtk_widget_get_allocated_height
 gtk_widget_get_allocation
 gtk_widget_get_allocated_baseline
+gtk_widget_get_allocated_size
 gtk_widget_get_width
 gtk_widget_get_height
 gtk_widget_compute_bounds
@@ -4597,8 +4610,6 @@ gtk_widget_get_first_child
 gtk_widget_get_last_child
 gtk_widget_insert_before
 gtk_widget_insert_after
-gtk_widget_set_layout_manager
-gtk_widget_get_layout_manager
 
 <SUBSECTION>
 gtk_widget_get_path
@@ -4695,6 +4706,8 @@ gtk_window_activate_focus
 gtk_window_activate_default
 gtk_window_set_modal
 gtk_window_set_default_size
+gtk_window_set_gravity
+gtk_window_get_gravity
 gtk_window_set_hide_on_close
 gtk_window_get_hide_on_close
 GtkWindowPosition
@@ -4742,14 +4755,20 @@ gtk_window_set_urgency_hint
 gtk_window_set_accept_focus
 gtk_window_set_focus_on_map
 gtk_window_set_startup_id
+gtk_window_set_role
 gtk_window_get_decorated
 gtk_window_get_deletable
+gtk_window_get_default_icon_list
 gtk_window_get_default_icon_name
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
+gtk_window_get_icon
+gtk_window_get_icon_list
 gtk_window_get_icon_name
 gtk_window_get_mnemonic_modifier
 gtk_window_get_modal
+gtk_window_get_position
+gtk_window_get_role
 gtk_window_get_size
 gtk_window_get_title
 gtk_window_get_transient_for
@@ -4763,8 +4782,15 @@ gtk_window_get_focus_on_map
 gtk_window_get_group
 gtk_window_has_group
 gtk_window_get_window_type
+gtk_window_move
 gtk_window_resize
+gtk_window_set_default_icon_list
+gtk_window_set_default_icon
+gtk_window_set_default_icon_from_file
 gtk_window_set_default_icon_name
+gtk_window_set_icon
+gtk_window_set_icon_list
+gtk_window_set_icon_from_file
 gtk_window_set_icon_name
 gtk_window_set_auto_startup_notification
 gtk_window_get_mnemonics_visible
@@ -5873,6 +5899,38 @@ gtk_mount_operation_get_type
 GtkMountOperationPrivate
 </SECTION>
 
+<SECTION>
+<FILE>gtktransform</FILE>
+<TITLE>3D transformations</TITLE>
+GtkTransformType;
+GtkTransform;
+gtk_transform_ref
+gtk_transform_unref
+<SUBSECTION>
+gtk_transform_print
+gtk_transform_to_string
+gtk_transform_to_matrix
+<SUBSECTION>
+gtk_transform_identity
+gtk_transform_transform
+gtk_transform_matrix
+gtk_transform_translate
+gtk_transform_translate_3d
+gtk_transform_rotate
+gtk_transform_rotate_3d
+gtk_transform_scale
+gtk_transform_scale_3d
+<SUBSECTION>
+gtk_transform_equal
+<SUBSECTION>
+gtk_transform_get_transform_type
+gtk_transform_get_next
+<SUBSECTION Private>
+GTK_TYPE_TRANSFORM
+gdk_transform_get_type
+gtk_transform_new
+</SECTION>
+
 <SECTION>
 <FILE>gtkorientable</FILE>
 <TITLE>Orientable</TITLE>
@@ -6219,10 +6277,6 @@ gtk_color_chooser_get_use_alpha
 gtk_color_chooser_set_use_alpha
 gtk_color_chooser_add_palette
 
-<SUBSECTION>
-gtk_hsv_to_rgb
-gtk_rgb_to_hsv
-
 <SUBSECTION Standard>
 GTK_TYPE_COLOR_CHOOSER
 GTK_COLOR_CHOOSER
@@ -6340,7 +6394,6 @@ gtk_stack_add_named
 gtk_stack_add_titled
 gtk_stack_get_child_by_name
 gtk_stack_get_page
-gtk_stack_get_pages
 gtk_stack_page_get_child
 gtk_stack_set_visible_child
 gtk_stack_get_visible_child
@@ -6371,7 +6424,6 @@ GTK_STACK_GET_CLASS
 
 <SUBSECTION Private>
 gtk_stack_get_type
-gtk_stack_page_get_type
 </SECTION>
 
 <SECTION>
@@ -6533,7 +6585,6 @@ gtk_popover_get_type
 <TITLE>GtkPopoverMenu</TITLE>
 GtkPopoverMenu
 gtk_popover_menu_new
-gtk_popover_menu_add_submenu
 gtk_popover_menu_open_submenu
 
 <SUBSECTION Standard>
@@ -6652,8 +6703,8 @@ gtk_gesture_single_get_type
 
 <SECTION>
 <FILE>gtkeventcontrollerlegacy</FILE>
-<TITLE>GtkEventControllerLegacy</TITLE>
-GtkEventControllerLegacy
+<TITLE>GtkEventControllerlegacy</TITLE>
+GtkEventControllerlegacy
 gtk_event_controller_legacy_new
 
 <SUBSECTION Standard>
@@ -6694,8 +6745,6 @@ gtk_event_controller_scroll_get_type
 <TITLE>GtkEventControllerMotion</TITLE>
 GtkEventControllerMotion
 gtk_event_controller_motion_new
-gtk_event_controller_motion_get_pointer_origin
-gtk_event_controller_motion_get_pointer_target
 
 <SUBSECTION Standard>
 GTK_TYPE_EVENT_CONTROLLER_MOTION
@@ -6714,12 +6763,6 @@ gtk_event_controller_motion_get_type
 <TITLE>GtkEventControllerKey</TITLE>
 GtkEventControllerKey
 gtk_event_controller_key_new
-gtk_event_controller_key_set_im_context
-gtk_event_controller_key_get_im_context
-gtk_event_controller_key_forward
-gtk_event_controller_key_get_group
-gtk_event_controller_key_get_focus_origin
-gtk_event_controller_key_get_focus_target
 
 <SUBSECTION Standard>
 GTK_TYPE_EVENT_CONTROLLER_KEY
@@ -7153,65 +7196,3 @@ gtk_media_stream_error_valist
 GTK_TYPE_MEDIA_STREAM
 gtk_media_stream_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkroot</FILE>
-<TITLE>GtkRoot</TITLE>
-GtkRoot
-gtk_root_get_for_surface
-gtk_root_get_focus
-gtk_root_set_focus
-
-<SUBSECTION>
-gtk_root_install_properties
-
-<SUBSECTION Private>
-gtk_root_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtklayoutmanager</FILE>
-GtkLayoutManager
-GtkLayoutManagerClass
-
-gtk_layout_manager_measure
-gtk_layout_manager_allocate
-gtk_layout_manager_get_request_mode
-gtk_layout_manager_get_widget
-gtk_layout_manager_get_layout_child
-gtk_layout_manager_layout_changed
-
-<SUBSECTION Standard>
-GTK_TYPE_LAYOUT_MANAGER
-gtk_layout_manager_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtklayoutchild</FILE>
-GtkLayoutChild
-GtkLayoutChildClass
-
-gtk_layout_child_get_layout_manager
-gtk_layout_child_get_child_widget
-
-<SUBSECTION Standard>
-GTK_TYPE_LAYOUT_CHILD
-gtk_layout_child_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkboxlayout</FILE>
-GtkBoxLayout
-
-gtk_box_layout_new
-gtk_box_layout_set_homogeneous
-gtk_box_layout_get_homogeneous
-gtk_box_layout_set_spacing
-gtk_box_layout_get_spacing
-gtk_box_layout_set_baseline_position
-gtk_box_layout_get_baseline_position
-
-<SUBSECTION Standard>
-GTK_TYPE_BOX_LAYOUT
-gtk_box_layout_get_type
-</SECTION>

docs/reference/gtk/gtk4.types.in

@@ -137,7 +137,6 @@ gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_recent_manager_get_type
 gtk_revealer_get_type
-gtk_root_get_type
 gtk_scale_button_get_type
 gtk_scale_get_type
 gtk_scrollable_get_type

docs/reference/gtk/migrating-3to4.xml

@@ -289,28 +289,6 @@
       </para>
     </section>
 
-    <section>
-      <title>Stop using gdk_pointer_warp()</title>
-      <para>
-        Warping the pointer is disorienting and unfriendly to users.
-        GTK 4 does not support it. In special circumstances (such as when
-        implementing remote connection UIs) it can be necessary to
-        warp the pointer; in this case, use platform APIs such as XWarpPointer
-        directly.
-      </para>
-    </section>
-
-    <section>
-      <title>Adapt to coordinate api changes</title>
-      <para>
-        A number of coordinate apis in GTK 3 had _double variants: 
-        gdk_device_get_position(), gdk_device_get_surface_at_position(),
-        gdk_surface_get_device_position(). These have been changed to use
-        doubles, and the _double variants have been removed. Update your
-        code accordingly.
-      </para>
-    </section>
-
     <section>
       <title>Adapt to GdkKeymap API changes</title>
       <para>
@@ -343,22 +321,12 @@
     </section>
 
     <section>
-      <title>Adapt to GtkHeaderBar and GtkActionBar API changes</title>
+      <title>Adapt to GtkHeaderBar API changes</title>
       <para>
         The gtk_header_bar_set_show_close_button() function has been renamed to
         the more accurate name gtk_header_bar_set_show_title_buttons(). The corresponding
         getter and the property itself have also been renamed.
       </para>
-      <para>
-        The ::pack-type child properties of GtkHeaderBar and GtkActionBar have
-        been removed. If you need to programmatically place children, use the
-        pack_start() and pack_end() APIs. In ui files, use the type attribute
-        on the child element.
-      </para>
-      <para>
-        gtk4-builder-tool can help with this conversion, with the --3to4 option
-        of the simplify command.
-      </para>
     </section>
 
     <section>
@@ -640,7 +608,7 @@
     </section>
 
     <section>
-      <title>Adapt to changes in the API of GtkEntry, GtkSearchEntry adn GtkSpinButton</title>
+      <title>Adapt to changes in the API of GtkEntry and GtkSearchEntry</title>
       <para>
         The GtkEditable has been made more useful, and the core functionality of
         GtkEntry has been broken out as a GtkText widget. GtkEntry, GtkSearchEntry,
@@ -652,8 +620,7 @@
       <para>
         Use GtkEditable API for editable functionality, and widget-specific APIs for
         things that go beyond the common interface. For password entries, use
-        GtkPasswordEntry. As an example, gtk_spin_button_set_max_width_chars()
-        has been removed in favor of gtk_editable_set_max_width_chars().
+        GtkPasswordEntry.
       </para>
     </section>
 

docs/reference/gtk/x11.sgml

@@ -150,8 +150,11 @@ see for example <link
 linkend="gtk-window-iconify">gtk_window_iconify()</link> or <link
 linkend="gtk-window-maximize">gtk_window_maximize()</link> or <link
 linkend="gtk-window-set-decorated">gtk_window_set_decorated()</link>.
-Keep in mind that most window managers <emphasis>will</emphasis> ignore
-certain requests from time to time, in the interests of good user interface.
+Keep in mind that <link
+linkend="gtk-window-move">gtk_window_move()</link> and window sizing
+are ultimately controlled by the window manager as well and most
+window managers <emphasis>will</emphasis> ignore certain requests from
+time to time, in the interests of good user interface.
 </para>
 
 <!--

docs/tools/widgets.c

@@ -226,7 +226,7 @@ create_entry (void)
   widget = gtk_entry_new ();
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_editable_set_text (GTK_EDITABLE (widget), "Entry");
+  gtk_entry_set_text (GTK_ENTRY (widget), "Entry");
   gtk_editable_set_position (GTK_EDITABLE (widget), -1);
 
   return  new_widget_info ("entry", widget, SMALL);
@@ -320,7 +320,7 @@ create_combo_box_entry (void)
   g_object_unref (model);
 
   child = gtk_bin_get_child (GTK_BIN (widget));
-  gtk_editable_set_text (GTK_EDITABLE (child), "Combo Box Entry");
+  gtk_entry_set_text (GTK_ENTRY (child), "Combo Box Entry");
   gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
@@ -399,7 +399,7 @@ create_search_bar (void)
   widget = gtk_search_bar_new ();
 
   entry = gtk_search_entry_new ();
-  gtk_editable_set_text (GTK_EDITABLE (entry), "Search Bar");
+  gtk_entry_set_text (GTK_ENTRY (entry), "Search Bar");
   gtk_container_add (GTK_CONTAINER (widget), entry);
   gtk_widget_show (entry);
 

examples/application10/exampleappwin.c

@@ -31,7 +31,7 @@ search_text_changed (GtkEntry         *entry,
   GtkTextBuffer *buffer;
   GtkTextIter start, match_start, match_end;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
 
   if (text[0] == '\0')
     return;
@@ -58,7 +58,7 @@ find_word (GtkButton        *button,
   const gchar *word;
 
   word = gtk_button_get_label (button);
-  gtk_editable_set_text (GTK_EDITABLE (win->searchentry), word);
+  gtk_entry_set_text (GTK_ENTRY (win->searchentry), word);
 }
 
 static void

examples/application10/window.ui

@@ -22,21 +22,25 @@
             <property name="stack">stack</property>
           </object>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkToggleButton" id="search">
             <property name="sensitive">0</property>
             <property name="icon-name">edit-find-symbolic</property>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkMenuButton" id="gears">
             <property name="direction">none</property>
             <style>
               <class name="image-button"/>
             </style>
           </object>
-          <packing/>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
       </object>
     </child>

examples/application7/exampleappwin.c

@@ -25,7 +25,7 @@ search_text_changed (GtkEntry         *entry,
   GtkTextBuffer *buffer;
   GtkTextIter start, match_start, match_end;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
 
   if (text[0] == '\0')
     return;

examples/application7/window.ui

@@ -13,12 +13,14 @@
                 <property name="stack">stack</property>
               </object>
             </child>
-            <child type="end">
+            <child>
               <object class="GtkToggleButton" id="search">
                 <property name="sensitive">0</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
-              <packing/>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
           </object>
         </child>

examples/application8/exampleappwin.c

@@ -29,7 +29,7 @@ search_text_changed (GtkEntry         *entry,
   GtkTextBuffer *buffer;
   GtkTextIter start, match_start, match_end;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
 
   if (text[0] == '\0')
     return;
@@ -56,7 +56,7 @@ find_word (GtkButton        *button,
   const gchar *word;
 
   word = gtk_button_get_label (button);
-  gtk_editable_set_text (GTK_EDITABLE (win->searchentry), word);
+  gtk_entry_set_text (GTK_ENTRY (win->searchentry), word);
 }
 
 static void

examples/application8/window.ui

@@ -13,21 +13,25 @@
                 <property name="stack">stack</property>
               </object>
             </child>
-            <child type="end">
+            <child>
               <object class="GtkToggleButton" id="search">
                 <property name="sensitive">0</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
-              <packing/>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
-            <child type="end">
+            <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="direction">none</property>
                 <style>
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing/>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
           </object>
         </child>

examples/application9/exampleappwin.c

@@ -31,7 +31,7 @@ search_text_changed (GtkEntry         *entry,
   GtkTextBuffer *buffer;
   GtkTextIter start, match_start, match_end;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (entry);
 
   if (text[0] == '\0')
     return;
@@ -58,7 +58,7 @@ find_word (GtkButton        *button,
   const gchar *word;
 
   word = gtk_button_get_label (button);
-  gtk_editable_set_text (GTK_EDITABLE (win->searchentry), word);
+  gtk_entry_set_text (GTK_ENTRY (win->searchentry), word);
 }
 
 static void

examples/application9/window.ui

@@ -24,21 +24,25 @@
                 <property name="stack">stack</property>
               </object>
             </child>
-            <child type="end">
+            <child>
               <object class="GtkToggleButton" id="search">
                 <property name="sensitive">0</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
-              <packing/>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
-            <child type="end">
+            <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="direction">none</property>
                 <style>
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing/>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
           </object>
         </child>

examples/bp/bloatpad.c

@@ -364,7 +364,7 @@ combo_changed (GtkComboBox *combo,
   str = g_strjoinv (",", accels);
   g_strfreev (accels);
 
-  gtk_editable_set_text (GTK_EDITABLE (entry), str);
+  gtk_entry_set_text (entry, str);
 }
 
 static void
@@ -389,7 +389,7 @@ response (GtkDialog *dialog,
   if (!action)
     return;
 
-  str = gtk_editable_get_text (GTK_EDITABLE (entry));
+  str = gtk_entry_get_text (entry);
   accels = g_strsplit (str, ",", 0);
 
   gtk_application_set_accels_for_action (gtk_window_get_application (user_data), action, (const gchar **) accels);

gdk/broadway/broadway-protocol.h

@@ -22,9 +22,6 @@ typedef enum { /* Sync changes with broadway.js */
   BROADWAY_NODE_CLIP = 10,
   BROADWAY_NODE_KEEP_ALL = 11,
   BROADWAY_NODE_KEEP_THIS = 12,
-  BROADWAY_NODE_TRANSFORM = 13,
-  BROADWAY_NODE_DEBUG = 14,
-  BROADWAY_NODE_REUSE = 15,
 } BroadwayNodeType;
 
 static const char *broadway_node_type_names[] G_GNUC_UNUSED =  {
@@ -41,8 +38,6 @@ static const char *broadway_node_type_names[] G_GNUC_UNUSED =  {
   "CLIP",
   "KEEP_ALL",
   "KEEP_THIS",
-  "TRANSLATE",
-  "DEBUG",
 };
 
 typedef enum {

gdk/broadway/broadway-server.c

@@ -35,6 +35,7 @@
 #include <string.h>
 #endif
 
+
 typedef struct {
   int id;
   guint32 tag;
@@ -125,56 +126,23 @@ struct BroadwaySurface {
   gint32 transient_for;
   guint32 texture;
   BroadwayNode *nodes;
-  GHashTable *node_lookup;
-};
-
-struct _BroadwayTexture {
-  grefcount refcount;
-  guint32 id;
-  GBytes *bytes;
 };
 
 static void broadway_server_resync_surfaces (BroadwayServer *server);
 static void send_outstanding_roundtrips (BroadwayServer *server);
 
-static void broadway_server_ref_texture (BroadwayServer   *server,
-                                         guint32           id);
-
 static GType broadway_server_get_type (void);
 
 G_DEFINE_TYPE (BroadwayServer, broadway_server, G_TYPE_OBJECT)
 
 static void
-broadway_texture_free (BroadwayTexture *texture)
-{
-  g_bytes_unref (texture->bytes);
-  g_free (texture);
-}
-
-static void
-broadway_node_unref (BroadwayServer *server,
-                     BroadwayNode *node)
+broadway_node_free (BroadwayNode *node)
 {
   int i;
+  for (i = 0; i < node->n_children; i++)
+    broadway_node_free (node->children[i]);
 
-  if (g_ref_count_dec (&node->refcount))
-    {
-      for (i = 0; i < node->n_children; i++)
-        broadway_node_unref (server, node->children[i]);
-
-      if (node->texture_id)
-        broadway_server_release_texture (server, node->texture_id);
-
-      g_free (node);
-    }
-}
-
-static BroadwayNode *
-broadway_node_ref (BroadwayNode *node)
-{
-  g_ref_count_inc (&node->refcount);
-
-  return node;
+  g_free (node);
 }
 
 gboolean
@@ -236,7 +204,7 @@ broadway_server_init (BroadwayServer *server)
   server->surface_id_hash = g_hash_table_new (NULL, NULL);
   server->id_counter = 0;
   server->textures = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
-                                            (GDestroyNotify)broadway_texture_free);
+                                            (GDestroyNotify)g_bytes_unref);
 
   root = g_new0 (BroadwaySurface, 1);
   root->id = server->id_counter++;
@@ -273,12 +241,10 @@ broadway_server_class_init (BroadwayServerClass * class)
 }
 
 static void
-broadway_surface_free (BroadwayServer *server,
-                       BroadwaySurface *surface)
+broadway_surface_free (BroadwaySurface *surface)
 {
   if (surface->nodes)
-    broadway_node_unref (server, surface->nodes);
-  g_hash_table_unref (surface->node_lookup);
+    broadway_node_free (surface->nodes);
   g_free (surface);
 }
 
@@ -1511,7 +1477,7 @@ broadway_server_destroy_surface (BroadwayServer *server,
       server->surfaces = g_list_remove (server->surfaces, surface);
       g_hash_table_remove (server->surface_id_hash,
                            GINT_TO_POINTER (id));
-      broadway_surface_free (server, surface);
+      broadway_surface_free (surface);
     }
 }
 
@@ -1639,242 +1605,53 @@ broadway_server_has_client (BroadwayServer *server)
   return server->output != NULL;
 }
 
-#define NODE_SIZE_COLOR 1
-#define NODE_SIZE_FLOAT 1
-#define NODE_SIZE_POINT 2
-#define NODE_SIZE_MATRIX 16
-#define NODE_SIZE_SIZE 2
-#define NODE_SIZE_RECT (NODE_SIZE_POINT + NODE_SIZE_SIZE)
-#define NODE_SIZE_RRECT (NODE_SIZE_RECT + 4 * NODE_SIZE_SIZE)
-#define NODE_SIZE_COLOR_STOP (NODE_SIZE_FLOAT + NODE_SIZE_COLOR)
-#define NODE_SIZE_SHADOW (NODE_SIZE_COLOR + 3 * NODE_SIZE_FLOAT)
-
-static guint32
-rotl (guint32 value, int shift)
-{
-  if ((shift &= 32 - 1) == 0)
-    return value;
-  return (value << shift) | (value >> (32 - shift));
-}
-
-static BroadwayNode *
-decode_nodes (BroadwayServer *server,
-              BroadwaySurface *surface,
-              int len,
-              guint32 data[],
-              GHashTable  *client_texture_map,
-              int *pos)
-{
-  BroadwayNode *node;
-  guint32 type, id;
-  guint32 i, n_stops, n_shadows, n_chars;
-  guint32 size, n_children;
-  gint32 texture_offset;
-  guint32 hash;
-  guint32 transform_type;
-
-  g_assert (*pos < len);
-
-  size = 0;
-  n_children = 0;
-  texture_offset = -1;
-
-  type = data[(*pos)++];
-  id = data[(*pos)++];
-  switch (type) {
-  case BROADWAY_NODE_REUSE:
-    node = g_hash_table_lookup (surface->node_lookup, GINT_TO_POINTER(id));
-    g_assert (node != NULL);
-    return broadway_node_ref (node);
-    break;
-  case BROADWAY_NODE_COLOR:
-    size = NODE_SIZE_RECT + NODE_SIZE_COLOR;
-    break;
-  case BROADWAY_NODE_BORDER:
-    size = NODE_SIZE_RRECT + 4 * NODE_SIZE_FLOAT + 4 * NODE_SIZE_COLOR;
-    break;
-  case BROADWAY_NODE_INSET_SHADOW:
-  case BROADWAY_NODE_OUTSET_SHADOW:
-    size = NODE_SIZE_RRECT + NODE_SIZE_COLOR + 4 * NODE_SIZE_FLOAT;
-    break;
-  case BROADWAY_NODE_TEXTURE:
-    texture_offset = 4;
-    size = 5;
-    break;
-  case BROADWAY_NODE_CONTAINER:
-    size = 1;
-    n_children = data[*pos];
-    break;
-  case BROADWAY_NODE_ROUNDED_CLIP:
-    size = NODE_SIZE_RRECT;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_CLIP:
-    size = NODE_SIZE_RECT;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_TRANSFORM:
-    transform_type = data[(*pos)];
-    size = 1;
-    if (transform_type == 0) {
-      size += NODE_SIZE_POINT;
-    } else if (transform_type == 1) {
-      size += NODE_SIZE_MATRIX;
-    } else {
-      g_assert_not_reached();
-    }
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_LINEAR_GRADIENT:
-    size = NODE_SIZE_RECT + 2 * NODE_SIZE_POINT;
-    n_stops = data[*pos + size++];
-    size += n_stops * NODE_SIZE_COLOR_STOP;
-    break;
-  case BROADWAY_NODE_SHADOW:
-    size = 1;
-    n_shadows = data[*pos];
-    size += n_shadows * NODE_SIZE_SHADOW;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_OPACITY:
-    size = NODE_SIZE_FLOAT;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_DEBUG:
-    n_chars = data[*pos];
-    size = 1 + (n_chars + 3) / 4;
-    n_children = 1;
-    break;
-  default:
-    g_assert_not_reached ();
-  }
-
-  node = g_malloc (sizeof(BroadwayNode) + (size - 1) * sizeof(guint32) + n_children * sizeof (BroadwayNode *));
-  g_ref_count_init (&node->refcount);
-  node->type = type;
-  node->id = id;
-  node->texture_id = 0;
-  node->n_children = n_children;
-  node->children = (BroadwayNode **)((char *)node + sizeof(BroadwayNode) + (size - 1) * sizeof(guint32));
-  node->n_data = size;
-  for (i = 0; i < size; i++)
-    {
-      node->data[i] = data[(*pos)++];
-      if (i == texture_offset)
-        {
-          node->texture_id = GPOINTER_TO_INT (g_hash_table_lookup (client_texture_map, GINT_TO_POINTER (node->data[i])));
-          broadway_server_ref_texture (server, node->texture_id);
-          node->data[i] = node->texture_id;
-        }
-    }
-
-  for (i = 0; i < n_children; i++)
-    node->children[i] = decode_nodes (server, surface, len, data, client_texture_map, pos);
-
-  hash = node->type << 16;
-
-  for (i = 0; i < size; i++)
-    hash ^= rotl (node->data[i], i);
-
-  for (i = 0; i < n_children; i++)
-    hash ^= rotl (node->children[i]->hash, i);
-
-  node->hash = hash;
-
-  return node;
-}
-
-static void
-init_node_lookup (BroadwaySurface *surface,
-                  BroadwayNode *node)
-{
-  int i;
-
-  g_hash_table_insert (surface->node_lookup, GINT_TO_POINTER(node->id), node);
-  for (i = 0; i < node->n_children; i++)
-    init_node_lookup (surface, node->children[i]);
-}
-
 /* passes ownership of nodes */
 void
-broadway_server_surface_update_nodes (BroadwayServer   *server,
-                                      gint              id,
-                                      guint32          data[],
-                                      int              len,
-                                      GHashTable      *client_texture_map)
+broadway_server_surface_set_nodes (BroadwayServer   *server,
+                                   gint              id,
+                                   BroadwayNode     *root)
 {
   BroadwaySurface *surface;
-  int pos = 0;
-  BroadwayNode *root;
 
   surface = broadway_server_lookup_surface (server, id);
   if (surface == NULL)
     return;
 
-  root = decode_nodes (server, surface, len, data, client_texture_map, &pos);
-
   if (server->output != NULL)
     broadway_output_surface_set_nodes (server->output, surface->id,
                                        root,
                                        surface->nodes);
 
   if (surface->nodes)
-    broadway_node_unref (server, surface->nodes);
-
+    broadway_node_free (surface->nodes);
   surface->nodes = root;
-
-  g_hash_table_remove_all (surface->node_lookup);
-
-  init_node_lookup (surface, surface->nodes);
 }
 
 guint32
 broadway_server_upload_texture (BroadwayServer   *server,
-                                GBytes           *bytes)
+                                GBytes           *texture)
 {
-  BroadwayTexture *texture;
-
-  texture = g_new0 (BroadwayTexture, 1);
-  g_ref_count_init (&texture->refcount);
-  texture->id = ++server->next_texture_id;
-  texture->bytes = g_bytes_ref (bytes);
+  guint32 id;
 
+  id = ++server->next_texture_id;
   g_hash_table_replace (server->textures,
-                        GINT_TO_POINTER (texture->id),
-                        texture);
+                        GINT_TO_POINTER (id),
+                        g_bytes_ref (texture));
 
   if (server->output)
-    broadway_output_upload_texture (server->output, texture->id, texture->bytes);
+    broadway_output_upload_texture (server->output, id, texture);
 
-  return texture->id;
-}
-
-static void
-broadway_server_ref_texture (BroadwayServer   *server,
-                             guint32           id)
-{
-  BroadwayTexture *texture;
-
-  texture = g_hash_table_lookup (server->textures, GINT_TO_POINTER (id));
-  if (texture)
-    g_ref_count_inc (&texture->refcount);
+  return id;
 }
 
 void
 broadway_server_release_texture (BroadwayServer   *server,
                                  guint32           id)
 {
-  BroadwayTexture *texture;
+  g_hash_table_remove (server->textures, GINT_TO_POINTER (id));
 
-  texture = g_hash_table_lookup (server->textures, GINT_TO_POINTER (id));
-
-  if (texture && g_ref_count_dec (&texture->refcount))
-    {
-      g_hash_table_remove (server->textures, GINT_TO_POINTER (id));
-
-      if (server->output)
-        broadway_output_release_texture (server->output, id);
-    }
+  if (server->output)
+    broadway_output_release_texture (server->output, id);
 }
 
 gboolean
@@ -2024,7 +1801,6 @@ broadway_server_new_surface (BroadwayServer *server,
   surface->width = width;
   surface->height = height;
   surface->is_temp = is_temp;
-  surface->node_lookup = g_hash_table_new (g_direct_hash, g_direct_equal);
 
   g_hash_table_insert (server->surface_id_hash,
                        GINT_TO_POINTER (surface->id),
@@ -2059,12 +1835,9 @@ broadway_server_resync_surfaces (BroadwayServer *server)
   /* First upload all textures */
   g_hash_table_iter_init (&iter, server->textures);
   while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      BroadwayTexture *texture = value;
-      broadway_output_upload_texture (server->output,
-                                      GPOINTER_TO_INT (key),
-                                      texture->bytes);
-    }
+    broadway_output_upload_texture (server->output,
+                                    GPOINTER_TO_INT (key),
+                                    (GBytes *)value);
 
   /* Then create all surfaces */
   for (l = server->surfaces; l != NULL; l = l->next)

gdk/broadway/broadway-server.h

@@ -19,16 +19,12 @@ typedef struct _BroadwayServerClass BroadwayServerClass;
 #define BROADWAY_SERVER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), BROADWAY_TYPE_SERVER, BroadwayServerClass))
 
 typedef struct _BroadwayNode BroadwayNode;
-typedef struct _BroadwayTexture BroadwayTexture;
 
 struct _BroadwayNode {
-  grefcount refcount;
   guint32 type;
-  guint32 id;
   guint32 hash; /* deep hash */
   guint32 n_children;
   BroadwayNode **children;
-  guint32 texture_id;
   guint32 n_data;
   guint32 data[1];
 };
@@ -103,11 +99,9 @@ void                broadway_server_release_texture           (BroadwayServer  *
                                                                guint32          id);
 cairo_surface_t   * broadway_server_create_surface            (int              width,
                                                                int              height);
-void                broadway_server_surface_update_nodes      (BroadwayServer  *server,
+void                broadway_server_surface_set_nodes         (BroadwayServer  *server,
                                                                gint             id,
-                                                               guint32          data[],
-                                                               int              len,
-                                                               GHashTable      *client_texture_map);
+                                                               BroadwayNode    *root);
 gboolean            broadway_server_surface_move_resize       (BroadwayServer  *server,
                                                                gint             id,
                                                                gboolean         with_move,

gdk/broadway/broadwayd.c

@@ -215,6 +215,116 @@ get_client_serial (BroadwayClient *client, guint32 daemon_serial)
   return client_serial;
 }
 
+#define NODE_SIZE_COLOR 1
+#define NODE_SIZE_FLOAT 1
+#define NODE_SIZE_POINT 2
+#define NODE_SIZE_SIZE 2
+#define NODE_SIZE_RECT (NODE_SIZE_POINT + NODE_SIZE_SIZE)
+#define NODE_SIZE_RRECT (NODE_SIZE_RECT + 4 * NODE_SIZE_SIZE)
+#define NODE_SIZE_COLOR_STOP (NODE_SIZE_FLOAT + NODE_SIZE_COLOR)
+#define NODE_SIZE_SHADOW (NODE_SIZE_COLOR + 3 * NODE_SIZE_FLOAT)
+
+static guint32
+rotl (guint32 value, int shift)
+{
+  if ((shift &= 32 - 1) == 0)
+    return value;
+  return (value << shift) | (value >> (32 - shift));
+}
+
+static BroadwayNode *
+decode_nodes (BroadwayClient *client,
+              int len, guint32 data[], int *pos)
+{
+  BroadwayNode *node;
+  guint32 type;
+  guint32 i, n_stops, n_shadows;
+  guint32 size, n_children;
+  gint32 texture_offset;
+  guint32 hash;
+
+  g_assert (*pos < len);
+
+  size = 0;
+  n_children = 0;
+  texture_offset = -1;
+
+  type = data[(*pos)++];
+  switch (type) {
+  case BROADWAY_NODE_COLOR:
+    size = NODE_SIZE_RECT + NODE_SIZE_COLOR;
+    break;
+  case BROADWAY_NODE_BORDER:
+    size = NODE_SIZE_RRECT + 4 * NODE_SIZE_FLOAT + 4 * NODE_SIZE_COLOR;
+    break;
+  case BROADWAY_NODE_INSET_SHADOW:
+  case BROADWAY_NODE_OUTSET_SHADOW:
+    size = NODE_SIZE_RRECT + NODE_SIZE_COLOR + 4 * NODE_SIZE_FLOAT;
+    break;
+  case BROADWAY_NODE_TEXTURE:
+    texture_offset = 4;
+    size = 5;
+    break;
+  case BROADWAY_NODE_CONTAINER:
+    size = 1;
+    n_children = data[*pos];
+    break;
+  case BROADWAY_NODE_ROUNDED_CLIP:
+    size = NODE_SIZE_RRECT;
+    n_children = 1;
+    break;
+  case BROADWAY_NODE_CLIP:
+    size = NODE_SIZE_RECT;
+    n_children = 1;
+    break;
+  case BROADWAY_NODE_LINEAR_GRADIENT:
+    size = NODE_SIZE_RECT + 2 * NODE_SIZE_POINT;
+    n_stops = data[*pos + size++];
+    size += n_stops * NODE_SIZE_COLOR_STOP;
+    break;
+  case BROADWAY_NODE_SHADOW:
+    size = 1;
+    n_shadows = data[*pos];
+    size += n_shadows * NODE_SIZE_SHADOW;
+    n_children = 1;
+    break;
+  case BROADWAY_NODE_OPACITY:
+    size = NODE_SIZE_FLOAT;
+    n_children = 1;
+    break;
+  default:
+    g_assert_not_reached ();
+  }
+
+  node = g_malloc (sizeof(BroadwayNode) + (size - 1) * sizeof(guint32) + n_children * sizeof (BroadwayNode *));
+  node->type = type;
+  node->n_children = n_children;
+  node->children = (BroadwayNode **)((char *)node + sizeof(BroadwayNode) + (size - 1) * sizeof(guint32));
+  node->n_data = size;
+  for (i = 0; i < size; i++)
+    {
+      node->data[i] = data[(*pos)++];
+      if (i == texture_offset)
+        node->data[i] = GPOINTER_TO_INT (g_hash_table_lookup (client->textures,
+                                                              GINT_TO_POINTER (node->data[i])));
+    }
+
+  for (i = 0; i < n_children; i++)
+    node->children[i] = decode_nodes (client, len, data, pos);
+
+  hash = node->type << 16;
+
+  for (i = 0; i < size; i++)
+    hash ^= rotl (node->data[i], i);
+
+  for (i = 0; i < n_children; i++)
+    hash ^= rotl (node->children[i]->hash, i);
+
+  node->hash = hash;
+
+  return node;
+}
+
 static void
 client_handle_request (BroadwayClient *client,
                        BroadwayRequest *request)
@@ -290,10 +400,13 @@ client_handle_request (BroadwayClient *client,
       {
         gsize array_size = request->base.size - sizeof (BroadwayRequestSetNodes) + sizeof(guint32);
         int n_data = array_size / sizeof(guint32);
+        int pos = 0;
+        BroadwayNode *node;
 
-        broadway_server_surface_update_nodes (server, request->set_nodes.id,
-                                              request->set_nodes.data, n_data,
-                                              client->textures);
+        node = decode_nodes (client, n_data, request->set_nodes.data, &pos);
+
+        broadway_server_surface_set_nodes (server, request->set_nodes.id,
+                                           node);
       }
       break;
     case BROADWAY_REQUEST_UPLOAD_TEXTURE:

gdk/broadway/gdkdevice-broadway.c

@@ -36,6 +36,9 @@ static void gdk_broadway_device_get_state (GdkDevice       *device,
 static void gdk_broadway_device_set_surface_cursor (GdkDevice *device,
                                                     GdkSurface *surface,
                                                     GdkCursor *cursor);
+static void gdk_broadway_device_warp (GdkDevice *device,
+                                      gdouble    x,
+                                      gdouble    y);
 static void gdk_broadway_device_query_state (GdkDevice        *device,
                                              GdkSurface        *surface,
                                              GdkSurface       **child_surface,
@@ -70,6 +73,7 @@ gdk_broadway_device_class_init (GdkBroadwayDeviceClass *klass)
   device_class->get_history = gdk_broadway_device_get_history;
   device_class->get_state = gdk_broadway_device_get_state;
   device_class->set_surface_cursor = gdk_broadway_device_set_surface_cursor;
+  device_class->warp = gdk_broadway_device_warp;
   device_class->query_state = gdk_broadway_device_query_state;
   device_class->grab = gdk_broadway_device_grab;
   device_class->ungrab = gdk_broadway_device_ungrab;
@@ -106,7 +110,7 @@ gdk_broadway_device_get_state (GdkDevice       *device,
 {
   gdouble x, y;
 
-  gdk_surface_get_device_position (surface, device, &x, &y, mask);
+  gdk_surface_get_device_position_double (surface, device, &x, &y, mask);
 
   if (axes)
     {
@@ -122,6 +126,13 @@ gdk_broadway_device_set_surface_cursor (GdkDevice *device,
 {
 }
 
+static void
+gdk_broadway_device_warp (GdkDevice *device,
+                          gdouble    x,
+                          gdouble    y)
+{
+}
+
 static void
 gdk_broadway_device_query_state (GdkDevice        *device,
                                  GdkSurface        *surface,

gdk/broadway/gdkdisplay-broadway.c

@@ -380,7 +380,7 @@ gdk_broadway_display_ensure_texture (GdkDisplay *display,
       data = g_new0 (BroadwayTextureData, 1);
       data->id = id;
       data->display = g_object_ref (display);
-     g_object_set_data_full (G_OBJECT (texture), "broadway-data", data, (GDestroyNotify)broadway_texture_data_free);
+      g_object_set_data_full (G_OBJECT (texture), "broadway-data", data, (GDestroyNotify)broadway_texture_data_free);
     }
 
   return data->id;

gdk/broadway/gdkdrawcontext-broadway.c

@@ -64,8 +64,6 @@ gdk_broadway_draw_context_end_frame (GdkDrawContext *draw_context,
 
   g_array_unref (self->nodes);
   self->nodes = NULL;
-
-  /* We now sent all new texture refs to the daemon via the nodes, so we can drop them here */
   g_ptr_array_unref (self->node_textures);
   self->node_textures = NULL;
 }

gdk/broadway/gdksurface-broadway.c

@@ -501,6 +501,12 @@ gdk_broadway_surface_set_title (GdkSurface   *surface,
 {
 }
 
+static void
+gdk_broadway_surface_set_role (GdkSurface   *surface,
+                               const gchar *role)
+{
+}
+
 static void
 gdk_broadway_surface_set_startup_id (GdkSurface   *surface,
                                      const gchar *startup_id)
@@ -1226,9 +1232,6 @@ gdk_broadway_surface_begin_resize_drag (GdkSurface     *surface,
 
   mv_resize = get_move_resize_data (gdk_surface_get_display (surface), TRUE);
 
-  if (mv_resize->moveresize_surface != NULL)
-    return; /* already a drag operation in progress */
-
   mv_resize->is_resize = TRUE;
   mv_resize->moveresize_button = button;
   mv_resize->resize_edge = edge;
@@ -1269,9 +1272,6 @@ gdk_broadway_surface_begin_move_drag (GdkSurface *surface,
 
   mv_resize = get_move_resize_data (gdk_surface_get_display (surface), TRUE);
 
-  if (mv_resize->moveresize_surface != NULL)
-    return; /* already a drag operation in progress */
-
   mv_resize->is_resize = FALSE;
   mv_resize->moveresize_button = button;
   mv_resize->moveresize_x = root_x;
@@ -1352,6 +1352,7 @@ gdk_surface_impl_broadway_class_init (GdkSurfaceImplBroadwayClass *klass)
   impl_class->set_urgency_hint = gdk_broadway_surface_set_urgency_hint;
   impl_class->set_geometry_hints = gdk_broadway_surface_set_geometry_hints;
   impl_class->set_title = gdk_broadway_surface_set_title;
+  impl_class->set_role = gdk_broadway_surface_set_role;
   impl_class->set_startup_id = gdk_broadway_surface_set_startup_id;
   impl_class->set_transient_for = gdk_broadway_surface_set_transient_for;
   impl_class->get_frame_extents = gdk_broadway_surface_get_frame_extents;

gdk/gdk-private.h

@@ -20,6 +20,8 @@ void            gdk_surface_thaw_toplevel_updates        (GdkSurface *surface);
 
 gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
 
+GObject *       gdk_event_get_user_data         (const GdkEvent *event);
+
 guint32         gdk_display_get_last_seen_time  (GdkDisplay *display);
 
 void gdk_display_set_double_click_time     (GdkDisplay   *display,
@@ -38,8 +40,4 @@ PangoDirection gdk_unichar_direction (gunichar    ch);
 PangoDirection gdk_find_base_dir     (const char *text,
                                       int         len);
 
-void           gdk_surface_set_widget (GdkSurface *surface,
-                                       gpointer    widget);
-gpointer       gdk_surface_get_widget (GdkSurface *surface);
-
 #endif /* __GDK__PRIVATE_H__ */

gdk/gdk.c

@@ -33,8 +33,6 @@
 
 #include "gdk-private.h"
 
-#include "gdkconstructor.h"
-
 #ifndef HAVE_XCONVERTCASE
 #include "gdkkeysyms.h"
 #endif
@@ -53,12 +51,12 @@
  * This section describes the GDK initialization functions and miscellaneous
  * utility functions, as well as deprecation facilities.
  *
- * The GDK and GTK headers annotate deprecated APIs in a way that produces
+ * The GDK and GTK+ headers annotate deprecated APIs in a way that produces
  * compiler warnings if these deprecated APIs are used. The warnings
  * can be turned off by defining the macro %GDK_DISABLE_DEPRECATION_WARNINGS
  * before including the glib.h header.
  *
- * GDK and GTK also provide support for building applications against
+ * GDK and GTK+ also provide support for building applications against
  * defined subsets of deprecated or new APIs. Define the macro
  * %GDK_VERSION_MIN_REQUIRED to specify up to what version
  * you want to receive warnings about deprecated APIs. Define the
@@ -301,11 +299,11 @@ gdk_should_use_portal (void)
  * locked for performance reasons. So e.g. you must coordinate
  * accesses to the same #GHashTable from multiple threads.
  *
- * GTK, however, is not thread safe. You should only use GTK and GDK
+ * GTK+, however, is not thread safe. You should only use GTK+ and GDK
  * from the thread gtk_init() and gtk_main() were called on.
  * This is usually referred to as the “main thread”.
  *
- * Signals on GTK and GDK types, as well as non-signal callbacks, are
+ * Signals on GTK+ and GDK types, as well as non-signal callbacks, are
  * emitted in the main thread.
  *
  * You can schedule work in the main thread safely from other threads

gdk/gdkcairo.c

@@ -30,7 +30,7 @@
  *
  * [Cairo](http://cairographics.org) is a graphics
  * library that supports vector graphics and image compositing that
- * can be used with GDK and GTK.
+ * can be used with GDK. GTK+ does all of its drawing using cairo.
  *
  * GDK does not wrap the cairo API, instead it allows to create cairo
  * contexts which can be used to draw on #GdkSurfaces. Additional

gdk/gdkconstructor.h

@@ -1,120 +0,0 @@
-/*
-  If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
-  destructors, in a sane way, including e.g. on library unload. If not you're on
-  your own.
-
-  Some compilers need #pragma to handle this, which does not work with macros,
-  so the way you need to use this is (for constructors):
-
-  #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-  #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
-  #endif
-  G_DEFINE_CONSTRUCTOR(my_constructor)
-  static void my_constructor(void) {
-   ...
-  }
-
-*/
-
-#ifndef __GTK_DOC_IGNORE__
-
-#if  __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-
-#define G_HAS_CONSTRUCTORS 1
-
-#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
-#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
-
-#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
-/* Visual studio 2008 and later has _Pragma */
-
-#define G_HAS_CONSTRUCTORS 1
-
-/* We do some weird things to avoid the constructors being optimized
- * away on VS2015 if WholeProgramOptimization is enabled. First we
- * make a reference to the array from the wrapper to make sure its
- * references. Then we use a pragma to make sure the wrapper function
- * symbol is always included at the link stage. Also, the symbols
- * need to be extern (but not dllexport), even though they are not
- * really used from another object file.
- */
-
-/* We need to account for differences between the mangling of symbols
- * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
- * with an underscore but symbols on x64 are not.
- */
-#ifdef _WIN64
-#define G_MSVC_SYMBOL_PREFIX ""
-#else
-#define G_MSVC_SYMBOL_PREFIX "_"
-#endif
-
-#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
-#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
-
-#define G_MSVC_CTOR(_func,_sym_prefix) \
-  static void _func(void); \
-  extern int (* _array ## _func)(void);              \
-  int _func ## _wrapper(void) { _func(); g_slist_find (NULL,  _array ## _func); return 0; } \
-  __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
-  __pragma(section(".CRT$XCU",read)) \
-  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
-
-#define G_MSVC_DTOR(_func,_sym_prefix) \
-  static void _func(void); \
-  extern int (* _array ## _func)(void);              \
-  int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL,  _array ## _func); return 0; } \
-   __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
-  __pragma(section(".CRT$XCU",read)) \
-  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
-
-#elif defined (_MSC_VER)
-
-#define G_HAS_CONSTRUCTORS 1
-
-/* Pre Visual studio 2008 must use #pragma section */
-#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
-#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
-
-#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
-  section(".CRT$XCU",read)
-#define G_DEFINE_CONSTRUCTOR(_func) \
-  static void _func(void); \
-  static int _func ## _wrapper(void) { _func(); return 0; } \
-  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
-
-#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
-  section(".CRT$XCU",read)
-#define G_DEFINE_DESTRUCTOR(_func) \
-  static void _func(void); \
-  static int _func ## _constructor(void) { atexit (_func); return 0; } \
-  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
-
-#elif defined(__SUNPRO_C)
-
-/* This is not tested, but i believe it should work, based on:
- * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
- */
-
-#define G_HAS_CONSTRUCTORS 1
-
-#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
-#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
-
-#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
-  init(_func)
-#define G_DEFINE_CONSTRUCTOR(_func) \
-  static void _func(void);
-
-#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
-  fini(_func)
-#define G_DEFINE_DESTRUCTOR(_func) \
-  static void _func(void);
-
-#else
-
-/* constructors not supported for this compiler */
-
-#endif
-
-#endif /* __GTK_DOC_IGNORE__ */

gdk/gdkdevice.c

@@ -529,7 +529,7 @@ gdk_device_get_state (GdkDevice       *device,
 }
 
 /**
- * gdk_device_get_position:
+ * gdk_device_get_position_double:
  * @device: pointer device to query status about.
  * @x: (out) (allow-none): location to store root window X coordinate of @device, or %NULL.
  * @y: (out) (allow-none): location to store root window Y coordinate of @device, or %NULL.
@@ -540,9 +540,9 @@ gdk_device_get_state (GdkDevice       *device,
  * unless there is an ongoing grab on them. See gdk_device_grab().
  **/
 void
-gdk_device_get_position (GdkDevice *device,
-                         double    *x,
-                         double    *y)
+gdk_device_get_position_double (GdkDevice        *device,
+                                gdouble          *x,
+                                gdouble          *y)
 {
   GdkDisplay *display;
   gdouble tmp_x, tmp_y;
@@ -568,7 +568,33 @@ gdk_device_get_position (GdkDevice *device,
 }
 
 /**
- * gdk_device_get_surface_at_position:
+ * gdk_device_get_position:
+ * @device: pointer device to query status about.
+ * @x: (out) (allow-none): location to store root window X coordinate of @device, or %NULL.
+ * @y: (out) (allow-none): location to store root window Y coordinate of @device, or %NULL.
+ *
+ * Gets the current location of @device. As a slave device
+ * coordinates are those of its master pointer, This function
+ * may not be called on devices of type %GDK_DEVICE_TYPE_SLAVE,
+ * unless there is an ongoing grab on them, see gdk_device_grab().
+ **/
+void
+gdk_device_get_position (GdkDevice *device,
+                         gint      *x,
+                         gint      *y)
+{
+  gdouble tmp_x, tmp_y;
+
+  gdk_device_get_position_double (device, &tmp_x, &tmp_y);
+  if (x)
+    *x = round (tmp_x);
+  if (y)
+    *y = round (tmp_y);
+}
+
+
+/**
+ * gdk_device_get_surface_at_position_double:
  * @device: pointer #GdkDevice to query info to.
  * @win_x: (out) (allow-none): return location for the X coordinate of the device location,
  *         relative to the surface origin, or %NULL.
@@ -587,9 +613,9 @@ gdk_device_get_position (GdkDevice *device,
  *   device position, or %NULL.
  **/
 GdkSurface *
-gdk_device_get_surface_at_position (GdkDevice *device,
-                                    double    *win_x,
-                                    double    *win_y)
+gdk_device_get_surface_at_position_double (GdkDevice  *device,
+                                          gdouble    *win_x,
+                                          gdouble    *win_y)
 {
   gdouble tmp_x, tmp_y;
   GdkSurface *surface;
@@ -616,6 +642,43 @@ gdk_device_get_surface_at_position (GdkDevice *device,
   return surface;
 }
 
+/**
+ * gdk_device_get_surface_at_position:
+ * @device: pointer #GdkDevice to query info to.
+ * @win_x: (out) (allow-none): return location for the X coordinate of the device location,
+ *         relative to the surface origin, or %NULL.
+ * @win_y: (out) (allow-none): return location for the Y coordinate of the device location,
+ *         relative to the surface origin, or %NULL.
+ *
+ * Obtains the surface underneath @device, returning the location of the device in @win_x and @win_y. Returns
+ * %NULL if the surface tree under @device is not known to GDK (for example, belongs to another application).
+ *
+ * As a slave device coordinates are those of its master pointer, This
+ * function may not be called on devices of type %GDK_DEVICE_TYPE_SLAVE,
+ * unless there is an ongoing grab on them, see gdk_device_grab().
+ *
+ * Returns: (nullable) (transfer none): the #GdkSurface under the
+ * device position, or %NULL.
+ **/
+GdkSurface *
+gdk_device_get_surface_at_position (GdkDevice  *device,
+                                   gint       *win_x,
+                                   gint       *win_y)
+{
+  gdouble tmp_x, tmp_y;
+  GdkSurface *surface;
+
+  surface =
+    gdk_device_get_surface_at_position_double (device, &tmp_x, &tmp_y);
+
+  if (win_x)
+    *win_x = round (tmp_x);
+  if (win_y)
+    *win_y = round (tmp_y);
+
+  return surface;
+}
+
 /**
  * gdk_device_get_history: (skip)
  * @device: a #GdkDevice
@@ -1362,6 +1425,34 @@ gdk_device_ungrab (GdkDevice  *device,
   GDK_DEVICE_GET_CLASS (device)->ungrab (device, time_);
 }
 
+/**
+ * gdk_device_warp:
+ * @device: the device to warp.
+ * @x: the X coordinate of the destination.
+ * @y: the Y coordinate of the destination.
+ *
+ * Warps @device in @display to the point @x,@y,
+ * unless the device is confined to a surface by a grab,
+ * in which case it will be moved
+ * as far as allowed by the grab. Warping the pointer
+ * creates events as if the user had moved the mouse
+ * instantaneously to the destination.
+ *
+ * Note that the pointer should normally be under the
+ * control of the user. This function was added to cover
+ * some rare use cases like keyboard navigation support
+ * for the color picker in the #GtkColorSelectionDialog.
+ **/
+void
+gdk_device_warp (GdkDevice  *device,
+                 gint        x,
+                 gint        y)
+{
+  g_return_if_fail (GDK_IS_DEVICE (device));
+
+  GDK_DEVICE_GET_CLASS (device)->warp (device, x, y);
+}
+
 /* Private API */
 void
 _gdk_device_reset_axes (GdkDevice *device)

gdk/gdkdevice.h

@@ -167,13 +167,25 @@ void     gdk_device_get_state    (GdkDevice         *device,
                                   gdouble           *axes,
                                   GdkModifierType   *mask);
 GDK_AVAILABLE_IN_ALL
-void     gdk_device_get_position (GdkDevice *device,
-                                  double    *x,
-                                  double    *y);
+void     gdk_device_get_position (GdkDevice         *device,
+                                  gint              *x,
+                                  gint              *y);
 GDK_AVAILABLE_IN_ALL
-GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device,
-                                                 double    *win_x,
-                                                 double    *win_y);
+GdkSurface *
+         gdk_device_get_surface_at_position
+                                 (GdkDevice         *device,
+                                  gint              *win_x,
+                                  gint              *win_y);
+GDK_AVAILABLE_IN_ALL
+void     gdk_device_get_position_double (GdkDevice         *device,
+                                         gdouble           *x,
+                                         gdouble           *y);
+GDK_AVAILABLE_IN_ALL
+GdkSurface *
+         gdk_device_get_surface_at_position_double
+                                 (GdkDevice         *device,
+                                  gdouble           *win_x,
+                                  gdouble           *win_y);
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_get_history  (GdkDevice         *device,
                                   GdkSurface         *surface,
@@ -224,6 +236,11 @@ GDK_DEPRECATED_FOR(gdk_seat_ungrab)
 void          gdk_device_ungrab      (GdkDevice        *device,
                                       guint32           time_);
 
+GDK_AVAILABLE_IN_ALL
+void          gdk_device_warp        (GdkDevice        *device,
+                                      gint              x,
+                                      gint              y);
+
 GDK_AVAILABLE_IN_ALL
 GdkSurface *gdk_device_get_last_event_surface (GdkDevice *device);
 

gdk/gdkdeviceprivate.h

@@ -86,6 +86,9 @@ struct _GdkDeviceClass
                               GdkSurface *surface,
                               GdkCursor *cursor);
 
+  void (* warp)              (GdkDevice  *device,
+                              gdouble     x,
+                              gdouble     y);
   void (* query_state)       (GdkDevice       *device,
                               GdkSurface       *surface,
                               GdkSurface      **child_surface,

gdk/gdkdisplaymanager.c

@@ -70,7 +70,7 @@
  *
  * You can use gdk_display_manager_get() to obtain the #GdkDisplayManager
  * singleton, but that should be rarely necessary. Typically, initializing
- * GTK opens a display that you can work with without ever accessing the
+ * GTK+ opens a display that you can work with without ever accessing the
  * #GdkDisplayManager.
  *
  * The GDK library can be built with support for multiple backends.

gdk/gdkevents.c

@@ -564,8 +564,8 @@ gdk_event_copy (const GdkEvent *event)
     g_object_ref (new_event->any.device);
   if (new_event->any.source_device)
     g_object_ref (new_event->any.source_device);
-  if (new_event->any.target)
-    g_object_ref (new_event->any.target);
+  if (new_event->any.user_data)
+    g_object_ref (new_event->any.user_data);
 
   switch ((guint) event->any.type)
     {
@@ -573,13 +573,6 @@ gdk_event_copy (const GdkEvent *event)
     case GDK_LEAVE_NOTIFY:
       if (event->crossing.child_surface != NULL)
         g_object_ref (event->crossing.child_surface);
-      if (event->crossing.related_target)
-        g_object_ref (event->crossing.related_target);
-      break;
-
-    case GDK_FOCUS_CHANGE:
-      if (event->focus_change.related_target)
-        g_object_ref (event->focus_change.related_target);
       break;
 
     case GDK_DRAG_ENTER:
@@ -641,11 +634,6 @@ gdk_event_finalize (GObject *object)
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
       g_clear_object (&event->crossing.child_surface);
-      g_clear_object (&event->crossing.related_target);
-      break;
-
-    case GDK_FOCUS_CHANGE:
-      g_clear_object (&event->focus_change.related_target);
       break;
 
     case GDK_DRAG_ENTER:
@@ -687,7 +675,7 @@ gdk_event_finalize (GObject *object)
 
   g_clear_object (&event->any.device);
   g_clear_object (&event->any.source_device);
-  g_clear_object (&event->any.target);
+  g_clear_object (&event->any.user_data);
 
   G_OBJECT_CLASS (gdk_event_parent_class)->finalize (object);
 }
@@ -1916,39 +1904,16 @@ gdk_event_get_scancode (GdkEvent *event)
 }
 
 void
-gdk_event_set_target (GdkEvent *event,
-                      GObject  *target)
+gdk_event_set_user_data (GdkEvent *event,
+                         GObject  *user_data)
 {
-  g_set_object (&event->any.target, target);
+  g_set_object (&event->any.user_data, user_data);
 }
 
 GObject *
-gdk_event_get_target (const GdkEvent *event)
+gdk_event_get_user_data (const GdkEvent *event)
 {
-  return event->any.target;
-}
-
-void
-gdk_event_set_related_target (GdkEvent *event,
-                              GObject  *target)
-{
-  if (event->any.type == GDK_ENTER_NOTIFY ||
-      event->any.type == GDK_LEAVE_NOTIFY)
-    g_set_object (&event->crossing.related_target, target);
-  else if (event->any.type == GDK_FOCUS_CHANGE)
-    g_set_object (&event->focus_change.related_target, target);
-}
-
-GObject *
-gdk_event_get_related_target (const GdkEvent *event)
-{
-  if (event->any.type == GDK_ENTER_NOTIFY ||
-      event->any.type == GDK_LEAVE_NOTIFY)
-    return event->crossing.related_target;
-  else if (event->any.type == GDK_FOCUS_CHANGE)
-    return event->focus_change.related_target;
-
-  return NULL;
+  return event->any.user_data;
 }
 
 /**
@@ -2015,11 +1980,6 @@ gdk_event_get_crossing_mode (const GdkEvent  *event,
       *mode = event->crossing.mode;
       return TRUE;
     }
-  else if (event->any.type == GDK_FOCUS_CHANGE)
-    {
-      *mode = event->focus_change.mode;
-      return TRUE;
-    }
 
   return FALSE;
 }
@@ -2046,11 +2006,6 @@ gdk_event_get_crossing_detail (const GdkEvent *event,
       *detail = event->crossing.detail;
       return TRUE;
     }
-  else if (event->any.type == GDK_FOCUS_CHANGE)
-    {
-      *detail = event->focus_change.detail;
-      return TRUE;
-    }
 
   return FALSE;
 }

gdk/gdkeventsprivate.h

@@ -61,7 +61,7 @@ struct _GdkEventAny
   GdkDevice *device;
   GdkDevice *source_device;
   GdkDisplay *display;
-  GObject *target;
+  GObject *user_data;
 };
 
 /*
@@ -303,7 +303,6 @@ struct _GdkEventCrossing
   GdkNotifyType detail;
   gboolean focus;
   guint state;
-  GObject *related_target;
 };
 
 /*
@@ -313,8 +312,6 @@ struct _GdkEventCrossing
  * @send_event: %TRUE if the event was sent explicitly.
  * @in: %TRUE if the surface has gained the keyboard focus, %FALSE if
  *   it has lost the focus.
- * @mode: the crossing mode
- * @detail: the kind of crossing that happened
  *
  * Describes a change of keyboard focus.
  */
@@ -322,9 +319,6 @@ struct _GdkEventFocus
 {
   GdkEventAny any;
   gint16 in;
-  GdkCrossingMode mode;
-  GdkNotifyType detail;
-  GObject *related_target;
 };
 
 /*
@@ -638,12 +632,8 @@ union _GdkEvent
   GdkEventPadGroupMode      pad_group_mode;
 };
 
-void           gdk_event_set_target              (GdkEvent *event,
-                                                  GObject  *user_data);
-GObject *      gdk_event_get_target              (const GdkEvent *event);
-void           gdk_event_set_related_target       (GdkEvent *event,
-                                                  GObject  *user_data);
-GObject *      gdk_event_get_related_target      (const GdkEvent *event);
+void           gdk_event_set_user_data              (GdkEvent *event,
+                                                     GObject  *user_data);
 
 
 #endif /* __GDK_EVENTS_PRIVATE_H__ */

gdk/gdkframeclock.c

@@ -179,7 +179,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * This signal is emitted as the second step of toolkit and
    * application processing of the frame. Any work to update
    * sizes and positions of application elements should be
-   * performed. GTK normally handles this internally.
+   * performed. GTK+ normally handles this internally.
    */
   signals[LAYOUT] =
     g_signal_new (g_intern_static_string ("layout"),
@@ -197,7 +197,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * This signal is emitted as the third step of toolkit and
    * application processing of the frame. The frame is
    * repainted. GDK normally handles this internally and
-   * produces expose events, which are turned into GTK
+   * produces expose events, which are turned into GTK+
    * #GtkWidget::draw signals.
    */
   signals[PAINT] =
@@ -230,7 +230,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * @clock: the frame clock emitting the signal
    *
    * This signal is emitted after processing of the frame is
-   * finished, and is handled internally by GTK to resume normal
+   * finished, and is handled internally by GTK+ to resume normal
    * event processing. Applications should not handle this signal.
    */
   signals[RESUME_EVENTS] =
@@ -289,7 +289,7 @@ gdk_frame_clock_get_frame_time (GdkFrameClock *frame_clock)
  * content and want to continually request the
  * %GDK_FRAME_CLOCK_PHASE_UPDATE phase for a period of time,
  * you should use gdk_frame_clock_begin_updating() instead, since
- * this allows GTK to adjust system parameters to get maximally
+ * this allows GTK+ to adjust system parameters to get maximally
  * smooth animations.
  */
 void

gdk/gdkgl.c

@@ -298,7 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
  * @width: The width of the region to draw
  * @height: The height of the region to draw
  *
- * This is the main way to draw GL content in GTK. It takes a render buffer ID 
+ * This is the main way to draw GL content in GTK+. It takes a render buffer ID 
  * (@source_type == #GL_RENDERBUFFER) or a texture id (@source_type == #GL_TEXTURE)
  * and draws it onto @cr with an OVER operation, respecting the current clip.
  * The top left corner of the rectangle specified by @x, @y, @width and @height

gdk/gdkinternals.h

@@ -145,7 +145,7 @@ struct _GdkSurface
   GdkSurface *parent;
   GdkSurface *transient_for;
 
-  gpointer widget;
+  gpointer user_data;
 
   gint x;
   gint y;

gdk/gdkseat.c

@@ -264,7 +264,7 @@ gdk_seat_get_capabilities (GdkSeat *seat)
  * commonly.
  *
  * Grabs are used for operations which need complete control over the
- * events corresponding to the given capabilities. For example in GTK this
+ * events corresponding to the given capabilities. For example in GTK+ this
  * is used for Drag and Drop operations, popup menus and such.
  *
  * Note that if the event mask of a #GdkSurface has selected both button press
@@ -350,7 +350,7 @@ gdk_seat_get_slaves (GdkSeat             *seat,
  * Returns the master device that routes pointer events.
  *
  * Returns: (transfer none) (nullable): a master #GdkDevice with pointer
- *          capabilities. This object is owned by GTK and must not be freed.
+ *          capabilities. This object is owned by GTK+ and must not be freed.
  **/
 GdkDevice *
 gdk_seat_get_pointer (GdkSeat *seat)
@@ -370,7 +370,7 @@ gdk_seat_get_pointer (GdkSeat *seat)
  * Returns the master device that routes keyboard events.
  *
  * Returns: (transfer none) (nullable): a master #GdkDevice with keyboard
- *          capabilities. This object is owned by GTK and must not be freed.
+ *          capabilities. This object is owned by GTK+ and must not be freed.
  **/
 GdkDevice *
 gdk_seat_get_keyboard (GdkSeat *seat)
@@ -405,7 +405,7 @@ gdk_seat_device_removed (GdkSeat   *seat,
  *
  * Returns the #GdkDisplay this seat belongs to.
  *
- * Returns: (transfer none): a #GdkDisplay. This object is owned by GTK
+ * Returns: (transfer none): a #GdkDisplay. This object is owned by GTK+
  *          and must not be freed.
  **/
 GdkDisplay *

gdk/gdksurface.h

@@ -491,6 +491,9 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_surface_focus                 (GdkSurface     *surface,
                                                  guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
+void          gdk_surface_set_user_data         (GdkSurface     *surface,
+                                                 gpointer       user_data);
+GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_get_accept_focus      (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_accept_focus      (GdkSurface     *surface,
@@ -570,6 +573,9 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_title         (GdkSurface   *surface,
                                              const gchar  *title);
 GDK_AVAILABLE_IN_ALL
+void          gdk_surface_set_role          (GdkSurface     *surface,
+                                             const gchar   *role);
+GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_startup_id    (GdkSurface     *surface,
                                              const gchar   *startup_id);
 GDK_AVAILABLE_IN_ALL
@@ -589,6 +595,9 @@ GDK_AVAILABLE_IN_ALL
 GdkCursor    *gdk_surface_get_device_cursor (GdkSurface     *surface,
                                              GdkDevice     *device);
 GDK_AVAILABLE_IN_ALL
+void          gdk_surface_get_user_data  (GdkSurface      *surface,
+                                          gpointer        *data);
+GDK_AVAILABLE_IN_ALL
 void          gdk_surface_get_geometry   (GdkSurface      *surface,
                                           gint            *x,
                                           gint            *y,
@@ -637,12 +646,18 @@ GDK_AVAILABLE_IN_ALL
 gint          gdk_surface_get_scale_factor  (GdkSurface     *surface);
 
 GDK_AVAILABLE_IN_ALL
-GdkSurface *   gdk_surface_get_device_position (GdkSurface      *surface,
+GdkSurface *   gdk_surface_get_device_position (GdkSurface       *surface,
                                                 GdkDevice       *device,
-                                                double          *x,
-                                                double          *y,
+                                                gint            *x,
+                                                gint            *y,
                                                 GdkModifierType *mask);
 GDK_AVAILABLE_IN_ALL
+GdkSurface *   gdk_surface_get_device_position_double (GdkSurface       *surface,
+                                                       GdkDevice       *device,
+                                                       gdouble         *x,
+                                                       gdouble         *y,
+                                                       GdkModifierType *mask);
+GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_surface_get_parent      (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_surface_get_toplevel    (GdkSurface       *surface);
@@ -651,6 +666,9 @@ GDK_AVAILABLE_IN_ALL
 GList *       gdk_surface_get_children   (GdkSurface      *surface);
 GDK_AVAILABLE_IN_ALL
 GList *       gdk_surface_peek_children   (GdkSurface       *surface);
+GDK_AVAILABLE_IN_ALL
+GList *       gdk_surface_get_children_with_user_data (GdkSurface *surface,
+                                                       gpointer   user_data);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_icon_list   (GdkSurface       *surface,
@@ -722,31 +740,31 @@ void          gdk_surface_register_dnd    (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_resize_drag            (GdkSurface     *surface,
                                                GdkSurfaceEdge  edge,
-                                               gint            button,
-                                               gint            x,
-                                               gint            y,
-                                               guint32         timestamp);
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_resize_drag_for_device (GdkSurface     *surface,
                                                GdkSurfaceEdge  edge,
-                                               GdkDevice      *device,
-                                               gint            button,
-                                               gint            x,
-                                               gint            y,
-                                               guint32         timestamp);
+                                               GdkDevice     *device,
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_move_drag              (GdkSurface     *surface,
-                                               gint            button,
-                                               gint            x,
-                                               gint            y,
-                                               guint32         timestamp);
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_move_drag_for_device   (GdkSurface     *surface,
-                                               GdkDevice      *device,
-                                               gint            button,
-                                               gint            x,
-                                               gint            y,
-                                               guint32         timestamp);
+                                               GdkDevice     *device,
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 
 /* Interface for dirty-region queueing */
 GDK_AVAILABLE_IN_ALL

gdk/gdksurfaceimpl.h

@@ -136,6 +136,8 @@ struct _GdkSurfaceImplClass
                                          GdkSurfaceHints     geom_mask);
   void         (* set_title)            (GdkSurface   *surface,
                                          const gchar *title);
+  void         (* set_role)             (GdkSurface   *surface,
+                                         const gchar *role);
   void         (* set_startup_id)       (GdkSurface   *surface,
                                          const gchar *startup_id);
   void         (* set_transient_for)    (GdkSurface *surface,

gdk/gdktypes.h

@@ -200,7 +200,7 @@ typedef enum
  * @GDK_HYPER_MASK: the Hyper modifier
  * @GDK_META_MASK: the Meta modifier
  * @GDK_MODIFIER_RESERVED_29_MASK: A reserved bit flag; do not use in your own code
- * @GDK_RELEASE_MASK: not used in GDK itself. GTK uses it to differentiate
+ * @GDK_RELEASE_MASK: not used in GDK itself. GTK+ uses it to differentiate
  *  between (keyval, modifiers) pairs from key press and release events.
  * @GDK_MODIFIER_MASK: a mask covering all modifier types.
  *
@@ -454,7 +454,7 @@ typedef enum {
  * GdkSurfaceTypeHint:
  * @GDK_SURFACE_TYPE_HINT_NORMAL: Normal toplevel window.
  * @GDK_SURFACE_TYPE_HINT_DIALOG: Dialog window.
- * @GDK_SURFACE_TYPE_HINT_MENU: Window used to implement a menu; GTK uses
+ * @GDK_SURFACE_TYPE_HINT_MENU: Window used to implement a menu; GTK+ uses
  *  this hint only for torn-off menus, see #GtkTearoffMenuItem.
  * @GDK_SURFACE_TYPE_HINT_TOOLBAR: Window used to implement toolbars.
  * @GDK_SURFACE_TYPE_HINT_SPLASHSCREEN: Window used to display a splash
@@ -514,7 +514,7 @@ typedef enum
  *
  * An enumeration describing the way in which a device
  * axis (valuator) maps onto the predefined valuator
- * types that GTK understands.
+ * types that GTK+ understands.
  *
  * Note that the X and Y axes are not really needed; pointer devices
  * report their location via the x/y members of events regardless. Whether

gdk/gdkversionmacros.h.in

@@ -37,7 +37,7 @@
  *
  * A macro that should be defined before including the gdk.h header.
  * If it is defined, no compiler warnings will be produced for uses
- * of deprecated GDK and GTK APIs.
+ * of deprecated GDK and GTK+ APIs.
  */
 
 #ifdef GDK_DISABLE_DEPRECATION_WARNINGS
@@ -54,7 +54,6 @@
 
 #define GDK_VERSION_3_92        (G_ENCODE_VERSION (3, 92))
 #define GDK_VERSION_3_94        (G_ENCODE_VERSION (3, 94))
-
 /**
  * GDK_VERSION_4_0:
  *
@@ -138,13 +137,6 @@
 # define GDK_AVAILABLE_IN_4_0                _GDK_EXTERN
 #endif
 
-#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_92
-# define GDK_DEPRECATED_IN_4_0                GDK_DEPRECATED
-# define GDK_DEPRECATED_IN_4_0_FOR(f)         GDK_DEPRECATED_FOR(f)
-#else
-# define GDK_DEPRECATED_IN_4_0                _GDK_EXTERN
-# define GDK_DEPRECATED_IN_4_0_FOR(f)         _GDK_EXTERN
-#endif
 
 #endif  /* __GDK_VERSION_MACROS_H__ */
 

gdk/gdkvulkancontext.c

@@ -1008,7 +1008,7 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                                  .pNext = NULL,
                                                  .pApplicationName = g_get_application_name (),
                                                  .applicationVersion = 0,
-                                                 .pEngineName = "GTK",
+                                                 .pEngineName = "GTK+",
                                                  .engineVersion = VK_MAKE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION, GDK_MICRO_VERSION),
                                                  .apiVersion = VK_API_VERSION_1_0
                                              },

gdk/quartz/gdkdevice-core-quartz.c

@@ -125,7 +125,7 @@ gdk_quartz_device_core_get_state (GdkDevice       *device,
 {
   gdouble x_pos, y_pos;
 
-  gdk_surface_get_device_position (window, device, &x_pos, &y_pos, mask);
+  gdk_surface_get_device_position_double (window, device, &x_pos, &y_pos, mask);
 
   if (axes)
     {

gdk/quartz/gdksurface-quartz.c

@@ -1739,6 +1739,17 @@ gdk_quartz_surface_set_title (GdkSurface   *window,
     }
 }
 
+static void
+gdk_quartz_surface_set_role (GdkSurface   *window,
+                            const gchar *role)
+{
+  if (GDK_SURFACE_DESTROYED (window) ||
+      SURFACE_IS_TOPLEVEL (window))
+    return;
+
+  /* FIXME: Implement */
+}
+
 static void
 gdk_quartz_surface_set_startup_id (GdkSurface   *window,
                                   const gchar *startup_id)
@@ -2743,6 +2754,7 @@ gdk_surface_impl_quartz_class_init (GdkSurfaceImplQuartzClass *klass)
   impl_class->set_urgency_hint = gdk_quartz_surface_set_urgency_hint;
   impl_class->set_geometry_hints = gdk_quartz_surface_set_geometry_hints;
   impl_class->set_title = gdk_quartz_surface_set_title;
+  impl_class->set_role = gdk_quartz_surface_set_role;
   impl_class->set_startup_id = gdk_quartz_surface_set_startup_id;
   impl_class->set_transient_for = gdk_quartz_surface_set_transient_for;
   impl_class->get_frame_extents = gdk_quartz_surface_get_frame_extents;

gdk/wayland/gdkdevice-wayland.c

@@ -321,7 +321,7 @@ gdk_wayland_device_get_state (GdkDevice       *device,
 {
   gdouble x, y;
 
-  gdk_surface_get_device_position (surface, device, &x, &y, mask);
+  gdk_surface_get_device_position_double (surface, device, &x, &y, mask);
 
   if (axes)
     {
@@ -517,6 +517,13 @@ gdk_wayland_device_set_surface_cursor (GdkDevice *device,
   gdk_wayland_device_update_surface_cursor (device);
 }
 
+static void
+gdk_wayland_device_warp (GdkDevice *device,
+                         gdouble    x,
+                         gdouble    y)
+{
+}
+
 static void
 get_coordinates (GdkDevice *device,
                  double    *x,
@@ -614,9 +621,9 @@ emulate_crossing (GdkSurface       *surface,
   gdk_event_set_device (event, device);
   gdk_event_set_source_device (event, device);
 
-  gdk_surface_get_device_position (surface, device,
-                                   &event->crossing.x, &event->crossing.y,
-                                   &event->crossing.state);
+  gdk_surface_get_device_position_double (surface, device,
+                                         &event->crossing.x, &event->crossing.y,
+                                         &event->crossing.state);
   event->crossing.x_root = event->crossing.x;
   event->crossing.y_root = event->crossing.y;
 
@@ -864,6 +871,7 @@ gdk_wayland_device_class_init (GdkWaylandDeviceClass *klass)
   device_class->get_history = gdk_wayland_device_get_history;
   device_class->get_state = gdk_wayland_device_get_state;
   device_class->set_surface_cursor = gdk_wayland_device_set_surface_cursor;
+  device_class->warp = gdk_wayland_device_warp;
   device_class->query_state = gdk_wayland_device_query_state;
   device_class->grab = gdk_wayland_device_grab;
   device_class->ungrab = gdk_wayland_device_ungrab;

gdk/wayland/gdksurface-wayland.c

@@ -2447,7 +2447,8 @@ gdk_wayland_surface_map (GdkSurface *surface)
                     GDK_SURFACE_IMPL_WAYLAND (attached_grab_surface->impl);
                   grab_device = gdk_seat_get_pointer (attached_impl->grab_input_seat);
                   transient_for =
-                    gdk_device_get_surface_at_position (grab_device, NULL, NULL);
+                    gdk_device_get_surface_at_position (grab_device,
+                                                       NULL, NULL);
                 }
             }
           else
@@ -2464,13 +2465,8 @@ gdk_wayland_surface_map (GdkSurface *surface)
            * position of the device that holds the grab.
            */
           if (impl->position_method == POSITION_METHOD_NONE && grab_device)
-            {
-              double px, py;
-              gdk_surface_get_device_position (transient_for, grab_device,
-                                               &px, &py, NULL);
-              surface->x = round (px);
-              surface->y = round (py);
-            }
+            gdk_surface_get_device_position (transient_for, grab_device,
+                                            &surface->x, &surface->y, NULL);
         }
       else
         {
@@ -3186,6 +3182,12 @@ gdk_wayland_surface_set_title (GdkSurface  *surface,
   gdk_wayland_surface_sync_title (surface);
 }
 
+static void
+gdk_wayland_surface_set_role (GdkSurface  *surface,
+                              const gchar *role)
+{
+}
+
 static void
 gdk_wayland_surface_set_startup_id (GdkSurface  *surface,
                                     const gchar *startup_id)
@@ -3554,8 +3556,8 @@ gdk_wayland_surface_begin_resize_drag (GdkSurface     *surface,
                                        GdkSurfaceEdge  edge,
                                        GdkDevice      *device,
                                        gint            button,
-                                       gint            x,
-                                       gint            y,
+                                       gint            root_x,
+                                       gint            root_y,
                                        guint32         timestamp)
 {
   GdkSurfaceImplWayland *impl;
@@ -3644,8 +3646,8 @@ static void
 gdk_wayland_surface_begin_move_drag (GdkSurface *surface,
                                      GdkDevice  *device,
                                      gint        button,
-                                     gint        x,
-                                     gint        y,
+                                     gint        root_x,
+                                     gint        root_y,
                                      guint32     timestamp)
 {
   GdkSurfaceImplWayland *impl;
@@ -3852,6 +3854,7 @@ _gdk_surface_impl_wayland_class_init (GdkSurfaceImplWaylandClass *klass)
   impl_class->set_urgency_hint = gdk_wayland_surface_set_urgency_hint;
   impl_class->set_geometry_hints = gdk_wayland_surface_set_geometry_hints;
   impl_class->set_title = gdk_wayland_surface_set_title;
+  impl_class->set_role = gdk_wayland_surface_set_role;
   impl_class->set_startup_id = gdk_wayland_surface_set_startup_id;
   impl_class->set_transient_for = gdk_wayland_surface_set_transient_for;
   impl_class->get_frame_extents = gdk_wayland_surface_get_frame_extents;

gdk/win32/gdkdevice-virtual.c

@@ -112,6 +112,14 @@ gdk_device_virtual_set_surface_cursor (GdkDevice  *device,
   g_set_object (&GDK_SURFACE_IMPL_WIN32 (window->impl)->cursor, win32_hcursor);
 }
 
+static void
+gdk_device_virtual_warp (GdkDevice *device,
+			 gdouble   x,
+			 gdouble   y)
+{
+  SetCursorPos (x - _gdk_offset_x, y - _gdk_offset_y);
+}
+
 static void
 gdk_device_virtual_query_state (GdkDevice        *device,
 				GdkSurface        *window,
@@ -190,6 +198,7 @@ gdk_device_virtual_class_init (GdkDeviceVirtualClass *klass)
   device_class->get_history = gdk_device_virtual_get_history;
   device_class->get_state = gdk_device_virtual_get_state;
   device_class->set_surface_cursor = gdk_device_virtual_set_surface_cursor;
+  device_class->warp = gdk_device_virtual_warp;
   device_class->query_state = gdk_device_virtual_query_state;
   device_class->grab = gdk_device_virtual_grab;
   device_class->ungrab = gdk_device_virtual_ungrab;

gdk/win32/gdkdevice-win32.c

@@ -21,7 +21,6 @@
 
 #include <windowsx.h>
 #include <objbase.h>
-#include <math.h>
 
 #include "gdkdevice-win32.h"
 #include "gdkwin32.h"
@@ -46,14 +45,14 @@ gdk_device_win32_get_state (GdkDevice       *device,
                             gdouble         *axes,
                             GdkModifierType *mask)
 {
-  double x, y;
+  gint x_int, y_int;
 
-  gdk_surface_get_device_position (window, device, &x, &y, mask);
+  gdk_surface_get_device_position (window, device, &x_int, &y_int, mask);
 
   if (axes)
     {
-      axes[0] = round (x);
-      axes[1] = round (y);
+      axes[0] = x_int;
+      axes[1] = y_int;
     }
 }
 
@@ -64,6 +63,13 @@ gdk_device_win32_set_surface_cursor (GdkDevice *device,
 {
 }
 
+static void
+gdk_device_win32_warp (GdkDevice *device,
+                       gdouble    x,
+                       gdouble    y)
+{
+}
+
 static GdkModifierType
 get_current_mask (void)
 {
@@ -280,6 +286,7 @@ gdk_device_win32_class_init (GdkDeviceWin32Class *klass)
   device_class->get_history = gdk_device_win32_get_history;
   device_class->get_state = gdk_device_win32_get_state;
   device_class->set_surface_cursor = gdk_device_win32_set_surface_cursor;
+  device_class->warp = gdk_device_win32_warp;
   device_class->query_state = gdk_device_win32_query_state;
   device_class->grab = gdk_device_win32_grab;
   device_class->ungrab = gdk_device_win32_ungrab;

gdk/win32/gdkdevice-wintab.c

@@ -99,6 +99,13 @@ gdk_device_wintab_set_surface_cursor (GdkDevice *device,
 {
 }
 
+static void
+gdk_device_wintab_warp (GdkDevice *device,
+                        gdouble   x,
+                        gdouble   y)
+{
+}
+
 static void
 gdk_device_wintab_query_state (GdkDevice        *device,
                                GdkSurface        *window,
@@ -284,6 +291,7 @@ gdk_device_wintab_class_init (GdkDeviceWintabClass *klass)
   device_class->get_history = gdk_device_wintab_get_history;
   device_class->get_state = gdk_device_wintab_get_state;
   device_class->set_surface_cursor = gdk_device_wintab_set_surface_cursor;
+  device_class->warp = gdk_device_wintab_warp;
   device_class->query_state = gdk_device_wintab_query_state;
   device_class->grab = gdk_device_wintab_grab;
   device_class->ungrab = gdk_device_wintab_ungrab;

gdk/win32/gdkdevicemanager-win32.c

@@ -883,12 +883,15 @@ gdk_input_other_event (GdkDisplay *display,
   GdkDeviceManagerWin32 *device_manager;
   GdkDeviceWintab *source_device = NULL;
   GdkDeviceGrabInfo *last_grab;
+  GdkEventMask masktest;
   guint key_state;
+  POINT pt;
+  GdkSurfaceImplWin32 *impl;
 
   PACKET packet;
   gint root_x, root_y;
   gint num_axes;
-  double x, y;
+  gint x, y;
   guint translated_buttons, button_diff, button_mask;
   /* Translation from tablet button state to GDK button state for
    * buttons 1-3 - swap button 2 and 3.
@@ -908,7 +911,7 @@ gdk_input_other_event (GdkDisplay *display,
     g_object_ref (window);
 
   GDK_NOTE (EVENTS_OR_INPUT,
-	    g_print ("gdk_input_other_event: window=%p %+g%+g\n",
+	    g_print ("gdk_input_other_event: window=%p %+d%+d\n",
                window ? GDK_SURFACE_HWND (window) : NULL, x, y));
 
   if (msg->message == WT_PACKET || msg->message == WT_CSRCHANGE)

gdk/win32/gdkdisplay-win32.c

@@ -38,8 +38,6 @@
 
 #include <dwmapi.h>
 
-#include "gdkwin32langnotification.h"
-
 static int debug_indent = 0;
 
 /**
@@ -538,7 +536,6 @@ _gdk_win32_display_open (const gchar *display_name)
                                       NULL);
   _gdk_device_manager->display = _gdk_display;
 
-  _gdk_win32_lang_notification_init ();
   _gdk_drag_init ();
   _gdk_drop_init ();
 
@@ -704,7 +701,6 @@ gdk_win32_display_finalize (GObject *object)
 
   _gdk_win32_display_finalize_cursors (display_win32);
   _gdk_win32_dnd_exit ();
-  _gdk_win32_lang_notification_exit ();
 
   g_ptr_array_free (display_win32->monitors, TRUE);
 

gdk/win32/gdkdrag-win32.c

@@ -29,7 +29,6 @@
 
 #include <io.h>
 #include <fcntl.h>
-#include <math.h>
 
 /*
  * Support for OLE-2 drag and drop added at Archaeopteryx Software, 2001
@@ -1718,7 +1717,6 @@ _gdk_win32_surface_drag_begin (GdkSurface         *surface,
   GdkDrag *drag;
   GdkWin32Drag *drag_win32;
   GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get ();
-  double px, py;
   int x_root, y_root;
 
   g_return_val_if_fail (surface != NULL, NULL);
@@ -1733,9 +1731,9 @@ _gdk_win32_surface_drag_begin (GdkSurface         *surface,
 
   GDK_NOTE (DND, g_print ("_gdk_win32_surface_drag_begin\n"));
 
-  gdk_device_get_position (device, &px, &px);
-  x_root = round (px) + dx;
-  y_root = round (py) + dy;
+  gdk_device_get_position (device, &x_root, &y_root);
+  x_root += dx;
+  y_root += dy;
 
   drag_win32->start_x = x_root;
   drag_win32->start_y = y_root;
@@ -1842,6 +1840,7 @@ gdk_win32_drag_find_window (GdkDrag    *drag,
 {
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
   find_window_enum_arg a;
+  HWND result;
 
   g_assert (_win32_main_thread == NULL ||
             _win32_main_thread == g_thread_self ());
@@ -2440,6 +2439,7 @@ gdk_dnd_handle_key_event (GdkDrag           *drag,
     {
       drag_win32->util_data.last_x += dx;
       drag_win32->util_data.last_y += dy;
+      gdk_device_warp (pointer, drag_win32->util_data.last_x, drag_win32->util_data.last_y);
     }
 
   if (drag_win32->drag_surface)

gdk/win32/gdkdrop-win32.c

@@ -1090,6 +1090,7 @@ static void
 gdk_win32_drop_finish (GdkDrop       *drop,
                        GdkDragAction  action)
 {
+  GdkDrag *drag;
   GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop);
 
   g_return_if_fail (drop != NULL);
@@ -1102,6 +1103,12 @@ gdk_win32_drop_finish (GdkDrop       *drop,
 
   if (drop_win32->protocol == GDK_DRAG_PROTO_OLE2)
     return;
+/* FIXME: remove?
+  drag = gdk_drop_get_drag (drop);
+
+  if (drag != NULL)
+    _gdk_win32_local_drag_drop_response (drag, action);
+*/
 }
 
 #if 0

gdk/win32/gdkevents-win32.c

@@ -1331,6 +1331,7 @@ _gdk_win32_do_emit_configure_event (GdkSurface *window,
                                     RECT       rect)
 {
   GdkSurfaceImplWin32 *impl = GDK_SURFACE_IMPL_WIN32 (window->impl);
+  GdkEvent *event;
 
   impl->unscaled_width = rect.right - rect.left;
   impl->unscaled_height = rect.bottom - rect.top;
@@ -2112,6 +2113,7 @@ gdk_event_translate (MSG  *msg,
     case WM_INPUTLANGCHANGE:
       _gdk_input_locale = (HKL) msg->lParam;
       _gdk_win32_keymap_set_active_layout (GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display)), _gdk_input_locale);
+      _gdk_input_locale_is_ime = ImmIsIME (_gdk_input_locale);
       GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
 		     LOCALE_IDEFAULTANSICODEPAGE,
 		     buf, sizeof (buf));
@@ -2123,20 +2125,6 @@ gdk_event_translate (MSG  *msg,
 			 (gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
 			 _gdk_input_codepage));
       gdk_display_setting_changed (display, "gtk-im-module");
-
-      /* Generate a dummy key event to "nudge" IMContext */
-      event = gdk_event_new (GDK_KEY_PRESS);
-      event->any.surface = window;
-      event->key.time = _gdk_win32_get_next_tick (msg->time);
-      event->key.keyval = GDK_KEY_VoidSymbol;
-      event->key.hardware_keycode = 0;
-      event->key.group = 0;
-      gdk_event_set_scancode (event, 0);
-      gdk_event_set_device (event, device_manager_win32->core_keyboard);
-      gdk_event_set_source_device (event, device_manager_win32->system_keyboard);
-      event->key.is_modifier = FALSE;
-      event->key.state = 0;
-      _gdk_win32_append_event (event);
       break;
 
     case WM_SYSKEYUP:

gdk/win32/gdkglobals-win32.c

@@ -39,7 +39,7 @@ HINSTANCE	  _gdk_app_hmodule;
 gint		  _gdk_input_ignore_core;
 
 HKL		  _gdk_input_locale;
-gboolean	  _gdk_input_locale_is_ime = FALSE;
+gboolean	  _gdk_input_locale_is_ime;
 UINT		  _gdk_input_codepage;
 
 gint		  _gdk_input_ignore_wintab = FALSE;

gdk/win32/gdkmain-win32.c

@@ -83,6 +83,7 @@ _gdk_win32_surfaceing_init (void)
   _gdk_display_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL);
   _gdk_input_locale = GetKeyboardLayout (0);
   _gdk_win32_keymap_set_active_layout (GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display)), _gdk_input_locale);
+  _gdk_input_locale_is_ime = ImmIsIME (_gdk_input_locale);
   GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
 		 LOCALE_IDEFAULTANSICODEPAGE,
 		 buf, sizeof (buf));

gdk/win32/gdkproperty-win32.c

@@ -215,9 +215,9 @@ _gdk_win32_get_setting (const gchar *name,
   else if (strcmp ("gtk-im-module", name) == 0)
     {
       if (_gdk_input_locale_is_ime)
-        g_value_set_static_string (value, "ime");
+        g_value_set_string (value, "ime");
       else
-        g_value_set_static_string (value, "");
+        g_value_set_string (value, "");
 
       return TRUE;
     }

gdk/win32/gdksurface-win32.c

@@ -1626,6 +1626,18 @@ gdk_win32_surface_set_title (GdkSurface   *window,
   GDK_NOTE (MISC_OR_EVENTS, g_free ((char *) title));
 }
 
+static void
+gdk_win32_surface_set_role (GdkSurface   *window,
+		     const gchar *role)
+{
+  g_return_if_fail (GDK_IS_SURFACE (window));
+
+  GDK_NOTE (MISC, g_print ("gdk_surface_set_role: %p: %s\n",
+			   GDK_SURFACE_HWND (window),
+			   (role ? role : "NULL")));
+  /* XXX */
+}
+
 static void
 gdk_win32_surface_set_transient_for (GdkSurface *window,
 			      GdkSurface *parent)
@@ -1941,6 +1953,19 @@ gdk_surface_win32_get_device_state (GdkSurface       *window,
   return (child != NULL);
 }
 
+void
+gdk_display_warp_device (GdkDisplay *display,
+                         GdkDevice  *device,
+                         gint        x,
+                         gint        y)
+{
+  g_return_if_fail (display == gdk_display_get_default ());
+  g_return_if_fail (GDK_IS_DEVICE (device));
+  g_return_if_fail (display == gdk_device_get_display (device));
+
+  GDK_DEVICE_GET_CLASS (device)->warp (device, x, y);
+}
+
 static void
 gdk_win32_surface_set_accept_focus (GdkSurface *window,
 			     gboolean accept_focus)
@@ -4100,7 +4125,7 @@ setup_drag_move_resize_context (GdkSurface                   *window,
            * the titlebar is, if any.
            */
           root_y = wy + wheight / 2;
-          SetCursorPos (root_x - _gdk_offset_x, root_y - _gdk_offset_y);
+          gdk_device_warp (device, root_x, root_y);
         }
     }
 
@@ -5316,6 +5341,7 @@ gdk_surface_impl_win32_class_init (GdkSurfaceImplWin32Class *klass)
   impl_class->set_urgency_hint = gdk_win32_surface_set_urgency_hint;
   impl_class->set_geometry_hints = gdk_win32_surface_set_geometry_hints;
   impl_class->set_title = gdk_win32_surface_set_title;
+  impl_class->set_role = gdk_win32_surface_set_role;
   //impl_class->set_startup_id = gdk_x11_surface_set_startup_id;
   impl_class->set_transient_for = gdk_win32_surface_set_transient_for;
   impl_class->get_frame_extents = gdk_win32_surface_get_frame_extents;