Add tests for gdk_content_formats_parse

Add a test that checks we can roundtrip things through
gdk_content_formats_parse and gdk_content_formats_to_string.

.gitlab-ci.yml

@@ -7,7 +7,6 @@ stages:
   - analysis
   - docs
   - flatpak
-  - publish
   - deploy
 
 .cache-paths: &cache-paths
@@ -21,11 +20,11 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v34"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v32"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:
@@ -58,7 +57,6 @@ style-check-diff:
       - "${CI_PROJECT_DIR}/_build/report*.xml"
       - "${CI_PROJECT_DIR}/_build/report*.html"
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
       - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
       - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
@@ -338,11 +336,14 @@ reference:
     paths:
       - _reference
 
-publish-docs:
-  stage: publish
+pages:
+  stage: deploy
   needs: ['reference']
   script:
-    - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
+    - mv _reference/ public/
+    - cp .gitlab-ci/pages/* public/
+  artifacts:
+    paths:
+      - public
   only:
-    refs:
-      - master
+    - master

.gitlab-ci/fedora.Dockerfile

@@ -48,9 +48,7 @@ RUN dnf -y install \
     libcloudproviders-devel \
     libepoxy-devel \
     libffi-devel \
-    libjpeg-turbo-devel \
     libmount-devel \
-    libpng-devel \
     librsvg2 \
     libselinux-devel \
     libubsan \

NEWS

@@ -1,170 +1,3 @@
-Overview of Changes in 4.4.2, 15-02-2022
-========================================
-
-* GtkEntry:
- - Update placeholder visibility when needed
-
-* Work with newer pango
-
-* Translation updates:
- German
- Icelandic
- Italian
- Japanese
- Occitan
-
-
-Overview of Changes in 4.4.1
-============================
-
-* input:
- - Fix compose data on bigendian systems
- - Accept long replacement strings for compose sequences
-
-* a11y:
- - Fix accessible relations for menu buttons
- - Fix accessible descriptions in some cases
- - Simplify atspi context a bit
-
-* Theme:
- - Improve styling for toggle buttons in toolbars
-
-*  gsk:
- - Avoid coordinate overflow with big text selections
-
-* GtkTextView:
- - Fix applying css properties such as
-   letterspacing, line decoration, font
-   features, etc
- - Improve grouping for undo
- - Invalidate Pango contexts when font settings change
- - Fix a crash
-
-* GtkFileChooser:
- - Fix handling of choices
-
-* GtkStackSwitcher:
- - Expand child buttons
-
-* GtkCalendar:
- - Fix day names for weeks that start on monday
-
-* GtkWindow:
- - Prefer menubars when handling F10
-
-* GtkFontButton:
- - Make sure the dialog is on the same display
-
-* X11:
- - Fix handling of randr events
-
-* Windows:
- - Fix DND coordinates
- - Fix build
-
-* macOS:
- - Fix handling of scale on macOS 12
-
-* build:
- - Fix detection of pre-compiled css files
-
-* Translation updates
- Basque
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Croatian
- Czech
- Danish
- Finnish
- French
- Galician
- German
- Hebrew
- Hungarian
- Icelandic
- Indonesian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Persian
- Polish
- Portuguese
- Romanian
- Russian
- Serbian
- Slovak
- Slovenian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.4.0
-============================
-
-* Input:
- - Match IBus for display of Compose sequences
- - Match IBus for handling of mismatches
- - Handle Escape in Compose sequences
- - Allow multiple dead keys
- - Support 32bit keysyms
-
-* GtkCheckButton:
- - Activate when moving focus
-
-* GtkLabel:
- - Propertly ignore double underscores for mnemonics
-
-* GtkPopoverMenu:
- - Fix focus cycling
-
-* GtkTextView:
- - Improve word selection
- - Fix block cursors on empty lines
-
-* GdkToplevel:
- - Support the gnome-shell titlebar gesture protocol
-
-* GdkDropTarget:
- - Allow creating drop targets in ui files
-
-* gsk:
- - Handle partial color fonts correctly
- - Use harfbuzz for color font information
- - Avoid pango for glyph cache rendering
- - Shrink shadow extents
-
-* Settings:
- - Change the default for gtk-split-cursor to FALSE
-
-* Demos:
- - Small improvements to widget-factory
- - gtk-demo: Improve the hypertext demo
- - gtk-dem: Improve the clipboard demo
-
-* X11:
- - Set WM_CLASS on toplevels
-
-* Wayland:
- - Support wl_seat v7
-
-* Windows:
- - Drop the local DND protocol
- - Avoid WGL if shaders don't work
- - Use WinPointer API
-
-* Translation updates:
- Belarusian
- Friulian
- Hebrew
- Khmer
- Persian
- Polish
-
-
 Overview of Changes in 4.3.2
 ============================
 

README.md

@@ -10,12 +10,10 @@ GTK is a multi-platform toolkit for creating graphical user interfaces.
 Offering a complete set of widgets, GTK is suitable for projects ranging
 from small one-off projects to complete application suites.
 
-GTK is a free and open-source software project. However, the licensing terms
-for GTK, the GNU LGPL, allow it to be used by all developers, including those
-developing proprietary software, without any license fees or royalties.
-
-GTK is hosted by the GNOME project (thanks!) and used by a wide variety
-of applications and projects.
+GTK is free software and part of the GNU Project. However, the
+licensing terms for GTK, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
 
 The official download location
 
@@ -153,9 +151,6 @@ Contributing to GTK
 Please, follow the [contribution guide](./CONTRIBUTING.md) to know how to
 start contributing to GTK.
 
-If you want to support GTK financially, please consider donating to
-the GNOME project, which runs the infrastructure hosting GTK.
-
 Release notes
 -------------
 

demos/gtk-demo/demoimage.c

@@ -100,11 +100,7 @@ prepare_drag (GtkDragSource *source,
   DemoImage *demo = DEMO_IMAGE (widget);
   GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
 
-  /* Textures can be serialized, paintables can't, so special case the textures */
-  if (GDK_IS_TEXTURE (paintable))
-    return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, paintable);
-  else
-    return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
+  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
 }
 
 static gboolean
@@ -133,11 +129,7 @@ copy_image (GtkWidget *widget,
   GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
   GValue value = G_VALUE_INIT;
 
-  /* Textures can be serialized, paintables can't, so special case the textures */
-  if (GDK_IS_TEXTURE (paintable))
-    g_value_init (&value, GDK_TYPE_TEXTURE);
-  else
-    g_value_init (&value, GDK_TYPE_PAINTABLE);
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
   g_value_set_object (&value, paintable);
   gdk_clipboard_set_value (clipboard, &value);
   g_value_unset (&value);
@@ -146,46 +138,24 @@ copy_image (GtkWidget *widget,
     g_object_unref (paintable);
 }
 
-static void
-paste_image_cb (GObject      *source,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  DemoImage *demo = DEMO_IMAGE (data);
-  const GValue *value;
-
-  value = gdk_clipboard_read_value_finish (clipboard, result, NULL);
-  if (value == NULL)
-    {
-      gtk_widget_error_bell (GTK_WIDGET (demo));
-      g_object_unref (demo);
-      return;
-    }
-
-  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), g_value_get_object (value));
-  g_object_unref (demo);
-}
-
 static void
 paste_image (GtkWidget *widget,
              const char *action_name,
              GVariant *parameter)
 {
   GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
-  GType type;
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkContentProvider *content = gdk_clipboard_get_content (clipboard);
+  GValue value = G_VALUE_INIT;
+  GdkPaintable *paintable;
 
-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GDK_TYPE_TEXTURE))
-    type = GDK_TYPE_TEXTURE;
-  else
-    type = GDK_TYPE_PAINTABLE;
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
+  if (!gdk_content_provider_get_value (content, &value, NULL))
+    return;
 
-  gdk_clipboard_read_value_async (clipboard, 
-                                  type,
-                                  G_PRIORITY_DEFAULT,
-                                  NULL,
-                                  paste_image_cb,
-                                  g_object_ref (widget));
+  paintable = GDK_PAINTABLE (g_value_get_object (&value));
+  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
+  g_value_unset (&value);
 }
 
 static void

demos/gtk-demo/fontify.c

@@ -255,12 +255,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (insert_hyphens);
           break;
 
-#if PANGO_VERSION_CHECK(1,49,0)
-        case PANGO_ATTR_LINE_HEIGHT:
-        case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
-          break;
-#endif
-
         case PANGO_ATTR_SHAPE:
         case PANGO_ATTR_ABSOLUTE_SIZE:
         case PANGO_ATTR_GRAVITY:
@@ -269,17 +263,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
         case PANGO_ATTR_BACKGROUND_ALPHA:
           break;
 
-#if PANGO_VERSION_CHECK(1,49,0)
-        case PANGO_ATTR_TEXT_TRANSFORM:
-#endif
-#if PANGO_VERSION_CHECK(1,49,1)
-        case PANGO_ATTR_WORD:
-        case PANGO_ATTR_SENTENCE:
-        case PANGO_ATTR_BASELINE_SHIFT:
-        case PANGO_ATTR_FONT_SCALE:
-          break;
-#endif
-
         case PANGO_ATTR_INVALID:
         default:
           g_assert_not_reached ();

demos/gtk-demo/hypertext.c

@@ -61,26 +61,12 @@ show_page (GtkTextView *text_view,
            int          page)
 {
   GtkTextBuffer *buffer;
-  GtkTextIter iter, start;
-  GtkTextMark *mark;
+  GtkTextIter iter;
   GtkWidget *child;
   GtkTextChildAnchor *anchor;
   GtkEventController *controller;
-  GtkTextTag *bold, *mono, *nobreaks;
 
   buffer = gtk_text_view_get_buffer (text_view);
-
-  bold = gtk_text_buffer_create_tag (buffer, NULL,
-                                     "weight", PANGO_WEIGHT_BOLD,
-                                     "scale", PANGO_SCALE_X_LARGE,
-                                     NULL);
-  mono = gtk_text_buffer_create_tag (buffer, NULL,
-                                     "family", "monospace",
-                                     NULL);
-  nobreaks = gtk_text_buffer_create_tag (buffer, NULL,
-                                         "allow-breaks", FALSE,
-                                         NULL);
-
   gtk_text_buffer_set_text (buffer, "", 0);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
   gtk_text_buffer_begin_irreversible_action (buffer);
@@ -118,22 +104,17 @@ show_page (GtkTextView *text_view,
     }
   else if (page == 2)
     {
-      mark = gtk_text_buffer_create_mark (buffer, "mark", &iter, TRUE);
+      GtkTextTag *tag;
 
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, bold, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
-
-      gtk_text_buffer_move_mark (buffer, mark, &iter);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, mono, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "weight", PANGO_WEIGHT_BOLD,
+                                        "scale", PANGO_SCALE_X_LARGE,
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, tag, NULL);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "family", "monospace",
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, " / tag / ", -1, tag, NULL);
 
       anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
       child = gtk_image_new_from_icon_name ("audio-volume-high-symbolic");
@@ -151,26 +132,20 @@ show_page (GtkTextView *text_view,
           "behavior of mouse and key presses, “lock” a range of text so the "
           "user can't edit it, or countless other things.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
-
-      gtk_text_buffer_delete_mark (buffer, mark);
     }
   else if (page == 3)
     {
-      mark = gtk_text_buffer_create_mark (buffer, "mark", &iter, TRUE);
+      GtkTextTag *tag;
 
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext", -1, bold, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
-
-      gtk_text_buffer_move_mark (buffer, mark, &iter);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "ˈhaɪ pərˌtɛkst", -1, mono, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "weight", PANGO_WEIGHT_BOLD,
+                                        "scale", PANGO_SCALE_X_LARGE,
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext", -1, tag, NULL);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "family", "monospace",
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, " / ˈhaɪ pərˌtɛkst / ", -1, tag, NULL);
 
       anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
       child = gtk_image_new_from_icon_name ("audio-volume-high-symbolic");
@@ -184,8 +159,6 @@ show_page (GtkTextView *text_view,
           "Machine-readable text that is not sequential but is organized "
           "so that related items of information are connected.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
-
-      gtk_text_buffer_delete_mark (buffer, mark);
     }
   gtk_text_buffer_end_irreversible_action (buffer);
 }
@@ -385,7 +358,7 @@ do_hypertext (GtkWidget *do_widget)
 
       sw = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
       gtk_window_set_child (GTK_WINDOW (window), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);

demos/gtk-demo/org.gtk.Demo4.appdata.xml.in

@@ -33,7 +33,7 @@
   <developer_name>Matthias Clasen and others</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
       <description>
         <p>A new build of GTK.</p>
       </description>

demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in

@@ -32,7 +32,7 @@
   <developer_name>Matthias Clasen and others</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
       <description>
         <p>A new build of GTK.</p>
       </description>

demos/meson.build

@@ -12,9 +12,19 @@ demo_conf_h = declare_dependency(
 )
 
 # appdata
+today = 'unknown'
+date = find_program('date',
+         required: false)
+if date.found()
+  r = run_command(date, '-I')
+  if r.returncode() == 0
+    today = r.stdout().strip()
+  endif
+endif
 
 appdata_config = configuration_data()
 appdata_config.set('BUILD_VERSION', meson.project_version())
+appdata_config.set('BUILD_DATE', today)
 
 subdir('constraint-editor')
 subdir('gtk-demo')

demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in

@@ -34,7 +34,7 @@
   <developer_name>Matthias Clasen and others</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
       <description>
         <p>A new build of GTK.</p>
       </description>

demos/widget-factory/widget-factory.c

@@ -696,37 +696,6 @@ on_range_to_changed (GtkSpinButton *to)
     gtk_spin_button_set_value (from, v2);
 }
 
-static GdkContentProvider *
-on_picture_drag_prepare (GtkDragSource *source,
-                         double         x,
-                         double         y,
-                         gpointer       unused)
-{
-  GtkWidget *picture;
-
-  picture = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-
-  return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, gtk_picture_get_paintable (GTK_PICTURE (picture)));
-}
-
-static gboolean
-on_picture_drop (GtkDropTarget *dest,
-                 const GValue  *value,
-                 double         x,
-                 double         y,
-                 gpointer       unused)
-{
-  GtkWidget *picture;
-  GdkPaintable *paintable;
-
-  picture = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-  paintable = g_value_get_object (value);
-
-  gtk_picture_set_paintable (GTK_PICTURE (picture), paintable);
-
-  return TRUE;
-}
-
 static void
 info_bar_response (GtkWidget *infobar, int response_id)
 {
@@ -1213,7 +1182,7 @@ populate_flowbox (GtkWidget *flowbox)
   GtkWidget *child;
   int i;
   const char *resources[] = {
-    "sunset.jpg", "portland-rose.jpg", "beach.jpg", "nyc.jpg"
+    "sunset.jpg", "snowy.jpg", "portland-rose.jpg"
   };
 
   if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (flowbox), "populated")))
@@ -2071,8 +2040,6 @@ activate (GApplication *app)
           "on_page_combo_changed", (GCallback)on_page_combo_changed,
           "on_range_from_changed", (GCallback)on_range_from_changed,
           "on_range_to_changed", (GCallback)on_range_to_changed,
-          "on_picture_drag_prepare", (GCallback)on_picture_drag_prepare,
-          "on_picture_drop", (GCallback)on_picture_drop,
           "tab_close_cb", (GCallback)tab_close_cb,
           "increase_icon_size", (GCallback)increase_icon_size,
           "decrease_icon_size", (GCallback)decrease_icon_size,

demos/widget-factory/widget-factory.gresource.xml

@@ -115,8 +115,7 @@
   <gresource prefix="/org/gtk/WidgetFactory4">
     <file>gtk-logo.webm</file>
     <file>sunset.jpg</file>
+    <file>snowy.jpg</file>
     <file>portland-rose.jpg</file>
-    <file>nyc.jpg</file>
-    <file>beach.jpg</file>
   </gresource>
 </gresources>

demos/widget-factory/widget-factory.ui

@@ -1051,9 +1051,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="spacing">10</property>
                             <property name="hexpand">1</property>
                             <child>
-                              <object class="GtkFrame">
+                              <object class="GtkFrame" id="frame1">
+                                <property name="valign">start</property>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label1">
+                                    <property name="label" translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
+                                    <property name="use-markup">1</property>
+                                  </object>
+                                </child>
                                 <child>
                                   <object class="GtkVideo">
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">6</property>
+                                    <property name="margin-end">6</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
                                     <property name="autoplay">1</property>
                                     <property name="loop">1</property>
                                     <property name="file">resource:///org/gtk/WidgetFactory4/gtk-logo.webm</property>
@@ -1062,78 +1075,66 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkFrame">
-                                <child type="label">
-                                  <object class="GtkLabel" id="label1">
-                                    <property name="label" translatable="yes">&lt;b&gt;Text Styles&lt;/b&gt;</property>
-                                    <property name="use-markup">1</property>
-                                  </object>
-                                </child>
+                              <object class="GtkScrolledWindow">
+                                <property name="vexpand">1</property>
+                                <property name="hscrollbar-policy">never</property>
+                                <property name="vscrollbar-policy">automatic</property>
                                 <child>
-                                  <object class="GtkScrolledWindow">
-                                    <property name="vexpand">1</property>
-                                    <property name="hscrollbar-policy">never</property>
-                                    <property name="vscrollbar-policy">automatic</property>
-                                    <property name="propagate-natural-height">1</property>
-                                    <property name="propagate-natural-width">1</property>
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">10</property>
                                     <child>
-                                      <object class="GtkBox">
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">10</property>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Large Title</property>
-                                            <style><class name="large-title"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 1</property>
-                                            <style><class name="title-1"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 2</property>
-                                            <style><class name="title-2"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 3</property>
-                                            <style><class name="title-3"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 4</property>
-                                            <style><class name="title-4"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Heading</property>
-                                            <style><class name="heading"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Body</property>
-                                            <style><class name="body"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Caption Heading</property>
-                                            <style><class name="caption-heading"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Caption</property>
-                                            <style><class name="caption"/></style>
-                                          </object>
-                                        </child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Large Title</property>
+                                        <style><class name="large-title"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 1</property>
+                                        <style><class name="title-1"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 2</property>
+                                        <style><class name="title-2"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 3</property>
+                                        <style><class name="title-3"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 4</property>
+                                        <style><class name="title-4"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Heading</property>
+                                        <style><class name="heading"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Body</property>
+                                        <style><class name="body"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Caption Heading</property>
+                                        <style><class name="caption-heading"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Caption</property>
+                                        <style><class name="caption"/></style>
                                       </object>
                                     </child>
                                   </object>
@@ -1250,21 +1251,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
-                                    <child>
-                                      <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
-                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropTarget">
-                                        <property name="actions">copy</property>
-                                        <property name="formats">GdkTexture</property>
-                                        <signal name="drop" handler="on_picture_drop" swapped="no"/>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box6">
+                                    <property name="orientation">vertical</property>
                                   </object>
                                 </property>
                                 <property name="tab">
@@ -1277,21 +1265,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/nyc.jpg</property>
-                                    <child>
-                                      <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
-                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropTarget">
-                                        <property name="actions">copy</property>
-                                        <property name="formats">GdkTexture</property>
-                                        <signal name="drop" handler="on_picture_drop" swapped="no"/>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box7">
+                                    <property name="orientation">vertical</property>
                                   </object>
                                 </property>
                                 <property name="tab">
@@ -1303,22 +1278,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkNotebookPage">
+                                <property name="position">2</property>
                                 <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/beach.jpg</property>
-                                    <child>
-                                      <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
-                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropTarget">
-                                        <property name="actions">copy</property>
-                                        <property name="formats">GdkTexture</property>
-                                        <signal name="drop" handler="on_picture_drop" swapped="no"/>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box8">
+                                    <property name="orientation">vertical</property>
                                   </object>
                                 </property>
                                 <property name="tab">
@@ -1336,7 +1299,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkBox" id="box8">
+                                  <object class="GtkBox" id="box9">
                                     <property name="orientation">vertical</property>
                                   </object>
                                 </property>

docs/reference/gdk/gdk4-wayland.toml.in

@@ -13,7 +13,7 @@ devhelp = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"
 
 [theme]
 name = "basic"

docs/reference/gdk/gdk4-x11.toml.in

@@ -13,7 +13,7 @@ devhelp = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"
 
 [theme]
 name = "basic"

docs/reference/gdk/gdk4.toml.in

@@ -14,7 +14,7 @@ search_index = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"
 
   [dependencies."cairo-1.0"]
   name = "Cairo"

docs/reference/gdk/meson.build

@@ -1,15 +1,11 @@
 expand_content_md_files = [
 ]
 
-if get_option('gtk_doc')
-  gdk4_toml = configure_file(
-    input: 'gdk4.toml.in',
-    output: 'gdk4.toml',
-    configuration: toml_conf,
-    install: true,
-    install_dir: docs_dir / 'gdk4',
-  )
+gdk4_toml = configure_file(input: 'gdk4.toml.in', output: 'gdk4.toml', configuration: toml_conf)
+gdk4x11_toml = configure_file(input: 'gdk4-x11.toml.in', output: 'gdk4-x11.toml', configuration: toml_conf)
+gdk4wayland_toml = configure_file(input: 'gdk4-wayland.toml.in', output: 'gdk4-wayland.toml', configuration: toml_conf)
 
+if get_option('gtk_doc')
   custom_target('gdk4-doc',
     input: [ gdk4_toml, gdk_gir[0] ],
     output: 'gdk4',
@@ -32,14 +28,6 @@ if get_option('gtk_doc')
   )
 
   if x11_enabled
-    gdk4x11_toml = configure_file(
-      input: 'gdk4-x11.toml.in',
-      output: 'gdk4-x11.toml',
-      configuration: toml_conf,
-      install: true,
-      install_dir: docs_dir / 'gdk4-x11',
-    )
-
     custom_target('gdk4-x11-doc',
       input: [ gdk4x11_toml, gdk_x11_gir[0] ],
       output: 'gdk4-x11',
@@ -64,14 +52,6 @@ if get_option('gtk_doc')
   endif
 
   if wayland_enabled
-    gdk4wayland_toml = configure_file(
-      input: 'gdk4-wayland.toml.in',
-      output: 'gdk4-wayland.toml',
-      configuration: toml_conf,
-      install: true,
-      install_dir: docs_dir / 'gdk4-wayland',
-    )
-
     custom_target('gdk4-wayland-doc',
       input: [ gdk4wayland_toml, gdk_wayland_gir[0] ],
       output: 'gdk4-wayland',

docs/reference/gdk/urlmap.js

@@ -3,14 +3,11 @@
 
 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'GLib', 'https://docs.gtk.org/glib/' ],
-    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
-    [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
-    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
-    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
-    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
-    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
-    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
+    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
+    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
+    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
+    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
+    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
+    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
 ]

docs/reference/gsk/gsk4.toml.in

@@ -14,7 +14,7 @@ search_index = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable/"
 
   [dependencies."Graphene-1.0"]
   name = "Graphene"

docs/reference/gsk/meson.build

@@ -1,12 +1,6 @@
-if get_option('gtk_doc')
-  gsk4_toml = configure_file(
-    input: 'gsk4.toml.in',
-    output: 'gsk4.toml',
-    configuration: toml_conf,
-    install: true,
-    install_dir: docs_dir / 'gsk4',
-  )
+gsk4_toml = configure_file(input: 'gsk4.toml.in', output: 'gsk4.toml', configuration: toml_conf)
 
+if get_option('gtk_doc')
   custom_target('gsk4-doc',
     input: [ gsk4_toml, gsk_gir[0] ],
     output: 'gsk4',

docs/reference/gsk/urlmap.js

@@ -3,14 +3,11 @@
 
 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'GLib', 'https://docs.gtk.org/glib/' ],
-    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
-    [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
-    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
-    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
-    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
-    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
-    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
+    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
+    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
+    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
+    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
+    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
+    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
 ]

docs/reference/gtk/gtk4.toml.in

@@ -14,7 +14,7 @@ search_index = true
   [dependencies."GObject-2.0"]
   name = "GObject"
   description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"
 
   [dependencies."Graphene-1.0"]
   name = "Graphene"

docs/reference/gtk/input-handling.md

@@ -137,14 +137,6 @@ capture phase, and key bindings locally, during the target phase.
 Under the hood, all shortcuts are represented as instances of `GtkShortcut`,
 and they are managed by `GtkShortcutController`.
 
-## Text input
-
-When actual text input is needed (i.e. not just keyboard shortcuts),
-input method support can be added to a widget by connecting an input
-method context and listening to its `::commit` signal. To create a new
-input method context, use gtk_im_multicontext_new(), to provide it with
-input, use gtk_event_controller_key_set_im_context().
-
 ## Event controllers and gestures
 
 Event controllers are standalone objects that can perform

docs/reference/gtk/meson.build

@@ -27,15 +27,9 @@ expand_content_md_files = [
   'visual_index.md'
 ]
 
-if get_option('gtk_doc')
-  gtk4_toml = configure_file(
-    input: 'gtk4.toml.in',
-    output: 'gtk4.toml',
-    configuration: toml_conf,
-    install: true,
-    install_dir: docs_dir / 'gtk4',
-  )
+gtk4_toml = configure_file(input: 'gtk4.toml.in', output: 'gtk4.toml', configuration: toml_conf)
 
+if get_option('gtk_doc')
   custom_target('gtk4-doc',
     input: [ gtk4_toml, gtk_gir[0] ],
     output: 'gtk4',

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

@@ -315,7 +315,7 @@ have been added to `GdkDisplay`.
 
 The root window is an X11-centric concept that is no longer exposed in the
 backend-neutral GDK API. If you need to interact with the X11 root window,
-you can use [`method@GdkX11.Display.get_xrootwindow`] to get its XID.
+you can use [method@GdkX11.Display.get_xrootwindow] to get its XID.
 
 ### Stop using `GdkVisual`
 
@@ -333,9 +333,9 @@ had replacements in GTK 3 and were deprecated in favor of `GdkSeat`.
 
 In GTK 4, the two roles of a standalone toplevel window and of a popup that
 is placed relative to a parent window have been separated out into two
-interfaces, [iface@Gdk.Toplevel] and [iface@Gdk.Popup]. Surfaces
-implementing these interfaces are created with [`ctor@Gdk.Surface.new_toplevel`]
-and [`ctor@Gdk.Surface.new_popup`], respectively, and they are presented on
+interfaces, [class@Gdk.Toplevel] and [class@Gdk.Popup]. Surfaces
+implementing these interfaces are created with [ctor@Gdk.Surface.new_toplevel]
+and [ctor@Gdk.Surface.new_popup], respectively, and they are presented on
 screen using [method@Gdk.Toplevel.present] and [method@Gdk.Popup.present].
 The `present()` functions take parameters in the form of an auxiliary layout
 struct, [struct@Gdk.PopupLayout] or [struct@Gdk.ToplevelLayout].
@@ -362,9 +362,9 @@ windows, you you will have to use Xlib apis.
 
 A number of minor API cleanups have happened in `GdkSurface`
 as well. For example, `gdk_surface_input_shape_combine_region()`
-has been renamed to [`method@Gdk.Surface.set_input_region`], and
+has been renamed to [method@Gdk.Surface.set_input_region], and
 `gdk_surface_begin_resize_drag()` has been renamed to
-[`method@Gdk.Toplevel.begin_resize`].
+[method@Gdk.Toplevel.begin_resize].
 
 ### The "iconified" window state has been renamed to "minimized"
 
@@ -388,7 +388,7 @@ have accessors that you will have to use.
 
 Event compression is always enabled in GTK 4, for both motion and
 scroll events. If you need to see the uncoalesced motion or scroll
-history, use [`method@Gdk.Event.get_history`] on the latest event.
+history, use [method@Gdk.Event.get_history] on the latest event.
 
 ### Stop using grabs
 
@@ -1051,7 +1051,7 @@ Observing widget contents and widget size is now done by using the
 
 ### Monitor handling has changed
 
-Instead of a monitor number, [class@Gdk.Monitor] is now used throughout.
+Instead of a monitor number, [class@Gdk.Monitor] is now used throughout. 
 [method@Gdk.Display.get_monitors] returns the list of monitors that can be queried
 or observed for monitors to pass to APIs like [method@Gtk.Window.fullscreen_on_monitor].
 
@@ -1332,18 +1332,6 @@ pointer coordinates as inout arguments any more, but as normal in ones.
 
 See: [method@Gtk.TreeView.get_tooltip_context], [method@Gtk.IconView.get_tooltip_context]
 
-### Adapt to GtkPopover changes
-
-In GTK 3, a `GtkPopover` could be attached to any widget, using the `relative-to`
-property. This is no longer possible in GTK 4. The parent widget has to be aware
-of its popover children, and manage their size allocation. Therefore, only widgets
-with dedicated popover support can have them, such as [class@Gtk.MenuButton] or
-[class@Gtk.PopoverMenuBar].
-
-If you want to make a custom widget that has an attached popover, you need to call
-[method@Gtk.Popover.present] in your [vfunc@Gtk.Widget.size_allocate] vfunc, in order
-to update the positioning of the popover.
-
 ### Stop using GtkFileChooserButton
 
 The `GtkFileChooserButton` widget was removed, due to its shortcomings in

docs/reference/gtk/question_index.md

@@ -14,7 +14,7 @@ the question you have, this list is a good place to start.
     (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
     reference manual also contains a introductory
     [Getting Started](#gtk-getting-started) part.
-
+    
     More documentation ranging from whitepapers to online books can be found at
     the [GNOME developer's site](https://developer.gnome.org). After studying these
     materials you should be well prepared to come back to this reference manual for details.
@@ -93,11 +93,11 @@ the question you have, this list is a good place to start.
 
     `gi18n.h` provides the following shorthand macros for convenience.
     Conventionally, people define macros as follows for convenience:
-
+    
         #define  _(x)     gettext (x)
         #define N_(x)     x
         #define C_(ctx,x) pgettext (ctx, x)
-
+        
     You use `N_()` (N stands for no-op) to mark a string for translation in
     a location where a function call to gettext() is not allowed, such as
     in an array initializer. You eventually have to call gettext() on the
@@ -205,14 +205,14 @@ the question you have, this list is a good place to start.
     Here is an example showing the three approaches using the copyright
     sign © which has Unicode and ISO-8859-1 codepoint 169 and is represented
     in UTF-8 by the two bytes 194, 169, or `"\302\251"` as a string literal:
-
+    
         g_print ("direct UTF-8: ©");
         g_print ("escaped UTF-8: \302\251");
         text = g_convert ("runtime conversion: ©", -1,
                           "ISO-8859-1", "UTF-8", NULL, NULL, NULL);
         g_print (text);
         g_free (text);
-
+        
     If you are using gettext() to localize your application, you need
     to call bind_textdomain_codeset() to ensure that translated strings
     are returned in UTF-8 encoding.
@@ -432,10 +432,10 @@ the question you have, this list is a good place to start.
 
 26. How do I associate some data with a row in the tree?
 
-    Remember that the [iface@Gtk.TreeModel] columns don't necessarily have to be
+    Remember that the [class@Gtk.TreeModel] columns don't necessarily have to be
     displayed. So you can put non-user-visible data in your model just
     like any other data, and retrieve it with [method@Gtk.TreeModel.get].
-    See the [tree widget overview](#TreeWidget).
+    See the [tree widget overview](#TreeWidget).        
 
 27. How do I put an image and some text in the same column?
 
@@ -447,7 +447,7 @@ the question you have, this list is a good place to start.
 28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
     [method@Gtk.ListStore.set] and [method@Gtk.TreeStore.set], but can't read it back?
 
-    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [iface@Gtk.TreeModel]
+    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [class@Gtk.TreeModel]
     interface. As a consequence, you can use any function this interface
     implements. The easiest way to read a set of data back is to use
     [method@Gtk.TreeModel.get].

docs/reference/gtk/urlmap.js

@@ -3,14 +3,11 @@
 
 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'GLib', 'https://docs.gtk.org/glib/' ],
-    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
-    [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
-    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
-    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
-    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
-    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
-    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
+    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
+    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
+    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
+    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
+    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
+    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
 ]

docs/reference/gtk/windows.md

@@ -14,19 +14,14 @@ instructions, binary downloads, etc, can be found
 The Win32 GDK backend can be influenced with some additional environment
 variables.
 
-### GDK_WIN32_TABLET_INPUT_API
+### GDK_IGNORE_WINTAB
 
-If this variable is set, it determines the API that GTK uses for tablet support.
-The possible values are:
+If this variable is set, GTK doesn't use the Wintab API for tablet support.
 
-`none`
-: Disables tablet support
+### GDK_USE_WINTAB
 
-`wintab`
-: Use the Wintab API
-
-`winpointer`
-: Use the Windows Pointer Input Stack API. This is the default.
+If this variable is set, GTK uses the Wintab API for tablet support.
+This is the default.
 
 ## Windows-specific handling of cursors
 

docs/reference/meson.build

@@ -5,10 +5,6 @@ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
 
 docs_dir = gtk_datadir / 'doc'
 
-if get_option('gtk_doc') and not build_gir
-  error('API reference requires introspection.')
-endif
-
 subdir('gdk')
 subdir('gsk')
 subdir('gtk')

gdk/broadway/gdkdisplay-broadway.c

@@ -33,7 +33,6 @@
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include <gdk/gdktextureprivate.h>
-#include "gdk-private.h"
 
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -214,7 +213,7 @@ _gdk_broadway_display_open (const char *display_name)
   broadway_display->server = _gdk_broadway_server_new (display, display_name, &error);
   if (broadway_display->server == NULL)
     {
-      GDK_NOTE (MISC, g_message ("Unable to init Broadway server: %s\n", error->message));
+      g_printerr ("Unable to init Broadway server: %s\n", error->message);
       g_error_free (error);
       return NULL;
     }
@@ -464,7 +463,7 @@ gdk_broadway_display_flush_in_idle (GdkDisplay *display)
   if (broadway_display->idle_flush_id == 0)
     {
       broadway_display->idle_flush_id = g_idle_add (flush_idle, g_object_ref (display));
-      gdk_source_set_static_name_by_id (broadway_display->idle_flush_id, "[gtk] flush_idle");
+      g_source_set_name_by_id (broadway_display->idle_flush_id, "[gtk] flush_idle");
     }
 }
 

gdk/gdk-private.h

@@ -57,11 +57,4 @@ guint gdk_parse_debug_var (const char        *variable,
 # define g_memdup2(mem,size)    g_memdup((mem),(size))
 #endif
 
-void gdk_source_set_static_name_by_id (guint       tag,
-                                       const char *name);
-
-#if !GLIB_CHECK_VERSION(2, 69, 1)
-#define g_source_set_static_name(source, name) g_source_set_name ((source), (name))
-#endif
-
 #endif /* __GDK__PRIVATE_H__ */

gdk/gdk.c

@@ -132,7 +132,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
   { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
   { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer" },
-  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
+  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings" },
 };
 
 
@@ -414,17 +414,3 @@ gdk_find_base_dir (const char *text,
   return dir;
 }
 
-void
-gdk_source_set_static_name_by_id (guint           tag,
-                                  const char     *name)
-{
-  GSource *source;
-
-  g_return_if_fail (tag > 0);
-
-  source = g_main_context_find_source_by_id (NULL, tag);
-  if (source == NULL)
-    return;
-
-  g_source_set_static_name (source, name);
-}

gdk/gdkclipboard.c

@@ -635,7 +635,7 @@ gdk_clipboard_read_internal (GdkClipboard        *clipboard,
 /**
  * gdk_clipboard_read_async:
  * @clipboard: a `GdkClipboard`
- * @mime_types: (array zero-terminated=1): a %NULL-terminated array of mime types to choose from
+ * @mime_types: a %NULL-terminated array of mime types to choose from
  * @io_priority: the I/O priority of the request
  * @cancellable: (nullable): optional `GCancellable` object
  * @callback: (scope async): callback to call when the request is satisfied
@@ -1253,15 +1253,9 @@ gdk_clipboard_set_content (GdkClipboard       *clipboard,
  * @...: value contents conforming to @type
  *
  * Sets the clipboard to contain the value collected from the given varargs.
- * 
- * Values should be passed the same way they are passed to other value
- * collecting APIs, such as [`method@GObject.Object.set`] or
- * [`id@g_signal_emit`].
  *
  * ```c
- * gdk_clipboard_set (clipboard, GTK_TYPE_STRING, "Hello World");
- * 
- * gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, some_texture);
+ * gdk_clipboard_set (clipboard, GTK_TYPE_TEXT_BUFFER, buffer);
  * ```
  */
 void

gdk/gdkcontentdeserializer.c

@@ -928,13 +928,11 @@ init (void)
   if (!g_get_charset (&charset))
     {
       char *mime = g_strdup_printf ("text/plain;charset=%s", charset);
-
       gdk_content_register_deserializer (mime,
                                          G_TYPE_STRING,
                                          string_deserializer,
                                          (gpointer) charset,
                                          g_free);
-      g_free (mime);
     }
   gdk_content_register_deserializer ("text/plain",
                                      G_TYPE_STRING,

gdk/gdkcontentformats.c

@@ -179,76 +179,6 @@ gdk_content_formats_new_for_gtype (GType type)
   return gdk_content_formats_new_take (data, 1, NULL, 0);
 }
 
-/**
- * gdk_content_formats_parse:
- * @string: the string to parse
- *
- * Parses the given @string into `GdkContentFormats` and
- * returns the formats. 
- *
- * Strings printed via [method@Gdk.ContentFormats.to_string]
- * can be read in again successfully using this function.
- *
- * If @string does not describe valid content formats, %NULL
- * is returned.
- *
- * Returns: (nullable): the content formats if @string is valid
- *
- * Since: 4.4
- */
-GdkContentFormats *
-gdk_content_formats_parse (const char *string)
-{
-  GdkContentFormatsBuilder *builder;
-  char **split;
-  gsize i;
-
-  g_return_val_if_fail (string != NULL, NULL);
-
-  split = g_strsplit_set (string, "\t\n\f\r ", -1); /* same as g_ascii_isspace() */
-  builder = gdk_content_formats_builder_new ();
-
-  /* first the GTypes */
-  for (i = 0; split[i] != NULL; i++)
-    {
-      GType type;
-
-      if (split[i][0] == 0)
-        continue;
-
-      type = g_type_from_name (split[i]);
-      if (type != 0)
-        gdk_content_formats_builder_add_gtype (builder, type);
-      else
-        break;
-    }
-
-  /* then the mime types */
-  for (; split[i] != NULL; i++)
-    {
-      const char *mime_type;
-
-      if (split[i][0] == 0)
-        continue;
-
-      mime_type = gdk_intern_mime_type (split[i]);
-      if (mime_type)
-        gdk_content_formats_builder_add_mime_type (builder, mime_type);
-      else
-        break;
-    }
-
-  if (split[i] != NULL)
-    {
-      g_strfreev (split);
-      gdk_content_formats_builder_unref (builder);
-      return NULL;
-    }
-
-  g_strfreev (split);
-  return gdk_content_formats_builder_free_to_formats (builder);
-}
-
 /**
  * gdk_content_formats_ref:
  * @formats:  a `GdkContentFormats`
@@ -297,8 +227,10 @@ gdk_content_formats_unref (GdkContentFormats *formats)
  *
  * Prints the given @formats into a string for human consumption.
  *
- * The result of this function can later be parsed with
- * [func@Gdk.ContentFormats.parse].
+ * This is meant for debugging and logging.
+ *
+ * The form of the representation may change at any time and is
+ * not guaranteed to stay identical.
  */
 void
 gdk_content_formats_print (GdkContentFormats *formats,
@@ -309,18 +241,20 @@ gdk_content_formats_print (GdkContentFormats *formats,
   g_return_if_fail (formats != NULL);
   g_return_if_fail (string != NULL);
 
+  g_string_append (string, "{ ");
   for (i = 0; i < formats->n_gtypes; i++)
     {
       if (i > 0)
-        g_string_append (string, " ");
+        g_string_append (string, ", ");
       g_string_append (string, g_type_name (formats->gtypes[i]));
     }
   for (i = 0; i < formats->n_mime_types; i++)
     {
       if (i > 0 || formats->n_gtypes > 0)
-        g_string_append (string, " ");
+        g_string_append (string, ", ");
       g_string_append (string, formats->mime_types[i]);
     }
+  g_string_append (string, " }");
 }
 
 /**
@@ -329,8 +263,6 @@ gdk_content_formats_print (GdkContentFormats *formats,
  *
  * Prints the given @formats into a human-readable string.
  *
- * The resulting string can be parsed with [func@Gdk.ContentFormats.parse].
- *
  * This is a small wrapper around [method@Gdk.ContentFormats.print]
  * to help when debugging.
  *

gdk/gdkcontentformats.h

@@ -40,8 +40,6 @@ GdkContentFormats *     gdk_content_formats_new                 (const char
                                                                  guint                           n_mime_types);
 GDK_AVAILABLE_IN_ALL
 GdkContentFormats *     gdk_content_formats_new_for_gtype       (GType                           type);
-GDK_AVAILABLE_IN_4_4
-GdkContentFormats *     gdk_content_formats_parse               (const char                     *string);
 GDK_AVAILABLE_IN_ALL
 GdkContentFormats *     gdk_content_formats_ref                 (GdkContentFormats              *formats);
 GDK_AVAILABLE_IN_ALL

gdk/gdkcontentproviderimpl.c

@@ -80,7 +80,7 @@ gdk_content_provider_value_get_value (GdkContentProvider  *provider,
 {
   GdkContentProviderValue *content = GDK_CONTENT_PROVIDER_VALUE (provider);
 
-  if (G_VALUE_HOLDS (&content->value, G_VALUE_TYPE (value)))
+  if (G_VALUE_HOLDS (value, G_VALUE_TYPE (&content->value)))
     {
       g_value_copy (&content->value, value);
       return TRUE;

gdk/gdkdisplay.c

@@ -1233,8 +1233,6 @@ gdk_display_init_gl (GdkDisplay *self)
    */
   priv->gl_context = context;
 
-  gdk_gl_backend_use (GDK_GL_CONTEXT_GET_CLASS (context)->backend_type);
-
   gdk_profiler_end_mark (before, "initialize OpenGL", NULL);
 }
 

gdk/gdkeventsprivate.h

@@ -105,7 +105,7 @@ struct _GdkDeleteEvent
  * GdkMotionEvent:
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) set during the motion
- *   event. See [flags@Gdk.ModifierType]
+ *   event. See [enum@Gdk.ModifierType]
  * @x: the x coordinate of the pointer relative to the surface.
  * @y: the y coordinate of the pointer relative to the surface.
  * @axes: @x, @y translated to the axes of @device, or %NULL if @device is
@@ -132,7 +132,7 @@ struct _GdkMotionEvent
  * GdkButtonEvent:
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
  * @button: the button which was pressed or released, numbered from 1 to 5.
  *   Normally button 1 is the left mouse button, 2 is the middle button,
  *   and 3 is the right button. On 2-button mice, the middle button can
@@ -162,7 +162,7 @@ struct _GdkButtonEvent
  * GdkTouchEvent:
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
  * @x: the x coordinate of the pointer relative to the surface
  * @y: the y coordinate of the pointer relative to the surface
  * @axes: @x, @y translated to the axes of the event's device, or %NULL
@@ -200,7 +200,7 @@ struct _GdkTouchEvent
  * @y: the y coordinate of the pointer relative to the surface.
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
  * @direction: the direction to scroll to (one of %GDK_SCROLL_UP,
  *   %GDK_SCROLL_DOWN, %GDK_SCROLL_LEFT, %GDK_SCROLL_RIGHT or
  *   %GDK_SCROLL_SMOOTH).
@@ -256,7 +256,7 @@ typedef struct {
  * GdkKeyEvent:
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
  * @keycode: the raw code of the key that was pressed or released.
  * @translated: the result of translating @keycode. First with the full
  *   @state, then while ignoring Caps Lock.
@@ -277,7 +277,7 @@ struct _GdkKeyEvent
  * GdkCrossingEvent:
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
  * @mode: the crossing mode (%GDK_CROSSING_NORMAL, %GDK_CROSSING_GRAB,
  *  %GDK_CROSSING_UNGRAB, %GDK_CROSSING_GTK_GRAB, %GDK_CROSSING_GTK_UNGRAB or
  *  %GDK_CROSSING_STATE_CHANGED).  %GDK_CROSSING_GTK_GRAB, %GDK_CROSSING_GTK_UNGRAB,
@@ -383,7 +383,7 @@ struct _GdkDNDEvent
  * GdkTouchpadEvent:
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
  * @phase: (type GdkTouchpadGesturePhase): the current phase of the gesture
  * @n_fingers: The number of fingers triggering the pinch
  * @time: the time of the event in milliseconds

gdk/gdkframeclockidle.c

@@ -29,7 +29,6 @@
 #include "gdkinternals.h"
 #include "gdkframeclockprivate.h"
 #include "gdk.h"
-#include "gdk-private.h"
 #include "gdkprofilerprivate.h"
 
 #ifdef G_OS_WIN32
@@ -308,15 +307,12 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle,
 
       if (priv->flush_idle_id == 0 && RUN_FLUSH_IDLE (priv))
         {
-          GSource *source;
-
           priv->flush_idle_id = g_timeout_add_full (GDK_PRIORITY_EVENTS + 1,
                                                     min_interval,
                                                     gdk_frame_clock_flush_idle,
                                                     g_object_ref (clock_idle),
                                                     (GDestroyNotify) g_object_unref);
-          source = g_main_context_find_source_by_id (NULL, priv->flush_idle_id);
-          g_source_set_static_name (source, "[gtk] gdk_frame_clock_flush_idle");
+          g_source_set_name_by_id (priv->flush_idle_id, "[gtk] gdk_frame_clock_flush_idle");
         }
 
       if (!priv->in_paint_idle &&
@@ -328,7 +324,7 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle,
                                                     gdk_frame_clock_paint_idle,
                                                     g_object_ref (clock_idle),
                                                     (GDestroyNotify) g_object_unref);
-          gdk_source_set_static_name_by_id (priv->paint_idle_id, "[gtk] gdk_frame_clock_paint_idle");
+          g_source_set_name_by_id (priv->paint_idle_id, "[gtk] gdk_frame_clock_paint_idle");
         }
     }
 }

gdk/gdkglcontext.c

@@ -75,13 +75,11 @@
 #include "config.h"
 
 #include "gdkglcontextprivate.h"
-
-#include "gdkdebug.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
-#include "gdkintl.h"
 #include "gdkmemorytextureprivate.h"
+#include "gdkinternals.h"
 
+#include "gdkintl.h"
 #include "gdk-private.h"
 
 #ifdef GDK_WINDOWING_WIN32
@@ -858,8 +856,6 @@ gdk_gl_context_set_is_legacy (GdkGLContext *context,
  * is not, this function will return %FALSE.
  *
  * Returns: %TRUE if the two GL contexts are compatible.
- *
- * Since: 4.4
  */
 gboolean
 gdk_gl_context_is_shared (GdkGLContext *self,
@@ -1337,68 +1333,3 @@ gdk_gl_context_use_es_bgra (GdkGLContext *context)
 
   return FALSE;
 }
-
-static GdkGLBackend the_gl_backend_type = GDK_GL_NONE;
-
-static const char *gl_backend_names[] = {
-  [GDK_GL_NONE] = "No GL (You should never read this)",
-  [GDK_GL_EGL] = "EGL",
-  [GDK_GL_GLX] = "X11 GLX",
-  [GDK_GL_WGL] = "Windows WGL",
-  [GDK_GL_CGL] = "Apple CGL"
-};
-
-/*<private>
- * gdk_gl_backend_can_be_used:
- * @backend_type: Type of backend to check
- * @error: Return location for an error
- *
- * Checks if this backend type can be used. When multiple displays
- * are opened that use different GL backends, conflicts can arise,
- * so this function checks that all displays use compatible GL
- * backends.
- *
- * Returns: %TRUE if the backend can still be used
- */
-gboolean
-gdk_gl_backend_can_be_used (GdkGLBackend   backend_type,
-                            GError       **error)
-{
-  if (the_gl_backend_type == GDK_GL_NONE || 
-      the_gl_backend_type == backend_type)
-    return TRUE;
-
-  g_set_error (error, GDK_GL_ERROR, GDK_GL_ERROR_NOT_AVAILABLE,
-               /* translators: This is about OpenGL backend names, like
-                * "Trying to use X11 GLX, but EGL is already in use" */
-               _("Trying to use %s, but %s is already in use"),
-               gl_backend_names[backend_type],
-               gl_backend_names[the_gl_backend_type]);
-  return FALSE;
-}
-
-/*<private>
- * gdk_gl_backend_use:
- * @backend_type: Type of backend
- *
- * Ensures that the backend in use is the given one. If another backend
- * is already in use, this function will abort the program. It should
- * have previously checked via gdk_gl_backend_can_be_used().
- **/
-void
-gdk_gl_backend_use (GdkGLBackend backend_type)
-{
-  /* Check that the context class is properly initializing its backend type */
-  g_assert (backend_type != GDK_GL_NONE);
-
-  if (the_gl_backend_type == GDK_GL_NONE)
-    {
-      the_gl_backend_type = backend_type;
-      /* This is important!!!11eleven
-       * (But really: How do I print a message in 2 categories?) */
-      GDK_NOTE (OPENGL, g_print ("Using OpenGL backend %s\n", gl_backend_names[the_gl_backend_type]));
-      GDK_NOTE (MISC, g_message ("Using Opengl backend %s", gl_backend_names[the_gl_backend_type]));
-    }
-
-  g_assert (the_gl_backend_type == backend_type);
-}

gdk/gdkglcontextprivate.h

@@ -34,14 +34,6 @@ G_BEGIN_DECLS
 #define GDK_EGL_MIN_VERSION_MAJOR (1)
 #define GDK_EGL_MIN_VERSION_MINOR (4)
 
-typedef enum {
-  GDK_GL_NONE = 0,
-  GDK_GL_EGL,
-  GDK_GL_GLX,
-  GDK_GL_WGL,
-  GDK_GL_CGL
-} GdkGLBackend;
-
 #define GDK_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
 #define GDK_IS_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GL_CONTEXT))
 #define GDK_GL_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
@@ -60,8 +52,6 @@ struct _GdkGLContextClass
 {
   GdkDrawContextClass parent_class;
 
-  GdkGLBackend        backend_type;
-
   gboolean              (* realize)                             (GdkGLContext          *context,
                                                                  GError               **error);
 
@@ -96,10 +86,6 @@ typedef struct {
   guint use_es : 1;
 } GdkGLContextPaintData;
 
-gboolean                gdk_gl_backend_can_be_used              (GdkGLBackend     backend_type,
-                                                                 GError         **error);
-void                    gdk_gl_backend_use                      (GdkGLBackend     backend_type);
-
 GdkGLContext *          gdk_gl_context_new_for_surface          (GdkSurface      *surface);
 
 void                    gdk_gl_context_set_is_legacy            (GdkGLContext    *context,

gdk/gdkpaintable.h

@@ -70,17 +70,17 @@ typedef enum {
  *   snapshot at or 0 if none. This is purely a hint. The object must still
  *   be able to render at any size.
  * @get_intrinsic_aspect_ratio: The preferred aspect ratio for this object
- *   or 0 if none. If both [vfunc@Gdk.Paintable.get_intrinsic_width]
- *   and [vfunc@Gdk.Paintable.get_intrinsic_height] return non-zero
+ *   or 0 if none. If both [vfunc@Gdk.PaintableInterface.get_intrinsic_width]
+ *   and [vfunc@Gdk.PaintableInterface.get_intrinsic_height] return non-zero
  *   values, this function should return the aspect ratio computed from those.
  *
  * The list of functions that can be implemented for the `GdkPaintable`
  * interface.
  *
- * Note that apart from the [vfunc@Gdk.Paintable.snapshot] function,
+ * Note that apart from the [vfunc@Gdk.PaintableInterface.snapshot] function,
  * no virtual function of this interface is mandatory to implement, though it
- * is a good idea to implement [vfunc@Gdk.Paintable.get_current_image]
- * for non-static paintables and [vfunc@Gdk.Paintable.get_flags] if the
+ * is a good idea to implement [vfunc@Gdk.PaintableInterface.get_current_image]
+ * for non-static paintables and [vfunc@Gdk.PaintableInterface.get_flags] if the
  * image is not dynamic as the default implementation returns no flags and
  * that will make the implementation likely quite slow.
  */

gdk/gdksurface.c

@@ -59,8 +59,8 @@
  * It’s a low-level object, used to implement high-level objects
  * such as [class@Gtk.Window] or [class@Gtk.Dialog] in GTK.
  *
- * The surfaces you see in practice are either [iface@Gdk.Toplevel] or
- * [iface@Gdk.Popup], and those interfaces provide much of the required
+ * The surfaces you see in practice are either [class@Gdk.Toplevel] or
+ * [class@Gdk.Popup], and those interfaces provide much of the required
  * API to interact with these surfaces. Other, more specialized surface
  * types exist, but you will rarely interact with them directly.
  */
@@ -2028,7 +2028,7 @@ gdk_surface_get_root_coords (GdkSurface *surface,
       *root_y = 0;
       return;
     }
-
+  
   GDK_SURFACE_GET_CLASS (surface)->get_root_coords (surface, x, y, root_x, root_y);
 }
 

gdk/gdktoplevel.c

@@ -78,13 +78,6 @@ gdk_toplevel_default_show_window_menu (GdkToplevel *toplevel,
   return FALSE;
 }
 
-static gboolean
-gdk_toplevel_default_titlebar_gesture (GdkToplevel        *toplevel,
-                                       GdkTitlebarGesture  gesture)
-{
-  return FALSE;
-}
-
 static gboolean
 gdk_toplevel_default_supports_edge_constraints (GdkToplevel *toplevel)
 {
@@ -121,7 +114,6 @@ gdk_toplevel_default_init (GdkToplevelInterface *iface)
   iface->supports_edge_constraints = gdk_toplevel_default_supports_edge_constraints;
   iface->inhibit_system_shortcuts = gdk_toplevel_default_inhibit_system_shortcuts;
   iface->restore_system_shortcuts = gdk_toplevel_default_restore_system_shortcuts;
-  iface->titlebar_gesture = gdk_toplevel_default_titlebar_gesture;
 
   /**
    * GdkToplevel:state: (attributes org.gtk.Property.get=gdk_toplevel_get_state)
@@ -724,13 +716,3 @@ gdk_toplevel_begin_move (GdkToplevel *toplevel,
                                                  x, y,
                                                  timestamp);
 }
-
-gboolean
-gdk_toplevel_titlebar_gesture (GdkToplevel        *toplevel,
-                               GdkTitlebarGesture  gesture)
-{
-  g_return_val_if_fail (GDK_IS_TOPLEVEL (toplevel), FALSE);
-
-  return GDK_TOPLEVEL_GET_IFACE (toplevel)->titlebar_gesture (toplevel,
-                                                              gesture);
-}

gdk/gdktoplevel.h

@@ -115,13 +115,6 @@ typedef enum
   GDK_TOPLEVEL_STATE_LEFT_RESIZABLE   = 1 << 15
 } GdkToplevelState;
 
-typedef enum
-{
-  GDK_TITLEBAR_GESTURE_DOUBLE_CLICK   = 1,
-  GDK_TITLEBAR_GESTURE_RIGHT_CLICK    = 2,
-  GDK_TITLEBAR_GESTURE_MIDDLE_CLICK   = 3
-} GdkTitlebarGesture;
-
 
 #define GDK_TYPE_TOPLEVEL (gdk_toplevel_get_type ())
 
@@ -203,10 +196,6 @@ void          gdk_toplevel_begin_move                (GdkToplevel    *toplevel,
                                                       double          y,
                                                       guint32         timestamp);
 
-GDK_AVAILABLE_IN_4_4
-gboolean      gdk_toplevel_titlebar_gesture          (GdkToplevel        *toplevel,
-                                                      GdkTitlebarGesture  gesture);
-
 G_END_DECLS
 
 #endif /* __GDK_TOPLEVEL_H__ */

gdk/gdktoplevelprivate.h

@@ -38,8 +38,6 @@ struct _GdkToplevelInterface
                                          double             x,
                                          double             y,
                                          guint32            timestamp);
-  gboolean      (* titlebar_gesture)    (GdkToplevel       *toplevel,
-                                         GdkTitlebarGesture gesture);
 };
 
 typedef enum

gdk/gdkvulkancontext.c

@@ -117,104 +117,104 @@ gdk_vulkan_strerror (VkResult result)
   switch (result)
   {
     case VK_SUCCESS:
-      return "Command successfully completed. (VK_SUCCESS)";
+      return "Command successfully completed.";
     case VK_NOT_READY:
-      return "A fence or query has not yet completed. (VK_NOT_READY)";
+      return "A fence or query has not yet completed.";
     case VK_TIMEOUT:
-      return "A wait operation has not completed in the specified time. (VK_TIMEOUT)";
+      return "A wait operation has not completed in the specified time.";
     case VK_EVENT_SET:
-      return "An event is signaled. (VK_EVENT_SET)";
+      return "An event is signaled.";
     case VK_EVENT_RESET:
-      return "An event is unsignaled. (VK_EVENT_RESET)";
+      return "An event is unsignaled.";
     case VK_INCOMPLETE:
-      return "A return array was too small for the result. (VK_INCOMPLETE)";
+      return "A return array was too small for the result.";
     case VK_SUBOPTIMAL_KHR:
-      return "A swapchain no longer matches the surface properties exactly, but can still be used to present to the surface successfully. (VK_SUBOPTIMAL_KHR)";
+      return "A swapchain no longer matches the surface properties exactly, but can still be used to present to the surface successfully.";
     case VK_ERROR_OUT_OF_HOST_MEMORY:
-      return "A host memory allocation has failed. (VK_ERROR_OUT_OF_HOST_MEMORY)";
+      return "A host memory allocation has failed.";
     case VK_ERROR_OUT_OF_DEVICE_MEMORY:
-      return "A device memory allocation has failed. (VK_ERROR_OUT_OF_DEVICE_MEMORY)";
+      return "A device memory allocation has failed.";
     case VK_ERROR_INITIALIZATION_FAILED:
-      return "Initialization of an object could not be completed for implementation-specific reasons. (VK_ERROR_INITIALIZATION_FAILED)";
+      return "Initialization of an object could not be completed for implementation-specific reasons.";
     case VK_ERROR_DEVICE_LOST:
-      return "The logical or physical device has been lost. (VK_ERROR_DEVICE_LOST)";
+      return "The logical or physical device has been lost.";
     case VK_ERROR_MEMORY_MAP_FAILED:
-      return "Mapping of a memory object has failed. (VK_ERROR_MEMORY_MAP_FAILED)";
+      return "Mapping of a memory object has failed.";
     case VK_ERROR_LAYER_NOT_PRESENT:
-      return "A requested layer is not present or could not be loaded. (VK_ERROR_LAYER_NOT_PRESENT)";
+      return "A requested layer is not present or could not be loaded.";
     case VK_ERROR_EXTENSION_NOT_PRESENT:
-      return "A requested extension is not supported. (VK_ERROR_EXTENSION_NOT_PRESENT)";
+      return "A requested extension is not supported.";
     case VK_ERROR_FEATURE_NOT_PRESENT:
-      return "A requested feature is not supported. (VK_ERROR_FEATURE_NOT_PRESENT)";
+      return "A requested feature is not supported.";
     case VK_ERROR_INCOMPATIBLE_DRIVER:
-      return "The requested version of Vulkan is not supported by the driver or is otherwise incompatible for implementation-specific reasons. (VK_ERROR_INCOMPATIBLE_DRIVER)";
+      return "The requested version of Vulkan is not supported by the driver or is otherwise incompatible for implementation-specific reasons.";
     case VK_ERROR_TOO_MANY_OBJECTS:
-      return "Too many objects of the type have already been created. (VK_ERROR_TOO_MANY_OBJECTS)";
+      return "Too many objects of the type have already been created.";
     case VK_ERROR_FORMAT_NOT_SUPPORTED:
-      return "A requested format is not supported on this device. (VK_ERROR_FORMAT_NOT_SUPPORTED)";
+      return "A requested format is not supported on this device.";
 #if VK_HEADER_VERSION >= 24
     case VK_ERROR_FRAGMENTED_POOL:
-      return "A requested pool allocation has failed due to fragmentation of the pool’s memory. (VK_ERROR_FRAGMENTED_POOL)";
+      return "A requested pool allocation has failed due to fragmentation of the pool’s memory.";
 #endif
     case VK_ERROR_SURFACE_LOST_KHR:
-      return "A surface is no longer available. (VK_ERROR_SURFACE_LOST_KHR)";
+      return "A surface is no longer available.";
     case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR:
-      return "The requested window is already in use by Vulkan or another API in a manner which prevents it from being used again. (VK_ERROR_NATIVE_WINDOW_IN_USE_KHR)";
+      return "The requested window is already in use by Vulkan or another API in a manner which prevents it from being used again.";
     case VK_ERROR_OUT_OF_DATE_KHR:
-      return "A surface has changed in such a way that it is no longer compatible with the swapchain. (VK_ERROR_OUT_OF_DATE_KHR)";
+      return "A surface has changed in such a way that it is no longer compatible with the swapchain.";
     case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR:
-      return "The display used by a swapchain does not use the same presentable image layout, or is incompatible in a way that prevents sharing an image. (VK_ERROR_INCOMPATIBLE_DISPLAY_KHR)";
+      return "The display used by a swapchain does not use the same presentable image layout, or is incompatible in a way that prevents sharing an image.";
     case VK_ERROR_VALIDATION_FAILED_EXT:
-      return "The application caused the validation layer to fail. (VK_ERROR_VALIDATION_FAILED_EXT)";
+      return "The application caused the validation layer to fail.";
     case VK_ERROR_INVALID_SHADER_NV:
-      return "One or more shaders failed to compile or link. (VK_ERROR_INVALID_SHADER_NV)";
+      return "One or more shaders failed to compile or link.";
 #if VK_HEADER_VERSION >= 39
     case VK_ERROR_OUT_OF_POOL_MEMORY_KHR:
-      return "A pool memory allocation has failed. (VK_ERROR_OUT_OF_POOL_MEMORY_KHR)";
+      return "A pool memory allocation has failed.";
 #endif
 #if VK_HEADER_VERSION >= 54
     case VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR:
-      return "An external handle is not a valid handle of the specified type. (VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR)";
+      return "An external handle is not a valid handle of the specified type.";
 #endif
 #if VK_HEADER_VERSION >= 64
     case VK_ERROR_NOT_PERMITTED_EXT:
-      return "The caller does not have sufficient privileges. (VK_ERROR_NOT_PERMITTED_EXT)";
+      return "The caller does not have sufficient privileges.";
 #endif
 #if VK_HEADER_VERSION >= 72
     case VK_ERROR_FRAGMENTATION_EXT:
-      return "A descriptor pool creation has failed due to fragmentation. (VK_ERROR_FRAGMENTATION_EXT)";
+      return "A descriptor pool creation has failed due to fragmentation";
 #endif
 #if VK_HEADER_VERSION >= 89
     case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
-      return "Invalid DRM format modifier plane layout (VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT)";
+      return "Invalid DRM format modifier plane layout";
 #endif
 #if VK_HEADER_VERSION >= 97
     case VK_ERROR_INVALID_DEVICE_ADDRESS_EXT:
-      return "Invalid device address (VK_ERROR_INVALID_DEVICE_ADDRESS_EXT)";
+      return "Invalid device address";
 #endif
 #if VK_HEADER_VERSION >= 105
     case VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT:
-      return "An operation on a swapchain created with VK_FULL_SCREEN_EXCLUSIVE_APPLICATION_CONTROLLED_EXT failed as it did not have exclusive full-screen access. (VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT)";
+      return "An operation on a swapchain created with VK_FULL_SCREEN_EXCLUSIVE_APPLICATION_CONTROLLED_EXT failed as it did not have exclusive full-screen access.";
 #endif
 #if VK_HEADER_VERSION >= 131
     case VK_ERROR_UNKNOWN:
-      return "An unknown error has occurred; either the application has provided invalid input, or an implementation failure has occurred. (VK_ERROR_UNKNOWN)";
+      return "An unknown error has occurred; either the application has provided invalid input, or an implementation failure has occurred.";
 #endif
 #if VK_HEADER_VERSION >= 135
 #if VK_HEADER_VERSION < 162
     case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
-      return "This error was removed by the Vulkan gods. (VK_ERROR_INCOMPATIBLE_VERSION_KHR)";
+      return "This error was removed by the Vulkan gods.";
 #endif
     case VK_THREAD_IDLE_KHR:
-      return "A deferred operation is not complete but there is currently no work for this thread to do at the time of this call. (VK_THREAD_IDLE_KHR)";
+      return "A deferred operation is not complete but there is currently no work for this thread to do at the time of this call.";
     case VK_THREAD_DONE_KHR:
-      return "A deferred operation is not complete but there is no work remaining to assign to additional threads. (VK_THREAD_DONE_KHR)";
+      return "A deferred operation is not complete but there is no work remaining to assign to additional threads.";
     case VK_OPERATION_DEFERRED_KHR:
-      return "A deferred operation was requested and at least some of the work was deferred. (VK_OPERATION_DEFERRED_KHR)";
+      return "A deferred operation was requested and at least some of the work was deferred.";
     case VK_OPERATION_NOT_DEFERRED_KHR:
-      return "A deferred operation was requested and no operations were deferred. (VK_OPERATION_NOT_DEFERRED_KHR)";
+      return "A deferred operation was requested and no operations were deferred.";
     case VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT:
-      return "A requested pipeline creation would have required compilation, but the application requested compilation to not be performed. (VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT)";
+      return "A requested pipeline creation would have required compilation, but the application requested compilation to not be performed.";
 #endif
 #if VK_HEADER_VERSION < 140
     case VK_RESULT_RANGE_SIZE:

gdk/macos/gdkdisplaylinksource.c

@@ -197,7 +197,7 @@ gdk_display_link_source_new (void)
                                   gdk_display_link_source_frame_cb,
                                   source);
 
-  g_source_set_static_name (source, "[gdk] quartz frame clock");
+  g_source_set_name (source, "[gdk] quartz frame clock");
 
   return source;
 }

gdk/macos/gdkmacosdisplay.c

@@ -641,9 +641,6 @@ static GdkGLContext *
 gdk_macos_display_init_gl (GdkDisplay  *display,
                            GError     **error)
 {
-  if (!gdk_gl_backend_can_be_used (GDK_GL_CGL, error))
-    return FALSE;
-
   return g_object_new (GDK_TYPE_MACOS_GL_CONTEXT,
                        "display", display,
                        NULL);

gdk/macos/gdkmacosdrag.c

@@ -21,7 +21,6 @@
 
 #include "gdkdeviceprivate.h"
 #include "gdkintl.h"
-#include "gdk-private.h"
 
 #include "gdkmacosdevice-private.h"
 #include "gdkmacoscursor-private.h"
@@ -162,7 +161,7 @@ gdk_macos_drag_drop_done (GdkDrag  *drag,
                            gdk_macos_zoomback_timeout,
                            zb,
                            (GDestroyNotify) gdk_macos_zoomback_destroy);
-  gdk_source_set_static_name_by_id (id, "[gtk] gdk_macos_zoomback_timeout");
+  g_source_set_name_by_id (id, "[gtk] gdk_macos_zoomback_timeout");
   g_object_unref (drag);
 }
 
@@ -243,11 +242,9 @@ gdk_macos_drag_drop_performed (GdkDrag *drag,
 
   g_assert (GDK_IS_MACOS_DRAG (self));
 
-  g_object_ref (self);
   drag_ungrab (self);
   g_signal_emit_by_name (drag, "dnd-finished");
   gdk_drag_drop_done (drag, TRUE);
-  g_object_unref (self);
 }
 
 static void

gdk/macos/gdkmacoseventsource.c

@@ -32,8 +32,6 @@
 #include "gdkmacoseventsource-private.h"
 #include "gdkmacosdisplay-private.h"
 
-#include "gdk-private.h"
-
 /*
  * This file implementations integration between the GLib main loop and
  * the native system of the Core Foundation run loop and Cocoa event
@@ -1065,7 +1063,7 @@ _gdk_macos_event_source_new (GdkMacosDisplay *display)
   event_poll_fd.fd = -1;
 
   source = g_source_new (&event_funcs, sizeof (GdkMacosEventSource));
-  g_source_set_static_name (source, "GDK Quartz event source");
+  g_source_set_name (source, "GDK Quartz event source");
   g_source_add_poll (source, &event_poll_fd);
   g_source_set_priority (source, GDK_PRIORITY_EVENTS);
   g_source_set_can_recurse (source, TRUE);

gdk/macos/gdkmacosglcontext.c

@@ -514,11 +514,7 @@ gdk_macos_gl_context_class_init (GdkMacosGLContextClass *klass)
   draw_context_class->surface_resized = gdk_macos_gl_context_surface_resized;
 
   gl_class->get_damage = gdk_macos_gl_context_get_damage;
-  gl_class->clear_current = gdk_macos_gl_context_clear_current;
-  gl_class->make_current = gdk_macos_gl_context_make_current;
   gl_class->realize = gdk_macos_gl_context_real_realize;
-
-  gl_class->backend_type = GDK_GL_CGL;
 }
 
 static void

gdk/macos/gdkmacossurface.c

@@ -807,7 +807,7 @@ _gdk_macos_surface_acquire_context (GdkMacosSurface *self,
       scale = CGSizeMake (1.0, 1.0);
       scale = CGContextConvertSizeToDeviceSpace (cg_context, scale);
 
-      CGContextScaleCTM (cg_context, 1.0 / fabs (scale.width), 1.0 / fabs (scale.height));
+      CGContextScaleCTM (cg_context, 1.0 / scale.width, 1.0 / scale.height);
     }
 
   return cg_context;

gdk/wayland/gdkdevice-wayland.c

@@ -460,7 +460,6 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
           pointer->cursor_timeout_id == 0)
         {
           guint id;
-          GSource *source;
 
           gdk_wayland_pointer_stop_cursor_animation (pointer);
 
@@ -468,8 +467,7 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
           id = g_timeout_add (next_image_delay,
                               (GSourceFunc) gdk_wayland_device_update_surface_cursor,
                               device);
-          source = g_main_context_find_source_by_id (NULL, id);
-          g_source_set_static_name (source, "[gtk] gdk_wayland_device_update_surface_cursor");
+          g_source_set_name_by_id (id, "[gtk] gdk_wayland_device_update_surface_cursor");
           pointer->cursor_timeout_id = id;
         }
       else
@@ -2220,7 +2218,7 @@ deliver_key_event (GdkWaylandSeat *seat,
   timeout = (seat->repeat_deadline - now) / 1000L;
 
   seat->repeat_timer = g_timeout_add (timeout, keyboard_repeat, seat);
-  gdk_source_set_static_name_by_id (seat->repeat_timer, "[gtk] keyboard_repeat");
+  g_source_set_name_by_id (seat->repeat_timer, "[gtk] keyboard_repeat");
 }
 
 static void
@@ -2634,23 +2632,6 @@ touch_handle_cancel (void            *data,
   GDK_SEAT_NOTE (seat, EVENTS, g_message ("touch cancel"));
 }
 
-static void
-touch_handle_shape (void            *data,
-                    struct wl_touch *touch,
-                    int32_t         id,
-                    wl_fixed_t      major,
-                    wl_fixed_t      minor)
-{
-}
-
-static void
-touch_handle_orientation (void            *data,
-                          struct wl_touch *touch,
-                          int32_t         id,
-                          wl_fixed_t      orientation)
-{
-}
-
 static void
 emit_gesture_swipe_event (GdkWaylandSeat          *seat,
                           GdkTouchpadGesturePhase  phase,
@@ -3038,9 +3019,7 @@ static const struct wl_touch_listener touch_listener = {
   touch_handle_up,
   touch_handle_motion,
   touch_handle_frame,
-  touch_handle_cancel,
-  touch_handle_shape,
-  touch_handle_orientation,
+  touch_handle_cancel
 };
 
 static const struct zwp_pointer_gesture_swipe_v1_listener gesture_swipe_listener = {

gdk/wayland/gdkdisplay-wayland.c

@@ -87,7 +87,7 @@
 
 #define MIN_SYSTEM_BELL_DELAY_MS 20
 
-#define GTK_SHELL1_VERSION       5
+#define GTK_SHELL1_VERSION       4
 #define OUTPUT_VERSION_WITH_DONE 2
 #define NO_XDG_OUTPUT_DONE_SINCE_VERSION 3
 #define XDG_ACTIVATION_VERSION   1
@@ -240,7 +240,7 @@ _gdk_wayland_display_add_seat (GdkWaylandDisplay *display_wayland,
 {
   struct wl_seat *seat;
 
-  display_wayland->seat_version = MIN (version, 7);
+  display_wayland->seat_version = MIN (version, 5);
   seat = wl_registry_bind (display_wayland->wl_registry,
                            id, &wl_seat_interface,
                            display_wayland->seat_version);
@@ -2117,7 +2117,7 @@ gdk_wayland_display_get_setting (GdkDisplay *display,
 {
   TranslationEntry *entry;
 
-  if (gdk_display_get_debug_flags (display) & GDK_DEBUG_DEFAULT_SETTINGS)
+  if (GDK_DISPLAY_DEBUG_CHECK (display, DEFAULT_SETTINGS))
       return FALSE;
 
   if (GDK_WAYLAND_DISPLAY (display)->settings != NULL &&

gdk/wayland/gdkdrag-wayland.c

@@ -290,10 +290,8 @@ data_source_dnd_finished (void                  *data,
 {
   GdkDrag *drag = data;
 
-  g_object_ref (drag);
   g_signal_emit_by_name (drag, "dnd-finished");
   gdk_drag_drop_done (drag, TRUE);
-  g_object_unref (drag);
 }
 
 static void

gdk/wayland/gdkglcontext-wayland.c

@@ -32,7 +32,6 @@
 #include "gdkprivate-wayland.h"
 
 #include "gdkinternals.h"
-#include "gdk-private.h"
 #include "gdksurfaceprivate.h"
 #include "gdkprofilerprivate.h"
 
@@ -358,8 +357,6 @@ gdk_wayland_gl_context_class_init (GdkWaylandGLContextClass *klass)
   context_class->make_current = gdk_wayland_gl_context_make_current;
   context_class->clear_current = gdk_wayland_gl_context_clear_current;
   context_class->get_damage = gdk_wayland_gl_context_get_damage;
-
-  context_class->backend_type = GDK_GL_EGL;
 }
 
 static void
@@ -477,31 +474,14 @@ gdk_wayland_display_init_gl (GdkDisplay  *display,
   G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
   G_GNUC_UNUSED gint64 start_time2;
 
-  if (!gdk_gl_backend_can_be_used (GDK_GL_EGL, error))
-    return FALSE;
-
-  if (!epoxy_has_egl ())
-    {
-      gboolean sandboxed = gdk_running_in_sandbox ();
-
-      g_set_error_literal (error, GDK_GL_ERROR,
-                           GDK_GL_ERROR_NOT_AVAILABLE,
-                           sandboxed ? _("libEGL not available in this sandbox")
-                                     : _("libEGL not available"));
-      return NULL;
-    }
-
   start_time2 = GDK_PROFILER_CURRENT_TIME;
   dpy = get_egl_display (display_wayland);
   gdk_profiler_end_mark (start_time, "get_egl_display", NULL);
   if (dpy == NULL)
     {
-      gboolean sandboxed = gdk_running_in_sandbox ();
-
       g_set_error_literal (error, GDK_GL_ERROR,
                            GDK_GL_ERROR_NOT_AVAILABLE,
-                           sandboxed ? _("Sandbox does not provide an OpenGL implementation")
-                                     : _("No OpenGL implementation available"));
+                           _("Failed to create EGL display"));
       return NULL;
     }
 

gdk/wayland/gdkkeys-wayland.c

@@ -542,7 +542,7 @@ _gdk_wayland_keymap_update_from_fd (GdkKeymap *keymap,
 
   context = xkb_context_new (0);
 
-  map_str = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+  map_str = mmap (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
   if (map_str == MAP_FAILED)
     {
       close(fd);

gdk/wayland/gdksurface-wayland.c

@@ -3009,7 +3009,6 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
 
   impl->has_uncommitted_ack_configure = FALSE;
   impl->input_region_dirty = TRUE;
-  impl->opaque_region_dirty = TRUE;
 
   unset_transient_for_exported (surface);
 
@@ -4191,65 +4190,6 @@ gdk_wayland_surface_show_window_menu (GdkSurface *surface,
   return TRUE;
 }
 
-static gboolean
-translate_gesture (GdkTitlebarGesture         gesture,
-                   enum gtk_surface1_gesture *out_gesture)
-{
-  switch (gesture)
-    {
-    case GDK_TITLEBAR_GESTURE_DOUBLE_CLICK:
-      *out_gesture = GTK_SURFACE1_GESTURE_DOUBLE_CLICK;
-      break;
-
-    case GDK_TITLEBAR_GESTURE_RIGHT_CLICK:
-      *out_gesture = GTK_SURFACE1_GESTURE_RIGHT_CLICK;
-      break;
-
-    case GDK_TITLEBAR_GESTURE_MIDDLE_CLICK:
-      *out_gesture = GTK_SURFACE1_GESTURE_MIDDLE_CLICK;
-      break;
-
-    default:
-      g_warning ("Not handling unknown titlebar gesture %u", gesture);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static gboolean
-gdk_wayland_surface_titlebar_gesture (GdkSurface         *surface,
-                                      GdkTitlebarGesture  gesture)
-{
-  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
-  struct gtk_surface1 *gtk_surface = impl->display_server.gtk_surface;
-  enum gtk_surface1_gesture gtk_gesture;
-  GdkSeat *seat;
-  struct wl_seat *wl_seat;
-  uint32_t serial;
-
-  if (!gtk_surface)
-    return FALSE;
-
-  if (gtk_surface1_get_version (gtk_surface) < GTK_SURFACE1_TITLEBAR_GESTURE_SINCE_VERSION)
-    return FALSE;
-
-  if (!translate_gesture (gesture, &gtk_gesture))
-    return FALSE;
-
-  seat = gdk_display_get_default_seat (surface->display);
-  wl_seat = gdk_wayland_seat_get_wl_seat (seat);
-
-  serial = _gdk_wayland_seat_get_last_implicit_grab_serial (GDK_WAYLAND_SEAT (seat), NULL);
-
-  gtk_surface1_titlebar_gesture (impl->display_server.gtk_surface,
-                                 serial,
-                                 wl_seat,
-                                 gtk_gesture);
-
-  return TRUE;
-}
-
 static gboolean
 gdk_wayland_surface_supports_edge_constraints (GdkSurface *surface)
 {
@@ -5047,13 +4987,6 @@ gdk_wayland_toplevel_show_window_menu (GdkToplevel *toplevel,
   return gdk_wayland_surface_show_window_menu (GDK_SURFACE (toplevel), event);
 }
 
-static gboolean
-gdk_wayland_toplevel_titlebar_gesture (GdkToplevel        *toplevel,
-                                       GdkTitlebarGesture  gesture)
-{
-  return gdk_wayland_surface_titlebar_gesture (GDK_SURFACE (toplevel), gesture);
-}
-
 static gboolean
 gdk_wayland_toplevel_supports_edge_constraints (GdkToplevel *toplevel)
 {
@@ -5132,7 +5065,6 @@ gdk_wayland_toplevel_iface_init (GdkToplevelInterface *iface)
   iface->lower = gdk_wayland_toplevel_lower;
   iface->focus = gdk_wayland_toplevel_focus;
   iface->show_window_menu = gdk_wayland_toplevel_show_window_menu;
-  iface->titlebar_gesture = gdk_wayland_toplevel_titlebar_gesture;
   iface->supports_edge_constraints = gdk_wayland_toplevel_supports_edge_constraints;
   iface->inhibit_system_shortcuts = gdk_wayland_toplevel_inhibit_system_shortcuts;
   iface->restore_system_shortcuts = gdk_wayland_toplevel_restore_system_shortcuts;

gdk/wayland/meson.build

@@ -71,7 +71,7 @@ foreach p: proto_sources
   elif proto_stability == 'staging'
     proto_version = p.get(2)
     output_base = '@0@-@1@'.format(proto_name, proto_version)
-    input = files(join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)))
+    input = join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
   elif proto_stability == 'private'
     output_base = proto_name
     input = files('protocol/@0@.xml'.format(proto_name))

gdk/wayland/protocol/gtk-shell.xml

@@ -1,6 +1,6 @@
 <protocol name="gtk">
 
-  <interface name="gtk_shell1" version="5">
+  <interface name="gtk_shell1" version="4">
     <description summary="gtk specific extensions">
       gtk_shell is a protocol extension providing additional features for
       clients implementing it.
@@ -35,7 +35,7 @@
     </request>
   </interface>
 
-  <interface name="gtk_surface1" version="5">
+  <interface name="gtk_surface1" version="4">
     <request name="set_dbus_properties">
       <arg name="application_id" type="string" allow-null="true"/>
       <arg name="app_menu_path" type="string" allow-null="true"/>
@@ -85,23 +85,6 @@
 
     <!-- Version 4 additions -->
     <request name="release" type="destructor" since="4"/>
-
-    <!-- Version 5 additions -->
-    <enum name="gesture" since="5">
-      <entry name="double_click" value="1"/>
-      <entry name="right_click" value="2"/>
-      <entry name="middle_click" value="3"/>
-    </enum>
-
-    <enum name="error" since="5">
-      <entry name="invalid_gesture" value="0"/>
-    </enum>
-
-    <request name="titlebar_gesture" since="5">
-      <arg name="serial" type="uint"/>
-      <arg name="seat" type="object" interface="wl_seat"/>
-      <arg name="gesture" type="uint" enum="gesture"/>
-    </request>
   </interface>
 
 </protocol>

gdk/win32/gdkdevice-win32.c

@@ -89,7 +89,7 @@ gdk_device_win32_query_state (GdkDevice        *device,
       hwnd = NULL;
     }
 
-  _gdk_win32_get_cursor_pos (&point);
+  GetCursorPos (&point);
 
   if (hwnd)
     ScreenToClient (hwnd, &point);
@@ -100,6 +100,15 @@ gdk_device_win32_query_state (GdkDevice        *device,
   if (win_y)
     *win_y = point.y / scale;
 
+  if (window)
+    {
+      if (win_x)
+        *win_x += _gdk_offset_x;
+
+      if (win_y)
+        *win_y += _gdk_offset_y;
+    }
+
   if (hwnd && child_window)
     {
       hwndc = ChildWindowFromPoint (hwnd, point);
@@ -168,7 +177,7 @@ _gdk_device_win32_surface_at_position (GdkDevice       *device,
   HWND hwnd;
   RECT rect;
 
-  if (!_gdk_win32_get_cursor_pos (&screen_pt))
+  if (!GetCursorPos (&screen_pt))
     return NULL;
 
   /* Use WindowFromPoint instead of ChildWindowFromPoint(Ex).

gdk/win32/gdkdevice-winpointer.c

@@ -1,215 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2020 the GTK team
- *
- * 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 <gdk/gdksurface.h>
-
-#include <windows.h>
-
-#include "gdkwin32.h"
-#include "gdkdevice-winpointer.h"
-#include "gdkdisplay-win32.h"
-
-G_DEFINE_TYPE (GdkDeviceWinpointer, gdk_device_winpointer, GDK_TYPE_DEVICE)
-
-static GdkModifierType
-get_keyboard_mask (void)
-{
-  GdkModifierType mask = 0;
-  BYTE kbd[256];
-
-  GetKeyboardState (kbd);
-  if (kbd[VK_SHIFT] & 0x80)
-    mask |= GDK_SHIFT_MASK;
-  if (kbd[VK_CAPITAL] & 0x80)
-    mask |= GDK_LOCK_MASK;
-  if (kbd[VK_CONTROL] & 0x80)
-    mask |= GDK_CONTROL_MASK;
-  if (kbd[VK_MENU] & 0x80)
-    mask |= GDK_ALT_MASK;
-
-  return mask;
-}
-
-static void
-gdk_device_winpointer_set_surface_cursor (GdkDevice *device,
-                                          GdkSurface *window,
-                                          GdkCursor *cursor)
-{
-}
-
-void
-gdk_device_winpointer_query_state (GdkDevice        *device,
-                                   GdkSurface       *window,
-                                   GdkSurface      **child_window,
-                                   double           *win_x,
-                                   double           *win_y,
-                                   GdkModifierType  *mask)
-{
-  GdkDeviceWinpointer *device_winpointer;
-  POINT point;
-  HWND hwnd, hwndc;
-  int scale;
-
-  device_winpointer = GDK_DEVICE_WINPOINTER (device);
-  if (window)
-    {
-      scale = GDK_WIN32_SURFACE (window)->surface_scale;
-      hwnd = GDK_SURFACE_HWND (window);
-    }
-  else
-    {
-      GdkDisplay *display = gdk_device_get_display (device);
-
-      scale = GDK_WIN32_DISPLAY (display)->surface_scale;
-      hwnd = NULL;
-    }
-
-  _gdk_win32_get_cursor_pos (&point);
-
-  if (hwnd)
-    ScreenToClient (hwnd, &point);
-
-  if (win_x)
-    *win_x = point.x / scale;
-
-  if (win_y)
-    *win_y = point.y / scale;
-
-  if (hwnd && child_window)
-    {
-      hwndc = ChildWindowFromPoint (hwnd, point);
-
-      if (hwndc && hwndc != hwnd)
-        *child_window = gdk_win32_handle_table_lookup (hwndc);
-      else
-        *child_window = NULL; /* Direct child unknown to gdk */
-    }
-
-  if (mask)
-    {
-      *mask = get_keyboard_mask ();
-      *mask |= device_winpointer->last_button_mask;
-    }
-}
-
-static GdkGrabStatus
-gdk_device_winpointer_grab (GdkDevice    *device,
-                            GdkSurface    *window,
-                            gboolean      owner_events,
-                            GdkEventMask  event_mask,
-                            GdkSurface    *confine_to,
-                            GdkCursor    *cursor,
-                            guint32       time_)
-{
-  return GDK_GRAB_SUCCESS;
-}
-
-static void
-gdk_device_winpointer_ungrab (GdkDevice *device,
-                              guint32    time_)
-{
-}
-
-static void
-screen_to_client (HWND hwnd, POINT screen_pt, POINT *client_pt)
-{
-  *client_pt = screen_pt;
-  ScreenToClient (hwnd, client_pt);
-}
-
-static GdkSurface *
-gdk_device_winpointer_surface_at_position (GdkDevice       *device,
-                                           double          *win_x,
-                                           double          *win_y,
-                                           GdkModifierType *mask)
-{
-  GdkSurface *surface = NULL;
-  GdkWin32Surface *impl = NULL;
-  POINT screen_pt, client_pt;
-  HWND hwnd;
-  RECT rect;
-
-  if (!_gdk_win32_get_cursor_pos (&screen_pt))
-    return NULL;
-
-  /* Use WindowFromPoint instead of ChildWindowFromPoint(Ex).
-  *  Only WindowFromPoint is able to look through transparent
-  *  layered windows.
-  */
-  hwnd = GetAncestor (WindowFromPoint (screen_pt), GA_ROOT);
-
-  /* Verify that we're really inside the client area of the surface */
-  GetClientRect (hwnd, &rect);
-  screen_to_client (hwnd, screen_pt, &client_pt);
-  if (!PtInRect (&rect, client_pt))
-    hwnd = NULL;
-
-  surface = gdk_win32_handle_table_lookup (hwnd);
-
-  if (surface && (win_x || win_y))
-    {
-      impl = GDK_WIN32_SURFACE (surface);
-
-      if (win_x)
-        *win_x = client_pt.x / impl->surface_scale;
-      if (win_y)
-        *win_y = client_pt.y / impl->surface_scale;
-    }
-
-  return surface;
-}
-
-static void
-gdk_device_winpointer_init (GdkDeviceWinpointer *device_winpointer)
-{
-  device_winpointer->device_handle = NULL;
-  device_winpointer->start_cursor_id = 0;
-  device_winpointer->end_cursor_id = 0;
-
-  device_winpointer->origin_x = 0;
-  device_winpointer->origin_y = 0;
-  device_winpointer->scale_x = 0.0;
-  device_winpointer->scale_y = 0.0;
-
-  device_winpointer->last_button_mask = 0;
-}
-
-static void
-gdk_device_winpointer_finalize (GObject *object)
-{
-  GdkDeviceWinpointer *device_winpointer = GDK_DEVICE_WINPOINTER (object);
-
-  g_clear_object (&device_winpointer->tool_pen);
-  g_clear_object (&device_winpointer->tool_eraser);
-
-  G_OBJECT_CLASS (gdk_device_winpointer_parent_class)->finalize (object);
-}
-
-static void
-gdk_device_winpointer_class_init (GdkDeviceWinpointerClass *klass)
-{
-  GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = gdk_device_winpointer_finalize;
-  device_class->set_surface_cursor = gdk_device_winpointer_set_surface_cursor;
-  device_class->grab = gdk_device_winpointer_grab;
-  device_class->ungrab = gdk_device_winpointer_ungrab;
-  device_class->surface_at_position = gdk_device_winpointer_surface_at_position;
-}

gdk/win32/gdkdevice-winpointer.h

@@ -1,67 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2020 the GTK team
- *
- * 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 __GDK_DEVICE_WINPOINTER_H__
-#define __GDK_DEVICE_WINPOINTER_H__
-
-#include <gdk/gdkdeviceprivate.h>
-
-#include <windows.h>
-
-#include "winpointer.h"
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_DEVICE_WINPOINTER         (gdk_device_winpointer_get_type ())
-#define GDK_DEVICE_WINPOINTER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_WINPOINTER, GdkDeviceWinpointer))
-#define GDK_DEVICE_WINPOINTER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_WINPOINTER, GdkDeviceWinpointerClass))
-#define GDK_IS_DEVICE_WINPOINTER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_WINPOINTER))
-#define GDK_IS_DEVICE_WINPOINTER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_WINPOINTER))
-#define GDK_DEVICE_WINPOINTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_WINPOINTER, GdkDeviceWinpointerClass))
-
-typedef struct _GdkDeviceWinpointer GdkDeviceWinpointer;
-typedef struct _GdkDeviceWinpointerClass GdkDeviceWinpointerClass;
-
-struct _GdkDeviceWinpointer
-{
-  GdkDevice parent_instance;
-
-  HANDLE device_handle;
-  UINT32 start_cursor_id;
-  UINT32 end_cursor_id;
-
-  int origin_x;
-  int origin_y;
-  double scale_x;
-  double scale_y;
-
-  GdkModifierType last_button_mask;
-
-  GdkDeviceTool *tool_pen;
-  GdkDeviceTool *tool_eraser;
-};
-
-struct _GdkDeviceWinpointerClass
-{
-  GdkDeviceClass parent_class;
-};
-
-GType gdk_device_winpointer_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GDK_DEVICE_WINPOINTER_H__ */

gdk/win32/gdkdevice-wintab.c

@@ -88,7 +88,7 @@ gdk_device_wintab_query_state (GdkDevice        *device,
       hwnd = NULL;
     }
 
-  _gdk_win32_get_cursor_pos (&point);
+  GetCursorPos (&point);
 
   if (hwnd)
     ScreenToClient (hwnd, &point);
@@ -99,6 +99,15 @@ gdk_device_wintab_query_state (GdkDevice        *device,
   if (win_y)
     *win_y = point.y / scale;
 
+  if (!window)
+    {
+      if (win_x)
+        *win_x += _gdk_offset_x;
+
+      if (win_y)
+        *win_y += _gdk_offset_y;
+    }
+
   if (hwnd && child_window)
     {
       hwndc = ChildWindowFromPoint (hwnd, point);

gdk/win32/gdkdevicemanager-win32.c

@@ -29,9 +29,7 @@
 #include "gdkdevice-win32.h"
 #include "gdkdevice-virtual.h"
 #include "gdkdevice-wintab.h"
-#include "gdkinput-winpointer.h"
 #include "gdkdisplayprivate.h"
-#include "gdkdisplay-win32.h"
 #include "gdkseatdefaultprivate.h"
 
 #define WINTAB32_DLL "Wintab32.dll"
@@ -373,6 +371,9 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
 
   wintab_contexts = NULL;
 
+  if (_gdk_input_ignore_wintab)
+    return;
+
   n = GetSystemDirectory (&dummy, 0);
 
   if (n <= 0)
@@ -683,13 +684,10 @@ wintab_default_display_notify_cb (GdkDisplayManager *display_manager)
 static void
 gdk_device_manager_win32_constructed (GObject *object)
 {
-  GdkWin32Display *display_win32;
   GdkDeviceManagerWin32 *device_manager;
   GdkSeat *seat;
-  const char *api_preference = NULL;
-  gboolean have_api_preference = TRUE;
-
-  display_win32 = GDK_WIN32_DISPLAY (_gdk_display);
+  GdkDisplayManager *display_manager = NULL;
+  GdkDisplay *default_display = NULL;
 
   device_manager = GDK_DEVICE_MANAGER_WIN32 (object);
   device_manager->core_pointer =
@@ -730,59 +728,18 @@ gdk_device_manager_win32_constructed (GObject *object)
   gdk_seat_default_add_physical_device (GDK_SEAT_DEFAULT (seat), device_manager->system_keyboard);
   g_object_unref (seat);
 
-  _gdk_device_manager = device_manager;
+  /* Only call Wintab init stuff after the default display
+   * is globally known and accessible through the display manager
+   * singleton. Approach lifted from gtkmodules.c.
+   */
+  display_manager = gdk_display_manager_get ();
+  g_assert (display_manager != NULL);
+  default_display = gdk_display_manager_get_default_display (display_manager);
+  g_assert (default_display == NULL);
 
-  api_preference = g_getenv ("GDK_WIN32_TABLET_INPUT_API");
-  if (g_strcmp0 (api_preference, "none") == 0)
-    {
-      display_win32->tablet_input_api = GDK_WIN32_TABLET_INPUT_API_NONE;
-    }
-  else if (g_strcmp0 (api_preference, "wintab") == 0)
-    {
-      display_win32->tablet_input_api = GDK_WIN32_TABLET_INPUT_API_WINTAB;
-    }
-  else if (g_strcmp0 (api_preference, "winpointer") == 0)
-    {
-      display_win32->tablet_input_api = GDK_WIN32_TABLET_INPUT_API_WINPOINTER;
-    }
-  else
-    {
-      /* No user preference, default to WinPointer. If unsuccessful,
-       * try to initialize other API's in sequence until one succeeds.
-       */
-      display_win32->tablet_input_api = GDK_WIN32_TABLET_INPUT_API_WINPOINTER;
-      have_api_preference = FALSE;
-    }
-
-  if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER)
-    {
-      gboolean init_successful = gdk_winpointer_initialize ();
-
-      if (!init_successful && !have_api_preference)
-        {
-          /* Try Wintab */
-          display_win32->tablet_input_api = GDK_WIN32_TABLET_INPUT_API_WINTAB;
-        }
-    }
-
-  if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINTAB)
-    {
-      GdkDisplayManager *display_manager = NULL;
-      GdkDisplay *default_display = NULL;
-
-      /* Only call Wintab init stuff after the default display
-       * is globally known and accessible through the display manager
-       * singleton. Approach lifted from gtkmodules.c.
-       */
-      display_manager = gdk_display_manager_get ();
-      g_assert (display_manager != NULL);
-      default_display = gdk_display_manager_get_default_display (display_manager);
-      g_assert (default_display == NULL);
-
-      g_signal_connect (display_manager, "notify::default-display",
-                        G_CALLBACK (wintab_default_display_notify_cb),
-                        NULL);
-    }
+  g_signal_connect (display_manager, "notify::default-display",
+                    G_CALLBACK (wintab_default_display_notify_cb),
+                    NULL);
 }
 
 static void
@@ -795,7 +752,7 @@ gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass)
 }
 
 void
-_gdk_wintab_set_tablet_active (void)
+_gdk_input_set_tablet_active (void)
 {
   GList *tmp_list;
   HCTX *hctx;
@@ -806,7 +763,7 @@ _gdk_wintab_set_tablet_active (void)
   if (!wintab_contexts)
     return; /* No tablet devices found, or Wintab not initialized yet */
 
-  GDK_NOTE (INPUT, g_print ("_gdk_wintab_set_tablet_active: "
+  GDK_NOTE (INPUT, g_print ("_gdk_input_set_tablet_active: "
                             "Bringing Wintab contexts to the top of the overlap order\n"));
 
   tmp_list = wintab_contexts;
@@ -909,7 +866,7 @@ gdk_device_manager_find_wintab_device (GdkDeviceManagerWin32 *device_manager,
 }
 
 GdkEvent *
-gdk_wintab_make_event (GdkDisplay *display,
+gdk_input_other_event (GdkDisplay *display,
                        MSG        *msg,
                        GdkSurface  *window)
 {
@@ -937,7 +894,7 @@ gdk_wintab_make_event (GdkDisplay *display,
 
   if (window != wintab_window)
     {
-      g_warning ("gdk_wintab_make_event: not wintab_window?");
+      g_warning ("gdk_input_other_event: not wintab_window?");
       return NULL;
     }
 
@@ -948,7 +905,7 @@ gdk_wintab_make_event (GdkDisplay *display,
     g_object_ref (window);
 
   GDK_NOTE (EVENTS_OR_INPUT,
-	    g_print ("gdk_wintab_make_event: window=%p %+g%+g\n",
+	    g_print ("gdk_input_other_event: window=%p %+g%+g\n",
                window ? GDK_SURFACE_HWND (window) : NULL, x, y));
 
   if (msg->message == WT_PACKET || msg->message == WT_CSRCHANGE)

gdk/win32/gdkdevicemanager-win32.h

@@ -40,8 +40,6 @@ struct _GdkDeviceManagerWin32
   /* Fake physical devices */
   GdkDevice *system_pointer;
   GdkDevice *system_keyboard;
-
-  GList *winpointer_devices;
   GList *wintab_devices;
 
   /* Bumped up every time a wintab device enters the proximity
@@ -58,8 +56,8 @@ struct _GdkDeviceManagerWin32Class
 
 GType gdk_device_manager_win32_get_type (void) G_GNUC_CONST;
 
-void     _gdk_wintab_set_tablet_active (void);
-GdkEvent * gdk_wintab_make_event      (GdkDisplay *display,
+void     _gdk_input_set_tablet_active (void);
+GdkEvent * gdk_input_other_event      (GdkDisplay *display,
                                        MSG        *msg,
                                        GdkSurface  *window);
 

gdk/win32/gdkdisplay-win32.c

@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#define _WIN32_WINNT 0x0600
 #define VK_USE_PLATFORM_WIN32_KHR
 
 #include "gdk.h"
@@ -534,6 +535,7 @@ _gdk_win32_display_open (const char *display_name)
 
   _gdk_win32_lang_notification_init ();
   _gdk_drag_init ();
+  _gdk_drop_init ();
 
   _gdk_display->clipboard = gdk_win32_clipboard_new (_gdk_display);
   _gdk_display->primary_clipboard = gdk_clipboard_new (_gdk_display);
@@ -1150,8 +1152,6 @@ static gboolean
 gdk_win32_display_init_gl_backend (GdkDisplay  *display,
                                    GError     **error)
 {
-  gboolean result = FALSE;
-
 #ifdef GDK_WIN32_ENABLE_EGL
   if (GDK_DISPLAY_DEBUG_CHECK (display, GL_EGL))
     return gdk_win32_display_init_egl (display, error);
@@ -1163,17 +1163,17 @@ gdk_win32_display_init_gl_backend (GdkDisplay  *display,
    * as WGL is the more tried-and-tested configuration.
    */
 
-  result = gdk_win32_display_init_wgl (display, error);
+  if (gdk_win32_display_init_wgl (display, error))
+    return TRUE;
+  g_clear_error (error);
 
 #ifdef GDK_WIN32_ENABLE_EGL
-  if (!result)
-    {
-      g_clear_error (error);
-      result = gdk_win32_display_init_egl (display, error);
-    }
+  if (gdk_win32_display_init_egl (display, error))
+    return TRUE;
 #endif
+  g_clear_error (error);
 
-  return result;
+  return gdk_win32_display_init_wgl (display, error);
 }
 
 static GdkGLContext *

gdk/win32/gdkdisplay-win32.h

@@ -99,12 +99,6 @@ typedef struct _GdkWin32User32DPIFuncs
   funcADACE areDACEqual;
 } GdkWin32User32DPIFuncs;
 
-typedef enum {
-  GDK_WIN32_TABLET_INPUT_API_NONE,
-  GDK_WIN32_TABLET_INPUT_API_WINTAB,
-  GDK_WIN32_TABLET_INPUT_API_WINPOINTER
-} GdkWin32TabletInputAPI;
-
 /* Detect running architecture */
 typedef BOOL (WINAPI *funcIsWow64Process2) (HANDLE, USHORT *, USHORT *);
 typedef struct _GdkWin32KernelCPUFuncs
@@ -165,9 +159,7 @@ struct _GdkWin32Display
 
   GdkWin32ShcoreFuncs shcore_funcs;
   GdkWin32User32DPIFuncs user32_dpi_funcs;
-
-  GdkWin32TabletInputAPI tablet_input_api;
-
+  
   /* Cursor Items (GdkCursor->GdkWin32HCursor) */
   GHashTable *cursors;
   /* The cursor that is used by current grab (if any) */

gdk/win32/gdkdrag-win32.c

@@ -27,8 +27,6 @@
 #include "config.h"
 #include <string.h>
 
-#include "gdk-private.h"
-
 #include <io.h>
 #include <fcntl.h>
 #include <math.h>
@@ -158,6 +156,9 @@
  * drag window) in response to this, as all the functions
  * that GDK could perform here are already handled by the
  * OS driving the DnD process via DoDragDrop() call.
+ * The LOCAL protocol, on the other hand, does a lot,
+ * similar to what X11 backend does with XDND - it sends
+ * GDK_DRAG_LEAVE and GDK_DRAG_ENTER, emits GDK_DRAG_MOTION.
  *
  * GDK_BUTTON_RELEASE checks the
  * released button - if it's the button that was used to
@@ -178,7 +179,11 @@
  * the OS notifies the process about these things happening.
  * For X11 backend that is done in Xdnd event filters,
  * for W32 backend this is done in IDropSource/IDropTarget
- * object methods for the OLE2 protocol.
+ * object methods for the OLE2 protocol, whereas for the
+ * LOCAL protocol these events are emitted only by GDK itself
+ * (with the exception of WM_DROPFILES message, which causes
+ *  GDK to create a drop context and then immediately finish
+ *  the drag, providing the list of files it got from the message).
  * 
  */
 
@@ -480,6 +485,17 @@ process_dnd_queue (gboolean                   timed,
   return FALSE;
 }
 
+void
+_gdk_win32_local_drag_drop_response (GdkDrag        *drag,
+                                     GdkDragAction   action)
+{
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drag_drop_response: 0x%p\n",
+                          drag));
+
+  g_signal_emit_by_name (drag, "dnd-finished");
+  gdk_drag_drop_done (drag, action != 0);
+}
+
 static gboolean
 do_drag_drop_response (gpointer user_data)
 {
@@ -696,6 +712,16 @@ _gdk_win32_dnd_thread_main (gpointer data)
   return NULL;
 }
 
+/* For the LOCAL protocol */
+typedef enum {
+  GDK_DRAG_STATUS_DRAG,
+  GDK_DRAG_STATUS_MOTION_WAIT,
+  GDK_DRAG_STATUS_ACTION_WAIT,
+  GDK_DRAG_STATUS_DROP
+} GdkDragStatus;
+
+static gboolean use_ole2_dnd = TRUE;
+
 static gboolean drag_context_grab (GdkDrag *drag);
 
 G_DEFINE_TYPE (GdkWin32Drag, gdk_win32_drag, GDK_TYPE_DRAG)
@@ -763,7 +789,8 @@ gdk_drag_new (GdkDisplay         *display,
               GdkSurface         *surface,
               GdkContentProvider *content,
               GdkDragAction       actions,
-              GdkDevice          *device)
+              GdkDevice          *device,
+              GdkDragProtocol     protocol)
 {
   GdkWin32Drag *drag_win32;
   GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
@@ -783,6 +810,8 @@ gdk_drag_new (GdkDisplay         *display,
   else
     drag_win32->scale = gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
 
+  drag_win32->protocol = protocol;
+
   return drag;
 }
 
@@ -1050,6 +1079,21 @@ maybe_emit_action_changed (GdkWin32Drag        *drag_win32,
     }
 }
 
+void
+_gdk_win32_local_drag_give_feedback (GdkDrag        *drag,
+                                     GdkDragAction   actions)
+{
+  GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
+
+  if (drag_win32->drag_status == GDK_DRAG_STATUS_MOTION_WAIT)
+    drag_win32->drag_status = GDK_DRAG_STATUS_DRAG;
+
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drag_give_feedback: 0x%p\n",
+                          drag));
+
+  maybe_emit_action_changed (drag_win32, actions);
+}
+
 static gboolean
 give_feedback (gpointer user_data)
 {
@@ -1624,20 +1668,30 @@ enum_formats_new (GArray *formats)
 void
 _gdk_drag_init (void)
 {
-  HRESULT hr;
-
   CoInitializeEx (NULL, COINIT_APARTMENTTHREADED);
 
-  hr = OleInitialize (NULL);
+  if (g_strcmp0 (getenv ("GDK_WIN32_OLE2_DND"), "0") == 0)
+    use_ole2_dnd = FALSE;
 
-  if (! SUCCEEDED (hr))
-    g_error ("OleInitialize failed");
+  if (use_ole2_dnd)
+    {
+      HRESULT hr;
+
+      hr = OleInitialize (NULL);
+
+      if (! SUCCEEDED (hr))
+        g_error ("OleInitialize failed");
+    }
 }
 
 void
 _gdk_win32_dnd_exit (void)
 {
-  OleUninitialize ();
+  if (use_ole2_dnd)
+    {
+      OleUninitialize ();
+    }
+
   CoUninitialize ();
 }
 
@@ -1667,9 +1721,6 @@ _gdk_win32_surface_drag_begin (GdkSurface         *surface,
   GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get ();
   double px, py;
   int x_root, y_root;
-  GdkWin32DnDThreadDoDragDrop *ddd;
-  source_drag_context *source_ctx;
-  data_object         *data_obj;
 
   g_return_val_if_fail (surface != NULL, NULL);
 
@@ -1677,7 +1728,8 @@ _gdk_win32_surface_drag_begin (GdkSurface         *surface,
                        surface,
                        content,
                        actions,
-                       device);
+                       device,
+                       use_ole2_dnd ? GDK_DRAG_PROTO_OLE2 : GDK_DRAG_PROTO_LOCAL);
   drag_win32 = GDK_WIN32_DRAG (drag);
 
   GDK_NOTE (DND, g_print ("_gdk_win32_surface_drag_begin\n"));
@@ -1701,35 +1753,121 @@ _gdk_win32_surface_drag_begin (GdkSurface         *surface,
       return FALSE;
     }
 
-  ddd = g_new0 (GdkWin32DnDThreadDoDragDrop, 1);
+  if (drag_win32->protocol == GDK_DRAG_PROTO_OLE2)
+    {
+      GdkWin32DnDThreadDoDragDrop *ddd = g_new0 (GdkWin32DnDThreadDoDragDrop, 1);
+      source_drag_context *source_ctx;
+      data_object         *data_obj;
 
-  source_ctx = source_context_new (drag, gdk_drag_get_formats (drag));
-  data_obj = data_object_new (drag);
+      source_ctx = source_context_new (drag, gdk_drag_get_formats (drag));
+      data_obj = data_object_new (drag);
 
-  ddd->base.item_type = GDK_WIN32_DND_THREAD_QUEUE_ITEM_DO_DRAG_DROP;
-  ddd->base.opaque_context = drag_win32;
-  ddd->src_context = source_ctx;
-  ddd->src_object = data_obj;
-  ddd->allowed_drop_effects = 0;
-  if (actions & GDK_ACTION_COPY)
-    ddd->allowed_drop_effects |= DROPEFFECT_COPY;
-  if (actions & GDK_ACTION_MOVE)
-    ddd->allowed_drop_effects |= DROPEFFECT_MOVE;
-  if (actions & GDK_ACTION_LINK)
-    ddd->allowed_drop_effects |= DROPEFFECT_LINK;
+      ddd->base.item_type = GDK_WIN32_DND_THREAD_QUEUE_ITEM_DO_DRAG_DROP;
+      ddd->base.opaque_context = drag_win32;
+      ddd->src_context = source_ctx;
+      ddd->src_object = data_obj;
+      ddd->allowed_drop_effects = 0;
+      if (actions & GDK_ACTION_COPY)
+        ddd->allowed_drop_effects |= DROPEFFECT_COPY;
+      if (actions & GDK_ACTION_MOVE)
+        ddd->allowed_drop_effects |= DROPEFFECT_MOVE;
+      if (actions & GDK_ACTION_LINK)
+        ddd->allowed_drop_effects |= DROPEFFECT_LINK;
 
-  g_hash_table_replace (clipdrop->active_source_drags, g_object_ref (drag), ddd);
-  increment_dnd_queue_counter ();
-  g_async_queue_push (clipdrop->dnd_queue, ddd);
-  API_CALL (PostThreadMessage, (clipdrop->dnd_thread_id, thread_wakeup_message, 0, 0));
+      g_hash_table_replace (clipdrop->active_source_drags, g_object_ref (drag), ddd);
+      increment_dnd_queue_counter ();
+      g_async_queue_push (clipdrop->dnd_queue, ddd);
+      API_CALL (PostThreadMessage, (clipdrop->dnd_thread_id, thread_wakeup_message, 0, 0));
 
-  drag_win32->util_data.state = GDK_WIN32_DND_PENDING;
+      drag_win32->util_data.state = GDK_WIN32_DND_PENDING;
+    }
 
   move_drag_surface (drag, x_root, y_root);
 
   return drag;
 }
 
+/* TODO: remove this?
+ * window finder is only used by our gdk_drag_update() to
+ * find the window at drag coordinates - which is
+ * something IDropSourceNotify already gives us.
+ * Unless, of course, we keep the LOCAL protocol around.
+ */
+typedef struct {
+  int x;
+  int y;
+  HWND ignore;
+  HWND result;
+} find_window_enum_arg;
+
+static BOOL CALLBACK
+find_window_enum_proc (HWND   hwnd,
+                       LPARAM lparam)
+{
+  RECT rect;
+  POINT tl, br;
+  find_window_enum_arg *a = (find_window_enum_arg *) lparam;
+
+  if (hwnd == a->ignore)
+    return TRUE;
+
+  if (!IsWindowVisible (hwnd))
+    return TRUE;
+
+  tl.x = tl.y = 0;
+  ClientToScreen (hwnd, &tl);
+  GetClientRect (hwnd, &rect);
+  br.x = rect.right;
+  br.y = rect.bottom;
+  ClientToScreen (hwnd, &br);
+
+  if (a->x >= tl.x && a->y >= tl.y && a->x < br.x && a->y < br.y)
+    {
+      a->result = hwnd;
+      return FALSE;
+    }
+  else
+    return TRUE;
+}
+
+/* Finds the HWND under cursor. Local DnD protocol
+ * uses this function, since local protocol is implemented
+ * entirely in GDK and cannot rely on the OS to notify
+ * drop targets about drags that move over them.
+ */
+static HWND
+gdk_win32_drag_find_window (GdkDrag    *drag,
+                            GdkSurface *drag_surface,
+                            int         x_root,
+                            int         y_root)
+{
+  GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
+  find_window_enum_arg a;
+
+  g_assert (_win32_main_thread == NULL ||
+            _win32_main_thread == g_thread_self ());
+
+  a.x = x_root * drag_win32->scale - _gdk_offset_x;
+  a.y = y_root * drag_win32->scale - _gdk_offset_y;
+  a.ignore = drag_surface ? GDK_SURFACE_HWND (drag_surface) : NULL;
+  a.result = INVALID_HANDLE_VALUE;
+
+  GDK_NOTE (DND,
+            g_print ("gdk_win32_drag_find_window: %p %+d%+d\n",
+                     (drag_surface ? GDK_SURFACE_HWND (drag_surface) : NULL),
+                     a.x, a.y));
+
+  EnumWindows (find_window_enum_proc, (LPARAM) &a);
+
+  GDK_NOTE (DND,
+            g_print ("gdk_win32_drag_find_window: %p %+d%+d: %p\n",
+                     (drag_surface ? GDK_SURFACE_HWND (drag_surface) : NULL),
+                     x_root, y_root,
+                     a.result));
+
+  return a.result;
+}
+
 static DWORD
 manufacture_keystate_from_GMT (GdkModifierType state)
 {
@@ -1751,6 +1889,100 @@ manufacture_keystate_from_GMT (GdkModifierType state)
   return key_state;
 }
 
+/* This only works if dest_window our window and the DnD operation
+ * is currently local to the application.
+ */
+static GdkDrop *
+_gdk_win32_get_drop_for_dest_window (HWND dest_window)
+{
+  GdkSurface *drop_surface = gdk_win32_handle_table_lookup (dest_window);
+  GdkDrop    *result = NULL;
+
+  if (drop_surface)
+    result = _gdk_win32_get_drop_for_dest_surface (drop_surface);
+
+  return result;
+}
+
+static gboolean
+gdk_win32_local_drag_motion (GdkDrag         *drag,
+                             HWND             dest_window,
+                             int              x_root,
+                             int              y_root,
+                             GdkDragAction    possible_actions,
+                             DWORD            key_state,
+                             guint32          time_)
+{
+  GdkWin32Drag *drag_win32;
+  GdkDrop *drop;
+  GdkDragAction actions;
+
+  g_assert (_win32_main_thread == NULL ||
+            _win32_main_thread == g_thread_self ());
+
+  g_return_val_if_fail (drag != NULL, FALSE);
+
+  drag_win32 = GDK_WIN32_DRAG (drag);
+
+  drop = _gdk_win32_get_drop_for_dest_window (drag_win32->dest_window);
+
+  actions = gdk_drag_get_actions (drag);
+
+  GDK_NOTE (DND, g_print ("gdk_win32_local_drag_motion: @ %+d:%+d possible=%s\n"
+                          " dest=%p (current %p) drop=%p drag=%p:{actions=%s,action=%s}\n",
+                          x_root, y_root,
+                          _gdk_win32_drag_action_to_string (possible_actions),
+                          dest_window, drag_win32->dest_window, drop, drag,
+                          _gdk_win32_drag_action_to_string (actions),
+                          _gdk_win32_drag_action_to_string (gdk_drag_get_selected_action (drag))));
+
+  if (drag_win32->dest_window != dest_window)
+    {
+      /* Send a leave to the last destination */
+      if (drop)
+        _gdk_win32_local_drop_target_dragleave (drop, time_);
+
+      drag_win32->dest_window = dest_window;
+      drag_win32->drag_status = GDK_DRAG_STATUS_DRAG;
+
+      _gdk_win32_local_drop_target_dragenter (drag,
+                                              gdk_win32_handle_table_lookup (dest_window),
+                                              x_root,
+                                              y_root,
+                                              key_state,
+                                              time_,
+                                              &actions);
+
+      drop = _gdk_win32_get_drop_for_dest_window (drag_win32->dest_window);
+      maybe_emit_action_changed (drag_win32, actions);
+    }
+
+  /* Send a drag-motion event */
+
+  drag_win32->util_data.last_x = x_root;
+  drag_win32->util_data.last_y = y_root;
+
+  if (drop != NULL &&
+      drag_win32->drag_status == GDK_DRAG_STATUS_DRAG &&
+      _gdk_win32_local_drop_target_will_emit_motion (drop, x_root, y_root, key_state))
+    {
+      actions = gdk_drag_get_actions (drag);
+      drag_win32->drag_status = GDK_DRAG_STATUS_MOTION_WAIT;
+
+      _gdk_win32_local_drop_target_dragover (drop, drag, x_root, y_root, key_state, time_, &actions);
+
+      maybe_emit_action_changed (drag_win32, actions);
+    }
+
+  GDK_NOTE (DND, g_print (" returning %s\n"
+                          " drag=%p:{actions=%s,action=%s}\n",
+                          (drop != NULL && drag_win32->drag_status == GDK_DRAG_STATUS_DRAG) ? "TRUE" : "FALSE",
+                          drag,
+                          _gdk_win32_drag_action_to_string (gdk_drag_get_actions (drag)),
+                          _gdk_win32_drag_action_to_string (gdk_drag_get_selected_action (drag))));
+  return (drop != NULL && drag_win32->drag_status == GDK_DRAG_STATUS_DRAG);
+}
+
 static void
 send_source_state_update (GdkWin32Clipdrop    *clipdrop,
                           GdkWin32Drag        *drag_win32,
@@ -1771,7 +2003,6 @@ gdk_win32_drag_drop (GdkDrag *drag,
 {
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
   GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get ();
-  gpointer ddd;
 
   g_assert (_win32_main_thread == NULL ||
             _win32_main_thread == g_thread_self ());
@@ -1780,12 +2011,29 @@ gdk_win32_drag_drop (GdkDrag *drag,
 
   GDK_NOTE (DND, g_print ("gdk_win32_drag_drop\n"));
 
-  ddd = g_hash_table_lookup (clipdrop->active_source_drags, drag);
+  if (drag_win32->protocol == GDK_DRAG_PROTO_LOCAL)
+    {
+      GdkDrop *drop = _gdk_win32_get_drop_for_dest_window (drag_win32->dest_window);
 
-  drag_win32->util_data.state = GDK_WIN32_DND_DROPPED;
+      if (drop)
+        {
+          GdkDragAction actions;
 
-  if (ddd)
-    send_source_state_update (clipdrop, drag_win32, ddd);
+          actions = gdk_drag_get_actions (drag);
+          _gdk_win32_local_drop_target_drop (drop, drag, time_, &actions);
+          maybe_emit_action_changed (drag_win32, actions);
+          _gdk_win32_local_drag_drop_response (drag, actions);
+        }
+    }
+  else if (drag_win32->protocol == GDK_DRAG_PROTO_OLE2)
+    {
+      gpointer ddd = g_hash_table_lookup (clipdrop->active_source_drags, drag);
+
+      drag_win32->util_data.state = GDK_WIN32_DND_DROPPED;
+
+      if (ddd)
+        send_source_state_update (clipdrop, drag_win32, ddd);
+    }
 }
 
 static void
@@ -1875,8 +2123,6 @@ gdk_win32_drag_drop_done (GdkDrag  *drag,
 {
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
   GdkDragAnim *anim;
-  GdkWin32Clipdrop *clipdrop;
-  gpointer ddd;
 /*
   cairo_surface_t *win_surface;
   cairo_surface_t *surface;
@@ -1891,16 +2137,23 @@ gdk_win32_drag_drop_done (GdkDrag  *drag,
   /* FIXME: This is temporary, until the code is fixed to ensure that
    * gdk_drag_finish () is called by GTK.
    */
-  clipdrop = _gdk_win32_clipdrop_get ();
-  ddd = g_hash_table_lookup (clipdrop->active_source_drags, drag);
+  if (drag_win32->protocol == GDK_DRAG_PROTO_OLE2)
+    {
+      GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get ();
+      gpointer ddd = g_hash_table_lookup (clipdrop->active_source_drags, drag);
 
-  if (success)
-    drag_win32->util_data.state = GDK_WIN32_DND_DROPPED;
-  else
-    drag_win32->util_data.state = GDK_WIN32_DND_NONE;
+      if (success)
+        drag_win32->util_data.state = GDK_WIN32_DND_DROPPED;
+      else
+        drag_win32->util_data.state = GDK_WIN32_DND_NONE;
 
-  if (ddd)
-    send_source_state_update (clipdrop, drag_win32, ddd);
+      if (ddd)
+        send_source_state_update (clipdrop, drag_win32, ddd);
+    }
+  else if (drag_win32->protocol == GDK_DRAG_PROTO_LOCAL)
+    {
+      
+    }
 
   drag_win32->handle_events = FALSE;
 
@@ -1943,7 +2196,7 @@ gdk_win32_drag_drop_done (GdkDrag  *drag,
   id = g_timeout_add_full (G_PRIORITY_DEFAULT, 17,
                            gdk_drag_anim_timeout, anim,
                            (GDestroyNotify) gdk_drag_anim_destroy);
-  gdk_source_set_static_name_by_id (id, "[gtk] gdk_drag_anim_timeout");
+  g_source_set_name_by_id (id, "[gtk] gdk_drag_anim_timeout");
 }
 
 static gboolean
@@ -2026,6 +2279,14 @@ gdk_win32_drag_cancel (GdkDrag             *drag,
                           drag,
                           reason_str));
 
+  if (drag_win32->protocol == GDK_DRAG_PROTO_LOCAL)
+    {
+      GdkDrop *drop = _gdk_win32_get_drop_for_dest_window (drag_win32->dest_window);
+      if (drop)
+        _gdk_win32_local_drop_target_dragleave (drop, GDK_CURRENT_TIME);
+      drop = NULL;
+    }
+
   gdk_drag_set_cursor (drag, NULL);
   drag_context_ungrab (drag);
   gdk_drag_drop_done (drag, FALSE);
@@ -2047,6 +2308,28 @@ gdk_win32_drag_drop_performed (GdkDrag *drag,
 #define BIG_STEP 20
 #define SMALL_STEP 1
 
+static void
+gdk_local_drag_update (GdkDrag *drag,
+                       double   x_root,
+                       double   y_root,
+                       DWORD    grfKeyState,
+                       guint32  evtime)
+{
+  GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
+  HWND dest_window;
+
+  g_assert (_win32_main_thread == NULL ||
+            _win32_main_thread == g_thread_self ());
+
+  dest_window = gdk_win32_drag_find_window (drag,
+                                            drag_win32->drag_surface,
+                                            x_root, y_root);
+
+  gdk_win32_local_drag_motion (drag, dest_window, x_root, y_root,
+                               gdk_drag_get_actions (drag),
+                               grfKeyState, evtime);
+}
+
 static gboolean
 gdk_dnd_handle_motion_event (GdkDrag  *drag,
                              GdkEvent *event)
@@ -2056,7 +2339,6 @@ gdk_dnd_handle_motion_event (GdkDrag  *drag,
   DWORD key_state;
   double x, y;
   double x_root, y_root;
-  GdkWin32Clipdrop *clipdrop;
 
   GDK_NOTE (DND, g_print ("gdk_dnd_handle_motion_event: 0x%p\n", drag));
 
@@ -2071,18 +2353,26 @@ gdk_dnd_handle_motion_event (GdkDrag  *drag,
 
   key_state = manufacture_keystate_from_GMT (state);
 
-  clipdrop = _gdk_win32_clipdrop_get ();
+  if (drag_win32->protocol == GDK_DRAG_PROTO_LOCAL)
+    {
+      gdk_local_drag_update (drag, x_root, y_root, key_state,
+                             gdk_event_get_time (event));
+    }
+  else if (drag_win32->protocol == GDK_DRAG_PROTO_OLE2)
+    {
+      GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get ();
 
-  GDK_NOTE (DND, g_print ("Post WM_MOUSEMOVE keystate=%lu\n", key_state));
+      GDK_NOTE (DND, g_print ("Post WM_MOUSEMOVE keystate=%lu\n", key_state));
 
-  drag_win32->util_data.last_x = x_root;
-  drag_win32->util_data.last_y = y_root;
+      drag_win32->util_data.last_x = x_root;
+      drag_win32->util_data.last_y = y_root;
 
-  API_CALL (PostThreadMessage, (clipdrop->dnd_thread_id,
-                                WM_MOUSEMOVE,
-                                key_state,
-                                MAKELPARAM (x_root * drag_win32->scale,
-                                            y_root * drag_win32->scale)));
+      API_CALL (PostThreadMessage, (clipdrop->dnd_thread_id,
+                                    WM_MOUSEMOVE,
+                                    key_state,
+                                    MAKELPARAM (x * drag_win32->scale,
+                                                y * drag_win32->scale)));
+    }
 
   return TRUE;
 }
@@ -2164,6 +2454,11 @@ gdk_dnd_handle_key_event (GdkDrag  *drag,
   if (drag_win32->drag_surface)
     move_drag_surface (drag, drag_win32->util_data.last_x, drag_win32->util_data.last_y);
 
+  if (drag_win32->protocol == GDK_DRAG_PROTO_LOCAL)
+    gdk_local_drag_update (drag, drag_win32->util_data.last_x, drag_win32->util_data.last_y,
+                           manufacture_keystate_from_GMT (state),
+                           gdk_event_get_time (event));
+
   return TRUE;
 }
 

gdk/win32/gdkdrop-win32.c

@@ -140,6 +140,9 @@ struct _drop_target_context
   IDataObject                    *data_object;
 };
 
+/* TRUE to use OLE2 protocol, FALSE to use local protocol */
+static gboolean use_ole2_dnd = TRUE;
+
 static void
 gdk_win32_drop_init (GdkWin32Drop *drop)
 {
@@ -193,6 +196,28 @@ gdk_drop_new (GdkDisplay        *display,
   return GDK_DROP (drop_win32);
 }
 
+/* Gets the GdkDrop that corresponds to a particular GdkSurface.
+ * Will be NULL for surfaces that are not registered as drop targets,
+ * or for surfaces that are currently not under the drag cursor.
+ * This function is only used for local DnD, where we do have
+ * a real GdkSurface that corresponds to the HWND under cursor.
+ */
+GdkDrop *
+_gdk_win32_get_drop_for_dest_surface (GdkSurface *dest)
+{
+  GdkWin32Surface *impl;
+
+  if (dest == NULL)
+    return NULL;
+
+  impl = GDK_WIN32_SURFACE (dest);
+
+  if (impl->drop_target != NULL)
+    return impl->drop_target->drop;
+
+  return impl->drop;
+}
+
 
 #define PRINT_GUID(guid) \
   g_print ("%.08lx-%.04x-%.04x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x", \
@@ -426,24 +451,49 @@ set_source_actions_helper (GdkDrop       *drop,
   return actions;
 }
 
-/* Utility function to translate screen coordinates to surface-relative
- * coordinates. This routine only works with pixel values that aren't
- * scaled by any GDK DPI scale factor.
- */
-static void
-unscaled_screen_to_client (GdkSurface* surface,
-                           double screen_x,
-                           double screen_y,
-                           double *client_x,
-                           double *client_y)
+void
+_gdk_win32_local_drop_target_dragenter (GdkDrag        *drag,
+                                        GdkSurface     *dest_surface,
+                                        int             x_root,
+                                        int             y_root,
+                                        DWORD           grfKeyState,
+                                        guint32         time_,
+                                        GdkDragAction  *actions)
 {
-  POINT client_origin;
+  GdkDrop *drop;
+  GdkWin32Drop *drop_win32;
+  GdkDisplay *display;
+  GdkDragAction source_actions;
+  GdkWin32Surface *impl = GDK_WIN32_SURFACE (dest_surface);
 
-  client_origin.x = 0;
-  client_origin.y = 0;
-  ClientToScreen (GDK_SURFACE_HWND (surface), &client_origin);
-  *client_x = screen_x - client_origin.x;
-  *client_y = screen_y - client_origin.y;
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drop_target_dragenter %p @ %d : %d"
+                          " for dest window 0x%p"
+                          ". actions = %s\n",
+                          drag, x_root, y_root,
+                          dest_surface,
+                          _gdk_win32_drag_action_to_string (*actions)));
+
+  display = gdk_surface_get_display (dest_surface);
+  drop = gdk_drop_new (display,
+                       gdk_seat_get_pointer (gdk_display_get_default_seat (display)),
+                       drag,
+                       gdk_drag_get_formats (drag),
+                       dest_surface,
+                       GDK_DRAG_PROTO_LOCAL);
+  drop_win32 = GDK_WIN32_DROP (drop);
+
+  impl->drop = drop;
+
+  source_actions = set_source_actions_helper (drop, *actions, grfKeyState);
+
+  gdk_drop_emit_enter_event (drop, TRUE, x_root, y_root, time_);
+  drop_win32->last_key_state = grfKeyState;
+  drop_win32->last_x = x_root;
+  drop_win32->last_y = y_root;
+  *actions = filter_actions (drop_win32->actions, source_actions);
+
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drop_target_dragenter returns with actions %s\n",
+                          _gdk_win32_drag_action_to_string (*actions)));
 }
 
 /* The pdwEffect here initially points
@@ -466,8 +516,6 @@ idroptarget_dragenter (LPDROPTARGET This,
   GdkDisplay *display;
   int pt_x;
   int pt_y;
-  double x = 0.0;
-  double y = 0.0;
   GdkDrag *drag;
   GdkDragAction source_actions;
   GdkDragAction dest_actions;
@@ -510,14 +558,9 @@ idroptarget_dragenter (LPDROPTARGET This,
                                               grfKeyState);
 
   set_data_object (&ctx->data_object, pDataObj);
-  pt_x = pt.x / drop_win32->scale;
-  pt_y = pt.y / drop_win32->scale;
-
-  unscaled_screen_to_client (ctx->surface, pt.x, pt.y, &x, &y);
-  x /= drop_win32->scale;
-  y /= drop_win32->scale;
-
-  gdk_drop_emit_enter_event (drop, TRUE, x, y, GDK_CURRENT_TIME);
+  pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
+  pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
+  gdk_drop_emit_enter_event (drop, TRUE, pt_x, pt_y, GDK_CURRENT_TIME);
   drop_win32->last_key_state = grfKeyState;
   drop_win32->last_x = pt_x;
   drop_win32->last_y = pt_y;
@@ -532,6 +575,55 @@ idroptarget_dragenter (LPDROPTARGET This,
   return S_OK;
 }
 
+gboolean
+_gdk_win32_local_drop_target_will_emit_motion (GdkDrop *drop,
+                                               int      x_root,
+                                               int      y_root,
+                                               DWORD    grfKeyState)
+{
+  GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop);
+
+  if (x_root != drop_win32->last_x ||
+      y_root != drop_win32->last_y ||
+      grfKeyState != drop_win32->last_key_state)
+    return TRUE;
+
+  return FALSE;
+}
+
+void
+_gdk_win32_local_drop_target_dragover (GdkDrop        *drop,
+                                       GdkDrag        *drag,
+                                       int             x_root,
+                                       int             y_root,
+                                       DWORD           grfKeyState,
+                                       guint32         time_,
+                                       GdkDragAction  *actions)
+{
+  GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop);
+  GdkDragAction source_actions;
+
+  source_actions = set_source_actions_helper (drop, *actions, grfKeyState);
+
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drop_target_dragover %p @ %d : %d"
+                          ", actions = %s\n",
+                          drop, x_root, y_root,
+                          _gdk_win32_drag_action_to_string (*actions)));
+
+  if (_gdk_win32_local_drop_target_will_emit_motion (drop, x_root, y_root, grfKeyState))
+    {
+      gdk_drop_emit_motion_event (drop, TRUE, x_root, y_root, time_);
+      drop_win32->last_key_state = grfKeyState;
+      drop_win32->last_x = x_root;
+      drop_win32->last_y = y_root;
+    }
+
+  *actions = filter_actions (drop_win32->actions, source_actions);
+
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drop_target_dragover returns with actions %s\n",
+                          _gdk_win32_drag_action_to_string (*actions)));
+}
+
 /* NOTE: This method is called continuously, even if nothing is
  * happening, as long as the drag operation is in progress and
  * the cursor is above our window.
@@ -550,8 +642,8 @@ idroptarget_dragover (LPDROPTARGET This,
 {
   drop_target_context *ctx = (drop_target_context *) This;
   GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop);
-  int pt_x = pt.x / drop_win32->scale;
-  int pt_y = pt.y / drop_win32->scale;
+  int pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
+  int pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
   GdkDragAction source_actions;
   GdkDragAction dest_actions;
 
@@ -572,14 +664,7 @@ idroptarget_dragover (LPDROPTARGET This,
       pt_y != drop_win32->last_y ||
       grfKeyState != drop_win32->last_key_state)
     {
-      double x = 0.0;
-      double y = 0.0;
-
-      unscaled_screen_to_client (ctx->surface, pt.x, pt.y, &x, &y);
-      x /= drop_win32->scale;
-      y /= drop_win32->scale;
-
-      gdk_drop_emit_motion_event (ctx->drop, TRUE, x, y, GDK_CURRENT_TIME);
+      gdk_drop_emit_motion_event (ctx->drop, TRUE, pt_x, pt_y, GDK_CURRENT_TIME);
       drop_win32->last_key_state = grfKeyState;
       drop_win32->last_x = pt_x;
       drop_win32->last_y = pt_y;
@@ -596,6 +681,18 @@ idroptarget_dragover (LPDROPTARGET This,
   return S_OK;
 }
 
+void
+_gdk_win32_local_drop_target_dragleave (GdkDrop *drop,
+                                        guint32  time_)
+{
+  GdkWin32Surface *impl = GDK_WIN32_SURFACE (gdk_drop_get_surface (drop));
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drop_target_dragleave %p\n", drop));
+
+  gdk_drop_emit_leave_event (drop, TRUE, time_);
+
+  g_clear_object (&impl->drop);
+}
+
 static HRESULT STDMETHODCALLTYPE
 idroptarget_dragleave (LPDROPTARGET This)
 {
@@ -611,6 +708,35 @@ idroptarget_dragleave (LPDROPTARGET This)
   return S_OK;
 }
 
+void
+_gdk_win32_local_drop_target_drop (GdkDrop        *drop,
+                                   GdkDrag        *drag,
+                                   guint32         time_,
+                                   GdkDragAction  *actions)
+{
+  GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop);
+
+  GDK_NOTE (DND, g_print ("_gdk_win32_local_drop_target_drop %p ", drop));
+
+  set_source_actions_helper (drop,
+                             *actions,
+                             drop_win32->last_key_state);
+
+  drop_win32->drop_finished = FALSE;
+  gdk_drop_emit_drop_event (drop, TRUE, drop_win32->last_x, drop_win32->last_y, time_);
+
+  while (!drop_win32->drop_finished)
+    g_main_context_iteration (NULL, FALSE);
+
+  /* Notify local source of the DnD result
+   * Special case:
+   * drop_win32->actions is guaranteed to contain 1 action after gdk_drop_finish ()
+   */
+  *actions = drop_win32->actions;
+
+  GDK_NOTE (DND, g_print ("drop with action %s\n", _gdk_win32_drag_action_to_string (*actions)));
+}
+
 static HRESULT STDMETHODCALLTYPE
 idroptarget_drop (LPDROPTARGET This,
                   LPDATAOBJECT pDataObj,
@@ -620,8 +746,8 @@ idroptarget_drop (LPDROPTARGET This,
 {
   drop_target_context *ctx = (drop_target_context *) This;
   GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop);
-  double x = 0.0;
-  double y = 0.0;
+  int pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
+  int pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
   GdkDragAction dest_action;
 
   GDK_NOTE (DND, g_print ("idroptarget_drop %p ", This));
@@ -641,12 +767,7 @@ idroptarget_drop (LPDROPTARGET This,
                              grfKeyState);
 
   drop_win32->drop_finished = FALSE;
-
-  unscaled_screen_to_client (ctx->surface, pt.x, pt.y, &x, &y);
-  x /= drop_win32->scale;
-  y /= drop_win32->scale;
-
-  gdk_drop_emit_drop_event (ctx->drop, TRUE, x, y, GDK_CURRENT_TIME);
+  gdk_drop_emit_drop_event (ctx->drop, TRUE, pt_x, pt_y, GDK_CURRENT_TIME);
 
   while (!drop_win32->drop_finished)
     g_main_context_iteration (NULL, FALSE);
@@ -928,8 +1049,8 @@ gdk_dropfiles_filter (GdkWin32Display *display,
 
   gdk_drop_emit_drop_event (drop,
                             FALSE, 
-                            pt.x / drop_win32->scale,
-                            pt.y / drop_win32->scale,
+                            pt.x / drop_win32->scale + _gdk_offset_x,
+                            pt.y / drop_win32->scale + _gdk_offset_y,
                             _gdk_win32_get_next_tick (msg->time));
 
   DragFinish (hdrop);
@@ -957,6 +1078,14 @@ gdk_win32_drop_status (GdkDrop       *drop,
                           _gdk_win32_drag_action_to_string (preferred)));
 
   drop_win32->actions = actions;
+
+  if (drop_win32->protocol == GDK_DRAG_PROTO_OLE2)
+    return;
+
+  drag = gdk_drop_get_drag (drop);
+
+  if (drag != NULL)
+    _gdk_win32_local_drag_give_feedback (drag, actions);
 }
 
 static void
@@ -972,6 +1101,9 @@ gdk_win32_drop_finish (GdkDrop       *drop,
 
   drop_win32->actions = action;
   drop_win32->drop_finished = TRUE;
+
+  if (drop_win32->protocol == GDK_DRAG_PROTO_OLE2)
+    return;
 }
 
 #if 0
@@ -1004,7 +1136,6 @@ _gdk_win32_surface_register_dnd (GdkSurface *window)
 {
   drop_target_context *ctx;
   HRESULT hr;
-  GdkWin32Surface *impl;
 
   g_return_if_fail (window != NULL);
 
@@ -1015,30 +1146,43 @@ _gdk_win32_surface_register_dnd (GdkSurface *window)
 
   GDK_NOTE (DND, g_print ("gdk_win32_surface_register_dnd: %p\n", GDK_SURFACE_HWND (window)));
 
-  impl = GDK_WIN32_SURFACE (window);
-
-  /* Return if window is already setup for DND. */
-  if (impl->drop_target != NULL)
-    return;
-
-  ctx = target_context_new (window);
-
-  hr = CoLockObjectExternal ((IUnknown *) &ctx->idt, TRUE, FALSE);
-  if (!SUCCEEDED (hr))
-    OTHER_API_FAILED ("CoLockObjectExternal");
+  if (!use_ole2_dnd)
+    {
+      /* We always claim to accept dropped files, but in fact we might not,
+       * of course. This function is called in such a way that it cannot know
+       * whether the window (widget) in question actually accepts files
+       * (in gtk, data of type text/uri-list) or not.
+       */
+      gdk_win32_display_add_filter (GDK_WIN32_DISPLAY (gdk_display_get_default ()), gdk_dropfiles_filter, NULL);
+      DragAcceptFiles (GDK_SURFACE_HWND (window), TRUE);
+    }
   else
     {
-      hr = RegisterDragDrop (GDK_SURFACE_HWND (window), &ctx->idt);
-      if (hr == DRAGDROP_E_ALREADYREGISTERED)
-        {
-          g_print ("DRAGDROP_E_ALREADYREGISTERED\n");
-          CoLockObjectExternal ((IUnknown *) &ctx->idt, FALSE, FALSE);
-        }
-      else if (!SUCCEEDED (hr))
-        OTHER_API_FAILED ("RegisterDragDrop");
+      GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
+
+      /* Return if window is already setup for DND. */
+      if (impl->drop_target != NULL)
+        return;
+
+      ctx = target_context_new (window);
+
+      hr = CoLockObjectExternal ((IUnknown *) &ctx->idt, TRUE, FALSE);
+      if (!SUCCEEDED (hr))
+        OTHER_API_FAILED ("CoLockObjectExternal");
       else
         {
-          impl->drop_target = ctx;
+          hr = RegisterDragDrop (GDK_SURFACE_HWND (window), &ctx->idt);
+          if (hr == DRAGDROP_E_ALREADYREGISTERED)
+            {
+              g_print ("DRAGDROP_E_ALREADYREGISTERED\n");
+              CoLockObjectExternal ((IUnknown *) &ctx->idt, FALSE, FALSE);
+            }
+          else if (!SUCCEEDED (hr))
+            OTHER_API_FAILED ("RegisterDragDrop");
+          else
+            {
+              impl->drop_target = ctx;
+            }
         }
     }
 }
@@ -1274,3 +1418,10 @@ gdk_win32_drop_class_init (GdkWin32DropClass *klass)
   drop_class->read_async = gdk_win32_drop_read_async;
   drop_class->read_finish = gdk_win32_drop_read_finish;
 }
+
+void
+_gdk_drop_init (void)
+{
+  if (g_strcmp0 (getenv ("GDK_WIN32_OLE2_DND"), "0") == 0)
+    use_ole2_dnd = FALSE;
+}

gdk/win32/gdkevents-win32.c

@@ -55,15 +55,12 @@
 #include "gdkdevicemanager-win32.h"
 #include "gdkdisplay-win32.h"
 #include "gdkdeviceprivate.h"
-#include "gdkdevice-virtual.h"
 #include "gdkdevice-wintab.h"
-#include "gdkinput-winpointer.h"
 #include "gdkwin32dnd.h"
 #include "gdkwin32dnd-private.h"
 #include "gdkdisplay-win32.h"
 //#include "gdkselection-win32.h"
 #include "gdkdragprivate.h"
-#include "gdk-private.h"
 
 #include <windowsx.h>
 
@@ -73,9 +70,8 @@
 #endif
 
 #include <objbase.h>
+
 #include <imm.h>
-#include <tchar.h>
-#include <tpcshrd.h>
 
 #define GDK_MOD2_MASK (1 << 4)
 
@@ -166,10 +162,6 @@ static int both_shift_pressed[2]; /* to store keycodes for shift keys */
 static HHOOK keyboard_hook = NULL;
 static UINT aerosnap_message;
 
-static gboolean pen_touch_input;
-static POINT pen_touch_cursor_position;
-static LONG last_digitizer_time;
-
 static void
 track_mouse_event (DWORD dwFlags,
 		   HWND  hwnd)
@@ -204,18 +196,6 @@ _gdk_win32_get_next_tick (gulong suggested_tick)
     return cur_tick = suggested_tick;
 }
 
-BOOL
-_gdk_win32_get_cursor_pos (LPPOINT lpPoint)
-{
-  if (pen_touch_input)
-    {
-      *lpPoint = pen_touch_cursor_position;
-      return TRUE;
-    }
-  else
-    return GetCursorPos (lpPoint);
-}
-
 static void
 generate_focus_event (GdkDeviceManagerWin32 *device_manager,
                       GdkSurface        *window,
@@ -522,7 +502,7 @@ _gdk_events_init (GdkDisplay *display)
 #endif
 
   source = g_source_new (&event_funcs, sizeof (GdkWin32EventSource));
-  g_source_set_static_name (source, "GDK Win32 event source");
+  g_source_set_name (source, "GDK Win32 event source");
   g_source_set_priority (source, GDK_PRIORITY_EVENTS);
 
   event_source = (GdkWin32EventSource *)source;
@@ -1055,12 +1035,11 @@ do_show_window (GdkSurface *window, gboolean hide_window)
 
 static void
 send_crossing_event (GdkDisplay                 *display,
-                     GdkDevice                  *physical_device,
-		     GdkSurface                 *window,
+		     GdkSurface                  *window,
 		     GdkEventType                type,
 		     GdkCrossingMode             mode,
 		     GdkNotifyType               notify_type,
-		     GdkSurface                 *subwindow,
+		     GdkSurface                  *subwindow,
 		     POINT                      *screen_pt,
 		     GdkModifierType             mask,
 		     guint32                     time_)
@@ -1087,18 +1066,16 @@ send_crossing_event (GdkDisplay                 *display,
   pt = *screen_pt;
   ScreenToClient (GDK_SURFACE_HWND (window), &pt);
 
-  _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer, physical_device);
-
   event = gdk_crossing_event_new (type,
                                   window,
                                   device_manager->core_pointer,
-                                  time_,
+                                  _gdk_win32_get_next_tick (time_),
                                   mask,
                                   pt.x / impl->surface_scale,
                                   pt.y / impl->surface_scale,
                                   mode,
                                   notify_type);
-
+          
   _gdk_win32_append_event (event);
 }
 
@@ -1141,9 +1118,8 @@ find_common_ancestor (GdkSurface *win1,
 
 void
 synthesize_crossing_events (GdkDisplay                 *display,
-                            GdkDevice                  *physical_device,
-			    GdkSurface                 *src,
-			    GdkSurface                 *dest,
+			    GdkSurface                  *src,
+			    GdkSurface                  *dest,
 			    GdkCrossingMode             mode,
 			    POINT                      *screen_pt,
 			    GdkModifierType             mask,
@@ -1176,7 +1152,6 @@ synthesize_crossing_events (GdkDisplay                 *display,
       else
 	notify_type = GDK_NOTIFY_ANCESTOR;
       send_crossing_event (display,
-                           physical_device,
 			   a, GDK_LEAVE_NOTIFY,
 			   mode,
 			   notify_type,
@@ -1196,7 +1171,6 @@ synthesize_crossing_events (GdkDisplay                 *display,
 	  while (win != c && win != NULL)
 	    {
 	      send_crossing_event (display,
-                                   physical_device,
 				   win, GDK_LEAVE_NOTIFY,
 				   mode,
 				   notify_type,
@@ -1239,7 +1213,6 @@ synthesize_crossing_events (GdkDisplay                 *display,
 		next = b;
 
 	      send_crossing_event (display,
-                                   physical_device,
 				   win, GDK_ENTER_NOTIFY,
 				   mode,
 				   notify_type,
@@ -1259,7 +1232,6 @@ synthesize_crossing_events (GdkDisplay                 *display,
 	notify_type = GDK_NOTIFY_INFERIOR;
 
       send_crossing_event (display,
-                           physical_device,
 			   b, GDK_ENTER_NOTIFY,
 			   mode,
 			   notify_type,
@@ -1269,33 +1241,14 @@ synthesize_crossing_events (GdkDisplay                 *display,
     }
 }
 
-static void
-make_crossing_event (GdkDevice *physical_device,
-                     GdkSurface *surface,
-                     POINT *screen_pt,
-                     guint32 time_)
-{
-  GDK_NOTE (EVENTS, g_print (" mouse_window %p -> %p",
-                             mouse_window ? GDK_SURFACE_HWND (mouse_window) : NULL,
-                             surface ? GDK_SURFACE_HWND (surface) : NULL));
-  synthesize_crossing_events (_gdk_display,
-                              physical_device,
-                              mouse_window, surface,
-                              GDK_CROSSING_NORMAL,
-                              screen_pt,
-                              0, /* TODO: Set right mask */
-                              time_,
-                              FALSE);
-  g_set_object (&mouse_window, surface);
-}
-
 /* Acquires actual client area size of the underlying native window.
+ * Rectangle is in GDK screen coordinates (_gdk_offset_* is added).
  * Returns FALSE if configure events should be inhibited,
  * TRUE otherwise.
  */
 gboolean
 _gdk_win32_get_window_rect (GdkSurface *window,
-                            RECT       *rect)
+                            RECT      *rect)
 {
   RECT client_rect;
   POINT point;
@@ -1310,7 +1263,11 @@ _gdk_win32_get_window_rect (GdkSurface *window,
 
   /* top level windows need screen coords */
   if (GDK_IS_TOPLEVEL (window))
-    ClientToScreen (hwnd, &point);
+    {
+      ClientToScreen (hwnd, &point);
+      point.x += _gdk_offset_x * impl->surface_scale;
+      point.y += _gdk_offset_y * impl->surface_scale;
+    }
 
   rect->left = point.x;
   rect->top = point.y;
@@ -1568,9 +1525,6 @@ generate_button_event (GdkEventType      type,
   current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
   current_y = (gint16) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
 
-  _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
-                                  _gdk_device_manager->system_pointer);
-
   event = gdk_button_event_new (type,
                                 window,
                                 device_manager->core_pointer,
@@ -1802,8 +1756,6 @@ gdk_event_translate (MSG *msg,
   GdkDeviceGrabInfo *pointer_grab = NULL;
   GdkSurface *grab_window = NULL;
 
-  crossing_cb_t crossing_cb = NULL;
-
   int button;
 
   char buf[256];
@@ -2226,8 +2178,6 @@ gdk_event_translate (MSG *msg,
 		g_print (" (%d,%d)",
 			 GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      pen_touch_input = FALSE;
-
       g_set_object (&window, find_window_for_mouse_event (window, msg));
       /* TODO_CSW?: there used to some synthesize and propagate */
       if (GDK_SURFACE_DESTROYED (window))
@@ -2270,8 +2220,6 @@ gdk_event_translate (MSG *msg,
 		g_print (" (%d,%d)",
 			 GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      pen_touch_input = FALSE;
-
       g_set_object (&window, find_window_for_mouse_event (window, msg));
 
       if (pointer_grab == NULL && implicit_grab_surface != NULL)
@@ -2296,12 +2244,11 @@ gdk_event_translate (MSG *msg,
 		}
 
 	      synthesize_crossing_events (display,
-                                          _gdk_device_manager->system_pointer,
 					  implicit_grab_surface, new_window,
 					  GDK_CROSSING_UNGRAB,
 					  &msg->pt,
 					  0, /* TODO: Set right mask */
-					  _gdk_win32_get_next_tick (msg->time),
+					  msg->time,
 					  FALSE);
 	      g_set_object (&implicit_grab_surface, NULL);
 	      g_set_object (&mouse_window, new_window);
@@ -2330,23 +2277,6 @@ gdk_event_translate (MSG *msg,
 			 (gpointer) msg->wParam,
 			 GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      /* Even if we handle WM_POINTER messages, synthetic WM_MOUSEMOVE messages
-       * are still sent occasionally by the OS, e.g. when a surface is hidden
-       * or shown. Discard spurious WM_MOUSEMOVE messages while handling pen or
-       * touch input
-       *
-       * See the article
-       * "Why do I get spurious WM_MOUSEMOVE messages?" by Raymond Chen:
-       * https://devblogs.microsoft.com/oldnewthing/20031001-00/?p=42343
-       *
-       */
-      if (win32_display->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER &&
-          ( (msg->time - last_digitizer_time) < 200 ||
-           -(msg->time - last_digitizer_time) < 200 ))
-        break;
-
-      pen_touch_input = FALSE;
-
       new_window = window;
 
       if (pointer_grab != NULL)
@@ -2374,16 +2304,15 @@ gdk_event_translate (MSG *msg,
 
       if (mouse_window != new_window)
 	{
-	  GDK_NOTE (EVENTS, g_print (" mouse_window %p -> %p",
+	  GDK_NOTE (EVENTS, g_print (" mouse_sinwod %p -> %p",
 				     mouse_window ? GDK_SURFACE_HWND (mouse_window) : NULL,
 				     new_window ? GDK_SURFACE_HWND (new_window) : NULL));
 	  synthesize_crossing_events (display,
-                                      _gdk_device_manager->system_pointer,
 				      mouse_window, new_window,
 				      GDK_CROSSING_NORMAL,
 				      &msg->pt,
 				      0, /* TODO: Set right mask */
-				      _gdk_win32_get_next_tick (msg->time),
+				      msg->time,
 				      FALSE);
 	  g_set_object (&mouse_window, new_window);
 	  mouse_window_ignored_leave = NULL;
@@ -2404,15 +2333,15 @@ gdk_event_translate (MSG *msg,
       impl = GDK_WIN32_SURFACE (window);
 
       /* If we haven't moved, don't create any GDK event. Windows
-       * sends WM_MOUSEMOVE messages after a new window is shown under
+       * sends WM_MOUSEMOVE messages after a new window is shows under
        * the mouse, even if the mouse hasn't moved. This disturbs gtk.
        */
-      if (msg->pt.x / impl->surface_scale == current_root_x &&
-          msg->pt.y / impl->surface_scale == current_root_y)
-        break;
+      if ((msg->pt.x + _gdk_offset_x) / impl->surface_scale == current_root_x &&
+	  (msg->pt.y + _gdk_offset_y) / impl->surface_scale == current_root_y)
+	break;
 
-      current_root_x = msg->pt.x / impl->surface_scale;
-      current_root_y = msg->pt.y / impl->surface_scale;
+      current_root_x = (msg->pt.x + _gdk_offset_x) / impl->surface_scale;
+      current_root_y = (msg->pt.y + _gdk_offset_y) / impl->surface_scale;
 
       if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
         gdk_win32_surface_do_move_resize_drag (window, current_root_x, current_root_y);
@@ -2421,9 +2350,6 @@ gdk_event_translate (MSG *msg,
 	  current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
 	  current_y = (gint16) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
 
-          _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
-                                          _gdk_device_manager->system_pointer);
-
 	  event = gdk_motion_event_new (window,
 	                                device_manager_win32->core_pointer,
                                         NULL,
@@ -2449,8 +2375,6 @@ gdk_event_translate (MSG *msg,
       GDK_NOTE (EVENTS, g_print (" %d (%ld,%ld)",
 				 HIWORD (msg->wParam), msg->pt.x, msg->pt.y));
 
-      pen_touch_input = FALSE;
-
       new_window = NULL;
       hwnd = WindowFromPoint (msg->pt);
       ignore_leave = FALSE;
@@ -2476,12 +2400,11 @@ gdk_event_translate (MSG *msg,
 
       if (!ignore_leave)
 	synthesize_crossing_events (display,
-                                    _gdk_device_manager->system_pointer,
 				    mouse_window, new_window,
 				    GDK_CROSSING_NORMAL,
 				    &msg->pt,
 				    0, /* TODO: Set right mask */
-				    _gdk_win32_get_next_tick (msg->time),
+				    msg->time,
 				    FALSE);
       g_set_object (&mouse_window, new_window);
       mouse_window_ignored_leave = ignore_leave ? new_window : NULL;
@@ -2490,213 +2413,6 @@ gdk_event_translate (MSG *msg,
       return_val = TRUE;
       break;
 
-    case WM_POINTERDOWN:
-      if (win32_display->tablet_input_api != GDK_WIN32_TABLET_INPUT_API_WINPOINTER ||
-          gdk_winpointer_should_forward_message (msg))
-        {
-          return_val = FALSE;
-          break;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
-        {
-          current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
-          current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
-          pen_touch_input = TRUE;
-          last_digitizer_time = msg->time;
-        }
-
-      if (pointer_grab != NULL &&
-          !pointer_grab->implicit &&
-          !pointer_grab->owner_events)
-        g_set_object (&window, pointer_grab->surface);
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) && mouse_window != window)
-        crossing_cb = make_crossing_event;
-
-      gdk_winpointer_input_events (window, crossing_cb, msg);
-
-      *ret_valp = 0;
-      return_val = TRUE;
-      break;
-
-    case WM_POINTERUP:
-      if (win32_display->tablet_input_api != GDK_WIN32_TABLET_INPUT_API_WINPOINTER ||
-          gdk_winpointer_should_forward_message (msg))
-        {
-          return_val = FALSE;
-          break;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
-        {
-          current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
-          current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
-          pen_touch_input = TRUE;
-          last_digitizer_time = msg->time;
-        }
-
-      if (pointer_grab != NULL &&
-          !pointer_grab->implicit &&
-          !pointer_grab->owner_events)
-        g_set_object (&window, pointer_grab->surface);
-
-      gdk_winpointer_input_events (window, NULL, msg);
-
-      impl = GDK_WIN32_SURFACE (window);
-      if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
-        {
-          gdk_win32_surface_end_move_resize_drag (window);
-        }
-
-      *ret_valp = 0;
-      return_val = TRUE;
-      break;
-
-    case WM_POINTERUPDATE:
-      if (win32_display->tablet_input_api != GDK_WIN32_TABLET_INPUT_API_WINPOINTER ||
-          gdk_winpointer_should_forward_message (msg))
-        {
-          return_val = FALSE;
-          break;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
-        {
-          current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
-          current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
-          pen_touch_input = TRUE;
-          last_digitizer_time = msg->time;
-        }
-
-      if (pointer_grab != NULL &&
-          !pointer_grab->implicit &&
-          !pointer_grab->owner_events)
-        g_set_object (&window, pointer_grab->surface);
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) && mouse_window != window)
-        crossing_cb = make_crossing_event;
-
-      impl = GDK_WIN32_SURFACE (window);
-
-      if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
-        {
-          gdk_win32_surface_do_move_resize_drag (window, current_root_x, current_root_y);
-        }
-      else
-        {
-          gdk_winpointer_input_events (window, crossing_cb, msg);
-        }
-
-      *ret_valp = 0;
-      return_val = TRUE;
-      break;
-
-    case WM_NCPOINTERUPDATE:
-      if (win32_display->tablet_input_api != GDK_WIN32_TABLET_INPUT_API_WINPOINTER ||
-          gdk_winpointer_should_forward_message (msg))
-        {
-          return_val = FALSE;
-          break;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
-        {
-          current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
-          current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
-          pen_touch_input = TRUE;
-          last_digitizer_time = msg->time;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) &&
-          !IS_POINTER_INCONTACT_WPARAM (msg->wParam) &&
-          mouse_window != NULL)
-        {
-          GdkDevice *event_device = NULL;
-          guint32 event_time = 0;
-
-          if (gdk_winpointer_get_message_info (msg, &event_device, &event_time))
-            {
-              make_crossing_event(event_device,
-                                  NULL,
-                                  &pen_touch_cursor_position,
-                                  event_time);
-            }
-        }
-
-      return_val = FALSE; /* forward to DefWindowProc */
-      break;
-
-    case WM_POINTERENTER:
-      if (win32_display->tablet_input_api != GDK_WIN32_TABLET_INPUT_API_WINPOINTER ||
-          gdk_winpointer_should_forward_message (msg))
-        {
-          return_val = FALSE;
-          break;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
-        {
-          current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
-          current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
-          pen_touch_input = TRUE;
-          last_digitizer_time = msg->time;
-        }
-
-      if (pointer_grab != NULL &&
-          !pointer_grab->implicit &&
-          !pointer_grab->owner_events)
-        g_set_object (&window, pointer_grab->surface);
-
-      if (IS_POINTER_NEW_WPARAM (msg->wParam))
-        {
-          gdk_winpointer_input_events (window, NULL, msg);
-        }
-
-      *ret_valp = 0;
-      return_val = TRUE;
-      break;
-
-    case WM_POINTERLEAVE:
-      if (win32_display->tablet_input_api != GDK_WIN32_TABLET_INPUT_API_WINPOINTER ||
-          gdk_winpointer_should_forward_message (msg))
-        {
-          return_val = FALSE;
-          break;
-        }
-
-      if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
-        {
-          current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
-          current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
-          pen_touch_input = TRUE;
-          last_digitizer_time = msg->time;
-        }
-
-      if (!IS_POINTER_INRANGE_WPARAM (msg->wParam))
-        {
-          gdk_winpointer_input_events (window, NULL, msg);
-        }
-      else if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) && mouse_window != NULL)
-        {
-          GdkDevice *event_device = NULL;
-          guint32 event_time = 0;
-
-          if (gdk_winpointer_get_message_info (msg, &event_device, &event_time))
-            {
-              make_crossing_event(event_device,
-                                  NULL,
-                                  &pen_touch_cursor_position,
-                                  event_time);
-            }
-        }
-
-      gdk_winpointer_interaction_ended (msg);
-
-      *ret_valp = 0;
-      return_val = TRUE;
-      break;
-
     case WM_MOUSEWHEEL:
     case WM_MOUSEHWHEEL:
       GDK_NOTE (EVENTS, g_print (" %d", (short) HIWORD (msg->wParam)));
@@ -2759,9 +2475,6 @@ gdk_event_translate (MSG *msg,
        */
       delta_y *= -1.0;
 
-      _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
-                                      _gdk_device_manager->system_pointer);
-
       event = gdk_scroll_event_new (window,
                                     device_manager_win32->core_pointer,
                                     NULL,
@@ -2795,6 +2508,44 @@ gdk_event_translate (MSG *msg,
       return_val = TRUE;
       break;
 
+    case WM_HSCROLL:
+      /* Just print more debugging information, don't actually handle it. */
+      GDK_NOTE (EVENTS,
+		(g_print (" %s",
+			  (LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
+			   (LOWORD (msg->wParam) == SB_LEFT ? "LEFT" :
+			    (LOWORD (msg->wParam) == SB_RIGHT ? "RIGHT" :
+			     (LOWORD (msg->wParam) == SB_LINELEFT ? "LINELEFT" :
+			      (LOWORD (msg->wParam) == SB_LINERIGHT ? "LINERIGHT" :
+			       (LOWORD (msg->wParam) == SB_PAGELEFT ? "PAGELEFT" :
+				(LOWORD (msg->wParam) == SB_PAGERIGHT ? "PAGERIGHT" :
+				 (LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
+				  (LOWORD (msg->wParam) == SB_THUMBTRACK ? "THUMBTRACK" :
+				   "???")))))))))),
+		 (LOWORD (msg->wParam) == SB_THUMBPOSITION ||
+		  LOWORD (msg->wParam) == SB_THUMBTRACK) ?
+		 (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
+      break;
+
+    case WM_VSCROLL:
+      /* Just print more debugging information, don't actually handle it. */
+      GDK_NOTE (EVENTS,
+		(g_print (" %s",
+			  (LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
+			   (LOWORD (msg->wParam) == SB_BOTTOM ? "BOTTOM" :
+			    (LOWORD (msg->wParam) == SB_TOP ? "TOP" :
+			     (LOWORD (msg->wParam) == SB_LINEDOWN ? "LINDOWN" :
+			      (LOWORD (msg->wParam) == SB_LINEUP ? "LINEUP" :
+			       (LOWORD (msg->wParam) == SB_PAGEDOWN ? "PAGEDOWN" :
+				(LOWORD (msg->wParam) == SB_PAGEUP ? "PAGEUP" :
+				 (LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
+				  (LOWORD (msg->wParam) == SB_THUMBTRACK ? "THUMBTRACK" :
+				   "???")))))))))),
+		 (LOWORD (msg->wParam) == SB_THUMBPOSITION ||
+		  LOWORD (msg->wParam) == SB_THUMBTRACK) ?
+		 (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
+      break;
+
      case WM_MOUSEACTIVATE:
        {
 	 if (GDK_IS_DRAG_SURFACE (window))
@@ -2812,16 +2563,6 @@ gdk_event_translate (MSG *msg,
 
        break;
 
-    case WM_POINTERACTIVATE:
-      if (GDK_IS_DRAG_SURFACE (window) ||
-          _gdk_modal_blocked (window))
-        {
-          *ret_valp = PA_NOACTIVATE;
-          return_val = TRUE;
-        }
-
-      break;
-
     case WM_KILLFOCUS:
       if (keyboard_grab != NULL &&
 	  !GDK_SURFACE_DESTROYED (keyboard_grab->surface) &&
@@ -3213,13 +2954,6 @@ gdk_event_translate (MSG *msg,
       *ret_valp = 0;
       break;
 
-    case WM_DESTROY:
-      if (win32_display->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER)
-        gdk_winpointer_finalize_surface (window);
-
-      return_val = FALSE;
-      break;
-
     case WM_NCDESTROY:
       if ((pointer_grab != NULL && pointer_grab->surface == window) ||
           (keyboard_grab && keyboard_grab->surface == window))
@@ -3300,15 +3034,12 @@ gdk_event_translate (MSG *msg,
         {
           gdk_synthesize_surface_state (window, 0, GDK_TOPLEVEL_STATE_FOCUSED);
 
-          if (win32_display->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINTAB)
-            {
-              /* Bring any tablet contexts to the top of the overlap order when
-               * one of our windows is activated.
-               * NOTE: It doesn't seem to work well if it is done in WM_ACTIVATEAPP
-               * instead
-               */
-              _gdk_wintab_set_tablet_active ();
-           }
+          /* Bring any tablet contexts to the top of the overlap order when
+           * one of our windows is activated.
+           * NOTE: It doesn't seem to work well if it is done in WM_ACTIVATEAPP
+           * instead
+           */
+          _gdk_input_set_tablet_active ();
         }
 
       break;
@@ -3325,16 +3056,6 @@ gdk_event_translate (MSG *msg,
                                      GET_Y_LPARAM (msg->lParam), ret_valp);
       break;
 
-    case WM_TABLET_QUERYSYSTEMGESTURESTATUS:
-      *ret_valp = TABLET_DISABLE_PRESSANDHOLD |
-                  TABLET_DISABLE_PENTAPFEEDBACK |
-                  TABLET_DISABLE_PENBARRELFEEDBACK |
-                  TABLET_DISABLE_FLICKS |
-                  TABLET_DISABLE_FLICKFALLBACKKEYS;
-      return_val = TRUE;
-      break;
-
-
       /* Handle WINTAB events here, as we know that the device manager will
        * use the fixed WT_DEFBASE as lcMsgBase, and we thus can use the
        * constants as case labels.
@@ -3357,14 +3078,11 @@ gdk_event_translate (MSG *msg,
       /* Fall through */
     wintab:
 
-      if (win32_display->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINTAB)
+      event = gdk_input_other_event (display, msg, window);
+      if (event)
         {
-          event = gdk_wintab_make_event (display, msg, window);
-          if (event)
-            {
-              _gdk_win32_append_event (event);
-               gdk_event_unref (event);
-            }
+          _gdk_win32_append_event (event);
+	  gdk_event_unref (event);
         }
 
       break;

gdk/win32/gdkglcontext-win32-egl.c

@@ -256,9 +256,6 @@ gdk_win32_display_init_egl (GdkDisplay  *display,
   int best_idx = 0;
   EGLDisplay egl_disp;
 
-  if (!gdk_gl_backend_can_be_used (GDK_GL_EGL, error))
-    return FALSE;
-
   if (display_win32->egl_disp != EGL_NO_DISPLAY)
     return TRUE;
   
@@ -280,7 +277,7 @@ gdk_win32_display_init_egl (GdkDisplay  *display,
   display_win32->egl_disp = egl_disp;
   display_win32->egl_version = epoxy_egl_version (egl_disp);
 
-  eglBindAPI (EGL_OPENGL_ES_API);
+  eglBindAPI(EGL_OPENGL_ES_API);
 
   display_win32->hasEglSurfacelessContext =
     epoxy_has_egl_extension (egl_disp, "EGL_KHR_surfaceless_context");
@@ -491,8 +488,6 @@ gdk_win32_gl_context_egl_class_init (GdkWin32GLContextClass *klass)
   GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS(klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  context_class->backend_type = GDK_GL_EGL;
-
   context_class->realize = gdk_win32_gl_context_egl_realize;
   context_class->make_current = gdk_win32_gl_context_egl_make_current;
   context_class->clear_current = gdk_win32_gl_context_egl_clear_current;

gdk/win32/gdkglcontext-win32-wgl.c

@@ -265,9 +265,6 @@ gdk_win32_display_init_wgl (GdkDisplay  *display,
   GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
   HDC hdc;
 
-  if (!gdk_gl_backend_can_be_used (GDK_GL_WGL, error))
-    return FALSE;
-
   if (display_win32->wgl_pixel_format != 0)
     return TRUE;
 
@@ -281,9 +278,6 @@ gdk_win32_display_init_wgl (GdkDisplay  *display,
   if (best_idx == 0 ||
      !wglMakeCurrent (hdc, display_win32->dummy_context_wgl.hglrc))
     {
-      if (display_win32->dummy_context_wgl.hglrc != NULL)
-        wglDeleteContext (display_win32->dummy_context_wgl.hglrc);
-
       g_set_error_literal (error, GDK_GL_ERROR,
                            GDK_GL_ERROR_NOT_AVAILABLE,
                            _("No GL implementation is available"));
@@ -291,25 +285,8 @@ gdk_win32_display_init_wgl (GdkDisplay  *display,
       return FALSE;
     }
 
-  display_win32->gl_version = epoxy_gl_version ();
-
-  /* We must have OpenGL/WGL 2.0 or later, or have the GL_ARB_shader_objects extension */
-  if (display_win32->gl_version < 20)
-    {
-      if (!epoxy_has_gl_extension ("GL_ARB_shader_objects"))
-        {
-          wglMakeCurrent (NULL, NULL);
-          wglDeleteContext (display_win32->dummy_context_wgl.hglrc);
-
-          g_set_error_literal (error, GDK_GL_ERROR,
-                               GDK_GL_ERROR_NOT_AVAILABLE,
-                               _("No GL implementation is available"));
-
-          return FALSE;
-        }
-    }
-
   display_win32->wgl_pixel_format = best_idx;
+  display_win32->gl_version = epoxy_gl_version ();
 
   display_win32->hasWglARBCreateContext =
     epoxy_has_wgl_extension (hdc, "WGL_ARB_create_context");
@@ -701,8 +678,6 @@ gdk_win32_gl_context_wgl_class_init (GdkWin32GLContextWGLClass *klass)
   GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  context_class->backend_type = GDK_GL_WGL;
-
   context_class->realize = gdk_win32_gl_context_wgl_realize;
   context_class->make_current = gdk_win32_gl_context_wgl_make_current;
   context_class->clear_current = gdk_win32_gl_context_wgl_clear_current;

gdk/win32/gdkglobals-win32.c

@@ -30,6 +30,8 @@
 GdkDisplay	 *_gdk_display = NULL;
 GdkDeviceManagerWin32 *_gdk_device_manager = NULL;
 
+int		  _gdk_offset_x, _gdk_offset_y;
+
 HDC		  _gdk_display_hdc;
 HINSTANCE	  _gdk_dll_hinstance;
 HINSTANCE	  _gdk_app_hmodule;
@@ -40,6 +42,9 @@ HKL		  _gdk_input_locale;
 gboolean	  _gdk_input_locale_is_ime = FALSE;
 UINT		  _gdk_input_codepage;
 
+int		  _gdk_input_ignore_wintab = FALSE;
+int		  _gdk_max_colors = 0;
+
 GdkWin32ModalOpKind	  _modal_operation_in_progress = GDK_WIN32_MODAL_OP_NONE;
 HWND              _modal_move_resize_window = NULL;
 

gdk/win32/gdkinput-winpointer.h

@@ -1,43 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 the GTK team
- *
- * 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 __GDK_INPUT_WINPOINTER_H__
-#define __GDK_INPUT_WINPOINTER_H__
-
-#include "winpointer.h"
-
-gboolean gdk_winpointer_initialize (void);
-
-void gdk_winpointer_initialize_surface (GdkSurface *surface);
-void gdk_winpointer_finalize_surface (GdkSurface *surface);
-
-typedef void
-(*crossing_cb_t)(GdkDevice *physical_device,
-                 GdkSurface *surface,
-                 POINT *screen_pt,
-                 guint32 time_);
-
-gboolean gdk_winpointer_should_forward_message (MSG *msg);
-void     gdk_winpointer_input_events (GdkSurface *surface,
-                                      crossing_cb_t crossing_cb,
-                                      MSG *msg);
-gboolean gdk_winpointer_get_message_info (MSG *msg,
-                                          GdkDevice **device,
-                                          guint32 *time_);
-void     gdk_winpointer_interaction_ended (MSG *msg);
-
-#endif /* __GDK_INPUT_WINPOINTER_H__ */

gdk/win32/gdkmain-win32.c

@@ -54,6 +54,11 @@ _gdk_win32_surfaceing_init (void)
 {
   char buf[10];
 
+  if (getenv ("GDK_IGNORE_WINTAB") != NULL)
+    _gdk_input_ignore_wintab = TRUE;
+  else if (getenv ("GDK_USE_WINTAB") != NULL)
+    _gdk_input_ignore_wintab = FALSE;
+
   if (gdk_synchronize)
     GdiSetBatchLimit (1);
 
@@ -248,6 +253,7 @@ _gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol)
       CASE (NONE);
       CASE (WIN32_DROPFILES);
       CASE (OLE2);
+      CASE (LOCAL);
 #undef CASE
     default: return static_printf ("illegal_%d", protocol);
     }

gdk/win32/gdkmonitor-win32.c

@@ -15,6 +15,22 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined (_WIN32_WINNT) && WIN32_WINNT < 0x0601
+#  undef _WIN32_WINNT
+
+#  define _WIN32_WINNT 0x0601
+#  ifdef WINVER
+#    undef WINVER
+#  endif
+#  define WINVER _WIN32_WINNT
+#elif !defined (_WIN32_WINNT)
+#  define _WIN32_WINNT 0x0601
+#  ifdef WINVER
+#    undef WINVER
+#  endif
+#  define WINVER _WIN32_WINNT
+#endif
+
 #include "config.h"
 
 #include "gdkprivate-win32.h"
@@ -563,7 +579,7 @@ enum_monitor (HMONITOR hmonitor,
           GdkWin32Monitor *w32mon;
           GdkMonitor *mon;
           GdkRectangle rect;
-          int scale;
+          guint scale;
 
           memset (&dd_monitor, 0, sizeof (dd_monitor));
           dd_monitor.cb = sizeof (dd_monitor);
@@ -673,6 +689,9 @@ enum_monitor (HMONITOR hmonitor,
                   HMONITOR hmonitor;
                   POINT pt;
 
+                  /* Not subtracting _gdk_offset_x and _gdk_offset_y because they will only
+                   * be added later on, in _gdk_win32_display_get_monitor_list().
+                   */
                   pt.x = w32mon->work_rect.x + w32mon->work_rect.width / 2;
                   pt.y = w32mon->work_rect.y + w32mon->work_rect.height / 2;
                   hmonitor = MonitorFromPoint (pt, MONITOR_DEFAULTTONEAREST);
@@ -769,6 +788,45 @@ _gdk_win32_display_get_monitor_list (GdkWin32Display *win32_display)
       prune_monitors (&data);
     }
 
+  _gdk_offset_x = G_MININT;
+  _gdk_offset_y = G_MININT;
+
+  for (i = 0; i < data.monitors->len; i++)
+    {
+      GdkWin32Monitor *m;
+      GdkRectangle rect;
+
+      m = g_ptr_array_index (data.monitors, i);
+
+      /* Calculate offset */
+      gdk_monitor_get_geometry (GDK_MONITOR (m), &rect);
+      _gdk_offset_x = MAX (_gdk_offset_x, -rect.x);
+      _gdk_offset_y = MAX (_gdk_offset_y, -rect.y);
+    }
+
+  GDK_NOTE (MISC, g_print ("Multi-monitor offset: (%d,%d)\n",
+                           _gdk_offset_x, _gdk_offset_y));
+
+  /* Translate monitor coords into GDK coordinate space */
+  for (i = 0; i < data.monitors->len; i++)
+    {
+      GdkWin32Monitor *m;
+      GdkRectangle rect;
+
+      m = g_ptr_array_index (data.monitors, i);
+
+      gdk_monitor_get_geometry (GDK_MONITOR (m), &rect);
+      rect.x += _gdk_offset_x;
+      rect.y += _gdk_offset_y;
+      gdk_monitor_set_geometry (GDK_MONITOR (m), &rect);
+
+      m->work_rect.x += _gdk_offset_x;
+      m->work_rect.y += _gdk_offset_y;
+
+      GDK_NOTE (MISC, g_print ("Monitor %d: %dx%d@%+d%+d\n", i,
+                               rect.width, rect.height, rect.x, rect.y));
+    }
+
   return data.monitors;
 }
 

gdk/win32/gdkprivate-win32.h

@@ -25,6 +25,15 @@
 #ifndef __GDK_PRIVATE_WIN32_H__
 #define __GDK_PRIVATE_WIN32_H__
 
+#ifndef WINVER
+/* Vista or newer */
+#define WINVER 0x0600
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT WINVER
+#endif
+
 #include <gdk/gdkcursorprivate.h>
 #include <gdk/win32/gdksurface-win32.h>
 #include <gdk/win32/gdkwin32display.h>
@@ -145,14 +154,13 @@ typedef enum
   GDK_DRAG_PROTO_NONE = 0,
   GDK_DRAG_PROTO_WIN32_DROPFILES,
   GDK_DRAG_PROTO_OLE2,
+  GDK_DRAG_PROTO_LOCAL,
 } GdkDragProtocol;
 
 GType _gdk_gc_win32_get_type (void);
 
 gulong _gdk_win32_get_next_tick (gulong suggested_tick);
 
-BOOL _gdk_win32_get_cursor_pos (LPPOINT lpPoint);
-
 void _gdk_surface_init_position     (GdkSurface *window);
 void _gdk_surface_move_resize_child (GdkSurface *window,
                                      int        x,
@@ -242,8 +250,6 @@ void    _gdk_other_api_failed        (const char *where,
 #define WIN32_GDI_FAILED(api) WIN32_API_FAILED (api)
 #define OTHER_API_FAILED(api) _gdk_other_api_failed (G_STRLOC, api)
 
-#define WIN32_API_FAILED_LOG_ONCE(api) G_STMT_START { static gboolean logged = 0; if (!logged) { _gdk_win32_api_failed (G_STRLOC , api); logged = 1; }} G_STMT_END
-
 /* These two macros call a GDI or other Win32 API and if the return
  * value is zero or NULL, print a warning message. The majority of GDI
  * calls return zero or NULL on failure. The value of the macros is nonzero
@@ -259,6 +265,13 @@ extern GdkDisplay       *_gdk_display;
 
 extern GdkDeviceManagerWin32 *_gdk_device_manager;
 
+/* Offsets to add to Windows coordinates (which are relative to the
+ * primary monitor's origin, and thus might be negative for monitors
+ * to the left and/or above the primary monitor) to get GDK
+ * coordinates, which should be non-negative on the whole screen.
+ */
+extern int               _gdk_offset_x, _gdk_offset_y;
+
 extern HDC               _gdk_display_hdc;
 extern HINSTANCE         _gdk_dll_hinstance;
 extern HINSTANCE         _gdk_app_hmodule;
@@ -300,6 +313,11 @@ extern HWND             _modal_move_resize_window;
 void  _gdk_win32_begin_modal_call (GdkWin32ModalOpKind kind);
 void  _gdk_win32_end_modal_call (GdkWin32ModalOpKind kind);
 
+
+/* Options */
+extern gboolean          _gdk_input_ignore_wintab;
+extern int               _gdk_max_colors;
+
 /* Convert a pixbuf to an HICON (or HCURSOR).  Supports alpha under
  * Windows XP, thresholds alpha otherwise.
  */
@@ -424,6 +442,7 @@ BOOL WINAPI GtkShowWindow (GdkSurface *window,
 /* Initialization */
 void _gdk_win32_surfaceing_init (void);
 void _gdk_drag_init    (void);
+void _gdk_drop_init    (void);
 void _gdk_events_init (GdkDisplay *display);
 
 #endif /* __GDK_PRIVATE_WIN32_H__ */

gdk/win32/gdkscreen-win32.c

@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#define _WIN32_WINNT 0x0600
+
 #include "gdk.h"
 #include "gdkprivate-win32.h"
 #include "gdkwin32screen.h"

gdk/win32/gdksurface-win32.c

@@ -43,7 +43,6 @@
 #include "gdkmonitorprivate.h"
 #include "gdkwin32surface.h"
 #include "gdkwin32cursor.h"
-#include "gdkinput-winpointer.h"
 #include "gdkglcontext-win32.h"
 #include "gdkdisplay-win32.h"
 #include "gdkdevice-win32.h"
@@ -205,6 +204,7 @@ gdk_surface_win32_finalize (GObject *object)
     }
 
   _gdk_win32_surface_unregister_dnd (GDK_SURFACE (surface));
+  g_clear_object (&surface->drop);
 
   g_assert (surface->transient_owner == NULL);
   g_assert (surface->transient_children == NULL);
@@ -472,6 +472,7 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
   wchar_t *wtitle;
   int window_width, window_height;
   int window_x, window_y;
+  int offset_x = 0, offset_y = 0;
   int real_x = 0, real_y = 0;
   GdkFrameClock *frame_clock;
 
@@ -526,6 +527,8 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
   dwExStyle = 0;
   owner = NULL;
 
+  offset_x = _gdk_offset_x;
+  offset_y = _gdk_offset_y;
   /* MSDN: We need WS_CLIPCHILDREN and WS_CLIPSIBLINGS for GL Context Creation */
   dwStyle = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 
@@ -557,8 +560,8 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
 
   AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
 
-  real_x = x * impl->surface_scale;
-  real_y = y * impl->surface_scale;
+  real_x = (x - offset_x) * impl->surface_scale;
+  real_y = (y - offset_y) * impl->surface_scale;
 
   if (surface_type == GDK_SURFACE_TOPLEVEL)
     {
@@ -580,6 +583,12 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
   if (!title || !*title)
     title = "";
 
+  /* WS_EX_TRANSPARENT means "try draw this window last, and ignore input".
+   * It's the last part we're after. We don't want DND indicator to accept
+   * input, because that will make it a potential drop target, and if it's
+   * under the mouse cursor, this will kill any DND.
+   */
+
   klass = RegisterGdkClass (surface_type);
 
   wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL);
@@ -623,8 +632,8 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
   GDK_NOTE (MISC, g_print ("... \"%s\" %dx%d@%+d%+d %p = %p\n",
 			   title,
 			   window_width, window_height,
-			   surface->x,
-			   surface->y,
+			   surface->x - offset_x,
+			   surface->y - offset_y,
 			   owner,
 			   hwndNew));
 
@@ -637,12 +646,8 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
       return NULL;
     }
 
-  if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER)
-    gdk_winpointer_initialize_surface (surface);
-
   _gdk_win32_surface_enable_transparency (surface);
   _gdk_win32_surface_register_dnd (surface);
-  _gdk_win32_surface_update_style_bits (surface);
 
   g_signal_connect (frame_clock,
                     "after-paint",
@@ -860,8 +865,8 @@ show_window_internal (GdkSurface *window,
 	{
 	  GdkSurface *owner = surface->transient_owner;
 	  /* Center on transient parent */
-          center_on_rect.left = owner->x * surface->surface_scale;
-          center_on_rect.top = owner->y * surface->surface_scale;
+	  center_on_rect.left = (owner->x - _gdk_offset_x) * surface->surface_scale;
+	  center_on_rect.top = (owner->y - _gdk_offset_y) * surface->surface_scale;
 	  center_on_rect.right = center_on_rect.left + owner->width * surface->surface_scale;
 	  center_on_rect.bottom = center_on_rect.top + owner->height * surface->surface_scale;
 
@@ -1043,13 +1048,13 @@ gdk_win32_surface_do_move (GdkSurface *window,
   GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,%d,%d,0,0,"
                            "NOACTIVATE|NOSIZE|NOZORDER)\n",
                            GDK_SURFACE_HWND (window),
-                           x * impl->surface_scale,
-                           y * impl->surface_scale));
+                           (x - _gdk_offset_x) * impl->surface_scale,
+                           (y - _gdk_offset_y) * impl->surface_scale));
 
   API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window),
                            SWP_NOZORDER_SPECIFIED,
-                           x * impl->surface_scale,
-                           y * impl->surface_scale,
+                           (x - _gdk_offset_x) * impl->surface_scale,
+                           (y - _gdk_offset_y) * impl->surface_scale,
                            0, 0,
                            SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER));
 }
@@ -1129,15 +1134,15 @@ gdk_win32_surface_do_move_resize (GdkSurface *window,
   GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,%d,%d,%ld,%ld,"
                            "NOACTIVATE|NOZORDER)\n",
                            GDK_SURFACE_HWND (window),
-                           x * impl->surface_scale,
-                           y * impl->surface_scale,
+                           (x - _gdk_offset_x) * impl->surface_scale,
+                           (y - _gdk_offset_y) * impl->surface_scale,
                            outer_rect.right - outer_rect.left,
                            outer_rect.bottom - outer_rect.top));
 
   API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window),
                            SWP_NOZORDER_SPECIFIED,
-                           x * impl->surface_scale,
-                           y * impl->surface_scale,
+                           (x - _gdk_offset_x) * impl->surface_scale,
+                           (y - _gdk_offset_y) * impl->surface_scale,
                            outer_rect.right - outer_rect.left,
                            outer_rect.bottom - outer_rect.top,
                            SWP_NOACTIVATE | SWP_NOZORDER));
@@ -1680,6 +1685,14 @@ gdk_win32_surface_get_geometry (GdkSurface *window,
 
           rect.right = pt.x;
           rect.bottom = pt.y;
+
+	      if (parent == NULL)
+	        {
+	          rect.left += _gdk_offset_x * impl->surface_scale;
+	          rect.top += _gdk_offset_y * impl->surface_scale;
+	          rect.right += _gdk_offset_x * impl->surface_scale;
+	          rect.bottom += _gdk_offset_y * impl->surface_scale;
+	        }
         }
 
       if (x)
@@ -1718,16 +1731,16 @@ gdk_win32_surface_get_root_coords (GdkSurface *window,
   ty = pt.y;
 
   if (root_x)
-    *root_x = tx / impl->surface_scale;
+    *root_x = (tx + _gdk_offset_x) / impl->surface_scale;
   if (root_y)
-    *root_y = ty / impl->surface_scale;
+    *root_y = (ty + _gdk_offset_y) / impl->surface_scale;
 
   GDK_NOTE (MISC, g_print ("gdk_win32_surface_get_root_coords: %p: %+d%+d %+d%+d\n",
 			   GDK_SURFACE_HWND (window),
 			   x * impl->surface_scale,
 			   y * impl->surface_scale,
-			   tx / impl->surface_scale,
-			   ty / impl->surface_scale));
+			   (tx + _gdk_offset_x) / impl->surface_scale,
+			   (ty + _gdk_offset_y) / impl->surface_scale));
 }
 
 static gboolean
@@ -1825,8 +1838,6 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
   RECT rect, before, after;
   gboolean was_topmost;
   gboolean will_be_topmost;
-  gboolean was_layered;
-  gboolean will_be_layered;
   HWND insert_after;
   UINT flags;
 
@@ -1841,9 +1852,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
   AdjustWindowRectEx (&before, old_style, FALSE, old_exstyle);
 
   was_topmost = (old_exstyle & WS_EX_TOPMOST) ? TRUE : FALSE;
-  was_layered = (old_exstyle & WS_EX_LAYERED) ? TRUE : FALSE;
   will_be_topmost = was_topmost;
-  will_be_layered = was_layered;
 
   old_exstyle &= ~WS_EX_TOPMOST;
 
@@ -1853,14 +1862,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
   if (GDK_IS_DRAG_SURFACE (window))
     {
       new_exstyle |= WS_EX_TOOLWINDOW;
-
-      /* WS_EX_LAYERED | WS_EX_TRANSPARENT makes the drag surface behave
-       * in pointer input passthrough mode, so it doesn't interfere with
-       * the drag and drop operation.
-       */
-      new_exstyle |= WS_EX_LAYERED | WS_EX_TRANSPARENT;
       will_be_topmost = TRUE;
-      will_be_layered = TRUE;
     }
   else
     {
@@ -1905,14 +1907,6 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
 			       _gdk_win32_surface_exstyle_to_string (new_exstyle)));
 
       SetWindowLong (GDK_SURFACE_HWND (window), GWL_EXSTYLE, new_exstyle);
-
-      if (!was_layered && will_be_layered)
-        {
-          /* We have to call SetLayeredWindowAttributes when setting the
-           * WS_EX_LAYERED style anew, otherwise the window won't show up
-           */
-          API_CALL (SetLayeredWindowAttributes, (GDK_SURFACE_HWND (window), 0, 255, LWA_ALPHA));
-        }
     }
 
   AdjustWindowRectEx (&after, new_style, FALSE, new_exstyle);
@@ -2875,8 +2869,8 @@ redraw_indicator (gpointer user_data)
 
   last_draw = draw_indicator (context, context->draw_timestamp);
 
-  window_position.x = context->indicator_window_rect.x * impl->surface_scale;
-  window_position.y = context->indicator_window_rect.y * impl->surface_scale;
+  window_position.x = (context->indicator_window_rect.x - _gdk_offset_x) * impl->surface_scale;
+  window_position.y = (context->indicator_window_rect.y - _gdk_offset_y) * impl->surface_scale;
   window_size.cx = context->indicator_window_rect.width * impl->surface_scale;
   window_size.cy = context->indicator_window_rect.height * impl->surface_scale;
 
@@ -3567,8 +3561,8 @@ setup_drag_move_resize_context (GdkSurface                   *window,
           GDK_NOTE (MISC, g_print ("W32 WM unmaximized window placement is %ld x %ld @ %ld : %ld\n",
                                    placement.rcNormalPosition.right - placement.rcNormalPosition.left,
                                    placement.rcNormalPosition.bottom - placement.rcNormalPosition.top,
-                                   placement.rcNormalPosition.left,
-                                   placement.rcNormalPosition.top));
+                                   placement.rcNormalPosition.left + _gdk_offset_x * impl->surface_scale,
+                                   placement.rcNormalPosition.top + _gdk_offset_y * impl->surface_scale));
 
           unmax_width = placement.rcNormalPosition.right - placement.rcNormalPosition.left;
           unmax_height = placement.rcNormalPosition.bottom - placement.rcNormalPosition.top;
@@ -3579,36 +3573,40 @@ setup_drag_move_resize_context (GdkSurface                   *window,
           if (offsetx * impl->surface_scale < (shadow_unmax_width / 2) &&
               offsety * impl->surface_scale < (shadow_unmax_height / 2))
             {
-              placement.rcNormalPosition.top = (root_y - offsety + impl->shadow.top) * impl->surface_scale;
+              placement.rcNormalPosition.top = (root_y - offsety + impl->shadow.top - _gdk_offset_y) * impl->surface_scale;
               placement.rcNormalPosition.bottom = placement.rcNormalPosition.top + unmax_height;
 
               if (left_half)
                 {
-                  placement.rcNormalPosition.left = (root_x - offsetx + impl->shadow.left) * impl->surface_scale;
+                  placement.rcNormalPosition.left = (root_x - offsetx + impl->shadow.left - _gdk_offset_x) * impl->surface_scale;
                   placement.rcNormalPosition.right = placement.rcNormalPosition.left + unmax_width;
                 }
               else
                 {
-                  placement.rcNormalPosition.right = (root_x + offsetx + impl->shadow.right) * impl->surface_scale;
+                  placement.rcNormalPosition.right = (root_x + offsetx + impl->shadow.right - _gdk_offset_x) * impl->surface_scale;
                   placement.rcNormalPosition.left = placement.rcNormalPosition.right - unmax_width;
                 }
             }
           else
             {
-              placement.rcNormalPosition.left = root_x * impl->surface_scale - unmax_width / 2;
+              placement.rcNormalPosition.left = (root_x * impl->surface_scale) -
+                                                (unmax_width / 2) -
+                                                (_gdk_offset_x * impl->surface_scale);
 
               if (offsety * impl->surface_scale < shadow_unmax_height / 2)
-                placement.rcNormalPosition.top = (root_y - offsety + impl->shadow.top) * impl->surface_scale;
+                placement.rcNormalPosition.top = (root_y - offsety + impl->shadow.top - _gdk_offset_y) * impl->surface_scale;
               else
-                placement.rcNormalPosition.top = root_y * impl->surface_scale - unmax_height / 2;
+                placement.rcNormalPosition.top = (root_y * impl->surface_scale) -
+                                                 (unmax_height / 2) -
+                                                 (_gdk_offset_y * impl->surface_scale);
 
               placement.rcNormalPosition.right = placement.rcNormalPosition.left + unmax_width;
               placement.rcNormalPosition.bottom = placement.rcNormalPosition.top + unmax_height;
             }
 
           GDK_NOTE (MISC, g_print ("Unmaximized window will be at %ld : %ld\n",
-                                   placement.rcNormalPosition.left,
-                                   placement.rcNormalPosition.top));
+                                   placement.rcNormalPosition.left + _gdk_offset_x * impl->surface_scale,
+                                   placement.rcNormalPosition.top + _gdk_offset_y * impl->surface_scale));
 
           API_CALL (SetWindowPlacement, (GDK_SURFACE_HWND (window), &placement));
         }
@@ -3666,7 +3664,7 @@ setup_drag_move_resize_context (GdkSurface                   *window,
            * the titlebar is, if any.
            */
           root_y = wy + wheight / 2;
-          SetCursorPos (root_x, root_y);
+          SetCursorPos (root_x - _gdk_offset_x, root_y - _gdk_offset_y);
         }
     }
 
@@ -3787,6 +3785,12 @@ gdk_win32_get_window_size_and_position_from_client_rect (GdkSurface *window,
   /* Turn client area into window area */
   _gdk_win32_adjust_client_rect (window, window_rect);
 
+  /* Convert GDK screen coordinates to W32 desktop coordinates */
+  window_rect->left -= _gdk_offset_x * impl->surface_scale;
+  window_rect->right -= _gdk_offset_x * impl->surface_scale;
+  window_rect->top -= _gdk_offset_y * impl->surface_scale;
+  window_rect->bottom -= _gdk_offset_y * impl->surface_scale;
+
   window_position->x = window_rect->left;
   window_position->y = window_rect->top;
   window_size->cx = window_rect->right - window_rect->left;
@@ -5086,6 +5090,12 @@ gdk_win32_surface_get_queued_window_rect (GdkSurface *surface,
   /* Turn client area into window area */
   _gdk_win32_adjust_client_rect (surface, &window_rect);
 
+  /* Convert GDK screen coordinates to W32 desktop coordinates */
+  window_rect.left -= _gdk_offset_x * impl->surface_scale;
+  window_rect.right -= _gdk_offset_x * impl->surface_scale;
+  window_rect.top -= _gdk_offset_y * impl->surface_scale;
+  window_rect.bottom -= _gdk_offset_y * impl->surface_scale;
+
   *return_window_rect = window_rect;
 }
 

gdk/win32/gdksurface-win32.h

@@ -251,6 +251,10 @@ struct _GdkWin32Surface
    * For OLE2 protocol only.
    */
   drop_target_context *drop_target;
+  /* Temporarily holds the GdkDrop currently associated with this window.
+   * For LOCAL protocol only.
+   */
+  GdkDrop             *drop;
 
   GdkSurface *transient_owner;
   GSList    *transient_children;

gdk/win32/gdkwin32dnd-private.h

@@ -93,6 +93,38 @@ struct _GdkWin32DragClass
 gpointer _gdk_win32_dnd_thread_main                      (gpointer         data);
 
 GdkDrag *_gdk_win32_find_drag_for_dest_window     (HWND             dest_window);
+GdkDrop  *_gdk_win32_get_drop_for_dest_surface     (GdkSurface      *dest);
+
+gboolean _gdk_win32_local_drop_target_will_emit_motion   (GdkDrop *drop,
+                                                          int      x_root,
+                                                          int      y_root,
+                                                          DWORD    grfKeyState);
+
+void     _gdk_win32_local_drop_target_dragenter          (GdkDrag        *drag,
+                                                          GdkSurface     *dest_surface,
+                                                          int             x_root,
+                                                          int             y_root,
+                                                          DWORD           grfKeyState,
+                                                          guint32         time_,
+                                                          GdkDragAction  *actions);
+void     _gdk_win32_local_drop_target_dragover           (GdkDrop        *drop,
+                                                          GdkDrag        *drag,
+                                                          int             x_root,
+                                                          int             y_root,
+                                                          DWORD           grfKeyState,
+                                                          guint32         time_,
+                                                          GdkDragAction  *actions);
+void     _gdk_win32_local_drop_target_dragleave          (GdkDrop        *drop,
+                                                          guint32         time_);
+void     _gdk_win32_local_drop_target_drop               (GdkDrop        *drop,
+                                                          GdkDrag        *drag,
+                                                          guint32         time_,
+                                                          GdkDragAction  *actions);
+
+void     _gdk_win32_local_drag_give_feedback             (GdkDrag        *drag,
+                                                          GdkDragAction   actions);
+void     _gdk_win32_local_drag_drop_response             (GdkDrag        *drag,
+                                                          GdkDragAction   action);
 
 
 G_END_DECLS

gdk/win32/meson.build

@@ -6,7 +6,6 @@ gdk_win32_sources = files([
   'gdkdevicemanager-win32.c',
   'gdkdevice-virtual.c',
   'gdkdevice-win32.c',
-  'gdkdevice-winpointer.c',
   'gdkdevice-wintab.c',
   'gdkdisplay-win32.c',
   'gdkdisplaymanager-win32.c',
@@ -17,7 +16,6 @@ gdk_win32_sources = files([
   'gdkglcontext-win32-wgl.c',
   'gdkglobals-win32.c',
   'gdkhdataoutputstream-win32.c',
-  'gdkinput-winpointer.c',
   'gdkkeys-win32.c',
   'gdkwin32langnotification.c',
   'gdkmain-win32.c',
@@ -53,9 +51,8 @@ if win32_has_egl
   gdk_win32_sources += ['gdkglcontext-win32-egl.c']
 endif
 
-gdk_win32_deps = [
-  pangowin32_dep, # FIXME
-  cc.find_library('hid'),
+gdk_win32_deps = [ # FIXME
+  pangowin32_dep
 ]
 
 libgdk_win32 = static_library('gdk-win32',
@@ -65,8 +62,6 @@ libgdk_win32 = static_library('gdk-win32',
     '-DGTK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
     '-DINSIDE_GDK_WIN32',
-    '-D_WIN32_WINNT=0x0601',
-    '-DWINVER=0x0601',
   ] + GDK_WIN32_EGL_CFLAGS,
   dependencies: [ gdk_deps, gdk_win32_deps ],
 )

gdk/win32/winpointer.h

@@ -1,320 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 the GTK team
- *
- * 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/>.
- */
-
-/* This code is derived from portions provided by the mingw-w64 project
- * (mingw-w64.org), originally licensed under the Zope Public License
- * (ZPL) version 2.1, with modifications made on May 12, 2021.
- * Legal notice of the Zope Public License version 2.1 follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *    1. Redistributions in source code must retain the accompanying copyright
- *       notice, this list of conditions, and the following disclaimer.
- *    2. Redistributions in binary form must reproduce the accompanying
- *       copyright notice, this list of conditions, and the following disclaimer
- *       in the documentation and/or other materials provided with the
- *       distribution.
- *    3. Names of the copyright holders must not be used to endorse or promote
- *       products derived from this software without prior written permission
- *       from the copyright holders.
- *    4. The right to distribute this software or to use it for any purpose does
- *       not give you the right to use Servicemarks (sm) or Trademarks (tm) of
- *       the copyright holders.  Use of them is covered by separate agreement
- *       with the copyright holders.
- *    5. If any files are modified, you must cause the modified files to carry
- *       prominent notices stating that you changed the files and the date of
- *       any change.
- */
-
-#ifndef POINTER_FLAG_NONE
-
-#include <windows.h>
-#include <tchar.h>
-
-#define WM_POINTERDEVICECHANGE 0x238
-#define WM_POINTERDEVICEINRANGE 0x239
-#define WM_POINTERDEVICEOUTOFRANGE 0x23a
-
-#define WM_NCPOINTERUPDATE 0x0241
-#define WM_NCPOINTERDOWN 0x0242
-#define WM_NCPOINTERUP 0x0243
-#define WM_POINTERUPDATE 0x0245
-#define WM_POINTERDOWN 0x0246
-#define WM_POINTERUP 0x0247
-#define WM_POINTERENTER 0x0249
-#define WM_POINTERLEAVE 0x024a
-#define WM_POINTERACTIVATE 0x024b
-#define WM_POINTERCAPTURECHANGED 0x024c
-#define WM_TOUCHHITTESTING 0x024d
-#define WM_POINTERWHEEL 0x024e
-#define WM_POINTERHWHEEL 0x024f
-#define DM_POINTERHITTEST 0x0250
-#define WM_POINTERROUTEDTO 0x0251
-#define WM_POINTERROUTEDAWAY 0x0252
-#define WM_POINTERROUTEDRELEASED 0x0253
-
-#define POINTER_FLAG_NONE 0x00000000
-#define POINTER_FLAG_NEW 0x00000001
-#define POINTER_FLAG_INRANGE 0x00000002
-#define POINTER_FLAG_INCONTACT 0x00000004
-#define POINTER_FLAG_FIRSTBUTTON 0x00000010
-#define POINTER_FLAG_SECONDBUTTON 0x00000020
-#define POINTER_FLAG_THIRDBUTTON 0x00000040
-#define POINTER_FLAG_FOURTHBUTTON 0x00000080
-#define POINTER_FLAG_FIFTHBUTTON 0x00000100
-#define POINTER_FLAG_PRIMARY 0x00002000
-#define POINTER_FLAG_CONFIDENCE 0x00004000
-#define POINTER_FLAG_CANCELED 0x00008000
-#define POINTER_FLAG_DOWN 0x00010000
-#define POINTER_FLAG_UPDATE 0x00020000
-#define POINTER_FLAG_UP 0x00040000
-#define POINTER_FLAG_WHEEL 0x00080000
-#define POINTER_FLAG_HWHEEL 0x00100000
-#define POINTER_FLAG_CAPTURECHANGED 0x00200000
-#define POINTER_FLAG_HASTRANSFORM 0x00400000
-
-#define POINTER_MOD_SHIFT (0x0004)
-#define POINTER_MOD_CTRL (0x0008)
-
-#define TOUCH_FLAG_NONE 0x00000000
-
-#define TOUCH_MASK_NONE 0x00000000
-#define TOUCH_MASK_CONTACTAREA 0x00000001
-#define TOUCH_MASK_ORIENTATION 0x00000002
-#define TOUCH_MASK_PRESSURE 0x00000004
-
-#define PEN_FLAG_NONE 0x00000000
-#define PEN_FLAG_BARREL 0x00000001
-#define PEN_FLAG_INVERTED 0x00000002
-#define PEN_FLAG_ERASER 0x00000004
-
-#define PEN_MASK_NONE 0x00000000
-#define PEN_MASK_PRESSURE 0x00000001
-#define PEN_MASK_ROTATION 0x00000002
-#define PEN_MASK_TILT_X 0x00000004
-#define PEN_MASK_TILT_Y 0x00000008
-
-#define POINTER_MESSAGE_FLAG_NEW 0x00000001
-#define POINTER_MESSAGE_FLAG_INRANGE 0x00000002
-#define POINTER_MESSAGE_FLAG_INCONTACT 0x00000004
-#define POINTER_MESSAGE_FLAG_FIRSTBUTTON 0x00000010
-#define POINTER_MESSAGE_FLAG_SECONDBUTTON 0x00000020
-#define POINTER_MESSAGE_FLAG_THIRDBUTTON 0x00000040
-#define POINTER_MESSAGE_FLAG_FOURTHBUTTON 0x00000080
-#define POINTER_MESSAGE_FLAG_FIFTHBUTTON 0x00000100
-#define POINTER_MESSAGE_FLAG_PRIMARY 0x00002000
-#define POINTER_MESSAGE_FLAG_CONFIDENCE 0x00004000
-#define POINTER_MESSAGE_FLAG_CANCELED 0x00008000
-
-#define GET_POINTERID_WPARAM(wParam) (LOWORD (wParam))
-#define IS_POINTER_FLAG_SET_WPARAM(wParam, flag) (((DWORD)HIWORD (wParam) &(flag)) == (flag))
-#define IS_POINTER_NEW_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_NEW)
-#define IS_POINTER_INRANGE_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_INRANGE)
-#define IS_POINTER_INCONTACT_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_INCONTACT)
-#define IS_POINTER_FIRSTBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FIRSTBUTTON)
-#define IS_POINTER_SECONDBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_SECONDBUTTON)
-#define IS_POINTER_THIRDBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_THIRDBUTTON)
-#define IS_POINTER_FOURTHBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FOURTHBUTTON)
-#define IS_POINTER_FIFTHBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FIFTHBUTTON)
-#define IS_POINTER_PRIMARY_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_PRIMARY)
-#define HAS_POINTER_CONFIDENCE_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_CONFIDENCE)
-#define IS_POINTER_CANCELED_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_CANCELED)
-
-#define PA_ACTIVATE MA_ACTIVATE
-#define PA_NOACTIVATE MA_NOACTIVATE
-
-typedef DWORD POINTER_INPUT_TYPE;
-typedef UINT32 POINTER_FLAGS;
-typedef UINT32 TOUCH_FLAGS;
-typedef UINT32 TOUCH_MASK;
-typedef UINT32 PEN_FLAGS;
-typedef UINT32 PEN_MASK;
-
-enum tagPOINTER_INPUT_TYPE {
-  PT_POINTER = 0x00000001,
-  PT_TOUCH = 0x00000002,
-  PT_PEN = 0x00000003,
-  PT_MOUSE = 0x00000004,
-  PT_TOUCHPAD = 0x00000005
-};
-
-typedef enum tagFEEDBACK_TYPE {
-  FEEDBACK_TOUCH_CONTACTVISUALIZATION = 1,
-  FEEDBACK_PEN_BARRELVISUALIZATION = 2,
-  FEEDBACK_PEN_TAP = 3,
-  FEEDBACK_PEN_DOUBLETAP = 4,
-  FEEDBACK_PEN_PRESSANDHOLD = 5,
-  FEEDBACK_PEN_RIGHTTAP = 6,
-  FEEDBACK_TOUCH_TAP = 7,
-  FEEDBACK_TOUCH_DOUBLETAP = 8,
-  FEEDBACK_TOUCH_PRESSANDHOLD = 9,
-  FEEDBACK_TOUCH_RIGHTTAP = 10,
-  FEEDBACK_GESTURE_PRESSANDTAP = 11,
-  FEEDBACK_MAX = 0xffffffff
-} FEEDBACK_TYPE;
-
-typedef enum tagPOINTER_BUTTON_CHANGE_TYPE {
-  POINTER_CHANGE_NONE,
-  POINTER_CHANGE_FIRSTBUTTON_DOWN,
-  POINTER_CHANGE_FIRSTBUTTON_UP,
-  POINTER_CHANGE_SECONDBUTTON_DOWN,
-  POINTER_CHANGE_SECONDBUTTON_UP,
-  POINTER_CHANGE_THIRDBUTTON_DOWN,
-  POINTER_CHANGE_THIRDBUTTON_UP,
-  POINTER_CHANGE_FOURTHBUTTON_DOWN,
-  POINTER_CHANGE_FOURTHBUTTON_UP,
-  POINTER_CHANGE_FIFTHBUTTON_DOWN,
-  POINTER_CHANGE_FIFTHBUTTON_UP,
-} POINTER_BUTTON_CHANGE_TYPE;
-
-typedef struct tagPOINTER_INFO {
-  POINTER_INPUT_TYPE pointerType;
-  UINT32 pointerId;
-  UINT32 frameId;
-  POINTER_FLAGS pointerFlags;
-  HANDLE sourceDevice;
-  HWND hwndTarget;
-  POINT ptPixelLocation;
-  POINT ptHimetricLocation;
-  POINT ptPixelLocationRaw;
-  POINT ptHimetricLocationRaw;
-  DWORD dwTime;
-  UINT32 historyCount;
-  INT32 InputData;
-  DWORD dwKeyStates;
-  UINT64 PerformanceCount;
-  POINTER_BUTTON_CHANGE_TYPE ButtonChangeType;
-} POINTER_INFO;
-
-typedef struct tagPOINTER_TOUCH_INFO {
-  POINTER_INFO pointerInfo;
-  TOUCH_FLAGS touchFlags;
-  TOUCH_MASK touchMask;
-  RECT rcContact;
-  RECT rcContactRaw;
-  UINT32 orientation;
-  UINT32 pressure;
-} POINTER_TOUCH_INFO;
-
-typedef struct tagPOINTER_PEN_INFO {
-  POINTER_INFO pointerInfo;
-  PEN_FLAGS penFlags;
-  PEN_MASK penMask;
-  UINT32 pressure;
-  UINT32 rotation;
-  INT32 tiltX;
-  INT32 tiltY;
-} POINTER_PEN_INFO;
-
-typedef enum {
-  POINTER_FEEDBACK_DEFAULT = 1,
-  POINTER_FEEDBACK_INDIRECT = 2,
-  POINTER_FEEDBACK_NONE = 3
-} POINTER_FEEDBACK_MODE;
-
-typedef struct tagUSAGE_PROPERTIES {
-  USHORT level;
-  USHORT page;
-  USHORT usage;
-  INT32 logicalMinimum;
-  INT32 logicalMaximum;
-  USHORT unit;
-  USHORT exponent;
-  BYTE count;
-  INT32 physicalMinimum;
-  INT32 physicalMaximum;
-} USAGE_PROPERTIES, *PUSAGE_PROPERTIES;
-
-typedef struct tagPOINTER_TYPE_INFO {
-  POINTER_INPUT_TYPE  type;
-  union {
-      POINTER_TOUCH_INFO touchInfo;
-      POINTER_PEN_INFO penInfo;
-  } DUMMYUNIONNAME;
-} POINTER_TYPE_INFO, *PPOINTER_TYPE_INFO;
-
-#define POINTER_DEVICE_PRODUCT_STRING_MAX 520
-#define PDC_ARRIVAL 0x001
-#define PDC_REMOVAL 0x002
-#define PDC_ORIENTATION_0 0x004
-#define PDC_ORIENTATION_90 0x008
-#define PDC_ORIENTATION_180 0x010
-#define PDC_ORIENTATION_270 0x020
-#define PDC_MODE_DEFAULT 0x040
-#define PDC_MODE_CENTERED 0x080
-#define PDC_MAPPING_CHANGE 0x100
-#define PDC_RESOLUTION 0x200
-#define PDC_ORIGIN 0x400
-#define PDC_MODE_ASPECTRATIOPRESERVED 0x800
-
-typedef enum tagPOINTER_DEVICE_TYPE {
-  POINTER_DEVICE_TYPE_INTEGRATED_PEN = 0x00000001,
-  POINTER_DEVICE_TYPE_EXTERNAL_PEN = 0x00000002,
-  POINTER_DEVICE_TYPE_TOUCH = 0x00000003,
-  POINTER_DEVICE_TYPE_TOUCH_PAD = 0x00000004,
-  POINTER_DEVICE_TYPE_MAX = 0xffffffff
-} POINTER_DEVICE_TYPE;
-
-typedef struct tagPOINTER_DEVICE_INFO {
-  DWORD displayOrientation;
-  HANDLE device;
-  POINTER_DEVICE_TYPE pointerDeviceType;
-  HMONITOR monitor;
-  ULONG startingCursorId;
-  USHORT maxActiveContacts;
-  WCHAR productString[POINTER_DEVICE_PRODUCT_STRING_MAX];
-} POINTER_DEVICE_INFO;
-
-typedef struct tagPOINTER_DEVICE_PROPERTY {
-  INT32 logicalMin;
-  INT32 logicalMax;
-  INT32 physicalMin;
-  INT32 physicalMax;
-  UINT32 unit;
-  UINT32 unitExponent;
-  USHORT usagePageId;
-  USHORT usageId;
-} POINTER_DEVICE_PROPERTY;
-
-typedef enum tagPOINTER_DEVICE_CURSOR_TYPE {
-  POINTER_DEVICE_CURSOR_TYPE_UNKNOWN = 0x00000000,
-  POINTER_DEVICE_CURSOR_TYPE_TIP = 0x00000001,
-  POINTER_DEVICE_CURSOR_TYPE_ERASER = 0x00000002,
-  POINTER_DEVICE_CURSOR_TYPE_MAX = 0xffffffff
-} POINTER_DEVICE_CURSOR_TYPE;
-
-typedef struct tagPOINTER_DEVICE_CURSOR_INFO {
-  UINT32 cursorId;
-  POINTER_DEVICE_CURSOR_TYPE cursor;
-} POINTER_DEVICE_CURSOR_INFO;
-
-#endif /* POINTER_FLAG_NONE */
-
-#if WINVER < 0x0601
-
-typedef struct tagGESTURECONFIG {
-  DWORD dwID;
-  DWORD dwWant;
-  DWORD dwBlock;
-} GESTURECONFIG,*PGESTURECONFIG;
-
-#endif /* WINVER < 0x0601 */
-
-#ifndef MICROSOFT_TABLETPENSERVICE_PROPERTY
-#define MICROSOFT_TABLETPENSERVICE_PROPERTY _T("MicrosoftTabletPenServiceProperty")
-#endif

gdk/x11/gdkapplaunchcontext-x11.c

@@ -25,7 +25,6 @@
 #include "gdkintl.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdk-private.h"
 
 #include <glib.h>
 #ifdef HAVE_DESKTOPAPPINFO
@@ -220,7 +219,7 @@ startup_timeout (void *data)
     std->timeout_id = 0;
   else {
     std->timeout_id = g_timeout_add_seconds ((min_timeout + 500)/1000, startup_timeout, std);
-    gdk_source_set_static_name_by_id (std->timeout_id, "[gtk] startup_timeout");
+    g_source_set_name_by_id (std->timeout_id, "[gtk] startup_timeout");
   }
 
   /* always remove this one, but we may have reinstalled another one. */
@@ -257,7 +256,7 @@ add_startup_timeout (GdkX11Screen *screen,
   if (data->timeout_id == 0) {
     data->timeout_id = g_timeout_add_seconds (STARTUP_TIMEOUT_LENGTH_SECONDS,
                                               startup_timeout, data);
-    gdk_source_set_static_name_by_id (data->timeout_id, "[gtk] startup_timeout");
+    g_source_set_name_by_id (data->timeout_id, "[gtk] startup_timeout");
   }
 }
 

gdk/x11/gdkasync.c

@@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group.
 #include "gdkasync.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdk-private.h"
 
 #include <X11/Xlibint.h>
 
@@ -172,7 +171,7 @@ send_event_handler (Display *dpy,
         {
           guint id;
           id = g_idle_add (callback_idle, state);
-          gdk_source_set_static_name_by_id (id, "[gtk] callback_idle");
+          g_source_set_name_by_id (id, "[gtk] callback_idle");
         }
 
       DeqAsyncHandler(state->dpy, &state->async);
@@ -708,7 +707,7 @@ roundtrip_handler (Display *dpy,
         {
           guint id;
           id = g_idle_add (roundtrip_callback_idle, state);
-          gdk_source_set_static_name_by_id (id, "[gtk] roundtrip_callback_idle");
+          g_source_set_name_by_id (id, "[gtk] roundtrip_callback_idle");
         }
 
       DeqAsyncHandler(state->dpy, &state->async);

gdk/x11/gdkdisplay-x11.c

@@ -1037,8 +1037,8 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
       if (xevent->type - display_x11->xrandr_event_base == RRScreenChangeNotify ||
           xevent->type - display_x11->xrandr_event_base == RRNotify)
 	{
-          if (display_x11->screen)
-            _gdk_x11_screen_size_changed (display_x11->screen, xevent);
+          if (x11_screen)
+            _gdk_x11_screen_size_changed (x11_screen, xevent);
 	}
       else
 #endif

gdk/x11/gdkdrag-x11.c

@@ -884,10 +884,8 @@ gdk_x11_drag_handle_finished (GdkDisplay   *display,
       if (drag_x11->version == 5)
         drag_x11->drop_failed = xevent->xclient.data.l[1] == 0;
 
-      g_object_ref (drag);
       g_signal_emit_by_name (drag, "dnd-finished");
       gdk_drag_drop_done (drag, !drag_x11->drop_failed);
-      g_object_unref (drag);
     }
 }
 
@@ -1864,7 +1862,7 @@ gdk_x11_drag_drop_done (GdkDrag  *drag,
   id = g_timeout_add_full (G_PRIORITY_DEFAULT, 17,
                            gdk_drag_anim_timeout, anim,
                            (GDestroyNotify) gdk_drag_anim_destroy);
-  gdk_source_set_static_name_by_id (id, "[gtk] gdk_drag_anim_timeout");
+  g_source_set_name_by_id (id, "[gtk] gdk_drag_anim_timeout");
   g_object_unref (drag);
 }
 

gdk/x11/gdkglcontext-egl.c

@@ -642,8 +642,6 @@ gdk_x11_gl_context_egl_class_init (GdkX11GLContextEGLClass *klass)
   GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  context_class->backend_type = GDK_GL_EGL;
-
   context_class->realize = gdk_x11_gl_context_egl_realize;
   context_class->make_current = gdk_x11_gl_context_egl_make_current;
   context_class->clear_current = gdk_x11_gl_context_egl_clear_current;
@@ -672,9 +670,6 @@ gdk_x11_display_init_egl (GdkX11Display  *self,
   Display *dpy;
   int major, minor;
 
-  if (!gdk_gl_backend_can_be_used (GDK_GL_EGL, error))
-    return FALSE;
-
   dpy = gdk_x11_display_get_xdisplay (display);
 
   if (!epoxy_has_egl ())

gdk/x11/gdkglcontext-glx.c

@@ -692,8 +692,6 @@ gdk_x11_gl_context_glx_class_init (GdkX11GLContextGLXClass *klass)
   GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  context_class->backend_type = GDK_GL_GLX;
-
   context_class->realize = gdk_x11_gl_context_glx_realize;
   context_class->make_current = gdk_x11_gl_context_glx_make_current;
   context_class->clear_current = gdk_x11_gl_context_glx_clear_current;
@@ -907,9 +905,6 @@ gdk_x11_display_init_glx (GdkX11Display  *display_x11,
   Display *dpy;
   int screen_num;
 
-  if (!gdk_gl_backend_can_be_used (GDK_GL_GLX, error))
-    return FALSE;
-
   dpy = gdk_x11_display_get_xdisplay (display);
 
   if (!epoxy_has_glx (dpy))

gdk/x11/gdksurface-x11.c

@@ -1282,10 +1282,7 @@ _gdk_x11_display_create_surface (GdkDisplay     *display,
 
   class_hint = XAllocClassHint ();
   class_hint->res_name = (char *) g_get_prgname ();
-  if (display_x11->program_class)
-    class_hint->res_class = (char *) display_x11->program_class;
-  else
-    class_hint->res_class = class_hint->res_name;
+  class_hint->res_class = (char *) display_x11->program_class;
   XSetClassHint (xdisplay, impl->xid, class_hint);
   XFree (class_hint);
 
@@ -1923,13 +1920,8 @@ gdk_x11_surface_update_popups (GdkSurface *parent)
     {
       GdkX11Surface *popup_impl = l->data;
       GdkSurface *popup = GDK_SURFACE (popup_impl);
-      int new_x, new_y;
-
-      if (GDK_SURFACE_DESTROYED (popup))
-        continue;
-
-      new_x = GDK_X11_SURFACE (parent)->abs_x + popup->x;
-      new_y = GDK_X11_SURFACE (parent)->abs_y + popup->y;
+      int new_x = GDK_X11_SURFACE (parent)->abs_x + popup->x;
+      int new_y = GDK_X11_SURFACE (parent)->abs_y + popup->y;
 
       if (new_x != popup_impl->abs_x || new_y != popup_impl->abs_y)
         x11_surface_move (popup, new_x, new_y);

gdk/x11/gdkxftdefaults.c

@@ -89,7 +89,7 @@ get_boolean_default (GdkX11Screen *x11_screen,
   char *v;
   int i;
 
-  if (gdk_display_get_debug_flags (GDK_SCREEN_DISPLAY (x11_screen)) & GDK_DEBUG_DEFAULT_SETTINGS)
+  if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
       return FALSE;
 
   v = XGetDefault (dpy, "Xft", option);
@@ -114,7 +114,7 @@ get_double_default (GdkX11Screen *x11_screen,
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
   char     *v, *e;
 
-  if (gdk_display_get_debug_flags (GDK_SCREEN_DISPLAY (x11_screen)) & GDK_DEBUG_DEFAULT_SETTINGS)
+  if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
       return FALSE;
 
   v = XGetDefault (dpy, "Xft", option);
@@ -141,7 +141,7 @@ get_integer_default (GdkX11Screen *x11_screen,
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
   char *v, *e;
 
-  if (gdk_display_get_debug_flags (GDK_SCREEN_DISPLAY (x11_screen)) & GDK_DEBUG_DEFAULT_SETTINGS)
+  if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
       return FALSE;
 
   v = XGetDefault (dpy, "Xft", option);

gsk/gskrendernodeimpl.c

@@ -30,7 +30,7 @@
 #include "gdk/gdktextureprivate.h"
 #include "gdk/gdk-private.h"
 
-#include <hb-ot.h>
+#include <cairo-ft.h>
 
 static inline void
 gsk_cairo_rectangle (cairo_t               *cr,
@@ -2146,7 +2146,7 @@ gsk_outset_shadow_get_extents (GskOutsetShadowNode *self,
 {
   float clip_radius;
 
-  clip_radius = gsk_cairo_blur_compute_pixels (self->blur_radius / 2.0);
+  clip_radius = gsk_cairo_blur_compute_pixels (self->blur_radius);
   *top = MAX (0, clip_radius + self->spread - self->dy);
   *right = MAX (0, ceil (clip_radius + self->spread + self->dx));
   *bottom = MAX (0, ceil (clip_radius + self->spread + self->dy));
@@ -3852,7 +3852,7 @@ gsk_shadow_node_diff (GskRenderNode  *node1,
           return;
         }
 
-      clip_radius = gsk_cairo_blur_compute_pixels (shadow1->radius / 2.0);
+      clip_radius = gsk_cairo_blur_compute_pixels (shadow1->radius);
       top = MAX (top, ceil (clip_radius - shadow1->dy));
       right = MAX (right, ceil (clip_radius + shadow1->dx));
       bottom = MAX (bottom, ceil (clip_radius + shadow1->dy));
@@ -3886,7 +3886,7 @@ gsk_shadow_node_get_bounds (GskShadowNode *self,
 
   for (i = 0; i < self->n_shadows; i++)
     {
-      float clip_radius = gsk_cairo_blur_compute_pixels (self->shadows[i].radius / 2.0);
+      float clip_radius = gsk_cairo_blur_compute_pixels (self->shadows[i].radius);
       top = MAX (top, clip_radius - self->shadows[i].dy);
       right = MAX (right, clip_radius + self->shadows[i].dx);
       bottom = MAX (bottom, clip_radius + self->shadows[i].dy);
@@ -4377,15 +4377,6 @@ gsk_text_node_draw (GskRenderNode *node,
   cairo_restore (cr);
 }
 
-/* We steal one of the bits in PangoGlyphVisAttr */
-
-G_STATIC_ASSERT (sizeof (PangoGlyphVisAttr) == 4);
-
-#define COLOR_GLYPH_BIT 2
-#define GLYPH_IS_COLOR(g)  (((*(guint32*)&(g)->attr) & COLOR_GLYPH_BIT) != 0)
-#define GLYPH_SET_COLOR(g)  (*(guint32*)(&(g)->attr) |= COLOR_GLYPH_BIT)
-#define GLYPH_CLEAR_COLOR(g)  (*(guint32*)(&(g)->attr) &= ~COLOR_GLYPH_BIT)
-
 static void
 gsk_text_node_diff (GskRenderNode  *node1,
                     GskRenderNode  *node2,
@@ -4410,8 +4401,7 @@ gsk_text_node_diff (GskRenderNode  *node1,
               info1->geometry.width == info2->geometry.width &&
               info1->geometry.x_offset == info2->geometry.x_offset &&
               info1->geometry.y_offset == info2->geometry.y_offset &&
-              info1->attr.is_cluster_start == info2->attr.is_cluster_start &&
-              GLYPH_IS_COLOR (info1) == GLYPH_IS_COLOR (info2))
+              info1->attr.is_cluster_start == info2->attr.is_cluster_start)
             continue;
 
           gsk_render_node_diff_impossible (node1, node2, region);
@@ -4425,43 +4415,20 @@ gsk_text_node_diff (GskRenderNode  *node1,
 }
 
 static gboolean
-font_has_color_glyphs (PangoFont *font)
+font_has_color_glyphs (const PangoFont *font)
 {
-  hb_face_t *face = hb_font_get_face (pango_font_get_hb_font (font));
+  cairo_scaled_font_t *scaled_font;
+  gboolean has_color = FALSE;
 
-  return hb_ot_color_has_layers (face) ||
-         hb_ot_color_has_png (face) ||
-         hb_ot_color_has_svg (face);
-}
-
-static gboolean
-glyph_has_color (PangoFont *font,
-                 guint      glyph)
-{
-  hb_font_t *hb_font = pango_font_get_hb_font (font);
-  hb_face_t *face = hb_font_get_face (hb_font);
-  hb_blob_t *blob;
-
-  if (hb_ot_color_glyph_get_layers (face, glyph, 0, NULL, NULL) > 0)
-    return TRUE;
-
-  blob = hb_ot_color_glyph_reference_png (hb_font, glyph);
-  if (blob)
+  scaled_font = pango_cairo_font_get_scaled_font ((PangoCairoFont *)font);
+  if (cairo_scaled_font_get_type (scaled_font) == CAIRO_FONT_TYPE_FT)
     {
-      guint length = hb_blob_get_length (blob);
-      hb_blob_destroy (blob);
-      return length > 0;
+      FT_Face ft_face = cairo_ft_scaled_font_lock_face (scaled_font);
+      has_color = (FT_HAS_COLOR (ft_face) != 0);
+      cairo_ft_scaled_font_unlock_face (scaled_font);
     }
 
-  blob = hb_ot_color_glyph_reference_svg (face, glyph);
-  if (blob)
-    {
-      guint length = hb_blob_get_length (blob);
-      hb_blob_destroy (blob);
-      return length > 0;
-    }
-
-  return FALSE;
+  return has_color;
 }
 
 /**
@@ -4487,9 +4454,6 @@ gsk_text_node_new (PangoFont              *font,
   GskTextNode *self;
   GskRenderNode *node;
   PangoRectangle ink_rect;
-  PangoGlyphInfo *glyph_infos;
-  gboolean has_color_glyphs;
-  int n;
 
   pango_glyph_string_extents (glyphs, font, &ink_rect, NULL);
   pango_extents_to_pixels (&ink_rect, NULL);
@@ -4502,36 +4466,19 @@ gsk_text_node_new (PangoFont              *font,
   node = (GskRenderNode *) self;
 
   self->font = g_object_ref (font);
+  self->has_color_glyphs = font_has_color_glyphs (font);
   self->color = *color;
   self->offset = *offset;
-  self->has_color_glyphs = FALSE;
+  self->glyphs = g_malloc_n (glyphs->num_glyphs, sizeof (PangoGlyphInfo));
 
-  glyph_infos = g_malloc_n (glyphs->num_glyphs, sizeof (PangoGlyphInfo));
-  has_color_glyphs = font_has_color_glyphs (font);
-
-  n = 0;
+  /* skip empty glyphs */
+  self->num_glyphs = 0;
   for (int i = 0; i < glyphs->num_glyphs; i++)
     {
-      /* skip empty glyphs */
-      if (glyphs->glyphs[i].glyph == PANGO_GLYPH_EMPTY)
-        continue;
-
-      glyph_infos[n] = glyphs->glyphs[i];
-      GLYPH_CLEAR_COLOR (&glyph_infos[n]);
-
-      if (has_color_glyphs &&
-          glyph_has_color (font, glyph_infos[n].glyph))
-        {
-          self->has_color_glyphs = TRUE;
-          GLYPH_SET_COLOR (&glyph_infos[n]);
-        }
-
-      n++;
+      if (glyphs->glyphs[i].glyph != PANGO_GLYPH_EMPTY)
+        self->glyphs[self->num_glyphs++] = glyphs->glyphs[i];
     }
 
-  self->glyphs = glyph_infos;
-  self->num_glyphs = n;
-
   graphene_rect_init (&node->bounds,
                       offset->x + ink_rect.x - 1,
                       offset->y + ink_rect.y - 1,
@@ -4866,7 +4813,7 @@ gsk_blur_node_diff (GskRenderNode  *node1,
       cairo_region_t *sub;
       int i, n, clip_radius;
 
-      clip_radius = ceil (gsk_cairo_blur_compute_pixels (self1->radius / 2.0));
+      clip_radius = ceil (gsk_cairo_blur_compute_pixels (self1->radius));
       sub = cairo_region_create ();
       gsk_render_node_diff (self1->child, self2->child, sub);
 
@@ -4913,7 +4860,7 @@ gsk_blur_node_new (GskRenderNode *child,
   self->child = gsk_render_node_ref (child);
   self->radius = radius;
 
-  clip_radius = gsk_cairo_blur_compute_pixels (radius / 2.0);
+  clip_radius = gsk_cairo_blur_compute_pixels (radius);
 
   graphene_rect_init_from_rect (&node->bounds, &child->bounds);
   graphene_rect_inset (&self->render_node.bounds,