]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwindow.c
Fix a compiler warning
[~andy/gtk] / gtk / gtkwindow.c
index 324e1c986f1e160d82187f60210092f07a5e5fec..89206845795c1ea0f8fbd164fefa1796a725585c 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include <string.h>
 #include <limits.h>
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
+#include "gtkintl.h"
+
 #include "gtkprivate.h"
 #include "gtkrc.h"
 #include "gtkwindow.h"
 #include "gtkbindings.h"
 #include "gtkkeyhash.h"
 #include "gtkmain.h"
+#include "gtkmnemonichash.h"
 #include "gtkiconfactory.h"
-#include "gtkintl.h"
+#include "gtkicontheme.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
+#include "gtkalias.h"
+
+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
 
 enum {
   SET_FOCUS,
@@ -59,6 +68,7 @@ enum {
 
   /* Normal Props */
   PROP_TITLE,
+  PROP_ROLE,
   PROP_ALLOW_SHRINK,
   PROP_ALLOW_GROW,
   PROP_RESIZABLE,
@@ -68,10 +78,18 @@ enum {
   PROP_DEFAULT_HEIGHT,
   PROP_DESTROY_WITH_PARENT,
   PROP_ICON,
+  PROP_ICON_NAME,
   PROP_SCREEN,
   PROP_TYPE_HINT,
   PROP_SKIP_TASKBAR_HINT,
   PROP_SKIP_PAGER_HINT,
+  PROP_URGENCY_HINT,
+  PROP_ACCEPT_FOCUS,
+  PROP_FOCUS_ON_MAP,
+  PROP_DECORATED,
+  PROP_DELETABLE,
+  PROP_GRAVITY,
+  PROP_TRANSIENT_FOR,
   
   /* Readonly properties */
   PROP_IS_ACTIVE,
@@ -85,9 +103,11 @@ typedef struct
   GList     *icon_list;
   GdkPixmap *icon_pixmap;
   GdkPixmap *icon_mask;
+  gchar     *icon_name;
   guint      realized : 1;
   guint      using_default_icon : 1;
   guint      using_parent_icon : 1;
+  guint      using_themed_icon : 1;
 } GtkWindowIconInfo;
 
 typedef struct {
@@ -136,30 +156,32 @@ struct _GtkWindowGeometryInfo
   GtkWindowLastGeometryInfo last;
 };
 
-typedef struct _GtkWindowMnemonic GtkWindowMnemonic;
-
-struct _GtkWindowMnemonic {
-  GtkWindow *window;
-  guint keyval;
-
-  GSList *targets;
-};
+#define GTK_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_WINDOW, GtkWindowPrivate))
 
 typedef struct _GtkWindowPrivate GtkWindowPrivate;
 
 struct _GtkWindowPrivate
 {
+  GtkMnemonicHash *mnemonic_hash;
+  
+  guint above_initially : 1;
+  guint below_initially : 1;
   guint fullscreen_initially : 1;
   guint skips_taskbar : 1;
   guint skips_pager : 1;
+  guint urgent : 1;
+  guint accept_focus : 1;
+  guint focus_on_map : 1;
+  guint deletable : 1;
+  guint transient_parent_group : 1;
+
+  guint reset_type_hint : 1;
+  GdkWindowTypeHint type_hint;
 };
 
-static void gtk_window_class_init         (GtkWindowClass    *klass);
-static void gtk_window_init               (GtkWindow         *window);
 static void gtk_window_dispose            (GObject           *object);
 static void gtk_window_destroy            (GtkObject         *object);
 static void gtk_window_finalize           (GObject           *object);
-static void gtk_window_private_finalize   (GtkWindowPrivate  *priv);
 static void gtk_window_show               (GtkWidget         *widget);
 static void gtk_window_hide               (GtkWidget         *widget);
 static void gtk_window_map                (GtkWidget         *widget);
@@ -172,6 +194,8 @@ static void gtk_window_size_allocate      (GtkWidget         *widget,
                                           GtkAllocation     *allocation);
 static gint gtk_window_event              (GtkWidget *widget,
                                           GdkEvent *event);
+static gboolean gtk_window_map_event      (GtkWidget         *widget,
+                                           GdkEventAny       *event);
 static gboolean gtk_window_frame_event    (GtkWindow *window,
                                           GdkEvent *event);
 static gint gtk_window_configure_event    (GtkWidget         *widget,
@@ -201,18 +225,18 @@ static void gtk_window_real_activate_focus   (GtkWindow         *window);
 static void gtk_window_move_focus            (GtkWindow         *window,
                                               GtkDirectionType   dir);
 static void gtk_window_keys_changed          (GtkWindow         *window);
-static void gtk_window_read_rcfiles       (GtkWidget         *widget,
-                                          GdkEventClient    *event);
-static void gtk_window_paint              (GtkWidget         *widget,
-                                          GdkRectangle      *area);
-static gint gtk_window_expose             (GtkWidget         *widget,
-                                          GdkEventExpose    *event);
+static void gtk_window_paint                 (GtkWidget         *widget,
+                                             GdkRectangle      *area);
+static gint gtk_window_expose                (GtkWidget         *widget,
+                                             GdkEventExpose    *event);
 static void gtk_window_unset_transient_for         (GtkWindow  *window);
 static void gtk_window_transient_parent_realized   (GtkWidget  *parent,
                                                    GtkWidget  *window);
 static void gtk_window_transient_parent_unrealized (GtkWidget  *parent,
                                                    GtkWidget  *window);
 
+static GdkScreen *gtk_window_check_screen (GtkWindow *window);
+
 static GtkWindowGeometryInfo* gtk_window_get_geometry_info         (GtkWindow    *window,
                                                                     gboolean      create);
 
@@ -248,22 +272,32 @@ static void     gtk_window_set_default_size_internal (GtkWindow    *window,
                                                       gint          height,
                                                      gboolean      is_geometry);
 
+static void     update_themed_icon                    (GtkIconTheme *theme,
+                                                      GtkWindow    *window);
+static GList   *icon_list_from_theme                  (GtkWidget    *widget,
+                                                      const gchar  *name);
 static void     gtk_window_realize_icon               (GtkWindow    *window);
 static void     gtk_window_unrealize_icon             (GtkWindow    *window);
 
 static void        gtk_window_notify_keys_changed (GtkWindow   *window);
 static GtkKeyHash *gtk_window_get_key_hash        (GtkWindow   *window);
 static void        gtk_window_free_key_hash       (GtkWindow   *window);
+static void       gtk_window_on_composited_changed (GdkScreen *screen,
+                                                    GtkWindow *window);
 
 static GSList      *toplevel_list = NULL;
-static GHashTable  *mnemonic_hash_table = NULL;
-static GtkBinClass *parent_class = NULL;
 static guint        window_signals[LAST_SIGNAL] = { 0 };
 static GList       *default_icon_list = NULL;
+static gchar       *default_icon_name = NULL;
 static guint        default_icon_serial = 0;
 static gboolean     disable_startup_notification = FALSE;
 static gboolean     sent_startup_notification = FALSE;
 
+static GQuark       quark_gtk_embedded = 0;
+static GQuark       quark_gtk_window_key_hash = 0;
+static GQuark       quark_gtk_window_default_icon_pixmap = 0;
+static GQuark       quark_gtk_window_icon_info = 0;
+
 static void gtk_window_set_property (GObject         *object,
                                     guint            prop_id,
                                     const GValue    *value,
@@ -274,88 +308,7 @@ static void gtk_window_get_property (GObject         *object,
                                     GParamSpec      *pspec);
 
 
-static guint
-mnemonic_hash (gconstpointer key)
-{
-  const GtkWindowMnemonic *k;
-  guint h;
-  
-  k = (GtkWindowMnemonic *)key;
-  
-  h = (gulong) k->window;
-  h ^= k->keyval << 16;
-  h ^= k->keyval >> 16;
-
-  return h;
-}
-
-static gboolean
-mnemonic_equal (gconstpointer a, gconstpointer b)
-{
-  const GtkWindowMnemonic *ka;
-  const GtkWindowMnemonic *kb;
-  
-  ka = (GtkWindowMnemonic *)a;
-  kb = (GtkWindowMnemonic *)b;
-
-  return
-    (ka->window == kb->window) &&
-    (ka->keyval == kb->keyval);
-}
-
-GtkWindowPrivate*
-gtk_window_get_private (GtkWindow *window)
-{
-  GtkWindowPrivate *private;
-  static GQuark private_quark = 0;
-
-  if (!private_quark)
-    private_quark = g_quark_from_static_string ("gtk-window-private");
-
-  private = g_object_get_qdata (G_OBJECT (window), private_quark);
-
-  if (!private)
-    {
-      private = g_new0 (GtkWindowPrivate, 1);
-
-      private->fullscreen_initially = FALSE;
-      private->skips_pager = FALSE;
-      private->skips_taskbar = FALSE;
-      
-      g_object_set_qdata_full (G_OBJECT (window), private_quark,
-                              private,
-                               (GDestroyNotify) gtk_window_private_finalize);
-    }
-
-  return private;
-}
-
-GType
-gtk_window_get_type (void)
-{
-  static GType window_type = 0;
-
-  if (!window_type)
-    {
-      static const GTypeInfo window_info =
-      {
-       sizeof (GtkWindowClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_window_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkWindow),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_window_init,
-      };
-
-      window_type = g_type_register_static (GTK_TYPE_BIN, "GtkWindow",
-                                           &window_info, 0);
-    }
-
-  return window_type;
-}
+G_DEFINE_TYPE (GtkWindow, gtk_window, GTK_TYPE_BIN)
 
 static void
 add_tab_bindings (GtkBindingSet    *binding_set,
@@ -405,9 +358,10 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class = (GtkWidgetClass*) klass;
   container_class = (GtkContainerClass*) klass;
   
-  parent_class = g_type_class_peek_parent (klass);
-
-  mnemonic_hash_table = g_hash_table_new (mnemonic_hash, mnemonic_equal);
+  quark_gtk_embedded = g_quark_from_static_string ("gtk-embedded");
+  quark_gtk_window_key_hash = g_quark_from_static_string ("gtk-window-key-hash");
+  quark_gtk_window_default_icon_pixmap = g_quark_from_static_string ("gtk-window-default-icon-pixmap");
+  quark_gtk_window_icon_info = g_quark_from_static_string ("gtk-window-icon-info");
 
   gobject_class->dispose = gtk_window_dispose;
   gobject_class->finalize = gtk_window_finalize;
@@ -420,6 +374,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class->show = gtk_window_show;
   widget_class->hide = gtk_window_hide;
   widget_class->map = gtk_window_map;
+  widget_class->map_event = gtk_window_map_event;
   widget_class->unmap = gtk_window_unmap;
   widget_class->realize = gtk_window_realize;
   widget_class->unrealize = gtk_window_unrealize;
@@ -447,154 +402,282 @@ gtk_window_class_init (GtkWindowClass *klass)
   klass->move_focus = gtk_window_move_focus;
   klass->keys_changed = gtk_window_keys_changed;
   
+  g_type_class_add_private (gobject_class, sizeof (GtkWindowPrivate));
+  
   /* Construct */
   g_object_class_install_property (gobject_class,
                                    PROP_TYPE,
                                    g_param_spec_enum ("type",
-                                                     _("Window Type"),
-                                                     _("The type of the window"),
+                                                     P_("Window Type"),
+                                                     P_("The type of the window"),
                                                      GTK_TYPE_WINDOW_TYPE,
                                                      GTK_WINDOW_TOPLEVEL,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
+                                                     GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   /* Regular Props */
   g_object_class_install_property (gobject_class,
                                    PROP_TITLE,
                                    g_param_spec_string ("title",
-                                                        _("Window Title"),
-                                                        _("The title of the window"),
+                                                        P_("Window Title"),
+                                                        P_("The title of the window"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_ROLE,
+                                   g_param_spec_string ("role",
+                                                       P_("Window Role"),
+                                                       P_("Unique identifier for the window to be used when restoring a session"),
+                                                       NULL,
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_SHRINK,
-                                   g_param_spec_boolean ("allow_shrink",
-                                                        _("Allow Shrink"),
+                                   g_param_spec_boolean ("allow-shrink",
+                                                        P_("Allow Shrink"),
                                                         /* xgettext:no-c-format */
-                                                        _("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"),
+                                                        P_("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_GROW,
-                                   g_param_spec_boolean ("allow_grow",
-                                                        _("Allow Grow"),
-                                                        _("If TRUE, users can expand the window beyond its minimum size"),
+                                   g_param_spec_boolean ("allow-grow",
+                                                        P_("Allow Grow"),
+                                                        P_("If TRUE, users can expand the window beyond its minimum size"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_RESIZABLE,
                                    g_param_spec_boolean ("resizable",
-                                                        _("Resizable"),
-                                                        _("If TRUE, users can resize the window"),
+                                                        P_("Resizable"),
+                                                        P_("If TRUE, users can resize the window"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_MODAL,
                                    g_param_spec_boolean ("modal",
-                                                        _("Modal"),
-                                                        _("If TRUE, the window is modal (other windows are not usable while this one is up)"),
+                                                        P_("Modal"),
+                                                        P_("If TRUE, the window is modal (other windows are not usable while this one is up)"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WIN_POS,
-                                   g_param_spec_enum ("window_position",
-                                                     _("Window Position"),
-                                                     _("The initial position of the window"),
+                                   g_param_spec_enum ("window-position",
+                                                     P_("Window Position"),
+                                                     P_("The initial position of the window"),
                                                      GTK_TYPE_WINDOW_POSITION,
                                                      GTK_WIN_POS_NONE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_DEFAULT_WIDTH,
-                                   g_param_spec_int ("default_width",
-                                                    _("Default Width"),
-                                                    _("The default width of the window, used when initially showing the window"),
+                                   g_param_spec_int ("default-width",
+                                                    P_("Default Width"),
+                                                    P_("The default width of the window, used when initially showing the window"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DEFAULT_HEIGHT,
-                                   g_param_spec_int ("default_height",
-                                                    _("Default Height"),
-                                                    _("The default height of the window, used when initially showing the window"),
+                                   g_param_spec_int ("default-height",
+                                                    P_("Default Height"),
+                                                    P_("The default height of the window, used when initially showing the window"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DESTROY_WITH_PARENT,
-                                   g_param_spec_boolean ("destroy_with_parent",
-                                                        _("Destroy with Parent"),
-                                                        _("If this window should be destroyed when the parent is destroyed"),
+                                   g_param_spec_boolean ("destroy-with-parent",
+                                                        P_("Destroy with Parent"),
+                                                        P_("If this window should be destroyed when the parent is destroyed"),
                                                          FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ICON,
                                    g_param_spec_object ("icon",
-                                                        _("Icon"),
-                                                        _("Icon for this window"),
+                                                        P_("Icon"),
+                                                        P_("Icon for this window"),
                                                         GDK_TYPE_PIXBUF,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
+  
+  /**
+   * GtkWindow:icon-name:
+   *
+   * The :icon-name property specifies the name of the themed icon to
+   * use as the window icon. See #GtkIconTheme for more details.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name",
+                                                        P_("Icon Name"),
+                                                        P_("Name of the themed icon for this window"),
+                                                       NULL,
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_SCREEN,
                                   g_param_spec_object ("screen",
-                                                       _("Screen"),
-                                                       _("The screen where this window will be displayed"),
+                                                       P_("Screen"),
+                                                       P_("The screen where this window will be displayed"),
                                                        GDK_TYPE_SCREEN,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_IS_ACTIVE,
-                                   g_param_spec_boolean ("is_active",
-                                                        _("Is Active"),
-                                                        _("Whether the toplevel is the current active window"),
+                                   g_param_spec_boolean ("is-active",
+                                                        P_("Is Active"),
+                                                        P_("Whether the toplevel is the current active window"),
                                                         FALSE,
-                                                        G_PARAM_READABLE));
+                                                        GTK_PARAM_READABLE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_HAS_TOPLEVEL_FOCUS,
-                                   g_param_spec_boolean ("has_toplevel_focus",
-                                                        _("Focus in Toplevel"),
-                                                        _("Whether the input focus is within this GtkWindow"),
+                                   g_param_spec_boolean ("has-toplevel-focus",
+                                                        P_("Focus in Toplevel"),
+                                                        P_("Whether the input focus is within this GtkWindow"),
                                                         FALSE,
-                                                        G_PARAM_READABLE));
+                                                        GTK_PARAM_READABLE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_TYPE_HINT,
-                                  g_param_spec_enum ("type_hint",
-                                                      _("Type hint"),
-                                                      _("Hint to help the desktop environment understand what kind of window this is and how to treat it."),
+                                  g_param_spec_enum ("type-hint",
+                                                      P_("Type hint"),
+                                                      P_("Hint to help the desktop environment understand what kind of window this is and how to treat it."),
                                                       GDK_TYPE_WINDOW_TYPE_HINT,
                                                       GDK_WINDOW_TYPE_HINT_NORMAL,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_SKIP_TASKBAR_HINT,
-                                  g_param_spec_boolean ("skip_taskbar_hint",
-                                                         _("Skip taskbar"),
-                                                         _("TRUE if the window should not be in the task bar."),
+                                  g_param_spec_boolean ("skip-taskbar-hint",
+                                                         P_("Skip taskbar"),
+                                                         P_("TRUE if the window should not be in the task bar."),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_SKIP_PAGER_HINT,
-                                  g_param_spec_boolean ("skip_pager_hint",
-                                                         _("Skip pager"),
-                                                         _("TRUE if the window should not be in the pager."),
+                                  g_param_spec_boolean ("skip-pager-hint",
+                                                         P_("Skip pager"),
+                                                         P_("TRUE if the window should not be in the pager."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (gobject_class,
+                                  PROP_URGENCY_HINT,
+                                  g_param_spec_boolean ("urgency-hint",
+                                                         P_("Urgent"),
+                                                         P_("TRUE if the window should be brought to the user's attention."),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));  
+                                                         GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkWindow:accept-focus-hint:
+   *
+   * Whether the window should receive the input focus.
+   *
+   * Since: 2.4
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_ACCEPT_FOCUS,
+                                  g_param_spec_boolean ("accept-focus",
+                                                         P_("Accept focus"),
+                                                         P_("TRUE if the window should receive the input focus."),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkWindow:focus-on-map-hint:
+   *
+   * Whether the window should receive the input focus when mapped.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_FOCUS_ON_MAP,
+                                  g_param_spec_boolean ("focus-on-map",
+                                                         P_("Focus on map"),
+                                                         P_("TRUE if the window should receive the input focus when mapped."),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkWindow:decorated:
+   *
+   * Whether the window should be decorated by the window manager.
+   *
+   * Since: 2.4
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DECORATED,
+                                   g_param_spec_boolean ("decorated",
+                                                        P_("Decorated"),
+                                                        P_("Whether the window should be decorated by the window manager"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkWindow:deletable:
+   *
+   * Whether the window frame should have a close button.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DELETABLE,
+                                   g_param_spec_boolean ("deletable",
+                                                        P_("Deletable"),
+                                                        P_("Whether the window frame should have a close button"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkWindow:gravity:
+   *
+   * The window gravity of the window. See gtk_window_move() and #GdkGravity for
+   * more details about window gravity.
+   *
+   * Since: 2.4
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_GRAVITY,
+                                   g_param_spec_enum ("gravity",
+                                                     P_("Gravity"),
+                                                     P_("The window gravity of the window"),
+                                                     GDK_TYPE_GRAVITY,
+                                                     GDK_GRAVITY_NORTH_WEST,
+                                                     GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkWindow:transient-for:
+   *
+   * The transient parent of the window. See gtk_window_set_transient_for() for
+   * more details about transient windows.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_TRANSIENT_FOR,
+                                  g_param_spec_object ("transient-for",
+                                                       P_("Transient for Window"),
+                                                       P_("The transient parent of the dialog"),
+                                                       GTK_TYPE_WINDOW,
+                                                       GTK_PARAM_READWRITE| G_PARAM_CONSTRUCT));
 
   window_signals[SET_FOCUS] =
-    g_signal_new ("set_focus",
+    g_signal_new (I_("set_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkWindowClass, set_focus),
@@ -604,7 +687,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   GTK_TYPE_WIDGET);
   
   window_signals[FRAME_EVENT] =
-    g_signal_new ("frame_event",
+    g_signal_new (I_("frame_event"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWindowClass, frame_event),
@@ -614,7 +697,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   GDK_TYPE_EVENT);
 
   window_signals[ACTIVATE_FOCUS] =
-    g_signal_new ("activate_focus",
+    g_signal_new (I_("activate_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, activate_focus),
@@ -624,7 +707,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   0);
 
   window_signals[ACTIVATE_DEFAULT] =
-    g_signal_new ("activate_default",
+    g_signal_new (I_("activate_default"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, activate_default),
@@ -634,7 +717,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   0);
 
   window_signals[MOVE_FOCUS] =
-    g_signal_new ("move_focus",
+    g_signal_new (I_("move_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, move_focus),
@@ -645,7 +728,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   GTK_TYPE_DIRECTION_TYPE);
 
   window_signals[KEYS_CHANGED] =
-    g_signal_new ("keys_changed",
+    g_signal_new (I_("keys_changed"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkWindowClass, keys_changed),
@@ -686,6 +769,7 @@ static void
 gtk_window_init (GtkWindow *window)
 {
   GdkColormap *colormap;
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
   
   GTK_WIDGET_UNSET_FLAGS (window, GTK_NO_WINDOW);
   GTK_WIDGET_SET_FLAGS (window, GTK_TOPLEVEL);
@@ -721,22 +805,24 @@ gtk_window_init (GtkWindow *window)
   window->decorated = TRUE;
   window->mnemonic_modifier = GDK_MOD1_MASK;
   window->screen = gdk_screen_get_default ();
-  
+
+  priv->accept_focus = TRUE;
+  priv->focus_on_map = TRUE;
+  priv->deletable = TRUE;
+  priv->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
+
   colormap = _gtk_widget_peek_colormap ();
   if (colormap)
     gtk_widget_set_colormap (GTK_WIDGET (window), colormap);
   
-  g_object_ref (window);
-  gtk_object_sink (GTK_OBJECT (window));
+  g_object_ref_sink (window);
   window->has_user_ref_count = TRUE;
   toplevel_list = g_slist_prepend (toplevel_list, window);
 
   gtk_decorated_window_init (window);
 
-  g_signal_connect (window,
-                   "event",
-                   G_CALLBACK (gtk_window_event),
-                   NULL);
+  g_signal_connect (window->screen, "composited_changed",
+                   G_CALLBACK (gtk_window_on_composited_changed), window);
 }
 
 static void
@@ -757,6 +843,9 @@ gtk_window_set_property (GObject      *object,
     case PROP_TITLE:
       gtk_window_set_title (window, g_value_get_string (value));
       break;
+    case PROP_ROLE:
+      gtk_window_set_role (window, g_value_get_string (value));
+      break;
     case PROP_ALLOW_SHRINK:
       window->allow_shrink = g_value_get_boolean (value);
       gtk_widget_queue_resize (GTK_WIDGET (window));
@@ -769,7 +858,7 @@ gtk_window_set_property (GObject      *object,
     case PROP_RESIZABLE:
       window->allow_grow = g_value_get_boolean (value);
       gtk_widget_queue_resize (GTK_WIDGET (window));
-      g_object_notify (G_OBJECT (window), "allow_grow");
+      g_object_notify (G_OBJECT (window), "allow-grow");
       break;
     case PROP_MODAL:
       gtk_window_set_modal (window, g_value_get_boolean (value));
@@ -794,6 +883,9 @@ gtk_window_set_property (GObject      *object,
       gtk_window_set_icon (window,
                            g_value_get_object (value));
       break;
+    case PROP_ICON_NAME:
+      gtk_window_set_icon_name (window, g_value_get_string (value));
+      break;
     case PROP_SCREEN:
       gtk_window_set_screen (window, g_value_get_object (value));
       break;
@@ -809,7 +901,30 @@ gtk_window_set_property (GObject      *object,
       gtk_window_set_skip_pager_hint (window,
                                       g_value_get_boolean (value));
       break;
-      
+    case PROP_URGENCY_HINT:
+      gtk_window_set_urgency_hint (window,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_ACCEPT_FOCUS:
+      gtk_window_set_accept_focus (window,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_FOCUS_ON_MAP:
+      gtk_window_set_focus_on_map (window,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_DECORATED:
+      gtk_window_set_decorated (window, g_value_get_boolean (value));
+      break;
+    case PROP_DELETABLE:
+      gtk_window_set_deletable (window, g_value_get_boolean (value));
+      break;
+    case PROP_GRAVITY:
+      gtk_window_set_gravity (window, g_value_get_enum (value));
+      break;
+    case PROP_TRANSIENT_FOR:
+      gtk_window_set_transient_for (window, g_value_get_object (value));
+      break;
     default:
       break;
     }
@@ -822,15 +937,20 @@ gtk_window_get_property (GObject      *object,
                         GParamSpec   *pspec)
 {
   GtkWindow  *window;
+  GtkWindowPrivate *priv;
 
   window = GTK_WINDOW (object);
-
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+  
   switch (prop_id)
     {
       GtkWindowGeometryInfo *info;
     case PROP_TYPE:
       g_value_set_enum (value, window->type);
       break;
+    case PROP_ROLE:
+      g_value_set_string (value, window->wm_role);
+      break;
     case PROP_TITLE:
       g_value_set_string (value, window->title);
       break;
@@ -869,6 +989,9 @@ gtk_window_get_property (GObject      *object,
     case PROP_ICON:
       g_value_set_object (value, gtk_window_get_icon (window));
       break;
+    case PROP_ICON_NAME:
+      g_value_set_string (value, gtk_window_get_icon_name (window));
+      break;
     case PROP_SCREEN:
       g_value_set_object (value, window->screen);
       break;
@@ -879,8 +1002,7 @@ gtk_window_get_property (GObject      *object,
       g_value_set_boolean (value, window->has_toplevel_focus);
       break;
     case PROP_TYPE_HINT:
-      g_value_set_enum (value,
-                        window->type_hint);
+      g_value_set_enum (value, priv->type_hint);
       break;
     case PROP_SKIP_TASKBAR_HINT:
       g_value_set_boolean (value,
@@ -890,6 +1012,30 @@ gtk_window_get_property (GObject      *object,
       g_value_set_boolean (value,
                            gtk_window_get_skip_pager_hint (window));
       break;
+    case PROP_URGENCY_HINT:
+      g_value_set_boolean (value,
+                           gtk_window_get_urgency_hint (window));
+      break;
+    case PROP_ACCEPT_FOCUS:
+      g_value_set_boolean (value,
+                           gtk_window_get_accept_focus (window));
+      break;
+    case PROP_FOCUS_ON_MAP:
+      g_value_set_boolean (value,
+                           gtk_window_get_focus_on_map (window));
+      break;
+    case PROP_DECORATED:
+      g_value_set_boolean (value, gtk_window_get_decorated (window));
+      break;
+    case PROP_DELETABLE:
+      g_value_set_boolean (value, gtk_window_get_deletable (window));
+      break;
+    case PROP_GRAVITY:
+      g_value_set_enum (value, gtk_window_get_gravity (window));
+      break;
+    case PROP_TRANSIENT_FOR:
+      g_value_set_object (value, gtk_window_get_transient_for (window));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -948,11 +1094,13 @@ void
 gtk_window_set_title (GtkWindow   *window,
                      const gchar *title)
 {
+  char *new_title;
+  
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  if (window->title)
-    g_free (window->title);
-  window->title = g_strdup (title);
+  new_title = g_strdup (title);
+  g_free (window->title);
+  window->title = new_title;
 
   if (GTK_WIDGET_REALIZED (window))
     {
@@ -1038,16 +1186,18 @@ void
 gtk_window_set_role (GtkWindow   *window,
                      const gchar *role)
 {
+  char *new_role;
+  
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  if (role == window->wm_role)
-    return;
-  
+  new_role = g_strdup (role);
   g_free (window->wm_role);
-  window->wm_role = g_strdup (role);
-  
+  window->wm_role = new_role;
+
   if (GTK_WIDGET_REALIZED (window))
-    g_warning ("gtk_window_set_role(): shouldn't set role after window is realized!\n");
+    gdk_window_set_role (GTK_WIDGET (window)->window, window->wm_role);
+
+  g_object_notify (G_OBJECT (window), "role");
 }
 
 /**
@@ -1175,11 +1325,11 @@ gtk_window_set_default (GtkWindow *window,
        }
 
       if (old_default_widget)
-       g_object_notify (G_OBJECT (old_default_widget), "has_default");
+       g_object_notify (G_OBJECT (old_default_widget), "has-default");
       
       if (default_widget)
        {
-         g_object_notify (G_OBJECT (default_widget), "has_default");
+         g_object_notify (G_OBJECT (default_widget), "has-default");
          g_object_unref (default_widget);
        }
     }
@@ -1197,8 +1347,8 @@ gtk_window_set_policy (GtkWindow *window,
   window->allow_grow = (allow_grow != FALSE);
 
   g_object_freeze_notify (G_OBJECT (window));
-  g_object_notify (G_OBJECT (window), "allow_shrink");
-  g_object_notify (G_OBJECT (window), "allow_grow");
+  g_object_notify (G_OBJECT (window), "allow-shrink");
+  g_object_notify (G_OBJECT (window), "allow-grow");
   g_object_notify (G_OBJECT (window), "resizable");
   g_object_thaw_notify (G_OBJECT (window));
   
@@ -1210,17 +1360,15 @@ handle_keys_changed (gpointer data)
 {
   GtkWindow *window;
 
-  GDK_THREADS_ENTER ();
   window = GTK_WINDOW (data);
 
   if (window->keys_changed_handler)
     {
-      gtk_idle_remove (window->keys_changed_handler);
+      g_source_remove (window->keys_changed_handler);
       window->keys_changed_handler = 0;
     }
 
   g_signal_emit (window, window_signals[KEYS_CHANGED], 0);
-  GDK_THREADS_LEAVE ();
   
   return FALSE;
 }
@@ -1229,7 +1377,7 @@ static void
 gtk_window_notify_keys_changed (GtkWindow *window)
 {
   if (!window->keys_changed_handler)
-    window->keys_changed_handler = gtk_idle_add (handle_keys_changed, window);
+    window->keys_changed_handler = gdk_threads_add_idle (handle_keys_changed, window);
 }
 
 /**
@@ -1274,6 +1422,17 @@ gtk_window_remove_accel_group (GtkWindow     *window,
   _gtk_accel_group_detach (accel_group, G_OBJECT (window));
 }
 
+static GtkMnemonicHash *
+gtk_window_get_mnemonic_hash (GtkWindow *window,
+                             gboolean   create)
+{
+  GtkWindowPrivate *private = GTK_WINDOW_GET_PRIVATE (window);
+  if (!private->mnemonic_hash && create)
+    private->mnemonic_hash = _gtk_mnemonic_hash_new ();
+  
+  return private->mnemonic_hash;
+}
+
 /**
  * gtk_window_add_mnemonic:
  * @window: a #GtkWindow
@@ -1287,28 +1446,11 @@ gtk_window_add_mnemonic (GtkWindow *window,
                         guint      keyval,
                         GtkWidget *target)
 {
-  GtkWindowMnemonic key;
-  GtkWindowMnemonic *mnemonic;
-
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (GTK_IS_WIDGET (target));
-  
-  key.window = window;
-  key.keyval = keyval;
-  mnemonic = g_hash_table_lookup (mnemonic_hash_table, &key);
 
-  if (mnemonic)
-    {
-      g_return_if_fail (g_slist_find (mnemonic->targets, target) == NULL);
-      mnemonic->targets = g_slist_append (mnemonic->targets, target);
-    }
-  else
-    {
-      mnemonic = g_new (GtkWindowMnemonic, 1);
-      *mnemonic = key;
-      mnemonic->targets = g_slist_prepend (NULL, target);
-      g_hash_table_insert (mnemonic_hash_table, mnemonic, mnemonic);
-    }
+  _gtk_mnemonic_hash_add (gtk_window_get_mnemonic_hash (window, TRUE),
+                         keyval, target);
   gtk_window_notify_keys_changed (window);
 }
 
@@ -1325,24 +1467,11 @@ gtk_window_remove_mnemonic (GtkWindow *window,
                            guint      keyval,
                            GtkWidget *target)
 {
-  GtkWindowMnemonic key;
-  GtkWindowMnemonic *mnemonic;
-
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (GTK_IS_WIDGET (target));
   
-  key.window = window;
-  key.keyval = keyval;
-  mnemonic = g_hash_table_lookup (mnemonic_hash_table, &key);
-
-  g_return_if_fail (mnemonic && g_slist_find (mnemonic->targets, target) != NULL);
-
-  mnemonic->targets = g_slist_remove (mnemonic->targets, target);
-  if (mnemonic->targets == NULL)
-    {
-      g_hash_table_remove (mnemonic_hash_table, mnemonic);
-      g_free (mnemonic);
-    }
+  _gtk_mnemonic_hash_remove (gtk_window_get_mnemonic_hash (window, TRUE),
+                            keyval, target);
   gtk_window_notify_keys_changed (window);
 }
 
@@ -1360,55 +1489,15 @@ gtk_window_mnemonic_activate (GtkWindow      *window,
                              guint           keyval,
                              GdkModifierType modifier)
 {
-  GtkWindowMnemonic key;
-  GtkWindowMnemonic *mnemonic;
-  GSList *list;
-  GtkWidget *widget, *chosen_widget;
-  gboolean overloaded;
-
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->mnemonic_modifier != (modifier & gtk_accelerator_get_default_mod_mask ()))
-    return FALSE;
-  
-  key.window = window;
-  key.keyval = keyval;
-  mnemonic = g_hash_table_lookup (mnemonic_hash_table, &key);
-
-  if (!mnemonic)
-    return FALSE;
-  
-  overloaded = FALSE;
-  chosen_widget = NULL;
-  list = mnemonic->targets;
-  while (list)
-    {
-      widget = GTK_WIDGET (list->data);
-      
-      if (GTK_WIDGET_IS_SENSITIVE (widget) &&
-         GTK_WIDGET_MAPPED (widget))
-       {
-         if (chosen_widget)
-           {
-             overloaded = TRUE;
-             break;
-           }
-         else
-           chosen_widget = widget;
-       }
-      list = g_slist_next (list);
-    }
-
-  if (chosen_widget)
-    {
-      /* For round robin we put the activated entry on
-       * the end of the list after activation
-       */
-      mnemonic->targets = g_slist_remove (mnemonic->targets, chosen_widget);
-      mnemonic->targets = g_slist_append (mnemonic->targets, chosen_widget);
+  if (window->mnemonic_modifier == (modifier & gtk_accelerator_get_default_mod_mask ()))
+      {
+       GtkMnemonicHash *mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+       if (mnemonic_hash)
+         return _gtk_mnemonic_hash_activate (mnemonic_hash, keyval);
+      }
 
-      return gtk_widget_mnemonic_activate (chosen_widget, overloaded);
-    }
   return FALSE;
 }
 
@@ -1482,20 +1571,24 @@ gtk_window_set_position (GtkWindow         *window,
 
   window->position = position;
   
-  g_object_notify (G_OBJECT (window), "window_position");
+  g_object_notify (G_OBJECT (window), "window-position");
 }
 
+/**
+ * gtk_window_activate_focus:
+ * @window: a #GtkWindow
+ * 
+ * Activates the current focused widget within the window.
+ * 
+ * Return value: %TRUE if a widget got activated.
+ **/
 gboolean 
 gtk_window_activate_focus (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->focus_widget)
-    {
-      if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-        gtk_widget_activate (window->focus_widget);
-      return TRUE;
-    }
+  if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+    return gtk_widget_activate (window->focus_widget);
 
   return FALSE;
 }
@@ -1510,7 +1603,7 @@ gtk_window_activate_focus (GtkWindow *window)
  * is not focused then  <literal>GTK_WIDGET_HAS_FOCUS (widget)</literal> will
  * not be %TRUE for the widget. 
  * 
- * Return value: the currently focused widget.
+ * Return value: the currently focused widget, or %NULL if there is none.
  **/
 GtkWidget *
 gtk_window_get_focus (GtkWindow *window)
@@ -1520,6 +1613,17 @@ gtk_window_get_focus (GtkWindow *window)
   return window->focus_widget;
 }
 
+/**
+ * gtk_window_activate_default:
+ * @window: a #GtkWindow
+ * 
+ * Activates the default widget for the window, unless the current 
+ * focused widget has been configured to receive the default action 
+ * (see #GTK_RECEIVES_DEFAULT in #GtkWidgetFlags), in which case the
+ * focused widget is activated. 
+ * 
+ * Return value: %TRUE if a widget got activated.
+ **/
 gboolean
 gtk_window_activate_default (GtkWindow *window)
 {
@@ -1527,16 +1631,9 @@ gtk_window_activate_default (GtkWindow *window)
 
   if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
       (!window->focus_widget || !GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget)))
-    {
-      gtk_widget_activate (window->default_widget);
-      return TRUE;
-    }
-  else if (window->focus_widget)
-    {
-      if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-        gtk_widget_activate (window->focus_widget);
-      return TRUE;
-    }
+    return gtk_widget_activate (window->default_widget);
+  else if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+    return gtk_widget_activate (window->focus_widget);
 
   return FALSE;
 }
@@ -1561,13 +1658,30 @@ gtk_window_set_modal (GtkWindow *window,
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  window->modal = modal != FALSE;
+  modal = modal != FALSE;
+  if (window->modal == modal)
+    return;
+  
+  window->modal = modal;
   
   /* adjust desired modality state */
-  if (GTK_WIDGET_VISIBLE (window) && window->modal)
-    gtk_grab_add (GTK_WIDGET (window));
-  else
-    gtk_grab_remove (GTK_WIDGET (window));
+  if (GTK_WIDGET_REALIZED (window))
+    {
+      GtkWidget *widget = GTK_WIDGET (window);
+      
+      if (window->modal)
+       gdk_window_set_modal_hint (widget->window, TRUE);
+      else
+       gdk_window_set_modal_hint (widget->window, FALSE);
+    }
+
+  if (GTK_WIDGET_VISIBLE (window))
+    {
+      if (window->modal)
+       gtk_grab_add (GTK_WIDGET (window));
+      else
+       gtk_grab_remove (GTK_WIDGET (window));
+    }
 
   g_object_notify (G_OBJECT (window), "modal");
 }
@@ -1620,17 +1734,16 @@ gtk_window_add_embedded_xid (GtkWindow *window, guint xid)
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  embedded_windows = g_object_get_data (G_OBJECT (window), "gtk-embedded");
+  embedded_windows = g_object_get_qdata (G_OBJECT (window), quark_gtk_embedded);
   if (embedded_windows)
-    g_object_steal_qdata (G_OBJECT (window), 
-                         g_quark_from_static_string ("gtk-embedded"));
+    g_object_steal_qdata (G_OBJECT (window), quark_gtk_embedded);
   embedded_windows = g_list_prepend (embedded_windows,
                                     GUINT_TO_POINTER (xid));
 
-  g_object_set_data_full (G_OBJECT (window), "gtk-embedded"
-                         embedded_windows,
-                         embedded_windows ?
-                           (GDestroyNotify) g_list_free : NULL);
+  g_object_set_qdata_full (G_OBJECT (window), quark_gtk_embedded
+                          embedded_windows,
+                          embedded_windows ?
+                          (GDestroyNotify) g_list_free : NULL);
 }
 
 void
@@ -1641,10 +1754,9 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
 
   g_return_if_fail (GTK_IS_WINDOW (window));
   
-  embedded_windows = g_object_get_data (G_OBJECT (window), "gtk-embedded");
+  embedded_windows = g_object_get_qdata (G_OBJECT (window), quark_gtk_embedded);
   if (embedded_windows)
-    g_object_steal_qdata (G_OBJECT (window), 
-                         g_quark_from_static_string ("gtk-embedded"));
+    g_object_steal_qdata (G_OBJECT (window), quark_gtk_embedded);
 
   node = g_list_find (embedded_windows, GUINT_TO_POINTER (xid));
   if (node)
@@ -1653,10 +1765,10 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
       g_list_free_1 (node);
     }
   
-  g_object_set_data_full (G_OBJECT (window), "gtk-embedded",
-                         embedded_windows,
-                         embedded_windows ?
-                           (GDestroyNotify) g_list_free : NULL);
+  g_object_set_qdata_full (G_OBJECT (window), quark_gtk_embedded,
+                          embedded_windows,
+                          embedded_windows ?
+                          (GDestroyNotify) g_list_free : NULL);
 }
 
 void       
@@ -1677,7 +1789,7 @@ gtk_window_dispose (GObject *object)
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (gtk_window_parent_class)->dispose (object);
 }
 
 static void
@@ -1723,7 +1835,7 @@ gtk_window_transient_parent_unrealized (GtkWidget *parent,
 {
   if (GTK_WIDGET_REALIZED (window))
     gdk_property_delete (window->window, 
-                        gdk_atom_intern ("WM_TRANSIENT_FOR", FALSE));
+                        gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
 }
 
 static void
@@ -1737,8 +1849,14 @@ gtk_window_transient_parent_screen_changed (GtkWindow    *parent,
 static void       
 gtk_window_unset_transient_for  (GtkWindow *window)
 {
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
+  
   if (window->transient_parent)
     {
+      if (priv->transient_parent_group)
+       gtk_window_group_remove_window (window->group,
+                                       window);
+
       g_signal_handlers_disconnect_by_func (window->transient_parent,
                                            gtk_window_transient_parent_realized,
                                            window);
@@ -1756,6 +1874,7 @@ gtk_window_unset_transient_for  (GtkWindow *window)
         disconnect_parent_destroyed (window);
       
       window->transient_parent = NULL;
+      priv->transient_parent_group = FALSE;
     }
 }
 
@@ -1781,11 +1900,12 @@ void
 gtk_window_set_transient_for  (GtkWindow *window, 
                               GtkWindow *parent)
 {
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
+  
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
   g_return_if_fail (window != parent);
 
-    
   if (window->transient_parent)
     {
       if (GTK_WIDGET_REALIZED (window) && 
@@ -1798,7 +1918,7 @@ gtk_window_set_transient_for  (GtkWindow *window,
     }
 
   window->transient_parent = parent;
-
+  
   if (parent)
     {
       g_signal_connect (parent, "destroy",
@@ -1823,6 +1943,12 @@ gtk_window_set_transient_for  (GtkWindow *window,
          GTK_WIDGET_REALIZED (parent))
        gtk_window_transient_parent_realized (GTK_WIDGET (parent),
                                              GTK_WIDGET (window));
+
+      if (parent->group)
+       {
+         gtk_window_group_add_window (parent->group, window);
+         priv->transient_parent_group = TRUE;
+       }
     }
 }
 
@@ -1863,9 +1989,20 @@ void
 gtk_window_set_type_hint (GtkWindow           *window, 
                          GdkWindowTypeHint    hint)
 {
+  GtkWindowPrivate *priv;
+
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
-  window->type_hint = hint;
+
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  if (hint < GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU)
+    window->type_hint = hint;
+  else
+    window->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
+
+  priv->reset_type_hint = TRUE;
+  priv->type_hint = hint;
 }
 
 /**
@@ -1879,9 +2016,13 @@ gtk_window_set_type_hint (GtkWindow           *window,
 GdkWindowTypeHint
 gtk_window_get_type_hint (GtkWindow *window)
 {
+  GtkWindowPrivate *priv;
+  
   g_return_val_if_fail (GTK_IS_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL);
 
-  return window->type_hint;
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+  
+  return priv->type_hint;
 }
 
 /**
@@ -1890,8 +2031,9 @@ gtk_window_get_type_hint (GtkWindow *window)
  * @setting: %TRUE to keep this window from appearing in the task bar
  * 
  * Windows may set a hint asking the desktop environment not to display
- * the window in the task bar. This function toggles this hint.
+ * the window in the task bar. This function sets this hint.
  * 
+ * Since: 2.2
  **/
 void
 gtk_window_set_skip_taskbar_hint (GtkWindow *window,
@@ -1901,7 +2043,7 @@ gtk_window_set_skip_taskbar_hint (GtkWindow *window,
 
   g_return_if_fail (GTK_IS_WINDOW (window));
   
-  priv = gtk_window_get_private (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
 
   setting = setting != FALSE;
 
@@ -1911,7 +2053,7 @@ gtk_window_set_skip_taskbar_hint (GtkWindow *window,
       if (GTK_WIDGET_REALIZED (window))
         gdk_window_set_skip_taskbar_hint (GTK_WIDGET (window)->window,
                                           priv->skips_taskbar);
-      g_object_notify (G_OBJECT (window), "skip_taskbar_hint");
+      g_object_notify (G_OBJECT (window), "skip-taskbar-hint");
     }
 }
 
@@ -1922,6 +2064,8 @@ gtk_window_set_skip_taskbar_hint (GtkWindow *window,
  * Gets the value set by gtk_window_set_skip_taskbar_hint()
  * 
  * Return value: %TRUE if window shouldn't be in taskbar
+ * 
+ * Since: 2.2
  **/
 gboolean
 gtk_window_get_skip_taskbar_hint (GtkWindow *window)
@@ -1930,7 +2074,7 @@ gtk_window_get_skip_taskbar_hint (GtkWindow *window)
 
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
   
-  priv = gtk_window_get_private (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
 
   return priv->skips_taskbar;
 }
@@ -1941,11 +2085,12 @@ gtk_window_get_skip_taskbar_hint (GtkWindow *window)
  * @setting: %TRUE to keep this window from appearing in the pager
  * 
  * Windows may set a hint asking the desktop environment not to display
- * the window in the pager. This function toggles this hint.
+ * the window in the pager. This function sets this hint.
  * (A "pager" is any desktop navigation tool such as a workspace
  * switcher that displays a thumbnail representation of the windows
  * on the screen.)
  * 
+ * Since: 2.2
  **/
 void
 gtk_window_set_skip_pager_hint (GtkWindow *window,
@@ -1955,7 +2100,7 @@ gtk_window_set_skip_pager_hint (GtkWindow *window,
 
   g_return_if_fail (GTK_IS_WINDOW (window));
   
-  priv = gtk_window_get_private (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
 
   setting = setting != FALSE;
 
@@ -1965,7 +2110,7 @@ gtk_window_set_skip_pager_hint (GtkWindow *window,
       if (GTK_WIDGET_REALIZED (window))
         gdk_window_set_skip_pager_hint (GTK_WIDGET (window)->window,
                                         priv->skips_pager);
-      g_object_notify (G_OBJECT (window), "skip_pager_hint");
+      g_object_notify (G_OBJECT (window), "skip-pager-hint");
     }
 }
 
@@ -1976,6 +2121,8 @@ gtk_window_set_skip_pager_hint (GtkWindow *window,
  * Gets the value set by gtk_window_set_skip_pager_hint().
  * 
  * Return value: %TRUE if window shouldn't be in pager
+ * 
+ * Since: 2.2
  **/
 gboolean
 gtk_window_get_skip_pager_hint (GtkWindow *window)
@@ -1984,11 +2131,175 @@ gtk_window_get_skip_pager_hint (GtkWindow *window)
 
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
   
-  priv = gtk_window_get_private (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
 
   return priv->skips_pager;
 }
 
+/**
+ * gtk_window_set_urgency_hint:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to mark this window as urgent
+ * 
+ * Windows may set a hint asking the desktop environment to draw
+ * the users attention to the window. This function sets this hint.
+ * 
+ * Since: 2.8
+ **/
+void
+gtk_window_set_urgency_hint (GtkWindow *window,
+                            gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->urgent != setting)
+    {
+      priv->urgent = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_urgency_hint (GTK_WIDGET (window)->window,
+                                    priv->urgent);
+      g_object_notify (G_OBJECT (window), "urgency-hint");
+    }
+}
+
+/**
+ * gtk_window_get_urgency_hint:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_urgency_hint()
+ * 
+ * Return value: %TRUE if window is urgent
+ * 
+ * Since: 2.8
+ **/
+gboolean
+gtk_window_get_urgency_hint (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->urgent;
+}
+
+/**
+ * gtk_window_set_accept_focus:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to let this window receive input focus
+ * 
+ * Windows may set a hint asking the desktop environment not to receive
+ * the input focus. This function sets this hint.
+ * 
+ * Since: 2.4
+ **/
+void
+gtk_window_set_accept_focus (GtkWindow *window,
+                            gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->accept_focus != setting)
+    {
+      priv->accept_focus = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_accept_focus (GTK_WIDGET (window)->window,
+                                    priv->accept_focus);
+      g_object_notify (G_OBJECT (window), "accept-focus");
+    }
+}
+
+/**
+ * gtk_window_get_accept_focus:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_accept_focus().
+ * 
+ * Return value: %TRUE if window should receive the input focus
+ * 
+ * Since: 2.4
+ **/
+gboolean
+gtk_window_get_accept_focus (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->accept_focus;
+}
+
+/**
+ * gtk_window_set_focus_on_map:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to let this window receive input focus on map
+ * 
+ * Windows may set a hint asking the desktop environment not to receive
+ * the input focus when the window is mapped.  This function sets this
+ * hint.
+ * 
+ * Since: 2.6
+ **/
+void
+gtk_window_set_focus_on_map (GtkWindow *window,
+                            gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->focus_on_map != setting)
+    {
+      priv->focus_on_map = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_focus_on_map (GTK_WIDGET (window)->window,
+                                    priv->focus_on_map);
+      g_object_notify (G_OBJECT (window), "focus-on-map");
+    }
+}
+
+/**
+ * gtk_window_get_focus_on_map:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_focus_on_map().
+ * 
+ * Return value: %TRUE if window should receive the input focus when
+ * mapped.
+ * 
+ * Since: 2.6
+ **/
+gboolean
+gtk_window_get_focus_on_map (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->focus_on_map;
+}
+
 /**
  * gtk_window_set_destroy_with_parent:
  * @window: a #GtkWindow
@@ -2019,7 +2330,7 @@ gtk_window_set_destroy_with_parent  (GtkWindow *window,
   
   window->destroy_with_parent = setting;
 
-  g_object_notify (G_OBJECT (window), "destroy_with_parent");
+  g_object_notify (G_OBJECT (window), "destroy-with-parent");
 }
 
 /**
@@ -2162,6 +2473,8 @@ gtk_window_set_decorated (GtkWindow *window,
         gdk_window_set_decorations (GTK_WIDGET (window)->window,
                                     0);
     }
+
+  g_object_notify (G_OBJECT (window), "decorated");
 }
 
 /**
@@ -2181,13 +2494,91 @@ gtk_window_get_decorated (GtkWindow *window)
   return window->decorated;
 }
 
+/**
+ * gtk_window_set_deletable:
+ * @window: a #GtkWindow
+ * @setting: %TRUE to decorate the window as deletable
+ *
+ * By default, windows have a close button in the window frame. Some 
+ * <link linkend="gtk-X11-arch">window managers</link> allow GTK+ to 
+ * disable this button. If you set the deletable property to %FALSE
+ * using this function, GTK+ will do its best to convince the window
+ * manager not to show a close button. Depending on the system, this
+ * function may not have any effect when called on a window that is
+ * already visible, so you should call it before calling gtk_window_show().
+ *
+ * On Windows, this function always works, since there's no window manager
+ * policy involved.
+ *
+ * Since: 2.10
+ */
+void
+gtk_window_set_deletable (GtkWindow *window,
+                         gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (setting == priv->deletable)
+    return;
+
+  priv->deletable = setting;
+  
+  if (GTK_WIDGET (window)->window)
+    {
+      if (priv->deletable)
+        gdk_window_set_functions (GTK_WIDGET (window)->window,
+                                 GDK_FUNC_ALL);
+      else
+        gdk_window_set_functions (GTK_WIDGET (window)->window,
+                                 GDK_FUNC_ALL | GDK_FUNC_CLOSE);
+    }
+
+  g_object_notify (G_OBJECT (window), "deletable");  
+}
+
+/**
+ * gtk_window_get_deletable:
+ * @window: a #GtkWindow
+ *
+ * Returns whether the window has been set to have a close button
+ * via gtk_window_set_deletable().
+ *
+ * Return value: %TRUE if the window has been set to have a close button
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_window_get_deletable (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), TRUE);
+
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->deletable;
+}
+
 static GtkWindowIconInfo*
 get_icon_info (GtkWindow *window)
 {
-  return g_object_get_data (G_OBJECT (window),
-                            "gtk-window-icon-info");
+  return g_object_get_qdata (G_OBJECT (window), quark_gtk_window_icon_info);
 }
      
+static void
+free_icon_info (GtkWindowIconInfo *info)
+{
+  g_free (info->icon_name);
+  g_slice_free (GtkWindowIconInfo, info);
+}
+
+
 static GtkWindowIconInfo*
 ensure_icon_info (GtkWindow *window)
 {
@@ -2197,11 +2588,11 @@ ensure_icon_info (GtkWindow *window)
   
   if (info == NULL)
     {
-      info = g_new0 (GtkWindowIconInfo, 1);
-      g_object_set_data_full (G_OBJECT (window),
-                              "gtk-window-icon-info",
+      info = g_slice_new0 (GtkWindowIconInfo);
+      g_object_set_qdata_full (G_OBJECT (window),
+                              quark_gtk_window_icon_info,
                               info,
-                              g_free);
+                              (GDestroyNotify)free_icon_info);
     }
 
   return info;
@@ -2213,15 +2604,16 @@ typedef struct {
   GdkPixmap *mask;
 } ScreenIconInfo;
 
-ScreenIconInfo *
+static ScreenIconInfo *
 get_screen_icon_info (GdkScreen *screen)
 {
-  ScreenIconInfo *info = g_object_get_data (G_OBJECT (screen), 
-                                           "gtk-window-default-icon-pixmap");
+  ScreenIconInfo *info = g_object_get_qdata (G_OBJECT (screen), 
+                                            quark_gtk_window_default_icon_pixmap);
   if (!info)
     {
-      info = g_new0 (ScreenIconInfo, 1);
-      g_object_set_data (G_OBJECT (screen), "gtk-window-default-icon-pixmap", info);
+      info = g_slice_new0 (ScreenIconInfo);
+      g_object_set_qdata (G_OBJECT (screen), 
+                         quark_gtk_window_default_icon_pixmap, info);
     }
 
   if (info->serial != default_icon_serial)
@@ -2357,13 +2749,52 @@ get_pixmap_and_mask (GdkWindow          *window,
     }
 }
 
+static GList *
+icon_list_from_theme (GtkWidget    *widget,
+                     const gchar  *name)
+{
+  GList *list;
+
+  GtkIconTheme *icon_theme;
+  GdkPixbuf *icon;
+  gint *sizes;
+  gint i;
+
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
+
+  sizes = gtk_icon_theme_get_icon_sizes (icon_theme, name);
+
+  list = NULL;
+  for (i = 0; sizes[i]; i++)
+    {      
+      /* FIXME
+       * We need an EWMH extension to handle scalable icons 
+       * by passing their name to the WM. For now just use a 
+       * fixed size of 48.
+       */ 
+      if (sizes[i] == -1)
+       icon = gtk_icon_theme_load_icon (icon_theme, name,
+                                        48, 0, NULL);
+      else
+       icon = gtk_icon_theme_load_icon (icon_theme, name,
+                                        sizes[i], 0, NULL);
+      if (icon)
+       list = g_list_append (list, icon);
+    }
+
+  g_free (sizes);
+
+  return list;
+}
+
+
 static void
 gtk_window_realize_icon (GtkWindow *window)
 {
   GtkWidget *widget;
   GtkWindowIconInfo *info;
   GList *icon_list;
-  
+
   widget = GTK_WIDGET (window);
 
   g_return_if_fail (widget->window != NULL);
@@ -2384,9 +2815,18 @@ gtk_window_realize_icon (GtkWindow *window)
   
   info->using_default_icon = FALSE;
   info->using_parent_icon = FALSE;
+  info->using_themed_icon = FALSE;
   
   icon_list = info->icon_list;
-  
+
+  /* Look up themed icon */
+  if (icon_list == NULL && info->icon_name) 
+    {
+      icon_list = icon_list_from_theme (widget, info->icon_name);
+      if (icon_list)
+       info->using_themed_icon = TRUE;
+    }
+
   /* Inherit from transient parent */
   if (icon_list == NULL && window->transient_parent)
     {
@@ -2402,6 +2842,14 @@ gtk_window_realize_icon (GtkWindow *window)
       if (icon_list)
         info->using_default_icon = TRUE;
     }
+
+  /* Look up themed icon */
+  if (icon_list == NULL && default_icon_name) 
+    {
+      icon_list = icon_list_from_theme (widget, default_icon_name);
+      info->using_default_icon = TRUE;
+      info->using_themed_icon = TRUE;  
+    }
   
   gdk_window_set_icon_list (widget->window, icon_list);
 
@@ -2421,16 +2869,25 @@ gtk_window_realize_icon (GtkWindow *window)
                        info->icon_mask);
 
   info->realized = TRUE;
+  
+  if (info->using_themed_icon) 
+    {
+      GtkIconTheme *icon_theme;
+
+      g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+      g_list_free (icon_list);
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
+      g_signal_connect (icon_theme, "changed",
+                       G_CALLBACK (update_themed_icon), window);
+    }
 }
 
 static void
 gtk_window_unrealize_icon (GtkWindow *window)
 {
   GtkWindowIconInfo *info;
-  GtkWidget *widget;
 
-  widget = GTK_WIDGET (window);
-  
   info = get_icon_info (window);
 
   if (info == NULL)
@@ -2445,11 +2902,21 @@ gtk_window_unrealize_icon (GtkWindow *window)
   info->icon_pixmap = NULL;
   info->icon_mask = NULL;
 
+  if (info->using_themed_icon)
+    {
+      GtkIconTheme *icon_theme;
+
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
+
+      g_signal_handlers_disconnect_by_func (icon_theme, update_themed_icon, window);
+    }
+    
   /* We don't clear the properties on the window, just figure the
    * window is going away.
    */
 
   info->realized = FALSE;
+
 }
 
 /**
@@ -2495,14 +2962,15 @@ gtk_window_set_icon_list (GtkWindow  *window,
   if (info->icon_list == list) /* check for NULL mostly */
     return;
 
+  g_list_foreach (list,
+                  (GFunc) g_object_ref, NULL);
+
   g_list_foreach (info->icon_list,
                   (GFunc) g_object_unref, NULL);
 
   g_list_free (info->icon_list);
 
   info->icon_list = g_list_copy (list);
-  g_list_foreach (info->icon_list,
-                  (GFunc) g_object_ref, NULL);
 
   g_object_notify (G_OBJECT (window), "icon");
   
@@ -2513,7 +2981,7 @@ gtk_window_set_icon_list (GtkWindow  *window,
 
   /* We could try to update our transient children, but I don't think
    * it's really worth it. If we did it, the best way would probably
-   * be to have children connect to notify::icon_list
+   * be to have children connect to notify::icon-list
    */
 }
 
@@ -2584,6 +3052,80 @@ gtk_window_set_icon (GtkWindow  *window,
   g_list_free (list);  
 }
 
+
+static void 
+update_themed_icon (GtkIconTheme *icon_theme,
+                   GtkWindow    *window)
+{
+  g_object_notify (G_OBJECT (window), "icon");
+  
+  gtk_window_unrealize_icon (window);
+  
+  if (GTK_WIDGET_REALIZED (window))
+    gtk_window_realize_icon (window);  
+}
+
+/**
+ * gtk_window_set_icon_name:
+ * @window: a #GtkWindow
+ * @name: the name of the themed icon
+ *
+ * Sets the icon for the window from a named themed icon. See
+ * the docs for #GtkIconTheme for more details. 
+ * 
+ * Note that this has nothing to do with the WM_ICON_NAME 
+ * property which is mentioned in the ICCCM.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_window_set_icon_name (GtkWindow   *window,
+                         const gchar *name)
+{
+  GtkWindowIconInfo *info;
+  gchar *tmp;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  info = ensure_icon_info (window);
+
+  tmp = info->icon_name;
+  info->icon_name = g_strdup (name);
+  g_free (tmp);
+
+  g_list_foreach (info->icon_list, (GFunc) g_object_unref, NULL);
+  g_list_free (info->icon_list);
+  info->icon_list = NULL;
+  
+  update_themed_icon (NULL, window);
+
+  g_object_notify (G_OBJECT (window), "icon-name");
+}
+
+/**
+ * gtk_window_get_icon_name:
+ * @window: a #GtkWindow
+ *
+ * Returns the name of the themed icon for the window,
+ * see gtk_window_set_icon_name().
+ *
+ * Returns: the icon name or %NULL if the window has 
+ * no themed icon
+ *
+ * Since: 2.6
+ */
+G_CONST_RETURN gchar *
+gtk_window_get_icon_name (GtkWindow *window)
+{
+  GtkWindowIconInfo *info;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
+  info = ensure_icon_info (window);
+
+  return info->icon_name;
+}
+
 /**
  * gtk_window_get_icon:
  * @window: a #GtkWindow
@@ -2647,6 +3189,8 @@ load_pixbuf_verbosely (const char *filename,
  * with a pixbuf created by loading the image from @filename.
  *
  * Returns: %TRUE if setting the icon succeeded.
+ *
+ * Since: 2.2
  **/
 gboolean
 gtk_window_set_icon_from_file (GtkWindow   *window,
@@ -2690,14 +3234,15 @@ gtk_window_set_default_icon_list (GList *list)
    */
   default_icon_serial++;
   
+  g_list_foreach (list,
+                  (GFunc) g_object_ref, NULL);
+
   g_list_foreach (default_icon_list,
                   (GFunc) g_object_unref, NULL);
 
   g_list_free (default_icon_list);
 
   default_icon_list = g_list_copy (list);
-  g_list_foreach (default_icon_list,
-                  (GFunc) g_object_ref, NULL);
   
   /* Update all toplevels */
   toplevels = gtk_window_list_toplevels ();
@@ -2720,6 +3265,77 @@ gtk_window_set_default_icon_list (GList *list)
   g_list_free (toplevels);
 }
 
+/**
+ * gtk_window_set_default_icon:
+ * @icon: the icon
+ *
+ * Sets an icon to be used as fallback for windows that haven't
+ * had gtk_window_set_icon() called on them from a pixbuf.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_window_set_default_icon (GdkPixbuf *icon)
+{
+  GList *list;
+  
+  g_return_if_fail (GDK_IS_PIXBUF (icon));
+
+  list = g_list_prepend (NULL, icon);
+  gtk_window_set_default_icon_list (list);
+  g_list_free (list);
+}
+
+/**
+ * gtk_window_set_default_icon_name:
+ * @name: the name of the themed icon
+ * 
+ * Sets an icon to be used as fallback for windows that haven't
+ * had gtk_window_set_icon_list() called on them from a named
+ * themed icon, see gtk_window_set_icon_name().
+ *
+ * Since: 2.6
+ **/
+void
+gtk_window_set_default_icon_name (const gchar *name)
+{
+  GList *tmp_list;
+  GList *toplevels;
+
+  /* Update serial so we don't used cached pixmaps/masks
+   */
+  default_icon_serial++;
+
+  g_free (default_icon_name);
+  default_icon_name = g_strdup (name);
+
+  g_list_foreach (default_icon_list,
+                  (GFunc) g_object_unref, NULL);
+
+  g_list_free (default_icon_list);
+  default_icon_list = NULL;
+  
+  /* Update all toplevels */
+  toplevels = gtk_window_list_toplevels ();
+  tmp_list = toplevels;
+  while (tmp_list != NULL)
+    {
+      GtkWindowIconInfo *info;
+      GtkWindow *w = tmp_list->data;
+      
+      info = get_icon_info (w);
+      if (info && info->using_default_icon && info->using_themed_icon)
+        {
+          gtk_window_unrealize_icon (w);
+          if (GTK_WIDGET_REALIZED (w))
+            gtk_window_realize_icon (w);
+        }
+
+      tmp_list = tmp_list->next;
+    }
+  g_list_free (toplevels);
+}
+
 /**
  * gtk_window_set_default_icon_from_file:
  * @filename: location of icon file
@@ -2730,6 +3346,8 @@ gtk_window_set_default_icon_list (GList *list)
  * on disk. Warns on failure if @err is %NULL.
  *
  * Returns: %TRUE if setting the icon succeeded.
+ *
+ * Since: 2.2
  **/
 gboolean
 gtk_window_set_default_icon_from_file (const gchar *filename,
@@ -2739,10 +3357,7 @@ gtk_window_set_default_icon_from_file (const gchar *filename,
 
   if (pixbuf)
     {
-      GList *list = g_list_prepend (NULL, pixbuf);
-      gtk_window_set_default_icon_list (list);
-      g_list_free (list);
-
+      gtk_window_set_default_icon (pixbuf);
       g_object_unref (pixbuf);
       
       return TRUE;
@@ -2796,7 +3411,7 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
 
       info->default_width = width;
 
-      g_object_notify (G_OBJECT (window), "default_width");
+      g_object_notify (G_OBJECT (window), "default-width");
     }
 
   if (change_height)
@@ -2809,7 +3424,7 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
 
       info->default_height = height;
       
-      g_object_notify (G_OBJECT (window), "default_height");
+      g_object_notify (G_OBJECT (window), "default-height");
     }
   
   g_object_thaw_notify (G_OBJECT (window));
@@ -2888,10 +3503,10 @@ gtk_window_get_default_size (GtkWindow *window,
   info = gtk_window_get_geometry_info (window, FALSE);
 
   if (width)
-    *width = info->default_width;
+    *width = info ? info->default_width : -1;
 
   if (height)
-    *height = info->default_height;
+    *height = info ? info->default_height : -1;
 }
 
 /**
@@ -2990,12 +3605,9 @@ gtk_window_get_size (GtkWindow *window,
                      gint      *height)
 {
   gint w, h;
-  GtkWidget *widget;
   
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  widget = GTK_WIDGET (window);
-  
   if (width == NULL && height == NULL)
     return;
 
@@ -3054,16 +3666,16 @@ gtk_window_get_size (GtkWindow *window,
  * reference point. So, to place a window in the bottom right corner
  * you would first set gravity to south east, then write:
  * <literal>gtk_window_move (window, gdk_screen_width () - window_width,
- * gdk_screen_height () - window_height)</literal>.
+ * gdk_screen_height () - window_height)</literal> (note that this
+ * example does not take multi-head scenarios into account).
  *
- * The extended window manager hints specification at <ulink 
- * url="http://www.freedesktop.org/standards/wm-spec.html">
- * http://www.freedesktop.org/standards/wm-spec.html</ulink> has a 
+ * The Extended Window Manager Hints specification at <ulink 
+ * url="http://www.freedesktop.org/Standards/wm-spec">
+ * http://www.freedesktop.org/Standards/wm-spec</ulink> has a 
  * nice table of gravities in the "implementation notes" section.
  *
  * The gtk_window_get_position() documentation may also be relevant.
- * 
- **/
+ */
 void
 gtk_window_move (GtkWindow *window,
                  gint       x,
@@ -3318,6 +3930,8 @@ gtk_window_destroy (GtkObject *object)
 {
   GtkWindow *window = GTK_WINDOW (object);
   
+  toplevel_list = g_slist_remove (toplevel_list, window);
+
   if (window->transient_parent)
     gtk_window_set_transient_for (window, NULL);
 
@@ -3335,57 +3949,24 @@ gtk_window_destroy (GtkObject *object)
 
    gtk_window_free_key_hash (window);
 
-   GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static gboolean
-gtk_window_mnemonic_hash_remove (gpointer      key,
-                                gpointer       value,
-                                gpointer       user)
-{
-  GtkWindowMnemonic *mnemonic = key;
-  GtkWindow *window = user;
-
-  if (mnemonic->window == window)
-    {
-      if (mnemonic->targets)
-       {
-         gchar *name = gtk_accelerator_name (mnemonic->keyval, 0);
-
-         g_warning ("mnemonic \"%s\" wasn't removed for widget (%p)",
-                    name, mnemonic->targets->data);
-         g_free (name);
-       }
-      g_slist_free (mnemonic->targets);
-      g_free (mnemonic);
-      
-      return TRUE;
-    }
-  return FALSE;
-}
-
-static void
-gtk_window_private_finalize (GtkWindowPrivate  *priv)
-{
-  
-  g_free (priv);
+   GTK_OBJECT_CLASS (gtk_window_parent_class)->destroy (object);
 }
 
 static void
 gtk_window_finalize (GObject *object)
 {
   GtkWindow *window = GTK_WINDOW (object);
-
-  toplevel_list = g_slist_remove (toplevel_list, window);
+  GtkMnemonicHash *mnemonic_hash;
 
   g_free (window->title);
   g_free (window->wmclass_name);
   g_free (window->wmclass_class);
   g_free (window->wm_role);
 
-  g_hash_table_foreach_remove (mnemonic_hash_table,
-                              gtk_window_mnemonic_hash_remove,
-                              window);
+  mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+  if (mnemonic_hash)
+    _gtk_mnemonic_hash_free (mnemonic_hash);
+
   if (window->geometry_info)
     {
       if (window->geometry_info->widget)
@@ -3397,11 +3978,17 @@ gtk_window_finalize (GObject *object)
 
   if (window->keys_changed_handler)
     {
-      gtk_idle_remove (window->keys_changed_handler);
+      g_source_remove (window->keys_changed_handler);
       window->keys_changed_handler = 0;
     }
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  if (window->screen)
+    {
+      g_signal_handlers_disconnect_by_func (window->screen,
+                                           gtk_window_on_composited_changed, window);
+    }
+      
+  G_OBJECT_CLASS (gtk_window_parent_class)->finalize (object);
 }
 
 static void
@@ -3467,9 +4054,11 @@ gtk_window_show (GtkWidget *widget)
        * then we created it with widget->allocation anyhow.
        */
       if (!was_realized)
-       gdk_window_resize (widget->window,
-                           configure_request.width,
-                           configure_request.height);
+       gdk_window_move_resize (widget->window,
+                               configure_request.x,
+                               configure_request.y,
+                               configure_request.width,
+                               configure_request.height);
     }
   
   gtk_container_check_resize (container);
@@ -3478,11 +4067,7 @@ gtk_window_show (GtkWidget *widget)
 
   /* Try to make sure that we have some focused widget
    */
-#ifdef GDK_WINDOWING_X11
   if (!window->focus_widget && !GTK_IS_PLUG (window))
-#else
-  if (!window->focus_widget)
-#endif
     gtk_window_move_focus (window, GTK_DIR_TAB_FORWARD);
   
   if (window->modal)
@@ -3505,11 +4090,9 @@ static void
 gtk_window_map (GtkWidget *widget)
 {
   GtkWindow *window = GTK_WINDOW (widget);
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
   GdkWindow *toplevel;
-  GtkWindowPrivate *priv;
 
-  priv = gtk_window_get_private (window);
-  
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
   if (window->bin.child &&
@@ -3542,10 +4125,25 @@ gtk_window_map (GtkWidget *widget)
   else
     gdk_window_unfullscreen (toplevel);
   
+  gdk_window_set_keep_above (toplevel, priv->above_initially);
+
+  gdk_window_set_keep_below (toplevel, priv->below_initially);
+
   /* No longer use the default settings */
   window->need_default_size = FALSE;
   window->need_default_position = FALSE;
   
+  if (priv->reset_type_hint)
+    {
+      /* We should only reset the type hint when the application
+       * used gtk_window_set_type_hint() to change the hint.
+       * Some applications use X directly to change the properties;
+       * in that case, we shouldn't overwrite what they did.
+       */
+      gdk_window_set_type_hint (widget->window, priv->type_hint);
+      priv->reset_type_hint = FALSE;
+    }
+
   gdk_window_show (widget->window);
 
   if (window->frame)
@@ -3559,10 +4157,29 @@ gtk_window_map (GtkWidget *widget)
     }
 }
 
+static gboolean
+gtk_window_map_event (GtkWidget   *widget,
+                      GdkEventAny *event)
+{
+  if (!GTK_WIDGET_MAPPED (widget))
+    {
+      /* we should be be unmapped, but are getting a MapEvent, this may happen
+       * to toplevel XWindows if mapping was intercepted by a window manager
+       * and an unmap request occoured while the MapRequestEvent was still
+       * being handled. we work around this situaiton here by re-requesting
+       * the window being unmapped. more details can be found in:
+       *   http://bugzilla.gnome.org/show_bug.cgi?id=316180
+       */
+      gdk_window_hide (widget->window);
+    }
+  return FALSE;
+}
+
 static void
 gtk_window_unmap (GtkWidget *widget)
 {
   GtkWindow *window = GTK_WINDOW (widget);
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (widget);
   GtkWindowGeometryInfo *info;    
   GdkWindowState state;
 
@@ -3589,9 +4206,11 @@ gtk_window_unmap (GtkWidget *widget)
     }
 
   state = gdk_window_get_state (widget->window);
-  window->iconify_initially = state & GDK_WINDOW_STATE_ICONIFIED;
-  window->maximize_initially = state & GDK_WINDOW_STATE_MAXIMIZED;
-  window->stick_initially = state & GDK_WINDOW_STATE_STICKY;
+  window->iconify_initially = (state & GDK_WINDOW_STATE_ICONIFIED) != 0;
+  window->maximize_initially = (state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  window->stick_initially = (state & GDK_WINDOW_STATE_STICKY) != 0;
+  priv->above_initially = (state & GDK_WINDOW_STATE_ABOVE) != 0;
+  priv->below_initially = (state & GDK_WINDOW_STATE_BELOW) != 0;
 }
 
 static void
@@ -3601,9 +4220,12 @@ gtk_window_realize (GtkWidget *widget)
   GdkWindow *parent_window;
   GdkWindowAttr attributes;
   gint attributes_mask;
+  GtkWindowPrivate *priv;
   
   window = GTK_WINDOW (widget);
 
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
   /* ensure widget tree is properly size allocated */
   if (widget->allocation.x == -1 &&
       widget->allocation.y == -1 &&
@@ -3678,6 +4300,11 @@ gtk_window_realize (GtkWidget *widget)
       attributes_mask = GDK_WA_X | GDK_WA_Y;
 
       parent_window = window->frame;
+
+      g_signal_connect (window,
+                       "event",
+                       G_CALLBACK (gtk_window_event),
+                       NULL);
     }
   else
     {
@@ -3701,6 +4328,8 @@ gtk_window_realize (GtkWidget *widget)
   attributes_mask |= (window->wmclass_name ? GDK_WA_WMCLASS : 0);
   
   widget->window = gdk_window_new (parent_window, &attributes, attributes_mask);
+
+  gdk_window_enable_synchronized_configure (widget->window);
     
   gdk_window_set_user_data (widget->window, window);
       
@@ -3723,16 +4352,28 @@ gtk_window_realize (GtkWidget *widget)
   if (!window->decorated)
     gdk_window_set_decorations (widget->window, 0);
 
-  gdk_window_set_type_hint (widget->window, window->type_hint);
+  if (!priv->deletable)
+    gdk_window_set_functions (widget->window, GDK_FUNC_ALL | GDK_FUNC_CLOSE);
 
+  gdk_window_set_type_hint (widget->window, priv->type_hint);
   if (gtk_window_get_skip_pager_hint (window))
     gdk_window_set_skip_pager_hint (widget->window, TRUE);
 
   if (gtk_window_get_skip_taskbar_hint (window))
     gdk_window_set_skip_taskbar_hint (widget->window, TRUE);
+
+  if (gtk_window_get_accept_focus (window))
+    gdk_window_set_accept_focus (widget->window, TRUE);
+  else
+    gdk_window_set_accept_focus (widget->window, FALSE);
+
+  if (gtk_window_get_focus_on_map (window))
+    gdk_window_set_focus_on_map (widget->window, TRUE);
+  else
+    gdk_window_set_focus_on_map (widget->window, FALSE);
   
-  /* transient_for must be set to allow the modal hint */
-  if (window->transient_parent && window->modal)
+  if (window->modal)
     gdk_window_set_modal_hint (widget->window, TRUE);
   else
     gdk_window_set_modal_hint (widget->window, FALSE);
@@ -3779,7 +4420,7 @@ gtk_window_unrealize (GtkWidget *widget)
   /* Icons */
   gtk_window_unrealize_icon (window);
   
-  (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  (* GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize) (widget);
 }
 
 static void
@@ -3928,7 +4569,10 @@ gtk_window_configure_event (GtkWidget         *widget,
   if (!expected_reply &&
       (widget->allocation.width == event->width &&
        widget->allocation.height == event->height))
-    return TRUE;
+    {
+      gdk_window_configure_finished (widget->window);
+      return TRUE;
+    }
 
   /*
    * If we do need to resize, we do that by:
@@ -3979,65 +4623,84 @@ _gtk_window_query_nonaccels (GtkWindow      *window,
   /* mnemonics are considered locked accels */
   if (accel_mods == window->mnemonic_modifier)
     {
-      GtkWindowMnemonic mkey;
-
-      mkey.window = window;
-      mkey.keyval = accel_key;
-      if (g_hash_table_lookup (mnemonic_hash_table, &mkey))
+      GtkMnemonicHash *mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+      if (mnemonic_hash && _gtk_mnemonic_hash_lookup (mnemonic_hash, accel_key))
        return TRUE;
     }
 
   return FALSE;
 }
 
-static gint
-gtk_window_key_press_event (GtkWidget   *widget,
-                           GdkEventKey *event)
+/**
+ * gtk_window_propagate_key_event:
+ * @window:  a #GtkWindow
+ * @event:   a #GdkEventKey
+ *
+ * Propagate a key press or release event to the focus widget and
+ * up the focus container chain until a widget handles @event.
+ * This is normally called by the default ::key_press_event and
+ * ::key_release_event handlers for toplevel windows,
+ * however in some cases it may be useful to call this directly when
+ * overriding the standard key handling for a toplevel window.
+ *
+ * Return value: %TRUE if a widget in the focus chain handled the event.
+ **/
+gboolean
+gtk_window_propagate_key_event (GtkWindow        *window,
+                                GdkEventKey      *event)
 {
-  GtkWindow *window;
-  GtkWidget *focus;
-  gboolean handled;
+  gboolean handled = FALSE;
+  GtkWidget *widget, *focus;
 
-  window = GTK_WINDOW (widget);
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  handled = FALSE;
+  widget = GTK_WIDGET (window);
+  focus = window->focus_widget;
+  if (focus)
+    g_object_ref (focus);
+  
+  while (!handled &&
+         focus && focus != widget &&
+         gtk_widget_get_toplevel (focus) == widget)
+    {
+      GtkWidget *parent;
+      
+      if (GTK_WIDGET_IS_SENSITIVE (focus))
+        handled = gtk_widget_event (focus, (GdkEvent*) event);
+      
+      parent = focus->parent;
+      if (parent)
+        g_object_ref (parent);
+      
+      g_object_unref (focus);
+      
+      focus = parent;
+    }
+  
+  if (focus)
+    g_object_unref (focus);
 
-  /* Check for mnemonics and accelerators
-   */
-  if (!handled)
-    handled = _gtk_window_activate_key (window, event);
+  return handled;
+}
+
+static gint
+gtk_window_key_press_event (GtkWidget   *widget,
+                           GdkEventKey *event)
+{
+  GtkWindow *window = GTK_WINDOW (widget);
+  gboolean handled = FALSE;
 
+  /* handle mnemonics and accelerators */
   if (!handled)
-    {
-      focus = window->focus_widget;
-      if (focus)
-       g_object_ref (focus);
-      
-      while (!handled &&
-            focus && focus != widget &&
-            gtk_widget_get_toplevel (focus) == widget)
-       {
-         GtkWidget *parent;
-         
-         if (GTK_WIDGET_IS_SENSITIVE (focus))
-           handled = gtk_widget_event (focus, (GdkEvent*) event);
-         
-         parent = focus->parent;
-         if (parent)
-           g_object_ref (parent);
-         
-         g_object_unref (focus);
-         
-         focus = parent;
-       }
+    handled = gtk_window_activate_key (window, event);
 
-      if (focus)
-       g_object_unref (focus);
-    }
+  /* handle focus widget key events */
+  if (!handled)
+    handled = gtk_window_propagate_key_event (window, event);
 
   /* Chain up, invokes binding set */
-  if (!handled && GTK_WIDGET_CLASS (parent_class)->key_press_event)
-    handled = GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
+  if (!handled)
+    handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_press_event (widget, event);
 
   return handled;
 }
@@ -4046,20 +4709,16 @@ static gint
 gtk_window_key_release_event (GtkWidget   *widget,
                              GdkEventKey *event)
 {
-  GtkWindow *window;
-  gint handled;
-  
-  window = GTK_WINDOW (widget);
-  handled = FALSE;
-  if (window->focus_widget &&
-      window->focus_widget != widget &&
-      GTK_WIDGET_SENSITIVE (window->focus_widget))
-    {
-      handled = gtk_widget_event (window->focus_widget, (GdkEvent*) event);
-    }
+  GtkWindow *window = GTK_WINDOW (widget);
+  gboolean handled = FALSE;
+
+  /* handle focus widget key events */
+  if (!handled)
+    handled = gtk_window_propagate_key_event (window, event);
 
-  if (!handled && GTK_WIDGET_CLASS (parent_class)->key_release_event)
-    handled = GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+  /* Chain up, invokes binding set */
+  if (!handled)
+    handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_press_event (widget, event);
 
   return handled;
 }
@@ -4114,12 +4773,14 @@ do_focus_change (GtkWidget *widget,
     GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
   
   fevent->focus_change.type = GDK_FOCUS_CHANGE;
-  fevent->focus_change.window = g_object_ref (widget->window);
+  fevent->focus_change.window = widget->window;
+  if (widget->window)
+    g_object_ref (widget->window);
   fevent->focus_change.in = in;
   
   gtk_widget_event (widget, fevent);
   
-  g_object_notify (G_OBJECT (widget), "has_focus");
+  g_object_notify (G_OBJECT (widget), "has-focus");
 
   g_object_unref (widget);
   gdk_event_free (fevent);
@@ -4158,14 +4819,15 @@ gtk_window_focus_out_event (GtkWidget     *widget,
 }
 
 static GdkAtom atom_rcfiles = GDK_NONE;
+static GdkAtom atom_iconthemes = GDK_NONE;
 
 static void
-gtk_window_read_rcfiles (GtkWidget *widget,
-                        GdkEventClient *event)
+send_client_message_to_embedded_windows (GtkWidget *widget,
+                                        GdkAtom    message_type)
 {
   GList *embedded_windows;
 
-  embedded_windows = g_object_get_data (G_OBJECT (widget), "gtk-embedded");
+  embedded_windows = g_object_get_qdata (G_OBJECT (widget), quark_gtk_embedded);
   if (embedded_windows)
     {
       GdkEvent *send_event = gdk_event_new (GDK_CLIENT_EVENT);
@@ -4174,7 +4836,7 @@ gtk_window_read_rcfiles (GtkWidget *widget,
       for (i = 0; i < 5; i++)
        send_event->client.data.l[i] = 0;
       send_event->client.data_format = 32;
-      send_event->client.message_type = atom_rcfiles;
+      send_event->client.message_type = message_type;
       
       while (embedded_windows)
        {
@@ -4185,8 +4847,6 @@ gtk_window_read_rcfiles (GtkWidget *widget,
 
       gdk_event_free (send_event);
     }
-
-  gtk_rc_reparse_all_for_settings (gtk_widget_get_settings (widget), FALSE);
 }
 
 static gint
@@ -4194,10 +4854,22 @@ gtk_window_client_event (GtkWidget      *widget,
                         GdkEventClient *event)
 {
   if (!atom_rcfiles)
-    atom_rcfiles = gdk_atom_intern ("_GTK_READ_RCFILES", FALSE);
+    {
+      atom_rcfiles = gdk_atom_intern_static_string ("_GTK_READ_RCFILES");
+      atom_iconthemes = gdk_atom_intern_static_string ("_GTK_LOAD_ICONTHEMES");
+    }
 
   if (event->message_type == atom_rcfiles) 
-    gtk_window_read_rcfiles (widget, event);    
+    {
+      send_client_message_to_embedded_windows (widget, atom_rcfiles);
+      gtk_rc_reparse_all_for_settings (gtk_widget_get_settings (widget), FALSE);
+    }
+
+  if (event->message_type == atom_iconthemes) 
+    {
+      send_client_message_to_embedded_windows (widget, atom_iconthemes);
+      _gtk_icon_theme_check_reload (gtk_widget_get_display (widget));    
+    }
 
   return FALSE;
 }
@@ -4239,6 +4911,14 @@ gtk_window_focus (GtkWidget        *widget,
 
   if (window->focus_widget)
     {
+      if (direction == GTK_DIR_LEFT ||
+         direction == GTK_DIR_RIGHT ||
+         direction == GTK_DIR_UP ||
+         direction == GTK_DIR_DOWN)
+       {
+         return FALSE;
+       }
+      
       /* Wrapped off the end, clear the focus setting for the toplpevel */
       parent = window->focus_widget->parent;
       while (parent)
@@ -4265,21 +4945,25 @@ gtk_window_real_set_focus (GtkWindow *window,
                           GtkWidget *focus)
 {
   GtkWidget *old_focus = window->focus_widget;
-  gboolean def_flags = 0;
+  gboolean had_default = FALSE;
+  gboolean focus_had_default = FALSE;
+  gboolean old_focus_had_default = FALSE;
 
   if (old_focus)
     {
       g_object_ref (old_focus);
       g_object_freeze_notify (G_OBJECT (old_focus));
+      old_focus_had_default = GTK_WIDGET_HAS_DEFAULT (old_focus);
     }
   if (focus)
     {
       g_object_ref (focus);
       g_object_freeze_notify (G_OBJECT (focus));
+      focus_had_default = GTK_WIDGET_HAS_DEFAULT (focus);
     }
   
   if (window->default_widget)
-    def_flags = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
+    had_default = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
   
   if (window->focus_widget)
     {
@@ -4287,21 +4971,27 @@ gtk_window_real_set_focus (GtkWindow *window,
          (window->focus_widget != window->default_widget))
         {
          GTK_WIDGET_UNSET_FLAGS (window->focus_widget, GTK_HAS_DEFAULT);
-
+         gtk_widget_queue_draw (window->focus_widget);
+         
          if (window->default_widget)
            GTK_WIDGET_SET_FLAGS (window->default_widget, GTK_HAS_DEFAULT);
-        }
+       }
+
+      window->focus_widget = NULL;
 
       if (window->has_focus)
-       do_focus_change (window->focus_widget, FALSE);
+       do_focus_change (old_focus, FALSE);
 
-      g_object_notify (G_OBJECT (window->focus_widget), "is_focus");
+      g_object_notify (G_OBJECT (old_focus), "is-focus");
     }
-  
-  window->focus_widget = focus;
-  
-  if (window->focus_widget)
+
+  /* The above notifications may have set a new focus widget,
+   * if so, we don't want to override it.
+   */
+  if (focus && !window->focus_widget)
     {
+      window->focus_widget = focus;
+  
       if (GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget) &&
          (window->focus_widget != window->default_widget))
        {
@@ -4315,25 +5005,78 @@ gtk_window_real_set_focus (GtkWindow *window,
       if (window->has_focus)
        do_focus_change (window->focus_widget, TRUE);
 
-      g_object_notify (G_OBJECT (window->focus_widget), "is_focus");
+      g_object_notify (G_OBJECT (window->focus_widget), "is-focus");
     }
-  
+
+  /* If the default widget changed, a redraw will have been queued
+   * on the old and new default widgets by gtk_window_set_default(), so
+   * we only have to worry about the case where it didn't change.
+   * We'll sometimes queue a draw twice on the new widget but that
+   * is harmless.
+   */
   if (window->default_widget &&
-      (def_flags != GTK_WIDGET_FLAGS (window->default_widget)))
+      (had_default != GTK_WIDGET_HAS_DEFAULT (window->default_widget)))
     gtk_widget_queue_draw (window->default_widget);
-
+  
   if (old_focus)
     {
+      if (old_focus_had_default != GTK_WIDGET_HAS_DEFAULT (old_focus))
+       gtk_widget_queue_draw (old_focus);
+       
       g_object_thaw_notify (G_OBJECT (old_focus));
       g_object_unref (old_focus);
     }
   if (focus)
     {
+      if (focus_had_default != GTK_WIDGET_HAS_DEFAULT (focus))
+       gtk_widget_queue_draw (focus);
+
       g_object_thaw_notify (G_OBJECT (focus));
       g_object_unref (focus);
     }
 }
 
+/**
+ * _gtk_window_unset_focus_and_default:
+ * @window: a #GtkWindow
+ * @widget: a widget inside of @window
+ * 
+ * Checks whether the focus and default widgets of @window are
+ * @widget or a descendent of @widget, and if so, unset them.
+ **/
+void
+_gtk_window_unset_focus_and_default (GtkWindow *window,
+                                    GtkWidget *widget)
+
+{
+  GtkWidget *child;
+
+  g_object_ref (window);
+  g_object_ref (widget);
+      
+  if (GTK_CONTAINER (widget->parent)->focus_child == widget)
+    {
+      child = window->focus_widget;
+      
+      while (child && child != widget)
+       child = child->parent;
+  
+      if (child == widget)
+       gtk_window_set_focus (GTK_WINDOW (window), NULL);
+    }
+      
+  child = window->default_widget;
+      
+  while (child && child != widget)
+    child = child->parent;
+      
+  if (child == widget)
+    gtk_window_set_default (window, NULL);
+  
+  g_object_unref (widget);
+  g_object_unref (window);
+}
+
 /*********************************
  * Functions related to resizing *
  *********************************/
@@ -4377,6 +5120,8 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
          {
           gint base_width = 0;
           gint base_height = 0;
+          gint min_width = 0;
+          gint min_height = 0;
           gint width_inc = 1;
           gint height_inc = 1;
           
@@ -4393,10 +5138,10 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
                   base_width = geometry.base_width;
                   base_height = geometry.base_height;
                 }
-              else if (flags & GDK_HINT_MIN_SIZE)
+              if (flags & GDK_HINT_MIN_SIZE)
                 {
-                  base_width = geometry.min_width;
-                  base_height = geometry.min_height;
+                  min_width = geometry.min_width;
+                  min_height = geometry.min_height;
                 }
               if (flags & GDK_HINT_RESIZE_INC)
                 {
@@ -4406,10 +5151,10 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
             }
             
           if (info->default_width > 0)
-            *width = info->default_width * width_inc + base_width;
+            *width = MAX (info->default_width * width_inc + base_width, min_width);
           
           if (info->default_height > 0)
-            *height = info->default_height * height_inc + base_height;
+            *height = MAX (info->default_height * height_inc + base_height, min_height);
          }
     }
   else
@@ -4449,7 +5194,7 @@ get_center_monitor_of_window (GtkWindow *window)
    * stuff, or we could just be losers and assume you have a row
    * or column of monitors.
    */
-  return gdk_screen_get_n_monitors (window->screen) / 2;
+  return gdk_screen_get_n_monitors (gtk_window_check_screen (window)) / 2;
 }
 
 static int
@@ -4457,14 +5202,16 @@ get_monitor_containing_pointer (GtkWindow *window)
 {
   gint px, py;
   gint monitor_num;
+  GdkScreen *window_screen;
   GdkScreen *pointer_screen;
 
-  gdk_display_get_pointer (gdk_screen_get_display (window->screen),
+  window_screen = gtk_window_check_screen (window);
+  gdk_display_get_pointer (gdk_screen_get_display (window_screen),
                            &pointer_screen,
                            &px, &py, NULL);
 
-  if (pointer_screen == window->screen)
-    monitor_num = gdk_screen_get_monitor_at_point (window->screen, px, py);
+  if (pointer_screen == window_screen)
+    monitor_num = gdk_screen_get_monitor_at_point (pointer_screen, px, py);
   else
     monitor_num = -1;
 
@@ -4485,8 +5232,9 @@ center_window_on_monitor (GtkWindow *window,
   
   if (monitor_num == -1)
     monitor_num = get_center_monitor_of_window (window);
-  
-  gdk_screen_get_monitor_geometry (window->screen, monitor_num, &monitor);
+
+  gdk_screen_get_monitor_geometry (gtk_window_check_screen (window),
+                                  monitor_num, &monitor);
   
   *x = (monitor.width - w) / 2 + monitor.x;
   *y = (monitor.height - h) / 2 + monitor.y;
@@ -4538,12 +5286,15 @@ gtk_window_compute_configure_request (GtkWindow    *window,
   GtkWindowPosition pos;
   GtkWidget *parent_widget;
   GtkWindowGeometryInfo *info;
+  GdkScreen *screen;
   int x, y;
   
   widget = GTK_WIDGET (window);
+
+  screen = gtk_window_check_screen (window);
   
   gtk_widget_size_request (widget, NULL);
-  gtk_window_compute_configure_request_size (window, &w, &h);
+  gtk_window_compute_configure_request_size (window, (guint *)&w, (guint *)&h);
   
   gtk_window_compute_hints (window, &new_geometry, &new_flags);
   gtk_window_constrain_size (window,
@@ -4554,12 +5305,21 @@ gtk_window_compute_configure_request (GtkWindow    *window,
   parent_widget = (GtkWidget*) window->transient_parent;
   
   pos = get_effective_position (window);
-  info = gtk_window_get_geometry_info (window, TRUE);
-
-  /* by default, don't change position requested */
-  x = info->last.configure_request.x;
-  y = info->last.configure_request.y;
+  info = gtk_window_get_geometry_info (window, FALSE);
   
+  /* by default, don't change position requested */
+  if (info)
+    {
+      x = info->last.configure_request.x;
+      y = info->last.configure_request.y;
+    }
+  else
+    {
+      x = 0;
+      y = 0;
+    }
+
+
   if (window->need_default_position)
     {
 
@@ -4589,7 +5349,7 @@ gtk_window_compute_configure_request (GtkWindow    *window,
             g_assert (GTK_WIDGET_MAPPED (parent_widget)); /* established earlier */
 
             if (parent_widget->window != NULL)
-              monitor_num = gdk_screen_get_monitor_at_window (window->screen,
+              monitor_num = gdk_screen_get_monitor_at_window (screen,
                                                               parent_widget->window);
             else
               monitor_num = -1;
@@ -4606,7 +5366,7 @@ gtk_window_compute_configure_request (GtkWindow    *window,
              */
             if (monitor_num >= 0)
               {
-                gdk_screen_get_monitor_geometry (window->screen, monitor_num, &monitor);
+                gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
                 clamp_window_to_rectangle (&x, &y, w, h, &monitor);
               }
           }
@@ -4614,19 +5374,19 @@ gtk_window_compute_configure_request (GtkWindow    *window,
 
         case GTK_WIN_POS_MOUSE:
           {
-            gint screen_width = gdk_screen_get_width (window->screen);
-            gint screen_height = gdk_screen_get_height (window->screen);
+            gint screen_width = gdk_screen_get_width (screen);
+            gint screen_height = gdk_screen_get_height (screen);
            gint monitor_num;
            GdkRectangle monitor;
             GdkScreen *pointer_screen;
             gint px, py;
             
-            gdk_display_get_pointer (gdk_screen_get_display (window->screen),
+            gdk_display_get_pointer (gdk_screen_get_display (screen),
                                      &pointer_screen,
                                      &px, &py, NULL);
 
-            if (pointer_screen == window->screen)
-              monitor_num = gdk_screen_get_monitor_at_point (window->screen, px, py);
+            if (pointer_screen == screen)
+              monitor_num = gdk_screen_get_monitor_at_point (screen, px, py);
             else
               monitor_num = -1;
             
@@ -4641,7 +5401,7 @@ gtk_window_compute_configure_request (GtkWindow    *window,
              */
             if (monitor_num >= 0)
               {
-                gdk_screen_get_monitor_geometry (window->screen, monitor_num, &monitor);
+                gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
                 clamp_window_to_rectangle (&x, &y, w, h, &monitor);
               }
           }
@@ -4652,7 +5412,7 @@ gtk_window_compute_configure_request (GtkWindow    *window,
         }
     } /* if (window->need_default_position) */
 
-  if (window->need_default_position &&
+  if (window->need_default_position && info &&
       info->initial_pos_set)
     {
       x = info->initial_x;
@@ -4937,6 +5697,10 @@ gtk_window_move_resize (GtkWindow *window)
       allocation = widget->allocation;
       gtk_widget_size_allocate (widget, &allocation);
 
+      gdk_window_process_updates (widget->window, TRUE);
+      
+      gdk_window_configure_finished (widget->window);
+
       /* If the configure request changed, it means that
        * we either:
        *   1) coincidentally changed hints or widget properties
@@ -5012,10 +5776,9 @@ gtk_window_move_resize (GtkWindow *window)
                                  new_request.width, new_request.height);
            }
          else
-           if (widget->window)
-             gdk_window_move_resize (widget->window,
-                                     new_request.x, new_request.y,
-                                     new_request.width, new_request.height);
+           gdk_window_move_resize (widget->window,
+                                   new_request.x, new_request.y,
+                                   new_request.width, new_request.height);
        }
       else  /* only size changed */
        {
@@ -5023,9 +5786,8 @@ gtk_window_move_resize (GtkWindow *window)
            gdk_window_resize (window->frame,
                               new_request.width + window->frame_left + window->frame_right,
                               new_request.height + window->frame_top + window->frame_bottom);
-         if (widget->window)
-           gdk_window_resize (widget->window,
-                              new_request.width, new_request.height);
+         gdk_window_resize (widget->window,
+                            new_request.width, new_request.height);
        }
       
       /* Increment the number of have-not-yet-received-notify requests */
@@ -5269,7 +6031,7 @@ gtk_window_compute_hints (GtkWindow   *window,
        new_geometry->max_width += extra_width;
 
       if (new_geometry->max_height < 0)
-       new_geometry->max_width = requisition.height;
+       new_geometry->max_height = requisition.height;
       else
        new_geometry->max_height += extra_height;
     }
@@ -5304,8 +6066,8 @@ gtk_window_expose (GtkWidget      *widget,
   if (!GTK_WIDGET_APP_PAINTABLE (widget))
     gtk_window_paint (widget, &event->area);
   
-  if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-    return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+  if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event)
+    return GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event (widget, event);
 
   return FALSE;
 }
@@ -5323,10 +6085,10 @@ gtk_window_expose (GtkWidget      *widget,
  * If this function is called on a window with setting of %TRUE, before
  * it is realized or showed, it will have a "frame" window around
  * @window->window, accessible in @window->frame. Using the signal 
- * frame_event you can recieve all events targeted at the frame.
+ * frame_event you can receive all events targeted at the frame.
  * 
  * This function is used by the linux-fb port to implement managed
- * windows, but it could concievably be used by X-programs that
+ * windows, but it could conceivably be used by X-programs that
  * want to do their own window decorations.
  *
  **/
@@ -5427,10 +6189,32 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
  * currently open, and the user chooses Preferences from the menu
  * a second time; use gtk_window_present() to move the already-open dialog
  * where the user can see it.
+ *
+ * If you are calling this function in response to a user interaction,
+ * it is preferable to use gtk_window_present_with_time().
  * 
  **/
 void
 gtk_window_present (GtkWindow *window)
+{
+  gtk_window_present_with_time (window, GDK_CURRENT_TIME);
+}
+
+/**
+ * gtk_window_present_with_time:
+ * @window: a #GtkWindow
+ * @timestamp: the timestamp of the user interaction (typically a 
+ *   button or key press event) which triggered this call
+ *
+ * Presents a window to the user in response to a user interaction.
+ * If you need to present a window without a timestamp, use 
+ * gtk_window_present(). See gtk_window_present() for details. 
+ * 
+ * Since: 2.8
+ **/
+void
+gtk_window_present_with_time (GtkWindow *window,
+                             guint32    timestamp)
 {
   GtkWidget *widget;
 
@@ -5444,11 +6228,20 @@ gtk_window_present (GtkWindow *window)
       
       gdk_window_show (widget->window);
 
-      /* note that gdk_window_focus() will also move the window to
-       * the current desktop, for WM spec compliant window managers.
-       */
-      gdk_window_focus (widget->window,
-                        gtk_get_current_event_time ());
+      /* Translate a timestamp of GDK_CURRENT_TIME appropriately */
+      if (timestamp == GDK_CURRENT_TIME)
+        {
+#ifdef GDK_WINDOWING_X11
+          GdkDisplay *display;
+
+          display = gtk_widget_get_display (GTK_WIDGET (window));
+          timestamp = gdk_x11_display_get_user_time (display);
+#else
+          timestamp = gtk_get_current_event_time ();
+#endif
+        }
+
+      gdk_window_focus (widget->window, timestamp);
     }
   else
     {
@@ -5698,6 +6491,7 @@ gtk_window_unmaximize (GtkWindow *window)
  * You can track the fullscreen state via the "window_state_event" signal
  * on #GtkWidget.
  * 
+ * Since: 2.2
  **/
 void
 gtk_window_fullscreen (GtkWindow *window)
@@ -5709,7 +6503,7 @@ gtk_window_fullscreen (GtkWindow *window)
   g_return_if_fail (GTK_IS_WINDOW (window));
 
   widget = GTK_WIDGET (window);
-  priv = gtk_window_get_private (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
   
   priv->fullscreen_initially = TRUE;
 
@@ -5737,6 +6531,7 @@ gtk_window_fullscreen (GtkWindow *window)
  * You can track the fullscreen state via the "window_state_event" signal
  * on #GtkWidget.
  * 
+ * Since: 2.2
  **/
 void
 gtk_window_unfullscreen (GtkWindow *window)
@@ -5748,7 +6543,7 @@ gtk_window_unfullscreen (GtkWindow *window)
   g_return_if_fail (GTK_IS_WINDOW (window));
 
   widget = GTK_WIDGET (window);
-  priv = gtk_window_get_private (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
   
   priv->fullscreen_initially = FALSE;
 
@@ -5761,6 +6556,113 @@ gtk_window_unfullscreen (GtkWindow *window)
     gdk_window_unfullscreen (toplevel);
 }
 
+/**
+ * gtk_window_set_keep_above:
+ * @window: a #GtkWindow
+ * @setting: whether to keep @window above other windows
+ *
+ * Asks to keep @window above, so that it stays on top. Note that
+ * you shouldn't assume the window is definitely above afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could not keep it above,
+ * and not all window managers support keeping windows above. But
+ * normally the window will end kept above. Just don't write code
+ * that crashes if not.
+ *
+ * It's permitted to call this function before showing a window,
+ * in which case the window will be kept above when it appears onscreen
+ * initially.
+ *
+ * You can track the above state via the "window_state_event" signal
+ * on #GtkWidget.
+ *
+ * Note that, according to the <ulink 
+ * url="http://www.freedesktop.org/Standards/wm-spec">Extended Window 
+ * Manager Hints</ulink> specification, the above state is mainly meant 
+ * for user preferences and should not be used by applications e.g. for 
+ * drawing attention to their dialogs.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_window_set_keep_above (GtkWindow *window,
+                          gboolean   setting)
+{
+  GtkWidget *widget;
+  GtkWindowPrivate *priv;
+  GdkWindow *toplevel;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  priv->above_initially = setting != FALSE;
+  if (setting)
+    priv->below_initially = FALSE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+
+  if (toplevel != NULL)
+    gdk_window_set_keep_above (toplevel, setting);
+}
+
+/**
+ * gtk_window_set_keep_below:
+ * @window: a #GtkWindow
+ * @setting: whether to keep @window below other windows
+ *
+ * Asks to keep @window below, so that it stays in bottom. Note that
+ * you shouldn't assume the window is definitely below afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could not keep it below,
+ * and not all window managers support putting windows below. But
+ * normally the window will be kept below. Just don't write code
+ * that crashes if not.
+ *
+ * It's permitted to call this function before showing a window,
+ * in which case the window will be kept below when it appears onscreen
+ * initially.
+ *
+ * You can track the below state via the "window_state_event" signal
+ * on #GtkWidget.
+ *
+ * Note that, according to the <ulink 
+ * url="http://www.freedesktop.org/Standards/wm-spec">Extended Window 
+ * Manager Hints</ulink> specification, the above state is mainly meant 
+ * for user preferences and should not be used by applications e.g. for 
+ * drawing attention to their dialogs.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_window_set_keep_below (GtkWindow *window,
+                          gboolean   setting)
+{
+  GtkWidget *widget;
+  GtkWindowPrivate *priv;
+  GdkWindow *toplevel;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  priv->below_initially = setting != FALSE;
+  if (setting)
+    priv->above_initially = FALSE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+
+  if (toplevel != NULL)
+    gdk_window_set_keep_below (toplevel, setting);
+}
 
 /**
  * gtk_window_set_resizable:
@@ -5825,6 +6727,8 @@ gtk_window_set_gravity (GtkWindow *window,
       /* gtk_window_move_resize() will adapt gravity
        */
       gtk_widget_queue_resize (GTK_WIDGET (window));
+
+      g_object_notify (G_OBJECT (window), "gravity");
     }
 }
 
@@ -5976,6 +6880,8 @@ gtk_window_begin_move_drag  (GtkWindow *window,
  * Sets the #GdkScreen where the @window is displayed; if
  * the window is already mapped, it will be unmapped, and
  * then remapped on the new screen.
+ *
+ * Since: 2.2
  */
 void
 gtk_window_set_screen (GtkWindow *window,
@@ -5983,7 +6889,6 @@ gtk_window_set_screen (GtkWindow *window,
 {
   GtkWidget *widget;
   GdkScreen *previous_screen;
-  GdkScreen *new_screen;
   gboolean was_mapped;
   
   g_return_if_fail (GTK_IS_WINDOW (window));
@@ -6006,13 +6911,43 @@ gtk_window_set_screen (GtkWindow *window,
   window->screen = screen;
   gtk_widget_reset_rc_styles (widget);
   if (screen != previous_screen)
-    _gtk_widget_propagate_screen_changed (widget, previous_screen);
+    {
+      g_signal_handlers_disconnect_by_func (previous_screen,
+                                           gtk_window_on_composited_changed, window);
+      g_signal_connect (screen, "composited_changed", 
+                       G_CALLBACK (gtk_window_on_composited_changed), window);
+      
+      _gtk_widget_propagate_screen_changed (widget, previous_screen);
+      _gtk_widget_propagate_composited_changed (widget);
+    }
   g_object_notify (G_OBJECT (window), "screen");
 
   if (was_mapped)
     gtk_widget_map (widget);
 }
 
+static void
+gtk_window_on_composited_changed (GdkScreen *screen,
+                                 GtkWindow *window)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (window));
+  
+  _gtk_widget_propagate_composited_changed (GTK_WIDGET (window));
+}
+
+static GdkScreen *
+gtk_window_check_screen (GtkWindow *window)
+{
+  if (window->screen)
+    return window->screen;
+  else
+    {
+      g_warning ("Screen for GtkWindow not set; you must always set\n"
+                "a screen for a GtkWindow before using the window");
+      return NULL;
+    }
+}
+
 /** 
  * gtk_window_get_screen:
  * @window: a #GtkWindow.
@@ -6020,15 +6955,60 @@ gtk_window_set_screen (GtkWindow *window,
  * Returns the #GdkScreen associated with @window.
  *
  * Return value: a #GdkScreen.
+ *
+ * Since: 2.2
  */
 GdkScreen*
 gtk_window_get_screen (GtkWindow *window)
 {
-   g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
    
-   return window->screen;
+  return window->screen;
+}
+
+/**
+ * gtk_window_is_active:
+ * @window: a #GtkWindow
+ * 
+ * Returns whether the window is part of the current active toplevel.
+ * (That is, the toplevel window receiving keystrokes.)
+ * The return value is %TRUE if the window is active toplevel
+ * itself, but also if it is, say, a #GtkPlug embedded in the active toplevel.
+ * You might use this function if you wanted to draw a widget
+ * differently in an active window from a widget in an inactive window.
+ * See gtk_window_has_toplevel_focus()
+ * 
+ * Return value: %TRUE if the window part of the current active window.
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_window_is_active (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  return window->is_active;
 }
 
+/**
+ * gtk_window_has_toplevel_focus:
+ * @window: a #GtkWindow
+ * 
+ * Returns whether the input focus is within this GtkWindow.
+ * For real toplevel windows, this is identical to gtk_window_is_active(),
+ * but for embedded windows, like #GtkPlug, the results will differ.
+ * 
+ * Return value: %TRUE if the input focus is within this GtkWindow
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_window_has_toplevel_focus (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  return window->has_toplevel_focus;
+}
 
 static void
 gtk_window_group_class_init (GtkWindowGroupClass *klass)
@@ -6042,7 +7022,7 @@ gtk_window_group_get_type (void)
 
   if (!window_group_type)
     {
-      static const GTypeInfo window_group_info =
+      const GTypeInfo window_group_info =
       {
        sizeof (GtkWindowGroupClass),
        NULL,           /* base_init */
@@ -6051,11 +7031,12 @@ gtk_window_group_get_type (void)
        NULL,           /* class_finalize */
        NULL,           /* class_data */
        sizeof (GtkWindowGroup),
-       16,             /* n_preallocs */
+       0,              /* n_preallocs */
        (GInstanceInitFunc) NULL,
       };
 
-      window_group_type = g_type_register_static (G_TYPE_OBJECT, "GtkWindowGroup", &window_group_info, 0);
+      window_group_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkWindowGroup"), 
+                                                 &window_group_info, 0);
     }
 
   return window_group_type;
@@ -6120,7 +7101,7 @@ gtk_window_group_add_window (GtkWindowGroup *window_group,
       if (window->group)
        gtk_window_group_remove_window (window->group, window);
       else
-       window_group_cleanup_grabs (_gtk_window_get_group (NULL), window);
+       window_group_cleanup_grabs (gtk_window_get_group (NULL), window);
 
       window->group = window_group;
 
@@ -6152,10 +7133,20 @@ gtk_window_group_remove_window (GtkWindowGroup *window_group,
   g_object_unref (window);
 }
 
-/* Return the group for the window or the default group
+/**
+ * gtk_window_get_group:
+ * @window: a #GtkWindow, or %NULL
+ *
+ * Returns the group for @window or the default group, if
+ * @window is %NULL or if @window does not have an explicit
+ * window group. 
+ *
+ * Returns: the #GtkWindowGroup for a window or the default group
+ *
+ * Since: 2.10
  */
 GtkWindowGroup *
-_gtk_window_get_group (GtkWindow *window)
+gtk_window_get_group (GtkWindow *window)
 {
   if (window && window->group)
     return window->group;
@@ -6170,6 +7161,15 @@ _gtk_window_get_group (GtkWindow *window)
     }
 }
 
+/* Return the current grab widget of the given group 
+ */
+GtkWidget *
+_gtk_window_group_get_current_grab (GtkWindowGroup *window_group)
+{
+  if (window_group->grabs)
+    return GTK_WIDGET (window_group->grabs->data);
+  return NULL;
+}
 
 /*
   Derived from XParseGeometry() in XFree86  
@@ -6373,38 +7373,88 @@ gtk_XParseGeometry (const char   *string,
  * indicating to the window manager that the size/position of
  * the window was user-specified. This causes most window
  * managers to honor the geometry.
+ *
+ * Note that for gtk_window_parse_geometry() to work as expected, it has
+ * to be called when the window has its "final" size, i.e. after calling
+ * gtk_widget_show_all() on the contents and gtk_window_set_geometry_hints()
+ * on the window.
  * 
+ * <informalexample><programlisting>
+ * #include &lt;gtk/gtk.h&gt;
+ *    
+ * static void
+ * fill_with_content (GtkWidget *vbox)
+ * {
+ *   /<!-- -->* fill with content... *<!-- -->/
+ * }
+ *    
+ * int
+ * main (int argc, char *argv[])
+ * {
+ *   GtkWidget *window, *vbox;
+ *   GdkGeometry size_hints = {
+ *     100, 50, 0, 0, 100, 50, 10, 10, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
+ *   };
+ *    
+ *   gtk_init (&amp;argc, &amp;argv);
+ *   
+ *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *   vbox = gtk_vbox_new (FALSE, 0);
+ *   
+ *   gtk_container_add (GTK_CONTAINER (window), vbox);
+ *   fill_with_content (vbox);
+ *   gtk_widget_show_all (vbox);
+ *   
+ *   gtk_window_set_geometry_hints (GTK_WINDOW (window),
+ *                                 window,
+ *                                 &amp;size_hints,
+ *                                 GDK_HINT_MIN_SIZE | 
+ *                                 GDK_HINT_BASE_SIZE | 
+ *                                 GDK_HINT_RESIZE_INC);
+ *   
+ *   if (argc &gt; 1)
+ *     {
+ *       if (!gtk_window_parse_geometry (GTK_WINDOW (window), argv[1]))
+ *         fprintf (stderr, "Failed to parse '&percnt;s'\n", argv[1]);
+ *     }
+ *    
+ *   gtk_widget_show_all (window);
+ *   gtk_main ();
+ *    
+ *   return 0;
+ * }
+ * </programlisting></informalexample>
+ *
  * Return value: %TRUE if string was parsed successfully
  **/
 gboolean
 gtk_window_parse_geometry (GtkWindow   *window,
                            const gchar *geometry)
 {
-  gint result, x, y;
+  gint result, x = 0, y = 0;
   guint w, h;
   GdkGravity grav;
   gboolean size_set, pos_set;
+  GdkScreen *screen;
   
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
   g_return_val_if_fail (geometry != NULL, FALSE);
+
+  screen = gtk_window_check_screen (window);
   
   result = gtk_XParseGeometry (geometry, &x, &y, &w, &h);
 
-  if ((result & WidthValue) == 0 ||
-      w < 0)
-    w = -1;
-  if ((result & HeightValue) == 0 ||
-      h < 0)
-    h = -1;
-
   size_set = FALSE;
   if ((result & WidthValue) || (result & HeightValue))
     {
-      gtk_window_set_default_size_internal (window, TRUE, w, TRUE, h, TRUE);
+      gtk_window_set_default_size_internal (window, 
+                                           TRUE, result & WidthValue ? w : -1,
+                                           TRUE, result & HeightValue ? h : -1, 
+                                           TRUE);
       size_set = TRUE;
     }
 
-  gtk_window_get_size (window, &w, &h);
+  gtk_window_get_size (window, (gint *)&w, (gint *)&h);
   
   grav = GDK_GRAVITY_NORTH_WEST;
 
@@ -6423,11 +7473,11 @@ gtk_window_parse_geometry (GtkWindow   *window,
 
   if (grav == GDK_GRAVITY_SOUTH_WEST ||
       grav == GDK_GRAVITY_SOUTH_EAST)
-    y = gdk_screen_get_height (window->screen) - h + y;
+    y = gdk_screen_get_height (screen) - h + y;
 
   if (grav == GDK_GRAVITY_SOUTH_EAST ||
       grav == GDK_GRAVITY_NORTH_EAST)
-    x = gdk_screen_get_width (window->screen) - w + x;
+    x = gdk_screen_get_width (screen) - w + x;
 
   /* we don't let you put a window offscreen; maybe some people would
    * prefer to be able to, but it's kind of a bogus thing to do.
@@ -6463,9 +7513,9 @@ gtk_window_parse_geometry (GtkWindow   *window,
 }
 
 static void
-gtk_window_mnemonic_hash_foreach (gpointer key,
-                                 gpointer value,
-                                 gpointer data)
+gtk_window_mnemonic_hash_foreach (guint      keyval,
+                                 GSList    *targets,
+                                 gpointer   data)
 {
   struct {
     GtkWindow *window;
@@ -6473,10 +7523,7 @@ gtk_window_mnemonic_hash_foreach (gpointer key,
     gpointer func_data;
   } *info = data;
 
-  GtkWindowMnemonic *mnemonic = value;
-
-  if (mnemonic->window == info->window)
-    (*info->func) (info->window, mnemonic->keyval, info->window->mnemonic_modifier, TRUE, info->func_data);
+  (*info->func) (info->window, keyval, info->window->mnemonic_modifier, TRUE, info->func_data);
 }
 
 void
@@ -6485,6 +7532,7 @@ _gtk_window_keys_foreach (GtkWindow                *window,
                          gpointer                 func_data)
 {
   GSList *groups;
+  GtkMnemonicHash *mnemonic_hash;
 
   struct {
     GtkWindow *window;
@@ -6496,9 +7544,10 @@ _gtk_window_keys_foreach (GtkWindow                *window,
   info.func = func;
   info.func_data = func_data;
 
-  g_hash_table_foreach (mnemonic_hash_table,
-                       gtk_window_mnemonic_hash_foreach,
-                       &info);
+  mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+  if (mnemonic_hash)
+    _gtk_mnemonic_hash_foreach (mnemonic_hash,
+                               gtk_window_mnemonic_hash_foreach, &info);
 
   groups = gtk_accel_groups_from_object (G_OBJECT (window));
   while (groups)
@@ -6531,9 +7580,15 @@ struct _GtkWindowKeyEntry
 {
   guint keyval;
   guint modifiers;
-  gboolean is_mnemonic;
+  guint is_mnemonic : 1;
 };
 
+static void 
+window_key_entry_destroy (gpointer data)
+{
+  g_slice_free (GtkWindowKeyEntry, data);
+}
+
 static void
 add_to_key_hash (GtkWindow      *window,
                 guint           keyval,
@@ -6543,7 +7598,7 @@ add_to_key_hash (GtkWindow      *window,
 {
   GtkKeyHash *key_hash = data;
 
-  GtkWindowKeyEntry *entry = g_new (GtkWindowKeyEntry, 1);
+  GtkWindowKeyEntry *entry = g_slice_new (GtkWindowKeyEntry);
 
   entry->keyval = keyval;
   entry->modifiers = modifiers;
@@ -6566,14 +7621,16 @@ add_to_key_hash (GtkWindow      *window,
 static GtkKeyHash *
 gtk_window_get_key_hash (GtkWindow *window)
 {
-  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+  GdkScreen *screen = gtk_window_check_screen (window);
+  GtkKeyHash *key_hash = g_object_get_qdata (G_OBJECT (window), quark_gtk_window_key_hash);
+  
   if (key_hash)
     return key_hash;
   
-  key_hash = _gtk_key_hash_new (gdk_keymap_get_for_display (gdk_screen_get_display (window->screen)),
-                               (GDestroyNotify)g_free);
+  key_hash = _gtk_key_hash_new (gdk_keymap_get_for_display (gdk_screen_get_display (screen)),
+                               (GDestroyNotify)window_key_entry_destroy);
   _gtk_window_keys_foreach (window, add_to_key_hash, key_hash);
-  g_object_set_data (G_OBJECT (window), "gtk-window-key-hash", key_hash);
+  g_object_set_qdata (G_OBJECT (window), quark_gtk_window_key_hash, key_hash);
 
   return key_hash;
 }
@@ -6581,41 +7638,45 @@ gtk_window_get_key_hash (GtkWindow *window)
 static void
 gtk_window_free_key_hash (GtkWindow *window)
 {
-  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+  GtkKeyHash *key_hash = g_object_get_qdata (G_OBJECT (window), quark_gtk_window_key_hash);
   if (key_hash)
     {
       _gtk_key_hash_free (key_hash);
-      g_object_set_data (G_OBJECT (window), "gtk-window-key-hash", NULL);
+      g_object_set_qdata (G_OBJECT (window), quark_gtk_window_key_hash, NULL);
     }
 }
 
 /**
- * _gtk_window_activate_key:
- * @window: a #GtkWindow
- * @event: a #GdkEventKey
- * 
- * Activates mnemonics and accelerators for this #GtKWindow
+ * gtk_window_activate_key:
+ * @window:  a #GtkWindow
+ * @event:   a #GdkEventKey
+ *
+ * Activates mnemonics and accelerators for this #GtkWindow. This is normally
+ * called by the default ::key_press_event handler for toplevel windows,
+ * however in some cases it may be useful to call this directly when
+ * overriding the standard key handling for a toplevel window.
  * 
  * Return value: %TRUE if a mnemonic or accelerator was found and activated.
  **/
 gboolean
-_gtk_window_activate_key (GtkWindow   *window,
-                         GdkEventKey *event)
+gtk_window_activate_key (GtkWindow   *window,
+                        GdkEventKey *event)
 {
-  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+  GtkKeyHash *key_hash = g_object_get_qdata (G_OBJECT (window), quark_gtk_window_key_hash);
   GtkWindowKeyEntry *found_entry = NULL;
 
   if (!key_hash)
     {
       gtk_window_keys_changed (window);
-      key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+      key_hash = g_object_get_qdata (G_OBJECT (window), quark_gtk_window_key_hash);
     }
   
   if (key_hash)
     {
       GSList *entries = _gtk_key_hash_lookup (key_hash,
                                              event->hardware_keycode,
-                                             event->state & gtk_accelerator_get_default_mod_mask (),
+                                             event->state,
+                                             gtk_accelerator_get_default_mod_mask (),
                                              event->group);
       GSList *tmp_list;
 
@@ -6695,7 +7756,7 @@ _gtk_window_set_is_active (GtkWindow *window,
       window->is_active = is_active;
       window_update_has_focus (window);
 
-      g_object_notify (G_OBJECT (window), "is_active");
+      g_object_notify (G_OBJECT (window), "is-active");
     }
 }
 
@@ -6720,7 +7781,7 @@ _gtk_window_set_has_toplevel_focus (GtkWindow *window,
       window->has_toplevel_focus = has_toplevel_focus;
       window_update_has_focus (window);
 
-      g_object_notify (G_OBJECT (window), "has_toplevel_focus");
+      g_object_notify (G_OBJECT (window), "has-toplevel-focus");
     }
 }
 
@@ -6728,20 +7789,66 @@ _gtk_window_set_has_toplevel_focus (GtkWindow *window,
  * gtk_window_set_auto_startup_notification:
  * @setting: %TRUE to automatically do startup notification
  *
- * By default, after showing the first #GtkWindow for each #GdkScreen,
- * GTK+ calls gdk_screen_notify_startup_complete().  Call this
- * function to disable the automatic startup notification. You might
- * do this if your first window is a splash screen, and you want to
- * delay notification until after your real main window has been
- * shown, for example.
+ * By default, after showing the first #GtkWindow, GTK+ calls 
+ * gdk_notify_startup_complete().  Call this function to disable 
+ * the automatic startup notification. You might do this if your 
+ * first window is a splash screen, and you want to delay notification 
+ * until after your real main window has been shown, for example.
  *
  * In that example, you would disable startup notification
  * temporarily, show your splash screen, then re-enable it so that
  * showing the main window would automatically result in notification.
  * 
+ * Since: 2.2
  **/
 void
 gtk_window_set_auto_startup_notification (gboolean setting)
 {
   disable_startup_notification = !setting;
 }
+
+#ifdef G_OS_WIN32
+
+#undef gtk_window_set_icon_from_file
+
+gboolean
+gtk_window_set_icon_from_file (GtkWindow   *window,
+                              const gchar *filename,
+                              GError     **err)
+{
+  gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, err);
+  gboolean retval;
+
+  if (utf8_filename == NULL)
+    return FALSE;
+
+  retval = gtk_window_set_icon_from_file_utf8 (window, utf8_filename, err);
+
+  g_free (utf8_filename);
+
+  return retval;
+}
+
+#undef gtk_window_set_default_icon_from_file
+
+gboolean
+gtk_window_set_default_icon_from_file (const gchar *filename,
+                                      GError     **err)
+{
+  gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, err);
+  gboolean retval;
+
+  if (utf8_filename == NULL)
+    return FALSE;
+
+  retval = gtk_window_set_default_icon_from_file_utf8 (utf8_filename, err);
+
+  g_free (utf8_filename);
+
+  return retval;
+}
+
+#endif
+
+#define __GTK_WINDOW_C__
+#include "gtkaliasdef.c"