Add tests/testbaseline

GtkButton: Add baseline align support
GtkAlignment: Support baselines
2013-03-07 19:57:43 +01:00 · 2013-03-07 19:57:43 +01:00 · 2013-03-07 19:57:43 +01:00 · 2013-03-07 19:57:43 +01:00 · 2013-03-07 19:57:43 +01:00 · 2013-03-07 19:57:43 +01:00
233 changed files with 50393 additions and 61723 deletions
@@ -1,202 +1,3 @@
-Overview of Changes in GTK+ 3.8.3
-=================================
-
-* Bugs fixed:
- 667759 gtkdnd-quartz.c is missing annotations for introspection
- 672271 File chooser seems over-enthusiastic about using subdir...
- 674108 Hard crash due to wrong NSAutoreleasePool stacking
- 680953 set_item_width / text wrapping doesn't work in iconview...
- 688738 GtkMenuButton problem with mnemonics / accelerators
- 691921 GTK+ (quartz) built on Mac OS X 10.5 references [NSMenu...
- 692548 Quartz: Cursor doesn't reset when the mouse leaves a to...
- 694273 Patch to support NSTextInputClient in text widgets
- 694755 When clicking Activities, sometimes gnome-shell crashes.
- 696498 can't set download folder
- 696640 GtkButton: Don't suppress unhandled mouse events
- 698183 Text input is too slow and some keys are broken after c...
- 698758 Wrong limit for "Native Windows wider or taller than 65...
- 700185 GtkWindow: problem with child widget visibility
- 700779 gtk_menu_item_draw puts the arrow too close to the border
- 701332 Patch for minor glitch in NSTextInput
- 701341 Windows only paint once in Weston 1.1
- 701365 Do not assert sm_proxy != NULL in GtkApplication inhibi...
- 701613 XEmbed doesn't work with frame-synced GTK/Mutter
- 702598 Invalid read of size 4 in gtk_icon_info_get_embedded_rect
- 702763 ellipsize placeholder text
- 702913 Reduce hash table lookups in gdk_x11_screen_supports_ne...
- 703069 Opening a big menu activates some menu entry
- 703220 Memory allocation integer overflow in gdk_cairo_set_sou...
- 705181 Annoying beep on arrow keys when using IME on MacOS
- 705182 Reset Cocoa IME state when immodule is reset
- 705320 gtkicontheme: check for GdkPixbuf first
- 705692 Segmentation fault on horizontal slider
- 705750 Quartz input method doesn't work correctly for Chinese...
- 706152 g_object_notify called with NULL priv->focus_widget
-
-* Translation updates:
- Brazilian Portuguese
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.8.2
-=================================
-
-* Bugs fixed:
- 504901 GtkCellRendererCombo requires click-and-hold
- 695120 GtkMenu and GdkWindow sizes can get out of sync
- 698051 Typo in documentation comment
- 698181 Document icon-shadow CSS property
- 699104 when nothing is selected, Add to Bookmarks is enabled...
- 699239 Choose DnD/tooltip widget better on GtkOverlay and ot...
- 699750 Print dialog crashes when printer does not provide pr...
- 699901 GTK CSS keybinding broken
- 699929 GtkCheckMenuItem: remove an unused boolean field
- 700007 Various small improvements
- 700079 Fix accels added after the window was shown not working
-
-Translation updates:
- Brazilian Portuguese
- German
- Italian
- Japanese
- Lithuanian
- Norwegian bokmål
- Russian
-
-
-Overview of Changes in GTK+ 3.8.1
-=================================
-
-* Broadway backend improvements:
- - Ensure window sizes are synched right
- - Sync surface updates with paint clock
- - Add support for password authentication
- - Reuse surfaces passed to server
-
-* CSS improvements:
- - Add cycle detection to color resolving
-
-* Bug fixes
- 675649 gtk-demo: Fix typo
- 681446 gtkdnd memory leak
- 685419 gtkprintbackendfile: Infinite loop in _cairo_write()
- 685420 Critical warnings when GtkPrintJob is released too early
- 690275 scrolling on other windows is applied when coming back...
- 696370 GtkOverlay doesn't work on top of GtkClutterEmbed
- 696622 gtk option printer widget segfault in epiphany
- 696623 GtkOverlay with a revealer produces warnings setting a...
- 696882 GtkWindow changes size after hide/show cycle
- 697144 Popup menu mnemonics fixes
- 697263 Impossible to set window transparency on 3.8
- 697427 Unreferencing GtkStatusIcon object causes abort
-
-* Translation updates
- Basque
- British English
- Catalan (Valencian)
- Czech
- Finnish
- Hungarian
- Indonesian
- Interlingua
- Kannada
- Malayalam
- Norwegian bokmål
- Polish
- Simplified Chinese
- Slovak
- Slovenian
-
-
-Overview of Changes in GTK+ 3.8.0
-=================================
-
-* Bug fixes
- 674759 GtkLabel: wrong value of "mnemonic-keyval" when...
- 695493 testgtk: issues with the color selection example
- 696051 vertical grid lines in rtl mode
- 696171 GtkAssistant highlighted font unreadable
- 696202 Add GtkSpinner animation back to Win32 theme
- 696232 win32: do not crash on invalid utf8 conversion
- 696405 appchooserbutton: filter out applications not...
- 696546 Fix a crash in gtk_print_backend_cups_finalize()
- 696553 Fix a crash in avahi_create_browsers()
-        Use natural size to set treeview adjustments
-
-* Translation updates
- Aragonese
- Czech
- French
- Galician
- German
- Gujarati
- Hindi
- Hungarian
- Italian
- Kazakh
- Marathi
- Odia
-  Persian
- Punjabi
- Russian
- Slovenian
- Tamil
- Traditional Chinese
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.7.14
-==================================
-
-* A lot of filechooser button fixes
-
-* Bugs fixed:
- 586367 In local_only mode, file chooser should return native...
- 671939 crash on exit
- 674759 GtkLabel: wrong value of "mnemonic-keyval" when "use-...
- 691040 selection is reported incorrectly in file chooser button
- 694339 Fix build of GTK+ on Windows
- 695200 Switching apps while a combobox open makes the parent...
- 695278 Avoid passing a NULL title to setTitle
- 695304 GtkTextView: don't popdown a bubble if we don't have one
- 695312 Initial 'text' set in the non-numeric-only GtkSpinBut...
- 695375 GtkEntryAccessible: also handle entry icon tooltip NU...
- 695391 wayland documentation section id is "gtk-osx"
- 695473 treeview: fix a critical warning
- 695482 Universal Access panel appears jumbled and horrible a...
- 695682 Cannot build docs for wayland-only build
- 695714 Getting of printer info can hang
- 695715 Use DBus calls instead of Avahi API
- 695772 Different appearance of menus within Audacious
- 695783 GtkApplication: Allow passing windows on non-X11 targets
- 695874 GtkFontChooser docs
- 695948 GtkFontButton sets wrong show-preview-entry
-
-* Translation updates:
- Arabic
- Assamese
- Belarusian
- Brazilian Portuguese
- Catalan
- Danish
- Finnish
- French
- Galician
- German
- Greek
- Indonesian
- Kazakh
- Lithuanian
- Korean
- Polish
- Portuguese
- Punjabi
- Serbian
- Slovenian
- Spanish
- Uyghur
-
-
 Overview of Changes in GTK+ 3.7.12
 ==================================

@@ -111,7 +111,6 @@ echo --no-libtool --library=gtk-3-vs%VSVER% ^^>> gtk_gir.bat
 echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 --add-include-path=. ^^>> gtk_gir.bat
 echo --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h" ^^>> gtk_gir.bat
 echo -I..\.. -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\" ^^>> gtk_gir.bat
-echo -Dtime_t=long ^^>> gtk_gir.bat
 echo -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" ^^>> gtk_gir.bat
 echo -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.6.2\" ^^>> gtk_gir.bat
 echo -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs%VSVER%\" ^^>> gtk_gir.bat
@@ -10,9 +10,9 @@
    <GtkBinaryVersion>3.0.0</GtkBinaryVersion>
    <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
    <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
-    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
+    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED</GtkDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="\"Gtk\"";GTK_HOST="\"i686-pc-vs$(VSVer)\"";GTK_PRINT_BACKENDS="\"file\"";GTK_PRINT_PREVIEW_COMMAND="\"undefined-gtk-print-preview-command\"";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="\"$(GtkDummyPrefix)/lib\"";GTK_DATADIR="\"$(GtkDummyPrefix)/share\"";GTK_DATA_PREFIX="\"$(GtkDummyPrefix)\"";GTK_SYSCONFDIR="\"$(GtkDummyPrefix)/etc\"";MULTIPRESS_CONFDIR="\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\"";MULTIPRESS_LOCALEDIR="\"$(GtkDummyPrefix)/share/locale\"";GTK_VERSION="\"$(GtkVersion)/etc\"";GTK_BINARY_VERSION="\"$(GtkBinaryVersion)/etc\"";GDK_DISABLE_DEPRECATED</GtkDefines>
    <GtkDoInstall>
 echo on

@@ -23,6 +23,23 @@ copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
 copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin


+mkdir $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.css $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+
 mkdir $(CopyDir)\lib

 copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
@@ -576,7 +593,7 @@ copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(ApiVersion
 copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated


-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\a11y


 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -79,6 +79,16 @@ mkdir $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;

+mkdir $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.css $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+
 mkdir $(CopyDir)\lib&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;

@@ -359,7 +369,7 @@ copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion
 copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
 copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\a11y&#x0D;&#x0A;

 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [8])
-m4_define([gtk_micro_version], [4])
-m4_define([gtk_interface_age], [4])
+m4_define([gtk_minor_version], [7])
+m4_define([gtk_micro_version], [13])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -350,7 +350,7 @@ if test "$enable_win32_backend" = "yes"; then
  backend_immodules="$backend_immodules,ime"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
  AM_CONDITIONAL(USE_WIN32, true)
  PANGO_PACKAGES="pangowin32 pangocairo"
 else
@@ -361,7 +361,6 @@ DISABLE_ON_QUARTZ=''
 if test "x$enable_quartz_backend" = xyes; then
  cairo_backends="$cairo_backends cairo-quartz"
  GDK_BACKENDS="$GDK_BACKENDS quartz"
-  backend_immodules="$backend_immodules,quartz"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
@@ -391,7 +390,6 @@ else
  AM_CONDITIONAL(USE_BROADWAY, false)
 fi

-DISABLE_ON_WAYLAND=''
 if test "x$enable_wayland_backend" = "xyes"; then
  # For the cairo image backend
  cairo_backends="$cairo_backends cairo"
@@ -399,13 +397,11 @@ if test "x$enable_wayland_backend" = "xyes"; then
  have_gio_unix=yes
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  DISABLE_ON_WAYLAND='%'
  WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor"
  AM_CONDITIONAL(USE_WAYLAND, true)
 else
  AM_CONDITIONAL(USE_WAYLAND, false)
 fi
-AC_SUBST(DISABLE_ON_WAYLAND)

 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
@@ -876,7 +872,6 @@ AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
@@ -1244,6 +1239,7 @@ if test "$have_gio_unix" = "yes"; then
 else
  GDK_GIO_PACKAGE=gio-2.0
 fi
+AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")

 # Check for Pango flags

@@ -1456,6 +1452,45 @@ else
  fi
 fi

+# Check for Avahi flags
+AC_ARG_ENABLE(avahi-browsing,
+              [AS_HELP_STRING([--disable-avahi-browsing],
+                              [disable avahi browsing of printers])],,
+              [enable_avahi_browsing=auto])
+
+have_avahi_browsing=no
+if test "x$enable_avahi_browsing" != "xno" -a \
+        "x$have_cups_api_1_6" = "xyes"; then
+  AC_MSG_CHECKING([avahi-gobject])
+
+  if $PKG_CONFIG --exists avahi-gobject ; then
+    AVAHI_CFLAGS=`$PKG_CONFIG --cflags avahi-gobject`
+    AC_SUBST(AVAHI_CFLAGS)
+    AVAHI_LIBS=`$PKG_CONFIG --libs avahi-gobject`
+    AC_SUBST(AVAHI_LIBS)
+    have_avahi_gobject=yes
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+
+  if test "x$have_avahi_gobject" = "xyes" ; then
+    AC_DEFINE([HAVE_AVAHI_BROWSING], [1], [Define to 1 if avahi-gobject available])
+    have_avahi_browsing=yes
+  else
+    AC_MSG_ERROR([
+*** avahi-gobject not found. avahi-gobject is required to build GTK+ with support
+*** for avahi browsed printers when using CUPS 1.6.
+])
+  fi
+else
+  if test "x$enable_avahi_browsing" = "xyes"; then
+    AC_MSG_ERROR([
+*** Avahi browsing support requested but CUPS 1.6 not found.
+])
+  fi
+fi
+
 # Checks to see if we should compile with PAPI backend for GTK+
 #

@@ -1832,6 +1867,7 @@ echo "        Dynamic modules:      $build_dynamic_modules"
 echo "        Included immodules:   $included_immodules"
 echo "        PackageKit support:   $build_packagekit"
 echo "        colord support:       $have_colord"
+echo "        Avahi browsing:       $have_avahi_browsing"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"
@@ -403,7 +403,7 @@ static GtkWidget *create_text (GtkWidget **text_view, gboolean is_source);
 static void
 add_data_tab (const gchar *demoname)
 {
-  gchar *resource_dir, *resource_name, *content_type, *content_mime;
+  gchar *resource_dir, *resource_name, *content_type;
  gchar **resources;
  GBytes *bytes;
  GtkWidget *widget, *label;
@@ -427,20 +427,17 @@ add_data_tab (const gchar *demoname)
                                           g_bytes_get_data (bytes, NULL),
                                           g_bytes_get_size (bytes),
                                           NULL);
-      content_mime = g_content_type_get_mime_type (content_type);

      /* In theory we should look at all the mime types gdk-pixbuf supports
       * and go from there, but we know what file types we've added.
       */
-      if (g_content_type_is_a (content_mime, "image/png") ||
-          g_content_type_is_a (content_mime, "image/gif") ||
-          g_content_type_is_a (content_mime, "image/jpeg"))
+      if (g_content_type_is_a (content_type, "image/png") ||
+          g_content_type_is_a (content_type, "image/gif") ||
+          g_content_type_is_a (content_type, "image/jpeg"))
        {
          widget = gtk_image_new_from_resource (resource_name);
        }
-      else if (g_content_type_is_a (content_mime, "text/plain") ||
-               g_content_type_is_a (content_mime, "application/x-ext-ui") ||
-               g_content_type_is_a (content_mime, "text/css"))
+      else if (g_content_type_is_a (content_type, "text/plain"))
        {
          GtkTextBuffer *buffer;
          GtkWidget *textview;
@@ -452,8 +449,7 @@ add_data_tab (const gchar *demoname)
        }
      else
        {
-
-          g_warning ("Don't know how to display resource '%s' of type '%s'\n", resource_name, content_mime);
+          g_warning ("Don't know how to display resource '%s' of type '%s'\n", resource_name, content_type);
          widget = NULL;
        }

@@ -462,7 +458,6 @@ add_data_tab (const gchar *demoname)
      gtk_widget_show (label);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);

-      g_free (content_mime);
      g_free (content_type);
      g_free (resource_name);
      g_bytes_unref (bytes);
@@ -85,7 +85,7 @@ scroll_to_bottom (GtkTextView *textview)
  gtk_text_iter_set_line_offset (&iter, 0);

  /* and place the mark at iter. the mark will stay there after we
-   * insert some text at the end because it has left gravity.
+   * insert some text at the end because it has right gravity.
   */
  mark = gtk_text_buffer_get_mark (buffer, "scroll");
  gtk_text_buffer_move_mark (buffer, mark, &iter);
@@ -54,15 +54,6 @@ Start your applications like this:
 BROADWAY_DISPLAY=:5 gtk3-demo
 </programlisting>

-You can add password protection for your session by creating a file in
-<filename>$XDG_CONFIG_HOME/broadway.passwd</filename> or <filename>$HOME/.config/broadway.passwd</filename>
-with a crypt(3) style password hash.
-
-A simple way to generate it is with openssl:
-<programlisting>
-openssl passwd -1  > ~/.config/broadway.passwd
-</programlisting>
-
 </para>
 </refsect1>

@@ -67,7 +67,7 @@ this range will trigger compiler warnings.
 Here is how you would compile hello.c if you want to allow it
 to use symbols that were not deprecated in 3.2:
 <programlisting>
-$ cc -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
+$ cc -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </programlisting>
 </para>

@@ -119,7 +119,7 @@ gtk_page_setup_get_type
@DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_plug_get_type
+@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_plug_get_type
@DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
@DISABLE_ON_W32@gtk_print_job_get_type
@@ -151,7 +151,7 @@ gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_size_group_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_socket_get_type
+@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_statusbar_get_type
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-wayland">
+<refentry id="gtk-osx">
 <refmeta>
 <refentrytitle>Using GTK+ with Wayland</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -83,7 +83,7 @@ broadwayd_SOURCES = \
 	broadway-output.h		\
 	broadway-output.c

-broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt -lcrypt
+broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt

 MAINTAINERCLEANFILES = $(broadway_built_sources)
 EXTRA_DIST += $(broadway_built_sources)
@@ -317,13 +317,6 @@ broadway_output_get_next_serial (BroadwayOutput *output)
  return output->serial;
 }

-void
-broadway_output_set_next_serial (BroadwayOutput *output,
-				 guint32 serial)
-{
-  output->serial = serial;
-}
-

 /************************************************************************
 *                     Core rendering operations                        *
@@ -478,24 +471,6 @@ broadway_output_new_surface(BroadwayOutput *output,
  append_bool (output, is_temp);
 }

-void
-broadway_output_request_auth (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_REQUEST_AUTH);
-}
-
-void
-broadway_output_auth_ok (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_AUTH_OK);
-}
-
-void
-broadway_output_disconnected (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_DISCONNECTED);
-}
-
 void
 broadway_output_show_surface(BroadwayOutput *output,  int id)
 {
@@ -23,8 +23,6 @@ BroadwayOutput *broadway_output_new             (GOutputStream  *out,
 void            broadway_output_free            (BroadwayOutput *output);
 int             broadway_output_flush           (BroadwayOutput *output);
 int             broadway_output_has_error       (BroadwayOutput *output);
-void            broadway_output_set_next_serial (BroadwayOutput *output,
-						 guint32         serial);
 guint32         broadway_output_get_next_serial (BroadwayOutput *output);
 void            broadway_output_new_surface     (BroadwayOutput *output,
 						 int             id,
@@ -33,9 +31,6 @@ void            broadway_output_new_surface     (BroadwayOutput *output,
 						 int             w,
 						 int             h,
 						 gboolean        is_temp);
-void            broadway_output_request_auth    (BroadwayOutput *output);
-void            broadway_output_auth_ok         (BroadwayOutput *output);
-void            broadway_output_disconnected    (BroadwayOutput *output);
 void            broadway_output_show_surface    (BroadwayOutput *output,
 						 int             id);
 void            broadway_output_hide_surface    (BroadwayOutput *output,
@@ -36,9 +36,6 @@ typedef enum {
  BROADWAY_OP_SET_TRANSIENT_FOR = 'p',
  BROADWAY_OP_PUT_RGB = 'i',
  BROADWAY_OP_FLUSH = 'f',
-  BROADWAY_OP_REQUEST_AUTH = 'l',
-  BROADWAY_OP_AUTH_OK = 'L',
-  BROADWAY_OP_DISCONNECTED = 'D',
 } BroadwayOpType;

 typedef struct {
@@ -163,7 +160,7 @@ typedef struct {
 typedef struct {
  BroadwayRequestBase base;
  guint32 id;
-  char name[36];
+  char name[34];
  guint32 width;
  guint32 height;
 } BroadwayRequestUpdate;
@@ -2,8 +2,6 @@

 #include "broadway-output.h"

-#define _XOPEN_SOURCE /* for crypt */
-
 #include <glib.h>
 #include <glib/gprintf.h>
 #include "gdktypes.h"
@@ -11,10 +9,6 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <crypt.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -25,7 +19,6 @@ typedef struct BroadwayWindow BroadwayWindow;
 struct _BroadwayServer {
  GObject parent_instance;

-  char *password;
  char *address;
  int port;
  GSocketService *service;
@@ -76,7 +69,6 @@ typedef struct HttpRequest {

 struct BroadwayInput {
  BroadwayServer *server;
-  BroadwayOutput *output;
  GSocketConnection *connection;
  GByteArray *buffer;
  GSource *source;
@@ -84,7 +76,6 @@ struct BroadwayInput {
  gint64 time_base;
  gboolean proto_v7_plus;
  gboolean binary;
-  gboolean active;
 };

 struct BroadwayWindow {
@@ -99,9 +90,6 @@ struct BroadwayWindow {
  gint32 transient_for;

  cairo_surface_t *last_surface;
-
-  char *cached_surface_name;
-  cairo_surface_t *cached_surface;
 };

 static void broadway_server_resync_windows (BroadwayServer *server);
@@ -112,8 +100,6 @@ static void
 broadway_server_init (BroadwayServer *server)
 {
  BroadwayWindow *root;
-  char *passwd_file;
-  char *password, *p;

  server->service = g_socket_service_new ();
  server->pointer_grab_window_id = -1;
@@ -122,22 +108,6 @@ broadway_server_init (BroadwayServer *server)
  server->id_ht = g_hash_table_new (NULL, NULL);
  server->id_counter = 0;

-  passwd_file = g_build_filename (g_get_user_config_dir (),
-				  "broadway.passwd", NULL);
-
-  if (g_file_get_contents (passwd_file,
-			   &password, NULL, NULL))
-    {
-      p = strchr (password, '\n');
-      if (p)
-	*p = 0;
-      g_strstrip (password);
-      if (strlen (password) > 3)
-	server->password = password;
-      else
-	g_free (password);
-    }
-
  root = g_new0 (BroadwayWindow, 1);
  root->id = server->id_counter++;
  root->width = 1024;
@@ -169,7 +139,7 @@ broadway_server_class_init (BroadwayServerClass * class)
  object_class->finalize = broadway_server_finalize;
 }

-static void start (BroadwayInput *input);
+static void start_output (HttpRequest *request, gboolean proto_v7_plus, gboolean binary);

 static void
 http_request_free (HttpRequest *request)
@@ -379,14 +349,6 @@ update_future_pointer_info (BroadwayServer *server, BroadwayInputPointerMsg *dat
  server->future_mouse_in_toplevel = data->mouse_window_id;
 }

-static gboolean
-verify_password (BroadwayServer *server, const char *password)
-{
-  char *hash;
-  hash = crypt (password, server->password);
-  return strcmp (hash, server->password) == 0;
-}
-
 static void
 parse_input_message (BroadwayInput *input, const char *message)
 {
@@ -395,22 +357,6 @@ parse_input_message (BroadwayInput *input, const char *message)
  char *p;
  gint64 time_;

-  if (!input->active)
-    {
-      /* The input has not been activated yet, handle auth/start */
-
-      if (message[0] != 'l' ||
-	  !verify_password (server, message+1))
-	{
-	  broadway_output_request_auth (input->output);
-	  broadway_output_flush (input->output);
-	}
-      else
-	start (input);
-
-      return;
-    }
-
  memset (&msg, 0, sizeof (msg));

  p = (char *)message;
@@ -624,7 +570,7 @@ parse_input (BroadwayInput *input)
 	      }
 	    break;
 	  case BROADWAY_WS_CNX_PING:
-	    broadway_output_pong (input->output);
+	    broadway_output_pong (server->output);
 	    break;
 	  case BROADWAY_WS_CNX_PONG:
 	    break; /* we never send pings, but tolerate pongs */
@@ -650,8 +596,7 @@ parse_input (BroadwayInput *input)

      if (buf[0] != 0)
 	{
-	  if (server->input == input)
-	    server->input = NULL;
+	  server->input = NULL;
 	  broadway_input_free (input);
 	  return;
 	}
@@ -668,8 +613,7 @@ parse_input (BroadwayInput *input)

 	  if (len > 0 && buf[0] != 0)
 	    {
-	      if (server->input == input)
-		server->input = NULL;
+	      server->input = NULL;
 	      broadway_input_free (input);
 	      break;
 	    }
@@ -696,16 +640,19 @@ queue_process_input_at_idle (BroadwayServer *server)
 }

 static void
-broadway_server_read_all_input_nonblocking (BroadwayInput *input)
+broadway_server_read_all_input_nonblocking (BroadwayServer *server)
 {
  GInputStream *in;
  gssize res;
  guint8 buffer[1024];
  GError *error;
+  BroadwayInput *input;

-  if (input == NULL)
+  if (server->input == NULL)
    return;

+  input = server->input;
+
  in = g_io_stream_get_input_stream (G_IO_STREAM (input->connection));

  error = NULL;
@@ -721,8 +668,7 @@ broadway_server_read_all_input_nonblocking (BroadwayInput *input)
 	  return;
 	}

-      if (input->server->input == input)
-	input->server->input = NULL;
+      server->input = NULL;
      broadway_input_free (input);
      if (res < 0)
 	{
@@ -740,7 +686,7 @@ broadway_server_read_all_input_nonblocking (BroadwayInput *input)
 static void
 broadway_server_consume_all_input (BroadwayServer *server)
 {
-  broadway_server_read_all_input_nonblocking (server->input);
+  broadway_server_read_all_input_nonblocking (server);

  /* Since we're parsing input but not processing the resulting messages
     we might not get a readable callback on the stream, so queue an idle to
@@ -755,10 +701,9 @@ input_data_cb (GObject  *stream,
 {
  BroadwayServer *server = input->server;

-  broadway_server_read_all_input_nonblocking (input);
+  broadway_server_read_all_input_nonblocking (server);

-  if (input->active)
-    process_input_messages (server);
+  process_input_messages (server);

  return TRUE;
 }
@@ -933,14 +878,15 @@ start_input (HttpRequest *request, gboolean binary)
  gsize len;
  GChecksum *checksum;
  char *origin, *host;
+  BroadwayServer *server;
  BroadwayInput *input;
  const void *data_buffer;
  gsize data_buffer_size;
  GInputStream *in;
  char *key_v7;
  gboolean proto_v7_plus;
-  GSocket *socket;
-  int flag = 1;
+
+  server = request->server;

 #ifdef DEBUG_WEBSOCKETS
  g_print ("incoming request:\n%s\n", request->request->str);
@@ -1087,11 +1033,15 @@ start_input (HttpRequest *request, gboolean binary)
      proto_v7_plus = FALSE;
    }

-  socket = g_socket_connection_get_socket (request->connection);
-  setsockopt (g_socket_get_fd (socket), IPPROTO_TCP,
-	      TCP_NODELAY, (char *) &flag, sizeof(int));
+
+  if (server->input != NULL)
+    {
+      broadway_input_free (server->input);
+      server->input = NULL;
+    }

  input = g_new0 (BroadwayInput, 1);
+
  input->server = request->server;
  input->connection = g_object_ref (request->connection);
  input->proto_v7_plus = proto_v7_plus;
@@ -1101,9 +1051,9 @@ start_input (HttpRequest *request, gboolean binary)
  input->buffer = g_byte_array_sized_new (data_buffer_size);
  g_byte_array_append (input->buffer, data_buffer, data_buffer_size);

-  input->output =
-    broadway_output_new (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-			 0, proto_v7_plus, binary);
+  server->input = input;
+
+  start_output (request, proto_v7_plus, binary);

  /* This will free and close the data input stream, but we got all the buffered content already */
  http_request_free (request);
@@ -1113,53 +1063,35 @@ start_input (HttpRequest *request, gboolean binary)
  g_source_set_callback (input->source, (GSourceFunc)input_data_cb, input, NULL);
  g_source_attach (input->source, NULL);

-  if (input->server->password)
-    {
-      broadway_output_request_auth (input->output);
-      broadway_output_flush (input->output);
-    }
-  else
-    start (input);
-
  /* Process any data in the pipe already */
  parse_input (input);
+  process_input_messages (server);

  g_strfreev (lines);
 }

 static void
-start (BroadwayInput *input)
+start_output (HttpRequest *request, gboolean proto_v7_plus, gboolean binary)
 {
+  GSocket *socket;
  BroadwayServer *server;
+  int flag = 1;

-  input->active = TRUE;
+  socket = g_socket_connection_get_socket (request->connection);
+  setsockopt(g_socket_get_fd (socket), IPPROTO_TCP,
+	     TCP_NODELAY, (char *) &flag, sizeof(int));

-  server = BROADWAY_SERVER (input->server);
-
-  if (server->output)
-    {
-      broadway_output_disconnected (server->output);
-      broadway_output_flush (server->output);
-    }
-
-  if (server->input != NULL)
-    {
-      broadway_input_free (server->input);
-      server->input = NULL;
-    }
-
-  server->input = input;
+  server = BROADWAY_SERVER (request->server);

  if (server->output)
    {
      server->saved_serial = broadway_output_get_next_serial (server->output);
      broadway_output_free (server->output);
    }
-  server->output = input->output;

-  broadway_output_set_next_serial (server->output, server->saved_serial);
-  broadway_output_auth_ok (server->output);
-  broadway_output_flush (server->output);
+  server->output =
+    broadway_output_new (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
+			 server->saved_serial, proto_v7_plus, binary);

  broadway_server_resync_windows (server);

@@ -1167,8 +1099,6 @@ start (BroadwayInput *input)
    broadway_output_grab_pointer (server->output,
 				  server->pointer_grab_window_id,
 				  server->pointer_grab_owner_events);
-
-  process_input_messages (server);
 }

 static void
@@ -1419,12 +1349,6 @@ broadway_server_destroy_window (BroadwayServer *server,
      server->toplevels = g_list_remove (server->toplevels, window);
      g_hash_table_remove (server->id_ht,
 			   GINT_TO_POINTER (id));
-
-      if (window->cached_surface_name != NULL)
-	g_free (window->cached_surface_name);
-      if (window->cached_surface != NULL)
-	cairo_surface_destroy (window->cached_surface);
-
      g_free (window);
    }
 }
@@ -1659,11 +1583,6 @@ broadway_server_window_update (BroadwayServer *server,
 						       window->width,
 						       window->height);

-  g_assert (window->width == cairo_image_surface_get_width (window->last_surface));
-  g_assert (window->width == cairo_image_surface_get_width (surface));
-  g_assert (window->height == cairo_image_surface_get_height (window->last_surface));
-  g_assert (window->height == cairo_image_surface_get_height (surface));
-
  if (server->output != NULL)
    {
      if (window->last_synced)
@@ -1820,86 +1739,6 @@ broadway_server_ungrab_pointer (BroadwayServer *server,
  return serial;
 }

-static const cairo_user_data_key_t shm_cairo_key;
-
-typedef struct {
-  void *data;
-  gsize data_size;
-} ShmSurfaceData;
-
-static void
-shm_data_unmap (void *_data)
-{
-  ShmSurfaceData *data = _data;
-  munmap (data->data, data->data_size);
-  g_free (data);
-}
-
-cairo_surface_t *
-broadway_server_open_surface (BroadwayServer *server,
-			      guint32 id,
-			      char *name,
-			      int width,
-			      int height)
-{
-  BroadwayWindow *window;
-  ShmSurfaceData *data;
-  cairo_surface_t *surface;
-  gsize size;
-  void *ptr;
-  int fd;
-
-  window = g_hash_table_lookup (server->id_ht,
-				GINT_TO_POINTER (id));
-  if (window == NULL)
-    return NULL;
-
-  if (window->cached_surface_name != NULL &&
-      strcmp (name, window->cached_surface_name) == 0)
-    return cairo_surface_reference (window->cached_surface);
-
-  size = width * height * sizeof (guint32);
-
-  fd = shm_open(name, O_RDONLY, 0600);
-  if (fd == -1)
-    {
-      perror ("Failed to shm_open");
-      return NULL;
-    }
-
-  ptr = mmap(0, size, PROT_READ, MAP_SHARED, fd, 0);
-  (void) close(fd);
-
-  shm_unlink (name);
-
-  if (ptr == NULL)
-    return NULL;
-
-  data = g_new0 (ShmSurfaceData, 1);
-
-  data->data = ptr;
-  data->data_size = size;
-
-  surface = cairo_image_surface_create_for_data ((guchar *)data->data,
-						 CAIRO_FORMAT_RGB24,
-						 width, height,
-						 width * sizeof (guint32));
-  g_assert (surface != NULL);
-
-  cairo_surface_set_user_data (surface, &shm_cairo_key,
-			       data, shm_data_unmap);
-
-  if (window->cached_surface_name != NULL)
-    g_free (window->cached_surface_name);
-  window->cached_surface_name = g_strdup (name);
-
-  if (window->cached_surface != NULL)
-    cairo_surface_destroy (window->cached_surface);
-  window->cached_surface = cairo_surface_reference (surface);
-
-  return surface;
-}
-
 guint32
 broadway_server_new_window (BroadwayServer *server,
 			    int x,
@@ -78,10 +78,5 @@ gboolean            broadway_server_window_move_resize       (BroadwayServer   *
 							      int               y,
 							      int               width,
 							      int               height);
-cairo_surface_t * broadway_server_open_surface (BroadwayServer *server,
-						guint32 id,
-						char *name,
-						int width,
-						int height);

 #endif /* __BROADWAY_SERVER__ */
@@ -225,16 +225,34 @@ function flushSurface(surface)
 	    context.save();
 	    context.beginPath();

+	    var minx;
+	    var miny;
+	    var maxx;
+	    var maxy;
 	    for (var j = 0; j < cmd.rects.length; j++) {
 		var rect = cmd.rects[j];
 		context.rect(rect.x, rect.y, rect.w, rect.h);
+		if (j == 0) {
+		    minx = rect.x;
+		    miny = rect.y;
+		    maxx = rect.x + rect.w;
+		    maxy = rect.y + rect.h;
+		} else {
+		    if (rect.x < minx)
+			minx = rect.x;
+		    if (rect.y < miny)
+			miny = rect.y;
+		    if (rect.x + rect.w > maxx)
+			maxx = rect.x + rect.w;
+		    if (rect.y + rect.h > maxy)
+			maxy = rect.y + rect.h;
+		}
 	    }
 	    context.clip();
-	    // This seems to break chrome when src overlaps dest
-	    // But source-over should be fine for rgb surfaces anyway
-	    //context.globalCompositeOperation = "copy";
-	    context.drawImage(surface.canvas,
-			      cmd.dx, cmd.dy);
+	    context.globalCompositeOperation = "copy";
+	    context.drawImage(context.canvas,
+			      minx - cmd.dx, miny - cmd.dy, maxx - minx, maxy - miny,
+			      minx, miny, maxx - minx, maxy - miny);
 	    context.restore();
 	    break;

@@ -478,6 +496,12 @@ function cmdMoveResizeSurface(id, has_pos, x, y, has_size, w, h)
 	    var xOffset = surface.x;
 	    var yOffset = surface.y;

+	    var transientToplevel = getTransientToplevel(surface);
+	    if (transientToplevel) {
+		xOffset = surface.x - transientToplevel.x;
+		yOffset = surface.y - transientToplevel.y;
+	    }
+
 	    var element = surface.canvas;
 	    if (surface.frame) {
 		element = surface.frame;
@@ -519,21 +543,6 @@ function handleCommands(cmd)
 	var command = cmd.get_char();
 	lastSerial = cmd.get_32();
 	switch (command) {
-	case 'l':
-	    login ();
-	    break;
-
-	case 'L':
-	    if (loginDiv != null)
-		loginDiv.parentNode.removeChild(loginDiv);
-	    start ();
-	    break;
-
-	case 'D':
-	    alert ("disconnected");
-	    inputSocket = null;
-	    break;
-
 	case 's': // create new surface
 	    id = cmd.get_16();
 	    x = cmd.get_16s();
@@ -733,12 +742,8 @@ BinCommands.prototype.get_32 = function() {
 };
 BinCommands.prototype.get_image_url = function() {
    var size = this.get_32();
-    var png_blob = new Blob ([new Uint8Array (this.arraybuffer, this.pos, size)], {type:"image/png"});
-    var url;
-    if (window.webkitURL)
-	url = window.webkitURL.createObjectURL(png_blob);
-    else
-	url = window.URL.createObjectURL(png_blob, {oneTimeOnly: true});
+    var png_blob = new Blob ([this.arraybuffer.slice (this.pos, this.pos + size)], {type:"image/png"});
+    var url = URL.createObjectURL(png_blob, {oneTimeOnly: true});
    this.pos = this.pos + size;
    return url;
 };
@@ -2585,7 +2590,7 @@ function onMouseWheel(ev)
    var id = getSurfaceId(ev);
    var pos = getPositionsFromEvent(ev, id);

-    var offset = ev.detail ? ev.detail : -ev.wheelDelta;
+    var offset = ev.detail ? ev.detail : ev.wheelDelta;
    var dir = 0;
    if (offset > 0)
 	dir = 1;
@@ -2626,47 +2631,6 @@ function newWS(loc) {
    return ws;
 }

-function start()
-{
-    setupDocument(document);
-
-    var w, h;
-    w = window.innerWidth;
-    h = window.innerHeight;
-    window.onresize = function(ev) {
-	var w, h;
-	w = window.innerWidth;
-	h = window.innerHeight;
-	sendInput ("d", [w, h]);
-    };
-    sendInput ("d", [w, h]);
-}
-
-var loginDiv = null;
-function login()
-{
-    if (loginDiv == null) {
-	var div = document.createElement('div');
-	document.body.appendChild(div);
-	div.innerHTML = "Please enter password<br>";
-	div.style.marginTop = "40px";
-	div.style.textAlign = "center";
-
-	var input = document.createElement("input");
-	input.setAttribute("type", "password");
-	div.appendChild(input);
-	input.focus ();
-	input.onkeyup = function(e) {
-	    if (e.keyCode === 13 && input.value != "") {
-		inputSocket.send ("l" + input.value);
-	    }
-	}
-	loginDiv = div;
-    } else {
-	alert ("Wrong password");
-    }
-}
-
 function connect()
 {
    var url = window.location.toString();
@@ -2675,7 +2639,7 @@ function connect()
 	var params = query_string[1].split("&");
    }

-    var loc = window.location.toString().replace("http:", "ws:").replace("https:", "wss:");
+    var loc = window.location.toString().replace("http:", "ws:");
    loc = loc.substr(0, loc.lastIndexOf('/')) + "/socket";

    var supports_binary = newWS (loc + "-test").binaryType == "blob";
@@ -2688,13 +2652,23 @@ function connect()

    ws.onopen = function() {
 	inputSocket = ws;
+	var w, h;
+	w = window.innerWidth;
+	h = window.innerHeight;
+	window.onresize = function(ev) {
+	    var w, h;
+	    w = window.innerWidth;
+	    h = window.innerHeight;
+	    sendInput ("d", [w, h]);
+	};
+	sendInput ("d", [w, h]);
    };
    ws.onclose = function() {
-	if (inputSocket != null)
-	    alert ("disconnected");
 	inputSocket = null;
    };
    ws.onmessage = function(event) {
 	handleMessage(event.data);
    };
+
+    setupDocument(document);
 }
@@ -140,6 +140,62 @@ region_from_rects (BroadwayRect *rects, int n_rects)
  return region;
 }

+static const cairo_user_data_key_t shm_cairo_key;
+
+typedef struct {
+  void *data;
+  gsize data_size;
+} ShmSurfaceData;
+
+static void
+shm_data_unmap (void *_data)
+{
+  ShmSurfaceData *data = _data;
+  munmap (data->data, data->data_size);
+  g_free (data);
+}
+
+cairo_surface_t *
+open_surface (char *name, int width, int height)
+{
+  ShmSurfaceData *data;
+  cairo_surface_t *surface;
+  gsize size;
+  void *ptr;
+  int fd;
+
+  size = width * height * sizeof (guint32);
+
+  fd = shm_open(name, O_RDONLY, 0600);
+  if (fd == -1)
+    {
+      perror ("Failed to shm_open");
+      return NULL;
+    }
+
+  ptr = mmap(0, size, PROT_READ, MAP_SHARED, fd, 0); 
+  (void) close(fd);
+
+  if (ptr == NULL)
+    return NULL;
+
+  data = g_new0 (ShmSurfaceData, 1);
+
+  data->data = ptr;
+  data->data_size = size;
+
+  surface = cairo_image_surface_create_for_data ((guchar *)data->data,
+						 CAIRO_FORMAT_RGB24,
+						 width, height,
+						 width * sizeof (guint32));
+  g_assert (surface != NULL);
+  
+  cairo_surface_set_user_data (surface, &shm_cairo_key,
+			       data, shm_data_unmap);
+
+  return surface;
+}
+
 void
 add_client_serial_mapping (BroadwayClient *client,
 			   guint32 client_serial,
@@ -281,11 +337,9 @@ client_handle_request (BroadwayClient *client,
      cairo_region_destroy (area);
      break;
    case BROADWAY_REQUEST_UPDATE:
-      surface = broadway_server_open_surface (server,
-					      request->update.id,
-					      request->update.name,
-					      request->update.width,
-					      request->update.height);
+      surface = open_surface (request->update.name,
+			      request->update.width,
+			      request->update.height);
      if (surface != NULL)
 	{
 	  broadway_server_window_update (server,
@@ -355,6 +409,7 @@ client_fill_cb (GObject *source_object,
      guint32 size;
      gsize count, remaining;
      guint8 *buffer;
+      BroadwayRequest request;

      buffer = (guint8 *)g_buffered_input_stream_peek_buffer (client->in, &count);

@@ -362,10 +417,14 @@ client_fill_cb (GObject *source_object,
      while (remaining >= sizeof (guint32))
 	{
 	  memcpy (&size, buffer, sizeof (guint32));
-
+	  
 	  if (size <= remaining)
 	    {
-	      client_handle_request (client, (BroadwayRequest *)buffer);
+	      g_assert (size >= sizeof (BroadwayRequestBase));
+	      g_assert (size <= sizeof (BroadwayRequest));
+
+	      memcpy (&request, buffer, size);
+	      client_handle_request (client, &request);

 	      remaining -= size;
 	      buffer += size;
@@ -506,7 +506,7 @@ make_valid_fs_char (char c)
 {
  char chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890";

-  return chars[c % (sizeof (chars) - 1)];
+  return chars[c % sizeof (chars)];
 }

 /* name must have at least space for 34 bytes */
@@ -550,7 +550,7 @@ create_random_shm (char *name)
 static const cairo_user_data_key_t gdk_broadway_shm_cairo_key;

 typedef struct {
-  char name[36];
+  char name[34];
  void *data;
  gsize data_size;
 } BroadwayShmSurfaceData;
@@ -582,13 +582,6 @@ _gdk_broadway_server_create_surface (int                 width,
  res = ftruncate (fd, data->data_size);
  g_assert (res != -1);

-  res = posix_fallocate (fd, 0, data->data_size);
-  if (res != 0)
-    {
-      shm_unlink (data->name);
-      g_error ("Not enough shared memory for window surface");
-    }
-
  data->data = mmap(0, data->data_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); 
  (void) close(fd);

@@ -617,7 +610,7 @@ _gdk_broadway_server_window_update (GdkBroadwayServer *server,
  g_assert (data != NULL);

  msg.id = id;
-  memcpy (msg.name, data->name, 36);
+  memcpy (msg.name, data->name, 34);
  msg.width = cairo_image_surface_get_width (surface);
  msg.height = cairo_image_surface_get_height (surface);

@@ -188,7 +188,7 @@ gdk_broadway_device_query_state (GdkDevice        *device,
  if (root_y)
    *root_y = device_root_y;
  if (win_x)
-    *win_x = device_root_x - toplevel->x;
+    *win_x = device_root_y - toplevel->x;
  if (win_y)
    *win_y = device_root_y - toplevel->y;
  if (mask)
@@ -211,29 +211,6 @@ gdk_broadway_device_query_state (GdkDevice        *device,
  return;
 }

-void
-_gdk_broadway_window_grab_check_unmap (GdkWindow *window,
-				       gulong     serial)
-{
-  GdkDisplay *display = gdk_window_get_display (window);
-  GdkDeviceManager *device_manager;
-  GList *devices, *d;
-
-  device_manager = gdk_display_get_device_manager (display);
-
-  /* Get all devices */
-  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
-
-  /* End all grabs on the newly hidden window */
-  for (d = devices; d; d = d->next)
-    _gdk_display_end_device_grab (display, d->data, serial, window, TRUE);
-
-  g_list_free (devices);
-}
-
-
 void
 _gdk_broadway_window_grab_check_destroy (GdkWindow *window)
 {
@@ -66,8 +66,6 @@ struct _GdkBroadwayDisplay
  GdkWindow *active_offscreen_window;

  GdkBroadwayServer *server;
-
-  gpointer move_resize_data;
 };

 struct _GdkBroadwayDisplayClass
@@ -247,7 +247,7 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
    break;
  case BROADWAY_EVENT_GRAB_NOTIFY:
  case BROADWAY_EVENT_UNGRAB_NOTIFY:
-    _gdk_display_device_grab_update (display, display->core_pointer, display->core_pointer, message->base.serial);
+    _gdk_display_device_grab_update (display, display->core_pointer, NULL, message->base.serial);
    break;

  case BROADWAY_EVENT_CONFIGURE_NOTIFY:
@@ -256,6 +256,10 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
      {
 	window->x = message->configure_notify.x;
 	window->y = message->configure_notify.y;
+	window->width = message->configure_notify.width;
+	window->height = message->configure_notify.height;
+	_gdk_window_update_size (window);
+	_gdk_broadway_window_resize_surface (window);

 	event = gdk_event_new (GDK_CONFIGURE);
 	event->configure.window = g_object_ref (window);
@@ -92,8 +92,6 @@ gboolean _gdk_broadway_moveresize_configure_done (GdkDisplay *display,

 void     _gdk_broadway_selection_window_destroyed (GdkWindow *window);
 void     _gdk_broadway_window_grab_check_destroy (GdkWindow *window);
-void     _gdk_broadway_window_grab_check_unmap (GdkWindow *window,
-						gulong     serial);

 void _gdk_keymap_keys_changed     (GdkDisplay      *display);
 gint _gdk_broadway_get_group_for_state (GdkDisplay      *display,
@@ -83,16 +83,18 @@ G_DEFINE_TYPE (GdkWindowImplBroadway,
 	       gdk_window_impl_broadway,
 	       GDK_TYPE_WINDOW_IMPL)

-static void
-update_dirty_windows_and_sync (void)
+static guint dirty_flush_id = 0;
+
+static gboolean
+dirty_flush_idle (gpointer data)
 {
  GList *l;
  GdkBroadwayDisplay *display;
-  gboolean updated_surface;
+
+  dirty_flush_id = 0;

  display = GDK_BROADWAY_DISPLAY (gdk_display_get_default ());

-  updated_surface = FALSE;
  for (l = display->toplevels; l != NULL; l = l->next)
    {
      GdkWindowImplBroadway *impl = l->data;
@@ -100,7 +102,6 @@ update_dirty_windows_and_sync (void)
      if (impl->dirty)
 	{
 	  impl->dirty = FALSE;
-	  updated_surface = TRUE;
 	  _gdk_broadway_server_window_update (display->server,
 					      impl->id,
 					      impl->surface);
@@ -109,32 +110,16 @@ update_dirty_windows_and_sync (void)

  /* We sync here to ensure all references to the impl->surface memory
     is done, as we may later paint new data in them. */
-  if (updated_surface)
-    gdk_display_sync (GDK_DISPLAY (display));
-  else
-    gdk_display_flush (GDK_DISPLAY (display));
-}
-
-static guint flush_id = 0;
-
-static gboolean
-flush_idle (gpointer data)
-{
-  flush_id = 0;
-
-  gdk_display_flush (gdk_display_get_default ());
+  gdk_display_sync (GDK_DISPLAY (display));

  return FALSE;
 }

-/* We need to flush in an idle rather than AFTER_PAINT, as the clock
-   is frozen during e.g. window resizes so the paint will not happen
-   and the window resize request is never flushed. */
 static void
-queue_flush (GdkWindow *window)
+queue_dirty_flush (GdkBroadwayDisplay *display)
 {
-  if (flush_id == 0)
-    flush_id = gdk_threads_add_idle (flush_idle, NULL);
+  if (dirty_flush_id == 0)
+    dirty_flush_id = gdk_threads_add_idle (dirty_flush_idle, NULL);
 }

 static void
@@ -212,25 +197,6 @@ _gdk_broadway_screen_init_root_window (GdkScreen * screen)
  _gdk_window_update_size (broadway_screen->root_window);
 }

-static void
-on_frame_clock_after_paint (GdkFrameClock *clock,
-                            GdkWindow     *window)
-{
-  update_dirty_windows_and_sync ();
-}
-
-static void
-connect_frame_clock (GdkWindow *window)
-{
-  if (WINDOW_IS_TOPLEVEL (window))
-    {
-      GdkFrameClock *frame_clock = gdk_window_get_frame_clock (window);
-
-      g_signal_connect (frame_clock, "after-paint",
-                        G_CALLBACK (on_frame_clock_after_paint), window);
-    }
-}
-
 void
 _gdk_broadway_display_create_window_impl (GdkDisplay    *display,
 					  GdkWindow     *window,
@@ -263,21 +229,22 @@ _gdk_broadway_display_create_window_impl (GdkDisplay    *display,
  g_assert (GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_ROOT);

  broadway_display->toplevels = g_list_prepend (broadway_display->toplevels, impl);
-
-  connect_frame_clock (window);
 }

 void
 _gdk_broadway_window_resize_surface (GdkWindow *window)
 {
  GdkWindowImplBroadway *impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  cairo_surface_t *old;

  if (impl->surface)
    {
-      cairo_surface_destroy (impl->surface);
+      old = impl->surface;

      impl->surface = _gdk_broadway_server_create_surface (gdk_window_get_width (impl->wrapper),
 							   gdk_window_get_height (impl->wrapper));
+
+      cairo_surface_destroy (old);
    }

  if (impl->ref_surface)
@@ -417,7 +384,7 @@ gdk_window_broadway_show (GdkWindow *window, gboolean already_mapped)

  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
  if (_gdk_broadway_server_window_show (broadway_display->server, impl->id))
-    queue_flush (window);
+    queue_dirty_flush (broadway_display);

 }

@@ -437,12 +404,8 @@ gdk_window_broadway_hide (GdkWindow *window)
    _gdk_make_event (GDK_WINDOW (window), GDK_UNMAP, NULL, FALSE);

  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
-
-  _gdk_broadway_window_grab_check_unmap (window,
-					 _gdk_broadway_server_get_next_serial (broadway_display->server));
-
  if (_gdk_broadway_server_window_hide (broadway_display->server, impl->id))
-    queue_flush (window);
+    queue_dirty_flush (broadway_display);

  _gdk_window_clear_update_area (window);
 }
@@ -497,7 +460,7 @@ gdk_window_broadway_move_resize (GdkWindow *window,
 					   with_move,
 					   x, y,
 					   window->width, window->height);
-  queue_flush (window);
+  queue_dirty_flush (broadway_display);
  if (size_changed)
    window->resize_count++;
 }
@@ -582,12 +545,6 @@ gdk_broadway_window_set_geometry_hints (GdkWindow         *window,
 					const GdkGeometry *geometry,
 					GdkWindowHints     geom_mask)
 {
-  GdkWindowImplBroadway *impl;
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
-
-  impl->geometry_hints = *geometry;
-  impl->geometry_hints_mask = geom_mask;
 }

 static void
@@ -653,7 +610,7 @@ gdk_window_broadway_set_device_cursor (GdkWindow *window,
    {
      _gdk_broadway_cursor_update_theme (cursor);
      g_hash_table_replace (impl->device_cursor,
-                            device, g_object_ref (cursor));
+                            device, gdk_cursor_ref (cursor));
    }

  if (!GDK_WINDOW_DESTROYED (window))
@@ -1035,8 +992,6 @@ struct _MoveResizeData
  gint moveresize_orig_width;
  gint moveresize_orig_height;
  long moveresize_process_time;
-  GdkWindowHints moveresize_geom_mask;
-  GdkGeometry moveresize_geometry;
  BroadwayInputMsg *moveresize_pending_event;
 };

@@ -1044,19 +999,20 @@ static MoveResizeData *
 get_move_resize_data (GdkDisplay *display,
 		      gboolean    create)
 {
-  GdkBroadwayDisplay *broadway_display;
  MoveResizeData *mv_resize;
+  static GQuark move_resize_quark = 0;

-  broadway_display = GDK_BROADWAY_DISPLAY (display);
+  if (!move_resize_quark)
+    move_resize_quark = g_quark_from_static_string ("gdk-window-moveresize");

-  mv_resize = broadway_display->move_resize_data;
+  mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark);

  if (!mv_resize && create)
    {
      mv_resize = g_new0 (MoveResizeData, 1);
      mv_resize->display = display;

-      broadway_display->move_resize_data = mv_resize;
+      g_object_set_qdata (G_OBJECT (display), move_resize_quark, mv_resize);
    }

  return mv_resize;
@@ -1125,13 +1081,6 @@ update_pos (MoveResizeData *mv_resize,
      w = MAX (w, 1);
      h = MAX (h, 1);

-      if (mv_resize->moveresize_geom_mask)
-	{
-	  gdk_window_constrain_size (&mv_resize->moveresize_geometry,
-				     mv_resize->moveresize_geom_mask,
-				     w, h, &w, &h);
-	}
-
      gdk_window_move_resize (mv_resize->moveresize_window, x, y, w, h);
    }
  else
@@ -1186,7 +1135,7 @@ _gdk_broadway_moveresize_handle_event (GdkDisplay *display,

  switch (event->base.type)
    {
-    case BROADWAY_EVENT_POINTER_MOVE:
+    case 'm':
      if (mv_resize->moveresize_window->resize_count > 0)
 	{
 	  if (mv_resize->moveresize_pending_event)
@@ -1214,7 +1163,7 @@ _gdk_broadway_moveresize_handle_event (GdkDisplay *display,
 	finish_drag (mv_resize);
      break;

-    case BROADWAY_EVENT_BUTTON_RELEASE:
+    case 'B':
      update_pos (mv_resize,
 		  event->pointer.root_x,
 		  event->pointer.root_y);
@@ -1294,71 +1243,6 @@ create_moveresize_window (MoveResizeData *mv_resize,
  mv_resize->moveresize_process_time = 0;
 }

-static void
-calculate_unmoving_origin (MoveResizeData *mv_resize)
-{
-  GdkRectangle rect;
-  gint width, height;
-
-  if (mv_resize->moveresize_geom_mask & GDK_HINT_WIN_GRAVITY &&
-      mv_resize->moveresize_geometry.win_gravity == GDK_GRAVITY_STATIC)
-    {
-      gdk_window_get_origin (mv_resize->moveresize_window,
-			     &mv_resize->moveresize_orig_x,
-			     &mv_resize->moveresize_orig_y);
-    }
-  else
-    {
-      gdk_window_get_frame_extents (mv_resize->moveresize_window, &rect);
-      gdk_window_get_geometry (mv_resize->moveresize_window,
-			       NULL, NULL, &width, &height);
-
-      switch (mv_resize->moveresize_geometry.win_gravity)
-	{
-	case GDK_GRAVITY_NORTH_WEST:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	case GDK_GRAVITY_NORTH:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width / 2 - width / 2;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	case GDK_GRAVITY_NORTH_EAST:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width - width;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	case GDK_GRAVITY_WEST:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height / 2 - height / 2;
-	  break;
-	case GDK_GRAVITY_CENTER:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width / 2 - width / 2;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height / 2 - height / 2;
-	  break;
-	case GDK_GRAVITY_EAST:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width - width;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height / 2 - height / 2;
-	  break;
-	case GDK_GRAVITY_SOUTH_WEST:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height - height;
-	  break;
-	case GDK_GRAVITY_SOUTH:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width / 2 - width / 2;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height - height;
-	  break;
-	case GDK_GRAVITY_SOUTH_EAST:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width - width;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height - height;
-	  break;
-	default:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	}
-    }
-}
-
 static void
 gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
 				       GdkWindowEdge  edge,
@@ -1369,9 +1253,6 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
 				       guint32        timestamp)
 {
  MoveResizeData *mv_resize;
-  GdkWindowImplBroadway *impl;
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);

  if (GDK_WINDOW_DESTROYED (window) ||
      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -1386,14 +1267,12 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
  mv_resize->moveresize_y = root_y;
  mv_resize->moveresize_window = g_object_ref (window);

+  gdk_window_get_origin (mv_resize->moveresize_window,
+			 &mv_resize->moveresize_orig_x,
+			 &mv_resize->moveresize_orig_y);
  mv_resize->moveresize_orig_width = gdk_window_get_width (window);
  mv_resize->moveresize_orig_height = gdk_window_get_height (window);

-  mv_resize->moveresize_geom_mask = impl->geometry_hints_mask;
-  mv_resize->moveresize_geometry = impl->geometry_hints;
-
-  calculate_unmoving_origin (mv_resize);
-
  create_moveresize_window (mv_resize, timestamp);
 }

@@ -1449,6 +1328,7 @@ gdk_broadway_window_process_updates_recurse (GdkWindow *window,

  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
  impl->dirty = TRUE;
+  queue_dirty_flush (GDK_BROADWAY_DISPLAY (gdk_window_get_display (window)));
 }

 void
@@ -1514,7 +1394,7 @@ _gdk_broadway_window_translate (GdkWindow      *window,
      if (_gdk_broadway_server_window_translate (broadway_display->server,
 						 impl->id,
 						 area, dx, dy))
-	queue_flush (window);
+	queue_dirty_flush (broadway_display);
    }
 }

@@ -64,9 +64,6 @@ struct _GdkWindowImplBroadway
  gint8 toplevel_window_type;
  gboolean dirty;
  gboolean last_synced;
-
-  GdkGeometry geometry_hints;
-  GdkWindowHints geometry_hints_mask;
 };

 struct _GdkWindowImplBroadwayClass
@@ -42,15 +42,3 @@ isinf (double x)
  return (!_finite (x) && !_isnan (x));
 }
 #endif
-
-/* Workaround for round() for non-GCC/non-C99 compilers */
-#ifndef HAVE_ROUND
-static inline double
-round (double x)
-{
-  if (x >= 0)
-    return floor (x + 0.5);
-  else
-    return ceil (x - 0.5);
-}
-#endif
@@ -610,7 +610,6 @@ gdk_x11_window_set_theme_variant
 gdk_x11_window_set_hide_titlebar_when_maximized
 gdk_x11_window_set_user_time
 gdk_x11_window_set_utf8_property
-gdk_x11_window_set_frame_sync_enabled
 gdk_x11_xatom_to_atom
 gdk_x11_xatom_to_atom_for_display
 #endif
@@ -213,7 +213,7 @@ gdk_cairo_set_source_pixbuf (cairo_t         *cr,
    format = CAIRO_FORMAT_ARGB32;

  cairo_stride = cairo_format_stride_for_width (format, width);
-  cairo_pixels = g_malloc_n (height, cairo_stride);
+  cairo_pixels = g_malloc (height * cairo_stride);
  surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
                                                 format,
                                                 width, height, cairo_stride);
@@ -330,7 +330,7 @@ gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
 * for this application. In X11, window managers may change this depending on the interaction
 * pattern under the presence of several pointers.
 *
- * You should use this function seldomly, only in code that isn't triggered by a #GdkEvent
+ * You should use this function sheldomly, only in code that isn't triggered by a #GdkEvent
 * and there aren't other means to get a meaningful #GdkDevice to operate on.
 *
 * Returns: (transfer none): The client pointer. This memory is
@@ -42,9 +42,6 @@

 #include <math.h>

-/* for the use of round() */
-#include "fallback-c89.c"
-
 #undef DEBUG_WINDOW_PRINTING


@@ -940,26 +937,19 @@ static void
 apply_clip_as_shape (GdkWindow *window)
 {
  GdkRectangle r;
-  cairo_region_t *region;

  r.x = r.y = 0;
  r.width = window->width;
  r.height = window->height;

-  region = cairo_region_copy (window->clip_region);
-  if (window->layered_region)
-    cairo_region_subtract (region, window->layered_region);
-
  /* We only apply the clip region if would differ
     from the actual clip region implied by the size
     of the window. This is to avoid unneccessarily
     adding meaningless shapes to all native subwindows */
-  if (!region_rect_equal (region, &r))
-    apply_shape (window, region);
+  if (!region_rect_equal (window->clip_region, &r))
+    apply_shape (window, window->clip_region);
  else
    apply_shape (window, NULL);
-
-  cairo_region_destroy (region);
 }

 static void
@@ -10006,9 +9996,6 @@ gdk_window_print (GdkWindow *window,
    g_print (" alpha[%d]",
 	   window->alpha);

-  if (window->has_alpha_background)
-    g_print (" alpha_bg");
-
  s = print_region (window->clip_region);
  g_print (" clipbox[%s]", s);

@@ -1,7 +1,6 @@
 /* GdkQuartzView.m
 *
 * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2011 Hiroyuki Yamamoto
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -24,541 +23,18 @@

@implementation GdkQuartzView

-(id)initWithFrame: (NSRect)frameRect
-{
-  if ((self = [super initWithFrame: frameRect]))
-    {
-      markedRange = NSMakeRange (NSNotFound, 0);
-      selectedRange = NSMakeRange (NSNotFound, 0);
-    }
-
-  return self;
-}
-
-(BOOL)acceptsFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("acceptsFirstResponder\n"));
-  return YES;
-}
-
-(BOOL)becomeFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("becomeFirstResponder\n"));
-  return YES;
-}
-
-(BOOL)resignFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("resignFirstResponder\n"));
-  return YES;
-}
-
-(void) keyDown: (NSEvent *) theEvent
-{
-  GDK_NOTE (EVENTS, g_print ("keyDown\n"));
-  [self interpretKeyEvents: [NSArray arrayWithObject: theEvent]];
-}
-
-(void)flagsChanged: (NSEvent *) theEvent
-{
-}
-
-(NSUInteger)characterIndexForPoint: (NSPoint)aPoint
-{
-  GDK_NOTE (EVENTS, g_print ("characterIndexForPoint\n"));
-  return 0;
-}
-
-(NSRect)firstRectForCharacterRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
-{
-  GDK_NOTE (EVENTS, g_print ("firstRectForCharacterRange\n"));
-  gint ns_x, ns_y;
-  GdkRectangle *rect;
-
-  rect = g_object_get_data (G_OBJECT (gdk_window), GIC_CURSOR_RECT);
-  if (rect)
-    {
-      _gdk_quartz_window_gdk_xy_to_xy (rect->x, rect->y + rect->height,
-				       &ns_x, &ns_y);
-
-      return NSMakeRect (ns_x, ns_y, rect->width, rect->height);
-    }
-  else
-    {
-      return NSMakeRect (0, 0, 0, 0);
-    }
-}
-
-(NSArray *)validAttributesForMarkedText
-{
-  GDK_NOTE (EVENTS, g_print ("validAttributesForMarkedText\n"));
-  return [NSArray arrayWithObjects: NSUnderlineStyleAttributeName, nil];
-}
-
-(NSAttributedString *)attributedSubstringForProposedRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
-{
-  GDK_NOTE (EVENTS, g_print ("attributedSubstringForProposedRange\n"));
-  return nil;
-}
-
-(BOOL)hasMarkedText
-{
-  GDK_NOTE (EVENTS, g_print ("hasMarkedText\n"));
-  return markedRange.location != NSNotFound && markedRange.length != 0;
-}
-
-(NSRange)markedRange
-{
-  GDK_NOTE (EVENTS, g_print ("markedRange\n"));
-  return markedRange;
-}
-
-(NSRange)selectedRange
-{
-  GDK_NOTE (EVENTS, g_print ("selectedRange\n"));
-  return selectedRange;
-}
-
-(void)unmarkText
-{
-  GDK_NOTE (EVENTS, g_print ("unmarkText\n"));
-  gchar *prev_str;
-  markedRange = selectedRange = NSMakeRange (NSNotFound, 0);
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, NULL);
-}
-
-(void)setMarkedText: (id)aString selectedRange: (NSRange)newSelection replacementRange: (NSRange)replacementRange
-{
-  GDK_NOTE (EVENTS, g_print ("setMarkedText\n"));
-  const char *str;
-  gchar *prev_str;
-
-  if (replacementRange.location == NSNotFound)
-    {
-      markedRange = NSMakeRange (newSelection.location, [aString length]);
-      selectedRange = NSMakeRange (newSelection.location, newSelection.length);
-    }
-  else {
-      markedRange = NSMakeRange (replacementRange.location, [aString length]);
-      selectedRange = NSMakeRange (replacementRange.location + newSelection.location, newSelection.length);
-    }
-
-  if ([aString isKindOfClass: [NSAttributedString class]])
-    {
-      str = [[aString string] UTF8String];
-    }
-  else {
-      str = [aString UTF8String];
-    }
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, g_strdup (str));
-  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_POS,
-		     GUINT_TO_POINTER (selectedRange.location));
-  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_LEN,
-		     GUINT_TO_POINTER (selectedRange.length));
-
-  GDK_NOTE (EVENTS, g_print ("setMarkedText: set %s (%p, nsview %p): %s\n",
-			     TIC_MARKED_TEXT, gdk_window, self,
-			     str ? str : "(empty)"));
-
-  /* handle text input changes by mouse events */
-  if (!GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (gdk_window),
-                                            TIC_IN_KEY_DOWN)))
-    {
-      _gdk_quartz_synthesize_null_key_event(gdk_window);
-    }
-}
-
-(void)doCommandBySelector: (SEL)aSelector
-{
-  GDK_NOTE (EVENTS, g_print ("doCommandBySelector\n"));
-  if ([self respondsToSelector: aSelector])
-    [self performSelector: aSelector];
-}
-
-(void)insertText: (id)aString replacementRange: (NSRange)replacementRange
-{
-  GDK_NOTE (EVENTS, g_print ("insertText\n"));
-  const char *str;
-  NSString *string;
-  gchar *prev_str;
-
-  if ([self hasMarkedText])
-    [self unmarkText];
-
-  if ([aString isKindOfClass: [NSAttributedString class]])
-      string = [aString string];
-  else
-      string = aString;
-
-  NSCharacterSet *ctrlChars = [NSCharacterSet controlCharacterSet];
-  NSCharacterSet *wsnlChars = [NSCharacterSet whitespaceAndNewlineCharacterSet];
-  if ([string rangeOfCharacterFromSet:ctrlChars].length &&
-      [string rangeOfCharacterFromSet:wsnlChars].length == 0)
-    {
-      /* discard invalid text input with Chinese input methods */
-      str = "";
-      [self unmarkText];
-      NSInputManager *currentInputManager = [NSInputManager currentInputManager];
-      [currentInputManager markedTextAbandoned:self];
-    }
-  else
-   {
-      str = [string UTF8String];
-   }
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT, g_strdup (str));
-  GDK_NOTE (EVENTS, g_print ("insertText: set %s (%p, nsview %p): %s\n",
-			     TIC_INSERT_TEXT, gdk_window, self,
-			     str ? str : "(empty)"));
-
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_FILTERED));
-
-  /* handle text input changes by mouse events */
-  if (!GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (gdk_window),
-                                            TIC_IN_KEY_DOWN)))
-    {
-      _gdk_quartz_synthesize_null_key_event(gdk_window);
-    }
-}
-
-(void)deleteBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteToBeginningOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteToBeginningOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteToEndOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteToEndOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteWordBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteWordBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)deleteWordForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteWordForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)insertBacktab: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertBacktab\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)insertNewline: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertNewline\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY, GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)insertTab: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertTab\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveBackwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveBackwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveDown: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveDown\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveDownAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveDownAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveForwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveForwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveLeft: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveLeft\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveLeftAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveLeftAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveRight: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveRight\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveRightAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveRightAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfDocument: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocument\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfDocumentAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocumentAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToBeginningOfLineAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLineAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfDocument: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocument\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfDocumentAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocumentAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveToEndOfLineAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfLineAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveUp: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveUp\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveUpAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveUpAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordBackwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordBackwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordForwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordForwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordLeft: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordLeft\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordLeftAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordLeftAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordRight: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordRight\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)moveWordRightAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordRightAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageDown: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageDown\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageDownAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageDownAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageUp: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageUp\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)pageUpAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageUpAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)selectAll: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectAll\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)selectLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)selectWord: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectWord\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
-(void)noop: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("noop\n"));
-}
-
-/* --------------------------------------------------------------- */
-
 -(void)dealloc
 {
  if (trackingRect)
    {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
      trackingRect = 0;
    }

  [super dealloc];
 }

-(void)setGdkWindow: (GdkWindow *)window
+-(void)setGdkWindow:(GdkWindow *)window
 {
  gdk_window = window;
 }
@@ -584,11 +60,10 @@
    return YES;

  /* A view is opaque if its GdkWindow doesn't have the RGBA visual */
-  return gdk_window_get_visual (gdk_window) !=
-    gdk_screen_get_rgba_visual (_gdk_screen);
+  return gdk_window_get_visual (gdk_window) != gdk_screen_get_rgba_visual (_gdk_screen);
 }

-(void)drawRect: (NSRect)rect
+-(void)drawRect:(NSRect)rect 
 {
  GdkRectangle gdk_rect;
  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
@@ -600,7 +75,7 @@
  if (GDK_WINDOW_DESTROYED (gdk_window))
    return;

-  if (! (gdk_window->event_mask & GDK_EXPOSURE_MASK))
+  if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK))
    return;

  if (NSEqualRects (rect, NSZeroRect))
@@ -618,7 +93,7 @@
      [NSGraphicsContext saveGraphicsState];

      [[NSColor windowBackgroundColor] setFill];
-      [NSBezierPath fillRect: rect];
+      [NSBezierPath fillRect:rect];

      [NSGraphicsContext restoreGraphicsState];

@@ -632,9 +107,9 @@
      impl->needs_display_region = NULL;
    }

-  [self getRectsBeingDrawn: &drawn_rects count: &count];
+  [self getRectsBeingDrawn:&drawn_rects count:&count];
  region = cairo_region_create ();
-
+  
  for (i = 0; i < count; i++)
    {
      gdk_rect.x = drawn_rects[i].origin.x;
@@ -658,7 +133,7 @@
    }
 }

-(void)setNeedsInvalidateShadow: (BOOL)invalidate
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate
 {
  needsInvalidateShadow = invalidate;
 }
@@ -676,7 +151,7 @@

  if (trackingRect)
    {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
      trackingRect = 0;
    }

@@ -688,32 +163,32 @@
   */

  rect = [self bounds];
-  trackingRect = [self addTrackingRect: rect
-		  owner: self
-		  userData: nil
-		  assumeInside: NO];
+  trackingRect = [self addTrackingRect:rect
+                                 owner:self
+                              userData:nil
+                          assumeInside:NO];
 }

 -(void)viewDidMoveToWindow
 {
  if (![self window]) /* We are destroyed already */
-    return;
+      return;

  [self updateTrackingRect];
 }

-(void)viewWillMoveToWindow: (NSWindow *)newWindow
+-(void)viewWillMoveToWindow:(NSWindow *)newWindow
 {
  if (newWindow == nil && trackingRect)
    {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
      trackingRect = 0;
    }
 }

-(void)setFrame: (NSRect)frame
+-(void)setFrame:(NSRect)frame
 {
-  [super setFrame: frame];
+  [super setFrame:frame];

  if ([self window])
    [self updateTrackingRect];
@@ -17,33 +17,17 @@
 */

 #import <AppKit/AppKit.h>
-#include "gdk/gdk.h"
+#include "gdkwindow.h"

-/* Text Input Client */
-#define TIC_MARKED_TEXT "tic-marked-text"
-#define TIC_SELECTED_POS  "tic-selected-pos"
-#define TIC_SELECTED_LEN  "tic-selected-len"
-#define TIC_INSERT_TEXT "tic-insert-text"
-#define TIC_IN_KEY_DOWN "tic-in-key-down"
-
-/* GtkIMContext */
-#define GIC_CURSOR_RECT  "gic-cursor-rect"
-#define GIC_FILTER_KEY   "gic-filter-key"
-#define GIC_FILTER_PASSTHRU	0
-#define GIC_FILTER_FILTERED	1
-
-@interface GdkQuartzView : NSView <NSTextInputClient>
-{
+@interface GdkQuartzView : NSView {
  GdkWindow *gdk_window;
  NSTrackingRectTag trackingRect;
  BOOL needsInvalidateShadow;
-  NSRange markedRange;
-  NSRange selectedRange;
 }

- (void)setGdkWindow: (GdkWindow *)window;
- (GdkWindow *)gdkWindow;
- (NSTrackingRectTag)trackingRect;
- (void)setNeedsInvalidateShadow: (BOOL)invalidate;
+-(void)setGdkWindow:(GdkWindow *)window;
+-(GdkWindow *)gdkWindow;
+-(NSTrackingRectTag)trackingRect;
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate;

@end
@@ -618,32 +618,7 @@ gdk_event_prepare (GSource *source,
  gboolean retval;

  gdk_threads_enter ();
-
-  /* The prepare stage is the stage before the main loop starts polling
-   * and dispatching events. The autorelease poll is drained here for
-   * the preceding main loop iteration or, in case of the first iteration,
-   * for the operations carried out between event loop initialization and
-   * this first iteration.
-   *
-   * The autorelease poll must only be drained when the following conditions
-   * apply:
-   *  - We are at the base CFRunLoop level (indicated by current_loop_level),
-   *  - We are at the base g_main_loop level (indicated by
-   *    g_main_depth())
-   *  - We are at the base poll_func level (indicated by getting events).
-   *
-   * Messing with the autorelease pool at any level of nesting can cause access
-   * to deallocated memory because autorelease_pool is static and releasing a
-   * pool will cause all pools allocated inside of it to be released as well.
-   */
-  if (current_loop_level == 0 && g_main_depth() == 0 && getting_events == 0)
-    {
-      if (autorelease_pool)
-        [autorelease_pool drain];
-
-      autorelease_pool = [[NSAutoreleasePool alloc] init];
-    }
-
+  
  *timeout = -1;

  if (_gdk_display->event_pause_count > 0)
@@ -684,6 +659,21 @@ gdk_event_dispatch (GSource     *source,

  gdk_threads_enter ();

+  /* Refresh the autorelease pool if we're at the base CFRunLoop level
+   * (indicated by current_loop_level) and the base g_main_loop level
+   * (indicated by g_main_depth()). Messing with the autorelease pool at
+   * any level of nesting can cause access to deallocated memory because
+   * autorelease_pool is static and releasing a pool will cause all pools
+   * allocated inside of it to be released as well.
+   */
+  if (current_loop_level == 0 && g_main_depth() == 0)
+    {
+      if (autorelease_pool)
+        [autorelease_pool drain];
+
+      autorelease_pool = [[NSAutoreleasePool alloc] init];
+    }
+
  _gdk_quartz_display_queue_events (_gdk_display);

  event = _gdk_event_unqueue (_gdk_display);
@@ -1156,24 +1156,6 @@ synthesize_crossing_event (GdkWindow *window,
  return FALSE;
 }

-void
-_gdk_quartz_synthesize_null_key_event (GdkWindow *window)
-{
-  GdkEvent *event;
-  GdkQuartzDeviceManagerCore *device_manager;
-
-  event = gdk_event_new (GDK_KEY_PRESS);
-  event->any.type = GDK_KEY_PRESS;
-  event->key.window = window;
-  event->key.state = 0;
-  event->key.hardware_keycode = 0;
-  event->key.group = 0;
-  event->key.keyval = GDK_KEY_VoidSymbol;
-  device_manager = GDK_QUARTZ_DEVICE_MANAGER_CORE (_gdk_display->device_manager);
-  gdk_event_set_device (event, device_manager->core_keyboard);
-  append_event(event, FALSE);
-}
-
 GdkModifierType
 _gdk_quartz_events_get_current_keyboard_modifiers (void)
 {
@@ -1512,11 +1494,8 @@ gdk_event_translate (GdkEvent *event,
      }
      break;

-    case NSMouseExited:
-      if (WINDOW_IS_TOPLEVEL (window))
-          [[NSCursor arrowCursor] set];
-      /* fall through */
    case NSMouseEntered:
+    case NSMouseExited:
      return_val = synthesize_crossing_event (window, event, nsevent, x, y, x_root, y_root);
      break;

@@ -82,6 +82,17 @@ _gdk_quartz_display_get_keymap (GdkDisplay *display)
  return default_keymap;
 }

+/* Note: we could check only if building against the 10.5 SDK instead, but
+ * that would make non-xml layouts not work in 32-bit which would be a quite
+ * bad regression. This way, old unsupported layouts will just not work in
+ * 64-bit.
+ */
+#ifdef __LP64__
+static TISInputSourceRef current_layout = NULL;
+#else
+static KeyboardLayoutRef current_layout = NULL;
+#endif
+
 /* This is a table of all keyvals. Each keycode gets KEYVALS_PER_KEYCODE entries.
 * TThere is 1 keyval per modifier (Nothing, Shift, Alt, Shift+Alt);
 */
@@ -256,17 +267,10 @@ const static struct {
 };

 static void
-update_keymap (void)
+maybe_update_keymap (void)
 {
  const void *chr_data = NULL;
-  guint *p;
-  int i;

-  /* Note: we could check only if building against the 10.5 SDK instead, but
-   * that would make non-xml layouts not work in 32-bit which would be a quite
-   * bad regression. This way, old unsupported layouts will just not work in
-   * 64-bit.
-   */
 #ifdef __LP64__
  TISInputSourceRef new_layout = TISCopyCurrentKeyboardLayoutInputSource ();
  CFDataRef layout_data_ref;
@@ -278,221 +282,228 @@ update_keymap (void)
  KLGetCurrentKeyboardLayout (&new_layout);
 #endif

-  g_free (keyval_array);
-  keyval_array = g_new0 (guint, NUM_KEYCODES * KEYVALS_PER_KEYCODE);
+  if (new_layout != current_layout)
+    {
+      guint *p;
+      int i;
+
+      g_free (keyval_array);
+      keyval_array = g_new0 (guint, NUM_KEYCODES * KEYVALS_PER_KEYCODE);

 #ifdef __LP64__
-  layout_data_ref = (CFDataRef) TISGetInputSourceProperty
-    (new_layout, kTISPropertyUnicodeKeyLayoutData);
+      layout_data_ref = (CFDataRef) TISGetInputSourceProperty
+	(new_layout, kTISPropertyUnicodeKeyLayoutData);

-  if (layout_data_ref)
-    chr_data = CFDataGetBytePtr (layout_data_ref);
+      if (layout_data_ref)
+	chr_data = CFDataGetBytePtr (layout_data_ref);

-  if (chr_data == NULL)
-    {
-      g_error ("cannot get keyboard layout data");
-      return;
-    }
+      if (chr_data == NULL)
+	{
+	  g_error ("cannot get keyboard layout data");
+	  return;
+	}
 #else
+      /* Get the layout kind */
+      KLGetKeyboardLayoutProperty (new_layout, kKLKind, (const void **)&layout_kind);

-  /* Get the layout kind */
-  KLGetKeyboardLayoutProperty (new_layout, kKLKind, (const void **)&layout_kind);
+      /* 8-bit-only keyabord layout */
+      if (layout_kind == kKLKCHRKind)
+	{ 
+	  /* Get chr data */
+	  KLGetKeyboardLayoutProperty (new_layout, kKLKCHRData, (const void **)&chr_data);
+	  
+	  for (i = 0; i < NUM_KEYCODES; i++) 
+	    {
+	      int j;
+	      UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};

-  /* 8-bit-only keyabord layout */
-  if (layout_kind == kKLKCHRKind)
-    {
-      /* Get chr data */
-      KLGetKeyboardLayoutProperty (new_layout, kKLKCHRData, (const void **)&chr_data);
+	      p = keyval_array + i * KEYVALS_PER_KEYCODE;
+	      
+	      for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
+		{
+		  UInt32 c, state = 0;
+		  UInt16 key_code;
+		  UniChar uc;
+		  
+		  key_code = modifiers[j] | i;
+		  c = KeyTranslate (chr_data, key_code, &state);

-      for (i = 0; i < NUM_KEYCODES; i++)
-        {
-          int j;
-          UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};
+		  if (state != 0)
+		    {
+		      UInt32 state2 = 0;
+		      c = KeyTranslate (chr_data, key_code | 128, &state2);
+		    }

-          p = keyval_array + i * KEYVALS_PER_KEYCODE;
+		  if (c != 0 && c != 0x10)
+		    {
+		      int k;
+		      gboolean found = FALSE;

-          for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
-            {
-              UInt32 c, state = 0;
-              UInt16 key_code;
-              UniChar uc;
+		      /* FIXME: some keyboard layouts (e.g. Russian) use
+                       * a different 8-bit character set. We should
+                       * check for this. Not a serious problem, because
+		       * most (all?) of these layouts also have a
+		       * uchr version. 
+		       */
+		      uc = macroman2ucs (c);

-              key_code = modifiers[j] | i;
-              c = KeyTranslate (chr_data, key_code, &state);
+		      for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++) 
+			{
+			  if (special_ucs_table[k].ucs_value == uc)
+			    {
+			      p[j] = special_ucs_table[k].keyval;
+			      found = TRUE;
+			      break;
+			    }
+			}
+		      
+		      /* Special-case shift-tab since GTK+ expects
+		       * GDK_KEY_ISO_Left_Tab for that.
+		       */
+		      if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
+			p[j] = GDK_KEY_ISO_Left_Tab;

-              if (state != 0)
-                {
-                  UInt32 state2 = 0;
-                  c = KeyTranslate (chr_data, key_code | 128, &state2);
-                }
+		      if (!found)
+                        p[j] = gdk_unicode_to_keyval (uc);
+		    }
+		}

-              if (c != 0 && c != 0x10)
-                {
-                  int k;
-                  gboolean found = FALSE;
-
-                  /* FIXME: some keyboard layouts (e.g. Russian) use a
-                   * different 8-bit character set. We should check
-                   * for this. Not a serious problem, because most
-                   * (all?) of these layouts also have a uchr version.
-                   */
-                  uc = macroman2ucs (c);
-
-                  for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++)
-                    {
-                      if (special_ucs_table[k].ucs_value == uc)
-                        {
-                          p[j] = special_ucs_table[k].keyval;
-                          found = TRUE;
-                          break;
-                        }
-                    }
-
-                  /* Special-case shift-tab since GTK+ expects
-                   * GDK_KEY_ISO_Left_Tab for that.
-                   */
-                  if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
-                    p[j] = GDK_KEY_ISO_Left_Tab;
-
-                  if (!found)
-                    p[j] = gdk_unicode_to_keyval (uc);
-                }
-            }
-
-          if (p[3] == p[2])
-            p[3] = 0;
-          if (p[2] == p[1])
-            p[2] = 0;
-          if (p[1] == p[0])
-            p[1] = 0;
-          if (p[0] == p[2] &&
-              p[1] == p[3])
-            p[2] = p[3] = 0;
-        }
-    }
-  /* unicode keyboard layout */
-  else if (layout_kind == kKLKCHRuchrKind || layout_kind == kKLuchrKind)
-    {
-      /* Get chr data */
-      KLGetKeyboardLayoutProperty (new_layout, kKLuchrData, (const void **)&chr_data);
+	      if (p[3] == p[2])
+		p[3] = 0;
+	      if (p[2] == p[1])
+		p[2] = 0;
+	      if (p[1] == p[0])
+		p[1] = 0;
+	      if (p[0] == p[2] && 
+		  p[1] == p[3])
+		p[2] = p[3] = 0;
+	    }
+	}
+      /* unicode keyboard layout */
+      else if (layout_kind == kKLKCHRuchrKind || layout_kind == kKLuchrKind)
+	{ 
+	  /* Get chr data */
+	  KLGetKeyboardLayoutProperty (new_layout, kKLuchrData, (const void **)&chr_data);
 #endif
+	  
+	  for (i = 0; i < NUM_KEYCODES; i++) 
+	    {
+	      int j;
+	      UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};
+              UniChar chars[4];
+              UniCharCount nChars;

-      for (i = 0; i < NUM_KEYCODES; i++)
-        {
-          int j;
-          UInt32 modifiers[] = {0, shiftKey, optionKey, shiftKey | optionKey};
-          UniChar chars[4];
-          UniCharCount nChars;
+	      p = keyval_array + i * KEYVALS_PER_KEYCODE;

-          p = keyval_array + i * KEYVALS_PER_KEYCODE;
+	      for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
+		{
+		  UInt32 state = 0;
+		  OSStatus err;
+		  UInt16 key_code;
+		  UniChar uc;
+		  
+		  key_code = modifiers[j] | i;
+		  err = UCKeyTranslate (chr_data, i, kUCKeyActionDisplay,
+		                        (modifiers[j] >> 8) & 0xFF,
+		                        LMGetKbdType(),
+		                        0,
+		                        &state, 4, &nChars, chars);

-          for (j = 0; j < KEYVALS_PER_KEYCODE; j++)
-            {
-              UInt32 state = 0;
-              OSStatus err;
-              UInt16 key_code;
-              UniChar uc;
+                  /* FIXME: Theoretically, we can get multiple UTF-16 values;
+		   * we should convert them to proper unicode and figure
+		   * out whether there are really keyboard layouts that
+		   * give us more than one character for one keypress. */
+		  if (err == noErr && nChars == 1)
+		    {
+		      int k;
+		      gboolean found = FALSE;

-              key_code = modifiers[j] | i;
-              err = UCKeyTranslate (chr_data, i, kUCKeyActionDisplay,
-                                    (modifiers[j] >> 8) & 0xFF,
-                                    LMGetKbdType(),
-                                    0,
-                                    &state, 4, &nChars, chars);
+		      /* A few <Shift><Option>keys return two
+		       * characters, the first of which is U+00a0,
+		       * which isn't interesting; so we return the
+		       * second. More sophisticated handling is the
+		       * job of a GtkIMContext.
+		       *
+		       * If state isn't zero, it means that it's a
+		       * dead key of some sort. Some of those are
+		       * enumerated in the special_ucs_table with the
+		       * high nibble set to f to push it into the
+		       * private use range. Here we do the same.
+		       */
+		      if (state != 0)
+			chars[nChars - 1] |= 0xf000;
+		      uc = chars[nChars - 1];

-              /* FIXME: Theoretically, we can get multiple UTF-16
-               * values; we should convert them to proper unicode and
-               * figure out whether there are really keyboard layouts
-               * that give us more than one character for one
-               * keypress.
-               */
-              if (err == noErr && nChars == 1)
-                {
-                  int k;
-                  gboolean found = FALSE;
+		      for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++) 
+			{
+			  if (special_ucs_table[k].ucs_value == uc)
+			    {
+			      p[j] = special_ucs_table[k].keyval;
+			      found = TRUE;
+			      break;
+			    }
+			}

-                  /* A few <Shift><Option>keys return two characters,
-                   * the first of which is U+00a0, which isn't
-                   * interesting; so we return the second. More
-                   * sophisticated handling is the job of a
-                   * GtkIMContext.
-                   *
-                   * If state isn't zero, it means that it's a dead
-                   * key of some sort. Some of those are enumerated in
-                   * the special_ucs_table with the high nibble set to
-                   * f to push it into the private use range. Here we
-                   * do the same.
-                   */
-                  if (state != 0)
-                    chars[nChars - 1] |= 0xf000;
-                  uc = chars[nChars - 1];
+		      /* Special-case shift-tab since GTK+ expects
+		       * GDK_KEY_ISO_Left_Tab for that.
+		       */
+		      if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
+			p[j] = GDK_KEY_ISO_Left_Tab;

-                  for (k = 0; k < G_N_ELEMENTS (special_ucs_table); k++)
-                    {
-                      if (special_ucs_table[k].ucs_value == uc)
-                        {
-                          p[j] = special_ucs_table[k].keyval;
-                          found = TRUE;
-                          break;
-                        }
-                    }
+		      if (!found)
+                        p[j] = gdk_unicode_to_keyval (uc);
+		    }
+		}

-                  /* Special-case shift-tab since GTK+ expects
-                   * GDK_KEY_ISO_Left_Tab for that.
-                   */
-                  if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
-                    p[j] = GDK_KEY_ISO_Left_Tab;
-
-                  if (!found)
-                    p[j] = gdk_unicode_to_keyval (uc);
-                }
-            }
-
-          if (p[3] == p[2])
-            p[3] = 0;
-          if (p[2] == p[1])
-            p[2] = 0;
-          if (p[1] == p[0])
-            p[1] = 0;
-          if (p[0] == p[2] &&
-              p[1] == p[3])
-            p[2] = p[3] = 0;
-        }
+	      if (p[3] == p[2])
+		p[3] = 0;
+	      if (p[2] == p[1])
+		p[2] = 0;
+	      if (p[1] == p[0])
+		p[1] = 0;
+	      if (p[0] == p[2] && 
+		  p[1] == p[3])
+		p[2] = p[3] = 0;
+	    }
 #ifndef __LP64__
-    }
-  else
-    {
-      g_error ("unknown type of keyboard layout (neither KCHR nor uchr)"
-               " - not supported right now");
-    }
+	}
+      else
+	{
+	  g_error ("unknown type of keyboard layout (neither KCHR nor uchr)"
+	           " - not supported right now");
+	}
 #endif

-  for (i = 0; i < G_N_ELEMENTS (modifier_keys); i++)
-    {
-      p = keyval_array + modifier_keys[i].keycode * KEYVALS_PER_KEYCODE;
+      for (i = 0; i < G_N_ELEMENTS (modifier_keys); i++)
+	{
+	  p = keyval_array + modifier_keys[i].keycode * KEYVALS_PER_KEYCODE;

-      if (p[0] == 0 && p[1] == 0 &&
-          p[2] == 0 && p[3] == 0)
-        p[0] = modifier_keys[i].keyval;
+	  if (p[0] == 0 && p[1] == 0 && 
+	      p[2] == 0 && p[3] == 0)
+	    p[0] = modifier_keys[i].keyval;
+	}
+
+      for (i = 0; i < G_N_ELEMENTS (function_keys); i++)
+	{
+	  p = keyval_array + function_keys[i].keycode * KEYVALS_PER_KEYCODE;
+
+          p[0] = function_keys[i].keyval;
+          p[1] = p[2] = p[3] = 0;
+	}
+
+      for (i = 0; i < G_N_ELEMENTS (known_numeric_keys); i++)
+	{
+	  p = keyval_array + known_numeric_keys[i].keycode * KEYVALS_PER_KEYCODE;
+
+	  if (p[0] == known_numeric_keys[i].normal_keyval)
+            p[0] = known_numeric_keys[i].keypad_keyval;
+	}
+      
+      if (current_layout)
+	g_signal_emit_by_name (default_keymap, "keys_changed");
+
+      current_layout = new_layout;
    }
-
-  for (i = 0; i < G_N_ELEMENTS (function_keys); i++)
-    {
-      p = keyval_array + function_keys[i].keycode * KEYVALS_PER_KEYCODE;
-
-      p[0] = function_keys[i].keyval;
-      p[1] = p[2] = p[3] = 0;
-    }
-
-  for (i = 0; i < G_N_ELEMENTS (known_numeric_keys); i++)
-    {
-      p = keyval_array + known_numeric_keys[i].keycode * KEYVALS_PER_KEYCODE;
-
-      if (p[0] == known_numeric_keys[i].normal_keyval)
-        p[0] = known_numeric_keys[i].keypad_keyval;
-    }
-
-  g_signal_emit_by_name (default_keymap, "keys-changed");
 }

 static PangoDirection
@@ -531,6 +542,8 @@ gdk_quartz_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
  GArray *keys_array;
  int i;

+  maybe_update_keymap ();
+
  *n_keys = 0;
  keys_array = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));

@@ -566,6 +579,8 @@ gdk_quartz_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
  int i;
  guint *p;

+  maybe_update_keymap ();
+
  *n_entries = 0;

  if (hardware_keycode > NUM_KEYCODES)
@@ -674,6 +689,8 @@ gdk_quartz_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  GdkModifierType bit;
  guint tmp_modifiers = 0;

+  maybe_update_keymap ();
+
  if (keyval)
    *keyval = 0;
  if (effective_group)
@@ -818,36 +835,14 @@ _gdk_quartz_keys_is_modifier (guint keycode)
  return FALSE;
 }

-static void
-input_sources_changed_notification (CFNotificationCenterRef  center,
-                                    void                    *observer,
-                                    CFStringRef              name,
-                                    const void              *object,
-                                    CFDictionaryRef          userInfo)
-{
-  update_keymap ();
-}
-
 static void
 gdk_quartz_keymap_init (GdkQuartzKeymap *keymap)
 {
-  update_keymap ();
-  CFNotificationCenterAddObserver (CFNotificationCenterGetDistributedCenter (),
-                                   keymap,
-                                   input_sources_changed_notification,
-                                   CFSTR ("AppleSelectedInputSourcesChangedNotification"),
-                                   NULL,
-                                   CFNotificationSuspensionBehaviorDeliverImmediately);
 }

 static void
 gdk_quartz_keymap_finalize (GObject *object)
 {
-  CFNotificationCenterRemoveObserver (CFNotificationCenterGetDistributedCenter (),
-                                      object,
-                                      CFSTR ("AppleSelectedInputSourcesChangedNotification"),
-                                      NULL);
-
  G_OBJECT_CLASS (gdk_quartz_keymap_parent_class)->finalize (object);
 }

@@ -74,7 +74,6 @@ void       _gdk_quartz_event_loop_release_event (NSEvent *event);
 /* Keys */
 GdkEventType _gdk_quartz_keys_event_type  (NSEvent   *event);
 gboolean     _gdk_quartz_keys_is_modifier (guint      keycode);
-void         _gdk_quartz_synthesize_null_key_event (GdkWindow *window);

 /* Drag and Drop */
 void        _gdk_quartz_window_register_dnd      (GdkWindow   *window);
@@ -55,10 +55,6 @@ typedef enum

 GdkOSXVersion gdk_quartz_osx_version (void);

-GdkAtom   gdk_quartz_pasteboard_type_to_atom_libgtk_only        (NSString       *type);
-NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only      (const gchar    *target);
-NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only        (GdkAtom         atom);
-
 G_END_DECLS

 #define __GDKQUARTZ_H_INSIDE__
@@ -22,7 +22,6 @@

 #include "gdkselection.h"
 #include "gdkproperty.h"
-#include "gdkquartz.h"

 gboolean
 _gdk_quartz_display_set_selection_owner (GdkDisplay *display,
@@ -172,42 +171,3 @@ _gdk_quartz_display_text_property_to_utf8_list (GdkDisplay    *display,
    }
 }

-GdkAtom
-gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type)
-{
-  if ([type isEqualToString:NSStringPboardType])
-    return gdk_atom_intern_static_string ("UTF8_STRING");
-  else if ([type isEqualToString:NSTIFFPboardType])
-    return gdk_atom_intern_static_string ("image/tiff");
-  else if ([type isEqualToString:NSColorPboardType])
-    return gdk_atom_intern_static_string ("application/x-color");
-  else if ([type isEqualToString:NSURLPboardType])
-    return gdk_atom_intern_static_string ("text/uri-list");
-  else
-    return gdk_atom_intern ([type UTF8String], FALSE);
-}
-
-NSString *
-gdk_quartz_target_to_pasteboard_type_libgtk_only (const char *target)
-{
-  if (strcmp (target, "UTF8_STRING") == 0)
-    return NSStringPboardType;
-  else if (strcmp (target, "image/tiff") == 0)
-    return NSTIFFPboardType;
-  else if (strcmp (target, "application/x-color") == 0)
-    return NSColorPboardType;
-  else if (strcmp (target, "text/uri-list") == 0)
-    return NSURLPboardType;
-  else
-    return [NSString stringWithUTF8String:target];
-}
-
-NSString *
-gdk_quartz_atom_to_pasteboard_type_libgtk_only (GdkAtom atom)
-{
-  gchar *target = gdk_atom_name (atom);
-  NSString *ret = gdk_quartz_target_to_pasteboard_type_libgtk_only (target);
-  g_free (target);
-
-  return ret;
-}
@@ -2338,18 +2338,14 @@ window_type_hint_to_level (GdkWindowTypeHint hint)
      return NSTornOffMenuWindowLevel;

    case GDK_WINDOW_TYPE_HINT_DOCK:
-      return NSFloatingWindowLevel; /* NSDockWindowLevel is deprecated, and not replaced */
-
    case GDK_WINDOW_TYPE_HINT_UTILITY:
-    case GDK_WINDOW_TYPE_HINT_DIALOG:  /* Dialog window */
      return NSFloatingWindowLevel;

    case GDK_WINDOW_TYPE_HINT_NORMAL:  /* Normal toplevel window */
+    case GDK_WINDOW_TYPE_HINT_DIALOG:  /* Dialog window */
    case GDK_WINDOW_TYPE_HINT_TOOLBAR: /* Window used to implement toolbars */
-      return NSNormalWindowLevel;
-
-    case GDK_WINDOW_TYPE_HINT_DESKTOP:
-      return kCGDesktopWindowLevelKey; /* doesn't map to any real Cocoa model */
+    case GDK_WINDOW_TYPE_HINT_DESKTOP: /* N/A */
+      break;

    default:
      break;
@@ -324,6 +324,13 @@ gdk_wayland_window_attach_image (GdkWindow *window)
  if (GDK_WINDOW_DESTROYED (window))
    return;

+  /* The "drawn to" Cairo surface is the same as the Cairo surface from which
+   * we are driving the buffer for the Wayland surface. Therefore we don't
+   * need to do anything here
+   */
+  if (impl->server_surface == impl->cairo_surface)
+    return;
+
  /* The wayland surface is attached to a buffer that is from the old "drawn
   * to" surface. Unref the surface and restore the state.
   */
@@ -150,7 +150,6 @@ _gdk_win32_window_change_property (GdkWindow    *window,
  guchar *ucptr;
  wchar_t *wcptr, *p;
  glong wclen;
-  GError *err = NULL;

  g_return_if_fail (window != NULL);
  g_return_if_fail (GDK_IS_WINDOW (window));
@@ -194,13 +193,7 @@ _gdk_win32_window_change_property (GdkWindow    *window,
 	      return;
 	    }

-	  wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, &err);
-          if (err != NULL)
-            {
-              g_warning ("Failed to convert utf8: %s", err->message);
-              g_clear_error (&err);
-              return;
-            }
+	  wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, NULL);

 	  wclen++;		/* Terminating 0 */
 	  size = wclen * 2;
@@ -491,8 +491,6 @@ gdk_x11_device_manager_xi2_constructed (GObject *object)
  XIEventMask event_mask;
  unsigned char mask[2] = { 0 };

-  G_OBJECT_CLASS (gdk_x11_device_manager_xi2_parent_class)->constructed (object);
-
  device_manager = GDK_X11_DEVICE_MANAGER_XI2 (object);
  display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (object));
  xdisplay = GDK_DISPLAY_XDISPLAY (display);
@@ -1557,20 +1555,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
        source_device = g_hash_table_lookup (device_manager->id_table,
                                             GUINT_TO_POINTER (xev->sourceid));
        gdk_event_set_source_device (event, source_device);
-
-	if (gdk_device_get_device_type (source_device) != GDK_DEVICE_TYPE_MASTER)
-          _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device));
-        else
-          {
-            GList *slaves, *l;
-
-            slaves = gdk_device_list_slave_devices (source_device);
-
-            for (l = slaves; l; l = l->next)
-              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));
-
-            g_list_free (slaves);
-          }
+        _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device));

        event->crossing.mode = translate_crossing_mode (xev->mode);
        event->crossing.detail = translate_notify_type (xev->detail);
@@ -140,7 +140,6 @@ static const char *const precache_atoms[] = {
  "_NET_WM_STATE_ABOVE",
  "_NET_WM_STATE_BELOW",
  "_NET_WM_STATE_FULLSCREEN",
-  "_NET_WM_STATE_HIDDEN",
  "_NET_WM_STATE_MODAL",
  "_NET_WM_STATE_MAXIMIZED_VERT",
  "_NET_WM_STATE_MAXIMIZED_HORZ",
@@ -150,17 +149,8 @@ static const char *const precache_atoms[] = {
  "_NET_WM_SYNC_REQUEST",
  "_NET_WM_SYNC_REQUEST_COUNTER",
  "_NET_WM_WINDOW_TYPE",
-  "_NET_WM_WINDOW_TYPE_COMBO",
-  "_NET_WM_WINDOW_TYPE_DIALOG",
-  "_NET_WM_WINDOW_TYPE_DND",
-  "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
-  "_NET_WM_WINDOW_TYPE_MENU",
  "_NET_WM_WINDOW_TYPE_NORMAL",
-  "_NET_WM_WINDOW_TYPE_POPUP_MENU",
-  "_NET_WM_WINDOW_TYPE_TOOLTIP",
-  "_NET_WM_WINDOW_TYPE_UTILITY",
  "_NET_WM_USER_TIME",
-  "_NET_WM_USER_TIME_WINDOW",
  "_NET_VIRTUAL_ROOTS",
  "GDK_SELECTION",
  "_NET_WM_STATE_FOCUSED"
@@ -149,9 +149,6 @@ gdk_x11_screen_dispose (GObject *object)
  if (x11_screen->root_window)
    _gdk_window_destroy (x11_screen->root_window, TRUE);

-  for (i = 0; i < x11_screen->nvisuals; i++)
-    g_object_run_dispose (G_OBJECT (x11_screen->visuals[i]));
-
  G_OBJECT_CLASS (gdk_x11_screen_parent_class)->dispose (object);

  x11_screen->xdisplay = NULL;
@@ -1473,7 +1470,6 @@ gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
  GdkX11Screen *x11_screen;
  NetWmSupportedAtoms *supported_atoms;
  GdkDisplay *display;
-  Atom atom;

  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);

@@ -1525,12 +1521,13 @@ gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
  if (supported_atoms->atoms == NULL)
    return FALSE;

-  atom = gdk_x11_atom_to_xatom_for_display (display, property);
-
-  for (i = 0; i < supported_atoms->n_atoms; i++)
+  i = 0;
+  while (i < supported_atoms->n_atoms)
    {
-      if (supported_atoms->atoms[i] == atom)
+      if (supported_atoms->atoms[i] == gdk_x11_atom_to_xatom_for_display (display, property))
        return TRUE;
+
+      ++i;
    }

  return FALSE;
@@ -87,28 +87,12 @@ gdk_x11_visual_finalize (GObject *object)
  G_OBJECT_CLASS (gdk_x11_visual_parent_class)->finalize (object);
 }

-static void
-gdk_x11_visual_dispose (GObject *object)
-{
-  GdkVisual *visual = (GdkVisual *)object;
-  GdkX11Visual *x11_visual = (GdkX11Visual *)object;
-
-  if (x11_visual->colormap != None)
-    {
-      XFreeColormap (GDK_SCREEN_XDISPLAY (visual->screen), x11_visual->colormap);
-      x11_visual->colormap = None;
-    }
-
-  G_OBJECT_CLASS (gdk_x11_visual_parent_class)->dispose (object);
-}
-
 static void
 gdk_x11_visual_class_init (GdkX11VisualClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);

  object_class->finalize = gdk_x11_visual_finalize;
-  object_class->dispose = gdk_x11_visual_dispose;
 }

 void
@@ -157,7 +157,6 @@ gdk_window_impl_x11_init (GdkWindowImplX11 *impl)
  impl->toplevel_window_type = -1;
  impl->device_cursor = g_hash_table_new_full (NULL, NULL,
                                               NULL, g_object_unref);
-  impl->frame_sync_enabled = TRUE;
 }

 GdkToplevelX11 *
@@ -404,8 +403,7 @@ gdk_x11_window_end_frame (GdkWindow *window)
 		       impl->toplevel->extended_update_counter,
 		       impl->toplevel->current_counter_value);

-      if (impl->frame_sync_enabled &&
-          gdk_x11_screen_supports_net_wm_hint (gdk_window_get_screen (window),
+      if (gdk_x11_screen_supports_net_wm_hint (gdk_window_get_screen (window),
 					       gdk_atom_intern_static_string ("_NET_WM_FRAME_DRAWN")))
        {
          impl->toplevel->frame_pending = TRUE;
@@ -1079,15 +1077,15 @@ _gdk_x11_display_create_window_impl (GdkDisplay    *display,
      class = InputOnly;
    }

-  if (window->width > 32767 ||
-      window->height > 32767)
+  if (window->width > 65535 ||
+      window->height > 65535)
    {
-      g_warning ("Native Windows wider or taller than 32767 pixels are not supported");
+      g_warning ("Native Windows wider or taller than 65535 pixels are not supported");

-      if (window->width > 32767)
-        window->width = 32767;
-      if (window->height > 32767)
-        window->height = 32767;
+      if (window->width > 65535)
+        window->width = 65535;
+      if (window->height > 65535)
+        window->height = 65535;
    }

  impl->xid = XCreateWindow (xdisplay, xparent,
@@ -5308,37 +5306,6 @@ gdk_x11_window_get_xid (GdkWindow *window)
  return GDK_WINDOW_IMPL_X11 (window->impl)->xid;
 }

-/**
- * gdk_x11_window_set_frame_sync_enabled:
- * @window: (type GdkX11Window): a native #GdkWindow
- * @frame_sync_enabled: whether frame-synchronization should be enabled
- *
- * This function can be used to disable frame synchronization for a window.
- * Normally frame synchronziation will be enabled or disabled based on whether
- * the system has a compositor that supports frame synchronization, but if
- * the window is not directly managed by the window manager, then frame
- * synchronziation may need to be disabled. This is the case for a window
- * embedded via the XEMBED protocol.
- *
- * Since: 3.8
- */
-void
-gdk_x11_window_set_frame_sync_enabled (GdkWindow *window,
-                                       gboolean   frame_sync_enabled)
-{
-  /* Try to ensure the window has a native window */
-  if (!_gdk_window_has_impl (window))
-    gdk_window_ensure_native (window);
-
-  if (!GDK_WINDOW_IS_X11 (window))
-    {
-      g_warning (G_STRLOC " drawable is not a native X11 window");
-      return;
-    }
-
-  GDK_WINDOW_IMPL_X11 (window->impl)->frame_sync_enabled = FALSE;
-}
-
 static void
 gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
 {
@@ -73,7 +73,6 @@ struct _GdkWindowImplX11
                           * unset during resizing and scaling */
  guint override_redirect : 1;
  guint frame_clock_connected : 1;
-  guint frame_sync_enabled : 1;

  cairo_surface_t *cairo_surface;

@@ -173,8 +172,6 @@ GType gdk_window_impl_x11_get_type (void);

 void            gdk_x11_window_set_user_time        (GdkWindow *window,
 						     guint32    timestamp);
-void            gdk_x11_window_set_frame_sync_enabled (GdkWindow *window,
-                                                       gboolean   frame_sync_enabled);

 GdkToplevelX11 *_gdk_x11_window_get_toplevel        (GdkWindow *window);
 void            _gdk_x11_window_tmp_unset_bg        (GdkWindow *window,
@@ -67,10 +67,6 @@ void     gdk_x11_window_set_hide_titlebar_when_maximized (GdkWindow *window,
                                                          gboolean   hide_titlebar_when_maximized);
 void     gdk_x11_window_move_to_current_desktop (GdkWindow   *window);

-GDK_AVAILABLE_IN_3_8
-void     gdk_x11_window_set_frame_sync_enabled (GdkWindow *window,
-                                                gboolean   frame_sync_enabled);
-
 /**
 * GDK_WINDOW_XDISPLAY:
 * @win: a #GdkWindow.
@@ -1265,24 +1265,13 @@ LDADDS =								\
 	$(GTK_DEP_LIBS)

 if HAVE_INTROSPECTION
-# The Quartz clipboard and dnd files aren't annotated for
-# introspection. Rather than copy the annotations over from the
-# regular files, exclude the quartz ones:
 introspection_files = \
    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
-    $(filter-out  gtkclipboard-quartz.c gtkdnd-quartz.c, \
-    $(gtk_base_c_sources)) \
+    $(gtk_base_c_sources) \
    gtkprintoperation-unix.c \
    gtktypebuiltins.h \
    gtktypebuiltins.c

-# And include the regular ones:
-if USE_QUARTZ
-introspection_files += \
-    gtkclipboard.c \
-    gtkdnd.c
-endif
-
 if USE_X11
 introspection_files += \
    gtksocket.c \
@@ -1319,9 +1308,7 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = \
-	gtk-query-immodules-3.0	\
-	gtk-launch
+bin_PROGRAMS = gtk-query-immodules-3.0

 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
@@ -1368,8 +1355,11 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 endif

+if HAVE_GIO_UNIX
+bin_PROGRAMS += gtk-launch
 gtk_launch_LDADD = $(LDADDS)
 gtk_launch_SOURCES = gtk-launch.c
+endif

 .PHONY: files test test-debug

@@ -106,7 +106,6 @@ gtka11y_private_h_sources =		\
 	gtkcellaccessibleprivate.h	\
 	gtkcolorswatchaccessibleprivate.h \
 	gtkiconviewaccessibleprivate.h	\
-	gtklabelaccessibleprivate.h 	\
 	gtklockbuttonaccessibleprivate.h \
 	gtktextviewaccessibleprivate.h  \
 	gtktreeviewaccessibleprivate.h	\
@@ -572,17 +572,9 @@ gtk_entry_accessible_notify_gtk (GObject    *obj,
          gchar *text;
          text = gtk_entry_get_icon_tooltip_text (gtk_entry,
                                                    GTK_ENTRY_ICON_PRIMARY);
-          if (text)
-            {
-              atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
+          atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
                                      text);
-              g_free (text);
-            }
-          else
-            {
-              atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
-                                      "");
-            }
+          g_free (text);
        }
    }
  else if (g_strcmp0 (pspec->name, "secondary-icon-tooltip-text") == 0)
@@ -592,17 +584,9 @@ gtk_entry_accessible_notify_gtk (GObject    *obj,
          gchar *text;
          text = gtk_entry_get_icon_tooltip_text (gtk_entry,
                                                    GTK_ENTRY_ICON_SECONDARY);
-          if (text)
-            {
-              atk_object_set_description (priv->icons[GTK_ENTRY_ICON_SECONDARY],
+          atk_object_set_description (priv->icons[GTK_ENTRY_ICON_SECONDARY],
                                      text);
-              g_free (text);
-            }
-          else
-            {
-              atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
-                                      "");
-            }
+          g_free (text);
        }
    }
  else if (g_strcmp0 (pspec->name, "primary-icon-activatable") == 0)
@@ -19,11 +19,11 @@

 #include <gtk/gtk.h>
 #include <gtk/gtkpango.h>
-#include "gtkwidgetprivate.h"
 #include "gtklabelaccessible.h"

 struct _GtkLabelAccessiblePrivate
 {
+  gchar *text;
  gint cursor_position;
  gint selection_bound;
 };
@@ -46,11 +46,16 @@ gtk_label_accessible_initialize (AtkObject *obj,
                                 gpointer   data)
 {
  GtkWidget  *widget;
+  GtkLabelAccessible *accessible;

  ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->initialize (obj, data);

+  accessible = GTK_LABEL_ACCESSIBLE (obj);
+
  widget = GTK_WIDGET (data);

+  accessible->priv->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
+
  /*
   * Check whether ancestor of GtkLabel is a GtkButton and if so
   * set accessible parent for GtkLabelAccessible
@@ -92,45 +97,6 @@ check_for_selection_change (GtkLabelAccessible *accessible,
  return ret_val;
 }

-void
-_gtk_label_accessible_text_deleted (GtkLabel *label)
-{
-  AtkObject *obj;
-  const char *text;
-  guint length;
-
-  obj = _gtk_widget_peek_accessible (GTK_WIDGET (label));
-  if (obj == NULL)
-    return;
-
-  text = gtk_label_get_text (label);
-  length = g_utf8_strlen (text, -1);
-  if (length > 0)
-    g_signal_emit_by_name (obj, "text-changed::delete", 0, length);
-}
-
-void
-_gtk_label_accessible_text_inserted (GtkLabel *label)
-{
-  AtkObject *obj;
-  const char *text;
-  guint length;
-
-  obj = _gtk_widget_peek_accessible (GTK_WIDGET (label));
-  if (obj == NULL)
-    return;
-
-  text = gtk_label_get_text (label);
-  length = g_utf8_strlen (text, -1);
-  if (length > 0)
-    g_signal_emit_by_name (obj, "text-changed::insert", 0, length);
-
-  if (obj->name == NULL)
-    /* The label has changed so notify a change in accessible-name */
-    g_object_notify (G_OBJECT (obj), "accessible-name");
-
-  g_signal_emit_by_name (obj, "visible-data-changed");
-}

 static void
 gtk_label_accessible_notify_gtk (GObject    *obj,
@@ -139,10 +105,37 @@ gtk_label_accessible_notify_gtk (GObject    *obj,
  GtkWidget *widget = GTK_WIDGET (obj);
  AtkObject* atk_obj = gtk_widget_get_accessible (widget);
  GtkLabelAccessible *accessible;
+  gint length;

  accessible = GTK_LABEL_ACCESSIBLE (atk_obj);

-  if (g_strcmp0 (pspec->name, "cursor-position") == 0)
+  if (g_strcmp0 (pspec->name, "label") == 0)
+    {
+      const gchar *text;
+
+      text = gtk_label_get_text (GTK_LABEL (widget));
+      if (g_strcmp0 (accessible->priv->text, text) == 0)
+        return;
+
+      /* Create a delete text and an insert text signal */
+      length = g_utf8_strlen (accessible->priv->text, -1);
+      if (length > 0)
+        g_signal_emit_by_name (atk_obj, "text-changed::delete", 0, length);
+
+      g_free (accessible->priv->text);
+      accessible->priv->text = g_strdup (text);
+
+      length = g_utf8_strlen (accessible->priv->text, -1);
+      if (length > 0)
+        g_signal_emit_by_name (atk_obj, "text-changed::insert", 0, length);
+
+      if (atk_obj->name == NULL)
+        /* The label has changed so notify a change in accessible-name */
+        g_object_notify (G_OBJECT (atk_obj), "accessible-name");
+
+      g_signal_emit_by_name (atk_obj, "visible-data-changed");
+    }
+  else if (g_strcmp0 (pspec->name, "cursor-position") == 0)
    {
      g_signal_emit_by_name (atk_obj, "text-caret-moved",
                             _gtk_label_get_cursor_position (GTK_LABEL (widget)));
@@ -158,6 +151,17 @@ gtk_label_accessible_notify_gtk (GObject    *obj,
    GTK_WIDGET_ACCESSIBLE_CLASS (gtk_label_accessible_parent_class)->notify_gtk (obj, pspec);
 }

+static void
+gtk_label_accessible_finalize (GObject *object)
+{
+  GtkLabelAccessible *accessible = GTK_LABEL_ACCESSIBLE (object);
+
+  g_free (accessible->priv->text);
+
+  G_OBJECT_CLASS (gtk_label_accessible_parent_class)->finalize (object);
+}
+
+
 /* atkobject.h */

 static AtkStateSet *
@@ -270,8 +274,11 @@ gtk_label_accessible_get_name (AtkObject *accessible)
 static void
 gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-  GtkWidgetAccessibleClass *widget_class = GTK_WIDGET_ACCESSIBLE_CLASS (klass);
+  GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
+
+  gobject_class->finalize = gtk_label_accessible_finalize;

  widget_class->notify_gtk = gtk_label_accessible_notify_gtk;

@@ -1,30 +0,0 @@
-/* GTK+ - accessibility implementations
- * Copyright (C) 2002, 2004  Anders Carlsson <andersca@gnu.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_LABEL_ACCESSIBLE_PRIVATE_H__
-#define __GTK_LABEL_ACCESSIBLE_PRIVATE_H__
-
-#include <gtk/a11y/gtklabelaccessible.h>
-
-G_BEGIN_DECLS
-
-void            _gtk_label_accessible_text_deleted              (GtkLabel       *label);
-void            _gtk_label_accessible_text_inserted             (GtkLabel       *label);
-
-G_END_DECLS
-
-#endif /* __GTK_LABEL_ACCESSIBLE_PRIVATE_H__ */
@@ -21,10 +21,6 @@
 #include <gtk/gtk.h>
 #include "gtkrangeaccessible.h"

-struct _GtkRangeAccessiblePrivate
-{
-  GtkAdjustment *adjustment;
-};

 static void atk_value_interface_init  (AtkValueIface  *iface);

@@ -38,60 +34,65 @@ gtk_range_accessible_value_changed (GtkAdjustment *adjustment,
  g_object_notify (G_OBJECT (data), "accessible-value");
 }

-static void
-gtk_range_accessible_widget_set (GtkAccessible *accessible)
-{
-  GtkRangeAccessiblePrivate *priv = GTK_RANGE_ACCESSIBLE (accessible)->priv;
-  GtkWidget *range;
-  GtkAdjustment *adj;
-
-  range = gtk_accessible_get_widget (accessible);
-  adj = gtk_range_get_adjustment (GTK_RANGE (range));
-  if (adj)
-    {
-      priv->adjustment = adj;
-      g_object_ref (priv->adjustment);
-      g_signal_connect (priv->adjustment, "value-changed",
-                        G_CALLBACK (gtk_range_accessible_value_changed),
-                        accessible);
-    }
-}
-
-static void
-gtk_range_accessible_widget_unset (GtkAccessible *accessible)
-{
-  GtkRangeAccessiblePrivate *priv = GTK_RANGE_ACCESSIBLE (accessible)->priv;
-
-  if (priv->adjustment)
-    {
-      g_signal_handlers_disconnect_by_func (priv->adjustment,
-                                            G_CALLBACK (gtk_range_accessible_value_changed),
-                                            accessible);
-      g_object_unref (priv->adjustment);
-      priv->adjustment = NULL;
-    }
-}
-
 static void
 gtk_range_accessible_initialize (AtkObject *obj,
                                 gpointer   data)
 {
+  GtkRangeAccessible *range = GTK_RANGE_ACCESSIBLE (obj);
+  GtkAdjustment *adj;
+  GtkRange *gtk_range;
+
  ATK_OBJECT_CLASS (gtk_range_accessible_parent_class)->initialize (obj, data);
+
+  gtk_range = GTK_RANGE (data);
+  /*
+   * If a GtkAdjustment already exists for the GtkRange,
+   * create the GailAdjustment
+   */
+  adj = gtk_range_get_adjustment (gtk_range);
+  if (adj)
+    g_signal_connect (adj, "value-changed",
+                      G_CALLBACK (gtk_range_accessible_value_changed),
+                      range);
+
  obj->role = ATK_ROLE_SLIDER;
 }

+static void
+gtk_range_accessible_finalize (GObject *object)
+{
+  GtkRangeAccessible *range = GTK_RANGE_ACCESSIBLE (object);
+  GtkWidget *widget;
+  GtkAdjustment *adj;
+
+  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (object));
+  if (widget)
+    {
+      adj = gtk_range_get_adjustment (GTK_RANGE (widget));
+      if (adj)
+        g_signal_handlers_disconnect_by_func (adj,
+                                              gtk_range_accessible_value_changed,
+                                              range);
+    }
+
+  G_OBJECT_CLASS (gtk_range_accessible_parent_class)->finalize (object);
+}
+
 static void
 gtk_range_accessible_notify_gtk (GObject    *obj,
                                 GParamSpec *pspec)
 {
  GtkWidget *widget = GTK_WIDGET (obj);
+  GtkAdjustment *adj;
  AtkObject *range;

  if (strcmp (pspec->name, "adjustment") == 0)
    {
      range = gtk_widget_get_accessible (widget);
-      gtk_range_accessible_widget_unset (GTK_ACCESSIBLE (range));
-      gtk_range_accessible_widget_set (GTK_ACCESSIBLE (range));
+      adj = gtk_range_get_adjustment (GTK_RANGE (widget));
+      g_signal_connect (adj, "value-changed",
+                        G_CALLBACK (gtk_range_accessible_value_changed),
+                        range);
    }
  else
    GTK_WIDGET_ACCESSIBLE_CLASS (gtk_range_accessible_parent_class)->notify_gtk (obj, pspec);
@@ -101,26 +102,20 @@ gtk_range_accessible_notify_gtk (GObject    *obj,
 static void
 gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-  GtkAccessibleClass *accessible_class = (GtkAccessibleClass*)klass;
  GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;

-  class->initialize = gtk_range_accessible_initialize;
-
-  accessible_class->widget_set = gtk_range_accessible_widget_set;
-  accessible_class->widget_unset = gtk_range_accessible_widget_unset;
-
  widget_class->notify_gtk = gtk_range_accessible_notify_gtk;

-  g_type_class_add_private (klass, sizeof (GtkRangeAccessiblePrivate));
+  class->initialize = gtk_range_accessible_initialize;
+
+  gobject_class->finalize = gtk_range_accessible_finalize;
 }

 static void
 gtk_range_accessible_init (GtkRangeAccessible *range)
 {
-  range->priv = G_TYPE_INSTANCE_GET_PRIVATE (range,
-                                             GTK_TYPE_RANGE_ACCESSIBLE,
-                                             GtkRangeAccessiblePrivate);
 }

 static void
@@ -21,10 +21,6 @@
 #include <gtk/gtk.h>
 #include "gtkspinbuttonaccessible.h"

-struct _GtkSpinButtonAccessiblePrivate
-{
-  GtkAdjustment *adjustment;
-};

 static void atk_value_interface_init (AtkValueIface *iface);

@@ -35,48 +31,31 @@ static void
 gtk_spin_button_accessible_value_changed (GtkAdjustment *adjustment,
                                          gpointer       data)
 {
-  g_object_notify (G_OBJECT (data), "accessible-value");
-}
+  GtkSpinButtonAccessible *spin_button;

-static void
-gtk_spin_button_accessible_widget_set (GtkAccessible *accessible)
-{
-  GtkSpinButtonAccessiblePrivate *priv = GTK_SPIN_BUTTON_ACCESSIBLE (accessible)->priv;
-  GtkWidget *spin;
-  GtkAdjustment *adj;
+  if (adjustment == NULL || data == NULL)
+    return;

-  spin = gtk_accessible_get_widget (accessible);
-  adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin));
-  if (adj)
-    {
-      priv->adjustment = adj;
-      g_object_ref (priv->adjustment);
-      g_signal_connect (priv->adjustment, "value-changed",
-                        G_CALLBACK (gtk_spin_button_accessible_value_changed),
-                        accessible);
-    }
-}
+  spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (data);

-static void
-gtk_spin_button_accessible_widget_unset (GtkAccessible *accessible)
-{
-  GtkSpinButtonAccessiblePrivate *priv = GTK_SPIN_BUTTON_ACCESSIBLE (accessible)->priv;
-
-  if (priv->adjustment)
-    {
-      g_signal_handlers_disconnect_by_func (priv->adjustment,
-                                            G_CALLBACK (gtk_spin_button_accessible_value_changed),
-                                            accessible);
-      g_object_unref (priv->adjustment);
-      priv->adjustment = NULL;
-    }
+  g_object_notify (G_OBJECT (spin_button), "accessible-value");
 }

 static void
 gtk_spin_button_accessible_initialize (AtkObject *obj,
                                       gpointer  data)
 {
+  GtkAdjustment *adjustment;
+
  ATK_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->initialize (obj, data);
+
+  adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (data));
+  if (adjustment)
+    g_signal_connect_object (adjustment,
+                             "value-changed",
+                             G_CALLBACK (gtk_spin_button_accessible_value_changed),
+                             obj, 0);
+
  obj->role = ATK_ROLE_SPIN_BUTTON;
 }

@@ -85,43 +64,37 @@ gtk_spin_button_accessible_notify_gtk (GObject    *obj,
                                       GParamSpec *pspec)
 {
  GtkWidget *widget = GTK_WIDGET (obj);
-  AtkObject *spin;
+  GtkSpinButtonAccessible *spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (gtk_widget_get_accessible (widget));

  if (strcmp (pspec->name, "adjustment") == 0)
    {
-      spin = gtk_widget_get_accessible (widget);
-      gtk_spin_button_accessible_widget_unset (GTK_ACCESSIBLE (spin));
-      gtk_spin_button_accessible_widget_set (GTK_ACCESSIBLE (spin));
+      GtkAdjustment* adjustment;

+      adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
+      g_signal_connect_object (adjustment, "value-changed",
+                               G_CALLBACK (gtk_spin_button_accessible_value_changed),
+                               spin_button, 0);
    }
  else
    GTK_WIDGET_ACCESSIBLE_CLASS (gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec);
 }

+
+
 static void
 gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass)
 {
  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-  GtkAccessibleClass *accessible_class = (GtkAccessibleClass*)klass;
  GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;

-  class->initialize = gtk_spin_button_accessible_initialize;
-
-  accessible_class->widget_set = gtk_spin_button_accessible_widget_set;
-  accessible_class->widget_unset = gtk_spin_button_accessible_widget_unset;
-
  widget_class->notify_gtk = gtk_spin_button_accessible_notify_gtk;

-  g_type_class_add_private (klass, sizeof (GtkSpinButtonAccessiblePrivate));
+  class->initialize = gtk_spin_button_accessible_initialize;
 }

 static void
 gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button)
 {
-  button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
-                                              GTK_TYPE_SPIN_BUTTON_ACCESSIBLE,
-                                              GtkSpinButtonAccessiblePrivate);
-
 }

 static void
@@ -342,8 +342,7 @@ _gtk_gradient_resolve_full (GtkGradient             *gradient,
                                          provider,
                                          _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
                                          GTK_CSS_DEPENDS_ON_COLOR,
-                                          &stop_deps,
-                                          NULL);
+                                          &stop_deps);
      if (val)
        {
          rgba = *_gtk_css_rgba_value_get_rgba (val);
@@ -307,7 +307,6 @@ gtk_symbolic_color_resolve (GtkSymbolicColor   *color,
                                    GTK_STYLE_PROVIDER_PRIVATE (props),
                                    current,
                                    0,
-                                    NULL,
                                    NULL);
  _gtk_css_value_unref (current);
  if (v == NULL)
@@ -791,7 +791,7 @@ GtkSwitch.trough:active {
 /* Assistant */

 GtkAssistant .sidebar .highlight {
-    background-color: gray;
+    background-color: blue;
    font: bold;
 }

@@ -834,354 +834,3 @@ GtkStatusbar > GtkFrame {
    background-image:  -gtk-win32-theme-part(status, 3 1);
 }
 */
-
-@keyframes spinner {
-   0% { background-image: none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)); }
-   0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)); }
-   8% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none; }
-   8% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
-  16% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)); }
-  16% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)); }
-  25% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)); }
-  25% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)); }
-  33% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)); }
-  33% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)); }
-  41% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)); }
-  41% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)); }
-  50% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)); }
-  50% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)); }
-  58% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)); }
-  58% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)); }
-  66% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)); }
-  66% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)); }
-  75% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)); }
-  75% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)); }
-  83% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)); }
-  83% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)); }
-  91% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)); }
-  91% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)); }
- 100% { background-image: none,
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)); }
- 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                          -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)); }
-}
-
-.spinner {
-  background-color: transparent;
-  background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                    -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-  background-position: 25.00% 6.70%, 6.70% 25.00%, 0.00% 50.00%, 6.70% 75.00%, 25.00% 93.30%, 50.00% 100.00%, 75.00% 93.30%, 93.30% 75.00%, 100.00% 50.00%, 93.30% 25.00%, 75.00% 6.70%, 50.00% 0.00%;
-  background-size: 20% 20%;
-  background-repeat: no-repeat;
-  transition: background-image 500ms ease-out;
-}
-
-.spinner:active {
-   background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-  animation: spinner 1s infinite linear;
-}
@@ -108,6 +108,12 @@ static void gtk_alignment_get_preferred_height_for_width (GtkWidget           *w
 							  gint                 for_size,
 							  gint                *minimum_size,
 							  gint                *natural_size);
+static void gtk_alignment_get_preferred_height_and_baseline_for_width (GtkWidget           *widget,
+								       gint                 for_size,
+								       gint                *minimum_size,
+								       gint                *natural_size,
+								       gint                *minimum_baseline,
+								       gint                *natural_baseline);

 G_DEFINE_TYPE (GtkAlignment, gtk_alignment, GTK_TYPE_BIN)

@@ -128,6 +134,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
  widget_class->get_preferred_height = gtk_alignment_get_preferred_height;
  widget_class->get_preferred_width_for_height = gtk_alignment_get_preferred_width_for_height;
  widget_class->get_preferred_height_for_width = gtk_alignment_get_preferred_height_for_width;
+  widget_class->get_preferred_height_and_baseline_for_width = gtk_alignment_get_preferred_height_and_baseline_for_width;

  g_object_class_install_property (gobject_class,
                                   PROP_XALIGN,
@@ -507,6 +514,7 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
  gint width, height;
  guint border_width;
  gint padding_horizontal, padding_vertical;
+  gint baseline;

  padding_horizontal = 0;
  padding_vertical = 0;
@@ -520,6 +528,7 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
      gint child_nat_width;
      gint child_nat_height;
      gint child_width, child_height;
+      double yalign, yscale;

      border_width = gtk_container_get_border_width (GTK_CONTAINER (alignment));

@@ -529,6 +538,25 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
      width  = MAX (1, allocation->width - padding_horizontal - 2 * border_width);
      height = MAX (1, allocation->height - padding_vertical - 2 * border_width);

+      baseline = gtk_widget_get_allocated_baseline (widget);
+      if (baseline != -1)
+	baseline -= border_width + priv->padding_top;
+
+      /* If we get a baseline set that means we're baseline aligned, and the parent
+	 honored that. In that case we have to ignore yalign/yscale as we need
+	 yalign based on the baseline and always FILL mode to ensure we can place
+	 the baseline anywhere */
+      if (baseline != -1)
+	{
+	  yalign = 0;
+	  yscale = 1.0;
+	}
+      else
+	{
+	  yalign = priv->yalign;
+	  yscale = priv->yscale;
+	}
+
      if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
 	{
 	  gtk_widget_get_preferred_width (child, NULL, &child_nat_width);
@@ -559,8 +587,8 @@ gtk_alignment_size_allocate (GtkWidget     *widget,

      if (height > child_height)
 	child_allocation.height = (child_height *
-				   (1.0 - priv->yscale) +
-				   height * priv->yscale);
+				   (1.0 - yscale) +
+				   height * yscale);
      else
 	child_allocation.height = height;

@@ -569,9 +597,9 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
      else 
 	child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;

-      child_allocation.y = priv->yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top;
+      child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top;

-      gtk_widget_size_allocate (child, &child_allocation);
+      gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
    }
 }

@@ -581,18 +609,30 @@ gtk_alignment_get_preferred_size (GtkWidget      *widget,
                                  GtkOrientation  orientation,
 				  gint            for_size,
                                  gint           *minimum_size,
-                                  gint           *natural_size)
+                                  gint           *natural_size,
+                                  gint           *minimum_baseline,
+                                  gint           *natural_baseline)
 {
  GtkAlignment *alignment = GTK_ALIGNMENT (widget);
  GtkAlignmentPrivate *priv = alignment->priv;
  GtkWidget *child;
  guint minimum, natural;
+  guint top_offset;
+  guint border;

-  natural = minimum = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
+  if (minimum_baseline)
+    *minimum_baseline = -1;
+  if (natural_baseline)
+    *natural_baseline = -1;
+
+  border = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  natural = minimum = border * 2;
+  top_offset = border;

  if ((child = gtk_bin_get_child (GTK_BIN (widget))) && gtk_widget_get_visible (child))
    {
      gint child_min, child_nat;
+      gint child_min_baseline = -1, child_nat_baseline = -1;

      /* Request extra space for the padding: */
      if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -619,9 +659,10 @@ gtk_alignment_get_preferred_size (GtkWidget      *widget,
      else
 	{
 	  minimum += (priv->padding_top + priv->padding_bottom);
+	  top_offset += priv->padding_top;

 	  if (for_size < 0)
-	    gtk_widget_get_preferred_height (child, &child_min, &child_nat);
+	    gtk_widget_get_preferred_height_and_baseline_for_width (child, -1, &child_min, &child_nat, &child_min_baseline, &child_nat_baseline);
 	  else
 	    {
 	      gint min_width;
@@ -634,8 +675,13 @@ gtk_alignment_get_preferred_size (GtkWidget      *widget,
 		for_size = (min_width * (1.0 - priv->xscale) +
 			    for_size * priv->xscale);

-	      gtk_widget_get_preferred_height_for_width (child, for_size, &child_min, &child_nat);
+	      gtk_widget_get_preferred_height_and_baseline_for_width (child, for_size, &child_min, &child_nat, &child_min_baseline, &child_nat_baseline);
 	    }
+
+	  if (minimum_baseline && child_min_baseline >= 0)
+	    *minimum_baseline = child_min_baseline + top_offset;
+	  if (natural_baseline && child_nat_baseline >= 0)
+	    *natural_baseline = child_nat_baseline + top_offset;
 	}

      natural = minimum;
@@ -656,7 +702,7 @@ gtk_alignment_get_preferred_width (GtkWidget      *widget,
                                   gint           *minimum_size,
                                   gint           *natural_size)
 {
-  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum_size, natural_size);
+  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum_size, natural_size, NULL, NULL);
 }

 static void
@@ -664,7 +710,7 @@ gtk_alignment_get_preferred_height (GtkWidget      *widget,
                                    gint           *minimum_size,
                                    gint           *natural_size)
 {
-  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum_size, natural_size);
+  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum_size, natural_size, NULL, NULL);
 }


@@ -674,7 +720,7 @@ gtk_alignment_get_preferred_width_for_height (GtkWidget           *widget,
 					      gint                *minimum_size,
 					      gint                *natural_size)
 {
-  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, for_size, minimum_size, natural_size);
+  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, for_size, minimum_size, natural_size, NULL, NULL);
 }

 static void
@@ -683,9 +729,21 @@ gtk_alignment_get_preferred_height_for_width (GtkWidget           *widget,
 					      gint                *minimum_size,
 					      gint                *natural_size)
 {
-  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum_size, natural_size);
+  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum_size, natural_size, NULL, NULL);
 }

+static void
+gtk_alignment_get_preferred_height_and_baseline_for_width (GtkWidget           *widget,
+							   gint                 for_size,
+							   gint                *minimum_size,
+							   gint                *natural_size,
+							   gint                *minimum_baseline,
+							   gint                *natural_baseline)
+{
+  gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum_size, natural_size, minimum_baseline, natural_baseline);
+}
+
+
 /**
 * gtk_alignment_set_padding:
 * @alignment: a #GtkAlignment
@@ -348,9 +348,6 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
    {
      app = l->data;

-      if (!g_app_info_should_show (app))
-        continue;
-
      if (default_app != NULL && g_app_info_equal (app, default_app))
        continue;

@@ -138,8 +138,7 @@ pk_search_mime_async (GtkAppChooserOnline *obj,

 #ifdef GDK_WINDOWING_X11
  window = gtk_widget_get_window (GTK_WIDGET (parent));
-  if (GDK_IS_X11_WINDOW (window))
-    xid = GDK_WINDOW_XID (window);
+  xid = GDK_WINDOW_XID (window);
 #endif

  mime_types[0] = content_type;
@@ -1422,9 +1422,7 @@ gtk_application_inhibit (GtkApplication             *application,

  g_return_val_if_fail (GTK_IS_APPLICATION (application), 0);
  g_return_val_if_fail (!g_application_get_is_remote (G_APPLICATION (application)), 0);
-
-  if (application->priv->sm_proxy == NULL)
-    return 0;
+  g_return_val_if_fail (application->priv->sm_proxy != NULL, 0);

  if (window != NULL)
    {
@@ -1433,10 +1431,8 @@ gtk_application_inhibit (GtkApplication             *application,
      gdkwindow = gtk_widget_get_window (GTK_WIDGET (window));
      if (gdkwindow == NULL)
        g_warning ("Inhibit called with an unrealized window");
-#ifdef GDK_WINDOWING_X11
-      else if (GDK_IS_X11_WINDOW (gdkwindow))
+      else
        xid = GDK_WINDOW_XID (gdkwindow);
-#endif
    }

  res = g_dbus_proxy_call_sync (application->priv->sm_proxy,
@@ -1479,10 +1475,6 @@ gtk_application_uninhibit (GtkApplication *application,
 {
  g_return_if_fail (GTK_IS_APPLICATION (application));
  g_return_if_fail (!g_application_get_is_remote (G_APPLICATION (application)));
-  g_return_if_fail (cookie > 0);
-
-  /* Application could only obtain a cookie through a session
-   * manager proxy, so it's valid to assert its presence here. */
  g_return_if_fail (application->priv->sm_proxy != NULL);

  g_dbus_proxy_call (application->priv->sm_proxy,
@@ -1515,9 +1507,7 @@ gtk_application_is_inhibited (GtkApplication             *application,

  g_return_val_if_fail (GTK_IS_APPLICATION (application), FALSE);
  g_return_val_if_fail (!g_application_get_is_remote (G_APPLICATION (application)), FALSE);
-
-  if (application->priv->sm_proxy == NULL)
-    return FALSE;
+  g_return_val_if_fail (application->priv->sm_proxy != NULL, FALSE);

  res = g_dbus_proxy_call_sync (application->priv->sm_proxy,
                                "IsInhibited",
@@ -216,7 +216,6 @@ struct _GtkApplicationWindowPrivate
  GtkWidget *menubar;
  GtkAccelGroup *accels;
  GSList *accel_closures;
-  guint accel_map_changed_id;

  GMenu *app_menu_section;
  GMenu *menubar_section;
@@ -753,12 +752,7 @@ gtk_application_window_real_realize (GtkWidget *widget)
  gtk_application_window_update_shell_shows_app_menu (window, settings);
  gtk_application_window_update_shell_shows_menubar (window, settings);
  gtk_application_window_update_menubar (window);
-
-  /* Update the accelerators, and ensure we do again
-   * if the accel map changes */
  gtk_application_window_update_accels (window);
-  window->priv->accel_map_changed_id = g_signal_connect_swapped (gtk_accel_map_get (), "changed",
-								 G_CALLBACK (gtk_application_window_update_accels), window);

  GTK_WIDGET_CLASS (gtk_application_window_parent_class)
    ->realize (widget);
@@ -796,7 +790,6 @@ gtk_application_window_real_realize (GtkWidget *widget)
 static void
 gtk_application_window_real_unrealize (GtkWidget *widget)
 {
-  GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (widget);
  GtkSettings *settings;

  settings = gtk_widget_get_settings (widget);
@@ -804,8 +797,6 @@ gtk_application_window_real_unrealize (GtkWidget *widget)
  g_signal_handlers_disconnect_by_func (settings, gtk_application_window_shell_shows_app_menu_changed, widget);
  g_signal_handlers_disconnect_by_func (settings, gtk_application_window_shell_shows_menubar_changed, widget);

-  g_signal_handler_disconnect (gtk_accel_map_get (), window->priv->accel_map_changed_id);
-
  GTK_WIDGET_CLASS (gtk_application_window_parent_class)
    ->unrealize (widget);
 }
@@ -107,7 +107,6 @@ struct _GtkAssistantPrivate
  GtkWidget *last;

  GtkWidget *sidebar;
-  GtkWidget *sidebar_frame;
  GtkWidget *content;
  GtkWidget *action_area;

@@ -708,7 +707,7 @@ update_title_state (GtkAssistant *assistant)
        show_titles = TRUE;
    }

-  gtk_widget_set_visible (priv->sidebar_frame, show_titles);
+  gtk_widget_set_visible (priv->sidebar, show_titles);
 }

 static void
@@ -957,6 +956,7 @@ gtk_assistant_init (GtkAssistant *assistant)
  GtkStyleContext *context;
  GtkWidget *main_box;
  GtkWidget *content_box;
+  GtkWidget *sidebar_frame;

  assistant->priv = G_TYPE_INSTANCE_GET_PRIVATE (assistant,
                                                 GTK_TYPE_ASSISTANT,
@@ -974,11 +974,11 @@ gtk_assistant_init (GtkAssistant *assistant)
  /* use a frame for the sidebar, and manually render a background
   * in it. GtkFrame also gives us padding support for free.
   */
-  priv->sidebar_frame = gtk_frame_new (NULL);
-  context = gtk_widget_get_style_context (priv->sidebar_frame);
+  sidebar_frame = gtk_frame_new (NULL);
+  context = gtk_widget_get_style_context (sidebar_frame);
  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SIDEBAR);

-  g_signal_connect (priv->sidebar_frame, "draw",
+  g_signal_connect (sidebar_frame, "draw",
                    G_CALLBACK (assistant_sidebar_draw_cb), assistant);

  content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
@@ -991,8 +991,8 @@ gtk_assistant_init (GtkAssistant *assistant)
  g_signal_connect (priv->content, "remove",
                    G_CALLBACK (assistant_remove_page_cb), assistant);

-  gtk_container_add (GTK_CONTAINER (priv->sidebar_frame), priv->sidebar);
-  gtk_box_pack_start (GTK_BOX (main_box), priv->sidebar_frame, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (sidebar_frame), priv->sidebar);
+  gtk_box_pack_start (GTK_BOX (main_box), sidebar_frame, FALSE, FALSE, 0);
  gtk_box_pack_start (GTK_BOX (main_box), content_box, TRUE, TRUE, 0);
  gtk_box_pack_start (GTK_BOX (content_box), priv->content, TRUE, TRUE, 0);
  gtk_box_pack_start (GTK_BOX (content_box), priv->action_area, FALSE, TRUE, 0);
@@ -189,44 +189,6 @@ gtk_bin_get_effective_border_width (GtkBin *bin)
  return gtk_container_get_border_width (GTK_CONTAINER (bin));
 }

-/* GtkBin widgets define the padding and borders independantly so
- * we cannot provide a generic get_size() for the same reason
- * we never implemented size_request() here.
- *
- * But for cases where the GtkBin class's padding is constant and
- * does not vary based on allocation (most cases), we can at least 
- * deduce a common code path for the get_width_for_height()/get_height_for_width()
- * cases by using the delta of the base size requsts.
- */
-static void
-get_child_padding_delta (GtkBin *bin,
-			 gint   *delta_h,
-			 gint   *delta_v)
-{
-  GtkBinPrivate *priv = bin->priv;
-  gint hmin, vmin, hnat, vnat, child_hmin, child_vmin;
-
-  /* we can't use gtk_widget_get_preferred_width() wrapper 
-   * because we want our "original" request, not any external
-   * adjustments from set_size_request() or whatever.  we have
-   * to ask for natural also because NULL isn't allowed for the
-   * direct vfuncs
-   */
-  GTK_WIDGET_GET_CLASS (bin)->get_preferred_width (GTK_WIDGET (bin), &hmin, &hnat);
-  GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin), 
-						   GTK_ORIENTATION_HORIZONTAL, &hmin, &hnat);
-
-  GTK_WIDGET_GET_CLASS (bin)->get_preferred_height (GTK_WIDGET (bin), &vmin, &vnat);
-  GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin), 
-						   GTK_ORIENTATION_VERTICAL, &vmin, &vnat);
-
-  gtk_widget_get_preferred_width (priv->child, &child_hmin, NULL);
-  gtk_widget_get_preferred_height (priv->child, &child_vmin, NULL);
-
-  *delta_h = hmin - child_hmin;
-  *delta_v = vmin - child_vmin;
-}
-
 static void
 gtk_bin_get_preferred_width (GtkWidget *widget,
                             gint      *minimum_width,
@@ -287,25 +249,25 @@ gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
 {
  GtkBin *bin = GTK_BIN (widget);
  GtkBinPrivate *priv = bin->priv;
-  gint    hdelta, vdelta, child_min, child_nat;
+  gint border_width;

  *minimum_width = 0;
  *natural_width = 0;

+  border_width = gtk_bin_get_effective_border_width (bin);
+
  if (priv->child && gtk_widget_get_visible (priv->child))
    {
-      get_child_padding_delta (bin, &hdelta, &vdelta);
-
-      gtk_widget_get_preferred_width_for_height (priv->child,
-                                                 height - vdelta,
+      gint child_min, child_nat;
+      gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width,
                                                 &child_min, &child_nat);

-      if (minimum_width)
-	*minimum_width = child_min + hdelta;
-      
-      if (natural_width)
-	*natural_width = child_nat + hdelta;
+      *minimum_width = child_min;
+      *natural_width = child_nat;
    }
+
+  *minimum_width += 2 * border_width;
+  *natural_width += 2 * border_width;
 }

 static void
@@ -316,25 +278,25 @@ gtk_bin_get_preferred_height_for_width  (GtkWidget *widget,
 {
  GtkBin *bin = GTK_BIN (widget);
  GtkBinPrivate *priv = bin->priv;
-  gint    hdelta, vdelta, child_min, child_nat;
+  gint border_width;

  *minimum_height = 0;
  *natural_height = 0;

+  border_width = gtk_bin_get_effective_border_width (bin);
+
  if (priv->child && gtk_widget_get_visible (priv->child))
    {
-      get_child_padding_delta (bin, &hdelta, &vdelta);
-
-      gtk_widget_get_preferred_height_for_width (priv->child,
-                                                 width - hdelta,
+      gint child_min, child_nat;
+      gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width,
                                                 &child_min, &child_nat);

-      if (minimum_height)
-	*minimum_height = child_min + vdelta;
-      
-      if (natural_height)
-	*natural_height = child_nat + vdelta;
+      *minimum_height = child_min;
+      *natural_height = child_nat;
    }
+
+  *minimum_height += 2 * border_width;
+  *natural_height += 2 * border_width;
 }

 static void
@@ -94,7 +94,8 @@ enum {
  PROP_0,
  PROP_ORIENTATION,
  PROP_SPACING,
-  PROP_HOMOGENEOUS
+  PROP_HOMOGENEOUS,
+  PROP_BASELINE_POSITION
 };

 enum {
@@ -116,6 +117,7 @@ struct _GtkBoxPrivate
  guint           default_expand : 1;
  guint           homogeneous    : 1;
  guint           spacing_set    : 1;
+  guint           baseline_pos   : 2;
 };

 typedef struct _GtkBoxChild        GtkBoxChild;
@@ -200,6 +202,12 @@ static void               gtk_box_get_preferred_height_for_width (GtkWidget
                                                                  gint                 width,
                                                                  gint                *minimum_height,
                                                                  gint                *natural_height);
+static void  gtk_box_get_preferred_height_and_baseline_for_width (GtkWidget           *widget,
+								  gint                 width,
+								  gint                *minimum_height,
+								  gint                *natural_height,
+								  gint                *minimum_baseline,
+								  gint                *natural_baseline);


 G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
@@ -220,6 +228,7 @@ gtk_box_class_init (GtkBoxClass *class)
  widget_class->get_preferred_width            = gtk_box_get_preferred_width;
  widget_class->get_preferred_height           = gtk_box_get_preferred_height;
  widget_class->get_preferred_height_for_width = gtk_box_get_preferred_height_for_width;
+  widget_class->get_preferred_height_and_baseline_for_width = gtk_box_get_preferred_height_and_baseline_for_width;
  widget_class->get_preferred_width_for_height = gtk_box_get_preferred_width_for_height;
  widget_class->compute_expand                 = gtk_box_compute_expand;
  widget_class->direction_changed              = gtk_box_direction_changed;
@@ -255,6 +264,15 @@ gtk_box_class_init (GtkBoxClass *class)
 							 FALSE,
 							 GTK_PARAM_READWRITE));

+  g_object_class_install_property (object_class,
+                                   PROP_BASELINE_POSITION,
+                                   g_param_spec_enum ("baseline-position",
+                                                     P_("Baseline position"),
+                                                     P_("The position of the baseline aligned widgets if extra space is availible"),
+                                                     GTK_TYPE_BASELINE_POSITION,
+                                                     GTK_BASELINE_POSITION_CENTER,
+                                                     GTK_PARAM_READWRITE));
+
  /**
   * GtkBox:expand:
   *
@@ -340,6 +358,7 @@ gtk_box_init (GtkBox *box)
  private->homogeneous = FALSE;
  private->spacing = 0;
  private->spacing_set = FALSE;
+  private->baseline_pos = GTK_BASELINE_POSITION_CENTER;
 }

 static void
@@ -361,6 +380,9 @@ gtk_box_set_property (GObject      *object,
    case PROP_SPACING:
      gtk_box_set_spacing (box, g_value_get_int (value));
      break;
+    case PROP_BASELINE_POSITION:
+      gtk_box_set_baseline_position (box, g_value_get_enum (value));
+      break;
    case PROP_HOMOGENEOUS:
      gtk_box_set_homogeneous (box, g_value_get_boolean (value));
      break;
@@ -387,6 +409,9 @@ gtk_box_get_property (GObject    *object,
    case PROP_SPACING:
      g_value_set_int (value, private->spacing);
      break;
+    case PROP_BASELINE_POSITION:
+      g_value_set_enum (value, private->baseline_pos);
+      break;
    case PROP_HOMOGENEOUS:
      g_value_set_boolean (value, private->homogeneous);
      break;
@@ -435,6 +460,11 @@ gtk_box_size_allocate (GtkWidget     *widget,
  GtkTextDirection direction;
  GtkAllocation child_allocation;
  GtkRequestedSize *sizes;
+  gint child_minimum_baseline, child_natural_baseline;
+  gint minimum_above, natural_above;
+  gint minimum_below, natural_below;
+  gboolean have_baseline;
+  gint baseline;

  GtkPackType packing;

@@ -461,6 +491,10 @@ gtk_box_size_allocate (GtkWidget     *widget,
  else
    size = allocation->height - (nvis_children - 1) * private->spacing;

+  have_baseline = FALSE;
+  minimum_above = natural_above = 0;
+  minimum_below = natural_below = 0;
+
  /* Retrieve desired size for visible children. */
  for (i = 0, children = private->children; children; children = children->next)
    {
@@ -475,11 +509,11 @@ gtk_box_size_allocate (GtkWidget     *widget,
                                                   &sizes[i].minimum_size,
                                                   &sizes[i].natural_size);
      else
-	gtk_widget_get_preferred_height_for_width (child->widget,
-                                                   allocation->width,
-                                                   &sizes[i].minimum_size,
-                                                   &sizes[i].natural_size);
-
+	gtk_widget_get_preferred_height_and_baseline_for_width (child->widget,
+								allocation->width,
+								&sizes[i].minimum_size,
+								&sizes[i].natural_size,
+								NULL, NULL);

      /* Assert the api is working properly */
      if (sizes[i].minimum_size < 0)
@@ -537,28 +571,9 @@ gtk_box_size_allocate (GtkWidget     *widget,
 	extra = 0;
    }

-  /* Allocate child positions. */
+  /* Allocate child sizes. */
  for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
    {
-      if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
-	{
-	  child_allocation.y = allocation->y;
-	  child_allocation.height = MAX (1, allocation->height);
-	  if (packing == GTK_PACK_START)
-	    x = allocation->x;
-	  else
-	    x = allocation->x + allocation->width;
-	}
-      else
-	{
-	  child_allocation.x = allocation->x;
-	  child_allocation.width = MAX (1, allocation->width);
-	  if (packing == GTK_PACK_START)
-	    y = allocation->y;
-	  else
-	    y = allocation->y + allocation->height;
-	}
-
      for (i = 0, children = private->children;
 	   children;
 	   children = children->next)
@@ -605,6 +620,105 @@ gtk_box_size_allocate (GtkWidget     *widget,
 		}
 	    }

+	  sizes[i].natural_size = child_size;
+
+	  if (private->orientation == GTK_ORIENTATION_HORIZONTAL &&
+	      gtk_widget_get_valign_with_baseline (child->widget) == GTK_ALIGN_BASELINE)
+	    {
+	      int child_allocation_width;
+	      int child_minimum_height, child_natural_height;
+
+	      if (child->fill)
+		child_allocation_width = MAX (1, child_size - child->padding * 2);
+	      else
+		child_allocation_width = sizes[i].minimum_size;
+
+	      child_minimum_baseline = -1;
+	      child_natural_baseline = -1;
+	      gtk_widget_get_preferred_height_and_baseline_for_width (child->widget,
+								      child_allocation_width,
+								      &child_minimum_height, &child_natural_height,
+								      &child_minimum_baseline, &child_natural_baseline);
+
+	      if (child_minimum_baseline >= 0)
+		{
+		  have_baseline = TRUE;
+		  minimum_below = MAX (minimum_below, child_minimum_height - child_minimum_baseline);
+		  natural_below = MAX (natural_below, child_natural_height - child_natural_baseline);
+		  minimum_above = MAX (minimum_above, child_minimum_baseline);
+		  natural_above = MAX (natural_above, child_natural_baseline);
+		}
+	    }
+
+	  i++;
+	}
+    }
+
+  baseline = gtk_widget_get_allocated_baseline (widget);
+  if (baseline == -1 && have_baseline)
+    {
+      gint height = MAX (1, allocation->height);
+
+      /* TODO: This is purely based on the minimum baseline, when things fit we should
+	 use the natural one? */
+
+      switch (private->baseline_pos)
+	{
+	case GTK_BASELINE_POSITION_TOP:
+	  baseline = minimum_above;
+	  break;
+	case GTK_BASELINE_POSITION_CENTER:
+	  baseline = minimum_above + (height - (minimum_above + minimum_below)) / 2;
+	  break;
+	case GTK_BASELINE_POSITION_BOTTOM:
+	  baseline = height - minimum_below;
+	  break;
+	}
+    }
+
+  /* Allocate child positions. */
+  for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
+    {
+      if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+	{
+	  child_allocation.y = allocation->y;
+	  child_allocation.height = MAX (1, allocation->height);
+	  if (packing == GTK_PACK_START)
+	    x = allocation->x;
+	  else
+	    x = allocation->x + allocation->width;
+	}
+      else
+	{
+	  child_allocation.x = allocation->x;
+	  child_allocation.width = MAX (1, allocation->width);
+	  if (packing == GTK_PACK_START)
+	    y = allocation->y;
+	  else
+	    y = allocation->y + allocation->height;
+	}
+
+      for (i = 0, children = private->children;
+	   children;
+	   children = children->next)
+	{
+	  child = children->data;
+
+	  /* If widget is not visible, skip it. */
+	  if (!gtk_widget_get_visible (child->widget))
+	    continue;
+
+	  /* If widget is packed differently skip it, but still increment i,
+	   * since widget is visible and will be handled in next loop iteration.
+	   */
+	  if (child->pack != packing)
+	    {
+	      i++;
+	      continue;
+	    }
+
+	  child_size = sizes[i].natural_size;
+
 	  /* Assign the child's position. */
 	  if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
 	    {
@@ -658,7 +772,7 @@ gtk_box_size_allocate (GtkWidget     *widget,
 		  child_allocation.y -= child_size;
 		}
 	    }
-	  gtk_widget_size_allocate (child->widget, &child_allocation);
+	  gtk_widget_size_allocate_with_baseline (child->widget, &child_allocation, baseline);

 	  i++;
 	}
@@ -1015,18 +1129,28 @@ static void
 gtk_box_get_size (GtkWidget      *widget,
 		  GtkOrientation  orientation,
 		  gint           *minimum_size,
-		  gint           *natural_size)
+		  gint           *natural_size,
+		  gint           *minimum_baseline,
+		  gint           *natural_baseline)
 {
  GtkBox *box;
  GtkBoxPrivate *private;
  GList *children;
  gint nvis_children;
  gint minimum, natural;
+  gint minimum_above, natural_above;
+  gint minimum_below, natural_below;
+  gboolean have_baseline;
+  gint min_baseline, nat_baseline;

  box = GTK_BOX (widget);
  private = box->priv;

+  have_baseline = FALSE;
  minimum = natural = 0;
+  minimum_above = natural_above = 0;
+  minimum_below = natural_below = 0;
+  min_baseline = nat_baseline = -1;

  nvis_children = 0;

@@ -1037,13 +1161,15 @@ gtk_box_get_size (GtkWidget      *widget,
      if (gtk_widget_get_visible (child->widget))
        {
          gint child_minimum, child_natural;
+          gint child_minimum_baseline = -1, child_natural_baseline = -1;

 	  if (orientation == GTK_ORIENTATION_HORIZONTAL)
 	    gtk_widget_get_preferred_width (child->widget,
                                            &child_minimum, &child_natural);
 	  else
-	    gtk_widget_get_preferred_height (child->widget,
-                                             &child_minimum, &child_natural);
+	    gtk_widget_get_preferred_height_and_baseline_for_width (child->widget, -1,
+								    &child_minimum, &child_natural,
+								    &child_minimum_baseline, &child_natural_baseline);

          if (private->orientation == orientation)
 	    {
@@ -1065,9 +1191,20 @@ gtk_box_get_size (GtkWidget      *widget,
 	    }
 	  else
 	    {
-	      /* The biggest mins and naturals in the opposing orientation */
-              minimum = MAX (minimum, child_minimum);
-              natural = MAX (natural, child_natural);
+	      if (child_minimum_baseline >= 0)
+		{
+		  have_baseline = TRUE;
+		  minimum_below = MAX (minimum_below, child_minimum - child_minimum_baseline);
+		  natural_below = MAX (natural_below, child_natural - child_natural_baseline);
+		  minimum_above = MAX (minimum_above, child_minimum_baseline);
+		  natural_above = MAX (natural_above, child_natural_baseline);
+		}
+	      else
+		{
+		  /* The biggest mins and naturals in the opposing orientation */
+		  minimum = MAX (minimum, child_minimum);
+		  natural = MAX (natural, child_natural);
+		}
 	    }

          nvis_children += 1;
@@ -1085,11 +1222,23 @@ gtk_box_get_size (GtkWidget      *widget,
      natural += (nvis_children - 1) * private->spacing;
    }

+  if (have_baseline)
+    {
+      min_baseline = minimum_above;
+      nat_baseline = natural_above;
+    }
+
  if (minimum_size)
-    *minimum_size = minimum;
+    *minimum_size = MAX (minimum, minimum_below + minimum_above);

  if (natural_size)
-    *natural_size = natural;
+    *natural_size = MAX (natural, natural_below + natural_above);
+
+  if (minimum_baseline)
+    *minimum_baseline = min_baseline;
+
+  if (natural_baseline)
+    *natural_baseline = nat_baseline;
 }

 static void
@@ -1097,7 +1246,7 @@ gtk_box_get_preferred_width (GtkWidget *widget,
                             gint      *minimum_size,
                             gint      *natural_size)
 {
-  gtk_box_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+  gtk_box_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size, NULL, NULL);
 }

 static void
@@ -1105,14 +1254,16 @@ gtk_box_get_preferred_height (GtkWidget *widget,
                              gint      *minimum_size,
                              gint      *natural_size)
 {
-  gtk_box_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+  gtk_box_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size, NULL, NULL);
 }

 static void
 gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
 					       gint    avail_size,
 					       gint   *minimum_size,
-					       gint   *natural_size)
+					       gint   *natural_size,
+					       gint   *minimum_baseline,
+					       gint   *natural_baseline)
 {
  GtkBoxPrivate       *private = box->priv;
  GtkBoxChild      *child;
@@ -1120,11 +1271,16 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
  gint              nvis_children;
  gint              nexpand_children;
  gint              computed_minimum = 0, computed_natural = 0;
+  gint              computed_minimum_above = 0, computed_natural_above = 0;
+  gint              computed_minimum_below = 0, computed_natural_below = 0;
+  gint              computed_minimum_baseline = -1, computed_natural_baseline = -1;
  GtkRequestedSize *sizes;
  GtkPackType       packing;
  gint              size, extra, i;
  gint              child_size, child_minimum, child_natural;
+  gint              child_minimum_baseline, child_natural_baseline;
  gint              n_extra_widgets = 0;
+  gboolean          have_baseline;

  count_expand_children (box, &nvis_children, &nexpand_children);

@@ -1199,6 +1355,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
 	extra = 0;
    }

+  have_baseline = FALSE;
  /* Allocate child positions. */
  for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
    {
@@ -1260,26 +1417,64 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
 		}


+	      child_minimum_baseline = child_natural_baseline = -1;
 	      /* Assign the child's position. */
 	      if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
-		gtk_widget_get_preferred_height_for_width (child->widget,
-                                                           child_size, &child_minimum, &child_natural);
+		gtk_widget_get_preferred_height_and_baseline_for_width (child->widget, child_size,
+									&child_minimum, &child_natural,
+									&child_minimum_baseline, &child_natural_baseline);
 	      else /* (private->orientation == GTK_ORIENTATION_VERTICAL) */
 		gtk_widget_get_preferred_width_for_height (child->widget,
                                                           child_size, &child_minimum, &child_natural);

-
-	      computed_minimum = MAX (computed_minimum, child_minimum);
-	      computed_natural = MAX (computed_natural, child_natural);
+	      if (child_minimum_baseline >= 0)
+		{
+		  have_baseline = TRUE;
+		  computed_minimum_below = MAX (computed_minimum_below, child_minimum - child_minimum_baseline);
+		  computed_natural_below = MAX (computed_natural_below, child_natural - child_natural_baseline);
+		  computed_minimum_above = MAX (computed_minimum_above, child_minimum_baseline);
+		  computed_natural_above = MAX (computed_natural_above, child_natural_baseline);
+		}
+	      else
+		{
+		  computed_minimum = MAX (computed_minimum, child_minimum);
+		  computed_natural = MAX (computed_natural, child_natural);
+		}
 	    }
 	  i += 1;
 	}
    }

+  if (have_baseline)
+    {
+      computed_minimum = MAX (computed_minimum, computed_minimum_below + computed_minimum_above);
+      computed_natural = MAX (computed_natural, computed_natural_below + computed_natural_above);
+      switch (private->baseline_pos)
+	{
+	case GTK_BASELINE_POSITION_TOP:
+	  computed_minimum_baseline = computed_minimum_above;
+	  computed_natural_baseline = computed_natural_above;
+	  break;
+	case GTK_BASELINE_POSITION_CENTER:
+	  computed_minimum_baseline = computed_minimum_above + MAX((computed_minimum - (computed_minimum_above + computed_minimum_below)) / 2, 0);
+	  computed_natural_baseline = computed_natural_above + MAX((computed_natural - (computed_natural_above + computed_natural_below)) / 2, 0);
+	  break;
+	case GTK_BASELINE_POSITION_BOTTOM:
+	  computed_minimum_baseline = computed_minimum - computed_minimum_below;
+	  computed_natural_baseline = computed_natural - computed_natural_below;
+	  break;
+	}
+    }
+
+  if (minimum_baseline)
+    *minimum_baseline = computed_minimum_baseline;
+  if (natural_baseline)
+    *natural_baseline = computed_natural_baseline;
+
  if (minimum_size)
    *minimum_size = computed_minimum;
  if (natural_size)
-    *natural_size = computed_natural;
+    *natural_size = MAX (computed_natural, computed_natural_below + computed_natural_above);
 }

 static void
@@ -1355,24 +1550,46 @@ gtk_box_get_preferred_width_for_height (GtkWidget *widget,
  GtkBoxPrivate *private = box->priv;

  if (private->orientation == GTK_ORIENTATION_VERTICAL)
-    gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width);
+    gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width, NULL, NULL);
  else
    gtk_box_compute_size_for_orientation (box, height, minimum_width, natural_width);
 }

+static void
+gtk_box_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
+						     gint       width,
+						     gint      *minimum_height,
+						     gint      *natural_height,
+						     gint      *minimum_baseline,
+						     gint      *natural_baseline)
+{
+  GtkBox        *box     = GTK_BOX (widget);
+  GtkBoxPrivate *private = box->priv;
+
+  if (width < 0)
+    gtk_box_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_height, natural_height, minimum_baseline, natural_baseline);
+  else
+    {
+      if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+	gtk_box_compute_size_for_opposing_orientation (box, width, minimum_height, natural_height, minimum_baseline, natural_baseline);
+      else
+	{
+	  if (minimum_baseline)
+	    *minimum_baseline = -1;
+	  if (natural_baseline)
+	    *natural_baseline = -1;
+	  gtk_box_compute_size_for_orientation (box, width, minimum_height, natural_height);
+	}
+    }
+}
+
 static void
 gtk_box_get_preferred_height_for_width (GtkWidget *widget,
                                        gint       width,
                                        gint      *minimum_height,
                                        gint      *natural_height)
 {
-  GtkBox        *box     = GTK_BOX (widget);
-  GtkBoxPrivate *private = box->priv;
-
-  if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
-    gtk_box_compute_size_for_opposing_orientation (box, width, minimum_height, natural_height);
-  else
-    gtk_box_compute_size_for_orientation (box, width, minimum_height, natural_height);
+  gtk_box_get_preferred_height_and_baseline_for_width (widget, width, minimum_height, natural_height, NULL, NULL);
 }

 /**
@@ -1550,6 +1767,35 @@ gtk_box_get_spacing (GtkBox *box)
  return box->priv->spacing;
 }

+void
+gtk_box_set_baseline_position (GtkBox             *box,
+			       GtkBaselinePosition position)
+{
+  GtkBoxPrivate *private;
+
+  g_return_if_fail (GTK_IS_BOX (box));
+
+  private = box->priv;
+
+  if (position != private->baseline_pos)
+    {
+      private->baseline_pos = position;
+
+      g_object_notify (G_OBJECT (box), "baseline-position");
+
+      gtk_widget_queue_resize (GTK_WIDGET (box));
+    }
+}
+
+GtkBaselinePosition
+gtk_box_get_baseline_position (GtkBox         *box)
+{
+  g_return_val_if_fail (GTK_IS_BOX (box), GTK_BASELINE_POSITION_CENTER);
+
+  return box->priv->baseline_pos;
+}
+
+
 void
 _gtk_box_set_spacing_set (GtkBox  *box,
                          gboolean spacing_set)
@@ -89,6 +89,9 @@ gboolean    gtk_box_get_homogeneous     (GtkBox         *box);
 void        gtk_box_set_spacing         (GtkBox         *box,
                                         gint            spacing);
 gint        gtk_box_get_spacing         (GtkBox         *box);
+void        gtk_box_set_baseline_position (GtkBox             *box,
+					   GtkBaselinePosition position);
+GtkBaselinePosition gtk_box_get_baseline_position (GtkBox         *box);

 void        gtk_box_reorder_child       (GtkBox         *box,
                                         GtkWidget      *child,
@@ -1355,6 +1355,12 @@ gtk_builder_get_translation_domain (GtkBuilder *builder)
 *
 * Add @object to the @builder object pool so it can be referenced just like any
 * other object built by builder.
+ *
+ * To make this function even more useful a new special entry point element
+ * &lt;external-object&gt; is defined. It is similar to &lt;object&gt; but has 
+ * to reference an external object exposed with this function.
+ * This way you can change properties and even add children to an
+ * external object using builder, not just reference it.
 * 
 * Since: 3.8
 **/
@@ -170,6 +170,12 @@ static void gtk_button_get_preferred_width       (GtkWidget           *widget,
 static void gtk_button_get_preferred_height      (GtkWidget           *widget,
 						  gint                *minimum_size,
 						  gint                *natural_size);
+static void gtk_button_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
+								    gint       width,
+								    gint      *minimum_size,
+								    gint      *natural_size,
+								    gint      *minimum_baseline,
+								    gint      *natural_baseline);
  
 static guint button_signals[LAST_SIGNAL] = { 0 };

@@ -196,6 +202,7 @@ gtk_button_class_init (GtkButtonClass *klass)

  widget_class->get_preferred_width  = gtk_button_get_preferred_width;
  widget_class->get_preferred_height = gtk_button_get_preferred_height;
+  widget_class->get_preferred_height_and_baseline_for_width = gtk_button_get_preferred_height_and_baseline_for_width;
  widget_class->destroy = gtk_button_destroy;
  widget_class->screen_changed = gtk_button_screen_changed;
  widget_class->realize = gtk_button_realize;
@@ -1150,11 +1157,15 @@ gtk_button_construct_child (GtkButton *button)
      else
 	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, image_spacing);

+      gtk_widget_set_valign (box, GTK_ALIGN_BASELINE);
+
      if (priv->align_set)
 	align = gtk_alignment_new (priv->xalign, priv->yalign, 0.0, 0.0);
      else
 	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);

+      gtk_widget_set_valign (align, GTK_ALIGN_BASELINE);
+
      if (priv->image_position == GTK_POS_LEFT ||
 	  priv->image_position == GTK_POS_TOP)
 	gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
@@ -1172,6 +1183,8 @@ gtk_button_construct_child (GtkButton *button)
          else
            label = gtk_label_new (label_text);

+	  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+
 	  if (priv->image_position == GTK_POS_RIGHT ||
 	      priv->image_position == GTK_POS_BOTTOM)
 	    gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
@@ -1196,6 +1209,8 @@ gtk_button_construct_child (GtkButton *button)
  else
    label = gtk_label_new (priv->label_text);

+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+
  if (priv->align_set)
    gtk_misc_set_alignment (GTK_MISC (label), priv->xalign, priv->yalign);

@@ -1584,6 +1599,7 @@ gtk_button_size_allocate (GtkWidget     *widget,
  GtkBorder border;
  gint focus_width;
  gint focus_pad;
+  gint baseline;

  context = gtk_widget_get_style_context (widget);

@@ -1651,7 +1667,10 @@ gtk_button_size_allocate (GtkWidget     *widget,
      child_allocation.width  = MAX (1, child_allocation.width);
      child_allocation.height = MAX (1, child_allocation.height);

-      gtk_widget_size_allocate (child, &child_allocation);
+      baseline = gtk_widget_get_allocated_baseline (widget);
+      if (baseline != -1)
+	baseline -= child_allocation.y - allocation->y;
+      gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
    }
 }

@@ -1784,13 +1803,10 @@ gtk_button_button_press (GtkWidget      *widget,
 	gtk_widget_grab_focus (widget);

      if (event->button == GDK_BUTTON_PRIMARY)
-        {
-          g_signal_emit (button, button_signals[PRESSED], 0);
-          return GDK_EVENT_STOP;
-        }
+        g_signal_emit (button, button_signals[PRESSED], 0);
    }

-  return GDK_EVENT_PROPAGATE;
+  return TRUE;
 }

 static gboolean
@@ -1803,10 +1819,9 @@ gtk_button_button_release (GtkWidget      *widget,
    {
      button = GTK_BUTTON (widget);
      g_signal_emit (button, button_signals[RELEASED], 0);
-      return GDK_EVENT_STOP;
    }

-  return GDK_EVENT_PROPAGATE;
+  return TRUE;
 }

 static gboolean
@@ -1822,15 +1837,13 @@ gtk_button_touch (GtkWidget     *widget,
        gtk_widget_grab_focus (widget);

      g_signal_emit (button, button_signals[PRESSED], 0);
-      return GDK_EVENT_STOP;
    }
  else if (event->type == GDK_TOUCH_END)
    {
      g_signal_emit (button, button_signals[RELEASED], 0);
-      return GDK_EVENT_STOP;
    }

-  return GDK_EVENT_PROPAGATE;
+  return TRUE;
 }

 static gboolean
@@ -2069,7 +2082,9 @@ static void
 gtk_button_get_size (GtkWidget      *widget,
 		     GtkOrientation  orientation,
 		     gint           *minimum_size,
-		     gint           *natural_size)
+		     gint           *natural_size,
+		     gint           *minimum_baseline,
+		     gint           *natural_baseline)
 {
  GtkButton *button = GTK_BUTTON (widget);
  GtkStyleContext *context;
@@ -2080,6 +2095,7 @@ gtk_button_get_size (GtkWidget      *widget,
  gint focus_width;
  gint focus_pad;
  gint minimum, natural;
+  gint top_offset;

  context = gtk_widget_get_style_context (widget);

@@ -2090,6 +2106,8 @@ gtk_button_get_size (GtkWidget      *widget,
                               "focus-padding", &focus_pad,
                               NULL);

+  top_offset = 0;
+
  if (orientation == GTK_ORIENTATION_HORIZONTAL)
    {
      minimum = padding.left + padding.right +
@@ -2103,9 +2121,14 @@ gtk_button_get_size (GtkWidget      *widget,
      minimum = padding.top + padding.bottom +
        border.top + border.bottom;

+      top_offset = padding.top + border.top + focus_width + focus_pad;
+
      if (gtk_widget_get_can_default (GTK_WIDGET (widget)))
-	minimum += default_border.top + default_border.bottom;
-    }  
+	{
+	  minimum += default_border.top + default_border.bottom;
+	  top_offset += default_border.top;
+	}
+    }

  minimum += 2 * (focus_width + focus_pad);
  natural = minimum;
@@ -2114,11 +2137,17 @@ gtk_button_get_size (GtkWidget      *widget,
      gtk_widget_get_visible (child))
    {
      gint child_min, child_nat;
+      gint child_min_baseline = -1, child_nat_baseline = -1;

      if (orientation == GTK_ORIENTATION_HORIZONTAL)
 	gtk_widget_get_preferred_width (child, &child_min, &child_nat);
      else
-	gtk_widget_get_preferred_height (child, &child_min, &child_nat);
+	gtk_widget_get_preferred_height_and_baseline_for_width (child, -1, &child_min, &child_nat, &child_min_baseline, &child_nat_baseline);
+
+      if (minimum_baseline && child_min_baseline >= 0)
+	*minimum_baseline = child_min_baseline + top_offset;
+      if (natural_baseline && child_nat_baseline >= 0)
+	*natural_baseline = child_nat_baseline + top_offset;

      minimum += child_min;
      natural += child_nat;
@@ -2136,7 +2165,7 @@ gtk_button_get_preferred_width (GtkWidget *widget,
                                gint      *minimum_size,
                                gint      *natural_size)
 {
-  gtk_button_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+  gtk_button_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size, NULL, NULL);
 }

 static void 
@@ -2144,7 +2173,20 @@ gtk_button_get_preferred_height (GtkWidget *widget,
                                 gint      *minimum_size,
                                 gint      *natural_size)
 {
-  gtk_button_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+  gtk_button_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size, NULL, NULL);
+}
+
+static void
+gtk_button_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
+							gint       width,
+							gint      *minimum_size,
+							gint      *natural_size,
+							gint      *minimum_baseline,
+							gint      *natural_baseline)
+{
+  /* GtkButton is GTK_SIZE_REQUEST_CONSTANT mode, so width will be -1 all the time */
+  g_assert (width == -1);
+  gtk_button_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size, minimum_baseline, natural_baseline);
 }

 /**
@@ -3440,7 +3440,7 @@ gtk_cell_area_activate_cell (GtkCellArea          *area,
          /* If the signal was successfully handled start the editing */
          if (gtk_widget_get_parent (GTK_WIDGET (editable_widget)))
            {
-              gtk_cell_editable_start_editing (editable_widget, event);
+              gtk_cell_editable_start_editing (editable_widget, NULL);
              gtk_widget_grab_focus (GTK_WIDGET (editable_widget));
            }
          else
@@ -53,6 +53,7 @@
 struct _GtkCheckMenuItemPrivate
 {
  guint active             : 1;
+  guint always_show_toggle : 1;
  guint draw_as_radio      : 1;
  guint inconsistent       : 1;
 };
@@ -466,6 +467,7 @@ gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
  priv = check_menu_item->priv; 

  priv->active = FALSE;
+  priv->always_show_toggle = TRUE;
 }

 static gint
@@ -554,29 +556,34 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,

      y = (allocation.height - indicator_size) / 2;

-      gtk_style_context_save (context);
-
-      if (priv->inconsistent)
-        state |= GTK_STATE_FLAG_INCONSISTENT;
-      else if (priv->active)
-        state |= GTK_STATE_FLAG_ACTIVE;
-
-      gtk_style_context_set_state (context, state);
-
-      if (priv->draw_as_radio)
+      if (priv->active ||
+          priv->always_show_toggle ||
+          (state & GTK_STATE_FLAG_PRELIGHT))
        {
-          gtk_style_context_add_class (context, GTK_STYLE_CLASS_RADIO);
-          gtk_render_option (context, cr, x, y,
-                             indicator_size, indicator_size);
-        }
-      else
-        {
-          gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
-          gtk_render_check (context, cr, x, y,
-                            indicator_size, indicator_size);
-        }
+          gtk_style_context_save (context);

-      gtk_style_context_restore (context);
+          if (priv->inconsistent)
+            state |= GTK_STATE_FLAG_INCONSISTENT;
+          else if (priv->active)
+            state |= GTK_STATE_FLAG_ACTIVE;
+
+          gtk_style_context_set_state (context, state);
+
+          if (priv->draw_as_radio)
+            {
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_RADIO);
+              gtk_render_option (context, cr, x, y,
+                                 indicator_size, indicator_size);
+            }
+          else
+            {
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
+              gtk_render_check (context, cr, x, y,
+                                indicator_size, indicator_size);
+            }
+
+          gtk_style_context_restore (context);
+        }
    }
 }

@@ -108,7 +108,7 @@ static GtkClipboard *clipboard_peek       (GdkDisplay       *display,
  memset (&selection_data, 0, sizeof (GtkSelectionData));

  selection_data.selection = clipboard->selection;
-  selection_data.target = gdk_quartz_pasteboard_type_to_atom_libgtk_only (type);
+  selection_data.target = _gtk_quartz_pasteboard_type_to_atom (type);
  selection_data.display = gdk_display_get_default ();
  selection_data.length = -1;

@@ -96,6 +96,7 @@ selected_cb (GtkButton *button,
             GtkDialog *dialog)
 {
  save_color (GTK_COLOR_CHOOSER_DIALOG (dialog));
+  gtk_dialog_response (dialog, GTK_RESPONSE_OK);
 }

 static void
@@ -151,7 +152,8 @@ gtk_color_chooser_dialog_init (GtkColorChooserDialog *cc)
                    G_CALLBACK (selected_cb), dialog);
  gtk_widget_set_can_default (priv->select_button, TRUE);
  gtk_widget_show (priv->select_button);
-  gtk_dialog_add_action_widget (dialog, priv->select_button, GTK_RESPONSE_OK);
+  gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (dialog)),
+                    priv->select_button, FALSE, TRUE, 0);
  gtk_widget_grab_default (priv->select_button);

  gtk_dialog_set_alternative_button_order (dialog,
@@ -2331,19 +2331,6 @@ popup_grab_on_window (GdkWindow *window,
  return TRUE;
 }

-static gboolean
-gtk_combo_box_grab_broken_event (GtkWidget          *widget,
-                                 GdkEventGrabBroken *event,
-                                 gpointer            user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  if (event->grab_window == NULL)
-    gtk_combo_box_popdown (combo_box);
-
-  return TRUE;
-}
-
 /**
 * gtk_combo_box_popup:
 * @combo_box: a #GtkComboBox
@@ -2468,11 +2455,6 @@ gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
  gtk_device_grab_add (priv->popup_window, pointer, TRUE);
  priv->grab_pointer = pointer;
  priv->grab_keyboard = keyboard;
-
-  g_signal_connect (priv->popup_window,
-                    "grab-broken-event",
-                    G_CALLBACK (gtk_combo_box_grab_broken_event),
-                    combo_box);
 }

 static void
@@ -2539,10 +2521,6 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
  if (!gtk_widget_get_realized (GTK_WIDGET (combo_box)))
    return;

-  if (priv->grab_keyboard)
-    gdk_device_ungrab (priv->grab_keyboard, GDK_CURRENT_TIME);
-  gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
-
  gtk_device_grab_remove (priv->popup_window, priv->grab_pointer);
  gtk_widget_hide (priv->popup_window);
  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button),
@@ -58,8 +58,7 @@
 * The GtkComboBoxText implementation of the GtkBuildable interface
 * supports adding items directly using the &lt;items&gt; element
 * and specifying &lt;item&gt; elements for each item. Each &lt;item&gt;
- * element can specify the "id" corresponding to the appended text and
- * also supports the regular translation attributes "translatable",
+ * element supports the regular translation attributes "translatable",
 * "context" and "comments".
 *
 * <example>
@@ -67,9 +66,9 @@
 * <programlisting><![CDATA[
 * <object class="GtkComboBoxText">
 *   <items>
- *     <item translatable="yes" id="factory">Factory</item>
- *     <item translatable="yes" id="home">Home</item>
- *     <item translatable="yes" id="subway">Subway</item>
+ *     <item translatable="yes">Factory</item>
+ *     <item translatable="yes">Home</item>
+ *     <item translatable="yes">Subway</item>
 *   </items>
 * </object>
 * ]]></programlisting>
@@ -237,6 +236,10 @@ item_end_element (GMarkupParseContext *context,
 	{
 	  gchar *translated;

+	  /* FIXME: This will not use the domain set in the .ui file,
+	   * since the parser is not telling the builder about the domain.
+	   * However, it will work for gtk_builder_set_translation_domain() calls.
+	   */
 	  translated = _gtk_builder_parser_translate (data->domain,
 						      data->context,
 						      data->string->str);
@@ -309,12 +309,17 @@ static void     gtk_container_adjust_size_request  (GtkWidget         *widget,
                                                    GtkOrientation     orientation,
                                                    gint              *minimum_size,
                                                    gint              *natural_size);
+static void     gtk_container_adjust_baseline_request (GtkWidget      *widget,
+						       gint           *minimum_baseline,
+						       gint           *natural_baseline);
 static void     gtk_container_adjust_size_allocation (GtkWidget       *widget,
                                                      GtkOrientation   orientation,
                                                      gint            *minimum_size,
                                                      gint            *natural_size,
                                                      gint            *allocated_pos,
                                                      gint            *allocated_size);
+static void     gtk_container_adjust_baseline_allocation (GtkWidget      *widget,
+							  gint           *baseline);
 static GtkSizeRequestMode gtk_container_get_request_mode (GtkWidget   *widget);

 static gchar* gtk_container_child_default_composite_name (GtkContainer *container,
@@ -444,7 +449,9 @@ gtk_container_class_init (GtkContainerClass *class)
  widget_class->focus = gtk_container_focus;

  widget_class->adjust_size_request = gtk_container_adjust_size_request;
+  widget_class->adjust_baseline_request = gtk_container_adjust_baseline_request;
  widget_class->adjust_size_allocation = gtk_container_adjust_size_allocation;
+  widget_class->adjust_baseline_allocation = gtk_container_adjust_baseline_allocation;
  widget_class->get_request_mode = gtk_container_get_request_mode;

  class->add = gtk_container_add_unimplemented;
@@ -1917,6 +1924,28 @@ gtk_container_adjust_size_request (GtkWidget         *widget,
                                     minimum_size, natural_size);
 }

+static void
+gtk_container_adjust_baseline_request (GtkWidget         *widget,
+				       gint              *minimum_baseline,
+				       gint              *natural_baseline)
+{
+  GtkContainer *container;
+
+  container = GTK_CONTAINER (widget);
+
+  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
+    {
+      int border_width;
+
+      border_width = container->priv->border_width;
+
+      *minimum_baseline += border_width;
+      *natural_baseline += border_width;
+    }
+
+  parent_class->adjust_baseline_request (widget, minimum_baseline, natural_baseline);
+}
+
 static void
 gtk_container_adjust_size_allocation (GtkWidget         *widget,
                                      GtkOrientation     orientation,
@@ -1952,6 +1981,27 @@ gtk_container_adjust_size_allocation (GtkWidget         *widget,
                                        allocated_size);
 }

+static void
+gtk_container_adjust_baseline_allocation (GtkWidget         *widget,
+					  gint              *baseline)
+{
+  GtkContainer *container;
+  int border_width;
+
+  container = GTK_CONTAINER (widget);
+
+  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
+    {
+      border_width = container->priv->border_width;
+
+      if (*baseline >= 0)
+	*baseline -= border_width;
+    }
+
+  parent_class->adjust_baseline_allocation (widget, baseline);
+}
+
+
 typedef struct {
  gint hfw;
  gint wfh;
@@ -140,8 +140,7 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
                              GtkStyleProviderPrivate *provider,
                              GtkCssValue             *current,
                              GtkCssDependencies       current_deps,
-                              GtkCssDependencies      *dependencies,
-                              GSList                  *cycle_list)
+                              GtkCssDependencies      *dependencies)
 {
  GtkCssDependencies unused;
  GtkCssValue *value;
@@ -161,20 +160,12 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
    case COLOR_TYPE_NAME:
      {
 	GtkCssValue *named;
-        GSList cycle = { color, cycle_list };
-
-        /* If color exists in cycle_list, we're currently resolving it.
-         * So we've detected a cycle. */
-        if (g_slist_find (cycle_list, color))
-          return NULL;

        named = _gtk_style_provider_private_get_color (provider, color->sym_col.name);
 	if (named == NULL)
 	  return NULL;

-        value = _gtk_css_color_value_resolve (named, provider, current, current_deps, dependencies, &cycle);
-	if (value == NULL)
-	  return NULL;
+        value = _gtk_css_color_value_resolve (named, provider, current, current_deps, dependencies);
      }

      break;
@@ -184,7 +175,7 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
        GtkHSLA hsla;
 	GdkRGBA shade;

-	val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, current_deps, dependencies, cycle_list);
+	val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, current_deps, dependencies);
 	if (val == NULL)
 	  return NULL;

@@ -206,7 +197,7 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
 	GtkCssValue *val;
 	GdkRGBA alpha;

-	val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, current_deps, dependencies, cycle_list);
+	val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, current_deps, dependencies);
 	if (val == NULL)
 	  return NULL;

@@ -226,13 +217,13 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
 	GdkRGBA color1, color2, res;
        GtkCssDependencies dep1, dep2;

-	val = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, current_deps, &dep1, cycle_list);
+	val = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, current_deps, &dep1);
 	if (val == NULL)
 	  return NULL;
 	color1 = *_gtk_css_rgba_value_get_rgba (val);
 	_gtk_css_value_unref (val);

-	val = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, current_deps, &dep2, cycle_list);
+	val = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, current_deps, &dep2);
 	if (val == NULL)
 	  return NULL;
 	color2 = *_gtk_css_rgba_value_get_rgba (val);
@@ -331,8 +322,7 @@ gtk_css_value_color_compute (GtkCssValue             *value,
                                           provider,
                                           current,
                                           current_deps,
-                                           dependencies,
-                                           NULL);
+                                           dependencies);

  if (resolved == NULL)
    return gtk_css_value_color_get_fallback (property_id, provider, values, parent_values);
@@ -47,8 +47,7 @@ GtkCssValue *   _gtk_css_color_value_resolve            (GtkCssValue
                                                         GtkStyleProviderPrivate *provider,
                                                         GtkCssValue             *current,
                                                         GtkCssDependencies       current_deps,
-                                                         GtkCssDependencies      *dependencies,
-                                                         GSList                  *cycle_list);
+                                                         GtkCssDependencies      *dependencies);


 G_END_DECLS
@@ -471,7 +471,6 @@ gtk_css_image_linear_transition (GtkCssImage *start_image,
  start = GTK_CSS_IMAGE_LINEAR (start_image);

  if (end_image == NULL)
-    return GTK_CSS_IMAGE_CLASS (_gtk_css_image_linear_parent_class)->transition (start_image, end_image, property_id, progress);

  if (!GTK_IS_CSS_IMAGE_LINEAR (end_image))
    return GTK_CSS_IMAGE_CLASS (_gtk_css_image_linear_parent_class)->transition (start_image, end_image, property_id, progress);
@@ -533,15 +533,11 @@
 * the GTK+ theming engine.
 * </para>
 * <para>
- * To set a shadow on an icon, use the icon-shadow property instead,
- * with the same syntax.
- * </para>
- * <para>
 * To set multiple shadows on an element, you can specify a comma-separated list
- * of shadow elements in the text-shadow or icon-shadow property. Shadows are
- * always rendered front-back, i.e. the first shadow specified is on top of the
- * others. Shadows can thus overlay each other, but they can never overlay the
- * text or icon itself, which is always rendered on top of the shadow layer.
+ * of shadow elements in the text-shadow property. Shadows are always rendered
+ * front-back, i.e. the first shadow specified is on top of the others. Shadows
+ * can thus overlay each other, but they can never overlay the text itself,
+ * which is always rendered on top of the shadow layer.
 * </para>
 * </refsect2>
 * <refsect2>
@@ -234,8 +234,7 @@ rgba_value_compute (GtkStyleProviderPrivate *provider,
                                          provider,
                                          _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
                                          GTK_CSS_DEPENDS_ON_COLOR,
-                                          dependencies,
-                                          NULL);
+                                          dependencies);
      if (val != NULL)
        {
          rgba = *_gtk_css_rgba_value_get_rgba (val);
@@ -324,8 +323,7 @@ color_value_compute (GtkStyleProviderPrivate *provider,
                                          provider,
                                          _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
                                          GTK_CSS_DEPENDS_ON_COLOR,
-                                          dependencies,
-                                          NULL);
+                                          dependencies);
      if (val != NULL)
        {
          const GdkRGBA *rgba = _gtk_css_rgba_value_get_rgba (val);
@@ -476,7 +476,7 @@ bindings_value_parse_one (GtkCssParser *parser)
      return NULL;
    }

-  if (g_ascii_strcasecmp (name, "none") == 0)
+  if (g_ascii_strcasecmp (name, "none"))
    {
      name = NULL;
    }
@@ -1254,11 +1254,7 @@ gtk_dialog_set_alternative_button_order_valist (GtkDialog *dialog,
    {
      /* reorder child with response_id to position */
      child = dialog_find_button (dialog, response_id);
-      if (child != NULL)
-        gtk_box_reorder_child (GTK_BOX (priv->action_area), child, position);
-      else
-        g_warning ("%s : no child button with response id %d.", G_STRFUNC,
-                   response_id);
+      gtk_box_reorder_child (GTK_BOX (priv->action_area), child, position);

      response_id = va_arg (args, gint);
      position++;
@@ -1369,11 +1365,7 @@ gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
  {
      /* reorder child with response_id to position */
      child = dialog_find_button (dialog, new_order[position]);
-      if (child != NULL)
-        gtk_box_reorder_child (GTK_BOX (priv->action_area), child, position);
-      else
-        g_warning ("%s : no child button with response id %d.", G_STRFUNC,
-                   new_order[position]);
+      gtk_box_reorder_child (GTK_BOX (priv->action_area), child, position);
    }
 }

@@ -144,7 +144,7 @@ struct _GtkDragFindData
  selection_data.selection = GDK_NONE;
  selection_data.data = NULL;
  selection_data.length = -1;
-  selection_data.target = gdk_quartz_pasteboard_type_to_atom_libgtk_only (type);
+  selection_data.target = _gtk_quartz_pasteboard_type_to_atom (type);
  selection_data.display = gdk_display_get_default ();

  if (gtk_target_list_find (info->target_list, 
@@ -3449,7 +3449,6 @@ gtk_drag_set_icon_surface (GdkDragContext    *context,
    }

  gdk_window_set_background_pattern (gtk_widget_get_window (window), pattern);
-  cairo_pattern_destroy (pattern);

  gtk_drag_set_icon_window (context, window, extents.x, extents.y, TRUE);
 }
@@ -1425,10 +1425,9 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                       PANGO_TYPE_ATTR_LIST,
                                                       GTK_PARAM_READWRITE));

-  /**
-   * GtkEntry:populate-all:
+  /** GtkEntry:populate-all:
   *
-   * If :populate-all is %TRUE, the #GtkEntry::populate-popup
+   * If ::populate-all is %TRUE, the #GtkEntry::populate-popup
   * signal is also emitted for touch popups.
   *
   * Since: 3.8
@@ -1508,7 +1507,7 @@ gtk_entry_class_init (GtkEntryClass *class)
   * to this signal and append your items to the @widget, which
   * will be a #GtkMenu in this case.
   *
-   * If #GtkEntry:populate-all is %TRUE, this signal will
+   * If #GtkEntry::populate-all is %TRUE, this signal will
   * also be emitted to populate touch popups. In this case,
   * @widget will be a different container, e.g. a #GtkToolbar.
   * The signal handler should not make assumptions about the
@@ -5934,7 +5933,6 @@ gtk_entry_create_layout (GtkEntry *entry,
      attr->start_index = 0;
      attr->end_index = G_MAXINT;
      pango_attr_list_insert (tmp_attrs, attr);
-      pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
    }

  if (preedit_length)
@@ -6075,9 +6073,6 @@ draw_text_with_color (GtkEntry *entry,

  get_layout_position (entry, &x, &y);

-  if (show_placeholder_text (entry))
-    pango_layout_set_width (layout, PANGO_SCALE * gdk_window_get_width (entry->priv->text_area));
-
  cairo_move_to (cr, x, y);
  gdk_cairo_set_source_rgba (cr, default_color);
  pango_cairo_show_layout (cr, layout);
@@ -70,7 +70,8 @@ typedef enum
  GTK_ALIGN_FILL,
  GTK_ALIGN_START,
  GTK_ALIGN_END,
-  GTK_ALIGN_CENTER
+  GTK_ALIGN_CENTER,
+  GTK_ALIGN_BASELINE
 } GtkAlign;


@@ -125,6 +126,20 @@ typedef enum
  GTK_FILL   = 1 << 2
 } GtkAttachOptions;

+/**
+ * GtkBaselinePosition:
+ * @GTK_BASELINE_POSITION_TOP:
+ * @GTK_BASELINE_POSITION_CENTER:
+ * @GTK_BASELINE_POSITION_BOTTOM:
+ *
+ */
+typedef enum
+{
+  GTK_BASELINE_POSITION_TOP,
+  GTK_BASELINE_POSITION_CENTER,
+  GTK_BASELINE_POSITION_BOTTOM
+} GtkBaselinePosition;
+
 /**
 * GtkButtonBoxStyle:
 * @GTK_BUTTONBOX_DEFAULT_STYLE: Default packing.
@@ -4112,11 +4112,11 @@ file_list_drag_motion_cb (GtkWidget             *widget,
  return TRUE;
 }

-/* Sensitizes the "Copy file’s location" and other context menu items if there is actually
+/* Sensitizes the "Copy file’s location" context menu item if there is actually
 * a selection active.
 */
 static void
-check_file_list_menu_sensitivity (GtkFileChooserDefault *impl)
+check_copy_file_location_sensitivity (GtkFileChooserDefault *impl)
 {
  GtkTreeSelection *selection;
  gboolean active;
@@ -4129,10 +4129,6 @@ check_file_list_menu_sensitivity (GtkFileChooserDefault *impl)

  if (impl->browse_files_popup_menu_copy_file_location_item)
    gtk_widget_set_sensitive (impl->browse_files_popup_menu_copy_file_location_item, active);
-  if (impl->browse_files_popup_menu_add_shortcut_item)
-    gtk_widget_set_sensitive (impl->browse_files_popup_menu_add_shortcut_item, active);
-  if (impl->browse_files_popup_menu_visit_file_item)
-    gtk_widget_set_sensitive (impl->browse_files_popup_menu_visit_file_item, active);
 }

 static GtkWidget *
@@ -4202,7 +4198,7 @@ file_list_build_popup_menu (GtkFileChooserDefault *impl)
 											 G_CALLBACK (show_size_column_toggled_cb));

  bookmarks_check_add_sensitivity (impl);
-  check_file_list_menu_sensitivity (impl);
+  check_copy_file_location_sensitivity (impl);
 }

 /* Updates the popup menu for the file list, creating it if necessary */
@@ -10070,7 +10066,7 @@ list_selection_changed (GtkTreeSelection      *selection,

  check_preview_change (impl);
  bookmarks_check_add_sensitivity (impl);
-  check_file_list_menu_sensitivity (impl);
+  check_copy_file_location_sensitivity (impl);

  g_signal_emit_by_name (impl, "selection-changed", 0);
 }
@@ -548,12 +548,8 @@ finished_loading_cb (GtkFileSystemModel  *model,

  completion = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
  update_inline_completion (chooser_entry);
-
-  if (gtk_widget_has_focus (GTK_WIDGET (chooser_entry)))
-    {
-      gtk_entry_completion_complete (completion);
-      gtk_entry_completion_insert_prefix (completion);
-    }
+  gtk_entry_completion_complete (completion);
+  gtk_entry_completion_insert_prefix (completion);
 }

 static void
@@ -555,7 +555,7 @@ gtk_font_button_init (GtkFontButton *font_button)
  font_button->priv->use_size = FALSE;
  font_button->priv->show_style = TRUE;
  font_button->priv->show_size = TRUE;
-  font_button->priv->show_preview_entry = TRUE;
+  font_button->priv->show_preview_entry = FALSE;
  font_button->priv->font_dialog = NULL;
  font_button->priv->font_family = NULL;
  font_button->priv->font_face = NULL;
@@ -107,11 +107,11 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
                          GTK_PARAM_READWRITE));

  /**
-   * GtkFontChooser::font-activated:
+   * GtkFontChooserWidget::font-activated:
   * @self: the object which received the signal
   * @fontname: the font name
   *
-   * Emitted when a font is activated.
+   * Emitted when a font is activated from the widget's list.
   * This usually happens when the user double clicks an item,
   * or an item is selected and the user presses one of the keys
   * Space, Shift+Space, Return or Enter.
@@ -520,7 +520,6 @@ _gtk_icon_cache_get_icon_data  (GtkIconCache *cache,
    return NULL;

  data = g_slice_new0 (GtkIconData);
-  data->ref = 1;

  offset = GET_UINT32 (cache->buffer, meta_data_offset);
  if (offset)
@@ -25,7 +25,6 @@ typedef struct _GtkIconData GtkIconData;

 struct _GtkIconData
 {
-  gint ref;
  gboolean has_embedded_rect;
  gint x0, y0, x1, y1;
  
@@ -986,8 +986,8 @@ icon_size_lookup_intern (GtkSettings *settings,
 * @settings: a #GtkSettings object, used to determine
 *   which set of user preferences to used.
 * @size: (type int): an icon size
- * @width: (out) (allow-none): location to store icon width
- * @height: (out) (allow-none): location to store icon height
+ * @width: (out): location to store icon width
+ * @height: (out): location to store icon height
 *
 * Obtains the pixel size of a semantic icon size, possibly
 * modified by user preferences for a particular
@@ -1018,8 +1018,8 @@ gtk_icon_size_lookup_for_settings (GtkSettings *settings,
 /**
 * gtk_icon_size_lookup:
 * @size: (type int): an icon size
- * @width: (out) (allow-none): location to store icon width
- * @height: (out) (allow-none): location to store icon height
+ * @width: (out): location to store icon width
+ * @height: (out): location to store icon height
 *
 * Obtains the pixel size of a semantic icon size, possibly
 * modified by user preferences for the default #GtkSettings.
@@ -204,7 +204,7 @@ struct _GtkIconThemePrivate
  glong last_stat_time;
  GList *dir_mtimes;

-  gulong theme_changed_idle;
+  gulong reset_styles_idle;
 };

 typedef struct {
@@ -351,8 +351,7 @@ static void     blow_themes               (GtkIconTheme    *icon_themes);
 static gboolean rescan_themes             (GtkIconTheme    *icon_themes);

 static GtkIconData *icon_data_dup      (GtkIconData     *icon_data);
-static GtkIconData *icon_data_ref      (GtkIconData     *icon_data);
-static void  icon_data_unref           (GtkIconData     *icon_data);
+static void  icon_data_free            (GtkIconData     *icon_data);
 static void load_icon_data             (IconThemeDir    *dir,
 			                const char      *path,
 			                const char      *name);
@@ -796,7 +795,7 @@ free_dir_mtime (IconThemeDirMtime *dir_mtime)
 }

 static gboolean
-theme_changed_idle (gpointer user_data)
+reset_styles_idle (gpointer user_data)
 {
  GtkIconTheme *icon_theme;
  GtkIconThemePrivate *priv;
@@ -804,27 +803,14 @@ theme_changed_idle (gpointer user_data)
  icon_theme = GTK_ICON_THEME (user_data);
  priv = icon_theme->priv;

-  g_signal_emit (icon_theme, signal_changed, 0);
-
  if (priv->screen && priv->is_screen_singleton)
    gtk_style_context_reset_widgets (priv->screen);

-  priv->theme_changed_idle = 0;
+  priv->reset_styles_idle = 0;

  return FALSE;
 }

-static void
-queue_theme_changed (GtkIconTheme *icon_theme)
-{
-  GtkIconThemePrivate *priv = icon_theme->priv;
-
-  if (!priv->theme_changed_idle)
-    priv->theme_changed_idle =
-      gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE - 2,
-                                 theme_changed_idle, icon_theme, NULL);
-}
-
 static void
 do_theme_change (GtkIconTheme *icon_theme)
 {
@@ -834,13 +820,16 @@ do_theme_change (GtkIconTheme *icon_theme)

  if (!priv->themes_valid)
    return;
-
+  
  GTK_NOTE (ICONTHEME, 
 	    g_print ("change to icon theme \"%s\"\n", priv->current_theme));
  blow_themes (icon_theme);
+  g_signal_emit (icon_theme, signal_changed, 0);

-  queue_theme_changed (icon_theme);
-
+  if (!priv->reset_styles_idle)
+    priv->reset_styles_idle = 
+      gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE - 2, 
+		       reset_styles_idle, icon_theme, NULL);
 }

 static void
@@ -875,10 +864,10 @@ gtk_icon_theme_finalize (GObject *object)
  g_hash_table_destroy (priv->info_cache);
  g_assert (priv->info_cache_lru == NULL);

-  if (priv->theme_changed_idle)
+  if (priv->reset_styles_idle)
    {
-      g_source_remove (priv->theme_changed_idle);
-      priv->theme_changed_idle = 0;
+      g_source_remove (priv->reset_styles_idle);
+      priv->reset_styles_idle = 0;
    }

  unset_screen (icon_theme);
@@ -1410,10 +1399,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)

      if (ABS (tv.tv_sec - priv->last_stat_time) > 5 &&
 	  rescan_themes (icon_theme))
-        {
-          g_hash_table_remove_all (priv->info_cache);
-          blow_themes (icon_theme);
-        }
+	blow_themes (icon_theme);
    }
  
  if (!priv->themes_valid)
@@ -1421,7 +1407,9 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
      load_themes (icon_theme);

      if (was_valid)
-        queue_theme_changed (icon_theme);
+	{
+	  g_signal_emit (icon_theme, signal_changed, 0);
+	}
    }

  priv->loading_themes = FALSE;
@@ -2619,9 +2607,9 @@ theme_lookup_icon (IconTheme          *theme,
          icon_info->filename = NULL;
          icon_info->icon_file = NULL;
        }
-
+      
      if (min_dir->icon_data != NULL)
-        icon_info->data = icon_data_ref (g_hash_table_lookup (min_dir->icon_data, icon_name));
+	icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);

      if (icon_info->data == NULL && min_dir->cache != NULL)
 	{
@@ -2630,9 +2618,9 @@ theme_lookup_icon (IconTheme          *theme,
 	    {
 	      if (min_dir->icon_data == NULL)
 		min_dir->icon_data = g_hash_table_new_full (g_str_hash, g_str_equal,
-							    g_free, (GDestroyNotify)icon_data_unref);
+							    g_free, (GDestroyNotify)icon_data_free);

-	      g_hash_table_replace (min_dir->icon_data, g_strdup (icon_name), icon_data_ref (icon_info->data));
+	      g_hash_table_replace (min_dir->icon_data, g_strdup (icon_name), icon_info->data);
 	    }
 	}

@@ -2647,10 +2635,10 @@ theme_lookup_icon (IconTheme          *theme,
 	    {
 	      if (min_dir->icon_data == NULL)	
 		min_dir->icon_data = g_hash_table_new_full (g_str_hash, g_str_equal,
-							    g_free, (GDestroyNotify)icon_data_unref);
+							    g_free, (GDestroyNotify)icon_data_free);
 	      load_icon_data (min_dir, icon_file_path, icon_file_name);
 	      
-	      icon_info->data = icon_data_ref (g_hash_table_lookup (min_dir->icon_data, icon_name));
+	      icon_info->data = g_hash_table_lookup (min_dir->icon_data, icon_name);
 	    }
 	  g_free (icon_file_name);
 	  g_free (icon_file_path);
@@ -2739,6 +2727,7 @@ load_icon_data (IconThemeDir *dir, const char *path, const char *name)
  int i;
  gint *ivalues;
  GError *error = NULL;
+  
  GtkIconData *data;

  icon_file = g_key_file_new ();
@@ -2753,10 +2742,8 @@ load_icon_data (IconThemeDir *dir, const char *path, const char *name)
  else
    {
      base_name = strip_suffix (name);
-
+      
      data = g_slice_new0 (GtkIconData);
-      data->ref = 1;
-
      /* takes ownership of base_name */
      g_hash_table_replace (dir->icon_data, base_name, data);
      
@@ -2837,7 +2824,7 @@ scan_directory (GtkIconThemePrivate *icon_theme,
 	{
 	  if (dir->icon_data == NULL)
 	    dir->icon_data = g_hash_table_new_full (g_str_hash, g_str_equal,
-						    g_free, (GDestroyNotify)icon_data_unref);
+						    g_free, (GDestroyNotify)icon_data_free);
 	  
 	  path = g_build_filename (full_dir, name, NULL);
 	  if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
@@ -2976,27 +2963,12 @@ theme_subdir_load (GtkIconTheme *icon_theme,
    }
 }

-static GtkIconData *
-icon_data_ref (GtkIconData *icon_data)
-{
-  if (icon_data)
-    icon_data->ref++;
-  return icon_data;
-}
-
 static void
-icon_data_unref (GtkIconData *icon_data)
+icon_data_free (GtkIconData *icon_data)
 {
-  if (icon_data)
-    {
-      icon_data->ref--;
-      if (icon_data->ref == 0)
-        {
-          g_free (icon_data->attach_points);
-          g_free (icon_data->display_name);
-          g_slice_free (GtkIconData, icon_data);
-        }
-    }
+  g_free (icon_data->attach_points);
+  g_free (icon_data->display_name);
+  g_slice_free (GtkIconData, icon_data);
 }

 static GtkIconData *
@@ -3006,7 +2978,6 @@ icon_data_dup (GtkIconData *icon_data)
  if (icon_data)
    {
      dup = g_slice_new0 (GtkIconData);
-      dup->ref = 1;
      *dup = *icon_data;
      if (dup->n_attach_points > 0)
 	{
@@ -3155,7 +3126,6 @@ gtk_icon_info_finalize (GObject *object)
    g_object_unref (icon_info->cache_pixbuf);
  if (icon_info->symbolic_pixbuf_size)
    gtk_requisition_free (icon_info->symbolic_pixbuf_size);
-  icon_data_unref (icon_info->data);

  symbolic_pixbuf_cache_free (icon_info->symbolic_pixbuf_cache);

@@ -3810,9 +3780,7 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
  gchar *css_warning;
  gchar *css_error;
  gchar *data;
-  gchar *width, *height;
-  gchar *file_data, *escaped_file_data;
-  gsize file_len;
+  gchar *width, *height, *uri;
  SymbolicPixbufCache *symbolic_cache;

  if (use_cache)
@@ -3856,13 +3824,14 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
      css_error = gdk_color_to_css (&error_default_color);
    }

-  if (!g_file_get_contents (icon_info->filename, &file_data, &file_len, NULL))
-    return NULL;
-
  if (!icon_info->symbolic_pixbuf_size)
    {
+      stream = G_INPUT_STREAM (g_file_read (icon_info->icon_file, NULL, error));
+
+      if (!stream)
+        return NULL;
+
      /* Fetch size from the original icon */
-      stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL);
      pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
      g_object_unref (stream);

@@ -3877,9 +3846,7 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,

  width = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->width);
  height = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->height);
-
-  escaped_file_data = g_markup_escape_text (file_data, file_len);
-  g_free (file_data);
+  uri = g_file_get_uri (icon_info->icon_file);

  data = g_strconcat ("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
                      "<svg version=\"1.1\"\n"
@@ -3901,16 +3868,16 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
                      "      fill: ", css_success, " !important;\n"
                      "    }\n"
                      "  </style>\n"
-                      "  <xi:include href=\"data:text/xml,", escaped_file_data, "\"/>\n"
+                      "  <xi:include href=\"", uri, "\"/>\n"
                      "</svg>",
                      NULL);
-  g_free (escaped_file_data);
  g_free (css_fg);
  g_free (css_warning);
  g_free (css_error);
  g_free (css_success);
  g_free (width);
  g_free (height);
+  g_free (uri);

  stream = g_memory_input_stream_new_from_data (data, -1, g_free);
  pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
@@ -4884,40 +4851,7 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *icon_theme,
  g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
  g_return_val_if_fail (G_IS_ICON (icon), NULL);

-  if (GDK_IS_PIXBUF (icon))
-    {
-      GdkPixbuf *pixbuf;
-
-      pixbuf = GDK_PIXBUF (icon);
-
-      if ((flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0)
-        {
-          gint width, height, max;
-          gdouble scale;
-          GdkPixbuf *scaled;
-
-          width = gdk_pixbuf_get_width (pixbuf);
-          height = gdk_pixbuf_get_height (pixbuf);
-          max = MAX (width, height);
-          scale = (gdouble) size / (gdouble) max;
-
-          scaled = gdk_pixbuf_scale_simple (pixbuf,
-                                            0.5 + width * scale,
-                                            0.5 + height * scale,
-                                            GDK_INTERP_BILINEAR);
-
-          info = gtk_icon_info_new_for_pixbuf (icon_theme, scaled);
-
-          g_object_unref (scaled);
-        }
-      else
-        {
-          info = gtk_icon_info_new_for_pixbuf (icon_theme, pixbuf);
-        }
-
-      return info;
-    }
-  else if (G_IS_LOADABLE_ICON (icon))
+  if (G_IS_LOADABLE_ICON (icon))
    {
      info = icon_info_new ();
      info->loadable = G_LOADABLE_ICON (g_object_ref (icon));
@@ -4980,6 +4914,39 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *icon_theme,
      else
        return NULL;
    }
+  else if (GDK_IS_PIXBUF (icon))
+    {
+      GdkPixbuf *pixbuf;
+
+      pixbuf = GDK_PIXBUF (icon);
+
+      if ((flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0)
+	{
+	  gint width, height, max;
+	  gdouble scale;
+	  GdkPixbuf *scaled;
+
+	  width = gdk_pixbuf_get_width (pixbuf);
+	  height = gdk_pixbuf_get_height (pixbuf);
+	  max = MAX (width, height);
+	  scale = (gdouble) size / (gdouble) max;
+
+	  scaled = gdk_pixbuf_scale_simple (pixbuf,
+					    0.5 + width * scale,
+					    0.5 + height * scale,
+					    GDK_INTERP_BILINEAR);
+
+	  info = gtk_icon_info_new_for_pixbuf (icon_theme, scaled);
+
+	  g_object_unref (scaled);
+	}
+      else
+	{
+	  info = gtk_icon_info_new_for_pixbuf (icon_theme, pixbuf);
+	}
+
+      return info;
+    }

  return NULL;
 }
@@ -1393,42 +1393,16 @@ adjust_wrap_width (GtkIconView *icon_view)
 {
  if (icon_view->priv->text_cell)
    {
-      gint pixbuf_width, wrap_width;
-
-      if (icon_view->priv->items && icon_view->priv->pixbuf_cell)
-        {
-          gtk_cell_renderer_get_preferred_width (icon_view->priv->pixbuf_cell,
-                                                 GTK_WIDGET (icon_view),
-                                                 &pixbuf_width, NULL);
-        }
-      else
-        {
-          pixbuf_width = 0;
-        }
-
-      if (icon_view->priv->item_width >= 0)
-        {
-          if (icon_view->priv->item_orientation == GTK_ORIENTATION_VERTICAL)
-            {
-              wrap_width = icon_view->priv->item_width;
-            }
-          else
-            { 
-              wrap_width = icon_view->priv->item_width - pixbuf_width;
-            }
-
-          wrap_width -= 2 * icon_view->priv->item_padding * 2;
-        }
-      else
-        {
-          wrap_width = MAX (pixbuf_width * 2, 50);
-        }
+      gint wrap_width = 50;

+      /* Here we go with the same old guess, try the icon size and set double
+       * the size of the first icon found in the list, naive but works much
+       * of the time */
      if (icon_view->priv->items && icon_view->priv->pixbuf_cell)
 	{
-          /* Here we go with the same old guess, try the icon size and set double
-           * the size of the first icon found in the list, naive but works much
-           * of the time */
+	  gtk_cell_renderer_get_preferred_width (icon_view->priv->pixbuf_cell,
+						 GTK_WIDGET (icon_view),
+						 &wrap_width, NULL);
 	  
 	  wrap_width = MAX (wrap_width * 2, 50);
 	}
@@ -52,7 +52,7 @@
 #include "gtktypebuiltins.h"
 #include "gtkmain.h"

-#include "a11y/gtklabelaccessibleprivate.h"
+#include "a11y/gtklabelaccessible.h"

 /* this is in case rint() is not provided by the compiler, 
 * such as in the case of C89 compilers, like MSVC
@@ -519,6 +519,12 @@ static void               gtk_label_get_preferred_height_for_width  (GtkWidget
                                                                     gint                 width,
                                                                     gint                *minimum_height,
                                                                     gint                *natural_height);
+static void    gtk_label_get_preferred_height_and_baseline_for_width (GtkWidget          *widget,
+								      gint                width,
+								      gint               *minimum_height,
+								      gint               *natural_height,
+								      gint               *minimum_baseline,
+								      gint               *natural_baseline);

 static GtkBuildableIface *buildable_parent_iface = NULL;

@@ -585,6 +591,7 @@ gtk_label_class_init (GtkLabelClass *class)
  widget_class->get_preferred_height = gtk_label_get_preferred_height;
  widget_class->get_preferred_width_for_height = gtk_label_get_preferred_width_for_height;
  widget_class->get_preferred_height_for_width = gtk_label_get_preferred_height_for_width;
+  widget_class->get_preferred_height_and_baseline_for_width = gtk_label_get_preferred_height_and_baseline_for_width;

  class->move_cursor = gtk_label_move_cursor;
  class->copy_clipboard = gtk_label_copy_clipboard;
@@ -1980,20 +1987,15 @@ gtk_label_set_text_internal (GtkLabel *label,
                             gchar    *str)
 {
  GtkLabelPrivate *priv = label->priv;
+  gboolean text_changed;

-  if (g_strcmp0 (priv->text, str) == 0)
-    {
-      g_free (str);
-      return;
-    }
+  text_changed = g_strcmp0 (priv->text, str) != 0;

-  _gtk_label_accessible_text_deleted (label);
  g_free (priv->text);
  priv->text = str;

-  _gtk_label_accessible_text_inserted (label);
-
-  gtk_label_select_region_index (label, 0, 0);
+  if (text_changed)
+    gtk_label_select_region_index (label, 0, 0);
 }

 static void
@@ -2517,11 +2519,10 @@ gtk_label_set_markup_internal (GtkLabel    *label,
  GError *error = NULL;
  PangoAttrList *attrs = NULL;
  gunichar accel_char = 0;
-  gchar *str_for_display = NULL;
-  gchar *str_for_accel = NULL;
+  gchar *new_str;
  GList *links = NULL;

-  if (!parse_uri_markup (label, str, &str_for_display, &links, &error))
+  if (!parse_uri_markup (label, str, &new_str, &links, &error))
    {
      g_warning ("Failed to set text from markup due to error parsing markup: %s",
                 error->message);
@@ -2529,8 +2530,6 @@ gtk_label_set_markup_internal (GtkLabel    *label,
      return;
    }

-  str_for_accel = g_strdup (str_for_display);
-
  if (links)
    {
      gtk_label_ensure_select_info (label);
@@ -2558,51 +2557,31 @@ gtk_label_set_markup_internal (GtkLabel    *label,
          gchar *pattern;
          guint key;

-          if (separate_uline_pattern (str_for_display, &key, &tmp, &pattern))
+          if (separate_uline_pattern (new_str, &key, &tmp, &pattern))
            {
-              g_free (str_for_display);
-              str_for_display = tmp;
+              g_free (new_str);
+              new_str = tmp;
              g_free (pattern);
            }
        }
    }

-  /* Extract the text to display */
-  if (!pango_parse_markup (str_for_display,
+  if (!pango_parse_markup (new_str,
                           -1,
                           with_uline ? '_' : 0,
                           &attrs,
                           &text,
-                           NULL,
+                           with_uline ? &accel_char : NULL,
                           &error))
    {
      g_warning ("Failed to set text from markup due to error parsing markup: %s",
                 error->message);
-      g_free (str_for_display);
-      g_free (str_for_accel);
+      g_free (new_str);
      g_error_free (error);
      return;
    }

-  /* Extract the accelerator character */
-  if (with_uline && !pango_parse_markup (str_for_accel,
-					 -1,
-					 '_',
-					 NULL,
-					 NULL,
-					 &accel_char,
-					 &error))
-    {
-      g_warning ("Failed to set text from markup due to error parsing markup: %s",
-                 error->message);
-      g_free (str_for_display);
-      g_free (str_for_accel);
-      g_error_free (error);
-      return;
-    }
-
-  g_free (str_for_display);
-  g_free (str_for_accel);
+  g_free (new_str);

  if (text)
    gtk_label_set_text_internal (label, text);
@@ -3462,15 +3441,18 @@ gtk_label_get_request_mode (GtkWidget *widget)
    return GTK_SIZE_REQUEST_CONSTANT_SIZE;
 }

+
 static void
 get_size_for_allocation (GtkLabel        *label,
                         GtkOrientation   orientation,
                         gint             allocation,
                         gint            *minimum_size,
-                         gint            *natural_size)
+                         gint            *natural_size,
+			 gint            *minimum_baseline,
+                         gint            *natural_baseline)
 {
  PangoLayout *layout;
-  gint text_height;
+  gint text_height, baseline;

  layout = gtk_label_get_measuring_layout (label, NULL, allocation * PANGO_SCALE);

@@ -3482,6 +3464,16 @@ get_size_for_allocation (GtkLabel        *label,
  if (natural_size)
    *natural_size = text_height;

+  if (minimum_baseline || natural_baseline)
+    {
+      baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;
+      if (minimum_baseline)
+	*minimum_baseline = baseline;
+
+      if (natural_baseline)
+	*natural_baseline = baseline;
+    }
+
  g_object_unref (layout);
 }

@@ -3578,7 +3570,9 @@ static void
 gtk_label_get_preferred_size (GtkWidget      *widget,
                              GtkOrientation  orientation,
                              gint           *minimum_size,
-                              gint           *natural_size)
+                              gint           *natural_size,
+			      gint           *minimum_baseline,
+			      gint           *natural_baseline)
 {
  GtkLabel      *label = GTK_LABEL (widget);
  GtkLabelPrivate  *priv = label->priv;
@@ -3586,6 +3580,12 @@ gtk_label_get_preferred_size (GtkWidget      *widget,
  PangoRectangle smallest_rect;
  GtkBorder border;

+  if (minimum_baseline)
+    *minimum_baseline = -1;
+
+  if (natural_baseline)
+    *natural_baseline = -1;
+
  gtk_label_get_preferred_layout_size (label, &smallest_rect, &widest_rect);

  /* Now that we have minimum and natural sizes in pango extents, apply a possible transform */
@@ -3640,7 +3640,8 @@ gtk_label_get_preferred_size (GtkWidget      *widget,
          get_size_for_allocation (label,
                                   GTK_ORIENTATION_VERTICAL,
                                   smallest_rect.height,
-                                   minimum_size, natural_size);
+                                   minimum_size, natural_size,
+				   NULL, NULL);

        }
      else
@@ -3667,7 +3668,16 @@ gtk_label_get_preferred_size (GtkWidget      *widget,
          get_size_for_allocation (label,
                                   GTK_ORIENTATION_HORIZONTAL,
                                   widest_rect.width,
-                                   minimum_size, natural_size);
+                                   minimum_size, natural_size,
+				   minimum_baseline, natural_baseline);
+
+	  if (priv->angle == 180)
+	    {
+	      if (minimum_baseline)
+		*minimum_baseline = *minimum_size - *minimum_baseline;
+	      if (natural_baseline)
+		*natural_baseline = *natural_size - *natural_baseline;
+	    }
        }
      else
        {
@@ -3680,6 +3690,12 @@ gtk_label_get_preferred_size (GtkWidget      *widget,

      *minimum_size += border.top + border.bottom;
      *natural_size += border.top + border.bottom;
+
+      if (minimum_baseline && *minimum_baseline != -1)
+	*minimum_baseline += border.top;
+
+      if (natural_baseline && *natural_baseline != -1)
+	*natural_baseline += border.top;
    }
 }

@@ -3688,7 +3704,7 @@ gtk_label_get_preferred_width (GtkWidget *widget,
                               gint      *minimum_size,
                               gint      *natural_size)
 {
-  gtk_label_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+  gtk_label_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size, NULL, NULL);
 }

 static void
@@ -3696,7 +3712,7 @@ gtk_label_get_preferred_height (GtkWidget *widget,
                                gint      *minimum_size,
                                gint      *natural_size)
 {
-  gtk_label_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+  gtk_label_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size, NULL, NULL);
 }

 static void
@@ -3719,7 +3735,8 @@ gtk_label_get_preferred_width_for_height (GtkWidget *widget,

      get_size_for_allocation (label, GTK_ORIENTATION_VERTICAL,
                               MAX (1, height - border.top - border.bottom),
-                               minimum_width, natural_width);
+                               minimum_width, natural_width,
+			       NULL, NULL);

      if (minimum_width)
        *minimum_width += border.right + border.left;
@@ -3732,15 +3749,17 @@ gtk_label_get_preferred_width_for_height (GtkWidget *widget,
 }

 static void
-gtk_label_get_preferred_height_for_width (GtkWidget *widget,
-                                          gint       width,
-                                          gint      *minimum_height,
-                                          gint      *natural_height)
+gtk_label_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
+						       gint       width,
+						       gint      *minimum_height,
+						       gint      *natural_height,
+						       gint      *minimum_baseline,
+						       gint      *natural_baseline)
 {
  GtkLabel *label = GTK_LABEL (widget);
  GtkLabelPrivate *priv = label->priv;

-  if (priv->wrap && (priv->angle == 0 || priv->angle == 180 || priv->angle == 360))
+  if (width != -1 && priv->wrap && (priv->angle == 0 || priv->angle == 180 || priv->angle == 360))
    {
      GtkBorder border;

@@ -3751,7 +3770,13 @@ gtk_label_get_preferred_height_for_width (GtkWidget *widget,

      get_size_for_allocation (label, GTK_ORIENTATION_HORIZONTAL,
                               MAX (1, width - border.left - border.right),
-                               minimum_height, natural_height);
+                               minimum_height, natural_height,
+			       minimum_baseline, natural_baseline);
+
+      if (minimum_baseline && *minimum_baseline >= 0)
+	*minimum_baseline += border.top;
+      if (natural_baseline && *natural_baseline >= 0)
+	*natural_baseline += border.top;

      if (minimum_height)
        *minimum_height += border.top + border.bottom;
@@ -3760,7 +3785,18 @@ gtk_label_get_preferred_height_for_width (GtkWidget *widget,
        *natural_height += border.top + border.bottom;
    }
  else
-    GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, minimum_height, natural_height);
+    gtk_label_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_height, natural_height, minimum_baseline, natural_baseline);
+}
+
+static void
+gtk_label_get_preferred_height_for_width (GtkWidget *widget,
+                                          gint       width,
+                                          gint      *minimum_height,
+                                          gint      *natural_height)
+{
+  return gtk_label_get_preferred_height_and_baseline_for_width (widget, width,
+								minimum_height, natural_height,
+								NULL, NULL);
 }

 static void
@@ -3855,6 +3891,7 @@ get_layout_location (GtkLabel  *label,
  gint req_height;
  gfloat xalign, yalign;
  PangoRectangle logical;
+  gint baseline, layout_baseline, baseline_offset;

  misc   = GTK_MISC (label);
  widget = GTK_WIDGET (label);
@@ -3887,6 +3924,15 @@ get_layout_location (GtkLabel  *label,

  x = floor (allocation.x + border.left + xalign * (allocation.width - req_width) - logical.x);

+  baseline_offset = 0;
+  baseline = gtk_widget_get_allocated_baseline (widget);
+  if (baseline >= 0 && !priv->have_transform)
+    {
+      layout_baseline = pango_layout_get_baseline (priv->layout) / PANGO_SCALE;
+      baseline_offset = baseline - layout_baseline;
+      yalign = 0.0; /* Can't support yalign while baseline aligning */
+    }
+
  /* bgo#315462 - For single-line labels, *do* align the requisition with
   * respect to the allocation, even if we are under-allocated.  For multi-line
   * labels, always show the top of the text when they are under-allocated.  The
@@ -3901,9 +3947,9 @@ get_layout_location (GtkLabel  *label,
   *   middle".  You want to read the first line, at least, to get some context.
   */
  if (pango_layout_get_line_count (priv->layout) == 1)
-    y = floor (allocation.y + border.top + (allocation.height - req_height) * yalign) - logical.y;
+    y = floor (allocation.y + border.top + (allocation.height - req_height) * yalign) - logical.y + baseline_offset;
  else
-    y = floor (allocation.y + border.top + MAX ((allocation.height - req_height) * yalign, 0)) - logical.y;
+    y = floor (allocation.y + border.top + MAX ((allocation.height - req_height) * yalign, 0)) - logical.y + baseline_offset;

  if (xp)
    *xp = x;
@@ -39,9 +39,8 @@
 * widget.  It implements the #GtkTreeModel interface, and consequentialy,
 * can use all of the methods available there.  It also implements the
 * #GtkTreeSortable interface so it can be sorted by the view.
- * Finally, it also implements the tree
- * <link linkend="gtk3-GtkTreeView-drag-and-drop">drag and drop</link>
- * interfaces.
+ * Finally, it also implements the tree <link linkend="gtktreednd">drag and
+ * drop</link> interfaces.
 *
 * The #GtkListStore can accept most GObject types as a column type, though
 * it can't accept all custom types.  Internally, it will keep a copy of
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Larsson	dba6649098	Add tests/testbaseline	2013-03-07 19:57:43 +01:00
Alexander Larsson	fe2062925c	GtkButton: Add baseline align support	2013-03-07 19:57:43 +01:00
Alexander Larsson	169ba01c2a	GtkAlignment: Support baselines We now report any baselines from the child, and allocate it. Also, in the case of a baselign aligned child we ignore yscale/yalign as that is not supportable.	2013-03-07 19:57:43 +01:00
Alexander Larsson	3244628724	GtkBox: Add baseline alignment for horizontal boxes Report a baseline based height and baseline whenever there are children with ALIGN_BASELINE. Assign baseline to childen in size_allocate. Either the one inherited from the parent if set, or otherwise calculate one based on any ALIGN_BASELINE children.	2013-03-07 19:57:43 +01:00
Alexander Larsson	2954b45f54	GtkLabel: Support baseline Report the baseline in get_preferred_height_and_baseline_for_width().	2013-03-07 19:57:43 +01:00
Alexander Larsson	d8a65ae304	Initial support for baselines This modifies the size machinery in order to allow baseline support. We add a new widget vfunc get_preferred_height_and_baseline_for_width which queries the normal height_for_width (or non-for-width if width is -1) and additionally returns optional (-1 means "no baseline") baselines for the minimal and natural heights. We also add a new gtk_widget_size_allocate_with_baseline() which baseline-aware containers can use to allocate children with a specific baseline, either one inherited from the parent, or one introduced due to requested baseline alignment in the container itself. size_allocate_with_baseline() works just like a normal size allocation, except the baseline gets recorded so that the child can access it via gtk_widget_get_allocated_baseline() when it aligns itself. There are also adjust_baseline_request/allocation similar to the allocation adjustment, and we extend the size request cache to also store the baselines.	2013-03-07 19:57:43 +01:00
Alexander Larsson	854fedbb45	Add GTK_ALIGN_BASELINE to GtkAlign Setting this means baseline aware containers should align the widget according to the baseline. For other containers this behaves like FILL. In order to not suprise old code with a new enum value we always return _FILL for _BASELINE unless you specifically request it via gtk_widget_get_valign_with_baseline().	2013-03-07 19:57:43 +01:00