]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwindow.c
Some fixes for modal hint setting based on a patch from Arvind Samptur
[~andy/gtk] / gtk / gtkwindow.c
index 1ee20e32297f7b1ca4b5e94227ec89e8a881fa61..1d3dfea02395aa8a6caa6f1cfae7e200fd77622a 100644 (file)
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
-#if defined (GDK_WINDOWING_X11)
-#include "x11/gdkx.h"
-#elif defined (GDK_WINDOWING_WIN32)
-#include "win32/gdkwin32.h"
-#elif defined (GDK_WINDOWING_NANOX)
-#include "nanox/gdkprivate-nanox.h"
-#elif defined (GDK_WINDOWING_FB)
-#include "linux-fb/gdkfb.h"
-#endif
-
 #include "gtkprivate.h"
 #include "gtkrc.h"
-#include "gtksignal.h"
 #include "gtkwindow.h"
 #include "gtkwindow-decorate.h"
 #include "gtkbindings.h"
+#include "gtkkeyhash.h"
 #include "gtkmain.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
+#include "gtkplug.h"
 
 enum {
   SET_FOCUS,
@@ -55,6 +47,7 @@ enum {
   ACTIVATE_FOCUS,
   ACTIVATE_DEFAULT,
   MOVE_FOCUS,
+  KEYS_CHANGED,
   LAST_SIGNAL
 };
 
@@ -64,7 +57,7 @@ enum {
   /* Construct */
   PROP_TYPE,
 
-  /* Style Props */
+  /* Normal Props */
   PROP_TITLE,
   PROP_ALLOW_SHRINK,
   PROP_ALLOW_GROW,
@@ -74,10 +67,29 @@ enum {
   PROP_DEFAULT_WIDTH,
   PROP_DEFAULT_HEIGHT,
   PROP_DESTROY_WITH_PARENT,
-
+  PROP_ICON,
+  PROP_SCREEN,
+  PROP_TYPE_HINT,
+  PROP_SKIP_TASKBAR_HINT,
+  PROP_SKIP_PAGER_HINT,
+  
+  /* Readonly properties */
+  PROP_IS_ACTIVE,
+  PROP_HAS_TOPLEVEL_FOCUS,
+  
   LAST_ARG
 };
 
+typedef struct
+{
+  GList     *icon_list;
+  GdkPixmap *icon_pixmap;
+  GdkPixmap *icon_mask;
+  guint      realized : 1;
+  guint      using_default_icon : 1;
+  guint      using_parent_icon : 1;
+} GtkWindowIconInfo;
+
 typedef struct {
   GdkGeometry    geometry; /* Last set of geometry hints we set */
   GdkWindowHints flags;
@@ -114,23 +126,40 @@ struct _GtkWindowGeometryInfo
    * we sent the last configure request.
    */
   guint          position_constraints_changed : 1;
+
+  /* if true, default_width, height come from gtk_window_parse_geometry,
+   * and thus should be multiplied by the increments and affect the
+   * geometry widget only
+   */
+  guint          default_is_geometry : 1;
   
   GtkWindowLastGeometryInfo last;
 };
 
-typedef struct {
+typedef struct _GtkWindowMnemonic GtkWindowMnemonic;
+
+struct _GtkWindowMnemonic {
   GtkWindow *window;
   guint keyval;
 
   GSList *targets;
-} GtkWindowMnemonic;
+};
 
+typedef struct _GtkWindowPrivate GtkWindowPrivate;
+
+struct _GtkWindowPrivate
+{
+  guint fullscreen_initially : 1;
+  guint skips_taskbar : 1;
+  guint skips_pager : 1;
+};
 
 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);
@@ -143,7 +172,7 @@ static void gtk_window_size_allocate      (GtkWidget         *widget,
                                           GtkAllocation     *allocation);
 static gint gtk_window_event              (GtkWidget *widget,
                                           GdkEvent *event);
-static gboolean gtk_window_frame_event    (GtkWidget *widget,
+static gboolean gtk_window_frame_event    (GtkWindow *window,
                                           GdkEvent *event);
 static gint gtk_window_configure_event    (GtkWidget         *widget,
                                           GdkEventConfigure *event);
@@ -171,6 +200,7 @@ static void gtk_window_real_activate_default (GtkWindow         *window);
 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,
@@ -183,6 +213,8 @@ static void gtk_window_transient_parent_realized   (GtkWidget  *parent,
 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);
 
@@ -215,13 +247,24 @@ static void     gtk_window_set_default_size_internal (GtkWindow    *window,
                                                       gboolean      change_width,
                                                       gint          width,
                                                       gboolean      change_height,
-                                                      gint          height);
+                                                      gint          height,
+                                                     gboolean      is_geometry);
+
+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 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 guint        default_icon_serial = 0;
+static gboolean     disable_startup_notification = FALSE;
+static gboolean     sent_startup_notification = FALSE;
 
 static void gtk_window_set_property (GObject         *object,
                                     guint            prop_id,
@@ -262,31 +305,95 @@ mnemonic_equal (gconstpointer a, gconstpointer b)
     (ka->keyval == kb->keyval);
 }
 
-GtkType
+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 GtkType window_type = 0;
+  static GType window_type = 0;
 
   if (!window_type)
     {
-      static const GtkTypeInfo window_info =
+      static const GTypeInfo window_info =
       {
-       "GtkWindow",
-       sizeof (GtkWindow),
        sizeof (GtkWindowClass),
-       (GtkClassInitFunc) gtk_window_class_init,
-       (GtkObjectInitFunc) gtk_window_init,
-        /* reserved_1 */ NULL,
-       /* reserved_2 */ NULL,
-       (GtkClassInitFunc) NULL,
+       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 = gtk_type_unique (gtk_bin_get_type (), &window_info);
+      window_type = g_type_register_static (GTK_TYPE_BIN, "GtkWindow",
+                                           &window_info, 0);
     }
 
   return window_type;
 }
 
+static void
+add_tab_bindings (GtkBindingSet    *binding_set,
+                 GdkModifierType   modifiers,
+                 GtkDirectionType  direction)
+{
+  gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+}
+
+static void
+add_arrow_bindings (GtkBindingSet    *binding_set,
+                   guint             keysym,
+                   GtkDirectionType  direction)
+{
+  guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
+  
+  gtk_binding_entry_add_signal (binding_set, keysym, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+}
+
+
 static void
 gtk_window_class_init (GtkWindowClass *klass)
 {
@@ -300,7 +407,9 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class = (GtkWidgetClass*) klass;
   container_class = (GtkContainerClass*) klass;
   
-  parent_class = gtk_type_class (gtk_bin_get_type ());
+  parent_class = g_type_class_peek_parent (klass);
+
+  mnemonic_hash_table = g_hash_table_new (mnemonic_hash, mnemonic_equal);
 
   gobject_class->dispose = gtk_window_dispose;
   gobject_class->finalize = gtk_window_finalize;
@@ -338,6 +447,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   klass->activate_default = gtk_window_real_activate_default;
   klass->activate_focus = gtk_window_real_activate_focus;
   klass->move_focus = gtk_window_move_focus;
+  klass->keys_changed = gtk_window_keys_changed;
   
   /* Construct */
   g_object_class_install_property (gobject_class,
@@ -349,7 +459,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                      GTK_WINDOW_TOPLEVEL,
                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-  /* Style Props */
+  /* Regular Props */
   g_object_class_install_property (gobject_class,
                                    PROP_TITLE,
                                    g_param_spec_string ("title",
@@ -362,7 +472,8 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_ALLOW_SHRINK,
                                    g_param_spec_boolean ("allow_shrink",
                                                         _("Allow Shrink"),
-                                                        _("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea."),
+                                                        /* xgettext:no-c-format */
+                                                        _("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"),
                                                         FALSE,
                                                         G_PARAM_READWRITE));
 
@@ -370,7 +481,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_ALLOW_GROW,
                                    g_param_spec_boolean ("allow_grow",
                                                         _("Allow Grow"),
-                                                        _("If TRUE, users can expand the window beyond its minimum size."),
+                                                        _("If TRUE, users can expand the window beyond its minimum size"),
                                                         TRUE,
                                                         G_PARAM_READWRITE));
 
@@ -378,7 +489,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_RESIZABLE,
                                    g_param_spec_boolean ("resizable",
                                                         _("Resizable"),
-                                                        _("If TRUE, users can resize the window."),
+                                                        _("If TRUE, users can resize the window"),
                                                         TRUE,
                                                         G_PARAM_READWRITE));
   
@@ -386,7 +497,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_MODAL,
                                    g_param_spec_boolean ("modal",
                                                         _("Modal"),
-                                                        _("If TRUE, the window is modal (other windows are not usable while this one is up)."),
+                                                        _("If TRUE, the window is modal (other windows are not usable while this one is up)"),
                                                         FALSE,
                                                         G_PARAM_READWRITE));
 
@@ -394,7 +505,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_WIN_POS,
                                    g_param_spec_enum ("window_position",
                                                      _("Window Position"),
-                                                     _("The initial position of the window."),
+                                                     _("The initial position of the window"),
                                                      GTK_TYPE_WINDOW_POSITION,
                                                      GTK_WIN_POS_NONE,
                                                      G_PARAM_READWRITE));
@@ -403,7 +514,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_DEFAULT_WIDTH,
                                    g_param_spec_int ("default_width",
                                                     _("Default Width"),
-                                                    _("The default width of the window, used when initially showing the window."),
+                                                    _("The default width of the window, used when initially showing the window"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
@@ -413,7 +524,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                    PROP_DEFAULT_HEIGHT,
                                    g_param_spec_int ("default_height",
                                                     _("Default Height"),
-                                                    _("The default height of the window, used when initially showing the window."),
+                                                    _("The default height of the window, used when initially showing the window"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
@@ -427,62 +538,123 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                          FALSE,
                                                         G_PARAM_READWRITE));
 
-  /* Style props are set or not */
+  g_object_class_install_property (gobject_class,
+                                   PROP_ICON,
+                                   g_param_spec_object ("icon",
+                                                        _("Icon"),
+                                                        _("Icon for this window"),
+                                                        GDK_TYPE_PIXBUF,
+                                                        G_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"),
+                                                       GDK_TYPE_SCREEN,
+                                                       G_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"),
+                                                        FALSE,
+                                                        G_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"),
+                                                        FALSE,
+                                                        G_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."),
+                                                      GDK_TYPE_WINDOW_TYPE_HINT,
+                                                      GDK_WINDOW_TYPE_HINT_NORMAL,
+                                                      G_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."),
+                                                         FALSE,
+                                                         G_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."),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));  
 
   window_signals[SET_FOCUS] =
     g_signal_new ("set_focus",
-                  G_TYPE_FROM_CLASS (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkWindowClass, set_focus),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT,
+                  _gtk_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_WIDGET);
   
   window_signals[FRAME_EVENT] =
     g_signal_new ("frame_event",
-                  G_TYPE_FROM_CLASS(object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWindowClass, frame_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT);
 
   window_signals[ACTIVATE_FOCUS] =
     g_signal_new ("activate_focus",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus),
+                  G_STRUCT_OFFSET (GtkWindowClass, activate_focus),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
                   0);
 
   window_signals[ACTIVATE_DEFAULT] =
     g_signal_new ("activate_default",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default),
+                  G_STRUCT_OFFSET (GtkWindowClass, activate_default),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
                   0);
 
   window_signals[MOVE_FOCUS] =
     g_signal_new ("move_focus",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus),
+                  G_STRUCT_OFFSET (GtkWindowClass, move_focus),
                   NULL, NULL,
-                  gtk_marshal_VOID__ENUM,
+                  _gtk_marshal_VOID__ENUM,
                   G_TYPE_NONE,
                   1,
                   GTK_TYPE_DIRECTION_TYPE);
-  
-  if (!mnemonic_hash_table)
-    mnemonic_hash_table = g_hash_table_new (mnemonic_hash,
-                                           mnemonic_equal);
+
+  window_signals[KEYS_CHANGED] =
+    g_signal_new ("keys_changed",
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkWindowClass, keys_changed),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE,
+                  0);
 
   /*
    * Key bindings
@@ -501,58 +673,22 @@ gtk_window_class_init (GtkWindowClass *klass)
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
                                 "activate_default", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_UP);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_UP);
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_DOWN);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_DOWN);
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_LEFT);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_LEFT);  
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);  
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Tab, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
+  add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
+  add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
+  add_arrow_bindings (binding_set, GDK_Left, GTK_DIR_LEFT);
+  add_arrow_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, GDK_SHIFT_MASK,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
+  add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
+  add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
+  add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+  add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 }
 
 static void
 gtk_window_init (GtkWindow *window)
 {
+  GdkColormap *colormap;
+  
   GTK_WIDGET_UNSET_FLAGS (window, GTK_NO_WINDOW);
   GTK_WIDGET_SET_FLAGS (window, GTK_TOPLEVEL);
 
@@ -562,7 +698,7 @@ gtk_window_init (GtkWindow *window)
 
   window->title = NULL;
   window->wmclass_name = g_strdup (g_get_prgname ());
-  window->wmclass_class = g_strdup (gdk_progclass);
+  window->wmclass_class = g_strdup (gdk_get_program_class ());
   window->wm_role = NULL;
   window->geometry_info = NULL;
   window->type = GTK_WINDOW_TOPLEVEL;
@@ -586,18 +722,23 @@ gtk_window_init (GtkWindow *window)
   window->gravity = GDK_GRAVITY_NORTH_WEST;
   window->decorated = TRUE;
   window->mnemonic_modifier = GDK_MOD1_MASK;
+  window->screen = gdk_screen_get_default ();
+  
+  colormap = _gtk_widget_peek_colormap ();
+  if (colormap)
+    gtk_widget_set_colormap (GTK_WIDGET (window), colormap);
   
-  gtk_widget_ref (GTK_WIDGET (window));
+  g_object_ref (window);
   gtk_object_sink (GTK_OBJECT (window));
   window->has_user_ref_count = TRUE;
   toplevel_list = g_slist_prepend (toplevel_list, window);
 
   gtk_decorated_window_init (window);
 
-  gtk_signal_connect (GTK_OBJECT (window),
-                     "event",
-                     GTK_SIGNAL_FUNC (gtk_window_event),
-                     NULL);
+  g_signal_connect (window,
+                   "event",
+                   G_CALLBACK (gtk_window_event),
+                   NULL);
 }
 
 static void
@@ -641,16 +782,36 @@ gtk_window_set_property (GObject      *object,
     case PROP_DEFAULT_WIDTH:
       gtk_window_set_default_size_internal (window,
                                             TRUE, g_value_get_int (value),
-                                            FALSE, -1);
+                                            FALSE, -1, FALSE);
       break;
     case PROP_DEFAULT_HEIGHT:
       gtk_window_set_default_size_internal (window,
                                             FALSE, -1,
-                                            TRUE, g_value_get_int (value));
+                                            TRUE, g_value_get_int (value), FALSE);
       break;
     case PROP_DESTROY_WITH_PARENT:
       gtk_window_set_destroy_with_parent (window, g_value_get_boolean (value));
       break;
+    case PROP_ICON:
+      gtk_window_set_icon (window,
+                           g_value_get_object (value));
+      break;
+    case PROP_SCREEN:
+      gtk_window_set_screen (window, g_value_get_object (value));
+      break;
+    case PROP_TYPE_HINT:
+      gtk_window_set_type_hint (window,
+                                g_value_get_enum (value));
+      break;
+    case PROP_SKIP_TASKBAR_HINT:
+      gtk_window_set_skip_taskbar_hint (window,
+                                        g_value_get_boolean (value));
+      break;
+    case PROP_SKIP_PAGER_HINT:
+      gtk_window_set_skip_pager_hint (window,
+                                      g_value_get_boolean (value));
+      break;
+      
     default:
       break;
     }
@@ -707,6 +868,30 @@ gtk_window_get_property (GObject      *object,
     case PROP_DESTROY_WITH_PARENT:
       g_value_set_boolean (value, window->destroy_with_parent);
       break;
+    case PROP_ICON:
+      g_value_set_object (value, gtk_window_get_icon (window));
+      break;
+    case PROP_SCREEN:
+      g_value_set_object (value, window->screen);
+      break;
+    case PROP_IS_ACTIVE:
+      g_value_set_boolean (value, window->is_active);
+      break;
+    case PROP_HAS_TOPLEVEL_FOCUS:
+      g_value_set_boolean (value, window->has_toplevel_focus);
+      break;
+    case PROP_TYPE_HINT:
+      g_value_set_enum (value,
+                        window->type_hint);
+      break;
+    case PROP_SKIP_TASKBAR_HINT:
+      g_value_set_boolean (value,
+                           gtk_window_get_skip_taskbar_hint (window));
+      break;
+    case PROP_SKIP_PAGER_HINT:
+      g_value_set_boolean (value,
+                           gtk_window_get_skip_pager_hint (window));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -722,9 +907,10 @@ gtk_window_get_property (GObject      *object,
  * be #GTK_WINDOW_TOPLEVEL. If you're implementing something like a
  * popup menu from scratch (which is a bad idea, just use #GtkMenu),
  * you might use #GTK_WINDOW_POPUP. #GTK_WINDOW_POPUP is not for
- * dialogs, though in some other toolkits dialogs are called "popups."
+ * dialogs, though in some other toolkits dialogs are called "popups".
  * In GTK+, #GTK_WINDOW_POPUP means a pop-up menu or pop-up tooltip.
- * Popup windows are not controlled by the window manager.
+ * On X11, popup windows are not controlled by the <link
+ * linkend="gtk-X11-arch">window manager</link>.
  *
  * If you simply want an undecorated window (no window borders), use
  * gtk_window_set_decorated(), don't use #GTK_WINDOW_POPUP.
@@ -738,7 +924,7 @@ gtk_window_new (GtkWindowType type)
 
   g_return_val_if_fail (type >= GTK_WINDOW_TOPLEVEL && type <= GTK_WINDOW_POPUP, NULL);
 
-  window = gtk_type_new (GTK_TYPE_WINDOW);
+  window = g_object_new (GTK_TYPE_WINDOW, NULL);
 
   window->type = type;
 
@@ -750,12 +936,14 @@ gtk_window_new (GtkWindowType type)
  * @window: a #GtkWindow
  * @title: title of the window
  * 
- * Sets the title of the #GtkWindow. The title of a window will be displayed in
- * its title bar; on the X Window System, the title bar is rendered by the
- * window manager, so exactly how the title appears to users may vary according
- * to a user's exact configuration. The title should help a user distinguish
- * this window from other windows they may have open. A good title might
- * include the application name and current document filename, for example.
+ * Sets the title of the #GtkWindow. The title of a window will be
+ * displayed in its title bar; on the X Window System, the title bar
+ * is rendered by the <link linkend="gtk-X11-arch">window
+ * manager</link>, so exactly how the title appears to users may vary
+ * according to a user's exact configuration. The title should help a
+ * user distinguish this window from other windows they may have
+ * open. A good title might include the application name and current
+ * document filename, for example.
  * 
  **/
 void
@@ -805,7 +993,7 @@ gtk_window_get_title (GtkWindow *window)
  * Don't use this function. It sets the X Window System "class" and
  * "name" hints for a window.  According to the ICCCM, you should
  * always set these to the same value for all windows in an
- * application, and GTK sets them to that value by default, so calling
+ * application, and GTK+ sets them to that value by default, so calling
  * this function is sort of pointless. However, you may want to call
  * gtk_window_set_role() on each window in your application, for the
  * benefit of the session manager. Setting the role allows the window
@@ -834,11 +1022,14 @@ gtk_window_set_wmclass (GtkWindow *window,
  * @window: a #GtkWindow
  * @role: unique identifier for the window to be used when restoring a session
  *
+ * This function is only useful on X11, not with other GTK+ targets.
+ * 
  * In combination with the window title, the window role allows a
- * window manager to identify "the same" window when an application is
- * restarted. So for example you might set the "toolbox" role on your
- * app's toolbox window, so that when the user restarts their session,
- * the window manager can put the toolbox back in the same place.
+ * <link linkend="gtk-X11-arch">window manager</link> to identify "the
+ * same" window when an application is restarted. So for example you
+ * might set the "toolbox" role on your app's toolbox window, so that
+ * when the user restarts their session, the window manager can put
+ * the toolbox back in the same place.
  *
  * If a window already has a unique title, you don't need to set the
  * role, since the WM can use the title to identify the window when
@@ -883,14 +1074,14 @@ gtk_window_get_role (GtkWindow *window)
 /**
  * gtk_window_set_focus:
  * @window: a #GtkWindow
- * @focus: widget to be the new focus widget
+ * @focus: widget to be the new focus widget, or %NULL to unset
+ *   any focus widget for the toplevel window.
  *
- * If @focus is not the current focus widget, and is focusable, emits
- * the "set_focus" signal to set @focus as the focus widget for the
- * window.  This function is more or less GTK-internal; to focus an
- * entry widget or the like, you should use gtk_widget_grab_focus()
- * instead of this function.
- * 
+ * If @focus is not the current focus widget, and is focusable, sets
+ * it as the focus widget for the window. If @focus is %NULL, unsets
+ * the focus widget for this window. To set the focus to a particular
+ * widget in the toplevel, it is usually more convenient to use
+ * gtk_widget_grab_focus() instead of this function.
  **/
 void
 gtk_window_set_focus (GtkWindow *window,
@@ -903,24 +1094,51 @@ gtk_window_set_focus (GtkWindow *window,
       g_return_if_fail (GTK_WIDGET_CAN_FOCUS (focus));
     }
 
+  if (focus)
+    gtk_widget_grab_focus (focus);
+  else
+    {
+      /* Clear the existing focus chain, so that when we focus into
+       * the window again, we start at the beginnning.
+       */
+      GtkWidget *widget = window->focus_widget;
+      if (widget)
+       {
+         while (widget->parent)
+           {
+             widget = widget->parent;
+             gtk_container_set_focus_child (GTK_CONTAINER (widget), NULL);
+           }
+       }
+      
+      _gtk_window_internal_set_focus (window, NULL);
+    }
+}
+
+void
+_gtk_window_internal_set_focus (GtkWindow *window,
+                               GtkWidget *focus)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
   if ((window->focus_widget != focus) ||
       (focus && !GTK_WIDGET_HAS_FOCUS (focus)))
-    gtk_signal_emit (GTK_OBJECT (window), window_signals[SET_FOCUS], focus);
+    g_signal_emit (window, window_signals[SET_FOCUS], 0, focus);
 }
 
 /**
  * gtk_window_set_default:
  * @window: a #GtkWindow
- * @default_widget: widget to be the default
+ * @default_widget: widget to be the default, or %NULL to unset the
+ *                  default widget for the toplevel.
  *
  * The default widget is the widget that's activated when the user
- * presses Enter in a dialog (for example). This function tells a
- * #GtkWindow about the current default widget; it's really a GTK
- * internal function and you shouldn't need it. Instead, to change the
- * default widget, first set the #GTK_CAN_DEFAULT flag on the widget
- * you'd like to make the default using GTK_WIDGET_SET_FLAGS(), then
- * call gtk_widget_grab_default() to move the default.
- * 
+ * presses Enter in a dialog (for example). This function sets or
+ * unsets the default widget for a #GtkWindow about. When setting
+ * (rather than unsetting) the default widget it's generally easier to
+ * call gtk_widget_grab_focus() on the widget. Before making a widget
+ * the default widget, you must set the #GTK_CAN_DEFAULT flag on the
+ * widget you'd like to make the default using GTK_WIDGET_SET_FLAGS().
  **/
 void
 gtk_window_set_default (GtkWindow *window,
@@ -930,11 +1148,18 @@ gtk_window_set_default (GtkWindow *window,
 
   if (default_widget)
     g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (default_widget));
-
+  
   if (window->default_widget != default_widget)
     {
+      GtkWidget *old_default_widget = NULL;
+      
+      if (default_widget)
+       g_object_ref (default_widget);
+      
       if (window->default_widget)
        {
+         old_default_widget = window->default_widget;
+         
          if (window->focus_widget != window->default_widget ||
              !GTK_WIDGET_RECEIVES_DEFAULT (window->default_widget))
            GTK_WIDGET_UNSET_FLAGS (window->default_widget, GTK_HAS_DEFAULT);
@@ -950,6 +1175,15 @@ gtk_window_set_default (GtkWindow *window,
            GTK_WIDGET_SET_FLAGS (window->default_widget, GTK_HAS_DEFAULT);
          gtk_widget_queue_draw (window->default_widget);
        }
+
+      if (old_default_widget)
+       g_object_notify (G_OBJECT (old_default_widget), "has_default");
+      
+      if (default_widget)
+       {
+         g_object_notify (G_OBJECT (default_widget), "has_default");
+         g_object_unref (default_widget);
+       }
     }
 }
 
@@ -973,26 +1207,83 @@ gtk_window_set_policy (GtkWindow *window,
   gtk_widget_queue_resize (GTK_WIDGET (window));
 }
 
+static gboolean
+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);
+      window->keys_changed_handler = 0;
+    }
+
+  g_signal_emit (window, window_signals[KEYS_CHANGED], 0);
+  GDK_THREADS_LEAVE ();
+  
+  return FALSE;
+}
+
+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);
+}
+
+/**
+ * gtk_window_add_accel_group:
+ * @window: window to attach accelerator group to
+ * @accel_group: a #GtkAccelGroup
+ *
+ * Associate @accel_group with @window, such that calling
+ * gtk_accel_groups_activate() on @window will activate accelerators
+ * in @accel_group.
+ **/
 void
-gtk_window_add_accel_group (GtkWindow        *window,
-                           GtkAccelGroup    *accel_group)
+gtk_window_add_accel_group (GtkWindow     *window,
+                           GtkAccelGroup *accel_group)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (accel_group != NULL);
+  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
 
-  gtk_accel_group_attach (accel_group, G_OBJECT (window));
+  _gtk_accel_group_attach (accel_group, G_OBJECT (window));
+  g_signal_connect_object (accel_group, "accel_changed",
+                          G_CALLBACK (gtk_window_notify_keys_changed),
+                          window, G_CONNECT_SWAPPED);
 }
 
+/**
+ * gtk_window_remove_accel_group:
+ * @window: a #GtkWindow
+ * @accel_group: a #GtkAccelGroup
+ *
+ * Reverses the effects of gtk_window_add_accel_group().
+ **/
 void
-gtk_window_remove_accel_group (GtkWindow       *window,
-                              GtkAccelGroup   *accel_group)
+gtk_window_remove_accel_group (GtkWindow     *window,
+                              GtkAccelGroup *accel_group)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (accel_group != NULL);
+  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
 
-  gtk_accel_group_detach (accel_group, G_OBJECT (window));
+  g_signal_handlers_disconnect_by_func (accel_group,
+                                       gtk_window_notify_keys_changed,
+                                       window);
+  _gtk_accel_group_detach (accel_group, G_OBJECT (window));
 }
 
+/**
+ * gtk_window_add_mnemonic:
+ * @window: a #GtkWindow
+ * @keyval: the mnemonic
+ * @target: the widget that gets activated by the mnemonic
+ *
+ * Adds a mnemonic to this window.
+ */
 void
 gtk_window_add_mnemonic (GtkWindow *window,
                         guint      keyval,
@@ -1011,7 +1302,7 @@ gtk_window_add_mnemonic (GtkWindow *window,
   if (mnemonic)
     {
       g_return_if_fail (g_slist_find (mnemonic->targets, target) == NULL);
-      mnemonic->targets = g_slist_prepend (mnemonic->targets, target);
+      mnemonic->targets = g_slist_append (mnemonic->targets, target);
     }
   else
     {
@@ -1020,8 +1311,17 @@ gtk_window_add_mnemonic (GtkWindow *window,
       mnemonic->targets = g_slist_prepend (NULL, target);
       g_hash_table_insert (mnemonic_hash_table, mnemonic, mnemonic);
     }
+  gtk_window_notify_keys_changed (window);
 }
 
+/**
+ * gtk_window_remove_mnemonic:
+ * @window: a #GtkWindow
+ * @keyval: the mnemonic
+ * @target: the widget that gets activated by the mnemonic
+ *
+ * Removes a mnemonic from this window.
+ */
 void
 gtk_window_remove_mnemonic (GtkWindow *window,
                            guint      keyval,
@@ -1045,8 +1345,18 @@ gtk_window_remove_mnemonic (GtkWindow *window,
       g_hash_table_remove (mnemonic_hash_table, mnemonic);
       g_free (mnemonic);
     }
+  gtk_window_notify_keys_changed (window);
 }
 
+/**
+ * gtk_window_mnemonic_activate:
+ * @window: a #GtkWindow
+ * @keyval: the mnemonic
+ * @modifier: the modifiers 
+ * @returns: %TRUE if the activation is done. 
+ * 
+ * Activates the targets associated with the mnemonic.
+ */
 gboolean
 gtk_window_mnemonic_activate (GtkWindow      *window,
                              guint           keyval,
@@ -1104,6 +1414,14 @@ gtk_window_mnemonic_activate (GtkWindow      *window,
   return FALSE;
 }
 
+/**
+ * gtk_window_set_mnemonic_modifier:
+ * @window: a #GtkWindow
+ * @modifier: the modifier mask used to activate
+ *               mnemonics on this window.
+ *
+ * Sets the mnemonic modifier for this window. 
+ **/
 void
 gtk_window_set_mnemonic_modifier (GtkWindow      *window,
                                  GdkModifierType modifier)
@@ -1112,6 +1430,7 @@ gtk_window_set_mnemonic_modifier (GtkWindow      *window,
   g_return_if_fail ((modifier & ~GDK_MODIFIER_MASK) == 0);
 
   window->mnemonic_modifier = modifier;
+  gtk_window_notify_keys_changed (window);
 }
 
 /**
@@ -1132,6 +1451,15 @@ gtk_window_get_mnemonic_modifier (GtkWindow *window)
   return window->mnemonic_modifier;
 }
 
+/**
+ * gtk_window_set_position:
+ * @window: a #GtkWindow.
+ * @position: a position constraint.
+ *
+ * Sets a position constraint for this window. If the old or new
+ * constraint is %GTK_WIN_POS_CENTER_ALWAYS, this will also cause
+ * the window to be repositioned to satisfy the new constraint. 
+ **/
 void
 gtk_window_set_position (GtkWindow         *window,
                         GtkWindowPosition  position)
@@ -1159,6 +1487,14 @@ gtk_window_set_position (GtkWindow         *window,
   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)
 {
@@ -1174,6 +1510,37 @@ gtk_window_activate_focus (GtkWindow *window)
   return FALSE;
 }
 
+/**
+ * gtk_window_get_focus:
+ * @window: a #GtkWindow
+ * 
+ * Retrieves the current focused widget within the window.
+ * Note that this is the widget that would have the focus
+ * if the toplevel window focused; if the toplevel 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.
+ **/
+GtkWidget *
+gtk_window_get_focus (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
+  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)
 {
@@ -1204,8 +1571,8 @@ gtk_window_activate_default (GtkWindow *window)
  * with other windows in the same application. To keep modal dialogs
  * on top of main application windows, use
  * gtk_window_set_transient_for() to make the dialog transient for the
- * parent; most window managers will then disallow lowering the dialog
- * below the parent.
+ * parent; most <link linkend="gtk-X11-arch">window managers</link>
+ * will then disallow lowering the dialog below the parent.
  * 
  * 
  **/
@@ -1215,13 +1582,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");
 }
@@ -1249,8 +1633,8 @@ gtk_window_get_modal (GtkWindow *window)
  * Returns a list of all existing toplevel windows. The widgets
  * in the list are not individually referenced. If you want
  * to iterate through the list and perform actions involving
- * callbacks that might destroy the widgets, you MUST call
- * g_list_foreach (result, (GFunc)g_object_ref, NULL) first, and
+ * callbacks that might destroy the widgets, you <emphasis>must</emphasis> call
+ * <literal>g_list_foreach (result, (GFunc)g_object_ref, NULL)</literal> first, and
  * then unref all the widgets afterwards.
  * 
  * Return value: list of toplevel widgets
@@ -1274,17 +1658,17 @@ gtk_window_add_embedded_xid (GtkWindow *window, guint xid)
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  embedded_windows = gtk_object_get_data (GTK_OBJECT (window), "gtk-embedded");
+  embedded_windows = g_object_get_data (G_OBJECT (window), "gtk-embedded");
   if (embedded_windows)
-    gtk_object_remove_no_notify_by_id (GTK_OBJECT (window), 
-                                      g_quark_from_static_string ("gtk-embedded"));
+    g_object_steal_qdata (G_OBJECT (window), 
+                         g_quark_from_static_string ("gtk-embedded"));
   embedded_windows = g_list_prepend (embedded_windows,
                                     GUINT_TO_POINTER (xid));
 
-  gtk_object_set_data_full (GTK_OBJECT (window), "gtk-embedded", 
-                           embedded_windows,
-                           embedded_windows ?
-                             (GtkDestroyNotify) g_list_free : NULL);
+  g_object_set_data_full (G_OBJECT (window), "gtk-embedded", 
+                         embedded_windows,
+                         embedded_windows ?
+                           (GDestroyNotify) g_list_free : NULL);
 }
 
 void
@@ -1295,10 +1679,10 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
 
   g_return_if_fail (GTK_IS_WINDOW (window));
   
-  embedded_windows = gtk_object_get_data (GTK_OBJECT (window), "gtk-embedded");
+  embedded_windows = g_object_get_data (G_OBJECT (window), "gtk-embedded");
   if (embedded_windows)
-    gtk_object_remove_no_notify_by_id (GTK_OBJECT (window), 
-                                      g_quark_from_static_string ("gtk-embedded"));
+    g_object_steal_qdata (G_OBJECT (window), 
+                         g_quark_from_static_string ("gtk-embedded"));
 
   node = g_list_find (embedded_windows, GUINT_TO_POINTER (xid));
   if (node)
@@ -1307,10 +1691,10 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
       g_list_free_1 (node);
     }
   
-  gtk_object_set_data_full (GTK_OBJECT (window), 
-                           "gtk-embedded", embedded_windows,
-                           embedded_windows ?
-                             (GtkDestroyNotify) g_list_free : NULL);
+  g_object_set_data_full (G_OBJECT (window), "gtk-embedded",
+                         embedded_windows,
+                         embedded_windows ?
+                           (GDestroyNotify) g_list_free : NULL);
 }
 
 void       
@@ -1326,11 +1710,7 @@ _gtk_window_reposition (GtkWindow *window,
 static void
 gtk_window_dispose (GObject *object)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (object));
-
-  window = GTK_WINDOW (object);
+  GtkWindow *window = GTK_WINDOW (object);
 
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
@@ -1349,10 +1729,10 @@ connect_parent_destroyed (GtkWindow *window)
 {
   if (window->transient_parent)
     {
-      gtk_signal_connect (GTK_OBJECT (window->transient_parent),
-                          "destroy",
-                          GTK_SIGNAL_FUNC (parent_destroyed_callback),
-                          window);
+      g_signal_connect (window->transient_parent,
+                        "destroy",
+                        G_CALLBACK (parent_destroyed_callback),
+                        window);
     }  
 }
 
@@ -1361,9 +1741,9 @@ disconnect_parent_destroyed (GtkWindow *window)
 {
   if (window->transient_parent)
     {
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                     GTK_SIGNAL_FUNC (parent_destroyed_callback),
-                                     window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           parent_destroyed_callback,
+                                           window);
     }
 }
 
@@ -1384,20 +1764,31 @@ gtk_window_transient_parent_unrealized (GtkWidget *parent,
                         gdk_atom_intern ("WM_TRANSIENT_FOR", FALSE));
 }
 
+static void
+gtk_window_transient_parent_screen_changed (GtkWindow  *parent,
+                                           GParamSpec  *pspec,
+                                           GtkWindow   *window)
+{
+  gtk_window_set_screen (window, parent->screen);
+}
+
 static void       
 gtk_window_unset_transient_for  (GtkWindow *window)
 {
   if (window->transient_parent)
     {
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                    GTK_SIGNAL_FUNC (gtk_window_transient_parent_realized),
-                                    window);
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                    GTK_SIGNAL_FUNC (gtk_window_transient_parent_unrealized),
-                                    window);
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                    GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                                    &window->transient_parent);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_window_transient_parent_realized,
+                                           window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_window_transient_parent_unrealized,
+                                           window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_window_transient_parent_screen_changed,
+                                           window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_widget_destroyed,
+                                           &window->transient_parent);
 
       if (window->destroy_with_parent)
         disconnect_parent_destroyed (window);
@@ -1412,11 +1803,16 @@ gtk_window_unset_transient_for  (GtkWindow *window)
  * @parent: parent window
  *
  * Dialog windows should be set transient for the main application
- * window they were spawned from. This allows window managers to
- * e.g. keep the dialog on top of the main window, or center the
- * dialog over the main window. gtk_dialog_new_with_buttons() and
- * other convenience functions in GTK+ will sometimes call
+ * window they were spawned from. This allows <link
+ * linkend="gtk-X11-arch">window managers</link> to e.g. keep the
+ * dialog on top of the main window, or center the dialog over the
+ * main window. gtk_dialog_new_with_buttons() and other convenience
+ * functions in GTK+ will sometimes call
  * gtk_window_set_transient_for() on your behalf.
+ *
+ * On Windows, this function will and put the child window
+ * on top of the parent, much as the window manager would have
+ * done on X.
  * 
  **/
 void       
@@ -1443,15 +1839,20 @@ gtk_window_set_transient_for  (GtkWindow *window,
 
   if (parent)
     {
-      gtk_signal_connect (GTK_OBJECT (parent), "destroy",
-                         GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                         &window->transient_parent);
-      gtk_signal_connect (GTK_OBJECT (parent), "realize",
-                         GTK_SIGNAL_FUNC (gtk_window_transient_parent_realized),
-                         window);
-      gtk_signal_connect (GTK_OBJECT (parent), "unrealize",
-                         GTK_SIGNAL_FUNC (gtk_window_transient_parent_unrealized),
-                         window);
+      g_signal_connect (parent, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed),
+                       &window->transient_parent);
+      g_signal_connect (parent, "realize",
+                       G_CALLBACK (gtk_window_transient_parent_realized),
+                       window);
+      g_signal_connect (parent, "unrealize",
+                       G_CALLBACK (gtk_window_transient_parent_unrealized),
+                       window);
+      g_signal_connect (parent, "notify::screen",
+                       G_CALLBACK (gtk_window_transient_parent_screen_changed),
+                       window);
+      
+      gtk_window_set_screen (window, parent->screen);
 
       if (window->destroy_with_parent)
         connect_parent_destroyed (window);
@@ -1522,49 +1923,160 @@ gtk_window_get_type_hint (GtkWindow *window)
 }
 
 /**
- * gtk_window_set_destroy_with_parent:
- * @window: a #GtkWindow
- * @setting: whether to destroy @window with its transient parent
+ * gtk_window_set_skip_taskbar_hint:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to keep this window from appearing in the task bar
  * 
- * If @setting is TRUE, then destroying the transient parent of @window
- * will also destroy @window itself. This is useful for dialogs that
- * shouldn't persist beyond the lifetime of the main window they're
- * associated with, for example.
+ * Windows may set a hint asking the desktop environment not to display
+ * the window in the task bar. This function toggles this hint.
+ * 
+ * Since: 2.2
  **/
 void
-gtk_window_set_destroy_with_parent  (GtkWindow *window,
-                                     gboolean   setting)
+gtk_window_set_skip_taskbar_hint (GtkWindow *window,
+                                  gboolean   setting)
 {
+  GtkWindowPrivate *priv;
+
   g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = gtk_window_get_private (window);
 
-  if (window->destroy_with_parent == (setting != FALSE))
-    return;
+  setting = setting != FALSE;
 
-  if (window->destroy_with_parent)
-    {
-      disconnect_parent_destroyed (window);
-    }
-  else
+  if (priv->skips_taskbar != setting)
     {
-      connect_parent_destroyed (window);
+      priv->skips_taskbar = setting;
+      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");
     }
-  
-  window->destroy_with_parent = setting;
-
-  g_object_notify (G_OBJECT (window), "destroy_with_parent");
 }
 
 /**
- * gtk_window_get_destroy_with_parent:
+ * gtk_window_get_skip_taskbar_hint:
  * @window: a #GtkWindow
  * 
- * Returns whether the window will be destroyed with its transient parent. See
- * gtk_window_set_destroy_with_parent ().
- *
- * Return value: %TRUE if the window will be destroyed with its transient parent.
+ * 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_destroy_with_parent (GtkWindow *window)
+gtk_window_get_skip_taskbar_hint (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = gtk_window_get_private (window);
+
+  return priv->skips_taskbar;
+}
+
+/**
+ * gtk_window_set_skip_pager_hint:
+ * @window: a #GtkWindow 
+ * @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.
+ * (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,
+                                gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = gtk_window_get_private (window);
+
+  setting = setting != FALSE;
+
+  if (priv->skips_pager != setting)
+    {
+      priv->skips_pager = setting;
+      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");
+    }
+}
+
+/**
+ * gtk_window_get_skip_pager_hint:
+ * @window: a #GtkWindow
+ * 
+ * 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)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = gtk_window_get_private (window);
+
+  return priv->skips_pager;
+}
+
+/**
+ * gtk_window_set_destroy_with_parent:
+ * @window: a #GtkWindow
+ * @setting: whether to destroy @window with its transient parent
+ * 
+ * If @setting is %TRUE, then destroying the transient parent of @window
+ * will also destroy @window itself. This is useful for dialogs that
+ * shouldn't persist beyond the lifetime of the main window they're
+ * associated with, for example.
+ **/
+void
+gtk_window_set_destroy_with_parent  (GtkWindow *window,
+                                     gboolean   setting)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  if (window->destroy_with_parent == (setting != FALSE))
+    return;
+
+  if (window->destroy_with_parent)
+    {
+      disconnect_parent_destroyed (window);
+    }
+  else
+    {
+      connect_parent_destroyed (window);
+    }
+  
+  window->destroy_with_parent = setting;
+
+  g_object_notify (G_OBJECT (window), "destroy_with_parent");
+}
+
+/**
+ * gtk_window_get_destroy_with_parent:
+ * @window: a #GtkWindow
+ * 
+ * Returns whether the window will be destroyed with its transient parent. See
+ * gtk_window_set_destroy_with_parent ().
+ *
+ * Return value: %TRUE if the window will be destroyed with its transient parent.
+ **/
+gboolean
+gtk_window_get_destroy_with_parent (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
@@ -1589,6 +2101,7 @@ gtk_window_get_geometry_info (GtkWindow *window,
       info->initial_x = 0;
       info->initial_y = 0;
       info->initial_pos_set = FALSE;
+      info->default_is_geometry = FALSE;
       info->position_constraints_changed = FALSE;
       info->last.configure_request.x = 0;
       info->last.configure_request.y = 0;
@@ -1623,20 +2136,21 @@ gtk_window_set_geometry_hints (GtkWindow       *window,
 {
   GtkWindowGeometryInfo *info;
 
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (geometry_widget == NULL || GTK_IS_WIDGET (geometry_widget));
 
   info = gtk_window_get_geometry_info (window, TRUE);
   
   if (info->widget)
-    gtk_signal_disconnect_by_func (GTK_OBJECT (info->widget),
-                                  GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                                  &info->widget);
+    g_signal_handlers_disconnect_by_func (info->widget,
+                                         gtk_widget_destroyed,
+                                         &info->widget);
   
   info->widget = geometry_widget;
   if (info->widget)
-    gtk_signal_connect (GTK_OBJECT (geometry_widget), "destroy",
-                       GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                       &info->widget);
+    g_signal_connect (geometry_widget, "destroy",
+                     G_CALLBACK (gtk_widget_destroyed),
+                     &info->widget);
 
   if (geometry)
     info->geometry = *geometry;
@@ -1658,10 +2172,16 @@ gtk_window_set_geometry_hints (GtkWindow       *window,
  * @setting: %TRUE to decorate the window
  *
  * By default, windows are decorated with a title bar, resize
- * controls, etc.  Some window managers allow GTK+ to disable these
- * decorations, creating a borderless window. If you set the decorated
- * property to %FALSE using this function, GTK+ will do its best to
- * convince the window manager not to decorate the window.
+ * controls, etc.  Some <link linkend="gtk-X11-arch">window
+ * managers</link> allow GTK+ to disable these decorations, creating a
+ * borderless window. If you set the decorated property to %FALSE
+ * using this function, GTK+ will do its best to convince the window
+ * manager not to decorate the window. 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.
  * 
  **/
 void
@@ -1705,16 +2225,606 @@ gtk_window_get_decorated (GtkWindow *window)
   return window->decorated;
 }
 
+static GtkWindowIconInfo*
+get_icon_info (GtkWindow *window)
+{
+  return g_object_get_data (G_OBJECT (window),
+                            "gtk-window-icon-info");
+}
+     
+static GtkWindowIconInfo*
+ensure_icon_info (GtkWindow *window)
+{
+  GtkWindowIconInfo *info;
+
+  info = get_icon_info (window);
+  
+  if (info == NULL)
+    {
+      info = g_new0 (GtkWindowIconInfo, 1);
+      g_object_set_data_full (G_OBJECT (window),
+                              "gtk-window-icon-info",
+                              info,
+                              g_free);
+    }
+
+  return info;
+}
+
+typedef struct {
+  guint serial;
+  GdkPixmap *pixmap;
+  GdkPixmap *mask;
+} ScreenIconInfo;
+
+ScreenIconInfo *
+get_screen_icon_info (GdkScreen *screen)
+{
+  ScreenIconInfo *info = g_object_get_data (G_OBJECT (screen), 
+                                           "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);
+    }
+
+  if (info->serial != default_icon_serial)
+    {
+      if (info->pixmap)
+       {
+         g_object_remove_weak_pointer (G_OBJECT (info->pixmap), (gpointer*)&info->pixmap);
+         info->pixmap = NULL;
+       }
+         
+      if (info->mask)
+       {
+         g_object_remove_weak_pointer (G_OBJECT (info->mask), (gpointer*)&info->mask);
+         info->mask = NULL;
+       }
+
+      info->serial = default_icon_serial;
+    }
+  
+  return info;
+}
+
+static void
+get_pixmap_and_mask (GdkWindow         *window,
+                    GtkWindowIconInfo  *parent_info,
+                     gboolean            is_default_list,
+                     GList              *icon_list,
+                     GdkPixmap         **pmap_return,
+                     GdkBitmap         **mask_return)
+{
+  GdkScreen *screen = gdk_drawable_get_screen (window);
+  ScreenIconInfo *default_icon_info = get_screen_icon_info (screen);
+  GdkPixbuf *best_icon;
+  GList *tmp_list;
+  int best_size;
+  
+  *pmap_return = NULL;
+  *mask_return = NULL;
+  
+  if (is_default_list &&
+      default_icon_info->pixmap != NULL)
+    {
+      /* Use shared icon pixmap for all windows on this screen.
+       */
+      if (default_icon_info->pixmap)
+        g_object_ref (default_icon_info->pixmap);
+      if (default_icon_info->mask)
+        g_object_ref (default_icon_info->mask);
+
+      *pmap_return = default_icon_info->pixmap;
+      *mask_return = default_icon_info->mask;
+    }
+  else if (parent_info && parent_info->icon_pixmap)
+    {
+      if (parent_info->icon_pixmap)
+        g_object_ref (parent_info->icon_pixmap);
+      if (parent_info->icon_mask)
+        g_object_ref (parent_info->icon_mask);
+      
+      *pmap_return = parent_info->icon_pixmap;
+      *mask_return = parent_info->icon_mask;
+    }
+  else
+    {
+#define IDEAL_SIZE 48
+  
+      best_size = G_MAXINT;
+      best_icon = NULL;
+      tmp_list = icon_list;
+      while (tmp_list != NULL)
+        {
+          GdkPixbuf *pixbuf = tmp_list->data;
+          int this;
+      
+          /* average width and height - if someone passes in a rectangular
+           * icon they deserve what they get.
+           */
+          this = gdk_pixbuf_get_width (pixbuf) + gdk_pixbuf_get_height (pixbuf);
+          this /= 2;
+      
+          if (best_icon == NULL)
+            {
+              best_icon = pixbuf;
+              best_size = this;
+            }
+          else
+            {
+              /* icon is better if it's 32 pixels or larger, and closer to
+               * the ideal size than the current best.
+               */
+              if (this >= 32 &&
+                  (ABS (best_size - IDEAL_SIZE) <
+                   ABS (this - IDEAL_SIZE)))
+                {
+                  best_icon = pixbuf;
+                  best_size = this;
+                }
+            }
+
+          tmp_list = tmp_list->next;
+        }
+
+      if (best_icon)
+        gdk_pixbuf_render_pixmap_and_mask_for_colormap (best_icon,
+                                                       gdk_screen_get_system_colormap (screen),
+                                                       pmap_return,
+                                                       mask_return,
+                                                       128);
+
+      /* Save pmap/mask for others to use if appropriate */
+      if (parent_info)
+        {
+          parent_info->icon_pixmap = *pmap_return;
+          parent_info->icon_mask = *mask_return;
+
+          if (parent_info->icon_pixmap)
+            g_object_ref (parent_info->icon_pixmap);
+          if (parent_info->icon_mask)
+            g_object_ref (parent_info->icon_mask);
+        }
+      else if (is_default_list)
+        {
+          default_icon_info->pixmap = *pmap_return;
+          default_icon_info->mask = *mask_return;
+
+          if (default_icon_info->pixmap)
+           g_object_add_weak_pointer (G_OBJECT (default_icon_info->pixmap),
+                                      (gpointer*)&default_icon_info->pixmap);
+          if (default_icon_info->mask) 
+           g_object_add_weak_pointer (G_OBJECT (default_icon_info->mask),
+                                      (gpointer*)&default_icon_info->mask);
+        }
+    }
+}
+
+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);
+
+  /* no point setting an icon on override-redirect */
+  if (window->type == GTK_WINDOW_POPUP)
+    return;
+
+  icon_list = NULL;
+  
+  info = ensure_icon_info (window);
+
+  if (info->realized)
+    return;
+
+  g_return_if_fail (info->icon_pixmap == NULL);
+  g_return_if_fail (info->icon_mask == NULL);
+  
+  info->using_default_icon = FALSE;
+  info->using_parent_icon = FALSE;
+  
+  icon_list = info->icon_list;
+  
+  /* Inherit from transient parent */
+  if (icon_list == NULL && window->transient_parent)
+    {
+      icon_list = ensure_icon_info (window->transient_parent)->icon_list;
+      if (icon_list)
+        info->using_parent_icon = TRUE;
+    }      
+
+  /* Inherit from default */
+  if (icon_list == NULL)
+    {
+      icon_list = default_icon_list;
+      if (icon_list)
+        info->using_default_icon = TRUE;
+    }
+  
+  gdk_window_set_icon_list (widget->window, icon_list);
+
+  get_pixmap_and_mask (widget->window,
+                      info->using_parent_icon ? ensure_icon_info (window->transient_parent) : NULL,
+                       info->using_default_icon,
+                       icon_list,
+                       &info->icon_pixmap,
+                       &info->icon_mask);
+  
+  /* This is a slight ICCCM violation since it's a color pixmap not
+   * a bitmap, but everyone does it.
+   */
+  gdk_window_set_icon (widget->window,
+                       NULL,
+                       info->icon_pixmap,
+                       info->icon_mask);
+
+  info->realized = TRUE;
+}
+
+static void
+gtk_window_unrealize_icon (GtkWindow *window)
+{
+  GtkWindowIconInfo *info;
+  GtkWidget *widget;
+
+  widget = GTK_WIDGET (window);
+  
+  info = get_icon_info (window);
+
+  if (info == NULL)
+    return;
+  
+  if (info->icon_pixmap)
+    g_object_unref (info->icon_pixmap);
+
+  if (info->icon_mask)
+    g_object_unref (info->icon_mask);
+
+  info->icon_pixmap = NULL;
+  info->icon_mask = NULL;
+
+  /* We don't clear the properties on the window, just figure the
+   * window is going away.
+   */
+
+  info->realized = FALSE;
+}
+
+/**
+ * gtk_window_set_icon_list:
+ * @window: a #GtkWindow
+ * @list: list of #GdkPixbuf
+ *
+ * Sets up the icon representing a #GtkWindow. The icon is used when
+ * the window is minimized (also known as iconified).  Some window
+ * managers or desktop environments may also place it in the window
+ * frame, or display it in other contexts.
+ *
+ * gtk_window_set_icon_list() allows you to pass in the same icon in
+ * several hand-drawn sizes. The list should contain the natural sizes
+ * your icon is available in; that is, don't scale the image before
+ * passing it to GTK+. Scaling is postponed until the last minute,
+ * when the desired final size is known, to allow best quality.
+ *
+ * By passing several sizes, you may improve the final image quality
+ * of the icon, by reducing or eliminating automatic image scaling.
+ *
+ * Recommended sizes to provide: 16x16, 32x32, 48x48 at minimum, and
+ * larger images (64x64, 128x128) if you have them.
+ *
+ * See also gtk_window_set_default_icon_list() to set the icon
+ * for all windows in your application in one go.
+ *
+ * Note that transient windows (those who have been set transient for another
+ * window using gtk_window_set_transient_for()) will inherit their
+ * icon from their transient parent. So there's no need to explicitly
+ * set the icon on transient windows.
+ **/
+void
+gtk_window_set_icon_list (GtkWindow  *window,
+                          GList      *list)
+{
+  GtkWindowIconInfo *info;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  info = ensure_icon_info (window);
+
+  if (info->icon_list == list) /* check for NULL mostly */
+    return;
+
+  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");
+  
+  gtk_window_unrealize_icon (window);
+  
+  if (GTK_WIDGET_REALIZED (window))
+    gtk_window_realize_icon (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
+   */
+}
+
+/**
+ * gtk_window_get_icon_list:
+ * @window: a #GtkWindow
+ * 
+ * Retrieves the list of icons set by gtk_window_set_icon_list().
+ * The list is copied, but the reference count on each
+ * member won't be incremented.
+ * 
+ * Return value: copy of window's icon list
+ **/
+GList*
+gtk_window_get_icon_list (GtkWindow  *window)
+{
+  GtkWindowIconInfo *info;
+  
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
+  info = get_icon_info (window);
+
+  if (info)
+    return g_list_copy (info->icon_list);
+  else
+    return NULL;  
+}
+
+/**
+ * gtk_window_set_icon:
+ * @window: a #GtkWindow
+ * @icon: icon image, or %NULL
+ * 
+ * Sets up the icon representing a #GtkWindow. This icon is used when
+ * the window is minimized (also known as iconified).  Some window
+ * managers or desktop environments may also place it in the window
+ * frame, or display it in other contexts.
+ *
+ * The icon should be provided in whatever size it was naturally
+ * drawn; that is, don't scale the image before passing it to
+ * GTK+. Scaling is postponed until the last minute, when the desired
+ * final size is known, to allow best quality.
+ *
+ * If you have your icon hand-drawn in multiple sizes, use
+ * gtk_window_set_icon_list(). Then the best size will be used.
+ *
+ * This function is equivalent to calling gtk_window_set_icon_list()
+ * with a 1-element list.
+ *
+ * See also gtk_window_set_default_icon_list() to set the icon
+ * for all windows in your application in one go.
+ **/
+void
+gtk_window_set_icon (GtkWindow  *window,
+                     GdkPixbuf  *icon)
+{
+  GList *list;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (icon == NULL || GDK_IS_PIXBUF (icon));
+
+  list = NULL;
+
+  if (icon)
+    list = g_list_append (list, icon);
+  
+  gtk_window_set_icon_list (window, list);
+  g_list_free (list);  
+}
+
+/**
+ * gtk_window_get_icon:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_icon() (or if you've
+ * called gtk_window_set_icon_list(), gets the first icon in
+ * the icon list).
+ * 
+ * Return value: icon for window
+ **/
+GdkPixbuf*
+gtk_window_get_icon (GtkWindow  *window)
+{
+  GtkWindowIconInfo *info;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
+  info = get_icon_info (window);
+  if (info && info->icon_list)
+    return GDK_PIXBUF (info->icon_list->data);
+  else
+    return NULL;
+}
+
+/* Load pixbuf, printing warning on failure if error == NULL
+ */
+static GdkPixbuf *
+load_pixbuf_verbosely (const char *filename,
+                      GError    **err)
+{
+  GError *local_err = NULL;
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gdk_pixbuf_new_from_file (filename, &local_err);
+
+  if (!pixbuf)
+    {
+      if (err)
+       *err = local_err;
+      else
+       {
+         g_warning ("Error loading icon from file '%s':\n\t%s",
+                    filename, local_err->message);
+         g_error_free (local_err);
+       }
+    }
+
+  return pixbuf;
+}
+
+/**
+ * gtk_window_set_icon_from_file:
+ * @window: a #GtkWindow
+ * @filename: location of icon file
+ * @err: location to store error, or %NULL.
+ *
+ * Sets the icon for @window.  
+ * Warns on failure if @err is %NULL.
+ *
+ * This function is equivalent to calling gtk_window_set_icon()
+ * 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,
+                              const gchar *filename,
+                              GError     **err)
+{
+  GdkPixbuf *pixbuf = load_pixbuf_verbosely (filename, err);
+
+  if (pixbuf)
+    {
+      gtk_window_set_icon (window, pixbuf);
+      g_object_unref (pixbuf);
+      
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/**
+ * gtk_window_set_default_icon_list:
+ * @list: a list of #GdkPixbuf
+ *
+ * Sets an icon list to be used as fallback for windows that haven't
+ * had gtk_window_set_icon_list() called on them to set up a
+ * window-specific icon list. This function allows you to set up the
+ * icon for all windows in your app at once.
+ *
+ * See gtk_window_set_icon_list() for more details.
+ * 
+ **/
+void
+gtk_window_set_default_icon_list (GList *list)
+{
+  GList *toplevels;
+  GList *tmp_list;
+  if (list == default_icon_list)
+    return;
+
+  /* Update serial so we don't used cached pixmaps/masks
+   */
+  default_icon_serial++;
+  
+  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 ();
+  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)
+        {
+          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
+ * @err: location to store error, or %NULL.
+ *
+ * Sets an icon to be used as fallback for windows that haven't
+ * had gtk_window_set_icon_list() called on them from a file
+ * 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,
+                                      GError     **err)
+{
+  GdkPixbuf *pixbuf = load_pixbuf_verbosely (filename, err);
+
+  if (pixbuf)
+    {
+      GList *list = g_list_prepend (NULL, pixbuf);
+      gtk_window_set_default_icon_list (list);
+      g_list_free (list);
+
+      g_object_unref (pixbuf);
+      
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/**
+ * gtk_window_get_default_icon_list:
+ * 
+ * Gets the value set by gtk_window_set_default_icon_list().
+ * The list is a copy and should be freed with g_list_free(),
+ * but the pixbufs in the list have not had their reference count
+ * incremented.
+ * 
+ * Return value: copy of default icon list 
+ **/
+GList*
+gtk_window_get_default_icon_list (void)
+{
+  return g_list_copy (default_icon_list);
+}
+
 static void
 gtk_window_set_default_size_internal (GtkWindow    *window,
                                       gboolean      change_width,
                                       gint          width,
                                       gboolean      change_height,
-                                      gint          height)
+                                      gint          height,
+                                     gboolean      is_geometry)
 {
   GtkWindowGeometryInfo *info;
 
-  g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (change_width == FALSE || width >= -1);
   g_return_if_fail (change_height == FALSE || height >= -1);
 
@@ -1722,6 +2832,8 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
 
   g_object_freeze_notify (G_OBJECT (window));
 
+  info->default_is_geometry = is_geometry != FALSE;
+
   if (change_width)
     {
       if (width == 0)
@@ -1776,11 +2888,6 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
  * For more control over a window's initial size and how resizing works,
  * investigate gtk_window_set_geometry_hints().
  *
- * A useful feature: if you set the "geometry widget" via
- * gtk_window_set_geometry_hints(), the default size specified by
- * gtk_window_set_default_size() will be the default size of that
- * widget, not of the entire window.
- *
  * For some uses, gtk_window_resize() is a more appropriate function.
  * gtk_window_resize() changes the current size of the window, rather
  * than the size to be used on initial display. gtk_window_resize() always
@@ -1802,7 +2909,7 @@ gtk_window_set_default_size (GtkWindow   *window,
   g_return_if_fail (width >= -1);
   g_return_if_fail (height >= -1);
 
-  gtk_window_set_default_size_internal (window, TRUE, width, TRUE, height);
+  gtk_window_set_default_size_internal (window, TRUE, width, TRUE, height, FALSE);
 }
 
 /**
@@ -1838,8 +2945,8 @@ gtk_window_get_default_size (GtkWindow *window,
 /**
  * gtk_window_resize:
  * @window: a #GtkWindow
- * @width: width to resize the window to
- * @height: height to resize the window to
+ * @width: width in pixels to resize the window to
+ * @height: height in pixels to resize the window to
  *
  * Resizes the window as if the user had done so, obeying geometry
  * constraints. The default geometry constraint is that windows may
@@ -1880,9 +2987,10 @@ gtk_window_resize (GtkWindow *window,
  * @height: return location for height, or %NULL
  *
  * Obtains the current size of @window. If @window is not onscreen,
- * returns the size GTK+ will suggest to the window manager for the
- * initial window size (but this is not reliably the same as the size
- * the window manager will actually select). The size obtained by
+ * it returns the size GTK+ will suggest to the <link
+ * linkend="gtk-X11-arch">window manager</link> for the initial window
+ * size (but this is not reliably the same as the size the window
+ * manager will actually select). The size obtained by
  * gtk_window_get_size() is the last size received in a
  * #GdkEventConfigure, that is, GTK+ uses its locally-stored size,
  * rather than querying the X server for the size. As a result, if you
@@ -1892,24 +3000,24 @@ gtk_window_resize (GtkWindow *window,
  * notification that the size has changed via a configure event, and
  * the size of the window gets updated.
  *
- * Note #1: Nearly any use of this function creates a race condition,
+ * Note 1: Nearly any use of this function creates a race condition,
  * because the size of the window may change between the time that you
  * get the size and the time that you perform some action assuming
  * that size is the current size. To avoid race conditions, connect to
  * "configure_event" on the window and adjust your size-dependent
  * state to match the size delivered in the #GdkEventConfigure.
  *
- * Note #2: The returned size does NOT include the size of the window
- * manager decorations (aka the window frame or border). Those
- * are not drawn by GTK+ and GTK+ has no reliable method of
- * determining their size.
+ * Note 2: The returned size does <emphasis>not</emphasis> include the
+ * size of the window manager decorations (aka the window frame or
+ * border). Those are not drawn by GTK+ and GTK+ has no reliable
+ * method of determining their size.
  *
- * Note #3: If you are getting a window size in order to position
+ * Note 3: If you are getting a window size in order to position
  * the window onscreen, there may be a better way. The preferred
  * way is to simply set the window's semantic type with
  * gtk_window_set_type_hint(), which allows the window manager to
  * e.g. center dialogs. Also, if you set the transient parent of
- * dialogs with gtk_widget_set_transient_for() window managers
+ * dialogs with gtk_window_set_transient_for() window managers
  * will often center the dialog over its parent window. It's
  * much preferred to let the window manager handle these
  * things rather than doing it yourself, because all apps will
@@ -1919,9 +3027,9 @@ gtk_window_resize (GtkWindow *window,
  * application cannot.
  *
  * In any case, if you insist on application-specified window
- * positioning, there's STILL a better way than doing it yourself -
- * gtk_window_set_position() will frequently handle the details
- * for you.
+ * positioning, there's <emphasis>still</emphasis> a better way than
+ * doing it yourself - gtk_window_set_position() will frequently
+ * handle the details for you.
  * 
  **/
 void
@@ -1968,11 +3076,11 @@ gtk_window_get_size (GtkWindow *window,
  * @x: X coordinate to move window to
  * @y: Y coordinate to move window to
  *
- * Asks the window manager to move @window to the given position.
- * Window managers are free to ignore this; most window managers
- * ignore requests for initial window positions (instead using a
- * user-defined placement algorithm) and honor requests after the
- * window has already been shown.
+ * Asks the <link linkend="gtk-X11-arch">window manager</link> to move
+ * @window to the given position.  Window managers are free to ignore
+ * this; most window managers ignore requests for initial window
+ * positions (instead using a user-defined placement algorithm) and
+ * honor requests after the window has already been shown.
  *
  * Note: the position is the position of the gravity-determined
  * reference point for the window. The gravity determines two things:
@@ -1993,12 +3101,13 @@ gtk_window_get_size (GtkWindow *window,
  * the bottom-right corner of the window border will be placed at that
  * reference point. So, to place a window in the bottom right corner
  * you would first set gravity to south east, then write:
- * gtk_window_move (window, gdk_screen_width () - window_width,
- * gdk_screen_height () - window_height).
+ * <literal>gtk_window_move (window, gdk_screen_width () - window_width,
+ * gdk_screen_height () - window_height)</literal>.
  *
- * The extended window manager hints specification at
- * http://www.freedesktop.org/standards/wm-spec.html has a nice table
- * of gravities in the "implementation notes" section.
+ * 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 
+ * nice table of gravities in the "implementation notes" section.
  *
  * The gtk_window_get_position() documentation may also be relevant.
  * 
@@ -2079,9 +3188,9 @@ gtk_window_move (GtkWindow *window,
  * 
  * If you haven't changed the window gravity, its gravity will be
  * #GDK_GRAVITY_NORTH_WEST. This means that gtk_window_get_position()
- * returns the position of the top-left corner of the window
- * manager frame for the window. gtk_window_move() sets the
- * position of this same top-left corner.
+ * gets the position of the top-left corner of the window manager
+ * frame for the window. gtk_window_move() sets the position of this
+ * same top-left corner.
  *
  * gtk_window_get_position() is not 100% reliable because the X Window System
  * does not specify a way to obtain the geometry of the
@@ -2089,10 +3198,11 @@ gtk_window_move (GtkWindow *window,
  * Thus GTK+ is using a "best guess" that works with most
  * window managers.
  *
- * Moreover, nearly all window managers are broken with respect to
- * their handling of window gravity. So moving a window to its current
- * position as returned by gtk_window_get_position() tends to
- * result in moving the window slightly.
+ * Moreover, nearly all window managers are historically broken with
+ * respect to their handling of window gravity. So moving a window to
+ * its current position as returned by gtk_window_get_position() tends
+ * to result in moving the window slightly. Window managers are
+ * slowly getting better over time.
  *
  * If a window has gravity #GDK_GRAVITY_STATIC the window manager
  * frame is not relevant, and thus gtk_window_get_position() will
@@ -2155,7 +3265,10 @@ gtk_window_get_position (GtkWindow *window,
       
       if (GTK_WIDGET_MAPPED (widget))
         {
-          gdk_window_get_frame_extents (widget->window, &frame_extents);
+         if (window->frame)
+           gdk_window_get_frame_extents (window->frame, &frame_extents);
+         else
+           gdk_window_get_frame_extents (widget->window, &frame_extents);
           x = frame_extents.x;
           y = frame_extents.y;
           gtk_window_get_size (window, &w, &h);
@@ -2251,25 +3364,26 @@ gtk_window_reshow_with_initial_size (GtkWindow *window)
 static void
 gtk_window_destroy (GtkObject *object)
 {
-  GtkWindow *window;
+  GtkWindow *window = GTK_WINDOW (object);
   
-  g_return_if_fail (GTK_IS_WINDOW (object));
-
-  window = GTK_WINDOW (object);
-
   if (window->transient_parent)
     gtk_window_set_transient_for (window, NULL);
 
+  /* frees the icons */
+  gtk_window_set_icon_list (window, NULL);
+  
   if (window->has_user_ref_count)
     {
       window->has_user_ref_count = FALSE;
-      gtk_widget_unref (GTK_WIDGET (window));
+      g_object_unref (window);
     }
 
   if (window->group)
     gtk_window_group_remove_window (window->group, window);
 
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
+   gtk_window_free_key_hash (window);
+
+   GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static gboolean
@@ -2299,13 +3413,16 @@ gtk_window_mnemonic_hash_remove (gpointer       key,
 }
 
 static void
-gtk_window_finalize (GObject *object)
+gtk_window_private_finalize (GtkWindowPrivate  *priv)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (object));
+  
+  g_free (priv);
+}
 
-  window = GTK_WINDOW (object);
+static void
+gtk_window_finalize (GObject *object)
+{
+  GtkWindow *window = GTK_WINDOW (object);
 
   toplevel_list = g_slist_remove (toplevel_list, window);
 
@@ -2320,12 +3437,18 @@ gtk_window_finalize (GObject *object)
   if (window->geometry_info)
     {
       if (window->geometry_info->widget)
-       gtk_signal_disconnect_by_func (GTK_OBJECT (window->geometry_info->widget),
-                                      GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                                      &window->geometry_info->widget);
+       g_signal_handlers_disconnect_by_func (window->geometry_info->widget,
+                                             gtk_widget_destroyed,
+                                             &window->geometry_info->widget);
       g_free (window->geometry_info);
     }
-  
+
+  if (window->keys_changed_handler)
+    {
+      gtk_idle_remove (window->keys_changed_handler);
+      window->keys_changed_handler = 0;
+    }
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -2335,12 +3458,12 @@ gtk_window_show (GtkWidget *widget)
   GtkWindow *window = GTK_WINDOW (widget);
   GtkContainer *container = GTK_CONTAINER (window);
   gboolean need_resize;
-  
+
   GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
   
   need_resize = container->need_resize || !GTK_WIDGET_REALIZED (widget);
   container->need_resize = FALSE;
-  
+
   if (need_resize)
     {
       GtkWindowGeometryInfo *info = gtk_window_get_geometry_info (window, TRUE);
@@ -2401,6 +3524,15 @@ gtk_window_show (GtkWidget *widget)
 
   gtk_widget_map (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)
     gtk_grab_add (widget);
 }
@@ -2408,11 +3540,7 @@ gtk_window_show (GtkWidget *widget)
 static void
 gtk_window_hide (GtkWidget *widget)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-
-  window = GTK_WINDOW (widget);
+  GtkWindow *window = GTK_WINDOW (widget);
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
   gtk_widget_unmap (widget);
@@ -2424,15 +3552,14 @@ gtk_window_hide (GtkWidget *widget)
 static void
 gtk_window_map (GtkWidget *widget)
 {
-  GtkWindow *window;
+  GtkWindow *window = GTK_WINDOW (widget);
   GdkWindow *toplevel;
-  
-  g_return_if_fail (GTK_IS_WINDOW (widget));
+  GtkWindowPrivate *priv;
 
+  priv = gtk_window_get_private (window);
+  
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
-  window = GTK_WINDOW (widget);
-
   if (window->bin.child &&
       GTK_WIDGET_VISIBLE (window->bin.child) &&
       !GTK_WIDGET_MAPPED (window->bin.child))
@@ -2458,6 +3585,11 @@ gtk_window_map (GtkWidget *widget)
   else
     gdk_window_deiconify (toplevel);
 
+  if (priv->fullscreen_initially)
+    gdk_window_fullscreen (toplevel);
+  else
+    gdk_window_unfullscreen (toplevel);
+  
   /* No longer use the default settings */
   window->need_default_size = FALSE;
   window->need_default_position = FALSE;
@@ -2466,16 +3598,22 @@ gtk_window_map (GtkWidget *widget)
 
   if (window->frame)
     gdk_window_show (window->frame);
+
+  if (!disable_startup_notification &&
+      !sent_startup_notification)
+    {
+      sent_startup_notification = TRUE;
+      gdk_notify_startup_complete ();
+    }
 }
 
 static void
 gtk_window_unmap (GtkWidget *widget)
 {
-  GtkWindow *window;
+  GtkWindow *window = GTK_WINDOW (widget);
   GtkWindowGeometryInfo *info;    
+  GdkWindowState state;
 
-  window = GTK_WINDOW (widget);
-  
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
   if (window->frame)
     gdk_window_withdraw (window->frame);
@@ -2497,6 +3635,11 @@ gtk_window_unmap (GtkWidget *widget)
       info->initial_pos_set = FALSE;
       info->position_constraints_changed = FALSE;
     }
+
+  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;
 }
 
 static void
@@ -2507,8 +3650,6 @@ gtk_window_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
   
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-
   window = GTK_WINDOW (widget);
 
   /* ensure widget tree is properly size allocated */
@@ -2529,7 +3670,7 @@ gtk_window_realize (GtkWidget *widget)
        }
       gtk_widget_size_allocate (widget, &allocation);
       
-      gtk_container_queue_resize (GTK_CONTAINER (widget));
+      _gtk_container_queue_resize (GTK_CONTAINER (widget));
 
       g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
     }
@@ -2573,12 +3714,14 @@ gtk_window_realize (GtkWidget *widget)
       
       attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
       
-      window->frame = gdk_window_new (NULL, &attributes, attributes_mask);
+      window->frame = gdk_window_new (gtk_widget_get_root_window (widget),
+                                     &attributes, attributes_mask);
+                                                
       gdk_window_set_user_data (window->frame, widget);
       
       attributes.window_type = GDK_WINDOW_CHILD;
       attributes.x = window->frame_left;
-      attributes.y = window->frame_right;
+      attributes.y = window->frame_top;
     
       attributes_mask = GDK_WA_X | GDK_WA_Y;
 
@@ -2587,7 +3730,7 @@ gtk_window_realize (GtkWidget *widget)
   else
     {
       attributes_mask = 0;
-      parent_window = NULL;
+      parent_window = gtk_widget_get_root_window (widget);
     }
   
   attributes.width = widget->allocation.width;
@@ -2595,6 +3738,7 @@ gtk_window_realize (GtkWidget *widget)
   attributes.event_mask = gtk_widget_get_events (widget);
   attributes.event_mask |= (GDK_EXPOSURE_MASK |
                            GDK_KEY_PRESS_MASK |
+                           GDK_KEY_RELEASE_MASK |
                            GDK_ENTER_NOTIFY_MASK |
                            GDK_LEAVE_NOTIFY_MASK |
                            GDK_FOCUS_CHANGE_MASK |
@@ -2603,7 +3747,9 @@ gtk_window_realize (GtkWidget *widget)
   attributes_mask |= GDK_WA_VISUAL | GDK_WA_COLORMAP;
   attributes_mask |= (window->title ? GDK_WA_TITLE : 0);
   attributes_mask |= (window->wmclass_name ? GDK_WA_WMCLASS : 0);
+  
   widget->window = gdk_window_new (parent_window, &attributes, attributes_mask);
+    
   gdk_window_set_user_data (widget->window, window);
       
   widget->style = gtk_style_attach (widget->style, widget->window);
@@ -2627,11 +3773,19 @@ gtk_window_realize (GtkWidget *widget)
 
   gdk_window_set_type_hint (widget->window, window->type_hint);
 
-  /* transient_for must be set to allow the modal hint */
-  if (window->transient_parent && window->modal)
+  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 (window->modal)
     gdk_window_set_modal_hint (widget->window, TRUE);
   else
     gdk_window_set_modal_hint (widget->window, FALSE);
+
+  /* Icons */
+  gtk_window_realize_icon (window);
 }
 
 static void
@@ -2668,6 +3822,9 @@ gtk_window_unrealize (GtkWidget *widget)
       gdk_window_destroy (window->frame);
       window->frame = NULL;
     }
+
+  /* Icons */
+  gtk_window_unrealize_icon (window);
   
   (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
@@ -2679,9 +3836,6 @@ gtk_window_size_request (GtkWidget      *widget,
   GtkWindow *window;
   GtkBin *bin;
 
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-  g_return_if_fail (requisition != NULL);
-
   window = GTK_WINDOW (widget);
   bin = GTK_BIN (window);
   
@@ -2706,9 +3860,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
   GtkWindow *window;
   GtkAllocation child_allocation;
 
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-  g_return_if_fail (allocation != NULL);
-
   window = GTK_WINDOW (widget);
   widget->allocation = *allocation;
 
@@ -2738,10 +3889,6 @@ gtk_window_event (GtkWidget *widget, GdkEvent *event)
   GtkWindow *window;
   gboolean return_val;
 
-  
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
   window = GTK_WINDOW (widget);
 
   if (window->frame && (event->any.window == window->frame))
@@ -2750,9 +3897,9 @@ gtk_window_event (GtkWidget *widget, GdkEvent *event)
          (event->type != GDK_KEY_RELEASE) &&
          (event->type != GDK_FOCUS_CHANGE))
        {
-         gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "event");
+         g_signal_stop_emission_by_name (widget, "event");
          return_val = FALSE;
-         gtk_signal_emit (GTK_OBJECT (widget), window_signals[FRAME_EVENT], event, &return_val);
+         g_signal_emit (widget, window_signals[FRAME_EVENT], 0, event, &return_val);
          return TRUE;
        }
       else
@@ -2766,10 +3913,9 @@ gtk_window_event (GtkWidget *widget, GdkEvent *event)
 }
 
 static gboolean
-gtk_window_frame_event (GtkWidget *widget, GdkEvent *event)
+gtk_window_frame_event (GtkWindow *window, GdkEvent *event)
 {
   GdkEventConfigure *configure_event;
-  GtkWindow *window = GTK_WINDOW (widget);
   GdkRectangle rect;
 
   switch (event->type)
@@ -2788,7 +3934,7 @@ gtk_window_frame_event (GtkWidget *widget, GdkEvent *event)
       /* Pass on the (modified) configure event */
       configure_event->width -= window->frame_left + window->frame_right;
       configure_event->height -= window->frame_top + window->frame_bottom;
-      return gtk_window_configure_event (widget, configure_event);
+      return gtk_window_configure_event (GTK_WIDGET (window), configure_event);
       break;
     default:
       break;
@@ -2800,12 +3946,8 @@ static gint
 gtk_window_configure_event (GtkWidget         *widget,
                            GdkEventConfigure *event)
 {
-  GtkWindow *window;
-  
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  window = GTK_WINDOW (widget);
+  GtkWindow *window = GTK_WINDOW (widget);
+  gboolean expected_reply = window->configure_request_count > 0;
 
   /* window->configure_request_count incremented for each 
    * configure request, and decremented to a min of 0 for
@@ -2830,7 +3972,7 @@ gtk_window_configure_event (GtkWidget         *widget,
    *     notifies and can wait to resize when we get them
    */
   
-  if (window->configure_request_count > 0 ||
+  if (!expected_reply &&
       (widget->allocation.width == event->width &&
        widget->allocation.height == event->height))
     return TRUE;
@@ -2850,36 +3992,95 @@ gtk_window_configure_event (GtkWidget         *widget,
   widget->allocation.width = event->width;
   widget->allocation.height = event->height;
   
-  gtk_widget_queue_resize (widget);
+  _gtk_container_queue_resize (GTK_CONTAINER (widget));
   
   return TRUE;
 }
 
+/* the accel_key and accel_mods fields of the key have to be setup
+ * upon calling this function. it'll then return whether that key
+ * is at all used as accelerator, and if so will OR in the
+ * accel_flags member of the key.
+ */
+gboolean
+_gtk_window_query_nonaccels (GtkWindow      *window,
+                            guint           accel_key,
+                            GdkModifierType accel_mods)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  /* movement keys are considered locked accels */
+  if (!accel_mods)
+    {
+      static const guint bindings[] = {
+       GDK_space, GDK_KP_Space, GDK_Return, GDK_KP_Enter, GDK_Up, GDK_KP_Up, GDK_Down, GDK_KP_Down,
+       GDK_Left, GDK_KP_Left, GDK_Right, GDK_KP_Right, GDK_Tab, GDK_KP_Tab, GDK_ISO_Left_Tab,
+      };
+      guint i;
+      
+      for (i = 0; i < G_N_ELEMENTS (bindings); i++)
+       if (bindings[i] == accel_key)
+         return TRUE;
+    }
+
+  /* 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))
+       return TRUE;
+    }
+
+  return FALSE;
+}
+
 static gint
 gtk_window_key_press_event (GtkWidget   *widget,
                            GdkEventKey *event)
 {
   GtkWindow *window;
+  GtkWidget *focus;
   gboolean handled;
 
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   window = GTK_WINDOW (widget);
 
   handled = FALSE;
-  
-  if (window->focus_widget && window->focus_widget != widget &&
-      GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-    handled = gtk_widget_event (window->focus_widget, (GdkEvent*) event);
 
+  /* Check for mnemonics and accelerators
+   */
   if (!handled)
-    handled = gtk_window_mnemonic_activate (window,
-                                           event->keyval,
-                                           event->state);
+    handled = _gtk_window_activate_key (window, event);
 
   if (!handled)
-    handled = gtk_accel_groups_activate (G_OBJECT (window), event->keyval, event->state);
+    {
+      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);
+    }
 
   /* Chain up, invokes binding set */
   if (!handled && GTK_WIDGET_CLASS (parent_class)->key_press_event)
@@ -2888,6 +4089,27 @@ gtk_window_key_press_event (GtkWidget   *widget,
   return handled;
 }
 
+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);
+    }
+
+  if (!handled && GTK_WIDGET_CLASS (parent_class)->key_release_event)
+    handled = GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+
+  return handled;
+}
 
 static void
 gtk_window_real_activate_default (GtkWindow *window)
@@ -2911,38 +4133,10 @@ gtk_window_move_focus (GtkWindow       *window,
     gtk_window_set_focus (window, NULL);
 }
 
-static gint
-gtk_window_key_release_event (GtkWidget   *widget,
-                             GdkEventKey *event)
-{
-  GtkWindow *window;
-  gint handled;
-  
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  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);
-    }
-
-  if (!handled && GTK_WIDGET_CLASS (parent_class)->key_release_event)
-    handled = GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
-
-  return handled;
-}
-
 static gint
 gtk_window_enter_notify_event (GtkWidget        *widget,
                               GdkEventCrossing *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   return FALSE;
 }
 
@@ -2950,18 +4144,41 @@ static gint
 gtk_window_leave_notify_event (GtkWidget        *widget,
                               GdkEventCrossing *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   return FALSE;
 }
 
+static void
+do_focus_change (GtkWidget *widget,
+                gboolean   in)
+{
+  GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
+  
+  g_object_ref (widget);
+  
+  if (in)
+    GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
+  else
+    GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
+  
+  fevent->focus_change.type = GDK_FOCUS_CHANGE;
+  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_unref (widget);
+  gdk_event_free (fevent);
+}
+
 static gint
 gtk_window_focus_in_event (GtkWidget     *widget,
                           GdkEventFocus *event)
 {
   GtkWindow *window = GTK_WINDOW (widget);
-  GdkEventFocus fevent;
 
   /* It appears spurious focus in events can occur when
    *  the window is hidden. So we'll just check to see if
@@ -2970,20 +4187,10 @@ gtk_window_focus_in_event (GtkWidget     *widget,
    */
   if (GTK_WIDGET_VISIBLE (widget))
     {
-      window->has_focus = TRUE;
-      
-      if (window->focus_widget &&
-         window->focus_widget != widget &&
-         !GTK_WIDGET_HAS_FOCUS (window->focus_widget))
-       {
-         fevent.type = GDK_FOCUS_CHANGE;
-         fevent.window = window->focus_widget->window;
-         fevent.in = TRUE;
-
-         gtk_widget_event (window->focus_widget, (GdkEvent*) &fevent);
-       }
+      _gtk_window_set_has_toplevel_focus (window, TRUE);
+      _gtk_window_set_is_active (window, TRUE);
     }
-
+      
   return FALSE;
 }
 
@@ -2992,20 +4199,9 @@ gtk_window_focus_out_event (GtkWidget     *widget,
                            GdkEventFocus *event)
 {
   GtkWindow *window = GTK_WINDOW (widget);
-  GdkEventFocus fevent;
-
-  window->has_focus = FALSE;
-  
-  if (window->focus_widget &&
-      window->focus_widget != widget &&
-      GTK_WIDGET_HAS_FOCUS (window->focus_widget))
-    {
-      fevent.type = GDK_FOCUS_CHANGE;
-      fevent.window = window->focus_widget->window;
-      fevent.in = FALSE;
 
-      gtk_widget_event (window->focus_widget, (GdkEvent*) &fevent);
-    }
+  _gtk_window_set_has_toplevel_focus (window, FALSE);
+  _gtk_window_set_is_active (window, FALSE);
 
   return FALSE;
 }
@@ -3018,35 +4214,34 @@ gtk_window_read_rcfiles (GtkWidget *widget,
 {
   GList *embedded_windows;
 
-  embedded_windows = gtk_object_get_data (GTK_OBJECT (widget), "gtk-embedded");
+  embedded_windows = g_object_get_data (G_OBJECT (widget), "gtk-embedded");
   if (embedded_windows)
     {
-      GdkEventClient sev;
+      GdkEvent *send_event = gdk_event_new (GDK_CLIENT_EVENT);
       int i;
       
       for (i = 0; i < 5; i++)
-       sev.data.l[i] = 0;
-      sev.data_format = 32;
-      sev.message_type = atom_rcfiles;
+       send_event->client.data.l[i] = 0;
+      send_event->client.data_format = 32;
+      send_event->client.message_type = atom_rcfiles;
       
       while (embedded_windows)
        {
          guint xid = GPOINTER_TO_UINT (embedded_windows->data);
-         gdk_event_send_client_message ((GdkEvent *) &sev, xid);
+         gdk_event_send_client_message_for_display (gtk_widget_get_display (widget), send_event, xid);
          embedded_windows = embedded_windows->next;
        }
+
+      gdk_event_free (send_event);
     }
 
-  gtk_rc_reparse_all ();
+  gtk_rc_reparse_all_for_settings (gtk_widget_get_settings (widget), FALSE);
 }
 
 static gint
 gtk_window_client_event (GtkWidget     *widget,
                         GdkEventClient *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   if (!atom_rcfiles)
     atom_rcfiles = gdk_atom_intern ("_GTK_READ_RCFILES", FALSE);
 
@@ -3059,11 +4254,7 @@ gtk_window_client_event (GtkWidget       *widget,
 static void
 gtk_window_check_resize (GtkContainer *container)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (container));
-
-  window = GTK_WINDOW (container);
+  GtkWindow *window = GTK_WINDOW (container);
 
   if (GTK_WIDGET_VISIBLE (container))
     gtk_window_move_resize (window);
@@ -3122,10 +4313,19 @@ static void
 gtk_window_real_set_focus (GtkWindow *window,
                           GtkWidget *focus)
 {
-  GdkEventFocus event;
+  GtkWidget *old_focus = window->focus_widget;
   gboolean def_flags = 0;
 
-  g_return_if_fail (GTK_IS_WINDOW (window));
+  if (old_focus)
+    {
+      g_object_ref (old_focus);
+      g_object_freeze_notify (G_OBJECT (old_focus));
+    }
+  if (focus)
+    {
+      g_object_ref (focus);
+      g_object_freeze_notify (G_OBJECT (focus));
+    }
   
   if (window->default_widget)
     def_flags = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
@@ -3142,13 +4342,9 @@ gtk_window_real_set_focus (GtkWindow *window,
         }
 
       if (window->has_focus)
-       {
-         event.type = GDK_FOCUS_CHANGE;
-         event.window = window->focus_widget->window;
-         event.in = FALSE;
-         
-         gtk_widget_event (window->focus_widget, (GdkEvent*) &event);
-       }
+       do_focus_change (window->focus_widget, FALSE);
+
+      g_object_notify (G_OBJECT (window->focus_widget), "is_focus");
     }
   
   window->focus_widget = focus;
@@ -3166,18 +4362,60 @@ gtk_window_real_set_focus (GtkWindow *window,
        }
 
       if (window->has_focus)
-       {
-         event.type = GDK_FOCUS_CHANGE;
-         event.window = window->focus_widget->window;
-         event.in = TRUE;
-         
-         gtk_widget_event (window->focus_widget, (GdkEvent*) &event);
-       }
+       do_focus_change (window->focus_widget, TRUE);
+
+      g_object_notify (G_OBJECT (window->focus_widget), "is_focus");
     }
   
   if (window->default_widget &&
       (def_flags != GTK_WIDGET_FLAGS (window->default_widget)))
     gtk_widget_queue_draw (window->default_widget);
+
+  if (old_focus)
+    {
+      g_object_thaw_notify (G_OBJECT (old_focus));
+      g_object_unref (old_focus);
+    }
+  if (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;
+      
+  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);
 }
 
 /*********************************
@@ -3221,11 +4459,41 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
 
        if (info)
          {
-           if (info->default_width > 0)
-             *width = info->default_width;
-           
-           if (info->default_height > 0)
-             *height = info->default_height;
+          gint base_width = 0;
+          gint base_height = 0;
+          gint width_inc = 1;
+          gint height_inc = 1;
+          
+          if (info->default_is_geometry &&
+              (info->default_width > 0 || info->default_height > 0))
+            {
+              GdkGeometry geometry;
+              guint flags;
+              
+              gtk_window_compute_hints (window, &geometry, &flags);
+
+              if (flags & GDK_HINT_BASE_SIZE)
+                {
+                  base_width = geometry.base_width;
+                  base_height = geometry.base_height;
+                }
+              else if (flags & GDK_HINT_MIN_SIZE)
+                {
+                  base_width = geometry.min_width;
+                  base_height = geometry.min_height;
+                }
+              if (flags & GDK_HINT_RESIZE_INC)
+                {
+                  width_inc = geometry.width_inc;
+                  height_inc = geometry.height_inc;
+                }
+            }
+            
+          if (info->default_width > 0)
+            *width = info->default_width * width_inc + base_width;
+          
+          if (info->default_height > 0)
+            *height = info->default_height * height_inc + base_height;
          }
     }
   else
@@ -3246,6 +4514,104 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
     }
 }
 
+static GtkWindowPosition
+get_effective_position (GtkWindow *window)
+{
+  GtkWindowPosition pos = window->position;
+  if (pos == GTK_WIN_POS_CENTER_ON_PARENT &&
+      (window->transient_parent == NULL ||
+       !GTK_WIDGET_MAPPED (window->transient_parent)))
+    pos = GTK_WIN_POS_NONE;
+
+  return pos;
+}
+
+static int
+get_center_monitor_of_window (GtkWindow *window)
+{
+  /* We could try to sort out the relative positions of the monitors and
+   * stuff, or we could just be losers and assume you have a row
+   * or column of monitors.
+   */
+  return gdk_screen_get_n_monitors (gtk_window_check_screen (window)) / 2;
+}
+
+static int
+get_monitor_containing_pointer (GtkWindow *window)
+{
+  gint px, py;
+  gint monitor_num;
+  GdkScreen *window_screen;
+  GdkScreen *pointer_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 (pointer_screen, px, py);
+  else
+    monitor_num = -1;
+
+  return monitor_num;
+}
+
+static void
+center_window_on_monitor (GtkWindow *window,
+                          gint       w,
+                          gint       h,
+                          gint      *x,
+                          gint      *y)
+{
+  GdkRectangle monitor;
+  int monitor_num;
+
+  monitor_num = get_monitor_containing_pointer (window);
+  
+  if (monitor_num == -1)
+    monitor_num = get_center_monitor_of_window (window);
+
+  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;
+
+  /* Be sure we aren't off the monitor, ignoring _NET_WM_STRUT
+   * and WM decorations.
+   */
+  if (*x < monitor.x)
+    *x = monitor.x;
+  if (*y < monitor.y)
+    *y = monitor.y;
+}
+
+static void
+clamp_window_to_rectangle (gint               *x,
+                           gint               *y,
+                           gint                w,
+                           gint                h,
+                           const GdkRectangle *rect)
+{
+  gint outside_w, outside_h;
+  
+  outside_w = (*x + w) - (rect->x + rect->width);
+  if (outside_w > 0)
+    *x -= outside_w;
+
+  outside_h = (*y + h) - (rect->y + rect->height);
+  if (outside_h > 0)
+    *y -= outside_h; 
+
+  /* if larger than the screen, center on the screen. */
+  if (*x < rect->x)
+    *x += (rect->x - *x) / 2;
+  if (*y < rect->y)
+    *y += (rect->y - *y) / 2;
+}
+
+
 static void
 gtk_window_compute_configure_request (GtkWindow    *window,
                                       GdkRectangle *request,
@@ -3259,9 +4625,12 @@ 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);
@@ -3274,12 +4643,7 @@ gtk_window_compute_configure_request (GtkWindow    *window,
 
   parent_widget = (GtkWidget*) window->transient_parent;
   
-  pos = window->position;
-  if (pos == GTK_WIN_POS_CENTER_ON_PARENT &&
-      (parent_widget == NULL ||
-       !GTK_WIDGET_MAPPED (parent_widget)))
-    pos = GTK_WIN_POS_NONE;
-
+  pos = get_effective_position (window);
   info = gtk_window_get_geometry_info (window, TRUE);
 
   /* by default, don't change position requested */
@@ -3303,40 +4667,73 @@ gtk_window_compute_configure_request (GtkWindow    *window,
            */
         case GTK_WIN_POS_CENTER_ALWAYS:
         case GTK_WIN_POS_CENTER:
-          {
-            gint screen_width = gdk_screen_width ();
-            gint screen_height = gdk_screen_height ();
-            
-            x = (screen_width - w) / 2;
-            y = (screen_height - h) / 2;
-          }
+          center_window_on_monitor (window, w, h, &x, &y);
           break;
       
         case GTK_WIN_POS_CENTER_ON_PARENT:
           {
+            gint monitor_num;
+            GdkRectangle monitor;
             gint ox, oy;
             
             g_assert (GTK_WIDGET_MAPPED (parent_widget)); /* established earlier */
+
+            if (parent_widget->window != NULL)
+              monitor_num = gdk_screen_get_monitor_at_window (screen,
+                                                              parent_widget->window);
+            else
+              monitor_num = -1;
             
             gdk_window_get_origin (parent_widget->window,
                                    &ox, &oy);
             
             x = ox + (parent_widget->allocation.width - w) / 2;
             y = oy + (parent_widget->allocation.height - h) / 2;
+            
+            /* Clamp onto current monitor, ignoring _NET_WM_STRUT and
+             * WM decorations. If parent wasn't on a monitor, just
+             * give up.
+             */
+            if (monitor_num >= 0)
+              {
+                gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+                clamp_window_to_rectangle (&x, &y, w, h, &monitor);
+              }
           }
           break;
 
         case GTK_WIN_POS_MOUSE:
           {
-            gint screen_width = gdk_screen_width ();
-            gint screen_height = gdk_screen_height ();
-            int px, py;
+            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 (screen),
+                                     &pointer_screen,
+                                     &px, &py, NULL);
+
+            if (pointer_screen == screen)
+              monitor_num = gdk_screen_get_monitor_at_point (screen, px, py);
+            else
+              monitor_num = -1;
             
-            gdk_window_get_pointer (NULL, &px, &py, NULL);
             x = px - w / 2;
             y = py - h / 2;
             x = CLAMP (x, 0, screen_width - w);
             y = CLAMP (y, 0, screen_height - h);
+
+            /* Clamp onto current monitor, ignoring _NET_WM_STRUT and
+             * WM decorations. Don't try to figure out what's going
+             * on if the mouse wasn't inside a monitor.
+             */
+            if (monitor_num >= 0)
+              {
+                gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+                clamp_window_to_rectangle (&x, &y, w, h, &monitor);
+              }
           }
           break;
 
@@ -3377,11 +4774,8 @@ gtk_window_constrain_position (GtkWindow    *window,
   if (window->position == GTK_WIN_POS_CENTER_ALWAYS)
     {
       gint center_x, center_y;
-      gint screen_width = gdk_screen_width ();
-      gint screen_height = gdk_screen_height ();
-      
-      center_x = (screen_width - new_width) / 2;
-      center_y = (screen_height - new_height) / 2;
+
+      center_window_on_monitor (window, new_width, new_height, &center_x, &center_y);
       
       *x = center_x;
       *y = center_y;
@@ -3403,7 +4797,7 @@ gtk_window_move_resize (GtkWindow *window)
    * or gtk_window_move().
    *
    * If the configure request has changed, we send off a new one.  To
-   * ensure GTK invariants are maintained (resize queue does what it
+   * ensure GTK+ invariants are maintained (resize queue does what it
    * should), we go ahead and size_allocate the requested size in this
    * function.
    *
@@ -3454,34 +4848,9 @@ gtk_window_move_resize (GtkWindow *window)
       info->last.configure_request.y != new_request.y)
     configure_request_pos_changed = TRUE;
 
-  /* To change, we must be different from BOTH the last request, and
-   * also our current size as received from the most recent configure
-   * notify.
-   *
-   * If different from last request, it means some sizing
-   * parameters have changed; but one possible such sizing
-   * parameter could be the current size.
-   *
-   * We never want to re-request our current size, because that could
-   * lead to some strange infinite loops if a window manager did
-   * something insane but ICCCM-compliant such as add 2 to all
-   * requested sizes. (i.e. if the WM always assigned a size that
-   * was a function of the requested size, rather than a constraint
-   * applied to requested size - so that requesting current size
-   * did not result in getting that size back)
-   *
-   * So here we detect and prevent any attempt to set size
-   * to current size.
-   *
-   * (FIXME I think some race may be possible here, but
-   *  perhaps avoided by configure_request_count?)
-   */
   if ((info->last.configure_request.width != new_request.width ||
-       info->last.configure_request.height != new_request.height) &&
-      (widget->allocation.width != new_request.width ||
-       widget->allocation.height != new_request.height))
+       info->last.configure_request.height != new_request.height))
     configure_request_size_changed = TRUE;
-
   
   hints_changed = FALSE;
   
@@ -3556,42 +4925,46 @@ gtk_window_move_resize (GtkWindow *window)
     }
 
 #if 0
-  {
-    int notify_x, notify_y;
+  if (window->type == GTK_WINDOW_TOPLEVEL)
+    {
+      int notify_x, notify_y;
 
-    /* this is the position from the last configure notify */
-    gdk_window_get_position (widget->window, &notify_x, &notify_y);
+      /* this is the position from the last configure notify */
+      gdk_window_get_position (widget->window, &notify_x, &notify_y);
     
-    g_print ("--- %s ---\n"
-             "last : %d,%d\t%d x %d\n"
-             "this : %d,%d\t%d x %d\n"
-             "alloc: %d,%d\t%d x %d\n"
-             "req  :      \t%d x %d\n"
-             "size_changed: %d pos_changed: %d hints_changed: %d\n"
-             "configure_notify_received: %d\n"
-             "configure_request_count: %d\n"
-             "position_constraints_changed: %d\n",
-             window->title ? window->title : "(no title)",
-             info->last.configure_request.x,
-             info->last.configure_request.y,
-             info->last.configure_request.width,
-             info->last.configure_request.height,
-             new_request.x,
-             new_request.y,
-             new_request.width,
-             new_request.height,
-             notify_x, notify_y,
-             widget->allocation.width,
-             widget->allocation.height,
-             widget->requisition.width,
-             widget->requisition.height,
-             configure_request_pos_changed,
-             configure_request_size_changed,
-             hints_changed,
-             window->configure_notify_received,
-             window->configure_request_count,
-             info->position_constraints_changed);
-  }
+      g_message ("--- %s ---\n"
+                "last  : %d,%d\t%d x %d\n"
+                "this  : %d,%d\t%d x %d\n"
+                "alloc : %d,%d\t%d x %d\n"
+                "req   :      \t%d x %d\n"
+                "resize:      \t%d x %d\n" 
+                "size_changed: %d pos_changed: %d hints_changed: %d\n"
+                "configure_notify_received: %d\n"
+                "configure_request_count: %d\n"
+                "position_constraints_changed: %d\n",
+                window->title ? window->title : "(no title)",
+                info->last.configure_request.x,
+                info->last.configure_request.y,
+                info->last.configure_request.width,
+                info->last.configure_request.height,
+                new_request.x,
+                new_request.y,
+                new_request.width,
+                new_request.height,
+                notify_x, notify_y,
+                widget->allocation.width,
+                widget->allocation.height,
+                widget->requisition.width,
+                widget->requisition.height,
+                info->resize_width,
+                info->resize_height,
+                configure_request_pos_changed,
+                configure_request_size_changed,
+                hints_changed,
+                window->configure_notify_received,
+                window->configure_request_count,
+                info->position_constraints_changed);
+    }
 #endif
   
   saved_last_info = info->last;
@@ -3617,7 +4990,7 @@ gtk_window_move_resize (GtkWindow *window)
   if ((configure_request_pos_changed ||
        info->initial_pos_set ||
        (window->need_default_position &&
-        window->position != GTK_WIN_POS_NONE)) &&
+        get_effective_position (window) != GTK_WIN_POS_NONE)) &&
       (new_flags & GDK_HINT_POS) == 0)
     {
       new_flags |= GDK_HINT_POS;
@@ -3630,7 +5003,7 @@ gtk_window_move_resize (GtkWindow *window)
     gdk_window_set_geometry_hints (widget->window,
                                   &new_geometry,
                                   new_flags);
-
+  
   /* handle resizing/moving and widget tree allocation
    */
   if (window->configure_notify_received)
@@ -3653,7 +5026,6 @@ gtk_window_move_resize (GtkWindow *window)
       /* gtk_window_configure_event() filled in widget->allocation */
       allocation = widget->allocation;
       gtk_widget_size_allocate (widget, &allocation);
-      gtk_widget_queue_draw (widget);
 
       /* If the configure request changed, it means that
        * we either:
@@ -3693,25 +5065,27 @@ gtk_window_move_resize (GtkWindow *window)
           
          gtk_widget_queue_resize (widget); /* migth recurse for GTK_RESIZE_IMMEDIATE */
        }
+
+      return;                  /* Bail out, we didn't really process the move/resize */
     }
-  else if (configure_request_pos_changed ||
-           configure_request_size_changed ||
-           hints_changed)
+  else if ((configure_request_size_changed || hints_changed) &&
+          (widget->allocation.width != new_request.width ||
+           widget->allocation.height != new_request.height))
+
     {
       /* We are in one of the following situations:
        * A. configure_request_size_changed
        *    our requisition has changed and we need a different window size,
        *    so we request it from the window manager.
-       * B. !configure_request_size_changed
-       *    the window manager wouldn't assign us the size we requested, in this
-       *    case we don't try to request a new size with every resize.
-       * C. !configure_request_size_changed && hints_changed
+       * B. !configure_request_size_changed && hints_changed
        *    the window manager rejects our size, but we have just changed the
-       *    window manager hints, so there's a certain chance our request will
+       *    window manager hints, so there's a chance our request will
        *    be honoured this time, so we try again.
-       * D. configure_request_pos_changed
-       *    we need to move to a new position, in which case we can also request
-       *    a new size since any of A-C might also apply.
+       *
+       * However, if the new requisition is the same as the current allocation,
+       * we don't request it again, since we won't get a ConfigureNotify back from
+       * the window manager unless it decides to change our requisition. If
+       * we don't get the ConfigureNotify back, the resize queue will never be run.
        */
 
       /* Now send the configure request */
@@ -3724,13 +5098,13 @@ gtk_window_move_resize (GtkWindow *window)
                                       new_request.y - window->frame_top,
                                      new_request.width + window->frame_left + window->frame_right,
                                      new_request.height + window->frame_top + window->frame_bottom);
-             gdk_window_resize (GTK_WIDGET (window)->window,
+             gdk_window_resize (widget->window,
                                  new_request.width, new_request.height);
            }
          else
            gdk_window_move_resize (widget->window,
-                                    new_request.x, new_request.y,
-                                    new_request.width, new_request.height);
+                                   new_request.x, new_request.y,
+                                   new_request.width, new_request.height);
        }
       else  /* only size changed */
        {
@@ -3739,20 +5113,12 @@ gtk_window_move_resize (GtkWindow *window)
                               new_request.width + window->frame_left + window->frame_right,
                               new_request.height + window->frame_top + window->frame_bottom);
          gdk_window_resize (widget->window,
-                             new_request.width, new_request.height);
+                            new_request.width, new_request.height);
        }
       
       /* Increment the number of have-not-yet-received-notify requests */
       window->configure_request_count += 1;
 
-      /* We have now sent a request since the last position constraint
-       * change and definitely don't need a an initial size again (not
-       * resetting this here can lead to infinite loops for
-       * GTK_RESIZE_IMMEDIATE containers)
-       */
-      info->position_constraints_changed = FALSE;
-      window->need_default_position = FALSE;
-
       /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
        * configure event in response to our resizing request.
        * the configure event will cause a new resize with
@@ -3776,12 +5142,35 @@ gtk_window_move_resize (GtkWindow *window)
     }
   else
     {
-      /* Not requesting anything new from WM, just had a queue resize
-       * for some reason, so handle the resize queue
+      /* Handle any position changes.
+       */
+      if (configure_request_pos_changed)
+       {
+         if (window->frame)
+           {
+             gdk_window_move (window->frame,
+                              new_request.x - window->frame_left,
+                              new_request.y - window->frame_top);
+           }
+         else
+           gdk_window_move (widget->window,
+                            new_request.x, new_request.y);
+       }
+
+      /* And run the resize queue.
        */
-      if (container->resize_widgets)
-        gtk_container_resize_children (container);
+      gtk_container_resize_children (container);
     }
+  
+  /* We have now processed a move/resize since the last position
+   * constraint change, setting of the initial position, or resize.
+   * (Not resetting these flags here can lead to infinite loops for
+   * GTK_RESIZE_IMMEDIATE containers)
+   */
+  info->position_constraints_changed = FALSE;
+  info->initial_pos_set = FALSE;
+  info->resize_width = -1;
+  info->resize_height = -1;
 }
 
 /* Compare two sets of Geometry hints for equality.
@@ -3883,8 +5272,6 @@ gtk_window_compute_hints (GtkWindow   *window,
   GtkWindowGeometryInfo *geometry_info;
   GtkRequisition requisition;
 
-  g_return_if_fail (GTK_IS_WINDOW (window));
-
   widget = GTK_WIDGET (window);
   
   gtk_widget_get_child_requisition (widget, &requisition);
@@ -3902,8 +5289,24 @@ gtk_window_compute_hints (GtkWindow   *window,
   
   if (geometry_info && geometry_info->widget)
     {
-      extra_width = widget->requisition.width - geometry_info->widget->requisition.width;
-      extra_height = widget->requisition.height - geometry_info->widget->requisition.height;
+      GtkRequisition child_requisition;
+
+      /* FIXME: This really isn't right. It gets the min size wrong and forces
+       * callers to do horrible hacks like set a huge usize on the child requisition
+       * to get the base size right. We really want to find the answers to:
+       *
+       *  - If the geometry widget was infinitely big, how much extra space
+       *    would be needed for the stuff around it.
+       *
+       *  - If the geometry widget was infinitely small, how big would the
+       *    window still have to be.
+       *
+       * Finding these answers would be a bit of a mess here. (Bug #68668)
+       */
+      gtk_widget_get_child_requisition (geometry_info->widget, &child_requisition);
+      
+      extra_width = widget->requisition.width - child_requisition.width;
+      extra_height = widget->requisition.height - child_requisition.height;
     }
 
   /* We don't want to set GDK_HINT_POS in here, we just set it
@@ -3986,31 +5389,34 @@ static gint
 gtk_window_expose (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   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);
 
-  return TRUE;
+  return FALSE;
 }
 
 /**
  * gtk_window_set_has_frame:
  * @window: a #GtkWindow
  * @setting: a boolean
+ *
+ * (Note: this is a special-purpose function for the framebuffer port,
+ *  that causes GTK+ to draw its own window border. For most applications,
+ *  you want gtk_window_set_decorated() instead, which tells the window
+ *  manager whether to draw the window border.)
  * 
- * If this function is called on a window with setting of TRUE, before
+ * 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
- * widget->window, accessible in window->frame. Using the signal 
+ * @window->window, accessible in @window->frame. Using the signal 
  * frame_event you can recieve 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
  * want to do their own window decorations.
+ *
  **/
 void
 gtk_window_set_has_frame (GtkWindow *window, 
@@ -4026,11 +5432,11 @@ gtk_window_set_has_frame (GtkWindow *window,
  * gtk_window_get_has_frame:
  * @window: a #GtkWindow
  * 
- * Returns whether the window has a frame window exterior to
- * widget->window. See gtk_window_set_has_frame ().
+ * Accessor for whether the window has a frame window exterior to
+ * @window->window. Gets the value set by gtk_window_set_has_frame ().
  *
  * Return value: %TRUE if a frame has been added to the window
- *   via gtk_widow_has_frame
+ *   via gtk_window_set_has_frame().
  **/
 gboolean
 gtk_window_get_has_frame (GtkWindow *window)
@@ -4048,7 +5454,12 @@ gtk_window_get_has_frame (GtkWindow *window)
  * @right: The width of the right border
  * @bottom: The height of the bottom border
  *
- * For windows with frames (see #gtk_window_set_has_frame) this function
+ * (Note: this is a special-purpose function intended for the framebuffer
+ *  port; see gtk_window_set_has_frame(). It will have no effect on the
+ *  window border drawn by the window manager, which is the normal
+ *  case when using the X Window system.)
+ *
+ * For windows with frames (see gtk_window_set_has_frame()) this function
  * can be used to change the size of the frame border.
  **/
 void
@@ -4058,10 +5469,12 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
                                 gint       right,
                                 gint       bottom)
 {
-  GtkWidget *widget = GTK_WIDGET (window);
+  GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
+  widget = GTK_WIDGET (window);
+
   if (window->frame_left == left &&
       window->frame_top == top &&
       window->frame_right == right && 
@@ -4135,12 +5548,13 @@ gtk_window_present (GtkWindow *window)
  * gtk_window_iconify:
  * @window: a #GtkWindow
  *
- * Asks to iconify (i.e. minimize) the specified @window. Note that you
- * shouldn't assume the window is definitely iconified afterward,
- * because other entities (e.g. the user or window manager) could
- * deiconify it again, or there may not be a window manager in which
- * case iconification isn't possible, etc. But normally the window
- * will end up iconified. Just don't write code that crashes if not.
+ * Asks to iconify (i.e. minimize) the specified @window. Note that
+ * you shouldn't assume the window is definitely iconified afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could deiconify it
+ * again, or there may not be a window manager in which case
+ * iconification isn't possible, etc. But normally the window will end
+ * up iconified. 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 iconified before it ever appears
@@ -4177,9 +5591,9 @@ gtk_window_iconify (GtkWindow *window)
  *
  * Asks to deiconify (i.e. unminimize) the specified @window. Note
  * that you shouldn't assume the window is definitely deiconified
- * afterward, because other entities (e.g. the user or window manager)
- * could iconify it again before your code which assumes
- * deiconification gets to run.
+ * afterward, because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could iconify it
+ * again before your code which assumes deiconification gets to run.
  *
  * You can track iconification via the "window_state_event" signal
  * on #GtkWidget.
@@ -4211,10 +5625,11 @@ gtk_window_deiconify (GtkWindow *window)
  *
  * Asks to stick @window, which means that it will appear on all user
  * desktops. Note that you shouldn't assume the window is definitely
- * stuck afterward, because other entities (e.g. the user or window
- * manager) could unstick it again, and some window managers do not
- * support sticking windows. But normally the window will end up
- * stuck. Just don't write code that crashes if not.
+ * stuck afterward, because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could unstick it
+ * again, and some window managers do not support sticking
+ * windows. But normally the window will end up stuck. Just don't
+ * write code that crashes if not.
  *
  * It's permitted to call this function before showing a window.
  *
@@ -4250,9 +5665,9 @@ gtk_window_stick (GtkWindow *window)
  * Asks to unstick @window, which means that it will appear on only
  * one of the user's desktops. Note that you shouldn't assume the
  * window is definitely unstuck afterward, because other entities
- * (e.g. the user or window manager) could stick it again. But
- * normally the window will end up stuck. Just don't write code that
- * crashes if not.
+ * (e.g. the user or <link linkend="gtk-X11-arch">window
+ * manager</link>) could stick it again. But normally the window will
+ * end up stuck. Just don't write code that crashes if not.
  *
  * You can track stickiness via the "window_state_event" signal
  * on #GtkWidget.
@@ -4285,10 +5700,11 @@ gtk_window_unstick (GtkWindow *window)
  *
  * Asks to maximize @window, so that it becomes full-screen. Note that
  * you shouldn't assume the window is definitely maximized afterward,
- * because other entities (e.g. the user or window manager) could
- * unmaximize it again, and not all window managers support
- * maximization. But normally the window will end up maximized. Just
- * don't write code that crashes if not.
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could unmaximize it
+ * again, and not all window managers support maximization. But
+ * normally the window will end up maximized. 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 maximized when it appears onscreen
@@ -4325,10 +5741,10 @@ gtk_window_maximize (GtkWindow *window)
  *
  * Asks to unmaximize @window. Note that you shouldn't assume the
  * window is definitely unmaximized afterward, because other entities
- * (e.g. the user or window manager) could maximize it again, and not
- * all window managers honor requests to unmaximize. But normally the
- * window will end up unmaximized. Just don't write code that crashes
- * if not.
+ * (e.g. the user or <link linkend="gtk-X11-arch">window
+ * manager</link>) could maximize it again, and not all window
+ * managers honor requests to unmaximize. But normally the window will
+ * end up unmaximized. Just don't write code that crashes if not.
  *
  * You can track maximization via the "window_state_event" signal
  * on #GtkWidget.
@@ -4355,6 +5771,87 @@ gtk_window_unmaximize (GtkWindow *window)
     gdk_window_unmaximize (toplevel);
 }
 
+/**
+ * gtk_window_fullscreen:
+ * @window: a #GtkWindow
+ *
+ * Asks to place @window in the fullscreen state. Note that you
+ * shouldn't assume the window is definitely full screen afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could unfullscreen it
+ * again, and not all window managers honor requests to fullscreen
+ * windows. But normally the window will end up fullscreen. Just
+ * don't write code that crashes if not.
+ *
+ * You can track the fullscreen state via the "window_state_event" signal
+ * on #GtkWidget.
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_fullscreen (GtkWindow *window)
+{
+  GtkWidget *widget;
+  GdkWindow *toplevel;
+  GtkWindowPrivate *priv;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+  priv = gtk_window_get_private (window);
+  
+  priv->fullscreen_initially = TRUE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+  
+  if (toplevel != NULL)
+    gdk_window_fullscreen (toplevel);
+}
+
+/**
+ * gtk_window_unfullscreen:
+ * @window: a #GtkWindow
+ *
+ * Asks to toggle off the fullscreen state for @window. Note that you
+ * shouldn't assume the window is definitely not full screen
+ * afterward, because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could fullscreen it
+ * again, and not all window managers honor requests to unfullscreen
+ * windows. But normally the window will end up restored to its normal
+ * state. Just don't write code that crashes if not.
+ *
+ * You can track the fullscreen state via the "window_state_event" signal
+ * on #GtkWidget.
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_unfullscreen (GtkWindow *window)
+{
+  GtkWidget *widget;
+  GdkWindow *toplevel;
+  GtkWindowPrivate *priv;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+  priv = gtk_window_get_private (window);
+  
+  priv->fullscreen_initially = FALSE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+  
+  if (toplevel != NULL)
+    gdk_window_unfullscreen (toplevel);
+}
+
+
 /**
  * gtk_window_set_resizable:
  * @window: a #GtkWindow
@@ -4448,9 +5945,10 @@ gtk_window_get_gravity (GtkWindow *window)
  *
  * Starts resizing a window. This function is used if an application
  * has window resizing controls. When GDK can support it, the resize
- * will be done using the standard mechanism for the window manager or
- * windowing system. Otherwise, GDK will try to emulate window
- * resizing, potentially not all that well, depending on the windowing system.
+ * will be done using the standard mechanism for the <link
+ * linkend="gtk-X11-arch">window manager</link> or windowing
+ * system. Otherwise, GDK will try to emulate window resizing,
+ * potentially not all that well, depending on the windowing system.
  * 
  **/
 void
@@ -4488,6 +5986,14 @@ gtk_window_begin_resize_drag  (GtkWindow    *window,
  * @right: location to store the width of the frame at the returns, or %NULL
  * @bottom: location to store the height of the frame at the bottom, or %NULL
  *
+ * (Note: this is a special-purpose function intended for the
+ *  framebuffer port; see gtk_window_set_has_frame(). It will not
+ *  return the size of the window border drawn by the <link
+ *  linkend="gtk-X11-arch">window manager</link>, which is the normal
+ *  case when using a windowing system.  See
+ *  gdk_window_get_frame_extents() to get the standard window border
+ *  extents.)
+ * 
  * Retrieves the dimensions of the frame window for this toplevel.
  * See gtk_window_set_has_frame(), gtk_window_set_frame_dimensions().
  **/
@@ -4505,9 +6011,9 @@ gtk_window_get_frame_dimensions (GtkWindow *window,
   if (top)
     *top = window->frame_top;
   if (right)
-    *top = window->frame_right;
+    *right = window->frame_right;
   if (bottom)
-    *top = window->frame_bottom;
+    *bottom = window->frame_bottom;
 }
 
 /**
@@ -4518,11 +6024,12 @@ gtk_window_get_frame_dimensions (GtkWindow *window,
  * @root_y: Y position where the user clicked to initiate the drag
  * @timestamp: timestamp from the click event that initiated the drag
  *
- * Starts moving a window. This function is used if an application
- * has window movement grips. When GDK can support it, the window movement
- * will be done using the standard mechanism for the window manager or
- * windowing system. Otherwise, GDK will try to emulate window
- * movement, potentially not all that well, depending on the windowing system.
+ * Starts moving a window. This function is used if an application has
+ * window movement grips. When GDK can support it, the window movement
+ * will be done using the standard mechanism for the <link
+ * linkend="gtk-X11-arch">window manager</link> or windowing
+ * system. Otherwise, GDK will try to emulate window movement,
+ * potentially not all that well, depending on the windowing system.
  * 
  **/
 void
@@ -4551,16 +6058,93 @@ gtk_window_begin_move_drag  (GtkWindow *window,
                               timestamp);
 }
 
+/** 
+ * gtk_window_set_screen:
+ * @window: a #GtkWindow.
+ * @screen: a #GdkScreen.
+ *
+ * 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,
+                      GdkScreen *screen)
+{
+  GtkWidget *widget;
+  GdkScreen *previous_screen;
+  gboolean was_mapped;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  if (screen == window->screen)
+    return;
+
+  widget = GTK_WIDGET (window);
+
+  previous_screen = window->screen;
+  was_mapped = GTK_WIDGET_MAPPED (widget);
+
+  if (was_mapped)
+    gtk_widget_unmap (widget);
+  if (GTK_WIDGET_REALIZED (widget))
+    gtk_widget_unrealize (widget);
+      
+  gtk_window_free_key_hash (window);
+  window->screen = screen;
+  gtk_widget_reset_rc_styles (widget);
+  if (screen != previous_screen)
+    _gtk_widget_propagate_screen_changed (widget, previous_screen);
+  g_object_notify (G_OBJECT (window), "screen");
+
+  if (was_mapped)
+    gtk_widget_map (widget);
+}
+
+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.
+ *
+ * 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);
+   
+   return window->screen;
+}
+
 
 static void
 gtk_window_group_class_init (GtkWindowGroupClass *klass)
 {
 }
 
-GtkType
+GType
 gtk_window_group_get_type (void)
 {
-  static GtkType window_group_type = 0;
+  static GType window_group_type = 0;
 
   if (!window_group_type)
     {
@@ -4586,11 +6170,10 @@ gtk_window_group_get_type (void)
 /**
  * gtk_window_group_new:
  * 
- * Create a new #GtkWindowGroup object. Grabs added with
- * gtk_window_grab_add() only affect windows within the
- * same #GtkWindowGroup
+ * Creates a new #GtkWindowGroup object. Grabs added with
+ * gtk_grab_add() only affect windows within the same #GtkWindowGroup.
  * 
- * Return value: 
+ * Return value: a new #GtkWindowGroup. 
  **/
 GtkWindowGroup *
 gtk_window_group_new (void)
@@ -4622,11 +6205,11 @@ window_group_cleanup_grabs (GtkWindowGroup *group,
 }
 
 /**
- * gtk_window_group_add_widget:
+ * gtk_window_group_add_window:
  * @window_group: a #GtkWindowGroup
  * @window: the #GtkWindow to add
  * 
- * Add a window to a #GtkWindowGroup. 
+ * Adds a window to a #GtkWindowGroup. 
  **/
 void
 gtk_window_group_add_window (GtkWindowGroup *window_group,
@@ -4671,7 +6254,7 @@ gtk_window_group_remove_window (GtkWindowGroup *window_group,
   window_group_cleanup_grabs (window_group, window);
   window->group = NULL;
   
-  g_object_unref (G_OBJECT (window_group));
+  g_object_unref (window_group);
   g_object_unref (window);
 }
 
@@ -4907,9 +6490,12 @@ gtk_window_parse_geometry (GtkWindow   *window,
   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);
 
@@ -4923,7 +6509,7 @@ gtk_window_parse_geometry (GtkWindow   *window,
   size_set = FALSE;
   if ((result & WidthValue) || (result & HeightValue))
     {
-      gtk_window_set_default_size (window, w, h);
+      gtk_window_set_default_size_internal (window, TRUE, w, TRUE, h, TRUE);
       size_set = TRUE;
     }
 
@@ -4943,15 +6529,18 @@ gtk_window_parse_geometry (GtkWindow   *window,
 
   if ((result & YValue) == 0)
     y = 0;
-  
+
   if (grav == GDK_GRAVITY_SOUTH_WEST ||
       grav == GDK_GRAVITY_SOUTH_EAST)
-    y = gdk_screen_height () - h;
+    y = gdk_screen_get_height (screen) - h + y;
 
   if (grav == GDK_GRAVITY_SOUTH_EAST ||
       grav == GDK_GRAVITY_NORTH_EAST)
-    x = gdk_screen_width () - w;
+    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.
+   */
   if (y < 0)
     y = 0;
 
@@ -4981,3 +6570,290 @@ gtk_window_parse_geometry (GtkWindow   *window,
   
   return result != 0;
 }
+
+static void
+gtk_window_mnemonic_hash_foreach (gpointer key,
+                                 gpointer value,
+                                 gpointer data)
+{
+  struct {
+    GtkWindow *window;
+    GtkWindowKeysForeachFunc func;
+    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);
+}
+
+void
+_gtk_window_keys_foreach (GtkWindow                *window,
+                         GtkWindowKeysForeachFunc func,
+                         gpointer                 func_data)
+{
+  GSList *groups;
+
+  struct {
+    GtkWindow *window;
+    GtkWindowKeysForeachFunc func;
+    gpointer func_data;
+  } info;
+
+  info.window = window;
+  info.func = func;
+  info.func_data = func_data;
+
+  g_hash_table_foreach (mnemonic_hash_table,
+                       gtk_window_mnemonic_hash_foreach,
+                       &info);
+
+  groups = gtk_accel_groups_from_object (G_OBJECT (window));
+  while (groups)
+    {
+      GtkAccelGroup *group = groups->data;
+      gint i;
+
+      for (i = 0; i < group->n_accels; i++)
+       {
+         GtkAccelKey *key = &group->priv_accels[i].key;
+         
+         if (key->accel_key)
+           (*func) (window, key->accel_key, key->accel_mods, FALSE, func_data);
+       }
+      
+      groups = groups->next;
+    }
+}
+
+static void
+gtk_window_keys_changed (GtkWindow *window)
+{
+  gtk_window_free_key_hash (window);
+  gtk_window_get_key_hash (window);
+}
+
+typedef struct _GtkWindowKeyEntry GtkWindowKeyEntry;
+
+struct _GtkWindowKeyEntry
+{
+  guint keyval;
+  guint modifiers;
+  gboolean is_mnemonic;
+};
+
+static void
+add_to_key_hash (GtkWindow      *window,
+                guint           keyval,
+                GdkModifierType modifiers,
+                gboolean        is_mnemonic,
+                gpointer        data)
+{
+  GtkKeyHash *key_hash = data;
+
+  GtkWindowKeyEntry *entry = g_new (GtkWindowKeyEntry, 1);
+
+  entry->keyval = keyval;
+  entry->modifiers = modifiers;
+  entry->is_mnemonic = is_mnemonic;
+
+  /* GtkAccelGroup stores lowercased accelerators. To deal
+   * with this, if <Shift> was specified, uppercase.
+   */
+  if (modifiers & GDK_SHIFT_MASK)
+    {
+      if (keyval == GDK_Tab)
+       keyval = GDK_ISO_Left_Tab;
+      else
+       keyval = gdk_keyval_to_upper (keyval);
+    }
+  
+  _gtk_key_hash_add_entry (key_hash, keyval, entry->modifiers, entry);
+}
+
+static GtkKeyHash *
+gtk_window_get_key_hash (GtkWindow *window)
+{
+  GdkScreen *screen = gtk_window_check_screen (window);
+  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "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 (screen)),
+                               (GDestroyNotify)g_free);
+  _gtk_window_keys_foreach (window, add_to_key_hash, key_hash);
+  g_object_set_data (G_OBJECT (window), "gtk-window-key-hash", key_hash);
+
+  return key_hash;
+}
+
+static void
+gtk_window_free_key_hash (GtkWindow *window)
+{
+  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "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);
+    }
+}
+
+/**
+ * _gtk_window_activate_key:
+ * @window: a #GtkWindow
+ * @event: a #GdkEventKey
+ * 
+ * Activates mnemonics and accelerators for this #GtKWindow
+ * 
+ * Return value: %TRUE if a mnemonic or accelerator was found and activated.
+ **/
+gboolean
+_gtk_window_activate_key (GtkWindow   *window,
+                         GdkEventKey *event)
+{
+  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "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");
+    }
+  
+  if (key_hash)
+    {
+      GSList *entries = _gtk_key_hash_lookup (key_hash,
+                                             event->hardware_keycode,
+                                             event->state & gtk_accelerator_get_default_mod_mask (),
+                                             event->group);
+      GSList *tmp_list;
+
+      for (tmp_list = entries; tmp_list; tmp_list = tmp_list->next)
+       {
+         GtkWindowKeyEntry *entry = tmp_list->data;
+         if (entry->is_mnemonic)
+           {
+             found_entry = entry;
+             break;
+           }
+       }
+      
+      if (!found_entry && entries)
+       found_entry = entries->data;
+
+      g_slist_free (entries);
+    }
+
+  if (found_entry)
+    {
+      if (found_entry->is_mnemonic)
+       return gtk_window_mnemonic_activate (window, found_entry->keyval, found_entry->modifiers);
+      else
+       return gtk_accel_groups_activate (G_OBJECT (window), found_entry->keyval, found_entry->modifiers);
+    }
+  else
+    return FALSE;
+}
+
+static void
+window_update_has_focus (GtkWindow *window)
+{
+  GtkWidget *widget = GTK_WIDGET (window);
+  gboolean has_focus = window->has_toplevel_focus && window->is_active;
+  
+  if (has_focus != window->has_focus)
+    {
+      window->has_focus = has_focus;
+      
+      if (has_focus)
+       {
+         if (window->focus_widget &&
+             window->focus_widget != widget &&
+             !GTK_WIDGET_HAS_FOCUS (window->focus_widget))
+           do_focus_change (window->focus_widget, TRUE);       
+       }
+      else
+       {
+         if (window->focus_widget &&
+             window->focus_widget != widget &&
+             GTK_WIDGET_HAS_FOCUS (window->focus_widget))
+           do_focus_change (window->focus_widget, FALSE);
+       }
+    }
+}
+
+/**
+ * _gtk_window_set_is_active:
+ * @window: a #GtkWindow
+ * @is_active: %TRUE if the window is in the currently active toplevel
+ * 
+ * Internal function that sets whether the #GtkWindow is part
+ * of the currently active toplevel window (taking into account inter-process
+ * embedding.)
+ **/
+void
+_gtk_window_set_is_active (GtkWindow *window,
+                          gboolean   is_active)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  is_active = is_active != FALSE;
+
+  if (is_active != window->is_active)
+    {
+      window->is_active = is_active;
+      window_update_has_focus (window);
+
+      g_object_notify (G_OBJECT (window), "is_active");
+    }
+}
+
+/**
+ * _gtk_window_set_has_toplevel_focus:
+ * @window: a #GtkWindow
+ * @has_toplevel_focus: %TRUE if the in
+ * 
+ * Internal function that sets whether the keyboard focus for the
+ * toplevel window (taking into account inter-process embedding.)
+ **/
+void
+_gtk_window_set_has_toplevel_focus (GtkWindow *window,
+                                  gboolean   has_toplevel_focus)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  has_toplevel_focus = has_toplevel_focus != FALSE;
+
+  if (has_toplevel_focus != window->has_toplevel_focus)
+    {
+      window->has_toplevel_focus = has_toplevel_focus;
+      window_update_has_focus (window);
+
+      g_object_notify (G_OBJECT (window), "has_toplevel_focus");
+    }
+}
+
+/**
+ * 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.
+ *
+ * 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;
+}