NEWS

+Overview of Changes in GTK+ 3.24.29
+===================================
+
+* Input:
+ - Look for a Compose file in the right place (~/.config/gtk-3.0)
+ - Revert some Compose sequence changes (mainly around dead
+   acute and apostrophe)
+ - Consume all key events during preedit, to avoid unexpected
+   interactions
+ - Ignore more modifiers during preedit, to allow using 3rd and
+   5th level choosers
+ - Fix handling of cursor positions in non-ASCII preedit text
+
+* GtkSpinButton:
+ - Interpret localized digits
+
+* GtkScale:
+ - Fix sporadic criticals
+
+* GtkScrolledWindow:
+ - Cancel overshoot on size changes
+ - Avoid criticals with non-overlay scrollbars
+
+* GtkFileChooser:
+ - Handle smb mounts better
+
+* GtkListBox:
+ - Fix extending multi-selections
+
+* Fix a possible crash in gtk_show_uri
+
+* Wayland:
+ - Improve font settings fallback
+
+* X11:
+ - Avoid log spam on exit
+ - Don't beep on untrusted displays
+
+* OS X:
+ - Fix building on OS X 10.11
+ - Add gdk-quartz-cocoa-access.h with api that provides
+   access to native objects
+
+* Translation updates:
+ Dutch
+ Nepali
+ Swedish
+
+
+Overview of Changes in GTK+ 3.24.28
+===================================
+
+* Input:
+ - Improve dead key handling
+
+* CSS:
+ - Fix rendering of scaled text shadows
+
+* Wayland:
+ - Fix matching of accelerators with multiple layouts
+
+* X11:
+ - Trap errors from the COW
+
+* Build:
+ - Make gtk3-update-icon-cache output reproducible
+
+* Translation updates:
+ Serbian
+
+
 Overview of Changes in GTK+ 3.24.27
 ===================================

configure.ac

@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [27])
-m4_define([gtk_interface_age], [23])
+m4_define([gtk_micro_version], [29])
+m4_define([gtk_interface_age], [25])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],

demos/icon-browser/gtk3-icon-browser.desktop

@@ -2,7 +2,6 @@
 Name=Icon Browser
 Comment=An application that shows themed icons
 Exec=gtk3-icon-browser
-Icon=gtk3-icon-browser
 Terminal=false
 Type=Application
 StartupNotify=true

docs/reference/gtk/meson.build

@@ -503,14 +503,19 @@ if get_option('man') and xsltproc.found()
     [ 'gtk-update-icon-cache', '1', ],
     [ 'gtk-encode-symbolic-svg', '1', ],
     [ 'gtk-launch', '1', ],
-    [ 'gtk3-demo', '1', ],
-    [ 'gtk3-demo-application', '1', ],
-    [ 'gtk3-widget-factory', '1', ],
-    [ 'gtk3-icon-browser', '1', ],
     [ 'gtk-builder-tool', '1', ],
     [ 'gtk-query-settings', '1', ],
   ]
 
+  if get_option('demos')
+    man_files += [
+      [ 'gtk3-demo', '1', ],
+      [ 'gtk3-demo-application', '1', ],
+      [ 'gtk3-widget-factory', '1', ],
+      [ 'gtk3-icon-browser', '1', ],
+    ]
+  endif
+
   if broadway_enabled
     man_files += [[ 'broadwayd', '1', ]]
   endif

gdk/quartz/Makefile.am

@@ -60,6 +60,7 @@ libgdkinclude_HEADERS = 	\
 	gdkquartz.h
 
 libgdkquartzinclude_HEADERS =		\
+	gdkquartz-cocoa-access.h        \
 	gdkquartz-gtk-only.h            \
 	gdkquartzcursor.h		\
 	gdkquartzdevice-core.h		\

gdk/quartz/gdkglcontext-quartz.c

@@ -28,7 +28,7 @@
 #include "gdkquartzglcontext.h"
 #include "gdkquartzwindow.h"
 #include "gdkprivate-quartz.h"
-#include "gdkquartz-gtk-only.h"
+#include "gdkquartz-cocoa-access.h"
 
 #include "gdkinternals.h"
 

gdk/quartz/gdkinternal-quartz.h

@@ -75,14 +75,18 @@ typedef enum {
   GDK_QUARTZ_EVENT_SUBTYPE_EVENTLOOP
 } GdkQuartzEventSubType;
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 10130
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
 #define GDK_QUARTZ_EVENT_TABLET_PROXIMITY NSEventTypeTabletProximity
 #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSEventSubtypeTabletProximity
 #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT NSEventSubtypeTabletPoint
-#else
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 10120
 #define GDK_QUARTZ_EVENT_TABLET_PROXIMITY NSTabletProximity
 #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSTabletProximityEventSubtype
 #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT NSTabletPointEventSubtype
+#else
+#define GDK_QUARTZ_EVENT_TABLET_PROXIMITY kEventTabletProximity
+#define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSTabletProximityEventSubtype
+#define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT kCGEventMouseSubtypeTabletPoint
 #endif
 
 void         _gdk_quartz_events_update_focus_window    (GdkWindow *new_window,

gdk/quartz/gdkquartz-cocoa-access.h

+/* gdkquartz-gtk-only.h
+ *
+ * Copyright (C) 2005-2007 Imendio AB
+ *
+ * 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_QUARTZ_COCOA_ACCESS_H__
+#define __GDK_QUARTZ_COCOA_ACCESS_H__
+
+#ifndef __OBJC__
+#error "This header declares Cocoa types and can be included only from source files compiled with Objective-C."
+#endif
+
+#include <AppKit/AppKit.h>
+#include <gdk/gdk.h>
+#include <gdk/quartz/gdkquartz.h>
+
+GDK_AVAILABLE_IN_ALL
+NSEvent  *gdk_quartz_event_get_nsevent              (GdkEvent  *event);
+GDK_AVAILABLE_IN_ALL
+NSWindow *gdk_quartz_window_get_nswindow            (GdkWindow *window);
+GDK_AVAILABLE_IN_ALL
+NSView   *gdk_quartz_window_get_nsview              (GdkWindow *window);
+
+#endif

gdk/quartz/gdkquartz-gtk-only.h

@@ -38,13 +38,5 @@ NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only        (GdkAtom
 /* Utilities */
 GDK_AVAILABLE_IN_ALL
 NSImage  *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf);
-GDK_AVAILABLE_IN_ALL
-NSEvent  *gdk_quartz_event_get_nsevent              (GdkEvent  *event);
-
-/* Window */
-GDK_AVAILABLE_IN_ALL
-NSWindow *gdk_quartz_window_get_nswindow            (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
-NSView   *gdk_quartz_window_get_nsview              (GdkWindow *window);
 
 #endif

gdk/quartz/gdkutils-quartz.c

@@ -23,6 +23,7 @@
 #include <gdkinternals.h>
 
 #include "gdkquartz-gtk-only.h"
+#include "gdkquartz-cocoa-access.h"
 #include <gdkquartzutils.h>
 
 NSImage *

gdk/quartz/gdkwindow-quartz.c

@@ -30,7 +30,7 @@
 #include "gdkquartzglcontext.h"
 #include "gdkquartzscreen.h"
 #include "gdkquartzcursor.h"
-#include "gdkquartz-gtk-only.h"
+#include "gdkquartz-cocoa-access.h"
 
 #include <Carbon/Carbon.h>
 #include <AvailabilityMacros.h>
@@ -2441,11 +2441,14 @@ gdk_quartz_window_set_decorations (GdkWindow       *window,
 
   impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
 
-  if (decorations == 0 || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP ||
+  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP ||
       impl->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN )
     {
       new_mask = GDK_QUARTZ_BORDERLESS_WINDOW;
     }
+  else if (decorations == 0) {
+      new_mask = GDK_QUARTZ_BORDERLESS_WINDOW | GDK_QUARTZ_MINIATURIZABLE_WINDOW;
+    }
   else
     {
       /* FIXME: Honor other GDK_DECOR_* flags. */

gdk/quartz/meson.build

@@ -26,6 +26,7 @@ gdk_quartz_sources = files(
 )
 
 gdk_quartz_public_headers = files(
+  'gdkquartz-cocoa-access.h',
   'gdkquartzcursor.h',
   'gdkquartzdevice-core.h',
   'gdkquartzdevicemanager-core.h',

gdk/wayland/gdkdevice-wayland.c

@@ -2195,6 +2195,7 @@ deliver_key_event (GdkWaylandSeat *seat,
   struct xkb_keymap *xkb_keymap;
   GdkKeymap *keymap;
   xkb_keysym_t sym;
+  int layout;
   guint delay, interval, timeout;
   gint64 begin_time, now;
 
@@ -2207,6 +2208,7 @@ deliver_key_event (GdkWaylandSeat *seat,
   xkb_keymap = _gdk_wayland_keymap_get_xkb_keymap (keymap);
 
   sym = xkb_state_key_get_one_sym (xkb_state, key);
+  layout = xkb_state_key_get_layout (xkb_state, key);
   if (sym == XKB_KEY_NoSymbol)
     return;
 
@@ -2220,7 +2222,7 @@ deliver_key_event (GdkWaylandSeat *seat,
   gdk_event_set_seat (event, GDK_SEAT (seat));
   event->key.time = time_;
   event->key.state = device_get_modifiers (seat->master_pointer);
-  event->key.group = 0;
+  event->key.group = layout;
   event->key.hardware_keycode = key;
   gdk_event_set_scancode (event, key);
   event->key.keyval = sym;

gdk/wayland/gdkdisplay-wayland.c

@@ -434,26 +434,19 @@ gdk_registry_handle_global (void               *data,
     }
   else if (strcmp (interface, "wl_seat") == 0)
     {
+      SeatAddedClosure *closure;
       static const char *required_device_manager_globals[] = {
         "wl_compositor",
         "wl_data_device_manager",
         NULL
       };
 
-      if (has_required_globals (display_wayland,
-                                required_device_manager_globals))
-        _gdk_wayland_display_add_seat (display_wayland, id, version);
-      else
-        {
-          SeatAddedClosure *closure;
-
-          closure = g_new0 (SeatAddedClosure, 1);
-          closure->base.handler = seat_added_closure_run;
-          closure->base.required_globals = required_device_manager_globals;
-          closure->id = id;
-          closure->version = version;
-          postpone_on_globals_closure (display_wayland, &closure->base);
-        }
+      closure = g_new0 (SeatAddedClosure, 1);
+      closure->base.handler = seat_added_closure_run;
+      closure->base.required_globals = required_device_manager_globals;
+      closure->id = id;
+      closure->version = version;
+      postpone_on_globals_closure (display_wayland, &closure->base);
     }
   else if (strcmp (interface, "wl_data_device_manager") == 0)
     {
@@ -533,8 +526,6 @@ gdk_registry_handle_global (void               *data,
 
   g_hash_table_insert (display_wayland->known_globals,
                        GUINT_TO_POINTER (id), g_strdup (interface));
-
-  process_on_globals_closures (display_wayland);
 }
 
 static void
@@ -625,8 +616,13 @@ _gdk_wayland_display_open (const gchar *display_name)
 
   display_wayland->wl_registry = wl_display_get_registry (display_wayland->wl_display);
   wl_registry_add_listener (display_wayland->wl_registry, &registry_listener, display_wayland);
+  if (wl_display_roundtrip (display_wayland->wl_display) < 0)
+    {
+      g_object_unref (display);
+      return NULL;
+    }
 
-  _gdk_wayland_display_async_roundtrip (display_wayland);
+  process_on_globals_closures (display_wayland);
 
   /* Wait for initializing to complete. This means waiting for all
    * asynchrounous roundtrips that were triggered during initial roundtrip. */

gdk/wayland/gdkscreen-wayland.c

@@ -542,13 +542,13 @@ static TranslationEntry translations[] = {
   { FALSE, "org.gnome.desktop.privacy", "remember-recent-files",    "gtk-recent-files-enabled", G_TYPE_BOOLEAN, { .b = TRUE } },
   { FALSE, WM_SETTINGS_SCHEMA, "button-layout",    "gtk-decoration-layout", G_TYPE_STRING, { .s = "menu:close" } },
   { FALSE, CLASSIC_WM_SETTINGS_SCHEMA, "button-layout",   "gtk-decoration-layout", G_TYPE_STRING, { .s = "menu:close" } },
-  { FALSE, "org.gnome.desktop.interface", "font-antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 0 } },
+  { FALSE, "org.gnome.desktop.interface", "font-antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 1 } },
+  { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
+  { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
   { FALSE, "org.gnome.desktop.interface", "font-rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 0 } },
+  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 1 } },
+  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
+  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
   { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
   { FALSE, "org.gnome.desktop.interface", "text-scaling-factor", "gtk-xft-dpi" , G_TYPE_NONE, { .i = 0 } },
   { FALSE, "org.gnome.desktop.wm.preferences", "action-double-click-titlebar", "gtk-titlebar-double-click", G_TYPE_STRING, { .s = "toggle-maximize" } },
@@ -745,6 +745,14 @@ init_settings (GdkScreen *screen)
           goto fallback;
         }
 
+      if (g_variant_n_children (ret) == 0)
+        {
+          g_debug ("Received no portal settings");
+          g_clear_pointer (&ret, g_variant_unref);
+
+          goto fallback;
+        }
+
       g_variant_get (ret, "(a{sa{sv}})", &iter);
 
       while (g_variant_iter_loop (iter, "{s@a{sv}}", &schema, &val))

gdk/win32/gdkglcontext-win32.c

@@ -589,8 +589,6 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
   gboolean disable_wgl = FALSE;
 
 #ifdef GDK_WIN32_ENABLE_EGL
-  EGLDisplay egl_disp;
-
   disable_wgl = ((_gdk_gl_flags & GDK_GL_GLES) != 0) ||
                 display_win32->running_on_arm64;
 #endif
@@ -655,46 +653,48 @@ _gdk_win32_display_init_gl (GdkDisplay *display,
       wglMakeCurrent (NULL, NULL);
 
       _destroy_dummy_gl_context (dummy);
-      return TRUE;
     }
 
 #ifdef GDK_WIN32_ENABLE_EGL
-  egl_disp = _gdk_win32_get_egl_display (display_win32);
-
-  if (egl_disp == EGL_NO_DISPLAY ||
-      !eglInitialize (egl_disp, NULL, NULL))
+  else
     {
-      if (egl_disp != EGL_NO_DISPLAY)
+      EGLDisplay egl_disp = _gdk_win32_get_egl_display (display_win32);
+
+      if (egl_disp == EGL_NO_DISPLAY ||
+          !eglInitialize (egl_disp, NULL, NULL))
         {
-          eglTerminate (egl_disp);
-          egl_disp = EGL_NO_DISPLAY;
-        }
+          if (egl_disp != EGL_NO_DISPLAY)
+            {
+              eglTerminate (egl_disp);
+              egl_disp = EGL_NO_DISPLAY;
+            }
 
-      return FALSE;
-    }
+          return FALSE;
+        }
 
-  display_win32->egl_disp = egl_disp;
-  display_win32->have_egl = TRUE;
-  display_win32->egl_version = epoxy_egl_version (egl_disp);
+      display_win32->egl_disp = egl_disp;
+      display_win32->have_egl = TRUE;
+      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");
+      display_win32->hasEglSurfacelessContext =
+        epoxy_has_egl_extension (egl_disp, "EGL_KHR_surfaceless_context");
 
 
-  GDK_NOTE (OPENGL,
-            g_print ("EGL API version %d.%d found\n"
-                     " - Vendor: %s\n"
-                     " - Checked extensions:\n"
-                     "\t* EGL_KHR_surfaceless_context: %s\n",
-                     display_win32->egl_version / 10,
-                     display_win32->egl_version % 10,
-                     eglQueryString (display_win32->egl_disp, EGL_VENDOR),
-                     display_win32->hasEglSurfacelessContext ? "yes" : "no"));
+      GDK_NOTE (OPENGL,
+                g_print ("EGL API version %d.%d found\n"
+                         " - Vendor: %s\n"
+                         " - Checked extensions:\n"
+                         "\t* EGL_KHR_surfaceless_context: %s\n",
+                         display_win32->egl_version / 10,
+                         display_win32->egl_version % 10,
+                         eglQueryString (display_win32->egl_disp, EGL_VENDOR),
+                         display_win32->hasEglSurfacelessContext ? "yes" : "no"));
+    }
+#endif
 
   return TRUE;
-#endif
 }
 
 /* Setup the legacy context after creating it */

gdk/x11/gdkapplaunchcontext-x11.c

@@ -45,6 +45,9 @@ get_display_name (GFile     *file,
   if (name == NULL)
     {
       name = g_file_get_basename (file);
+      if (name == NULL)
+        name = g_file_get_uri (file);
+
       if (!g_utf8_validate (name, -1, NULL))
         {
           tmp = name;

gdk/x11/gdkdisplay-x11.c

@@ -1964,6 +1964,9 @@ _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display,
 static void
 gdk_x11_display_beep (GdkDisplay *display)
 {
+  if (!GDK_X11_DISPLAY (display)->trusted_client)
+    return;
+
 #ifdef HAVE_XKB
   XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None);
 #else

gdk/x11/gdkdnd-x11.c

@@ -634,12 +634,14 @@ gdk_window_cache_new (GdkScreen *screen)
    */
   if (gdk_screen_is_composited (screen))
     {
+      gdk_x11_display_error_trap_push (GDK_X11_SCREEN (screen)->display);
       cow = XCompositeGetOverlayWindow (xdisplay, GDK_WINDOW_XID (root_window));
       gdk_window_cache_add (result, cow, 0, 0, 
 			    gdk_x11_screen_get_width (screen) * GDK_X11_SCREEN(screen)->window_scale, 
 			    gdk_x11_screen_get_height (screen) * GDK_X11_SCREEN(screen)->window_scale, 
 			    TRUE);
       XCompositeReleaseOverlayWindow (xdisplay, GDK_WINDOW_XID (root_window));
+      gdk_x11_display_error_trap_pop_ignored (GDK_X11_SCREEN (screen)->display);
     }
 #endif
 

gdk/x11/gdkmain-x11.c

@@ -240,24 +240,13 @@ gdk_x_io_error (Display *display)
   /* This is basically modelled after the code in XLib. We need
    * an explicit error handler here, so we can disable our atexit()
    * which would otherwise cause a nice segfault.
-   * We fprintf(stderr, instead of g_warning() because g_warning()
-   * could possibly be redirected to a dialog
+   * We g_debug() instead of g_warning(), because g_warning()
+   * could possibly be redirected to the log
    */
-  if (errno == EPIPE)
-    {
-      g_message ("The application '%s' lost its connection to the display %s;\n"
-                 "most likely the X server was shut down or you killed/destroyed\n"
-                 "the application.\n",
-                 g_get_prgname (),
-                 display ? DisplayString (display) : gdk_get_display_arg_name ());
-    }
-  else
-    {
-      g_message ("%s: Fatal IO error %d (%s) on X server %s.\n",
-                 g_get_prgname (),
-                 errno, g_strerror (errno),
-                 display ? DisplayString (display) : gdk_get_display_arg_name ());
-    }
+  g_debug ("%s: Fatal IO error %d (%s) on X server %s.\n",
+           g_get_prgname (),
+           errno, g_strerror (errno),
+           display ? DisplayString (display) : gdk_get_display_arg_name ());
 
   _exit (1);
 }