gdkframeclock: Loop the layout phase if needed

In the case where the layout phase queued a layout we don't want to progress to the paint phase with invalid allocations, so we loop the layout. This shouldn't normally happen, but it may happen in some edge cases like if user/wm resizes clash with natural window size changes from a gtk widget. This should not generally loop though, so we detect this after 4 cycles and print a warning. This was detected because of an issue in GtkWindow where it seems to incorrectly handle the case of a user interactive resize. It seems gtk_window_move_resize() believes that configure_request_size_changed changed due to hitting some corner case so it calls gtk_widget_queue_resize_no_redraw(), marking the window as need_alloc after the layout phase. This commit fixes the issue, but we should also look into if we can fix that.
Change the way we draw (again)
2013-04-24 22:21:06 +02:00 · 2013-04-24 18:20:56 +02:00 · 2013-04-23 19:16:30 +02:00 · 2013-04-21 01:54:05 +02:00 · 2013-04-21 01:35:57 +02:00 · 2013-04-21 01:27:07 +02:00
138 changed files with 6775 additions and 28285 deletions
@@ -43,7 +43,6 @@ demos =						\
 	search_entry.c				\
 	sizegroup.c				\
 	spinner.c				\
-	stack.c					\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
@@ -111,7 +110,6 @@ RESOURCES=	$(demos)			\
 		application.ui			\
 		demo.ui				\
 		menus.ui			\
-		stack.ui			\
 		theming.ui			\
 		alphatest.png			\
 		apple-red.png			\
@@ -55,9 +55,6 @@
    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
  <gresource prefix="/images">
    <file>alphatest.png</file>
    <file>floppybuddy.gif</file>
@@ -113,7 +110,6 @@
    <file>rotated_text.c</file>
    <file>search_entry.c</file>
    <file>sizegroup.c</file>
-    <file>stack.c</file>
    <file>spinner.c</file>
    <file>stock_browser.c</file>
    <file>textview.c</file>
@@ -1,48 +0,0 @@
-/* Stack
- *
- * GtkStack is a container that shows a single child at a time,
- * with nice transitions when the visible child changes.
- *
- * GtkStackSwitcher adds buttons to control which child is visible.
- */
-
-#include <gtk/gtk.h>
-
-static GtkBuilder *builder;
-
-GtkWidget *
-do_stack (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-
-  if (!window)
-    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/stack/stack.ui", &err);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">GtkStack</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkStackSwitcher" id="switcher">
-            <property name="visible">True</property>
-            <property name="stack">stack</property>
-            <property name="halign">center</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="transition-type">crossfade</property>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
-                <property name="resource">/application/gtk-logo-48.png</property>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Page 1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton1">
-                <property name="label" translatable="yes">Page 2</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">Page 2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinner" id="spinner1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="name">page3</property>
-                <property name="icon-name">face-laugh-symbolic</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -234,8 +234,6 @@
      <xi:include href="xml/gtkpaned.xml" />
      <xi:include href="xml/gtklayout.xml" />
      <xi:include href="xml/gtknotebook.xml" />
-      <xi:include href="xml/gtkstack.xml" />
-      <xi:include href="xml/gtkstackswitcher.xml" />
      <xi:include href="xml/gtkexpander.xml" />
      <xi:include href="xml/gtkoverlay.xml" />
      <xi:include href="xml/gtkheaderbar.xml" />
@@ -7564,33 +7564,3 @@ GTK_HEADER_BAR_GET_CLASS
 <SUBSECTION Private>
 gtk_header_bar_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkstack</FILE>
-<TITLE>GtkStack</TITLE>
-GtkStack
-gtk_stack_new
-gtk_stack_add_named
-gtk_stack_add_titled
-gtk_stack_set_visible_child
-gtk_stack_get_visible_child
-gtk_stack_set_visible_child_name
-gtk_stack_get_visible_child_name
-gtk_stack_set_visible_child_full
-gtk_stack_set_homogeneous
-gtk_stack_get_homogeneous
-gtk_stack_set_transition_duration
-gtk_stack_get_transition_duration
-GtkStackTransitionType
-gtk_stack_set_transition_type
-gtk_stack_get_transition_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkstackswitcher</FILE>
-<TITLE>GtkStackSwitcher</TITLE>
-GtkStackSwitcher
-gtk_stack_switcher_new
-gtk_stack_switcher_set_stack
-gtk_stack_switcher_get_stack
-</SECTION>
@@ -171,6 +171,7 @@ _gdk_broadway_display_open (const gchar *display_name)
    }

  g_signal_emit_by_name (display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (), "display-opened", display);

  return display;
 }
@@ -81,6 +81,13 @@ g_initable_iface_init (GInitableIface *iface)
  iface->init = gdk_broadway_display_manager_initable_init;
 }

+static GdkDisplay *
+gdk_broadway_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_broadway_display_open (name);
+}
+
 static void
 gdk_broadway_display_manager_init (GdkBroadwayDisplayManager *manager)
 {
@@ -98,6 +105,9 @@ static void
 gdk_broadway_display_manager_class_init (GdkBroadwayDisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_broadway_display_manager_finalize;
+
+  manager_class->open_display = gdk_broadway_display_manager_open_display;
 }
@@ -203,6 +203,9 @@ void _gdk_broadway_window_resize_surface        (GdkWindow *window);
 void _gdk_broadway_cursor_update_theme (GdkCursor *cursor);
 void _gdk_broadway_cursor_display_finalize (GdkDisplay *display);

+#define GDK_SCREEN_DISPLAY(screen)    (GDK_BROADWAY_SCREEN (screen)->display)
+#define GDK_WINDOW_SCREEN(win)	      (GDK_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl)->screen)
+#define GDK_WINDOW_DISPLAY(win)       (GDK_BROADWAY_SCREEN (GDK_WINDOW_SCREEN (win))->display)
 #define GDK_WINDOW_IS_BROADWAY(win)   (GDK_IS_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl))

 #endif /* __GDK_PRIVATE_BROADWAY_H__ */
@@ -1379,7 +1379,7 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
    return;

-  mv_resize = get_move_resize_data (gdk_window_get_display (window), TRUE);
+  mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE);

  mv_resize->is_resize = TRUE;
  mv_resize->moveresize_button = button;
@@ -1470,56 +1470,6 @@ _gdk_broadway_window_queue_antiexpose (GdkWindow *window,
  return TRUE;
 }

-static void
-copy_region (cairo_surface_t *surface,
-	     cairo_region_t *area,
-	     gint            dx,
-	     gint            dy)
-{
-  cairo_t *cr;
-
-  cr = cairo_create (surface);
-
-  gdk_cairo_region (cr, area);
-  cairo_clip (cr);
-
-  /* NB: This is a self-copy and Cairo doesn't support that yet.
-   * So we do a litle trick.
-   */
-  cairo_push_group (cr);
-
-  cairo_set_source_surface (cr, surface, dx, dy);
-  cairo_paint (cr);
-
-  cairo_pop_group_to_source (cr);
-  cairo_paint (cr);
-
-  cairo_destroy (cr);
-}
-
-void
-_gdk_broadway_window_translate (GdkWindow      *window,
-				cairo_region_t *area,
-				gint            dx,
-				gint            dy)
-{
-  GdkWindowImplBroadway *impl;
-  GdkBroadwayDisplay *broadway_display;
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
-
-  if (impl->surface)
-    {
-      copy_region (impl->surface, area, dx, dy);
-      broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
-
-      if (_gdk_broadway_server_window_translate (broadway_display->server,
-						 impl->id,
-						 area, dx, dy))
-	queue_flush (window);
-    }
-}
-
 guint32
 gdk_broadway_get_last_seen_time (GdkWindow  *window)
 {
@@ -1558,7 +1508,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
  impl_class->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_broadway_set_static_gravities;
  impl_class->queue_antiexpose = _gdk_broadway_window_queue_antiexpose;
-  impl_class->translate = _gdk_broadway_window_translate;
  impl_class->destroy = _gdk_broadway_window_destroy;
  impl_class->destroy_foreign = gdk_broadway_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_broadway_resize_cairo_surface;
@@ -87,31 +87,6 @@ gdk_display_real_make_default (GdkDisplay *display)
 {
 }

-static void
-device_removed_cb (GdkDeviceManager *device_manager,
-                   GdkDevice        *device,
-                   GdkDisplay       *display)
-{
-  g_hash_table_remove (display->multiple_click_info, device);
-  g_hash_table_remove (display->device_grabs, device);
-  g_hash_table_remove (display->pointers_info, device);
-
-  /* FIXME: change core pointer and remove from device list */
-}
-
-static void
-gdk_display_real_opened (GdkDisplay *display)
-{
-  GdkDeviceManager *device_manager;
-
-  device_manager = gdk_display_get_device_manager (display);
-
-  g_signal_connect (device_manager, "device-removed",
-                    G_CALLBACK (device_removed_cb), display);
-
-  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
-}
-
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -123,7 +98,6 @@ gdk_display_class_init (GdkDisplayClass *class)
  class->get_app_launch_context = gdk_display_real_get_app_launch_context;
  class->window_type = GDK_TYPE_WINDOW;

-  class->opened = gdk_display_real_opened;
  class->make_default = gdk_display_real_make_default;

  /**
@@ -137,8 +111,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    g_signal_new (g_intern_static_string ("opened"),
 		  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GdkDisplayClass, opened),
-                  NULL, NULL,
+                  0, NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

@@ -192,6 +165,29 @@ free_device_grabs_foreach (gpointer key,
  return TRUE;
 }

+static void
+device_removed_cb (GdkDeviceManager *device_manager,
+                   GdkDevice        *device,
+                   GdkDisplay       *display)
+{
+  g_hash_table_remove (display->multiple_click_info, device);
+  g_hash_table_remove (display->device_grabs, device);
+  g_hash_table_remove (display->pointers_info, device);
+
+  /* FIXME: change core pointer and remove from device list */
+}
+
+static void
+gdk_display_opened (GdkDisplay *display)
+{
+  GdkDeviceManager *device_manager;
+
+  device_manager = gdk_display_get_device_manager (display);
+
+  g_signal_connect (device_manager, "device-removed",
+                    G_CALLBACK (device_removed_cb), display);
+}
+
 static void
 gdk_display_init (GdkDisplay *display)
 {
@@ -208,6 +204,11 @@ gdk_display_init (GdkDisplay *display)

  display->multiple_click_info = g_hash_table_new_full (NULL, NULL, NULL,
                                                        (GDestroyNotify) g_free);
+
+  g_signal_connect (display, "opened",
+                    G_CALLBACK (gdk_display_opened), NULL);
+
+  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
 }

 static void
@@ -34,7 +34,6 @@

 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
-#include "x11/gdkprivate-x11.h"
 #endif

 #ifdef GDK_WINDOWING_QUARTZ
@@ -43,22 +42,18 @@
 * "generic" GDK source code.
 */
 #include "quartz/gdkquartzdisplaymanager.h"
-#include "quartz/gdkprivate-quartz.h"
 #endif

 #ifdef GDK_WINDOWING_BROADWAY
 #include "broadway/gdkbroadwaydisplaymanager.h"
-#include "broadway/gdkprivate-broadway.h"
 #endif

 #ifdef GDK_WINDOWING_WIN32
 #include "win32/gdkwin32.h"
-#include "win32/gdkprivate-win32.h"
 #endif

 #ifdef GDK_WINDOWING_WAYLAND
 #include "wayland/gdkwayland.h"
-#include "wayland/gdkprivate-wayland.h"
 #endif

 /**
@@ -301,34 +296,6 @@ gdk_display_manager_get (void)
  return manager;
 }

-typedef struct _GdkBackend GdkBackend;
-
-struct _GdkBackend {
-  const char *name;
-  GType (* get_backend_type) (void);
-  GdkDisplay * (* open_display) (const char *name);
-};
-
-GdkBackend gdk_backends[] = {
-#ifdef GDK_WINDOWING_QUARTZ
-  { "quartz",   gdk_quartz_display_manager_get_type,    _gdk_quartz_display_open },
-#endif
-#ifdef GDK_WINDOWING_WIN32
-  { "win32",    gdk_win32_display_manager_get_type,     _gdk_win32_display_open },
-#endif
-#ifdef GDK_WINDOWING_X11
-  { "x11",      gdk_x11_display_manager_get_type,       _gdk_x11_display_open },
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-  { "wayland",  gdk_wayland_display_manager_get_type,   _gdk_wayland_display_open },
-#endif
-#ifdef GDK_WINDOWING_BROADWAY
-  { "broadway", gdk_broadway_display_manager_get_type,  _gdk_broadway_display_open },
-#endif
-  /* NULL-terminating this array so we can use commas above */
-  { NULL, NULL }
-};
-
 /**
 * gdk_display_manager_peek:
 *
@@ -348,7 +315,7 @@ gdk_display_manager_peek (void)
    {
      const gchar *backend_list;
      gchar **backends;
-      gint i, j;
+      gint i;
      gboolean allow_any;

      if (allowed_backends == NULL)
@@ -368,18 +335,61 @@ gdk_display_manager_peek (void)
          if (!allow_any && !any && !strstr (allowed_backends, backend))
            continue;

-          for (j = 0; gdk_backends[j].name != NULL; j++)
+#ifdef GDK_WINDOWING_QUARTZ
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "quartz")) ||
+              g_str_equal (backend, "quartz"))
            {
-              if ((any && allow_any) ||
-                  (any && strstr (allowed_backends, gdk_backends[j].name)) ||
-                  g_str_equal (backend, gdk_backends[j].name))
-                {
-                  GDK_NOTE (MISC, g_message ("Trying %s backend", gdk_backends[j].name));
-                  manager = g_initable_new (gdk_backends[j].get_backend_type (), NULL, NULL, NULL);
-                  if (manager)
-                    break;
-                }
+              GDK_NOTE (MISC, g_message ("Trying quartz backend"));
+              manager = g_initable_new (gdk_quartz_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
            }
+#endif
+#ifdef GDK_WINDOWING_WIN32
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "win32")) ||
+              g_str_equal (backend, "win32"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying win32 backend"));
+              manager = g_initable_new (gdk_win32_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
+#ifdef GDK_WINDOWING_X11
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "x11")) ||
+              g_str_equal (backend, "x11"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying x11 backend"));
+              manager = g_initable_new (gdk_x11_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
+#ifdef GDK_WINDOWING_WAYLAND
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "wayland")) ||
+              g_str_equal (backend, "wayland"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying wayland backend"));
+              manager = g_initable_new (gdk_wayland_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
+#ifdef GDK_WINDOWING_BROADWAY
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "broadway")) ||
+              g_str_equal (backend, "broadway"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying broadway backend"));
+              manager = g_initable_new (gdk_broadway_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
        }
      g_strfreev (backends);
    }
@@ -500,19 +510,7 @@ GdkDisplay *
 gdk_display_manager_open_display (GdkDisplayManager *manager,
                                  const gchar       *name)
 {
-  guint i;
-
-  for (i = 0; gdk_backends[i].name != NULL; i++)
-    {
-      if (G_OBJECT_TYPE (manager) == gdk_backends[i].get_backend_type ())
-        {
-          return gdk_backends[i].open_display (name);
-        }
-    }
-
-  g_assert_not_reached ();
-
-  return NULL;
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->open_display (manager, name);
 }

 void
@@ -523,8 +521,6 @@ _gdk_display_manager_add_display (GdkDisplayManager *manager,
    gdk_display_manager_set_default_display (manager, display);

  manager->displays = g_slist_prepend (manager->displays, display);
-
-  g_signal_emit (manager, signals[DISPLAY_OPENED], 0, display);
 }

 /* NB: This function can be called multiple times per display. */
@@ -41,6 +41,9 @@ struct _GdkDisplayManagerClass
 {
  GObjectClass parent_class;

+  GdkDisplay * (*open_display)        (GdkDisplayManager *manager,
+                                       const gchar       *name);
+
  /* signals */
  void         (*display_opened)      (GdkDisplayManager *manager,
                                       GdkDisplay        *display);
@@ -237,7 +237,6 @@ struct _GdkDisplayClass
                                                        const gchar    *text);

  /* Signals */
-  void                   (*opened)                     (GdkDisplay     *display);
  void (*closed) (GdkDisplay *display,
                  gboolean    is_error);
 };
@@ -384,6 +384,7 @@ gdk_frame_clock_paint_idle (void *data)
        case GDK_FRAME_CLOCK_PHASE_LAYOUT:
          if (priv->freeze_count == 0)
            {
+	      int iter;
 #ifdef G_ENABLE_DEBUG
              if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
                {
@@ -394,11 +395,20 @@ gdk_frame_clock_paint_idle (void *data)
 #endif /* G_ENABLE_DEBUG */

              priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT;
-              if (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)
+	      /* We loop in the layout phase, because we don't want to progress
+	       * into the paint phase with invalid size allocations. This may
+	       * happen in some situation like races between user window
+	       * resizes and natural size changes.
+	       */
+	      iter = 0;
+              while ((priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT) &&
+		     priv->freeze_count == 0 && iter++ < 4)
                {
                  priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                  g_signal_emit_by_name (G_OBJECT (clock), "layout");
                }
+	      if (iter == 4)
+		g_warning ("gdk-frame-clock: layout continuously requested, giving up after 4 tries");
            }
        case GDK_FRAME_CLOCK_PHASE_PAINT:
          if (priv->freeze_count == 0)
@@ -224,6 +224,7 @@ struct _GdkWindow
  guint native_visibility : 2; /* the native visibility of a impl windows */
  guint viewable : 1; /* mapped and all parents mapped */
  guint applied_shape : 1;
+  guint in_update : 1;
  GdkFullscreenMode fullscreen_mode;

  /* The GdkWindow that has the impl, ref:ed if another window.
@@ -250,10 +251,6 @@ struct _GdkWindow
  GdkCursor *cursor;
  GHashTable *device_cursor;

-  GSList *implicit_paint;
-
-  GList *outstanding_moves;
-
  cairo_region_t *shape;
  cairo_region_t *input_shape;

@@ -269,6 +266,7 @@ struct _GdkWindow
  guint num_offscreen_children;

  GdkFrameClock *frame_clock; /* NULL to use from parent or default */
+  GdkWindowInvalidateHandlerFunc invalidate_handler;
 };

 #define GDK_WINDOW_TYPE(d) (((GDK_WINDOW (d)))->window_type)
@@ -90,10 +90,7 @@ _gdk_keyval_from_name (const gchar *keyval_name)
  gdk_key *found;

  g_return_val_if_fail (keyval_name != NULL, 0);
-
-  if (strncmp (keyval_name,"XF86", 4) == 0)
-    keyval_name += 4;
-
+  
  found = bsearch (keyval_name, gdk_keys_by_name,
 		   GDK_NUM_KEYS, sizeof (gdk_key),
 		   gdk_keys_name_compare);
@@ -2278,7 +2278,6 @@
 #define GDK_TouchpadToggle 0x1008ffa9
 #define GDK_TouchpadOn 0x1008ffb0
 #define GDK_TouchpadOff 0x1008ffb1
-#define GDK_AudioMicMute 0x1008ffb2
 #define GDK_Switch_VT_1 0x1008fe01
 #define GDK_Switch_VT_2 0x1008fe02
 #define GDK_Switch_VT_3 0x1008fe03
@@ -2287,7 +2287,6 @@
 #define GDK_KEY_TouchpadToggle 0x1008ffa9
 #define GDK_KEY_TouchpadOn 0x1008ffb0
 #define GDK_KEY_TouchpadOff 0x1008ffb1
-#define GDK_KEY_AudioMicMute 0x1008ffb2
 #define GDK_KEY_Switch_VT_1 0x1008fe01
 #define GDK_KEY_Switch_VT_2 0x1008fe02
 #define GDK_KEY_Switch_VT_3 0x1008fe03
@@ -555,42 +555,6 @@ gdk_offscreen_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-static void
-gdk_offscreen_window_translate (GdkWindow      *window,
-                                cairo_region_t *area,
-                                gint            dx,
-                                gint            dy)
-{
-  GdkOffscreenWindow *offscreen = GDK_OFFSCREEN_WINDOW (window->impl);
-
-  if (offscreen->surface)
-    {
-      cairo_t *cr;
-
-      cr = cairo_create (offscreen->surface);
-
-      area = cairo_region_copy (area);
-
-      gdk_cairo_region (cr, area);
-      cairo_clip (cr);
-
-      /* NB: This is a self-copy and Cairo doesn't support that yet.
-       * So we do a litle trick.
-       */
-      cairo_push_group (cr);
-
-      cairo_set_source_surface (cr, offscreen->surface, dx, dy);
-      cairo_paint (cr);
-
-      cairo_pop_group_to_source (cr);
-      cairo_paint (cr);
-
-      cairo_destroy (cr);
-    }
-
-  _gdk_window_add_damage (window, area);
-}
-
 static cairo_surface_t *
 gdk_offscreen_window_resize_cairo_surface (GdkWindow       *window,
                                           cairo_surface_t *surface,
@@ -752,7 +716,6 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
  impl_class->input_shape_combine_region = gdk_offscreen_window_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_offscreen_window_set_static_gravities;
  impl_class->queue_antiexpose = gdk_offscreen_window_queue_antiexpose;
-  impl_class->translate = gdk_offscreen_window_translate;
  impl_class->destroy = gdk_offscreen_window_destroy;
  impl_class->destroy_foreign = NULL;
  impl_class->resize_cairo_surface = gdk_offscreen_window_resize_cairo_surface;
@@ -634,6 +634,26 @@ gboolean gdk_window_set_static_gravities (GdkWindow *window,

 /* GdkWindow */

+/**
+ * GdkWindowInvalidateHandlerFunc:
+ * @window: a #GdkWindow
+ * @region: a #cairo_region_t
+ *
+ * Whenever some area of the window is invalidated (directly in the
+ * window or in a child window) this gets called with @region in
+ * the coordinate space of @window. You can use @region to just
+ * keep track of the dirty region, or you can actually change
+ * @region in case you are doing display tricks like showing
+ * a child in multiple places.
+ *
+ * Since: 3.10
+ */
+typedef void (*GdkWindowInvalidateHandlerFunc)  (GdkWindow *window,
+						 cairo_region_t *region);
+GDK_AVAILABLE_IN_3_10
+void gdk_window_set_invalidate_handler (GdkWindow *window,
+					GdkWindowInvalidateHandlerFunc handler);
+
 gboolean      gdk_window_has_native         (GdkWindow       *window);
 void              gdk_window_set_type_hint (GdkWindow        *window,
                                            GdkWindowTypeHint hint);
@@ -125,16 +125,6 @@ struct _GdkWindowImplClass
  gboolean     (* queue_antiexpose)     (GdkWindow       *window,
 					 cairo_region_t  *update_area);

-  /* Called to move @area inside @window by @dx x @dy pixels. @area is 
-   * guaranteed to be inside @window. If part of @area is not invisible or
-   * invalid, it is this function's job to queue expose events in those 
-   * areas.
-   */
-  void         (* translate)            (GdkWindow       *window,
-					 cairo_region_t  *area,
-					 gint            dx,
-					 gint            dy);
-
 /* Called to do the windowing system specific part of gdk_window_destroy(),
 *
 * window: The window being destroyed
@@ -1,65 +1,28 @@
-BackSpace
-Tab
-Return
-Pause
-Scroll_Lock
-Sys_Req
-Escape
-Multi_key
-Home
-Left
-Up
-Right
-Down
-Page_Up
-Page_Down
-End
-Begin
-Print
-Insert
-Num_Lock
-KP_Space
-KP_Tab
-KP_Enter
-KP_Home
-KP_Left
-KP_Up
-KP_Right
-KP_Down
-KP_Page_Up
-KP_Prior
-KP_Page_Down
-KP_Next
-KP_End
-KP_Begin
-KP_Insert
-KP_Delete
-Delete
-MonBrightnessUp
-MonBrightnessDown
-KbdBrightnessUp
-KbdBrightnessDown
-AudioMute
-AudioLowerVolume
-AudioRaiseVolume
-AudioPlay
-AudioStop
-AudioNext
-AudioPrev
-AudioRecord
-AudioPause
-AudioRewind
-AudioMedia
-ScreenSaver
-Battery
-Launch1
-Forward
-Back
-Sleep
-Hibernate
-WLAN
-WebCam
-Display
-TouchpadToggle
-WakeUp
-Suspend
+XF86MonBrightnessUp
+XF86MonBrightnessDown
+XF86KbdBrightnessUp
+XF86KbdBrightnessDown
+XF86AudioMute
+XF86AudioLowerVolume
+XF86AudioRaiseVolume
+XF86AudioPlay
+XF86AudioStop
+XF86AudioNext
+XF86AudioPrev
+XF86AudioRecord
+XF86AudioPause
+XF86AudioRewind
+XF86AudioMedia
+XF86ScreenSaver
+XF86Battery
+XF86Launch1
+XF86Forward
+XF86Back
+XF86Sleep
+XF86Hibernate
+XF86WLAN
+XF86WebCam
+XF86Display
+XF86TouchpadToggle
+XF86WakeUp
+XF86Suspend
@@ -134,7 +134,8 @@ _gdk_quartz_display_open (const gchar *display_name)
  _gdk_quartz_dnd_init ();
 #endif

-  g_signal_emit_by_name (_gdk_display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (),
+			 "display_opened", _gdk_display);

  return _gdk_display;
 }
@@ -40,6 +40,13 @@ struct _GdkQuartzDisplayManager

 G_DEFINE_TYPE (GdkQuartzDisplayManager, gdk_quartz_display_manager, GDK_TYPE_DISPLAY_MANAGER)

+static GdkDisplay *
+gdk_quartz_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_quartz_display_open (name);
+}
+
 static void
 gdk_quartz_display_manager_init (GdkQuartzDisplayManager *manager)
 {
@@ -72,6 +79,7 @@ gdk_quartz_display_manager_class_init (GdkQuartzDisplayManagerClass *class)

  object_class->finalize = gdk_quartz_display_manager_finalize;

+  manager_class->open_display = gdk_quartz_display_manager_open_display;
  manager_class->atom_intern = _gdk_quartz_display_manager_atom_intern;
  manager_class->get_atom_name = _gdk_quartz_display_manager_get_atom_name;
 }
@@ -2237,49 +2237,6 @@ gdk_quartz_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-static void
-gdk_quartz_window_translate (GdkWindow      *window,
-                             cairo_region_t *area,
-                             gint            dx,
-                             gint            dy)
-{
-  cairo_region_t *invalidate, *scrolled;
-  GdkWindowImplQuartz *impl = (GdkWindowImplQuartz *)window->impl;
-  GdkRectangle extents;
-
-  cairo_region_get_extents (area, &extents);
-
-  [impl->view scrollRect:NSMakeRect (extents.x - dx, extents.y - dy,
-                                     extents.width, extents.height)
-              by:NSMakeSize (dx, dy)];
-
-  if (impl->needs_display_region)
-    {
-      cairo_region_t *intersection;
-
-      /* Invalidate already invalidated area that was moved at new
-       * location.
-       */
-      intersection = cairo_region_copy (impl->needs_display_region);
-      cairo_region_intersect (intersection, area);
-      cairo_region_translate (intersection, dx, dy);
-
-      gdk_quartz_window_set_needs_display_in_region (window, intersection);
-      cairo_region_destroy (intersection);
-    }
-
-  /* Calculate newly exposed area that needs invalidation */
-  scrolled = cairo_region_copy (area);
-  cairo_region_translate (scrolled, dx, dy);
-
-  invalidate = cairo_region_copy (area);
-  cairo_region_subtract (invalidate, scrolled);
-  cairo_region_destroy (scrolled);
-
-  gdk_quartz_window_set_needs_display_in_region (window, invalidate);
-  cairo_region_destroy (invalidate);
-}
-
 static void
 gdk_quartz_window_set_focus_on_map (GdkWindow *window,
                                    gboolean focus_on_map)
@@ -3078,7 +3035,6 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
  impl_class->input_shape_combine_region = gdk_window_quartz_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_quartz_set_static_gravities;
  impl_class->queue_antiexpose = gdk_quartz_window_queue_antiexpose;
-  impl_class->translate = gdk_quartz_window_translate;
  impl_class->destroy = gdk_quartz_window_destroy;
  impl_class->destroy_foreign = gdk_quartz_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_quartz_resize_cairo_surface;
@@ -31,10 +31,6 @@ TEST_PROGS        += display
 display_SOURCES    = display.c
 display_LDADD      = $(progs_ldadd)

-TEST_PROGS        += keysyms
-keysyms_SOURCES    = keysyms.c
-keysyms_LDADD      = $(progs_ldadd)
-
 CLEANFILES = \
 	cairosurface.png	\
 	gdksurface.png
@@ -1,69 +0,0 @@
-#include <locale.h>
-#include <gdk/gdk.h>
-
-static void
-test_keysyms_basic (void)
-{
-  struct {
-    guint keyval;
-    const gchar *name;
-    const gchar *other_name;
-  } tests[] = {
-    { GDK_KEY_space, "space", NULL },
-    { GDK_KEY_a, "a", NULL },
-    { GDK_KEY_Thorn, "Thorn", "THORN" },
-    { GDK_KEY_Hangul_J_RieulTieut, "Hangul_J_RieulTieut", NULL },
-    { GDK_KEY_Page_Up, "Page_Up", NULL },
-    { GDK_KEY_KP_Multiply, "KP_Multiply", NULL },
-    { GDK_KEY_MonBrightnessUp, "MonBrightnessUp", NULL },
-    { 0, NULL }
-  };
-  gint i;
-
- for (i = 0; tests[i].keyval != 0; i++)
-   {
-     g_assert_cmpstr (gdk_keyval_name (tests[i].keyval), ==, tests[i].name);
-     g_assert_cmpuint (gdk_keyval_from_name (tests[i].name), ==, tests[i].keyval);
-     if (tests[i].other_name)
-       g_assert_cmpuint (gdk_keyval_from_name (tests[i].other_name), ==, tests[i].keyval);
-   }
-}
-
-static void
-test_keysyms_void (void)
-{
-  g_assert_cmpuint (gdk_keyval_from_name ("NoSuchKeysym"), ==, GDK_KEY_VoidSymbol);
-  g_assert_cmpstr (gdk_keyval_name (GDK_KEY_VoidSymbol), ==, "0xffffff");
-}
-
-static void
-test_keysyms_xf86 (void)
-{
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86MonBrightnessUp"), ==, GDK_KEY_MonBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86MonBrightnessDown"), ==, GDK_KEY_MonBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86KbdBrightnessUp"), ==, GDK_KEY_KbdBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86KbdBrightnessDown"), ==, GDK_KEY_KbdBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86Battery"), ==, GDK_KEY_Battery);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86Display"), ==, GDK_KEY_Display);
-
-  g_assert_cmpuint (gdk_keyval_from_name ("MonBrightnessUp"), ==, GDK_KEY_MonBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("MonBrightnessDown"), ==, GDK_KEY_MonBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("KbdBrightnessUp"), ==, GDK_KEY_KbdBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("KbdBrightnessDown"), ==, GDK_KEY_KbdBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("Battery"), ==, GDK_KEY_Battery);
-  g_assert_cmpuint (gdk_keyval_from_name ("Display"), ==, GDK_KEY_Display);
-}
-
-int main (int argc, char *argv[])
-{
-  setlocale (LC_ALL, "");
-
-  g_test_init (&argc, &argv, NULL);
-  gdk_init (&argc, &argv);
-
-  g_test_add_func ("/keysyms/basic", test_keysyms_basic);
-  g_test_add_func ("/keysyms/void", test_keysyms_void);
-  g_test_add_func ("/keysyms/xf86", test_keysyms_xf86);
-
-  return g_test_run ();
-}
@@ -251,6 +251,7 @@ _gdk_wayland_display_open (const gchar *display_name)
  gdk_input_init (display);

  g_signal_emit_by_name (display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get(), "display_opened", display);

  return display;
 }
@@ -88,12 +88,22 @@ gdk_wayland_display_manager_finalize (GObject *object)
  G_OBJECT_CLASS (gdk_wayland_display_manager_parent_class)->finalize (object);
 }

+static GdkDisplay *
+gdk_wayland_display_manager_open_display (GdkDisplayManager *manager,
+					  const gchar       *name)
+{
+  return _gdk_wayland_display_open (name);
+}
+
 static void
 gdk_wayland_display_manager_class_init (GdkWaylandDisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_wayland_display_manager_finalize;
+
+  manager_class->open_display = gdk_wayland_display_manager_open_display;
 }

 static void
@@ -40,6 +40,9 @@

 #include "config.h"

+#define GDK_SCREEN_DISPLAY(screen)    (GDK_SCREEN_WAYLAND (screen)->display)
+#define GDK_WINDOW_SCREEN(win)	      (gdk_window_get_screen (win))
+#define GDK_WINDOW_DISPLAY(win)       (GDK_SCREEN_WAYLAND (GDK_WINDOW_SCREEN (win))->display)
 #define GDK_WINDOW_IS_WAYLAND(win)    (GDK_IS_WINDOW_IMPL_WAYLAND (((GdkWindow *)win)->impl))

 void _gdk_wayland_window_add_focus    (GdkWindow *window);
@@ -1009,15 +1009,6 @@ gdk_wayland_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-static void
-gdk_wayland_window_translate (GdkWindow      *window,
-			      cairo_region_t *area,
-			      gint            dx,
-			      gint            dy)
-{
-  _gdk_window_invalidate_for_expose (window, area);
-}
-
 static void
 gdk_wayland_window_destroy (GdkWindow *window,
 			    gboolean   recursing,
@@ -1726,7 +1717,6 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
  impl_class->input_shape_combine_region = gdk_window_wayland_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_wayland_set_static_gravities;
  impl_class->queue_antiexpose = gdk_wayland_window_queue_antiexpose;
-  impl_class->translate = gdk_wayland_window_translate;
  impl_class->destroy = gdk_wayland_window_destroy;
  impl_class->destroy_foreign = gdk_window_wayland_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_wayland_resize_cairo_surface;
@@ -215,7 +215,8 @@ _gdk_win32_display_open (const gchar *display_name)
  /* Precalculate display name */
  (void) gdk_display_get_name (_gdk_display);

-  g_signal_emit_by_name (_gdk_display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (),
+			 "display_opened", _gdk_display);

  GDK_NOTE (MISC, g_print ("... _gdk_display now set up\n"));

@@ -38,6 +38,13 @@ struct _GdkWin32DisplayManagerClass

 G_DEFINE_TYPE (GdkWin32DisplayManager, gdk_win32_display_manager, GDK_TYPE_DISPLAY_MANAGER)

+static GdkDisplay *
+gdk_win32_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_win32_display_open (name);
+}
+
 static void
 gdk_win32_display_manager_init (GdkWin32DisplayManager *manager)
 {
@@ -62,9 +69,11 @@ static void
 gdk_win32_display_manager_class_init (GdkWin32DisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_win32_display_manager_finalize;

+  manager_class->open_display = gdk_win32_display_manager_open_display;
 #if 0
  manager_class->atom_intern = _gdk_win32_display_manager_atom_intern;
  manager_class->get_atom_name = _gdk_win32_display_manager_get_atom_name;
@@ -3319,77 +3319,6 @@ _gdk_win32_window_queue_antiexpose (GdkWindow *window,
  return FALSE;
 }

-/* Gets called from gdwindow.c(do_move_region_bits_on_impl)
- * and got tested with testgtk::big_window. Given the previous,
- * untested implementation this one looks much too simple ;)
- */
-static void
-_gdk_win32_window_translate (GdkWindow *window,
-                             cairo_region_t *area, /* In impl window coords */
-                             gint       dx,
-                             gint       dy)
-{
-  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
-  HRGN hrgn, area_hrgn;
-  cairo_region_t *update_region;
-  HDC hdc;
-  int ret;
-
-  /* Note: This is the destination area, not the source, and
-     it has been moved by dx, dy from the source area */
-  area_hrgn = cairo_region_to_hrgn (area, 0, 0);
-
-  /* First we copy any outstanding invalid areas in the 
-     source area to the new position in the destination area */
-  hrgn = CreateRectRgn (0, 0, 0, 0);
-  ret = GetUpdateRgn (GDK_WINDOW_HWND (window), hrgn, FALSE);
-  if (ret == ERROR)
-    WIN32_API_FAILED ("GetUpdateRgn");
-  else if (ret != NULLREGION)
-    {
-      /* Convert the source invalid region as it would be copied */
-      OffsetRgn (hrgn, dx, dy);
-      /* Keep what intersects the copy destination area */
-      ret = CombineRgn (hrgn, hrgn, area_hrgn, RGN_AND);
-      /* And invalidate it */
-      if (ret == ERROR)
-        WIN32_API_FAILED ("CombineRgn");
-      else if (ret != NULLREGION)
-	API_CALL (InvalidateRgn, (GDK_WINDOW_HWND (window), hrgn, TRUE));
-    }
-
-  /* Then we copy the bits, invalidating whatever is copied from
-     otherwise invisible areas */
-
-  hdc = _gdk_win32_impl_acquire_dc (impl);
-
-  /* Clip hdc to target region */
-  API_CALL (SelectClipRgn, (hdc, area_hrgn));
-
-  SetRectRgn (hrgn, 0, 0, 0, 0);
-
-  if (!ScrollDC (hdc, dx, dy, NULL, NULL, hrgn, NULL))
-    WIN32_GDI_FAILED ("ScrollDC");
-  else
-    {
-      update_region = _gdk_win32_hrgn_to_region (hrgn);
-      if (!cairo_region_is_empty (update_region))
-	_gdk_window_invalidate_for_expose (window, update_region);
-      cairo_region_destroy (update_region);
-    }
-
-  /* Unset hdc clip region */
-  API_CALL (SelectClipRgn, (hdc, NULL));
-
-  _gdk_win32_impl_release_dc (impl);
-
-  if (!DeleteObject (hrgn))
-    WIN32_GDI_FAILED ("DeleteObject");
-
-  if (!DeleteObject (area_hrgn))
-    WIN32_GDI_FAILED ("DeleteObject");
-}
-
 static void
 gdk_win32_input_shape_combine_region (GdkWindow *window,
 				      const cairo_region_t *shape_region,
@@ -3556,7 +3485,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
  impl_class->input_shape_combine_region = gdk_win32_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_win32_window_set_static_gravities;
  impl_class->queue_antiexpose = _gdk_win32_window_queue_antiexpose;
-  impl_class->translate = _gdk_win32_window_translate;
  impl_class->destroy = gdk_win32_window_destroy;
  impl_class->destroy_foreign = gdk_win32_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_win32_window_resize_cairo_surface;
@@ -72,6 +72,24 @@ g_initable_iface_init (GInitableIface *iface)
 }


+static GdkDisplay *
+gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
+                                      const gchar       *name)
+{
+  GdkDisplay *display;
+
+  display = _gdk_x11_display_open (name);
+  if (display != NULL)
+    {
+      if (gdk_display_manager_get_default_display (manager) == NULL)
+        gdk_display_manager_set_default_display (manager, display);
+
+      g_signal_emit_by_name (manager, "display-opened", display);
+    }
+
+  return display;
+}
+
 static void
 gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
@@ -90,6 +108,9 @@ static void
 gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_x11_display_manager_finalize;
+
+  manager_class->open_display = gdk_x11_display_manager_open_display;
 }
@@ -28,26 +28,11 @@
 typedef struct _GdkWindowQueueItem GdkWindowQueueItem;
 typedef struct _GdkWindowParentPos GdkWindowParentPos;

-typedef enum {
-  GDK_WINDOW_QUEUE_TRANSLATE,
-  GDK_WINDOW_QUEUE_ANTIEXPOSE
-} GdkWindowQueueType;
-
 struct _GdkWindowQueueItem
 {
  GdkWindow *window;
  gulong serial;
-  GdkWindowQueueType type;
-  union {
-    struct {
-      cairo_region_t *area;
-      gint dx;
-      gint dy;
-    } translate;
-    struct {
-      cairo_region_t *area;
-    } antiexpose;
-  } u;
+  cairo_region_t *antiexpose_area;
 };

 void
@@ -140,14 +125,7 @@ queue_item_free (GdkWindowQueueItem *item)
 				    (gpointer *)&(item->window));
    }
  
-  if (item->type == GDK_WINDOW_QUEUE_ANTIEXPOSE)
-    cairo_region_destroy (item->u.antiexpose.area);
-  else
-    {
-      if (item->u.translate.area)
-	cairo_region_destroy (item->u.translate.area);
-    }
-  
+  cairo_region_destroy (item->antiexpose_area);
  g_free (item);
 }

@@ -213,11 +191,8 @@ gdk_window_queue (GdkWindow          *window,
 	  GdkWindowQueueItem *item = tmp_list->data;
 	  GList *next = tmp_list->next;
 	  
-	  if (item->type == GDK_WINDOW_QUEUE_ANTIEXPOSE)
-	    {
-	      queue_delete_link (display_x11->translate_queue, tmp_list);
-	      queue_item_free (item);
-	    }
+	  queue_delete_link (display_x11->translate_queue, tmp_list);
+	  queue_item_free (item);

 	  tmp_list = next;
 	}
@@ -232,86 +207,12 @@ gdk_window_queue (GdkWindow          *window,
  g_queue_push_tail (display_x11->translate_queue, item);
 }

-static GC
-_get_scratch_gc (GdkWindow *window, cairo_region_t *clip_region)
-{
-  GdkX11Screen *screen;
-  XRectangle *rectangles;
-  gint n_rects;
-  gint depth;
-
-  screen = GDK_X11_SCREEN (gdk_window_get_screen (window));
-  depth = gdk_visual_get_depth (gdk_window_get_visual (window)) - 1;
-
-  if (!screen->subwindow_gcs[depth])
-    {
-      XGCValues values;
-      
-      values.graphics_exposures = True;
-      values.subwindow_mode = IncludeInferiors;
-      
-      screen->subwindow_gcs[depth] = XCreateGC (screen->xdisplay,
-                                                GDK_WINDOW_XID (window),
-                                                GCSubwindowMode | GCGraphicsExposures,
-                                                &values);
-    }
-  
-  _gdk_x11_region_get_xrectangles (clip_region,
-                                   0, 0,
-                                   &rectangles,
-                                   &n_rects);
-  
-  XSetClipRectangles (screen->xdisplay,
-                      screen->subwindow_gcs[depth],
-                      0, 0,
-                      rectangles, n_rects,
-                      YXBanded);
-  
-  g_free (rectangles);
-  return screen->subwindow_gcs[depth];
-}
-
-
-
-void
-_gdk_x11_window_translate (GdkWindow      *window,
-                           cairo_region_t *area,
-                           gint            dx,
-                           gint            dy)
-{
-  GdkWindowQueueItem *item;
-  GC xgc;
-  GdkRectangle extents;
-
-  cairo_region_get_extents (area, &extents);
-
-  xgc = _get_scratch_gc (window, area);
-
-  cairo_region_translate (area, -dx, -dy); /* Move to source region */
-
-  item = g_new (GdkWindowQueueItem, 1);
-  item->type = GDK_WINDOW_QUEUE_TRANSLATE;
-  item->u.translate.area = cairo_region_copy (area);
-  item->u.translate.dx = dx;
-  item->u.translate.dy = dy;
-  gdk_window_queue (window, item);
-
-  XCopyArea (GDK_WINDOW_XDISPLAY (window),
-             GDK_WINDOW_XID (window),
-             GDK_WINDOW_XID (window),
-             xgc,
-             extents.x - dx, extents.y - dy,
-             extents.width, extents.height,
-             extents.x, extents.y);
-}
-
 gboolean
 _gdk_x11_window_queue_antiexpose (GdkWindow *window,
 				  cairo_region_t *area)
 {
  GdkWindowQueueItem *item = g_new (GdkWindowQueueItem, 1);
-  item->type = GDK_WINDOW_QUEUE_ANTIEXPOSE;
-  item->u.antiexpose.area = area;
+  item->antiexpose_area = area;

  gdk_window_queue (window, item);

@@ -339,28 +240,7 @@ _gdk_x11_window_process_expose (GdkWindow    *window,
          if (serial - item->serial > (gulong) G_MAXLONG)
            {
              if (item->window == window)
-                {
-                  if (item->type == GDK_WINDOW_QUEUE_TRANSLATE)
-                    {
-                      if (item->u.translate.area)
-                        {
-                          cairo_region_t *intersection;
-
-                          intersection = cairo_region_copy (invalidate_region);
-                          cairo_region_intersect (intersection, item->u.translate.area);
-                          cairo_region_subtract (invalidate_region, intersection);
-                          cairo_region_translate (intersection, item->u.translate.dx, item->u.translate.dy);
-                          cairo_region_union (invalidate_region, intersection);
-                          cairo_region_destroy (intersection);
-                        }
-                      else
-                        cairo_region_translate (invalidate_region, item->u.translate.dx, item->u.translate.dy);
-                    }
-                  else /* anti-expose */
-                    {
-                      cairo_region_subtract (invalidate_region, item->u.antiexpose.area);
-                    }
-                }
+		cairo_region_subtract (invalidate_region, item->antiexpose_area);
            }
          else
            {
@@ -5334,7 +5334,6 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
  impl_class->input_shape_combine_region = gdk_window_x11_input_shape_combine_region;
  impl_class->set_static_gravities = gdk_window_x11_set_static_gravities;
  impl_class->queue_antiexpose = _gdk_x11_window_queue_antiexpose;
-  impl_class->translate = _gdk_x11_window_translate;
  impl_class->destroy = gdk_x11_window_destroy;
  impl_class->destroy_foreign = gdk_x11_window_destroy_foreign;
  impl_class->resize_cairo_surface = gdk_window_x11_resize_cairo_surface;
@@ -331,8 +331,6 @@ gtk_public_h_sources = 		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
 	gtkspinner.h		\
-	gtkstack.h		\
-	gtkstackswitcher.h	\
 	gtkstatusbar.h		\
 	gtkstatusicon.h		\
 	gtkstock.h		\
@@ -832,8 +830,6 @@ gtk_base_c_sources = 		\
 	gtkshow.c		\
 	gtkspinbutton.c		\
 	gtkspinner.c		\
-	gtkstack.c		\
-	gtkstackswitcher.c	\
 	gtkstatusbar.c		\
 	gtkstatusicon.c		\
 	gtkstock.c		\
@@ -68,34 +68,21 @@ end_element_handler (GMarkupParseContext  *context,
                     GError              **error)
 {
  ParserData *data = user_data;
-  gchar **lines;
-  gint i;

  if (!data->translatable)
    return;

-  lines = g_strsplit (data->text->str, "\n", -1);
-
  if (data->comments)
    g_string_append_printf (data->output, "\n/* %s */\n",
                            data->comments);

  if (data->context)
-    g_string_append_printf (data->output, "C_(\"%s\", ",
-                            data->context);
+    g_string_append_printf (data->output, "C_(\"%s\", \"%s\")\n",
+                            data->context,
+                            data->text->str);
  else
-    g_string_append (data->output, "N_(");
-
-  for (i = 0; lines[i]; i++)
-    g_string_append_printf (data->output, "%s\"%s%s\"%s",
-                            i > 0 ? "   " : "",
-                            lines[i],
-                            lines[i+1] ? "\\n" : "",
-                            lines[i+1] ? "\n" : "");
-
-  g_string_append (data->output, ");\n");
-
-  g_strfreev (lines);
+    g_string_append_printf (data->output, "N_(\"%s\")\n",
+                            data->text->str);

  g_free (data->comments);
  g_free (data->context);
@@ -179,8 +179,6 @@
 #include <gtk/gtksizerequest.h>
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtkspinner.h>
-#include <gtk/gtkstack.h>
-#include <gtk/gtkstackswitcher.h>
 #include <gtk/gtkstatusbar.h>
 #include <gtk/gtkstatusicon.h>
 #include <gtk/gtkstock.h>
@@ -2598,26 +2598,6 @@ gtk_spinner_new
 gtk_spinner_start
 gtk_spinner_stop
 gtk_spin_type_get_type
-gtk_stack_add_named
-gtk_stack_add_titled
-gtk_stack_get_homogeneous
-gtk_stack_get_transition_duration
-gtk_stack_get_transition_type
-gtk_stack_get_type
-gtk_stack_get_visible_child
-gtk_stack_get_visible_child_name
-gtk_stack_new
-gtk_stack_set_homogeneous
-gtk_stack_set_transition_duration
-gtk_stack_set_transition_type
-gtk_stack_set_visible_child
-gtk_stack_set_visible_child_full
-gtk_stack_set_visible_child_name
-gtk_stack_switcher_get_stack
-gtk_stack_switcher_get_type
-gtk_stack_switcher_new
-gtk_stack_switcher_set_stack
-gtk_stack_transition_type_get_type
 gtk_state_flags_get_type
 gtk_state_type_get_type
 gtk_statusbar_accessible_get_type
@@ -258,6 +258,9 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window)

      window->priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined));
      gtk_widget_set_parent (window->priv->menubar, GTK_WIDGET (window));
+      if (_gtk_window_get_content_window (GTK_WINDOW (window)) != NULL)
+        gtk_widget_set_parent_window (window->priv->menubar,
+                                      _gtk_window_get_content_window (GTK_WINDOW (window)));
      gtk_widget_show_all (window->priv->menubar);
      g_object_unref (combined);

@@ -760,6 +763,10 @@ gtk_application_window_real_realize (GtkWidget *widget)
  GTK_WIDGET_CLASS (gtk_application_window_parent_class)
    ->realize (widget);

+  if (window->priv->menubar != NULL)
+    gtk_widget_set_parent_window (window->priv->menubar,
+                                  _gtk_window_get_content_window (GTK_WINDOW (window)));
+
 #ifdef GDK_WINDOWING_X11
  {
    GdkWindow *gdkwindow;
@@ -1557,7 +1557,7 @@ gtk_bindings_activate_list (GObject  *object,
          handled = binding_activate (binding_set, entries,
                                      object, is_release,
                                      &unbound);
-          if (handled || unbound)
+          if (handled)
            break;
        }

@@ -1584,8 +1584,6 @@ gtk_bindings_activate_list (GObject  *object,
          handled = binding_activate (binding_set, entries,
                                      object, is_release,
                                      &unbound);
-          if (unbound)
-            break;
        }

      if (unbound)
@@ -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
@@ -3315,7 +3315,7 @@ gtk_container_propagate_draw (GtkContainer   *container,
 {
  GdkEventExpose *event;
  GtkAllocation allocation;
-  GdkWindow *window, *w;
+  GdkWindow *window, *w, *event_window, *child_in_window;
  int x, y;

  g_return_if_fail (GTK_IS_CONTAINER (container));
@@ -3324,13 +3324,26 @@ gtk_container_propagate_draw (GtkContainer   *container,

  g_assert (gtk_widget_get_parent (child) == GTK_WIDGET (container));

+  if (!gtk_widget_is_drawable (child))
+    return;
+
+  /* Only propagate to native child window if we're not handling
+     an expose (i.e. in a pure gtk_widget_draw() call */
  event = _gtk_cairo_get_event (cr);
-  if (event)
-    {
-      if (gtk_widget_get_has_window (child) ||
-          gtk_widget_get_window (child) != event->window)
-        return;
-    }
+  if (event &&
+      (gtk_widget_get_has_window (child) &&
+       gdk_window_has_native (gtk_widget_get_window (child))))
+    return;
+
+  /* Never propagate to a child window when exposing a window
+     that is not the one the child widget is in. */
+  event_window = _gtk_cairo_get_event_window (cr);
+  if (gtk_widget_get_has_window (child))
+    child_in_window = gdk_window_get_parent (gtk_widget_get_window (child));
+  else
+    child_in_window = gtk_widget_get_window (child);
+  if (child_in_window != event_window)
+    return;

  cairo_save (cr);

@@ -3372,7 +3385,7 @@ gtk_container_propagate_draw (GtkContainer   *container,

  cairo_translate (cr, x, y);

-  _gtk_widget_draw_internal (child, cr, TRUE);
+  gtk_widget_draw (child, cr);

  cairo_restore (cr);
 }
@@ -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>
@@ -1614,9 +1614,17 @@ gtk_main_do_event (GdkEvent *event)
    case GDK_EXPOSE:
      if (event->any.window && gtk_widget_get_double_buffered (event_widget))
        {
-          gdk_window_begin_paint_region (event->any.window, event->expose.region);
-          gtk_widget_send_expose (event_widget, event);
-          gdk_window_end_paint (event->any.window);
+	  /* We handle exposes only on native windows, relying on the
+	   * draw() handler to propagate down to non-native windows.
+	   * This is ok now that we child windows always are considered
+	   * (semi)transparent.
+	   */
+	  if (gdk_window_has_native (event->expose.window))
+	    {
+	      gdk_window_begin_paint_region (event->any.window, event->expose.region);
+	      gtk_widget_send_expose (event_widget, event);
+	      gdk_window_end_paint (event->any.window);
+	    }
        }
      else
        {
@@ -2100,16 +2100,6 @@ gtk_menu_shell_tracker_remove_func (gint     position,
 * mentioned and @action_namespace is "app" then the effective action
 * name is "app.quit".
 *
- * This function uses #GtkActionable to define the action name and
- * target values on the created menu items.  If you want to use an
- * action group other than "app" and "win", or if you want to use a
- * #GtkMenuShell outside of a #GtkApplicationWindow, then you will need
- * to attach your own action group to the widget hierarchy using
- * gtk_widget_insert_action_group().  As an example, if you created a
- * group with a "quit" action and inserted it with the name "mygroup"
- * then you would use the action name "mygroup.quit" in your
- * #GMenuModel.
- *
 * For most cases you are probably better off using
 * gtk_menu_new_from_model() or gtk_menu_bar_new_from_model() or just
 * directly passing the #GMenuModel to gtk_application_set_app_menu() or
@@ -108,26 +108,6 @@

 #define DO_NOT_COMPILE 0

-/* These are used when a destination-side DnD operation is taking place.
- * Normally, when a file is being hovered directly over a bookmark,
- * we'll be in DROP_STATE_NORMAL.
- *
- * But when a file is being hovered between bookmarks, this means the user
- * may want to create a new bookmark for that file between those bookmarks.
- * In that case, the drop state will be *not* DROP_STATE_NORMAL.
- *
- * When the drop state is FADING_OUT, it means that the user is hovering
- * directly over an existing bookmark and an immediate drop will cause the
- * file being dragged to be dropped on the bookmark, instead of causing
- * a new bookmark to be created.
- */
-typedef enum {
-	DROP_STATE_NORMAL,
-	DROP_STATE_NEW_BOOKMARK_FADING_IN,
-	DROP_STATE_NEW_BOOKMARK_ARMED,
-	DROP_STATE_NEW_BOOKMARK_FADING_OUT
-} DropState;
-
 struct _GtkPlacesSidebar {
 	GtkScrolledWindow parent;

@@ -163,12 +143,6 @@ struct _GtkPlacesSidebar {

 	GtkPlacesOpenFlags open_flags;

-	DropState drop_state;
-	int new_bookmark_index;
-	guint drag_leave_timeout_id;
-	guint switch_location_timer;
-	char *drop_target_uri;
-
 	guint show_desktop : 1;
 };

@@ -221,7 +195,6 @@ typedef enum {
 	PLACES_MOUNTED_VOLUME,
 	PLACES_BOOKMARK,
 	PLACES_HEADING,
-	PLACES_DROP_FEEDBACK
 } PlaceType;

 typedef enum {
@@ -767,8 +740,8 @@ update_places (GtkPlacesSidebar *sidebar)
 	icon = g_themed_icon_new (ICON_NAME_HOME);
 	add_place (sidebar, PLACES_BUILT_IN,
 		   SECTION_COMPUTER,
-		   _("Home"), icon, home_uri,
-		   NULL, NULL, NULL, 0,
+		   _("Home"), icon,
+		   home_uri, NULL, NULL, NULL, 0,
 		   _("Open your personal folder"));
 	g_object_unref (icon);
 	g_free (home_uri);
@@ -779,8 +752,8 @@ update_places (GtkPlacesSidebar *sidebar)
 		icon = g_themed_icon_new (ICON_NAME_DESKTOP);
 		add_place (sidebar, PLACES_BUILT_IN,
 			   SECTION_COMPUTER,
-			   _("Desktop"), icon, mount_uri,
-			   NULL, NULL, NULL, 0,
+			   _("Desktop"), icon,
+			   mount_uri, NULL, NULL, NULL, 0,
 			   _("Open the contents of your desktop in a folder"));
 		g_object_unref (icon);
 		g_free (mount_uri);
@@ -949,8 +922,8 @@ update_places (GtkPlacesSidebar *sidebar)
 	icon = g_themed_icon_new (ICON_NAME_FILESYSTEM);
 	add_place (sidebar, PLACES_BUILT_IN,
 		   SECTION_DEVICES,
-		   sidebar->hostname, icon, mount_uri,
-		   NULL, NULL, NULL, 0,
+		   sidebar->hostname, icon,
+		   mount_uri, NULL, NULL, NULL, 0,
 		   _("Open the contents of the File System"));
 	g_object_unref (icon);

@@ -1057,8 +1030,8 @@ update_places (GtkPlacesSidebar *sidebar)
 	icon = g_themed_icon_new (ICON_NAME_NETWORK);
 	add_place (sidebar, PLACES_BUILT_IN,
 		   SECTION_NETWORK,
-		   _("Browse Network"), icon, mount_uri,
-		   NULL, NULL, NULL, 0,
+		   _("Browse Network"), icon,
+		   mount_uri, NULL, NULL, NULL, 0,
 		   _("Browse the contents of the network"));
 	g_object_unref (icon);

@@ -1309,12 +1282,6 @@ compute_drop_position (GtkTreeView             *tree_view,

 	drop_possible = TRUE;

-	/* Normalize drops on the feedback row */
-	if (place_type == PLACES_DROP_FEEDBACK) {
-		*pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
-		goto out;
-	}
-
 	/* Never drop on headings, but special case the bookmarks heading,
 	 * so we can drop bookmarks in between it and the first bookmark.
 	 */
@@ -1376,8 +1343,6 @@ compute_drop_position (GtkTreeView             *tree_view,
 		g_free (uri);
 	}

-out:
-
 	if (!drop_possible) {
 		gtk_tree_path_free (*path);
 		*path = NULL;
@@ -1409,15 +1374,6 @@ get_drag_data (GtkTreeView *tree_view,
 	return TRUE;
 }

-static void
-remove_switch_location_timer (GtkPlacesSidebar *sidebar)
-{
-	if (sidebar->switch_location_timer != 0) {
-		g_source_remove (sidebar->switch_location_timer);
-		sidebar->switch_location_timer = 0;
-	}
-}
-
 static void
 free_drag_data (GtkPlacesSidebar *sidebar)
 {
@@ -1427,142 +1383,6 @@ free_drag_data (GtkPlacesSidebar *sidebar)
 		g_list_free_full (sidebar->drag_list, g_object_unref);
 		sidebar->drag_list = NULL;
 	}
-
-	remove_switch_location_timer (sidebar);
-
-	g_free (sidebar->drop_target_uri);
-	sidebar->drop_target_uri = NULL;
-}
-
-static gboolean
-switch_location_timer (gpointer user_data)
-{
-	GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
-	GFile *location;
-
-	sidebar->switch_location_timer = 0;
-
-	location = g_file_new_for_uri (sidebar->drop_target_uri);
-	emit_open_location (sidebar, location, 0);
-	g_object_unref (location);
-
-	return FALSE;
-}
-
-static void
-check_switch_location_timer (GtkPlacesSidebar *sidebar, const char *uri)
-{
-	GtkSettings *settings;
-	guint timeout;
-
-	if (g_strcmp0 (uri, sidebar->drop_target_uri) == 0) {
-		return;
-	}
-	remove_switch_location_timer (sidebar);
-
-	settings = gtk_widget_get_settings (GTK_WIDGET (sidebar));
-	g_object_get (settings, "gtk-timeout-expand", &timeout, NULL);
-
-	g_free (sidebar->drop_target_uri);
-	sidebar->drop_target_uri = NULL;
-
-	if (uri != NULL) {
-		sidebar->drop_target_uri = g_strdup (uri);
-		sidebar->switch_location_timer = gdk_threads_add_timeout (timeout, switch_location_timer, sidebar);
-	}
-}
-
-static void
-remove_drop_bookmark_feedback_row (GtkPlacesSidebar *sidebar)
-{
-	if (sidebar->drop_state != DROP_STATE_NORMAL) {
-		gboolean success;
-		GtkTreeIter iter;
-
-		success = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (sidebar->store), &iter, NULL, sidebar->new_bookmark_index);
-		g_assert (success);
-		gtk_list_store_remove (sidebar->store, &iter);
-
-		sidebar->drop_state = DROP_STATE_NORMAL;
-	}
-}
-
-#if 0
-static const char *
-pos_to_string (GtkTreeViewDropPosition pos)
-{
-	switch (pos) {
-	case GTK_TREE_VIEW_DROP_BEFORE:
-		return "before";
-		
-	case GTK_TREE_VIEW_DROP_AFTER:
-		return "after";
-		
-	case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-		return "into_or_before";
-		
-	case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
-		return "into_or_after";
-
-	default:
-		return "w00t";
-	}
-}
-#endif
-
-static void
-start_drop_feedback (GtkPlacesSidebar *sidebar, GtkTreePath *path, GtkTreeViewDropPosition pos, gboolean drop_as_bookmarks)
-{
-	if (drop_as_bookmarks) {
-		int new_bookmark_index;
-		GtkTreePath *new_path;
-		gboolean need_feedback_row;
-
-		new_bookmark_index = gtk_tree_path_get_indices (path)[0];
-		if (pos == GTK_TREE_VIEW_DROP_AFTER)
-			new_bookmark_index++;
-
-		if (sidebar->drop_state == DROP_STATE_NORMAL)
-			need_feedback_row = TRUE;
-		else {
-			/* Feedback row already exists; remove it if its position needs to change */
-
-			if (sidebar->new_bookmark_index == new_bookmark_index)
-				need_feedback_row = FALSE;
-			else {
-				if (sidebar->new_bookmark_index < new_bookmark_index)
-					new_bookmark_index--; /* since the removal of the old feedback row pushed items one position up */
-
-				remove_drop_bookmark_feedback_row (sidebar);
-				need_feedback_row = TRUE;
-			}
-		}
-
-		if (need_feedback_row) {
-			GtkTreeIter iter;
-
-			sidebar->new_bookmark_index = new_bookmark_index;
-			gtk_list_store_insert_with_values (sidebar->store, &iter, sidebar->new_bookmark_index,
-							   PLACES_SIDEBAR_COLUMN_ROW_TYPE, PLACES_DROP_FEEDBACK,
-							   PLACES_SIDEBAR_COLUMN_SECTION_TYPE, SECTION_BOOKMARKS,
-							   PLACES_SIDEBAR_COLUMN_NAME, _("New bookmark"),
-							   PLACES_SIDEBAR_COLUMN_NO_EJECT, TRUE,
-							   -1);
-		}
-
-		new_path = gtk_tree_path_new_from_indices (sidebar->new_bookmark_index, -1);
-		gtk_tree_view_set_drag_dest_row (sidebar->tree_view, new_path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-		gtk_tree_path_free (new_path);
-
-		sidebar->drop_state = DROP_STATE_NEW_BOOKMARK_ARMED;
-	} else
-		gtk_tree_view_set_drag_dest_row (sidebar->tree_view, path, pos);
-}
-
-static void
-stop_drop_feedback (GtkPlacesSidebar *sidebar)
-{
-	gtk_tree_view_set_drag_dest_row (sidebar->tree_view, NULL, 0);
 }

 static gboolean
@@ -1578,11 +1398,8 @@ drag_motion_callback (GtkTreeView *tree_view,
 	int action;
 	GtkTreeIter iter;
 	gboolean res;
-	gboolean drop_as_bookmarks;
-	char *drop_target_uri = NULL;

 	action = 0;
-	drop_as_bookmarks = FALSE;

 	if (!sidebar->drag_data_received) {
 		if (!get_drag_data (tree_view, context, time)) {
@@ -1609,6 +1426,7 @@ drag_motion_callback (GtkTreeView *tree_view,
 		if (sidebar->drag_list != NULL) {
 			SectionType section_type;
 			PlaceType place_type;
+			gboolean drop_as_bookmarks;

 			gtk_tree_model_get_iter (GTK_TREE_MODEL (sidebar->store),
 						 &iter, path);
@@ -1618,40 +1436,40 @@ drag_motion_callback (GtkTreeView *tree_view,
 					    PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
 					    -1);

-			if (place_type == PLACES_DROP_FEEDBACK
-			    || (section_type == SECTION_BOOKMARKS
-				&& (pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER))) {
-				action = GDK_ACTION_COPY;
-				drop_as_bookmarks = TRUE;
+			drop_as_bookmarks = FALSE;
+
+			if (section_type == SECTION_BOOKMARKS) {
+				if (pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER) {
+					action = GDK_ACTION_COPY;
+					drop_as_bookmarks = TRUE;
+				}
 			}

 			if (!drop_as_bookmarks) {
+				char *uri;
+
 				gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store),
 						    &iter,
-						    PLACES_SIDEBAR_COLUMN_URI, &drop_target_uri,
+						    PLACES_SIDEBAR_COLUMN_URI, &uri,
 						    -1);

-				if (drop_target_uri != NULL) {
-					GFile *dest_file = g_file_new_for_uri (drop_target_uri);
+				if (uri != NULL) {
+					GFile *dest_file = g_file_new_for_uri (uri);

 					action = emit_drag_action_requested (sidebar, context, dest_file, sidebar->drag_list);

 					g_object_unref (dest_file);
+					g_free (uri);
 				} /* uri may be NULL for unmounted volumes, for example, so we don't allow drops there */
 			}
 		}
 	}

 out:
-	if (action != 0) {
-		check_switch_location_timer (sidebar, drop_target_uri);
-		start_drop_feedback (sidebar, path, pos, drop_as_bookmarks);
-	} else {
-		remove_switch_location_timer (sidebar);
-		stop_drop_feedback (sidebar);
-	}
-
-	g_free (drop_target_uri);
+	if (action != 0)
+		gtk_tree_view_set_drag_dest_row (tree_view, path, pos);
+	else
+		gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos);

 	if (path != NULL) {
 		gtk_tree_path_free (path);
@@ -1664,32 +1482,14 @@ drag_motion_callback (GtkTreeView *tree_view,
 	return TRUE;
 }

-static gboolean
-drag_leave_timeout_cb (gpointer data)
-{
-	GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (data);
-
-	free_drag_data (sidebar);
-	stop_drop_feedback (sidebar);
-	remove_drop_bookmark_feedback_row (sidebar);
-
-	sidebar->drag_leave_timeout_id = 0;
-	return FALSE;
-}
-
 static void
 drag_leave_callback (GtkTreeView *tree_view,
 		     GdkDragContext *context,
 		     unsigned int time,
 		     GtkPlacesSidebar *sidebar)
 {
-	if (sidebar->drag_leave_timeout_id)
-		g_source_remove (sidebar->drag_leave_timeout_id);
-
-	sidebar->drag_leave_timeout_id = gdk_threads_add_timeout (500, drag_leave_timeout_cb, sidebar);
-
-	remove_switch_location_timer (sidebar);
-
+	free_drag_data (sidebar);
+	gtk_tree_view_set_drag_dest_row (tree_view, NULL, 0);
 	g_signal_stop_emission_by_name (tree_view, "drag-leave");
 }

@@ -1870,9 +1670,7 @@ drag_data_received_callback (GtkWidget *widget,
 					position++;

 				if (tree_pos == GTK_TREE_VIEW_DROP_BEFORE
-				    || tree_pos == GTK_TREE_VIEW_DROP_AFTER
-				    || place_type == PLACES_DROP_FEEDBACK) {
-					remove_drop_bookmark_feedback_row (sidebar);
+				    || tree_pos == GTK_TREE_VIEW_DROP_AFTER) {
 					drop_files_as_bookmarks (sidebar, source_file_list, position);
 					success = TRUE;
 					drop_as_bookmarks = TRUE;
@@ -1902,7 +1700,6 @@ drag_data_received_callback (GtkWidget *widget,
 out:
 	sidebar->drop_occured = FALSE;
 	free_drag_data (sidebar);
-	remove_drop_bookmark_feedback_row (sidebar);
 	gtk_drag_finish (context, success, FALSE, time);

 	gtk_tree_path_free (tree_path);
@@ -1917,7 +1714,6 @@ drag_drop_callback (GtkTreeView *tree_view,
 		    GtkPlacesSidebar *sidebar)
 {
 	gboolean retval = FALSE;
-
 	sidebar->drop_occured = TRUE;
 	retval = get_drag_data (tree_view, context, time);
 	g_signal_stop_emission_by_name (tree_view, "drag-drop");
@@ -3211,22 +3007,6 @@ bookmarks_popup_menu_cb (GtkWidget *widget,
 	return TRUE;
 }

-static void
-bookmarks_row_activated_cb (GtkWidget *widget,
-			    GtkTreePath *path,
-			    GtkTreeViewColumn *column,
-			    GtkPlacesSidebar *sidebar)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-	if (!gtk_tree_model_get_iter (model, &iter, path)) {
-		return;
-	}
-
-	open_selected_bookmark (sidebar, model, &iter, 0);
-}
-
 static gboolean
 bookmarks_button_release_event_cb (GtkWidget *widget,
 				   GdkEventButton *event,
@@ -3252,10 +3032,6 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
 		return FALSE;
 	}

-	if (event->button == 1) {
-		return FALSE;
-	}
-
 	tree_view = GTK_TREE_VIEW (widget);
 	model = gtk_tree_view_get_model (tree_view);

@@ -3276,7 +3052,9 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
 		return FALSE;
 	}

-	if (event->button == 2) {
+	if (event->button == 1) {
+		open_selected_bookmark (sidebar, model, &iter, 0);
+	} else if (event->button == 2) {
 		GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;

 		open_flags = ((event->state & GDK_CONTROL_MASK) ?
@@ -3570,6 +3348,36 @@ bookmarks_changed_cb (gpointer data)
 	update_places (sidebar);
 }

+static gboolean
+tree_view_button_press_callback (GtkWidget *tree_view,
+				 GdkEventButton *event,
+				 gpointer data)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *column;
+
+	if (event->button == 1 && event->type == GDK_BUTTON_PRESS) {
+		if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tree_view),
+						   event->x, event->y,
+						   &path,
+						   &column,
+						   NULL,
+						   NULL)) {
+			gtk_tree_view_row_activated (GTK_TREE_VIEW (tree_view), path, column);
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+tree_view_set_activate_on_single_click (GtkTreeView *tree_view)
+{
+	g_signal_connect (tree_view, "button_press_event",
+			  G_CALLBACK (tree_view_button_press_callback),
+			  NULL);
+}
+
 static void
 trash_monitor_trash_state_changed_cb (GtkTrashMonitor *monitor,
 				      GtkPlacesSidebar *sidebar)
@@ -3766,10 +3574,8 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
 			  G_CALLBACK (bookmarks_popup_menu_cb), sidebar);
 	g_signal_connect (tree_view, "button-release-event",
 			  G_CALLBACK (bookmarks_button_release_event_cb), sidebar);
-	g_signal_connect (tree_view, "row-activated",
-			  G_CALLBACK (bookmarks_row_activated_cb), sidebar);

-	gtk_tree_view_set_activate_on_single_click (sidebar->tree_view, TRUE);
+	tree_view_set_activate_on_single_click (sidebar->tree_view);

 	sidebar->hostname = g_strdup (_("Computer"));
 	sidebar->hostnamed_cancellable = g_cancellable_new ();
@@ -3782,9 +3588,6 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
 				  sidebar->hostnamed_cancellable,
 				  hostname_proxy_new_cb,
 				  g_object_ref (sidebar));
-
-	sidebar->drop_state = DROP_STATE_NORMAL;
-	sidebar->new_bookmark_index = -1;
 }

 static void
@@ -3844,11 +3647,6 @@ gtk_places_sidebar_dispose (GObject *object)

 	sidebar->tree_view = NULL;

-	if (sidebar->drag_leave_timeout_id) {
-		g_source_remove (sidebar->drag_leave_timeout_id);
-		sidebar->drag_leave_timeout_id = 0;
-	}
-
 	free_drag_data (sidebar);

 	if (sidebar->bookmarks_manager != NULL) {
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *
- */
-
-#ifndef __GTK_STACK_H__
-#define __GTK_STACK_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_STACK (gtk_stack_get_type ())
-#define GTK_STACK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK, GtkStack))
-#define GTK_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK, GtkStackClass))
-#define GTK_IS_STACK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK))
-#define GTK_IS_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK))
-#define GTK_STACK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK, GtkStackClass))
-
-typedef struct _GtkStack GtkStack;
-typedef struct _GtkStackClass GtkStackClass;
-typedef struct _GtkStackPrivate GtkStackPrivate;
-
-typedef enum {
-  GTK_STACK_TRANSITION_TYPE_NONE,
-  GTK_STACK_TRANSITION_TYPE_CROSSFADE,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_UP,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN
-} GtkStackTransitionType;
-
-struct _GtkStack {
-  GtkContainer parent_instance;
-  GtkStackPrivate *priv;
-};
-
-struct _GtkStackClass {
-  GtkContainerClass parent_class;
-};
-
-GType                  gtk_stack_get_type                (void) G_GNUC_CONST;
-
-GtkWidget *            gtk_stack_new                     (void);
-void                   gtk_stack_add_named               (GtkStack               *stack,
-                                                          GtkWidget              *child,
-                                                          const gchar            *name);
-void                   gtk_stack_add_titled              (GtkStack               *stack,
-                                                          GtkWidget              *child,
-                                                          const gchar            *name,
-                                                          const gchar            *title);
-void                   gtk_stack_set_visible_child       (GtkStack               *stack,
-                                                          GtkWidget              *child);
-GtkWidget *            gtk_stack_get_visible_child       (GtkStack               *stack);
-void                   gtk_stack_set_visible_child_name  (GtkStack               *stack,
-                                                          const gchar            *name);
-const gchar *          gtk_stack_get_visible_child_name  (GtkStack               *stack);
-void                   gtk_stack_set_visible_child_full  (GtkStack               *stack,
-                                                          const gchar            *name,
-                                                          GtkStackTransitionType  transition_type);
-void                   gtk_stack_set_homogeneous         (GtkStack               *stack,
-                                                          gboolean                homogeneous);
-gboolean               gtk_stack_get_homogeneous         (GtkStack               *stack);
-void                   gtk_stack_set_transition_duration (GtkStack               *stack,
-                                                          guint                   transition_duration);
-guint                  gtk_stack_get_transition_duration (GtkStack               *stack);
-void                   gtk_stack_set_transition_type     (GtkStack               *stack,
-                                                          GtkStackTransitionType  transition_type);
-GtkStackTransitionType gtk_stack_get_transition_type     (GtkStack               *stack);
-
-G_END_DECLS
-
-#endif
@@ -1,445 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include "config.h"
-#include "gtkstackswitcher.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-
-/**
- * SECTION:gtkstackswitcher
- * @Short_decription: A controller for GtkStack
- * @Title: GtkStackSwitcher
- * @See_also: #GtkStack
- *
- * The GtkStackSwitcher widget acts as a controller for a
- * #GtkStack; it shows a row of buttons to switch between
- * the various pages of the associated stack widget.
- *
- * All the content for the buttons comes from the child properties
- * of the #GtkStack.
- *
- * It is possible to associate multiple #GtkStackSwitcher widgets
- * with the same stack widget.
- *
- * The GtkStackSwitcher widget was added in 3.10.
- */
-
-struct _GtkStackSwitcherPrivate
-{
-  GtkStack *stack;
-  GHashTable *buttons;
-  gboolean in_child_changed;
-};
-
-enum {
-  PROP_0,
-  PROP_STACK
-};
-
-G_DEFINE_TYPE (GtkStackSwitcher, gtk_stack_switcher, GTK_TYPE_BOX);
-
-static void
-gtk_stack_switcher_init (GtkStackSwitcher *switcher)
-{
-  GtkStyleContext *context;
-  GtkStackSwitcherPrivate *priv;
-
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (switcher, GTK_TYPE_STACK_SWITCHER, GtkStackSwitcherPrivate);
-  switcher->priv = priv;
-
-  priv->stack = NULL;
-  priv->buttons = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (switcher));
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
-
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (switcher), GTK_ORIENTATION_HORIZONTAL);
-}
-
-static void
-clear_switcher (GtkStackSwitcher *self)
-{
-  gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback) gtk_widget_destroy, self);
-}
-
-static void
-on_button_clicked (GtkWidget        *widget,
-                   GtkStackSwitcher *self)
-{
-  GtkWidget *child;
-
-  if (!self->priv->in_child_changed)
-    {
-      child = g_object_get_data (G_OBJECT (widget), "stack-child");
-      gtk_stack_set_visible_child (self->priv->stack, child);
-    }
-}
-
-static void
-rebuild_child (GtkWidget   *self,
-               const gchar *icon_name,
-               const gchar *title)
-{
-  GtkStyleContext *context;
-  GtkWidget *button_child;
-
-  gtk_widget_set_valign (GTK_WIDGET (self), GTK_ALIGN_CENTER);
-
-  button_child = gtk_bin_get_child (GTK_BIN (self));
-  if (button_child != NULL)
-    gtk_widget_destroy (button_child);
-
-  button_child = NULL;
-  context = gtk_widget_get_style_context (GTK_WIDGET (self));
-
-  if (icon_name != NULL)
-    {
-      button_child = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-      if (title != NULL)
-        gtk_widget_set_tooltip_text (GTK_WIDGET (self), title);
-
-      gtk_style_context_remove_class (context, "text-button");
-      gtk_style_context_add_class (context, "image-button");
-    }
-  else if (title != NULL)
-    {
-      button_child = gtk_label_new (title);
-
-      gtk_style_context_remove_class (context, "image-button");
-      gtk_style_context_add_class (context, "text-button");
-    }
-
-  if (button_child)
-    {
-      gtk_widget_show_all (button_child);
-      gtk_container_add (GTK_CONTAINER (self), button_child);
-    }
-}
-
-static void
-update_button (GtkStackSwitcher *self,
-               GtkWidget        *widget,
-               GtkWidget        *button)
-{
-  gchar *title;
-  gchar *icon_name;
-
-  gtk_container_child_get (GTK_CONTAINER (self->priv->stack), widget,
-                           "title", &title,
-                           "icon-name", &icon_name,
-                           NULL);
-
-  rebuild_child (button, icon_name, title);
-
-  gtk_widget_set_visible (button, title != NULL || icon_name != NULL);
-
-  if (icon_name != NULL)
-    gtk_widget_set_size_request (button, -1, -1);
-  else
-    gtk_widget_set_size_request (button, 100, -1);
-
-  g_free (title);
-  g_free (icon_name);
-}
-
-static void
-on_title_icon_updated (GtkWidget        *widget,
-                       GParamSpec       *pspec,
-                       GtkStackSwitcher *self)
-{
-  GtkWidget *button;
-
-  button = g_hash_table_lookup (self->priv->buttons, widget);
-  update_button (self, widget, button);
-}
-
-static void
-on_position_updated (GtkWidget        *widget,
-                     GParamSpec       *pspec,
-                     GtkStackSwitcher *self)
-{
-  GtkWidget *button;
-  gint position;
-
-  button = g_hash_table_lookup (self->priv->buttons, widget);
-
-  gtk_container_child_get (GTK_CONTAINER (self->priv->stack), widget,
-                           "position", &position,
-                           NULL);
-
-  gtk_box_reorder_child (GTK_BOX (self), button, position);
-}
-
-static void
-add_child (GtkStackSwitcher *self,
-           GtkWidget        *widget)
-{
-  GtkWidget *button;
-  GList *group;
-
-  button = gtk_radio_button_new (NULL);
-  gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
-
-  update_button (self, widget, button);
-
-  group = gtk_container_get_children (GTK_CONTAINER (self));
-  if (group != NULL)
-    {
-      gtk_radio_button_join_group (GTK_RADIO_BUTTON (button), GTK_RADIO_BUTTON (group->data));
-      g_list_free (group);
-    }
-
-  gtk_container_add (GTK_CONTAINER (self), button);
-
-  g_object_set_data (G_OBJECT (button), "stack-child", widget);
-  g_signal_connect (button, "clicked", G_CALLBACK (on_button_clicked), self);
-  g_signal_connect (widget, "child-notify::title", G_CALLBACK (on_title_icon_updated), self);
-  g_signal_connect (widget, "child-notify::icon-name", G_CALLBACK (on_title_icon_updated), self);
-  g_signal_connect (widget, "child-notify::position", G_CALLBACK (on_position_updated), self);
-
-  g_hash_table_insert (self->priv->buttons, widget, button);
-}
-
-static void
-foreach_stack (GtkWidget        *widget,
-               GtkStackSwitcher *self)
-{
-  add_child (self, widget);
-}
-
-static void
-populate_switcher (GtkStackSwitcher *self)
-{
-  gtk_container_foreach (GTK_CONTAINER (self->priv->stack), (GtkCallback)foreach_stack, self);
-}
-
-static void
-on_child_changed (GtkWidget        *widget,
-                  GParamSpec       *pspec,
-                  GtkStackSwitcher *self)
-{
-  GtkWidget *child;
-  GtkWidget *button;
-
-  child = gtk_stack_get_visible_child (GTK_STACK (widget));
-  button = g_hash_table_lookup (self->priv->buttons, child);
-  if (button != NULL)
-    {
-      self->priv->in_child_changed = TRUE;
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-      self->priv->in_child_changed = FALSE;
-    }
-}
-
-static void
-on_stack_child_added (GtkContainer     *container,
-                      GtkWidget        *widget,
-                      GtkStackSwitcher *self)
-{
-  add_child (self, widget);
-}
-
-static void
-on_stack_child_removed (GtkContainer     *container,
-                        GtkWidget        *widget,
-                        GtkStackSwitcher *self)
-{
-  GtkWidget *button;
-
-  button = g_hash_table_lookup (self->priv->buttons, widget);
-  gtk_container_remove (GTK_CONTAINER (self), button);
-  g_hash_table_remove (self->priv->buttons, widget);
-}
-
-static void
-disconnect_stack_signals (GtkStackSwitcher *switcher)
-{
-  GtkStackSwitcherPrivate *priv = switcher->priv;
-
-  g_signal_handlers_disconnect_by_func (priv->stack, on_stack_child_added, switcher);
-  g_signal_handlers_disconnect_by_func (priv->stack, on_stack_child_removed, switcher);
-  g_signal_handlers_disconnect_by_func (priv->stack, on_child_changed, switcher);
-  g_signal_handlers_disconnect_by_func (priv->stack, disconnect_stack_signals, switcher);
-}
-
-static void
-connect_stack_signals (GtkStackSwitcher *switcher)
-{
-  GtkStackSwitcherPrivate *priv = switcher->priv;
-
-  g_signal_connect_after (priv->stack, "add",
-                          G_CALLBACK (on_stack_child_added), switcher);
-  g_signal_connect_after (priv->stack, "remove",
-                          G_CALLBACK (on_stack_child_removed), switcher);
-  g_signal_connect (priv->stack, "notify::visible-child",
-                    G_CALLBACK (on_child_changed), switcher);
-  g_signal_connect_swapped (priv->stack, "destroy",
-                            G_CALLBACK (disconnect_stack_signals), switcher);
-}
-
-/**
- * gtk_stack_switcher_set_stack:
- * @switcher: a #GtkStackSwitcher
- * @stack: (allow-none): a #GtkStack
- *
- * Sets the stack to control.
- *
- * Since: 3.10
- */
-void
-gtk_stack_switcher_set_stack (GtkStackSwitcher *switcher,
-                              GtkStack         *stack)
-{
-  GtkStackSwitcherPrivate *priv;
-
-  g_return_if_fail (GTK_IS_STACK_SWITCHER (switcher));
-  if (stack)
-    g_return_if_fail (GTK_IS_STACK (stack));
-
-  priv = switcher->priv;
-
-  if (priv->stack == stack)
-    return;
-
-  if (priv->stack)
-    {
-      disconnect_stack_signals (switcher);
-      clear_switcher (switcher);
-      g_clear_object (&priv->stack);
-    }
-
-  if (stack)
-    {
-      priv->stack = g_object_ref (stack);
-      populate_switcher (switcher);
-      connect_stack_signals (switcher);
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (switcher));
-
-  g_object_notify (G_OBJECT (switcher), "stack");
-}
-
-/**
- * gtk_stack_switcher_get_stack:
- * @switcher: a #GtkStackSwitcher
- *
- * Retrieves the stack.
- * See gtk_stack_switcher_set_stack().
- *
- * Return value: (transfer none): the stack, or %NULL if
- *    none has been set explicitly.
- *
- * Since: 3.10
- */
-GtkStack *
-gtk_stack_switcher_get_stack (GtkStackSwitcher *switcher)
-{
-  g_return_val_if_fail (GTK_IS_STACK_SWITCHER (switcher), NULL);
-
-  return switcher->priv->stack;
-}
-
-static void
-gtk_stack_switcher_get_property (GObject      *object,
-                                 guint         prop_id,
-                                 GValue       *value,
-                                 GParamSpec   *pspec)
-{
-  GtkStackSwitcher *switcher = GTK_STACK_SWITCHER (object);
-  GtkStackSwitcherPrivate *priv = switcher->priv;
-
-  switch (prop_id)
-    {
-    case PROP_STACK:
-      g_value_set_object (value, priv->stack);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_stack_switcher_set_property (GObject      *object,
-                                 guint         prop_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  GtkStackSwitcher *switcher = GTK_STACK_SWITCHER (object);
-
-  switch (prop_id)
-    {
-    case PROP_STACK:
-      gtk_stack_switcher_set_stack (switcher, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_stack_switcher_dispose (GObject *object)
-{
-  GtkStackSwitcher *switcher = GTK_STACK_SWITCHER (object);
-
-  gtk_stack_switcher_set_stack (switcher, NULL);
-
-  G_OBJECT_CLASS (gtk_stack_switcher_parent_class)->dispose (object);
-}
-
-static void
-gtk_stack_switcher_class_init (GtkStackSwitcherClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->get_property = gtk_stack_switcher_get_property;
-  object_class->set_property = gtk_stack_switcher_set_property;
-  object_class->dispose = gtk_stack_switcher_dispose;
-
-  g_object_class_install_property (object_class,
-                                   PROP_STACK,
-                                   g_param_spec_object ("stack",
-                                                        P_("Stack"),
-                                                        P_("Stack"),
-                                                        GTK_TYPE_STACK,
-                                                        GTK_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
-
-  g_type_class_add_private (object_class, sizeof (GtkStackSwitcherPrivate));
-}
-
-/**
- * gtk_stack_switcher_new:
- *
- * Create a new #GtkStackSwitcher.
- *
- * Return value: a new #GtkStackSwitcher.
- *
- * Since: 3.10
- */
-GtkWidget *
-gtk_stack_switcher_new (void)
-{
-  return GTK_WIDGET (g_object_new (GTK_TYPE_STACK_SWITCHER, NULL));
-}
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __GTK_STACK_SWITCHER_H__
-#define __GTK_STACK_SWITCHER_H__
-
-#include "gtkstack.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STACK_SWITCHER            (gtk_stack_switcher_get_type ())
-#define GTK_STACK_SWITCHER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK_SWITCHER, GtkStackSwitcher))
-#define GTK_STACK_SWITCHER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK_SWITCHER, GtkStackSwitcherClass))
-#define GTK_IS_STACK_SWITCHER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK_SWITCHER))
-#define GTK_IS_STACK_SWITCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK_SWITCHER))
-#define GTK_STACK_SWITCHER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK_SWITCHER, GtkStackSwitcherClass))
-
-typedef struct _GtkStackSwitcher              GtkStackSwitcher;
-typedef struct _GtkStackSwitcherPrivate       GtkStackSwitcherPrivate;
-typedef struct _GtkStackSwitcherClass         GtkStackSwitcherClass;
-
-struct _GtkStackSwitcher
-{
-  GtkBox widget;
-
-  /*< private >*/
-  GtkStackSwitcherPrivate *priv;
-};
-
-struct _GtkStackSwitcherClass
-{
-  GtkBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_stack_switcher_get_type          (void) G_GNUC_CONST;
-GtkWidget *  gtk_stack_switcher_new               (void);
-void         gtk_stack_switcher_set_stack         (GtkStackSwitcher *switcher,
-                                                   GtkStack         *stack);
-GtkStack *   gtk_stack_switcher_get_stack         (GtkStackSwitcher *switcher);
-
-G_END_DECLS
-
-#endif /* __GTK_STACK_SWITCHER_H__ */
@@ -14420,7 +14420,7 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
  gint cell_y;
  gint bin_x, bin_y;
  gdouble offset_into_row;
-  gdouble fourth;
+  gdouble third;
  GdkRectangle cell;
  GtkTreeViewColumn *column = NULL;
  GtkTreePath *tmp_path = NULL;
@@ -14442,8 +14442,8 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
  if (tree_view->priv->tree == NULL)
    return FALSE;

-  /* If in the top fourth of a row, we drop before that row; if
-   * in the bottom fourth, drop after that row; if in the middle,
+  /* If in the top third of a row, we drop before that row; if
+   * in the bottom third, drop after that row; if in the middle,
   * and the row has children, drop into the row.
   */
  gtk_tree_view_convert_widget_to_bin_window_coords (tree_view, drag_x, drag_y,
@@ -14470,11 +14470,11 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,

  tmp_path = NULL;

-  fourth = cell.height / 4.0;
+  third = cell.height / 3.0;

  if (pos)
    {
-      if (offset_into_row < fourth)
+      if (offset_into_row < third)
        {
          *pos = GTK_TREE_VIEW_DROP_BEFORE;
        }
@@ -14482,7 +14482,7 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
        {
          *pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
        }
-      else if (offset_into_row < cell.height - fourth)
+      else if (offset_into_row < third * 2.0)
        {
          *pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
        }
@@ -66,6 +66,13 @@ struct _GtkViewportPrivate
  GdkWindow      *bin_window;
  GdkWindow      *view_window;

+  int backing_surface_x;
+  int backing_surface_y;
+  int backing_surface_w;
+  int backing_surface_h;
+  cairo_surface_t *backing_surface;
+  cairo_region_t *backing_surface_dirty;
+
  /* GtkScrollablePolicy needs to be checked when
   * driving the scrollable adjustment values */
  guint hscroll_policy : 1;
@@ -649,6 +656,37 @@ gtk_viewport_get_view_window (GtkViewport *viewport)
  return viewport->priv->view_window;
 }

+static void
+gtk_viewport_bin_window_invalidate_handler (GdkWindow *window,
+					    cairo_region_t *region)
+{
+  gpointer widget;
+  GtkViewport *viewport;
+  GtkViewportPrivate *priv;
+  cairo_rectangle_int_t r;
+
+  gdk_window_get_user_data (window, &widget);
+  viewport = GTK_VIEWPORT (widget);
+  priv = viewport->priv;
+
+  if (priv->backing_surface_dirty == NULL)
+    priv->backing_surface_dirty = cairo_region_create ();
+
+  cairo_region_translate (region,
+			  -priv->backing_surface_x,
+			  -priv->backing_surface_y);
+  cairo_region_union (priv->backing_surface_dirty, region);
+  cairo_region_translate (region,
+			  priv->backing_surface_x,
+			  priv->backing_surface_y);
+
+  r.x = 0;
+  r.y = 0;
+  r.width = priv->backing_surface_w;
+  r.height = priv->backing_surface_h;
+  cairo_region_intersect_rectangle (priv->backing_surface_dirty, &r);
+}
+
 static void
 gtk_viewport_realize (GtkWidget *widget)
 {
@@ -713,6 +751,8 @@ gtk_viewport_realize (GtkWidget *widget)

  priv->bin_window = gdk_window_new (priv->view_window, &attributes, attributes_mask);
  gtk_widget_register_window (widget, priv->bin_window);
+  gdk_window_set_invalidate_handler (priv->bin_window,
+				     gtk_viewport_bin_window_invalidate_handler);

  child = gtk_bin_get_child (bin);
  if (child)
@@ -750,7 +790,10 @@ gtk_viewport_draw (GtkWidget *widget,
  GtkViewport *viewport = GTK_VIEWPORT (widget);
  GtkViewportPrivate *priv = viewport->priv;
  GtkStyleContext *context;
-  int x, y;
+  cairo_t *backing_cr;
+  GtkWidget *child;
+  int x, y, bin_x, bin_y, new_surf_x, new_surf_y;
+  cairo_rectangle_int_t view_pos;

  context = gtk_widget_get_style_context (widget);

@@ -766,30 +809,151 @@ gtk_viewport_draw (GtkWidget *widget,

      gtk_style_context_restore (context);
    }
-  
-  if (gtk_cairo_should_draw_window (cr, priv->view_window))
+
+  if (priv->backing_surface &&
+      /* Don't use backing surface if rendering elsewhere */
+      cairo_surface_get_type (priv->backing_surface) == cairo_surface_get_type (cairo_get_target (cr)))
    {
-      /* This is a cute hack to ensure the contents of bin_window are
-       * restricted to where they are visible. We only need to do this
-       * clipping when called via gtk_widget_draw() and not in expose
-       * events. And when that happens every window (including this one)
-       * should be drawn.
-       */
-      gdk_window_get_position (priv->view_window, &x, &y);
-      cairo_rectangle (cr, x, y, 
-                       gdk_window_get_width (priv->view_window),
-                       gdk_window_get_height (priv->view_window));
-      cairo_clip (cr);
+      gdk_window_get_position (priv->bin_window, &bin_x, &bin_y);
+      view_pos.x = -bin_x;
+      view_pos.y = -bin_y;
+      view_pos.width = gdk_window_get_width (priv->view_window);
+      view_pos.height = gdk_window_get_height (priv->view_window);
+
+      /* Reposition so all is visible visible */
+      if (priv->backing_surface)
+	{
+	  cairo_rectangle_int_t r;
+	  cairo_region_t *copy_region;
+	  if (view_pos.x < priv->backing_surface_x ||
+	      view_pos.x + view_pos.width >
+	      priv->backing_surface_x + priv->backing_surface_w ||
+	      view_pos.y < priv->backing_surface_y ||
+	      view_pos.y + view_pos.height >
+	      priv->backing_surface_y + priv->backing_surface_h)
+	    {
+	      new_surf_x = priv->backing_surface_x;
+	      if (view_pos.x < priv->backing_surface_x)
+		new_surf_x = view_pos.x - (priv->backing_surface_w - view_pos.width);
+	      else if (view_pos.x + view_pos.width >
+		       priv->backing_surface_x + priv->backing_surface_w)
+		new_surf_x = view_pos.x;
+
+	      new_surf_y = priv->backing_surface_y;
+	      if (view_pos.y < priv->backing_surface_y)
+		new_surf_y = view_pos.y - (priv->backing_surface_h - view_pos.height);
+	      else if (view_pos.y + view_pos.height >
+		       priv->backing_surface_y + priv->backing_surface_h)
+		new_surf_y = view_pos.y;
+
+	      r.x = 0;
+	      r.y = 0;
+	      r.width = priv->backing_surface_w;
+	      r.height = priv->backing_surface_h;
+	      copy_region = cairo_region_create_rectangle (&r);
+
+	      if (priv->backing_surface_dirty)
+		{
+		  cairo_region_subtract (copy_region, priv->backing_surface_dirty);
+		  cairo_region_destroy (priv->backing_surface_dirty);
+		  priv->backing_surface_dirty = NULL;
+		}
+
+	      cairo_region_translate (copy_region,
+				      priv->backing_surface_x - new_surf_x,
+				      priv->backing_surface_y - new_surf_y);
+	      cairo_region_intersect_rectangle (copy_region, &r);
+
+	      backing_cr = cairo_create (priv->backing_surface);
+	      gdk_cairo_region (backing_cr, copy_region);
+	      cairo_clip (backing_cr);
+	      cairo_push_group (backing_cr);
+	      cairo_set_source_surface (backing_cr, priv->backing_surface,
+					priv->backing_surface_x - new_surf_x,
+					priv->backing_surface_y - new_surf_y);
+	      cairo_paint (backing_cr);
+	      cairo_pop_group_to_source (backing_cr);
+	      cairo_set_operator (backing_cr, CAIRO_OPERATOR_SOURCE);
+	      cairo_paint (backing_cr);
+	      cairo_destroy (backing_cr);
+
+	      priv->backing_surface_x = new_surf_x;
+	      priv->backing_surface_y = new_surf_y;
+
+	      cairo_region_xor_rectangle (copy_region, &r);
+	      priv->backing_surface_dirty = copy_region;
+	    }
+	}
+
+      if (priv->backing_surface_dirty &&
+	  !cairo_region_is_empty (priv->backing_surface_dirty))
+	{
+	  backing_cr = cairo_create (priv->backing_surface);
+	  gdk_cairo_region (backing_cr, priv->backing_surface_dirty);
+	  cairo_clip (backing_cr);
+	  cairo_translate (backing_cr,
+			   -priv->backing_surface_x,
+			   -priv->backing_surface_y);
+	  cairo_set_source_rgba (backing_cr,
+				 0, 0, 0, 0);
+	  cairo_set_operator (backing_cr, CAIRO_OPERATOR_SOURCE);
+	  cairo_paint (backing_cr);
+	  cairo_set_operator (backing_cr, CAIRO_OPERATOR_OVER);
+	  gtk_render_background (context, backing_cr,
+				 0,0,
+				 gdk_window_get_width (priv->bin_window),
+				 gdk_window_get_height (priv->bin_window));
+	  child = gtk_bin_get_child (GTK_BIN (widget));
+	  if (child && gtk_widget_get_visible (child)) {
+	    if (!gtk_widget_get_has_window (child))
+	      {
+		GtkAllocation child_allocation;
+		gtk_widget_get_allocation (child, &child_allocation);
+		cairo_translate (backing_cr,
+				 child_allocation.x,
+				 child_allocation.y);
+	      }
+
+	    gtk_widget_draw (child, backing_cr);
+	  }
+
+	  cairo_destroy (backing_cr);
+	}
+
+      if (priv->backing_surface_dirty)
+	{
+	  cairo_region_destroy (priv->backing_surface_dirty);
+	  priv->backing_surface_dirty = NULL;
+	}
+
+      if (gtk_cairo_should_draw_window (cr, priv->bin_window))
+	{
+	  gdk_window_get_position (priv->view_window, &x, &y);
+	  cairo_set_source_surface (cr, priv->backing_surface,
+				    priv->backing_surface_x + bin_x + x,
+				    priv->backing_surface_y + bin_y + y);
+	  cairo_rectangle (cr, x, y,
+			   gdk_window_get_width (priv->view_window),
+			   gdk_window_get_height (priv->view_window));
+	  cairo_fill (cr);
+	}
    }
-
-  if (gtk_cairo_should_draw_window (cr, priv->bin_window))
+  else
    {
-      gdk_window_get_position (priv->bin_window, &x, &y);
-      gtk_render_background (context, cr, x, y,
-                             gdk_window_get_width (priv->bin_window),
-                             gdk_window_get_height (priv->bin_window));
-
-      GTK_WIDGET_CLASS (gtk_viewport_parent_class)->draw (widget, cr);
+      /* Don't use backing_surface */
+      if (gtk_cairo_should_draw_window (cr, priv->bin_window))
+	{
+	  gdk_window_get_position (priv->view_window, &x, &y);
+	  cairo_rectangle (cr, x, y,
+			   gdk_window_get_width (priv->view_window),
+			   gdk_window_get_height (priv->view_window));
+	  cairo_clip (cr);
+	  gdk_window_get_position (priv->bin_window, &x, &y);
+	  gtk_render_background (context, cr, x, y,
+				 gdk_window_get_width (priv->bin_window),
+				 gdk_window_get_height (priv->bin_window));
+	  GTK_WIDGET_CLASS (gtk_viewport_parent_class)->draw (widget, cr);
+	}
    }

  return FALSE;
@@ -823,6 +987,7 @@ gtk_viewport_size_allocate (GtkWidget     *widget,
  GtkAdjustment *vadjustment = priv->vadjustment;
  GtkAllocation child_allocation;
  GtkWidget *child;
+  int surface_w, surface_h;

  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));

@@ -843,7 +1008,7 @@ gtk_viewport_size_allocate (GtkWidget     *widget,

  viewport_set_hadjustment_values (viewport);
  viewport_set_vadjustment_values (viewport);
-  
+
  child_allocation.x = 0;
  child_allocation.y = 0;
  child_allocation.width = gtk_adjustment_get_upper (hadjustment);
@@ -851,6 +1016,7 @@ gtk_viewport_size_allocate (GtkWidget     *widget,
  if (gtk_widget_get_realized (widget))
    {
      GtkAllocation view_allocation;
+      cairo_rectangle_int_t rect;

      gdk_window_move_resize (gtk_widget_get_window (widget),
 			      allocation->x + border_width,
@@ -869,6 +1035,48 @@ gtk_viewport_size_allocate (GtkWidget     *widget,
                              - gtk_adjustment_get_value (vadjustment),
                              child_allocation.width,
                              child_allocation.height);
+
+      surface_w = view_allocation.width;
+      if (child_allocation.width > view_allocation.width)
+	surface_w = MIN (surface_w + 64, child_allocation.width);
+
+      surface_h = view_allocation.height;
+      if (child_allocation.height > view_allocation.height)
+	surface_h = MIN (surface_h + 64, child_allocation.height);
+
+      if (priv->backing_surface != NULL &&
+	  (priv->backing_surface_w < view_allocation.width ||
+	   priv->backing_surface_w > surface_w + 32 ||
+	   priv->backing_surface_h < view_allocation.height ||
+	   priv->backing_surface_h > surface_h + 32))
+	{
+	  cairo_surface_destroy (priv->backing_surface);
+	  priv->backing_surface = NULL;
+	  if (priv->backing_surface_dirty)
+	    cairo_region_destroy (priv->backing_surface_dirty);
+	  priv->backing_surface_dirty = NULL;
+	}
+
+      if (priv->backing_surface == NULL &&
+	  (view_allocation.width < child_allocation.width ||
+	   view_allocation.height < child_allocation.height))
+	{
+	  priv->backing_surface_x = gtk_adjustment_get_value (hadjustment);
+	  priv->backing_surface_y = gtk_adjustment_get_value (vadjustment);
+	  priv->backing_surface_w = surface_w;
+	  priv->backing_surface_h = surface_h;
+	  priv->backing_surface_dirty = cairo_region_create ();
+	  priv->backing_surface =
+	    gdk_window_create_similar_surface (priv->bin_window,
+					       CAIRO_CONTENT_COLOR_ALPHA,
+					       surface_w, surface_h);
+	  rect.x = 0;
+	  rect.y = 0;
+	  rect.width = surface_w;
+	  rect.height = surface_h;
+	  cairo_region_union_rectangle (priv->backing_surface_dirty,
+					&rect);
+	}
    }

  child = gtk_bin_get_child (bin);
@@ -827,9 +827,10 @@ static void gtk_widget_on_frame_clock_update (GdkFrameClock *frame_clock,
                                              GtkWidget     *widget);

 static gboolean event_window_is_still_viewable (GdkEvent *event);
+static void gtk_cairo_set_event_window (cairo_t        *cr,
+					GdkWindow *window);
 static void gtk_cairo_set_event (cairo_t        *cr,
 				 GdkEventExpose *event);
-static void gtk_widget_propagate_alpha (GtkWidget *widget);

 /* --- variables --- */
 static gpointer         gtk_widget_parent_class = NULL;
@@ -940,24 +941,9 @@ gtk_widget_draw_marshaller (GClosure     *closure,
                            gpointer      invocation_hint,
                            gpointer      marshal_data)
 {
-  GtkWidget *widget = g_value_get_object (&param_values[0]);
-  GdkEventExpose *tmp_event;
-  gboolean push_group;
  cairo_t *cr = g_value_get_boxed (&param_values[1]);

  cairo_save (cr);
-  tmp_event = _gtk_cairo_get_event (cr);
-
-  push_group =
-    widget->priv->opacity_group ||
-    (widget->priv->alpha != 255 &&
-     (!gtk_widget_get_has_window (widget) || tmp_event == NULL));
-
-  if (push_group)
-    {
-      cairo_push_group (cr);
-      gtk_cairo_set_event (cr, NULL);
-    }

  _gtk_marshal_BOOLEAN__BOXED (closure,
                               return_value,
@@ -967,14 +953,6 @@ gtk_widget_draw_marshaller (GClosure     *closure,
                               marshal_data);


-  if (push_group)
-    {
-      cairo_pop_group_to_source (cr);
-      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-      cairo_paint_with_alpha (cr, widget->priv->alpha / 255.0);
-    }
-
-  gtk_cairo_set_event (cr, tmp_event);
  cairo_restore (cr);
 }

@@ -987,9 +965,6 @@ gtk_widget_draw_marshallerv (GClosure     *closure,
 			     int           n_params,
 			     GType        *param_types)
 {
-  GtkWidget *widget = GTK_WIDGET (instance);
-  GdkEventExpose *tmp_event;
-  gboolean push_group;
  cairo_t *cr;
  va_list args_copy;

@@ -997,18 +972,6 @@ gtk_widget_draw_marshallerv (GClosure     *closure,
  cr = va_arg (args_copy, gpointer);

  cairo_save (cr);
-  tmp_event = _gtk_cairo_get_event (cr);
-
-  push_group =
-    widget->priv->opacity_group ||
-    (widget->priv->alpha != 255 &&
-     (!gtk_widget_get_has_window (widget) || tmp_event == NULL));
-
-  if (push_group)
-    {
-      cairo_push_group (cr);
-      gtk_cairo_set_event (cr, NULL);
-    }

  _gtk_marshal_BOOLEAN__BOXEDv (closure,
 				return_value,
@@ -1019,14 +982,6 @@ gtk_widget_draw_marshallerv (GClosure     *closure,
 				param_types);


-  if (push_group)
-    {
-      cairo_pop_group_to_source (cr);
-      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-      cairo_paint_with_alpha (cr, widget->priv->alpha / 255.0);
-    }
-
-  gtk_cairo_set_event (cr, tmp_event);
  cairo_restore (cr);

  va_end (args_copy);
@@ -4173,8 +4128,6 @@ gtk_widget_unparent (GtkWidget *widget)
    g_object_notify_queue_clear (G_OBJECT (widget), nqueue);
  g_object_notify_queue_thaw (G_OBJECT (widget), nqueue);

-  gtk_widget_propagate_alpha (widget);
-
  gtk_widget_pop_verify_invariants (widget);
  g_object_unref (widget);
 }
@@ -6187,6 +6140,23 @@ gtk_widget_real_mnemonic_activate (GtkWidget *widget,
  return TRUE;
 }

+static const cairo_user_data_key_t event_window_key;
+
+GdkWindow *
+_gtk_cairo_get_event_window (cairo_t *cr)
+{
+  g_return_val_if_fail (cr != NULL, NULL);
+
+  return cairo_get_user_data (cr, &event_window_key);
+}
+
+static void
+gtk_cairo_set_event_window (cairo_t        *cr,
+			    GdkWindow *event_window)
+{
+  cairo_set_user_data (cr, &event_window_key, event_window, NULL);
+}
+
 static const cairo_user_data_key_t event_key;

 GdkEventExpose *
@@ -6199,7 +6169,7 @@ _gtk_cairo_get_event (cairo_t *cr)

 static void
 gtk_cairo_set_event (cairo_t        *cr,
-                     GdkEventExpose *event)
+		     GdkEventExpose *event)
 {
  cairo_set_user_data (cr, &event_key, event, NULL);
 }
@@ -6228,15 +6198,15 @@ gboolean
 gtk_cairo_should_draw_window (cairo_t *cr,
                              GdkWindow *window)
 {
-  GdkEventExpose *event;
+  GdkWindow *event_window;

  g_return_val_if_fail (cr != NULL, FALSE);
  g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);

-  event = _gtk_cairo_get_event (cr);
+  event_window = _gtk_cairo_get_event_window (cr);

-  return event == NULL ||
-         event->window == window;
+  return event_window == NULL ||
+    event_window == window;
 }

 static gboolean
@@ -6253,17 +6223,20 @@ gtk_widget_get_clip_draw (GtkWidget *widget)
  return TRUE;
 }

-/* code shared by gtk_container_propagate_draw() and
- * gtk_widget_draw()
- */
-void
+static void
 _gtk_widget_draw_internal (GtkWidget *widget,
                           cairo_t   *cr,
-                           gboolean   clip_to_size)
+                           gboolean   clip_to_size,
+			   GdkWindow *window)
 {
+  GdkWindow *tmp_event_window;
+
  if (!gtk_widget_is_drawable (widget))
    return;

+  tmp_event_window = _gtk_cairo_get_event_window (cr);
+  gtk_cairo_set_event_window (cr, window);
+
  clip_to_size &= gtk_widget_get_clip_draw (widget);

  if (clip_to_size)
@@ -6284,7 +6257,7 @@ _gtk_widget_draw_internal (GtkWidget *widget,
                     &result);

      if (cairo_status (cr) &&
-          _gtk_cairo_get_event (cr))
+          _gtk_cairo_get_event_window (cr))
        {
          /* We check the event so we only warn about internal GTK calls.
           * Errors might come from PDF streams having write failures and
@@ -6296,6 +6269,77 @@ _gtk_widget_draw_internal (GtkWidget *widget,
                     cairo_status_to_string (cairo_status (cr)));
        }
    }
+
+  gtk_cairo_set_event_window (cr, tmp_event_window);
+}
+
+/* Emit draw() on the widget that owns window,
+   and on any child windows that also belong
+   to the widget. */
+static void
+_gtk_widget_draw_windows (GdkWindow *window,
+			  cairo_t *cr,
+			  int window_x,
+			  int window_y)
+{
+  cairo_pattern_t *pattern;
+  gboolean do_clip;
+  GtkWidget *widget = NULL;
+  GList *l;
+  int x, y;
+
+  if (!gdk_window_is_viewable (window))
+    return;
+
+  cairo_save (cr);
+  cairo_translate (cr, window_x, window_y);
+  cairo_rectangle (cr, 0, 0,
+		   gdk_window_get_width (window),
+		   gdk_window_get_height (window));
+  cairo_clip (cr);
+
+  if (gdk_cairo_get_clip_rectangle (cr, NULL))
+    {
+      cairo_save (cr);
+      pattern = gdk_window_get_background_pattern (window);
+      cairo_set_source (cr, pattern);
+      cairo_paint (cr);
+      cairo_restore (cr);
+
+      gdk_window_get_user_data (window, (gpointer *) &widget);
+      do_clip = _gtk_widget_get_translation_to_window (widget, window,
+						       &x, &y);
+      cairo_save (cr);
+      cairo_translate (cr, -x, -y);
+      _gtk_widget_draw_internal (widget, cr, do_clip, window);
+      cairo_restore (cr);
+
+      for (l = g_list_last (gdk_window_peek_children (window));
+	   l != NULL;
+	   l = l->prev)
+	{
+	  GdkWindow *child_window = l->data;
+	  gpointer child_data;
+	  GdkWindowType type;
+	  int wx, wy;
+
+	  type = gdk_window_get_window_type (child_window);
+	  if (!gdk_window_is_visible (child_window) ||
+	      gdk_window_is_input_only (child_window) ||
+	      type == GDK_WINDOW_OFFSCREEN ||
+	      type == GDK_WINDOW_FOREIGN)
+	    continue;
+
+	  gdk_window_get_user_data (child_window, &child_data);
+	  if (child_data == (gpointer)widget)
+	    {
+	      gdk_window_get_position (child_window, &wx, &wy);
+	      _gtk_widget_draw_windows (child_window, cr, wx,wy);
+	    }
+	}
+    }
+
+  cairo_restore (cr);
 }

 /**
@@ -6328,23 +6372,89 @@ void
 gtk_widget_draw (GtkWidget *widget,
                 cairo_t   *cr)
 {
-  GdkEventExpose *tmp_event;
+  GdkWindow *window, *child_window;
+  gpointer child_data;
+  GList *l;
+  int wx, wy;
+  gboolean push_group;
+  GdkWindowType type;

+  /* We get expose events only on native windows, so the draw
+   * implementation has to walk the entire widget hierarchy, except
+   * that it stops at native subwindows while we're in an expose
+   * event (_gtk_cairo_get_event () != NULL).
+   *
+   * However, we need to properly clip drawing into child windows
+   * to avoid drawing outside if widgets use e.g. cairo_paint(), so
+   * we traverse over GdkWindows as well as GtkWidgets.
+   *
+   * In order to be able to have opacity groups for entire widgets
+   * that consists of multiple windows we collect all the windows
+   * that belongs to a widget and draw them in one go. This means
+   * we may somewhat reorder GdkWindows when we paint them, but
+   * thats not generally a problem, as if you want a guaranteed
+   * order you generally use a windowed widget where you control
+   * the window hierarchy.
+   */
  g_return_if_fail (GTK_IS_WIDGET (widget));
  g_return_if_fail (!widget->priv->alloc_needed);
  g_return_if_fail (cr != NULL);

  cairo_save (cr);
-  /* We have to reset the event here so that draw functions can call
-   * gtk_widget_draw() on random other widgets and get the desired
-   * effect: Drawing all contents, not just the current window.
-   */
-  tmp_event = _gtk_cairo_get_event (cr);
-  gtk_cairo_set_event (cr, NULL);

-  _gtk_widget_draw_internal (widget, cr, TRUE);
+  push_group =
+    widget->priv->opacity_group ||
+    (widget->priv->alpha != 255 &&
+     !gtk_widget_is_toplevel (widget));
+
+  if (push_group)
+    cairo_push_group (cr);
+
+  window = gtk_widget_get_window (widget);
+  if (gtk_widget_get_has_window (widget))
+    {
+      /* The widget will be completely contained in its window, so just
+       * expose that (and any child window belonging to the widget) */
+      _gtk_widget_draw_windows (window, cr, 0, 0);
+    }
+  else
+    {
+      /* The widget draws in its parent window, so we send a draw() for
+       * that. */
+      _gtk_widget_draw_internal (widget, cr, TRUE, window);
+
+      /* But, it may also have child windows in the parent which we should
+       * draw (after having drawn on the parent) */
+      for (l = g_list_last (gdk_window_peek_children (window));
+	   l != NULL;
+	   l = l->prev)
+	{
+	  child_window = l->data;
+	  type = gdk_window_get_window_type (child_window);
+	  if (!gdk_window_is_visible (child_window) ||
+	      gdk_window_is_input_only (child_window) ||
+	      type == GDK_WINDOW_OFFSCREEN ||
+	      type == GDK_WINDOW_FOREIGN)
+	    continue;
+
+	  gdk_window_get_user_data (child_window, &child_data);
+	  if (child_data == (gpointer)widget)
+	    {
+	      gdk_window_get_position (child_window, &wx, &wy);
+	      _gtk_widget_draw_windows (child_window, cr,
+					wx - widget->priv->allocation.x,
+					wy - widget->priv->allocation.y);
+	    }
+	}
+    }
+
+  if (push_group)
+    {
+      cairo_pop_group_to_source (cr);
+      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+      cairo_paint_with_alpha (cr, widget->priv->alpha / 255.0);
+    }

-  gtk_cairo_set_event (cr, tmp_event);
  cairo_restore (cr);
 }

@@ -6640,8 +6750,6 @@ gtk_widget_send_expose (GtkWidget *widget,
 {
  gboolean result = FALSE;
  cairo_t *cr;
-  int x, y;
-  gboolean do_clip;

  g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
  g_return_val_if_fail (gtk_widget_get_realized (widget), TRUE);
@@ -6649,21 +6757,18 @@ gtk_widget_send_expose (GtkWidget *widget,
  g_return_val_if_fail (event->type == GDK_EXPOSE, TRUE);

  cr = gdk_cairo_create (event->expose.window);
-  gtk_cairo_set_event (cr, &event->expose);
-
  gdk_cairo_region (cr, event->expose.region);
  cairo_clip (cr);

-  do_clip = _gtk_widget_get_translation_to_window (widget,
-						   event->expose.window,
-						   &x, &y);
-  cairo_translate (cr, -x, -y);
+  gtk_cairo_set_event (cr, &event->expose);

-  _gtk_widget_draw_internal (widget, cr, do_clip);
+  if (event->expose.window == widget->priv->window)
+    gtk_widget_draw (widget, cr);
+  else
+    _gtk_widget_draw_windows (event->expose.window, cr, 0, 0);

-  /* unset here, so if someone keeps a reference to cr we
-   * don't leak the window. */
  gtk_cairo_set_event (cr, NULL);
+
  cairo_destroy (cr);

  return result;
@@ -8345,6 +8450,9 @@ gtk_widget_get_app_paintable (GtkWidget *widget)
 * expose events, since even the clearing to the background color or
 * pixmap will not happen automatically (as it is done in
 * gdk_window_begin_paint_region()).
+ *
+ * Since 3.10 this function only works for widgets with native
+ * windows.
 **/
 void
 gtk_widget_set_double_buffered (GtkWidget *widget,
@@ -8603,8 +8711,6 @@ gtk_widget_set_parent (GtkWidget *widget,
      gtk_widget_queue_compute_expand (parent);
    }

-  gtk_widget_propagate_alpha (widget);
-
  gtk_widget_pop_verify_invariants (widget);
 }

@@ -14371,10 +14477,6 @@ gtk_widget_set_window (GtkWidget *widget,
    {
      priv->window = window;

-      if (gtk_widget_get_has_window (widget) && window != NULL && !gdk_window_has_native (window))
-	gdk_window_set_opacity (window,
-				priv->norender ? 0 : priv->alpha / 255.0);
-
      g_object_notify (G_OBJECT (widget), "window");
    }
 }
@@ -14513,86 +14615,8 @@ gtk_widget_set_support_multidevice (GtkWidget *widget,
 * in gtk_widget_set_opacity, secondly we can get it from the css opacity. These two
 * are multiplied together to form the total alpha. Secondly, the user can specify
 * an opacity group for a widget, which means we must essentially handle it as having alpha.
- *
- * We handle opacity in two ways. For a windowed widget, with opacity set but no opacity
- * group we directly set the opacity of widget->window. This will cause gdk to properly
- * redirect drawing inside the window to a buffer and do OVER paint_with_alpha.
- *
- * However, if the widget is not windowed, or the user specified an opacity group for the
- * widget we do the opacity handling in the ::draw marshaller for the widget. A naive
- * implementation of this would break for windowed widgets or descendant widgets with
- * windows, as these would not be handled by the ::draw signal. To handle this we set
- * all such gdkwindows as fully transparent and then override gtk_cairo_should_draw_window()
- * to make the draw signal propagate to *all* child widgets/windows.
- *
- * Note: We don't make all child windows fully transparent, we stop at the first one
- * in each branch when propagating down the hierarchy.
 */

-
-/* This is called when priv->alpha or priv->opacity_group group changes, and should
- * update priv->norender and GdkWindow opacity for this widget and any children that
- * needs changing. It is also called whenver the parent changes, the parents
- * norender_children state changes, or the has_window state of the widget changes.
- */
-static void
-gtk_widget_propagate_alpha (GtkWidget *widget)
-{
-  GtkWidgetPrivate *priv = widget->priv;
-  GtkWidget *parent;
-  gboolean norender, norender_children;
-  GList *l;
-
-  parent = priv->parent;
-
-  /* Norender affects only windowed widget and means don't render widget->window in the
-     normal fashion.
-     We only set this if the parent has norender_children, because:
-     a) For an opacity group (that does not have a norender_children parent) we still
-     need to render the window or we will never get an expose event.
-     b) For alpha we set the opacity of window->widget directly, so no other
-     work is needed.
-  */
-  norender = (parent != NULL && parent->priv->norender_children);
-
-  /* windows under this widget should not render if:
-     a) This widget has an opacity group
-     b) This widget has alpha and is no-windowed (otherwise we'd set alpha on widget->window)
-     c) This widget has norender but is no-windowed (a windowed widget would "swallow" the norender)
-  */
-  norender_children =
-    priv->opacity_group ||
-    (!gtk_widget_get_has_window (widget) &&
-     ( norender || priv->alpha != 255));
-
-  if (gtk_widget_get_has_window (widget))
-    {
-      if (priv->window != NULL &&
-	  (!gdk_window_has_native (priv->window) || gtk_widget_is_toplevel (widget)))
-	gdk_window_set_opacity (priv->window,
-				norender ? 0 : priv->alpha / 255.0);
-    }
-
-  for (l = priv->registered_windows; l != NULL; l = l->next)
-    {
-      GdkWindow *w = l->data;
-      if (w != priv->window && !gdk_window_has_native (w))
-	gdk_window_set_opacity (w, norender_children ? 0.0 : 1.0);
-    }
-
-  priv->norender = norender;
-  if (priv->norender_children != norender_children)
-    {
-      priv->norender_children = norender_children;
-
-      if (GTK_IS_CONTAINER (widget))
-	gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback)gtk_widget_propagate_alpha, NULL);
-    }
-
-  if (gtk_widget_get_realized (widget))
-    gtk_widget_queue_draw (widget);
-}
-
 static void
 gtk_widget_update_alpha (GtkWidget *widget)
 {
@@ -14619,8 +14643,12 @@ gtk_widget_update_alpha (GtkWidget *widget)

  priv->alpha = alpha;

-  gtk_widget_propagate_alpha (widget);
+  if (gtk_widget_is_toplevel (widget))
+    gdk_window_set_opacity (priv->window,
+			    priv->alpha / 255.0);

+  if (gtk_widget_get_realized (widget))
+    gtk_widget_queue_draw (widget);
 }

 static void
@@ -14640,7 +14668,8 @@ gtk_widget_set_has_opacity_group  (GtkWidget *widget,

  priv->opacity_group = has_opacity_group;

-  gtk_widget_propagate_alpha (widget);
+  if (gtk_widget_get_realized (widget))
+    gtk_widget_queue_draw (widget);
 }

 /**
@@ -81,11 +81,9 @@ const gchar*      _gtk_widget_get_accel_path               (GtkWidget *widget,

 AtkObject *       _gtk_widget_peek_accessible              (GtkWidget *widget);

+GdkWindow *       _gtk_cairo_get_event_window              (cairo_t *cr);
 GdkEventExpose *  _gtk_cairo_get_event                     (cairo_t *cr);

-void              _gtk_widget_draw_internal                (GtkWidget *widget,
-                                                            cairo_t   *cr,
-                                                            gboolean   clip_to_size);
 void              _gtk_widget_set_has_default              (GtkWidget *widget,
                                                            gboolean   has_default);
 void              _gtk_widget_set_has_grab                 (GtkWidget *widget,
@@ -148,7 +148,9 @@ struct _GtkWindowPrivate
  GtkWidget *title_close_button;
  GtkWidget *popup_menu;

-  GdkWindow *border_window[8];
+  GdkCursor *default_cursor;
+
+  GdkWindow *content_window;

  /* The following flags are initially TRUE (before a window is mapped).
   * They cause us to compute a configure request that involves
@@ -370,6 +372,12 @@ static gint gtk_window_key_release_event  (GtkWidget         *widget,
 					   GdkEventKey       *event);
 static gint gtk_window_button_press_event (GtkWidget         *widget,
                                           GdkEventButton    *event);
+static gint gtk_window_enter_notify_event (GtkWidget         *widget,
+					   GdkEventCrossing  *event);
+static gint gtk_window_leave_notify_event (GtkWidget         *widget,
+					   GdkEventCrossing  *event);
+static gint gtk_window_motion_notify_event (GtkWidget        *widget,
+					    GdkEventMotion   *event);
 static gint gtk_window_focus_in_event     (GtkWidget         *widget,
 					   GdkEventFocus     *event);
 static gint gtk_window_focus_out_event    (GtkWidget         *widget,
@@ -382,6 +390,8 @@ static void gtk_window_forall             (GtkContainer   *container,
 					   gboolean	include_internals,
 					   GtkCallback     callback,
 					   gpointer        callback_data);
+static void gtk_window_add                (GtkContainer     *container,
+                                           GtkWidget        *child);
 static gint gtk_window_focus              (GtkWidget        *widget,
 				           GtkDirectionType  direction);
 static void gtk_window_move_focus         (GtkWidget         *widget,
@@ -451,6 +461,7 @@ static void     resize_grip_create_window             (GtkWindow    *window);
 static void     resize_grip_destroy_window            (GtkWindow    *window);
 static void     update_grip_visibility                (GtkWindow    *window);
 static void     update_window_buttons                 (GtkWindow    *window);
+static void     update_cursor_at_position             (GtkWidget *widget, gint x, gint y);

 static void        gtk_window_notify_keys_changed (GtkWindow   *window);
 static GtkKeyHash *gtk_window_get_key_hash        (GtkWindow   *window);
@@ -464,6 +475,9 @@ static void        gtk_window_on_theme_variant_changed (GtkSettings *settings,
 #endif
 static void        gtk_window_set_theme_variant         (GtkWindow  *window);

+static void        window_cursor_changed       (GdkWindow  *window,
+                                                GParamSpec *pspec,
+                                                GtkWidget  *widget);
 static gboolean    gtk_window_popup_menu       (GtkWidget      *widget);
 static void        gtk_window_do_popup         (GtkWindow      *window,
                                                GdkEventButton *event);
@@ -632,6 +646,9 @@ gtk_window_class_init (GtkWindowClass *klass)
  widget_class->configure_event = gtk_window_configure_event;
  widget_class->key_press_event = gtk_window_key_press_event;
  widget_class->key_release_event = gtk_window_key_release_event;
+  widget_class->enter_notify_event = gtk_window_enter_notify_event;
+  widget_class->leave_notify_event = gtk_window_leave_notify_event;
+  widget_class->motion_notify_event = gtk_window_motion_notify_event;
  widget_class->focus_in_event = gtk_window_focus_in_event;
  widget_class->button_press_event = gtk_window_button_press_event;
  widget_class->focus_out_event = gtk_window_focus_out_event;
@@ -648,6 +665,7 @@ gtk_window_class_init (GtkWindowClass *klass)
  widget_class->get_preferred_height = gtk_window_get_preferred_height;
  widget_class->get_preferred_height_for_width = gtk_window_get_preferred_height_for_width;

+  container_class->add = gtk_window_add;
  container_class->check_resize = gtk_window_check_resize;
  container_class->forall = gtk_window_forall;

@@ -5623,7 +5641,7 @@ gtk_window_realize (GtkWidget *widget)
  GdkWindowAttr attributes;
  gint attributes_mask;
  GtkWindowPrivate *priv;
-  gint i;
+  GtkStyleContext *context;

  window = GTK_WINDOW (widget);
  priv = window->priv;
@@ -5656,6 +5674,19 @@ gtk_window_realize (GtkWidget *widget)
      gtk_widget_set_window (widget, gdk_window);
      gtk_widget_register_window (widget, gdk_window);

+      if (priv->type == GTK_WINDOW_TOPLEVEL)
+        {
+          priv->content_window = gdk_window_new (gdk_window,
+                                                 &attributes, attributes_mask);
+          gdk_window_show (priv->content_window);
+          gtk_widget_register_window (widget, priv->content_window);
+
+          gtk_style_context_set_background (gtk_widget_get_style_context (widget), priv->content_window);
+
+          if (gtk_bin_get_child (GTK_BIN (window)))
+            gtk_widget_set_parent_window (gtk_bin_get_child (GTK_BIN (window)),
+                                          priv->content_window);
+        }
      return;
    }

@@ -5738,13 +5769,8 @@ gtk_window_realize (GtkWidget *widget)

  gdk_window = gdk_window_new (parent_window, &attributes, attributes_mask);
  gtk_widget_set_window (widget, gdk_window);
-  gtk_widget_register_window (widget, gdk_window);

-  /* We don't need to set a background on the GdkWindow; with decorations
-   * we draw the background ourself
-   */
-  if (!priv->client_decorated)
-    gtk_style_context_set_background (gtk_widget_get_style_context (widget), gdk_window);
+  gtk_widget_register_window (widget, gdk_window);

  attributes.x = allocation.x;
  attributes.y = allocation.y;
@@ -5759,34 +5785,19 @@ gtk_window_realize (GtkWidget *widget)

  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;

-  if (priv->client_decorated)
+  if (priv->type == GTK_WINDOW_TOPLEVEL)
    {
-      GdkCursorType cursor_type[8] = {
-        GDK_TOP_LEFT_CORNER,
-        GDK_TOP_SIDE,
-        GDK_TOP_RIGHT_CORNER,
-        GDK_LEFT_SIDE,
-        GDK_RIGHT_SIDE,
-        GDK_BOTTOM_LEFT_CORNER,
-        GDK_BOTTOM_SIDE,
-        GDK_BOTTOM_RIGHT_CORNER
-      };
+      priv->content_window = gdk_window_new (gdk_window,
+                                             &attributes, attributes_mask);
+      gdk_window_show (priv->content_window);
+      gtk_widget_register_window (widget, priv->content_window);

-      attributes.wclass = GDK_INPUT_ONLY;
-      attributes.width = 1;
-      attributes.height = 1;
-      attributes.event_mask = GDK_BUTTON_PRESS_MASK;
-      attributes_mask = GDK_WA_CURSOR;
+      context = gtk_widget_get_style_context (widget);
+      gtk_style_context_set_background (context, priv->content_window);

-      for (i = 0; i < 8; i++)
-        {
-          attributes.cursor = gdk_cursor_new (cursor_type[i]);
-          priv->border_window[i] = gdk_window_new (gdk_window, &attributes, attributes_mask);
-          g_object_unref (attributes.cursor);
-
-          gdk_window_show (priv->border_window[i]);
-          gtk_widget_register_window (widget, priv->border_window[i]);
-        }
+      if (gtk_bin_get_child (GTK_BIN (window)))
+        gtk_widget_set_parent_window (gtk_bin_get_child (GTK_BIN (window)),
+                                      priv->content_window);
    }

  if (priv->transient_parent &&
@@ -5848,6 +5859,11 @@ gtk_window_realize (GtkWidget *widget)
    }
 #endif

+  /* get the default cursor */
+  g_signal_connect (G_OBJECT (gdk_window), "notify::cursor",
+                    G_CALLBACK (window_cursor_changed), widget);
+  window_cursor_changed (gdk_window, NULL, widget);
+
  /* Icons */
  gtk_window_realize_icon (window);

@@ -5861,7 +5877,6 @@ gtk_window_unrealize (GtkWidget *widget)
  GtkWindow *window = GTK_WINDOW (widget);
  GtkWindowPrivate *priv = window->priv;
  GtkWindowGeometryInfo *info;
-  gint i;

  /* On unrealize, we reset the size of the window such
   * that we will re-apply the default sizing stuff
@@ -5894,14 +5909,11 @@ gtk_window_unrealize (GtkWidget *widget)
  if (priv->grip_window != NULL)
    resize_grip_destroy_window (window);

-  if (priv->border_window[0] != NULL)
+  if (priv->content_window != NULL)
    {
-      for (i = 0; i < 8; i++)
-        {
-          gtk_widget_unregister_window (widget, priv->border_window[i]);
-          gdk_window_destroy (priv->border_window[i]);
-          priv->border_window[i] = NULL;
-        }
+      gtk_widget_unregister_window (widget, priv->content_window);
+      gdk_window_destroy (priv->content_window);
+      priv->content_window = NULL;
    }

  GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize (widget);
@@ -6134,197 +6146,6 @@ get_decoration_borders (GtkWidget *widget,
    }
 }

-static void
-update_border_windows (GtkWindow *window, GtkBorder *border)
-{
-  GtkWidget *widget = (GtkWidget *)window;
-  GtkWindowPrivate *priv = window->priv;
-  GdkWindowState state;
-  gboolean resize_h, resize_v;
-  gint handle;
-  cairo_region_t *region;
-  cairo_rectangle_int_t rect;
-  gint width, height;
-
-  if (priv->border_window[0] == NULL)
-    return;
-
-  state = gdk_window_get_state (gtk_widget_get_window (widget));
-  if (!priv->resizable || (state & GDK_WINDOW_STATE_MAXIMIZED))
-    {
-      resize_h = resize_v = FALSE;
-    }
-  else
-    {
-      resize_h = resize_v = TRUE;
-      if (priv->geometry_info)
-        {
-          GdkGeometry *geometry = &priv->geometry_info->geometry;
-          GdkWindowHints flags = priv->geometry_info->mask;
-
-          if ((flags & GDK_HINT_MIN_SIZE) && (flags & GDK_HINT_MAX_SIZE))
-            {
-              resize_h = geometry->min_width != geometry->max_width;
-              resize_v = geometry->min_height != geometry->max_height;
-            }
-        }
-    }
-
-  gtk_widget_style_get (widget,
-                        "decoration-resize-handle", &handle,
-                        NULL);
-
-  width = gtk_widget_get_allocated_width (widget) - (border->left + border->right);
-  height = gtk_widget_get_allocated_height (widget) - (border->top + border->bottom);
-
-  if (resize_h && resize_v)
-    {
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST],
-                              0, 0,
-                              border->left + handle, border->top + handle);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST],
-                              border->left + width - handle, 0,
-                              border->right + handle, border->top + handle);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST],
-                              0, border->top + height - handle,
-                              border->left + handle, border->bottom + handle);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST],
-                              border->left + width - handle, border->top + height - handle,
-                              border->right + handle, border->bottom + handle);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->left + handle;
-      rect.height = border->top + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = border->left;
-      rect.y = border->top;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->right + handle;
-      rect.height = border->top + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = 0;
-      rect.y = border->top;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->left + handle;
-      rect.height = border->bottom + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = border->left;
-      rect.y = 0;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->right + handle;
-      rect.height = border->bottom + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST]);
-    }
-  else
-    {
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST]);
-    }
-
-  if (resize_v)
-    {
-      gint x, w;
-
-      if (resize_h)
-        {
-          x = border->left + handle;
-          w = width - 2 * handle;
-        }
-      else
-        {
-          x = 0;
-          w = width + border->left + border->right;
-        }
-
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH],
-                              x, 0,
-                              w, border->top);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH],
-                              x, border->top + height,
-                              w, border->bottom);
-
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
-    }
-  else
-    {
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
-    }
-
-  if (resize_h)
-    {
-      gint y, h;
-
-      if (resize_v)
-        {
-          y = border->top + handle;
-          h = height - 2 * handle;
-        }
-      else
-        {
-          y = 0;
-          h = height + border->top + border->bottom;
-        }
-
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_WEST],
-                              0, y,
-                              border->left, h);
-
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_EAST],
-                              border->left + width, y,
-                              border->right, h);
-
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_WEST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_EAST]);
-    }
-  else
-    {
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_WEST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_EAST]);
-    }
-}
-
 /* _gtk_window_set_allocation:
 * @window: a #GtkWindow
 * @allocation: the original allocation for the window
@@ -6428,12 +6249,20 @@ _gtk_window_set_allocation (GtkWindow           *window,
        {
          update_grip_visibility (window);
          set_grip_position (window);
-          update_border_windows (window, &window_border);
        }
+
+      if (priv->content_window != NULL)
+        gdk_window_move_resize (priv->content_window,
+                                child_allocation.x,
+                                child_allocation.y,
+                                child_allocation.width,
+                                child_allocation.height);
+
    }

-  child_allocation.x += border_width;
-  child_allocation.y += border_width;
+  /* Apply border width */
+  child_allocation.x = border_width;
+  child_allocation.y = border_width;
  child_allocation.width = MAX (1, child_allocation.width - border_width * 2);
  child_allocation.height = MAX (1, child_allocation.height - border_width * 2);

@@ -6450,7 +6279,7 @@ gtk_window_size_allocate (GtkWidget     *widget,

  _gtk_window_set_allocation (window, allocation, &child_allocation);

-  child = gtk_bin_get_child (GTK_BIN (window));
+  child = gtk_bin_get_child (&(window->bin));
  if (child && gtk_widget_get_visible (child))
    gtk_widget_size_allocate (child, &child_allocation);
 }
@@ -6975,27 +6804,170 @@ gtk_window_key_release_event (GtkWidget   *widget,
 }

 static GtkWindowRegion
-get_active_region_type (GtkWindow *window, GdkEventAny *event, gint x, gint y)
+get_region_type (GtkWindow *window, gint x, gint y)
 {
  GtkWindowPrivate *priv = window->priv;
-  GtkAllocation allocation;
-  gint i;
+  GtkWidget *widget = GTK_WIDGET (window);
+  gint title_height = 0;
+  gint resize_handle = 0;
+  GtkBorder window_border = { 0 };

-  for (i = 0; i < 8; i++)
+  if (priv->title_box)
+    title_height = gtk_widget_get_allocated_height (priv->title_box);
+
+  if (priv->client_decorated)
    {
-      if (event->window == priv->border_window[i])
-        return i;
+      get_decoration_borders (widget, NULL, &window_border, NULL);
+      gtk_widget_style_get (widget,
+                            "decoration-resize-handle", &resize_handle,
+                            NULL);
    }

-  if (priv->title_box != NULL)
+  if (x < window_border.left)
    {
-      gtk_widget_get_allocation (priv->title_box, &allocation);
-      if (allocation.x <= x && allocation.x + allocation.width > x &&
-          allocation.y <= y && allocation.y + allocation.height > y)
+      if (y < window_border.top + MAX (title_height, resize_handle))
+        return GTK_WINDOW_REGION_EDGE_NW;
+      else if (y > gtk_widget_get_allocated_height (widget) - window_border.bottom - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SW;
+      else
+        return GTK_WINDOW_REGION_EDGE_W;
+    }
+  else if (x > gtk_widget_get_allocated_width (widget) - window_border.right)
+    {
+      if (y < window_border.top + MAX (title_height, resize_handle))
+        return GTK_WINDOW_REGION_EDGE_NE;
+      else if (y > gtk_widget_get_allocated_height (widget) - window_border.bottom - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SE;
+      else
+        return GTK_WINDOW_REGION_EDGE_E;
+    }
+  else if (y < window_border.top)
+    {
+      if (x < window_border.left + resize_handle)
+        return GTK_WINDOW_REGION_EDGE_NW;
+      else if (x > gtk_widget_get_allocated_width (widget) - window_border.right - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_NE;
+      else
+        return GTK_WINDOW_REGION_EDGE_N;
+    }
+  else if (y > gtk_widget_get_allocated_height (widget) - window_border.bottom)
+    {
+      if (x < window_border.left + resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SW;
+      else if (x > gtk_widget_get_allocated_width (widget) - window_border.right - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SE;
+      else
+        return GTK_WINDOW_REGION_EDGE_S;
+    }
+  else
+    {
+      if (y < window_border.top + title_height)
        return GTK_WINDOW_REGION_TITLE;
+      else
+        return GTK_WINDOW_REGION_CONTENT;
+    }
+}
+
+static GtkWindowRegion
+get_active_region_type (GtkWindow *window, gint x, gint y)
+{
+  GtkWindowPrivate *priv = window->priv;
+  GtkWidget *widget = GTK_WIDGET (window);
+  GtkWindowRegion region;
+  gboolean resize_h, resize_v;
+  gint state;
+  GtkBorder window_border = { 0 };
+
+  region = get_region_type (window, x, y);
+  if (priv->client_decorated)
+    get_decoration_borders (widget, NULL, &window_border, NULL);
+
+  state = gdk_window_get_state (gtk_widget_get_window (widget));
+  if (!priv->resizable || (state & GDK_WINDOW_STATE_MAXIMIZED))
+    {
+      resize_h = resize_v = FALSE;
+    }
+  else
+    {
+      resize_h = resize_v = TRUE;
+      if (priv->geometry_info)
+        {
+          GdkGeometry *geometry = &priv->geometry_info->geometry;
+          GdkWindowHints flags = priv->geometry_info->mask;
+
+          if ((flags & GDK_HINT_MIN_SIZE) && (flags & GDK_HINT_MAX_SIZE))
+            {
+              resize_h = geometry->min_width != geometry->max_width;
+              resize_v = geometry->min_height != geometry->max_height;
+            }
+        }
    }

-  return GTK_WINDOW_REGION_CONTENT;
+  switch (region)
+    {
+    case GTK_WINDOW_REGION_EDGE_N:
+    case GTK_WINDOW_REGION_EDGE_S:
+      if (resize_v)
+        return region;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_W:
+    case GTK_WINDOW_REGION_EDGE_E:
+      if (resize_h)
+        return region;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_NW:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x < window_border.left)
+        return GTK_WINDOW_REGION_EDGE_W;
+      else if (resize_v && y < window_border.top)
+        return GTK_WINDOW_REGION_EDGE_N;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_NE:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x > gtk_widget_get_allocated_width (widget) - window_border.right)
+        return GTK_WINDOW_REGION_EDGE_E;
+      else if (resize_v && y < window_border.top)
+        return GTK_WINDOW_REGION_EDGE_N;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_SW:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x < window_border.left)
+        return GTK_WINDOW_REGION_EDGE_W;
+      else if (resize_v && y > gtk_widget_get_allocated_height (widget) - window_border.bottom)
+        return GTK_WINDOW_REGION_EDGE_N;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_SE:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x > gtk_widget_get_allocated_width (widget) - window_border.right)
+        return GTK_WINDOW_REGION_EDGE_E;
+      else if (resize_v && y > gtk_widget_get_allocated_height (widget) - window_border.bottom)
+        return GTK_WINDOW_REGION_EDGE_S;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    default:
+      return region;
+    }
 }

 static gint
@@ -7041,7 +7013,7 @@ gtk_window_button_press_event (GtkWidget      *widget,
          x = event->x;
          y = event->y;
        }
-      region = get_active_region_type (window, (GdkEventAny*)event, x, y);
+      region = get_active_region_type (window, x, y);

      if (event->type == GDK_BUTTON_PRESS)
        {
@@ -7111,6 +7083,55 @@ gtk_window_real_activate_focus (GtkWindow *window)
  gtk_window_activate_focus (window);
 }

+static gint
+gtk_window_enter_notify_event (GtkWidget        *widget,
+			       GdkEventCrossing *event)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
+
+  if (priv->client_decorated)
+    {
+      gint x, y;
+      GdkWindow *gdk_window;
+
+      gdk_window = gtk_widget_get_window (widget);
+      gdk_window_get_device_position (gdk_window,
+                                      gdk_event_get_device ((GdkEvent*)event),
+                                      &x, &y, NULL);
+      update_cursor_at_position (widget, x, y);
+    }
+
+  return FALSE;
+}
+
+static gint
+gtk_window_leave_notify_event (GtkWidget        *widget,
+			       GdkEventCrossing *event)
+{
+  return FALSE;
+}
+
+static gboolean
+gtk_window_motion_notify_event (GtkWidget       *widget,
+                                GdkEventMotion  *event)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
+
+  if (priv->client_decorated)
+    {
+      gint x, y;
+      GdkWindow *gdk_window;
+
+      gdk_window = gtk_widget_get_window (widget);
+      gdk_window_get_device_position (gdk_window,
+                                      gdk_event_get_device ((GdkEvent*)event),
+                                      &x, &y, NULL);
+      update_cursor_at_position (widget, x, y);
+    }
+
+  return FALSE;
+}
+
 static void
 do_focus_change (GtkWidget *widget,
 		 gboolean   in)
@@ -7271,6 +7292,18 @@ gtk_window_forall (GtkContainer *container,
    (* callback) (priv->title_box, callback_data);
 }

+static void
+gtk_window_add (GtkContainer *container,
+                GtkWidget    *child)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (container)->priv;
+
+  if (priv->content_window != NULL)
+    gtk_widget_set_parent_window (child, priv->content_window);
+
+  GTK_CONTAINER_CLASS (gtk_window_parent_class)->add (container, child);
+}
+
 static gboolean
 gtk_window_focus (GtkWidget        *widget,
 		  GtkDirectionType  direction)
@@ -7448,6 +7481,104 @@ gtk_window_real_set_focus (GtkWindow *window,
    }
 }

+static void
+window_cursor_changed (GdkWindow  *window,
+                       GParamSpec *pspec,
+                       GtkWidget  *widget)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
+
+  priv->default_cursor = gdk_window_get_cursor (window);
+  if (priv->default_cursor == NULL)
+    priv->default_cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_LEFT_PTR);
+  if (priv->content_window != NULL)
+    gdk_window_set_cursor (priv->content_window, priv->default_cursor);
+}
+
+static void
+update_cursor_at_position (GtkWidget *widget, gint x, gint y)
+{
+  GtkWindow *window = GTK_WINDOW (widget);
+  GtkWindowPrivate *priv = window->priv;
+  GtkWindowRegion region;
+  GdkCursorType cursor_type;
+  GdkCursor *cursor;
+  GdkWindowState state;
+  gboolean use_default = FALSE;
+  GdkWindow *gdk_window;
+
+  region = get_active_region_type (window, x, y);
+
+  state = gdk_window_get_state (gtk_widget_get_window (widget));
+
+  if ((state & GDK_WINDOW_STATE_MAXIMIZED) || !priv->resizable || !priv->decorated)
+    {
+      use_default = TRUE;
+    }
+  else
+    {
+      switch (region)
+        {
+        case GTK_WINDOW_REGION_EDGE_NW:
+          cursor_type = GDK_TOP_LEFT_CORNER;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_N:
+          cursor_type = GDK_TOP_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_NE:
+          cursor_type = GDK_TOP_RIGHT_CORNER;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_W:
+          cursor_type = GDK_LEFT_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_E:
+          cursor_type = GDK_RIGHT_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_SW:
+          cursor_type = GDK_BOTTOM_LEFT_CORNER;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_S:
+          cursor_type = GDK_BOTTOM_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_SE:
+          cursor_type = GDK_BOTTOM_RIGHT_CORNER;
+          break;
+
+        default:
+          use_default = TRUE;
+          break;
+        }
+    }
+
+  gdk_window = gtk_widget_get_window (widget);
+  g_signal_handlers_disconnect_by_func (G_OBJECT (gdk_window),
+                                        G_CALLBACK (window_cursor_changed),
+                                        widget);
+
+  if (use_default)
+    {
+      gdk_window_set_cursor (gdk_window, priv->default_cursor);
+    }
+  else
+    {
+      cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), cursor_type);
+      gdk_window_set_cursor (gdk_window, cursor);
+      g_object_unref (cursor);
+    }
+
+  g_signal_connect (G_OBJECT (gdk_window), "notify::cursor",
+                    G_CALLBACK (window_cursor_changed), widget);
+}
+
+
+
 static void
 gtk_window_get_preferred_width (GtkWidget *widget,
                                gint      *minimum_size,
@@ -8884,24 +9015,26 @@ gtk_window_draw (GtkWidget *widget,
  GtkBorder title_border = { 0 };
  GtkBorder inner_border = { 0 };
  GtkBorder outer_border = { 0 };
-  gint title_height;

  context = gtk_widget_get_style_context (widget);

  gtk_widget_get_allocation (widget, &allocation);

-  get_decoration_borders (widget, &title_border, &inner_border, &outer_border);
+  if (priv->title_box != NULL)
+    get_decoration_borders (widget, &title_border, &inner_border, &outer_border);
+  else
+    get_decoration_borders (widget, NULL, &inner_border, &outer_border);

  if (!gtk_widget_get_app_paintable (widget) &&
      gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
    {
+      gtk_style_context_save (context);
+
      if (priv->client_decorated &&
          priv->decorated &&
          !priv->fullscreen &&
          !(gdk_window_get_state (gtk_widget_get_window (widget)) & GDK_WINDOW_STATE_MAXIMIZED))
        {
-          gtk_style_context_save (context);
-
          gtk_style_context_add_class (context, "window-border");
          gtk_render_background (context, cr,
                                 inner_border.left + outer_border.left,
@@ -8921,31 +9054,23 @@ gtk_window_draw (GtkWidget *widget,
          gtk_style_context_add_class (context, "window-outer-border");
          gtk_render_frame (context, cr,
                            0, 0, allocation.width, allocation.height);
-          gtk_style_context_restore (context);
+          gtk_style_context_remove_class (context, "window-outer-border");
        }

-      if (priv->title_box)
-        title_height = gtk_widget_get_allocated_height (priv->title_box);
-      else
-        title_height = 0;
-      gtk_style_context_save (context);
-      gtk_style_context_add_class (context, "window-content");
-      gtk_render_background (context, cr,
-                             inner_border.left + outer_border.left,
-                             inner_border.top + outer_border.top +
-                             title_border.top + title_border.bottom +
-                             title_height,
-                             allocation.width -
-                             (inner_border.left + inner_border.right +
-                              outer_border.left + outer_border.right),
-                             allocation.height -
-                             (inner_border.top + inner_border.bottom +
-                              outer_border.top + outer_border.bottom +
-                              title_border.top + title_border.bottom +
-                              title_height));
      gtk_style_context_restore (context);
    }

+  if (!gtk_widget_get_app_paintable (widget) &&
+      priv->content_window != NULL &&
+      gtk_cairo_should_draw_window (cr, priv->content_window))
+    {
+      gint x, y;
+      gdk_window_get_position (priv->content_window, &x, &y);
+      gtk_render_background (context, cr, x, y,
+                             gdk_window_get_width (priv->content_window),
+                             gdk_window_get_height (priv->content_window));
+    }
+
  if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw)
    ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr);

@@ -11164,3 +11289,9 @@ ensure_state_flag_backdrop (GtkWidget *widget)

  gtk_widget_queue_draw (widget);
 }
+
+GdkWindow *
+_gtk_window_get_content_window (GtkWindow *window)
+{
+  return window->priv->content_window;
+}
@@ -64,6 +64,7 @@ void            _gtk_window_get_wmclass            (GtkWindow  *window,
 void            _gtk_window_set_allocation         (GtkWindow           *window,
                                                    const GtkAllocation *allocation,
                                                    GtkAllocation       *allocation_out);
+GdkWindow *     _gtk_window_get_content_window     (GtkWindow           *window);

 typedef void (*GtkWindowKeysForeachFunc) (GtkWindow      *window,
                                          guint           keyval,
@@ -169,7 +169,6 @@ gtk/gtkpagesetupunixdialog.c
 gtk/gtkpaned.c
 gtk/gtkpapersize.c
 gtk/gtkpathbar.c
-gtk/gtkplacessidebar.c
 gtk/gtkplug.c
 gtk/gtkpressandhold.c
 gtk/gtkprintbackend.c
@@ -237,7 +236,6 @@ gtk/gtktoolitem.c
 gtk/gtktoolitemgroup.c
 gtk/gtktoolpalette.c
 gtk/gtktoolshell.c
-gtk/gtktrashmonitor.c
 gtk/gtktrayicon-x11.c
 gtk/gtktreednd.c
 gtk/gtktreemenu.c
@@ -101,7 +101,6 @@ sr@latin
 sv
 ta
 te
-tg
 th
 tk
 tr
@@ -68,9 +68,6 @@ INSTOBJEXT = @INSTOBJEXT@
 .SUFFIXES:
 .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat

-$(filter %.ui.h, $(POTFILES)):
-	$(MAKE) -C ../gtk gtkresources.c
-
 .c.o:
 	$(COMPILE) $<

@@ -171,7 +171,6 @@ gtk/gtkpagesetupunixdialog.c
 gtk/gtkpaned.c
 gtk/gtkpapersize.c
 gtk/gtkpathbar.c
-gtk/gtkplacessidebar.c
 gtk/gtkplug.c
 gtk/gtkpressandhold.c
 gtk/gtkprintbackend.c
@@ -240,7 +239,6 @@ gtk/gtktoolitem.c
 gtk/gtktoolitemgroup.c
 gtk/gtktoolpalette.c
 gtk/gtktoolshell.c
-gtk/gtktrashmonitor.c
 gtk/gtktrayicon-x11.c
 gtk/gtktreednd.c
 gtk/gtktreemenu.c
@@ -300,4 +298,3 @@ gtk/gtkrecentchooserdefault.ui.h
 gtk/gtkscalebutton.ui.h
 gtk/gtkstatusbar.ui.h
 gtk/gtkvolumebutton.ui.h
-
@@ -285,82 +285,82 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr ""

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr ""

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr ""

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr ""

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr ""

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr ""

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr ""

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr ""

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr ""

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr ""

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr ""

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr ""

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr ""

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr ""

 #: ../gdk/keyname-table.h:4006
@@ -368,7 +368,7 @@ msgstr ""
 #| msgctxt "Stock label, navigation"
 #| msgid "_Forward"
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "_Vorentoe"

 #: ../gdk/keyname-table.h:4007
@@ -376,47 +376,47 @@ msgstr "_Vorentoe"
 #| msgctxt "Stock label, navigation"
 #| msgid "_Back"
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "_Terug"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr ""

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr ""

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr ""

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr ""

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr ""

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr ""

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr ""

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr ""

 #. Description of --sync in --help output
@@ -278,132 +278,132 @@ msgstr "Suprimir"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor: puyar o brilo"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor: baixar o brilo"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Son: Silenciar"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Son: baixar o volumen"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Son: puyar o volumen"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Son: reproducir"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Son: aturar"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Son: siguient"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Son: anterior"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Son: gravar"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Son: pausar"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Son: rebobinar"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Son: meyo"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Salvapantallas"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batería"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executar 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Abance"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Dezaga"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Adormir"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernar"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Camara web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Enchegar/desenchegar o touchpad"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Dispertar"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspender"

 #. Description of --sync in --help output
@@ -284,132 +284,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "رفع سطوع الشاشة"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "خفض سطوع الشاشة"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "غلق الصوت"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "خفض الصوت"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "رفع الصوت"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "تشغيل الصوتيات"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "إيقاف الصوتيات"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "الصوتي التالي"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "الصوتي السابق"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "تسجيل الصوت"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "إلباث الصوت"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "تدوير الصوت"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "وسائط الصوت"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "حافظة الشاشة"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "البطارية"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "مشغّل 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "أمام"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "خلف"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "نوم"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "إسبات"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "الشبكة المحلية"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "كمرة الوب"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "الشاشة"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "تشغيل لوحة اللمس"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "إيقاظ"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "تعليق"

 #. Description of --sync in --help output
@@ -281,132 +281,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -277,132 +277,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -288,132 +288,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Увеличаване на яркостта"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Намаляване на яркостта"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Заглушаване"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Намаляване на звука"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Увеличаване на звука"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Изпълнение на медия"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Спиране на изпълнение"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Следваща песен"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Предишна песен"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Запис на аудио"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Пауза на аудио"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Отначало на песента"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Аудио медия"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Предпазител на екрана"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Батерия"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Стартиране 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Напред"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Назад"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Приспиване"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Дълбоко приспиване"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Безжична мрежа"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Уеб камера"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Дисплей"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Сензорен панел"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Събуждане"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Изключване"

 #. Description of --sync in --help output
@@ -283,137 +283,137 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4006
 #| msgctxt "Stock label, navigation"
 #| msgid "_Forward"
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4007
 #| msgctxt "Stock label, navigation"
 #| msgid "_Back"
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:55
@@ -283,133 +283,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -282,134 +282,134 @@ msgstr "Dilemel"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr ""

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr ""

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr ""

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr ""

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr ""

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr ""

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr ""

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr ""

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr ""

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr ""

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr ""

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr ""

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr ""

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr ""

 #: ../gdk/keyname-table.h:4006
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "_War-lerc'h"

 #: ../gdk/keyname-table.h:4007
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "_Distro"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr ""

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr ""

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr ""

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr ""

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr ""

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr ""

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr ""

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr ""

 #. Description of --sync in --help output
@@ -305,132 +305,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Augmenta la brillantor"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Redueix la brillantor"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silencia"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Apuja el volum"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Abaixa el volum"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Reprodueix"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Atura"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Següent"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Previ"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Enregistra"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Fes una pausa"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Rebobina"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Mèdia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Estalvi de pantalla"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Bateria"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executa"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Endavant"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Enrere"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Atura temporalment"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hiberna"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Wi-Fi"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Càmera web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Commuta el ratolí tàctil"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Desperta"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Atura temporalment"

 #. Description of --sync in --help output
@@ -304,132 +304,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Augmenta la brillantor"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Redueix la brillantor"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silencia"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Apuja el volum"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Abaixa el volum"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Reprodueix"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Para"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Següent"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Previ"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Enregistra"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Fes una pausa"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Rebobina"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Mèdia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Estalvi de pantalla"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Bateria"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executa"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Avant"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Arrere"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Para temporalment"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hiberna"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Wi-Fi"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Càmera web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Commuta el ratolí tàctil"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Desperta"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Para temporalment"

 #. Description of --sync in --help output
@@ -291,134 +291,134 @@ msgstr "Sil"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr ""

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr ""

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr ""

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr ""

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr ""

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr ""

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr ""

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr ""

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr ""

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr ""

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr ""

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr ""

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr ""

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr ""

 #: ../gdk/keyname-table.h:4007
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "İ_leri"

 #: ../gdk/keyname-table.h:4008
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "_Keri"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr ""

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr ""

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr ""

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr ""

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr ""

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr ""

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr ""

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr ""

 #. Description of --sync in --help output
@@ -288,133 +288,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -306,133 +306,133 @@ msgstr "Del"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "SkærmLysstyrkeOp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "SkærmLysstyrkeNed"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "LydFra"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "LydstyrkeNed"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "LydstyrkeOp"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "LydAfspil"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "LydStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "LydNæste"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "LydForrige"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "LydOptag"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "LydPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "LydSpolTilbage"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "LydMedie"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Pauseskærm"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batteri"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Kør1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Næste"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Forrige"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sove"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Dvale"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Trådløs"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Webkamera"

 # Tasten på visse bærbare computeres tastaturer, som aktiverer noget projektoragtigt eller på anden vis piller ved skærmindstillingerne
 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Skærm"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "PegepladeTilFra"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "VågnOp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Hvile"

 #. Description of --sync in --help output
@@ -304,132 +304,132 @@ msgstr "Entf"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitorhelligkeit erhöhen"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitorhelligkeit senken"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Stumm schalten"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Lautstärke senken"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Lautstärke erhöhen"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Wiedergabe starten"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Wiedergabe stoppen"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Nächster Titel"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Vorheriger Titel"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Aufnahme starten"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Aufnahme pausieren"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Zurückspulen"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Bildschirmschoner"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batterie"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Starten1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Vorwärts"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Rückwärts"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Bereitschaft"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Ruhezustand"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Anzeige"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Aufwecken"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "In Bereitschaft versetzen"

 #. Description of --sync in --help output
@@ -273,132 +273,132 @@ msgstr ""

 #: gdk/keyname-table.h:3988
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor brightness up"

 #: gdk/keyname-table.h:3989
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor brightness down"

 #: gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Audio mute"

 #: gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Audio lower volume"

 #: gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Audio raise volume"

 #: gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Audio play"

 #: gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Audio stop"

 #: gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Audio next"

 #: gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Audio previous"

 #: gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Audio record"

 #: gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Audio pause"

 #: gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Audio rewind"

 #: gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Audio media"

 #: gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Screensaver"

 #: gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Web Cam"

 #: gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Touchpad toggle"

 #: gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Wake up"

 #: gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -279,132 +279,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor brightness up"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor brightness down"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Audio mute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Audio lower volume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Audio raise volume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Audio play"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Audio stop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Audio next"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Audio previous"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Audio record"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Audio pause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Audio rewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Audio media"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Screensaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Webcam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Touchpad toggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Wake up"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -280,132 +280,132 @@ msgstr "Forigi"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Plialtigi ekran-helecon"

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Malplialtigi ekran-helecon"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silentigi sonon"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Malplialtigi sonforton"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Plialtigi sonforton"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Ludi sonon"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Haltigi sonludon"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Sekva sono"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Antaŭa sono"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Registri sonon"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Paŭzigi sonon"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Revolvi sonon"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Aŭdvidea sono"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Ekrankurteno"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Akumulatoro"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Lanĉi1"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Antaŭen"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Malantaŭen"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Dormeti"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Pasivumigi"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Retkamerao"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Ekrano"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Tuŝplata baskulo"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Veki"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Prokrasti"

 #. Description of --sync in --help output
@@ -286,132 +286,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor: subir brillo"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor: bajar brillo"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silenciar"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Sonido: bajar volumen"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Sonido: subir volumen"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Sonido: reproducir"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Sonido: parar"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Sonido: siguiente"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Sonido: anterior"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Sonido: grabar"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Sonido: pausar"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Sonido: rebobinar"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Sonido: medio"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Salvapantallas"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batería"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Ejecutar1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Adelante"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Atrás"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Dormir"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernar"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Cámara web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Activar/desactivar touchpad"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Despertar"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspender"

 #. Description of --sync in --help output
@@ -236,107 +236,107 @@ msgstr "Delete"

 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Kuvari heledust vähemaks"

 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Kuvari heledust juurde"

 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Heli tummaks"

 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Heli vaiksemaks"

 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Heli valjemaks"

 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Heli - esitamine"

 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Heli - stopp"

 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Heli - järgmine"

 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Heli - eelmine"

 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Heli - lindistamine"

 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Heli - paus"

 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Heli - tagasi kerimine"

 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Heli - meedianupp"

 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Ekraanisäästja"

 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Aku"

 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Käivitaja 1"

 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Edasi"

 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Tagasi"

 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Uinak"

 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Talveuni"

 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Juhtmeta võrk"

 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Veebikaamera"

 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Kuva"

 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Puuteplaadi lüliti"

 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Üles äratamine"

 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Arvuti peatamine"

 #. Description of --sync in --help output
@@ -278,132 +278,132 @@ msgstr "Ezabatu"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitorea: igo distira"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitorea: jaitsi distira"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Audioa: mututu"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Audioa: jaitsi bolumena"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Audioa: igo bolumena"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Audioa: erreproduzitu"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Audioa: gelditu"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Audioa: hurrengoa"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Audioa: aurrekoa"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Audioa: grabatu"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Audioa: pausatu"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Audioa: birbobinatu"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Audioa: euskarria"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Pantaila-babeslea"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Bateria"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Abiarazi 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Aurrera"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Atzera"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Lo egin"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernatu"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Web kamera"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantaila"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Touchpad: aktibatu/desaktibatu"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Esnatu"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Eseki"

 #. Description of --sync in --help output
@@ -284,132 +284,132 @@ msgstr "حذف"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "افزایش درخشندگی صفحه‌نمایش"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "کاهش درخشندگی صفحه‌نمایش"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "بی‌صدا"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "کاهش بلندی صدا"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "افزایش بلندی صدا"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "پخش صوت"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "توقف صوت"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "صوت بعدی"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "صوت قبلی"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "ضبط صوت"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "مکث صوت"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "عقب‌بردن صوت"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "رسانه صوتی"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "محافظ صفحه‌نمایش"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "باتری"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "اجرا ۱"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "جلو"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "عقب"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "بخواب بردن"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "خواب زمستانی"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "لن"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "دوربین وب"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "نمایشگر"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "تغییرحالت صفحه‌لمسی"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "بیدار کردن"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "تعلیق کردن"

 #. Description of --sync in --help output
@@ -285,133 +285,133 @@ msgstr "Poista"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -289,132 +289,132 @@ msgstr "Suppr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "LuminositéÉcranPlusForte"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "LuminositéÉcranPlusFaible"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "SourdineVolume"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "VolumePlusFort"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "VolumePlusFaible"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "DémarrageLecture"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "ArrêtLecture"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "MorceauSuivant"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "MorceauPrécédent"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Enregistrement"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Pause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "LectureEnArrière"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "MédiaAudio"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "ÉconomiseurÉcran"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batterie"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Lancement1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "EnAvant"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "EnArrière"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "MiseEnVeille"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernation"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "RéseauSansFil"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Webcam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Écran"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "BasculePavéTactile"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Réveil"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspension"

 #. Description of --sync in --help output
@@ -288,132 +288,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor: subir brillo"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor: baixar brillo"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Enmudecer"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Son: baixar volume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Son: subir volume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Son: reproducir"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Son: parar"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Son: seguinte"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Son: anterior"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Son: gravar"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Son: pausar"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Son: rebobinar"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Son: medio"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Salvapantallas"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batería"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executar1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Adiante"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Atrás"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Durmir"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernar"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Rede sen fíos"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Cámara web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Activar/desactivar área táctil"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Espertar"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspender"

 #. Description of --sync in --help output
@@ -307,133 +307,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -286,132 +286,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "מדיה – הבהרת הצג"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "מדיה – הורדת בהירות הצג"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "מדיה – השתקה"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "מדיה – הנמכת עצמת השמע"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "מדיה – הגברת עצמת השמע"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "מדיה – נגינה"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "מדיה – עצירה"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "מדיה – הבא"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "מדיה – הקודם"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "מדיה – הקלטה"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "מדיה – השהיה"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "מדיה – חזרה"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "מדיה – שמע"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "שומר מסך"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "סוללה"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "הפעלה1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "קדימה"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "חזרה"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "שינה"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "תרדמת"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "רשת אלחוטית"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "מצלמת רשת"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "תצוגה"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "הפעלה/נטרול של משטח המגע"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "השכמה"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "השהיה"

 #. Description of --sync in --help output
@@ -290,133 +290,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -281,132 +281,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitorfényerő növelése"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitorfényerő csökkentése"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Hang némítása"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Hangerő csökkentése"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Hangerő növelése"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Hang lejátszása"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Hanglejátszás leállítása"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Következő hangfájl"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Előző hangfájl"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Hangrögzítés"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Hang szüneteltetése"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Hangfájl visszatekerése"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Hang/média"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Képernyővédő"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Akkumulátor"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Indítás1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Tovább"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Vissza"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Alvás"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernálás"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Webkamera"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Kijelző"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Érintőtábla"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Ébresztés"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Felfüggesztés"

 #. Description of --sync in --help output
@@ -278,132 +278,132 @@ msgstr "Deler"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Accrescer luminositate"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Decrescer luminositate"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silentiar"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Abassar volumine"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Altiar volumine"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Reproducer"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Arrestar"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Sequente"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Precedente"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Registrar"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Pausar"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Rebobinar"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Media"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Economisator"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Accumulator"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Lancear"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Avantiar"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Regreder"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Dormir"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hinernar"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Rete sin filo"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Camera web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Schermo"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Pannello tactile"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Eveliar"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspender"

 #. Description of --sync in --help output
@@ -283,133 +283,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Larsson	0d9b189a64	gdkframeclock: Loop the layout phase if needed In the case where the layout phase queued a layout we don't want to progress to the paint phase with invalid allocations, so we loop the layout. This shouldn't normally happen, but it may happen in some edge cases like if user/wm resizes clash with natural window size changes from a gtk widget. This should not generally loop though, so we detect this after 4 cycles and print a warning. This was detected because of an issue in GtkWindow where it seems to incorrectly handle the case of a user interactive resize. It seems gtk_window_move_resize() believes that configure_request_size_changed changed due to hitting some corner case so it calls gtk_widget_queue_resize_no_redraw(), marking the window as need_alloc after the layout phase. This commit fixes the issue, but we should also look into if we can fix that.	2013-04-24 22:21:06 +02:00
Alexander Larsson	fe70c2db55	Change the way we draw (again) We can't really just draw by walking down the widget hierarchy, as this doesn't get the right clipping (so e.g. widgets doing cairo_paint may draw outside the expected gdkwindow subarea) nor does it let us paint window backgrounds. So, we now do multiple draws for each widget, once for each expose event although we still do it at the same base cairo_t that we get for the toplevel native window. We also collect all the windows of a widget so we can expose them inside the same opacity group if needed.	2013-04-24 18:20:56 +02:00
Alexander Larsson	b40fc9d141	gdkwindow: Change update_handler to invalidate_handler The new name fits better, plus we also remove the return value, and adds docs.	2013-04-23 19:16:30 +02:00
Alexander Larsson	9da2f293e9	GtkViewport: Add offscreen surface based scrolling Rather than scroll via XCopyArea (which we no longer do) we keep an offscreen buffer of the scrolled area with some extra space outside the visible area and when we expose the viewport we just blit the offscreen to the right place.	2013-04-21 01:54:05 +02:00
Alexander Larsson	1270bcd5c3	gtkcontainer: Don't propagate draws to non-drawable widgets This short-circuits the propagation a bit earlier and fixes a crash when looking for has_native_window on non-realized widgets.	2013-04-21 01:35:57 +02:00
Alexander Larsson	b788fb784c	Add gdk_window_set_update_handler This lets you register callbacks for when child widgets invalidate areas of the window read it and/or change it. For instance, this lets you do rendering effects and keeping offscreen caches uptodate.	2013-04-21 01:27:07 +02:00
Alexander Larsson	472081c052	gdkwindow: Simplify invalidation Now that all windows are non-opaque we can simplify the invalidation a lot. There is no need to clip the invalidate area to child regions, because we will always redraw everything under all the children. We only have to handle native childen specially.	2013-04-19 17:40:58 +02:00
Alexander Larsson	08159b89bd	gdkwindow: Remove implicit paints We now only do one expose event per native window, so there will only be one begin/end_paint() call. This means all the work with implicit paints to combine the paints on a single double buffer surface is unnecessary, so we can just delete it.	2013-04-17 23:06:07 +02:00
Alexander Larsson	fc88ce08ee	Only handle exposes on native window, propagate to children via draw() We now consider non-native windows non-opaque, which means any invalid area in a subwindow will also be invalid all the way up to the nearest native windows. We take advantage of this by ignoring all expose events on non-native windows (which typically means just the toplevel) and instead propagating down the draw() calls to children directly via gtk_container_propagate_draw. This is nice as it means we always draw widgets the same way, and it will let us do some interesting ways in the future. We also clean up the GtkWidget opacity handling as we can now always rely on the draing happening via cairo. NOTE: This change neuters gtk_widget_set_double_buffered for widgets without native windows	2013-04-17 20:55:26 +02:00
Alexander Larsson	d0a10c847e	gdkwindow: Remove ancient USE_BACKING_STORE define This is always set anyway.	2013-04-17 17:10:18 +02:00
Alexander Larsson	20ed384efb	gdkwindow: Simplify clip region calculations Since we no longer make overlapping siblings affect clip_region we can further simplify the clip region calculation and updating.	2013-04-17 17:05:49 +02:00
Alexander Larsson	73107e0a4e	gdkwindow: Simplify clip region handling Since we dropped the move region optimization there is really no need to try carefully keep track of opaque non-overlapped regions, as we don't use this information to trigger the optimization anymore. So, by assuming that all windows are non-opaque we can vastly simplify the clip region stuff. First of all, we don't need clip_region_with_children, as each window will need to draw under all children anyway. Secondly, we don't remove overlapping sibling areas from clip_region, as these are all non-opaque anyway and we need to draw under them Finally, we don't need to track the layered region anymore as its essentially unused. The few times something like it is needed we can compute it explicitly. For the case of native children of widgets we may cause a repaint under native windows that are guaranteed to be opaque, but these will be clipped by the native child anyway.	2013-04-17 16:47:49 +02:00
Alexander Larsson	c95bcc2a9f	gdkwindow: Remove translate vfunc This is not used anymore	2013-04-17 14:15:51 +02:00
Alexander Larsson	36e71d80ad	gdkwindow: Remove outstanding_moves stuff Since we now never move regions directly on the window we can remove all the stuff that track outstanding moves and flushes then.	2013-04-17 14:02:32 +02:00
Alexander Larsson	dacd820965	gdk: Don't ever do copies from the window This basically neuters gdk_window_move_region, gdk_window_scroll and gdk_window_move_resize, in that they now never copy any bits but just invalidate the source and destination regions. This is a performance loss, but the hope is that the simplifications it later allows will let us recover this performance loss (which mainly affects scrolling).	2013-04-17 13:46:04 +02:00