Merge lp:~mterry/unity-greeter/grid-fixes-plus-refactor into lp:unity-greeter

[Michael Terry]

(This branch is lacking in history because I accidentally blew it away when I deleted my checkout. Thankfully I had the source files open in gedit and didn't lose the work, but I did lose the bzr history.)

This branch's primary purpose was to enable hiding the grid dots behind the login box and the menubar. But along the way, I refactored the background and menubar code out of UserList and fixed the logo to align with the grid better.

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'data/logo.png'
Binary files data/logo.png	2012-01-12 16:38:55 +0000 and data/logo.png	2012-01-15 10:29:23 +0000 differ
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-01-12 13:17:02 +0000
+++ src/Makefile.am	2012-01-15 10:29:23 +0000
@@ -7,7 +7,9 @@
 	fixes.vapi \
 	indicator.vapi \
 	animate-timer.vala \
+	background.vala \
 	dash-box.vala \
+	menubar.vala \
 	settings-daemon.vala \
 	unity-greeter.vala \
 	user-list.vala

=== added file 'src/background.vala'
--- src/background.vala	1970-01-01 00:00:00 +0000
+++ src/background.vala	2012-01-15 10:29:23 +0000
@@ -0,0 +1,357 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
+ *
+ * Copyright (C) 2011,2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Robert Ancell <[e-mail]>
+ *          Michael Terry <[e-mail]>
+ */
+
+class BackgroundLoader
+{
+    public string filename {get; private set;}
+    public Cairo.Surface logo {get; set;}
+
+    private int width;
+    private int height;
+    private bool draw_grid;
+    private unowned Thread<Cairo.Pattern?> thread;
+    private bool finished;
+    private uint ready_id;
+
+    public Cairo.Pattern? pattern = null;
+
+    public signal void loaded ();
+    
+    public BackgroundLoader (string filename, int width, int height, bool draw_grid)
+    {
+        this.filename = filename;
+        this.width = width;
+        this.height = height;
+        this.draw_grid = draw_grid;
+    }
+
+    public bool load ()
+    {
+        /* Already loaded */
+        if (finished)
+            return true;
+
+        /* Currently loading */
+        if (thread != null)
+            return false;
+
+        debug ("Making background %s at %dx%d", filename, width, height);
+        try
+        {
+            thread = Thread<Cairo.Pattern?>.create<Cairo.Pattern?> (render, true);
+        }
+        catch (ThreadError e)
+        {
+            finished = true;
+            return true;
+        }
+
+        return false;
+    }
+
+    ~Background ()
+    {
+        if (ready_id > 0)
+            Source.remove (ready_id);
+        ready_id = 0;
+    }
+
+    private bool ready_cb ()
+    {
+        debug ("Render of background %s at %dx%d complete", filename, width, height);
+
+        pattern = thread.join ();
+        thread = null;
+        finished = true;
+
+        loaded ();
+
+        return false;
+    }
+
+    private Cairo.Pattern? render ()
+    {    
+        Gdk.Color color;
+        Gdk.Pixbuf orig_image = null;
+        if (!Gdk.Color.parse (filename, out color))
+        {
+            try
+            {
+                orig_image = new Gdk.Pixbuf.from_file (filename);
+            }
+            catch (Error e)
+            {
+                debug ("Error loading background: %s", e.message);
+                ready_id = Gdk.threads_add_idle (ready_cb);
+                return null;
+            }
+        }
+
+        Gdk.Pixbuf? image = null;
+        if (orig_image != null)
+        {
+            var target_aspect = (double) width / height;
+            var aspect = (double) orig_image.width / orig_image.height;
+            double scale, offset_x = 0, offset_y = 0;
+            if (aspect > target_aspect)
+            {
+                /* Fit height and trim sides */
+                scale = (double) height / orig_image.height;
+                offset_x = (orig_image.width * scale - width) / 2;
+            }
+            else
+            {
+                /* Fit width and trim top and bottom */
+                scale = (double) width / orig_image.width;
+                offset_y = (orig_image.height * scale - height) / 2;
+            }
+
+            image = new Gdk.Pixbuf (orig_image.colorspace, orig_image.has_alpha, orig_image.bits_per_sample, width, height);
+            orig_image.scale (image, 0, 0, width, height, -offset_x, -offset_y, scale, scale, Gdk.InterpType.BILINEAR);
+        }
+
+        var grid_x_offset = get_grid_offset (width);
+        var grid_y_offset = get_grid_offset (height);
+
+        /* Create background */
+        var surface = new Cairo.ImageSurface (Cairo.Format.RGB24, width, height);
+        var bc = new Cairo.Context (surface);
+        if (image != null)
+            Gdk.cairo_set_source_pixbuf (bc, image, 0, 0);
+        else
+            Gdk.cairo_set_source_color (bc, color);
+        bc.paint ();
+
+        /* Draw logo */
+        if (logo != null)
+        {
+            bc.save ();
+            var y = (int) (height / grid_size - 2) * grid_size + grid_y_offset;
+            bc.translate (grid_x_offset, y);
+            bc.set_source_surface (logo, 0, 0);
+            bc.paint_with_alpha (0.5);
+            bc.restore ();
+        }
+
+        var pattern = new Cairo.Pattern.for_surface (surface);
+        pattern.set_extend (Cairo.Extend.REPEAT);
+
+        ready_id = Gdk.threads_add_idle (ready_cb);
+        
+        return pattern;
+    }
+}
+
+public class Background : Gtk.Box
+{
+    public enum DrawFlags
+    {
+        NONE,
+        GRID,
+    }
+
+    public string default_background {get; set; default = "#2C001E";}
+    public string? current_background {get; set; default = null;}
+    public bool draw_grid {get; set; default = true;}
+    public double alpha {get; private set; default = 1.0;}
+
+    public void set_logo (string logo_path)
+    {       
+        if (FileUtils.test (logo_path, FileTest.EXISTS))
+        {
+            logo_surface = new Cairo.ImageSurface.from_png (logo_path);
+        }
+        else
+        {
+            debug ("Can't use logo %s, it does not exist", logo_path);
+            logo_surface = null;
+        }
+    }
+
+    public override void size_allocate (Gtk.Allocation allocation)
+    {
+        var resized = allocation.height != get_allocated_height () || allocation.width != get_allocated_width ();
+
+        base.size_allocate (allocation);
+
+        /* Regenerate backgrounds */
+        if (resized)
+        {
+            debug ("Regenerating backgrounds");
+            loaders.remove_all ();
+            load_background (null);
+            reload ();
+        }
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        var flags = DrawFlags.NONE;
+        if (draw_grid)
+            flags |= DrawFlags.GRID;
+        draw_full (c, flags);
+        return base.draw (c);
+    }
+
+    public void draw_full (Cairo.Context c, DrawFlags flags)
+    {
+        c.save ();
+
+        /* Test whether we ran into an error loading this background */
+        if (current == null || (current.load () && current.pattern == null))
+        {
+            /* We couldn't load it, so swap it out for the default background
+               and remember that choice */
+            var new_background = load_background (null);
+            if (current != null)
+                loaders.insert (current.filename, new_background);
+            if (old == current)
+                old = new_background;
+            current = new_background;
+        }
+
+        /* Fade to this background when loaded */
+        if (current.load () && current != old && !timer.is_running)
+        {
+            alpha = 0.0;
+            timer.reset ();
+        }
+
+        c.set_source_rgba (0.0, 0.0, 0.0, 0.0);
+        var old_painted = false;
+
+        /* Draw old background */
+        if (old != null && old.load () && (alpha < 1.0 || !current.load ()))
+        {
+            c.set_source (old.pattern);
+            c.paint ();
+            old_painted = true;
+        }
+
+        /* Draw new background */
+        if (current.load () && alpha > 0.0)
+        {
+            c.set_source (current.pattern);
+            c.paint_with_alpha (old_painted ? alpha : 1.0);
+        }
+
+        c.restore ();
+
+        if ((flags & DrawFlags.GRID) != 0)
+            overlay_grid (c);
+    }
+
+    private AnimateTimer timer;
+
+    private BackgroundLoader current;
+    private BackgroundLoader old;
+
+    private HashTable<string, BackgroundLoader> loaders;
+
+    private Cairo.Surface? logo_surface = null;
+
+    construct
+    {
+        orientation = Gtk.Orientation.VERTICAL;
+
+        timer = new AnimateTimer (AnimateTimer.Speed.INSTANT);
+        timer.animate.connect (animate_cb);
+
+        loaders = new HashTable<string?, BackgroundLoader> (str_hash, str_equal);
+
+        notify["current-background"].connect (() => {reload ();});
+    }
+
+    private void animate_cb (double progress)
+    {
+        alpha = progress;
+
+        queue_draw ();
+
+        /* Stop when we get there */
+        if (alpha >= 1.0)
+            old = current;
+    }
+
+    private void reload ()
+    {
+        if (get_realized ())
+        {
+            var new_background = load_background (current_background);
+
+            if (current != new_background)
+            {
+                old = current;
+                current = new_background;
+            }
+
+            queue_draw ();
+        }
+    }
+
+    private BackgroundLoader load_background (string? filename)
+    {
+        if (filename == null)
+            filename = default_background;
+
+        var b = loaders.lookup (filename);
+        if (b == null)
+        {
+            b = new BackgroundLoader (filename, get_allocated_width (),
+                                      get_allocated_height (), draw_grid);
+            b.logo = logo_surface;
+            b.loaded.connect (() => {reload();});
+            b.load ();
+            loaders.insert (filename, b);
+        }
+
+        return b;
+    }
+
+    private void overlay_grid (Cairo.Context c)
+    {
+        var width = get_allocated_width ();
+        var height = get_allocated_height ();
+        var grid_x_offset = get_grid_offset (width);
+        var grid_y_offset = get_grid_offset (height);
+
+        /* Overlay grid */
+        var overlay_surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, grid_size, grid_size);
+        var oc = new Cairo.Context (overlay_surface);
+        oc.rectangle (0, 0, 1, 1);
+        oc.rectangle (grid_size - 1, 0, 1, 1);
+        oc.rectangle (0, grid_size - 1, 1, 1);
+        oc.rectangle (grid_size - 1, grid_size - 1, 1, 1);
+        oc.set_source_rgba (1.0, 1.0, 1.0, 0.25);
+        oc.fill ();
+        var overlay = new Cairo.Pattern.for_surface (overlay_surface);
+        var matrix = Cairo.Matrix.identity ();
+        matrix.translate (-grid_x_offset, -grid_y_offset);
+        overlay.set_matrix (matrix);
+        overlay.set_extend (Cairo.Extend.REPEAT);
+
+        /* Draw overlay */
+        c.save ();
+        c.set_source (overlay);
+        c.rectangle (0, 0, width, height);
+        c.fill ();
+        c.restore ();
+    }
+}

=== modified file 'src/dash-box.vala'
--- src/dash-box.vala	2012-01-12 12:03:25 +0000
+++ src/dash-box.vala	2012-01-15 10:29:23 +0000
@@ -19,6 +19,13 @@
 
 public class DashBox : Gtk.Box
 {
+    public Background? background {get; construct; default = null;}
+
+    public DashBox (Background bg)
+    {
+        Object (background: bg);
+    }
+
     construct
     {
         orientation = Gtk.Orientation.VERTICAL;
@@ -26,6 +33,16 @@
 
     public override bool draw (Cairo.Context c)
     {
+        if (background != null)
+        {
+            int x, y;
+            background.translate_coordinates (this, 0, 0, out x, out y);
+            c.save ();
+            c.translate (x, y);
+            background.draw_full (c, Background.DrawFlags.NONE);
+            c.restore ();
+        }
+
         c.save ();
 
         Gtk.Allocation allocation;

=== added file 'src/menubar.vala'
--- src/menubar.vala	1970-01-01 00:00:00 +0000
+++ src/menubar.vala	2012-01-15 10:29:23 +0000
@@ -0,0 +1,466 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
+ *
+ * Copyright (C) 2011,2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Robert Ancell <[e-mail]>
+ *          Michael Terry <[e-mail]>
+ */
+
+private class IndicatorMenuItem : Gtk.MenuItem
+{
+    public unowned Indicator.ObjectEntry entry;
+    private Gtk.HBox hbox;
+
+    public IndicatorMenuItem (Indicator.ObjectEntry entry)
+    {
+        this.entry = entry;
+        this.hbox = new Gtk.HBox (false, 3);
+        this.add (this.hbox);
+        this.hbox.show ();
+
+        if (entry.label != null)
+        {
+            entry.label.show.connect (this.visibility_changed_cb);
+            entry.label.hide.connect (this.visibility_changed_cb);
+            hbox.pack_start (entry.label, false, false, 0);
+        }
+        if (entry.image != null)
+        {
+            entry.image.show.connect (visibility_changed_cb);
+            entry.image.hide.connect (visibility_changed_cb);
+            hbox.pack_start (entry.image, false, false, 0);
+        }
+        if (entry.accessible_desc != null)
+            get_accessible ().set_name (entry.accessible_desc);
+        if (entry.menu != null)
+            submenu = entry.menu;
+
+        if (has_visible_child ())
+            show ();
+    }
+
+    public bool has_visible_child ()
+    {
+        return (entry.image != null && entry.image.get_visible ()) ||
+               (entry.label != null && entry.label.get_visible ());
+    }
+
+    public void visibility_changed_cb (Gtk.Widget widget)
+    {
+        visible = has_visible_child ();
+    }
+}
+
+public class MenuBar : Gtk.MenuBar
+{
+    public Background? background {get; construct; default = null;}
+    public bool high_contrast {get; private set; default = false;}
+
+    public MenuBar (Background bg)
+    {
+        Object (background: bg);
+    }
+
+    public void set_layout (LightDM.Layout? layout)
+    {
+        if (layout == null)
+            layout = LightDM.get_layout (); /* default layout */
+
+        var item = layout.get_data<Gtk.RadioMenuItem> ("unity-greeter-radio");
+        if (item != null)
+            item.active = true; /* will trigger callback to do rest of work */
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        if (background != null)
+        {
+            int x, y;
+            background.translate_coordinates (this, 0, 0, out x, out y);
+            c.save ();
+            c.translate (x, y);
+            background.draw_full (c, Background.DrawFlags.NONE);
+            c.restore ();
+        }
+
+        c.set_source_rgb (0, 0, 0);
+        c.paint_with_alpha (0.5);
+
+        foreach (var child in get_children ())
+        {
+            propagate_draw (child, c);
+        }
+
+        return false;
+    }
+
+    private string default_theme_name;
+    private List<Indicator.Object> indicator_objects;
+    private Gtk.CheckMenuItem high_contrast_item;
+    private Gtk.Label keyboard_label = null;
+    private Pid keyboard_pid = 0;
+    private Gtk.Window? keyboard_window = null;
+
+    construct
+    {
+        Gtk.Settings.get_default ().get ("gtk-theme-name", out default_theme_name);
+
+        pack_direction = Gtk.PackDirection.RTL;
+
+        var label = new Gtk.Label (Posix.utsname ().nodename);
+        label.show ();
+        var hostname_item = new Gtk.MenuItem ();
+        hostname_item.add (label);
+        hostname_item.sensitive = false;
+        hostname_item.right_justified = true;
+        hostname_item.show ();
+        append (hostname_item);
+
+        /* Hack to get a label showing on the menubar */
+        label.ensure_style ();
+        label.modify_fg (Gtk.StateType.INSENSITIVE, label.get_style ().fg[Gtk.StateType.NORMAL]);
+
+        setup_indicators ();
+    }
+
+    ~MenuBar ()
+    {
+        if (keyboard_pid != 0)
+        {
+            Posix.kill (keyboard_pid, Posix.SIGKILL);
+            int status;
+            Posix.waitpid (keyboard_pid, out status, 0);
+            keyboard_pid = 0;
+        }
+    }
+
+    private void greeter_set_env (string key, string val)
+    {
+        GLib.Environment.set_variable (key, val, true);
+
+        /* And also set it in the DBus activation environment so that any
+         * indicator services pick it up. */
+        try
+        {
+            var proxy = new GLib.DBusProxy.for_bus_sync (GLib.BusType.SESSION,
+                                                         GLib.DBusProxyFlags.NONE, null,
+                                                         "org.freedesktop.DBus",
+                                                         "/org/freedesktop/DBus",
+                                                         "org.freedesktop.DBus",
+                                                         null);
+
+            var builder = new GLib.VariantBuilder (GLib.VariantType.ARRAY);
+            builder.add ("{ss}", key, val);
+
+            proxy.call ("UpdateActivationEnvironment", new GLib.Variant ("(a{ss})", builder), GLib.DBusCallFlags.NONE, -1, null);
+        }
+        catch (Error e)
+        {
+            warning ("Could not get set environment for indicators: %s", e.message);
+            return;
+        }
+    }
+
+    private Gtk.Widget make_a11y_indicator ()
+    {
+        var a11y_item = new Gtk.MenuItem ();
+        var hbox = new Gtk.HBox (false, 3);
+        hbox.show ();
+        a11y_item.add (hbox);
+        var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "a11y.svg"));
+        image.show ();
+        hbox.add (image);
+        a11y_item.show ();
+        a11y_item.submenu = new Gtk.Menu ();
+        var item = new Gtk.CheckMenuItem.with_label (_("Onscreen keyboard"));
+        item.toggled.connect (keyboard_toggled_cb);
+        item.show ();
+        a11y_item.submenu.append (item);
+        high_contrast_item = new Gtk.CheckMenuItem.with_label (_("High Contrast"));
+        high_contrast_item.toggled.connect (high_contrast_toggled_cb);
+        high_contrast_item.show ();
+        a11y_item.submenu.append (high_contrast_item);
+        item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
+        item.toggled.connect (screen_reader_toggled_cb);
+        item.show ();
+        a11y_item.submenu.append (item);
+        return a11y_item;
+    }
+
+    private void layout_toggled_cb (Gtk.CheckMenuItem item)
+    {
+        if (!item.active)
+            return;
+
+        var layout = item.get_data<LightDM.Layout> ("unity-greeter-layout");
+        if (layout == null)
+            return;
+
+        keyboard_label.label = layout.short_description;
+        LightDM.set_layout (layout);
+    }
+
+    private static int cmp_layout (LightDM.Layout? a, LightDM.Layout? b)
+    {
+        if (a == null && b == null)
+            return 0;
+        else if (a == null)
+            return 1;
+        else if (b == null)
+            return -1;
+        else
+        {
+            /* Use a dumb, ascii comparison for now.  If it turns out that some
+               descriptions can be in unicode, we'll have to use libicu's collation
+               algorithms. */
+            return strcmp (a.description, b.description);
+        }
+    }
+
+    private Gtk.Widget make_keyboard_indicator ()
+    {
+        var keyboard_item = new Gtk.MenuItem ();
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
+        hbox.show ();
+        keyboard_item.add (hbox);
+        var image = new Gtk.Image.from_icon_name ("keyboard", Gtk.IconSize.LARGE_TOOLBAR);
+        image.show ();
+        hbox.add (image);
+        keyboard_label = new Gtk.Label ("");
+        keyboard_label.width_chars = 2;
+        keyboard_label.show ();
+        hbox.add (keyboard_label);
+        keyboard_item.show ();
+
+        var submenu = new Gtk.Menu ();
+        keyboard_item.set_submenu (submenu);
+
+        var layouts = LightDM.get_layouts ().copy ();
+        layouts.sort (cmp_layout);
+
+        Gtk.RadioMenuItem? last_item = null;
+        foreach (var layout in layouts)
+        {
+            var item = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), layout.description);
+            last_item = item;
+
+            item.show ();
+
+            /* LightDM does not change its layout list during its lifetime, so this is safe */
+            item.set_data ("unity-greeter-layout", layout);
+            layout.set_data ("unity-greeter-radio", item);
+
+            item.toggled.connect (layout_toggled_cb);
+
+            submenu.append (item);
+        }
+
+        return keyboard_item;
+    }
+
+    private void setup_indicators ()
+    {
+        /* Set indicators to run with reduced functionality */
+        greeter_set_env ("INDICATOR_GREETER_MODE", "1");
+
+        /* Don't allow virtual file systems? */
+        greeter_set_env ("GIO_USE_VFS", "local");
+        greeter_set_env ("GVFS_DISABLE_FUSE", "1");
+
+        /* Hint to have gnome-settings-daemon run in greeter mode */
+        greeter_set_env ("RUNNING_UNDER_GDM", "1");
+
+        var keyboard_item = make_keyboard_indicator ();
+        insert (keyboard_item, (int) get_children ().length () - 1);
+
+        var a11y_item = make_a11y_indicator ();
+        insert (a11y_item, (int) get_children ().length () - 1);
+
+        debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
+        string[] filenames = {"/usr/lib/indicators3/6/libsession.so",
+                              "/usr/lib/indicators3/6/libdatetime.so",
+                              "/usr/lib/indicators3/6/libpower.so",
+                              "/usr/lib/indicators3/6/libsoundmenu.so"};
+        foreach (var filename in filenames)
+        {
+            var io = new Indicator.Object.from_file (filename);
+            indicator_objects.append (io);
+            io.entry_added.connect (indicator_added_cb);
+            io.entry_removed.connect (indicator_removed_cb);
+            foreach (var entry in io.get_entries ())
+                indicator_added_cb (io, entry);
+        }
+        debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
+    }
+
+    private void keyboard_toggled_cb (Gtk.CheckMenuItem item)
+    {
+        /* FIXME: The below would be sufficient if gnome-session were running
+         * to notice and run a screen keyboard in /etc/xdg/autostart...  But
+         * since we're not running gnome-session, we hardcode onboard here. */
+        /* var settings = new Settings ("org.gnome.desktop.a11y.applications");*/
+        /*settings.set_boolean ("screen-keyboard-enabled", item.active);*/
+
+        if (keyboard_window == null)
+        {
+            int id;
+
+            try
+            {
+                string[] argv;
+                int onboard_stdout_fd;
+
+                Shell.parse_argv ("onboard --xid", out argv);
+                Process.spawn_async_with_pipes (null,
+                                                argv,
+                                                null,
+                                                SpawnFlags.SEARCH_PATH,
+                                                null,
+                                                out keyboard_pid,
+                                                null,
+                                                out onboard_stdout_fd,
+                                                null);
+                var f = FileStream.fdopen (onboard_stdout_fd, "r");
+                var stdout_text = new char[1024];
+                f.gets (stdout_text);
+                id = int.parse ((string) stdout_text);
+
+            }
+            catch (Error e)
+            {
+                warning ("Error setting up keyboard: %s", e.message);
+                return;
+            }
+
+            var keyboard_socket = new Gtk.Socket ();
+            keyboard_socket.show ();
+            keyboard_window = new Gtk.Window ();
+            keyboard_window.accept_focus = false;
+            keyboard_window.focus_on_map = false;
+            keyboard_window.add (keyboard_socket);
+            Gtk.socket_add_id (keyboard_socket, id);
+
+            /* Put keyboard at the bottom of the screen */
+            var screen = get_screen ();
+            var monitor = screen.get_monitor_at_window (get_window ());
+            Gdk.Rectangle geom;
+            screen.get_monitor_geometry (monitor, out geom);
+            keyboard_window.move (geom.x, geom.y + geom.height - 200);
+            keyboard_window.resize (geom.width, 200);
+        }
+
+        keyboard_window.visible = item.active;
+    }
+
+    private void high_contrast_toggled_cb (Gtk.CheckMenuItem item)
+    {
+        var settings = Gtk.Settings.get_default ();
+        if (item.active)
+            settings.set ("gtk-theme-name", "HighContrastInverse");
+        else
+            settings.set ("gtk-theme-name", default_theme_name);
+        high_contrast = item.active;
+    }
+
+    private void screen_reader_toggled_cb (Gtk.CheckMenuItem item)
+    {
+        /* FIXME: The below would be sufficient if gnome-session were running
+         * to notice and run a screen reader in /etc/xdg/autostart...  But
+         * since we're not running gnome-session, we hardcode orca here.
+        /*var settings = new Settings ("org.gnome.desktop.a11y.applications");*/
+        /*settings.set_boolean ("screen-reader-enabled", item.active);*/
+
+        /* Hardcoded orca: */
+        try
+        {
+            if (item.active)
+                Process.spawn_command_line_async ("orca --replace --no-setup --disable=splash-window --disable=main-window");
+            else
+                Process.spawn_command_line_async ("orca --quit");
+        }
+        catch (Error e)
+        {
+            warning ("Failed to run Orca: %s", e.message);
+        }
+    }
+
+    private uint get_indicator_index (Indicator.Object object)
+    {
+        uint index = 0;
+
+        foreach (var io in indicator_objects)
+        {
+            if (io == object)
+                return index;
+            index++;
+        }
+
+        return index;
+    }
+
+    private Indicator.Object? get_indicator_object_from_entry (Indicator.ObjectEntry entry)
+    {
+        foreach (var io in indicator_objects)
+        {
+            foreach (var e in io.get_entries ())
+            {
+                if (e == entry)
+                    return io;
+            }
+        }
+
+        return null;
+    }
+
+    private void indicator_added_cb (Indicator.Object object, Indicator.ObjectEntry entry)
+    {
+        var index = get_indicator_index (object);
+        var pos = 0;
+        foreach (var child in get_children ())
+        {
+            if (!(child is IndicatorMenuItem))
+                break;
+
+            var menuitem = (IndicatorMenuItem) child;
+            var child_object = get_indicator_object_from_entry (menuitem.entry);
+            var child_index = get_indicator_index (child_object);
+            if (child_index > index)
+                break;
+            pos++;
+        }
+
+        debug ("Adding indicator object %p at position %d", entry, pos);
+
+        var menuitem = new IndicatorMenuItem (entry);
+        insert (menuitem, pos);
+    }
+
+    private void indicator_removed_cb (Indicator.Object object, Indicator.ObjectEntry entry)
+    {
+        debug ("Removing indicator object %p", entry);
+
+        foreach (var child in get_children ())
+        {
+            var menuitem = (IndicatorMenuItem) child;
+            if (menuitem.entry == entry)
+            {
+                remove (child);
+                return;
+            }
+        }
+
+        warning ("Indicator object %p not in menubar", entry);
+    }
+}

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-01-12 13:17:02 +0000
+++ src/unity-greeter.vala	2012-01-15 10:29:23 +0000
@@ -120,11 +120,11 @@
         }
 
         user_list = new UserList ();
+        user_list.background.draw_grid = get_config_value ("greeter", "draw-grid", "true") == "true";
+        user_list.background.default_background = get_config_value ("greeter", "background", "#2C001E");
+        user_list.background.set_logo (get_config_value ("greeter", "logo", Path.build_filename (Config.PKGDATADIR, "logo.png", null)));
+        user_list.show ();
         main_window.add (user_list);
-        user_list.set_logo (get_config_value ("greeter", "logo", Path.build_filename (Config.PKGDATADIR, "logo.png", null)));
-        user_list.draw_grid = get_config_value ("greeter", "draw-grid", "true") == "true";
-        user_list.default_background = get_config_value ("greeter", "background", "#2C001E");
-        user_list.show ();
 
         foreach (var session in LightDM.get_sessions ())
         {
@@ -295,12 +295,20 @@
         user_list.show_prompt (text, type == LightDM.PromptType.SECRET);
     }
 
-    private void background_loaded_cb (Background background)
+    private void background_loaded_cb (ParamSpec pspec)
+    {
+        if (user_list.background.alpha == 1.0)
+        {
+            user_list.background.notify["alpha"].disconnect (background_loaded_cb);
+            start_session ();
+        }
+    }
+
+    private void start_session ()
     {
         /* Set the background */
         var c = new Cairo.Context (background_surface);
-        c.set_source (background.pattern);
-        c.paint ();
+        user_list.background.draw (c);
         c = null;
         refresh_background (Gdk.Screen.get_default ());
 
@@ -331,14 +339,12 @@
             if (prompted)
             {
                 user_list.login_complete ();
-                if (test_mode)
-                    user_list.login_complete ();
-                else
+                if (!test_mode)
                 {
-                    var background = user_list.get_background ();
-                    background.loaded.connect (background_loaded_cb);
-                    if (background.load ())
-                        background_loaded_cb (background);
+                    if (user_list.background.alpha == 1.0)
+                        start_session ();
+                    else
+                        user_list.background.notify["alpha"].connect (background_loaded_cb);
                 }
             }
             else

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-01-12 13:17:02 +0000
+++ src/user-list.vala	2012-01-15 10:29:23 +0000
@@ -1,6 +1,6 @@
 /* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
  *
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011,2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,11 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Robert Ancell <[e-mail]>
+ * Authors: Robert Ancell <[e-mail]>
+ *          Michael Terry <[e-mail]>
  */
 
-private Cairo.Surface? logo_surface = null;
-
 private int get_grid_offset (int size)
 {
     return (int) (size % grid_size) / 2;
@@ -42,222 +41,17 @@
     public LightDM.Layout keyboard_layout;
 }
 
-private class IndicatorMenuItem : Gtk.MenuItem
-{
-    public unowned Indicator.ObjectEntry entry;
-    private Gtk.HBox hbox;
-
-    public IndicatorMenuItem (Indicator.ObjectEntry entry)
-    {
-        this.entry = entry;
-        this.hbox = new Gtk.HBox (false, 3);
-        this.add (this.hbox);
-        this.hbox.show ();
-
-        if (entry.label != null)
-        {
-            entry.label.show.connect (this.visibility_changed_cb);
-            entry.label.hide.connect (this.visibility_changed_cb);
-            hbox.pack_start (entry.label, false, false, 0);
-        }
-        if (entry.image != null)
-        {
-            entry.image.show.connect (visibility_changed_cb);
-            entry.image.hide.connect (visibility_changed_cb);
-            hbox.pack_start (entry.image, false, false, 0);
-        }
-        if (entry.accessible_desc != null)
-            get_accessible ().set_name (entry.accessible_desc);
-        if (entry.menu != null)
-            submenu = entry.menu;
-
-        if (has_visible_child ())
-            show();
-    }
-
-    public bool has_visible_child ()
-    {
-        return (entry.image != null && entry.image.get_visible ()) ||
-               (entry.label != null && entry.label.get_visible ());
-    }
-
-    public void visibility_changed_cb (Gtk.Widget widget)
-    {
-        visible = has_visible_child ();
-    }
-}
-
 private class SessionMenuItem : Gtk.RadioMenuItem
 {
     public string session_name;
 }
 
-public class Background
-{
-    public string filename {get; private set;}
-    private int width;
-    private int height;
-    private bool draw_grid;
-    private unowned Thread<Cairo.Pattern?> thread;
-    private bool finished;
-
-    public Cairo.Pattern? pattern = null;
-
-    public signal void loaded ();
-    
-    public Background (string filename, int width, int height, bool draw_grid)
-    {
-        this.filename = filename;
-        this.width = width;
-        this.height = height;
-        this.draw_grid = draw_grid;
-    }
-
-    public bool load ()
-    {
-        /* Already loaded */
-        if (finished)
-            return true;
-
-        /* Currently loading */
-        if (thread != null)
-            return false;
-
-        debug ("Making background %s at %dx%d", filename, width, height);
-        try
-        {
-            thread = Thread<Cairo.Pattern?>.create<Cairo.Pattern?> (render, true);
-        }
-        catch (ThreadError e)
-        {
-            finished = true;
-            return true;
-        }
-
-        return false;
-    }
-    
-    private bool ready_cb ()
-    {
-        debug ("Render of background %s at %dx%d complete", filename, width, height);
-
-        pattern = thread.join ();
-        thread = null;
-        finished = true;
-
-        loaded ();
-
-        return false;
-    }
-
-    private Cairo.Pattern? render ()
-    {    
-        Gdk.Color color;
-        Gdk.Pixbuf orig_image = null;
-        if (!Gdk.Color.parse (filename, out color))
-        {
-            try
-            {
-                orig_image = new Gdk.Pixbuf.from_file (filename);
-            }
-            catch (Error e)
-            {
-                debug ("Error loading background: %s", e.message);
-                Gdk.threads_add_idle (ready_cb);
-                return null;
-            }
-        }
-
-        Gdk.Pixbuf? image = null;
-        if (orig_image != null)
-        {
-            var target_aspect = (double) width / height;
-            var aspect = (double) orig_image.width / orig_image.height;
-            double scale, offset_x = 0, offset_y = 0;
-            if (aspect > target_aspect)
-            {
-                /* Fit height and trim sides */
-                scale = (double) height / orig_image.height;
-                offset_x = (orig_image.width * scale - width) / 2;
-            }
-            else
-            {
-                /* Fit width and trim top and bottom */
-                scale = (double) width / orig_image.width;
-                offset_y = (orig_image.height * scale - height) / 2;
-            }
-
-            image = new Gdk.Pixbuf (orig_image.colorspace, orig_image.has_alpha, orig_image.bits_per_sample, width, height);
-            orig_image.scale (image, 0, 0, width, height, -offset_x, -offset_y, scale, scale, Gdk.InterpType.BILINEAR);
-        }
-
-        var grid_x_offset = get_grid_offset (width);
-        var grid_y_offset = get_grid_offset (height);
-
-        /* Overlay grid */
-        var overlay_surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, grid_size, grid_size);
-        var oc = new Cairo.Context (overlay_surface);
-        oc.rectangle (0, 0, 1, 1);
-        oc.rectangle (grid_size - 1, 0, 1, 1);
-        oc.rectangle (0, grid_size - 1, 1, 1);
-        oc.rectangle (grid_size - 1, grid_size - 1, 1, 1);
-        oc.set_source_rgba (1.0, 1.0, 1.0, 0.25);
-        oc.fill ();
-        var overlay = new Cairo.Pattern.for_surface (overlay_surface);
-        var matrix = Cairo.Matrix.identity ();
-        matrix.translate (-grid_x_offset, -grid_y_offset);
-        overlay.set_matrix (matrix);
-        overlay.set_extend (Cairo.Extend.REPEAT);
-
-        /* Create background */
-        var surface = new Cairo.ImageSurface (Cairo.Format.RGB24, width, height);
-        var bc = new Cairo.Context (surface);
-        if (image != null)
-            Gdk.cairo_set_source_pixbuf (bc, image, 0, 0);
-        else
-            Gdk.cairo_set_source_color (bc, color);
-        bc.paint ();
-
-        /* Draw overlay */
-        if (draw_grid) 
-        {
-            bc.set_source (overlay);
-            bc.rectangle (0, 0, width, height);
-            bc.fill ();
-        }
-
-        /* Draw logo */
-        if (logo_surface != null)
-        {
-            bc.save ();
-            var y = (int) (height / grid_size - 2) * grid_size + grid_y_offset;
-            bc.translate (grid_x_offset, y);
-            bc.set_source_surface (logo_surface, 0, 0);
-            bc.paint_with_alpha (0.5);
-            bc.restore ();
-        }
-
-        var pattern = new Cairo.Pattern.for_surface (surface);
-        pattern.set_extend (Cairo.Extend.REPEAT);
-
-        Gdk.threads_add_idle (ready_cb);
-        
-        return pattern;
-    }
-}
-
 public class UserList : Gtk.Container
 {
-    private string default_theme_name;
-
     private int frame_count = 0;
-    
-    private HashTable<string, Background> backgrounds;
-    private Background background;
-    private Background old_background;
+
+    public Background background;
     private uint change_background_timeout = 0;
-    public string default_background = "#2C001E";
-    public bool draw_grid = true;
 
     private List<UserEntry> entries = null;
     private UserEntry? selected_entry = null;
@@ -269,20 +63,9 @@
 
     private AnimateTimer scroll_timer;
 
-    private AnimateTimer background_timer;
-    private double background_alpha;
-
     private List<Gtk.Widget> children;
 
-    private Gtk.MenuBar menubar;
-    private Cairo.Context menubar_cairo_context;
-    public List<Indicator.Object> indicator_objects;
-    private Gtk.CheckMenuItem high_contrast_item;
-
-    private Gtk.Label keyboard_label = null;
-
-    private Pid keyboard_pid = 0;
-    private Gtk.Window? keyboard_window = null;
+    private MenuBar menubar;
 
     private string? error;
     private string? message;
@@ -356,30 +139,17 @@
     public UserList ()
     {
         can_focus = false;
-        background_alpha = 1.0;
-
-        Gtk.Settings.get_default ().get ("gtk-theme-name", out default_theme_name);
-
-        menubar = new Gtk.MenuBar ();
-        menubar.draw.connect_after (menubar_draw_cb);
-        menubar.pack_direction = Gtk.PackDirection.RTL;
+
+        background = new Background ();
+        background.show ();
+        add (background);
+
+        menubar = new MenuBar (background);
+        menubar.notify["high-contrast"].connect (() => {change_background ();});
         menubar.show ();
         add (menubar);
 
-        var label = new Gtk.Label (Posix.utsname ().nodename);
-        label.show ();
-        var hostname_item = new Gtk.MenuItem ();
-        hostname_item.add (label);
-        hostname_item.sensitive = false;
-        hostname_item.right_justified = true;
-        hostname_item.show ();
-        menubar.append (hostname_item);
-
-        /* Hack to get a label showing on the menubar */
-        label.ensure_style ();
-        label.modify_fg (Gtk.StateType.INSENSITIVE, label.get_style ().fg[Gtk.StateType.NORMAL]);
-
-        login_box = new DashBox ();
+        login_box = new DashBox (background);
         login_box.show ();
         add (login_box);
 
@@ -396,7 +166,7 @@
         add (prompt_entry);
 
         login_button = new Gtk.Button ();
-        label = new Gtk.Label ("<span font_size=\"large\">%s</span>".printf (/* 'Log In' here is the button for logging in. */
+        var label = new Gtk.Label ("<span font_size=\"large\">%s</span>".printf (/* 'Log In' here is the button for logging in. */
                                                                              _("Log In")));
         label.use_markup = true;
         label.show ();
@@ -424,275 +194,8 @@
 
         options_menu = new Gtk.Menu ();
 
-        backgrounds = new HashTable<string?, Background> (str_hash, str_equal);
-
         scroll_timer = new AnimateTimer (AnimateTimer.Speed.FAST);
         scroll_timer.animate.connect (scroll_animate_cb);
-        background_timer = new AnimateTimer (AnimateTimer.Speed.INSTANT);
-        background_timer.animate.connect (background_animate_cb);
-
-        setup_indicators ();
-    }
-
-    public void set_logo (string logo_path)
-    {       
-        if (FileUtils.test (logo_path, FileTest.EXISTS))
-        {
-            debug ("Using logo %s", logo_path);
-            logo_surface = new Cairo.ImageSurface.from_png (logo_path);
-        }
-        else
-        {
-            debug ("Can't use logo %s, it does not exist", logo_path);
-            logo_surface = null;
-        }
-    }
-
-    private void draw_child_cb (Gtk.Widget child)
-    {
-        menubar.propagate_draw (child, menubar_cairo_context);
-    }
-
-    private bool menubar_draw_cb (Cairo.Context c)
-    {
-        draw_background (c);
-
-        c.set_source_rgb (0, 0, 0);
-        c.paint_with_alpha (0.5);
-
-        menubar_cairo_context = c;
-        menubar.forall (draw_child_cb);
-
-        return false;
-    }
-
-    void greeter_set_env (string key, string val)
-    {
-        GLib.Environment.set_variable (key, val, true);
-
-        /* And also set it in the DBus activation environment so that any
-         * indicator services pick it up. */
-        try
-        {
-            var proxy = new GLib.DBusProxy.for_bus_sync (GLib.BusType.SESSION,
-                                                         GLib.DBusProxyFlags.NONE, null,
-                                                         "org.freedesktop.DBus",
-                                                         "/org/freedesktop/DBus",
-                                                         "org.freedesktop.DBus",
-                                                         null);
-
-            var builder = new GLib.VariantBuilder (GLib.VariantType.ARRAY);
-            builder.add ("{ss}", key, val);
-
-            proxy.call ("UpdateActivationEnvironment", new GLib.Variant ("(a{ss})", builder), GLib.DBusCallFlags.NONE, -1, null);
-        }
-        catch (Error e)
-        {
-            warning ("Could not get set environment for indicators: %s", e.message);
-            return;
-        }
-    }
-
-    Gtk.Widget make_a11y_indicator ()
-    {
-        var a11y_item = new Gtk.MenuItem ();
-        var hbox = new Gtk.HBox (false, 3);
-        hbox.show ();
-        a11y_item.add (hbox);
-        var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "a11y.svg"));
-        image.show ();
-        hbox.add (image);
-        a11y_item.show ();
-        a11y_item.submenu = new Gtk.Menu ();
-        var item = new Gtk.CheckMenuItem.with_label (_("Onscreen keyboard"));
-        item.toggled.connect (keyboard_toggled_cb);
-        item.show ();
-        a11y_item.submenu.append (item);
-        high_contrast_item = new Gtk.CheckMenuItem.with_label (_("High Contrast"));
-        high_contrast_item.toggled.connect (high_contrast_toggled_cb);
-        high_contrast_item.show ();
-        a11y_item.submenu.append (high_contrast_item);
-        item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
-        item.toggled.connect (screen_reader_toggled_cb);
-        item.show ();
-        a11y_item.submenu.append (item);
-        return a11y_item;
-    }
-
-    void set_layout (LightDM.Layout? layout)
-    {
-        if (layout == null)
-            layout = LightDM.get_layout (); /* default layout */
-
-        var item = layout.get_data<Gtk.RadioMenuItem> ("unity-greeter-radio");
-        if (item != null)
-            item.active = true; /* will trigger callback to do rest of work */
-    }
-
-    void layout_toggled_cb (Gtk.CheckMenuItem item)
-    {
-        if (!item.active)
-            return;
-
-        var layout = item.get_data<LightDM.Layout> ("unity-greeter-layout");
-        if (layout == null)
-            return;
-
-        keyboard_label.label = layout.short_description;
-        LightDM.set_layout (layout);
-    }
-
-    static int cmp_layout (LightDM.Layout? a, LightDM.Layout? b)
-    {
-        if (a == null && b == null)
-            return 0;
-        else if (a == null)
-            return 1;
-        else if (b == null)
-            return -1;
-        else
-        {
-            /* Use a dumb, ascii comparison for now.  If it turns out that some
-               descriptions can be in unicode, we'll have to use libicu's collation
-               algorithms. */
-            return strcmp (a.description, b.description);
-        }
-    }
-
-    Gtk.Widget make_keyboard_indicator ()
-    {
-        var keyboard_item = new Gtk.MenuItem ();
-        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
-        hbox.show ();
-        keyboard_item.add (hbox);
-        var image = new Gtk.Image.from_icon_name ("keyboard", Gtk.IconSize.LARGE_TOOLBAR);
-        image.show ();
-        hbox.add (image);
-        keyboard_label = new Gtk.Label ("");
-        keyboard_label.width_chars = 2;
-        keyboard_label.show ();
-        hbox.add (keyboard_label);
-        keyboard_item.show ();
-
-        var submenu = new Gtk.Menu ();
-        keyboard_item.set_submenu (submenu);
-
-        var layouts = LightDM.get_layouts ().copy ();
-        layouts.sort (cmp_layout);
-
-        Gtk.RadioMenuItem? last_item = null;
-        foreach (var layout in layouts)
-        {
-            var item = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), layout.description);
-            last_item = item;
-
-            item.show ();
-
-            /* LightDM does not change its layout list during its lifetime, so this is safe */
-            item.set_data ("unity-greeter-layout", layout);
-            layout.set_data ("unity-greeter-radio", item);
-
-            item.toggled.connect (layout_toggled_cb);
-
-            submenu.append (item);
-        }
-
-        return keyboard_item;
-    }
-
-    void setup_indicators ()
-    {
-        /* Set indicators to run with reduced functionality */
-        greeter_set_env ("INDICATOR_GREETER_MODE", "1");
-
-        /* Don't allow virtual file systems? */
-        greeter_set_env ("GIO_USE_VFS", "local");
-        greeter_set_env ("GVFS_DISABLE_FUSE", "1");
-
-        /* Hint to have gnome-settings-daemon run in greeter mode */
-        greeter_set_env ("RUNNING_UNDER_GDM", "1");
-
-        var keyboard_item = make_keyboard_indicator ();
-        menubar.insert (keyboard_item, (int) menubar.get_children ().length () - 1);
-
-        var a11y_item = make_a11y_indicator ();
-        menubar.insert (a11y_item, (int) menubar.get_children ().length () - 1);
-
-        debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
-        string[] filenames = {"/usr/lib/indicators3/6/libsession.so",
-                              "/usr/lib/indicators3/6/libdatetime.so",
-                              "/usr/lib/indicators3/6/libpower.so",
-                              "/usr/lib/indicators3/6/libsoundmenu.so"};
-        foreach (var filename in filenames)
-        {
-            var io = new Indicator.Object.from_file (filename);
-            indicator_objects.append (io);
-            io.entry_added.connect (indicator_added_cb);
-            io.entry_removed.connect (indicator_removed_cb);
-            foreach (var entry in io.get_entries ())
-                indicator_added_cb (io, entry);
-        }
-        debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
-    }
-
-    private void keyboard_toggled_cb (Gtk.CheckMenuItem item)
-    {
-        /* FIXME: The below would be sufficient if gnome-session were running
-         * to notice and run a screen keyboard in /etc/xdg/autostart...  But
-         * since we're not running gnome-session, we hardcode onboard here. */
-        /* var settings = new Settings ("org.gnome.desktop.a11y.applications");*/
-        /*settings.set_boolean ("screen-keyboard-enabled", item.active);*/
-
-        if (keyboard_window == null)
-        {
-            int id;
-
-            try
-            {
-                string[] argv;
-                int onboard_stdout_fd;
-
-                Shell.parse_argv ("onboard --xid", out argv);
-                Process.spawn_async_with_pipes (null,
-                                                argv,
-                                                null,
-                                                SpawnFlags.SEARCH_PATH,
-                                                null,
-                                                out keyboard_pid,
-                                                null,
-                                                out onboard_stdout_fd,
-                                                null);
-                var f = FileStream.fdopen (onboard_stdout_fd, "r");
-                var stdout_text = new char[1024];
-                f.gets (stdout_text);
-                id = int.parse ((string) stdout_text);
-
-            }
-            catch (Error e)
-            {
-                warning ("Error setting up keyboard: %s", e.message);
-                return;
-            }
-
-            var keyboard_socket = new Gtk.Socket ();
-            keyboard_socket.show ();
-            keyboard_window = new Gtk.Window ();
-            keyboard_window.accept_focus = false;
-            keyboard_window.focus_on_map = false;
-            keyboard_window.add (keyboard_socket);
-            Gtk.socket_add_id (keyboard_socket, id);
-
-            /* Put keyboard at the bottom of the screen */
-            keyboard_window.move (0, get_allocated_height () - 200);
-            keyboard_window.resize (get_allocated_width (), 200);
-        }
-
-        keyboard_window.visible = item.active;
-    }
-    
-    private void redraw_background ()
-    {
-        queue_draw ();
     }
 
     private void redraw_user_list ()
@@ -707,39 +210,6 @@
         queue_draw_area (box_x, box_y, box_width * grid_size, box_height * grid_size);
     }
 
-    private void high_contrast_toggled_cb (Gtk.CheckMenuItem item)
-    {
-        var settings = Gtk.Settings.get_default ();
-        if (item.active)
-            settings.set ("gtk-theme-name", "HighContrastInverse");
-        else
-            settings.set ("gtk-theme-name", default_theme_name);
-        change_background ();
-        redraw_background ();
-    }
-
-    private void screen_reader_toggled_cb (Gtk.CheckMenuItem item)
-    {
-        /* FIXME: The below would be sufficient if gnome-session were running
-         * to notice and run a screen reader in /etc/xdg/autostart...  But
-         * since we're not running gnome-session, we hardcode orca here.
-        /*var settings = new Settings ("org.gnome.desktop.a11y.applications");*/
-        /*settings.set_boolean ("screen-reader-enabled", item.active);*/
-
-        /* Hardcoded orca: */
-        try
-        {
-            if (item.active)
-                Process.spawn_command_line_async ("orca --replace --no-setup --disable=splash-window --disable=main-window");
-            else
-                Process.spawn_command_line_async ("orca --quit");
-        }
-        catch (Error e)
-        {
-            warning ("Failed to run Orca: %s", e.message);
-        }
-    }
-
     public void show_message (string text, bool error = false)
     {
         message = text;
@@ -807,74 +277,6 @@
         redraw_login_box ();
     }
 
-    private uint get_indicator_index (Indicator.Object object)
-    {
-        uint index = 0;
-
-        foreach (var io in indicator_objects)
-        {
-            if (io == object)
-                return index;
-            index++;
-        }
-
-        return index;
-    }
-
-    private Indicator.Object? get_indicator_object_from_entry (Indicator.ObjectEntry entry)
-    {
-        foreach (var io in indicator_objects)
-        {
-            foreach (var e in io.get_entries ())
-            {
-                if (e == entry)
-                    return io;
-            }
-        }
-
-        return null;
-    }
-
-    private void indicator_added_cb (Indicator.Object object, Indicator.ObjectEntry entry)
-    {
-        var index = get_indicator_index (object);
-        var pos = 0;
-        foreach (var child in menubar.get_children ())
-        {
-            if (!(child is IndicatorMenuItem))
-                break;
-
-            var menuitem = (IndicatorMenuItem) child;
-            var child_object = get_indicator_object_from_entry (menuitem.entry);
-            var child_index = get_indicator_index (child_object);
-            if (child_index > index)
-                break;
-            pos++;
-        }
-
-        debug ("Adding indicator object %p at position %d", entry, pos);
-
-        var menuitem = new IndicatorMenuItem (entry);
-        menubar.insert (menuitem, pos);
-    }
-
-    private void indicator_removed_cb (Indicator.Object object, Indicator.ObjectEntry entry)
-    {
-        debug ("Removing indicator object %p", entry);
-
-        foreach (var child in menubar.get_children ())
-        {
-            var menuitem = (IndicatorMenuItem) child;
-            if (menuitem.entry == entry)
-            {
-                menubar.remove (child);
-                return;
-            }
-        }
-
-        warning ("Indicator object %p not in menubar", entry);
-    }
-
     public void add_session (string name, string label)
     {
         var item = new SessionMenuItem ();
@@ -908,7 +310,7 @@
         }
         e.layout = create_pango_layout (label);
         e.layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 16"));
-        e.background = background != null ? background : default_background;
+        e.background = background;
         e.keyboard_layout = keyboard_layout;
         e.is_active = is_active;
 
@@ -1003,33 +405,15 @@
             finished_animating ();
     }
 
-    private void background_animate_cb (double progress)
-    {
-        background_alpha = progress;
-
-        redraw_background ();
-
-        /* Stop when we get there */
-        if (background_alpha >= 1.0)
-            old_background = background;
-    }
-    
     private bool change_background_timeout_cb ()
     {
-        Background new_background;
-        if (high_contrast_item.active)
-            new_background = make_background (default_background);
+        string new_background_file;
+        if (menubar.high_contrast)
+            new_background_file = null;
         else
-            new_background = make_background (selected_entry.background);
+            new_background_file = selected_entry.background;
 
-        if (background != new_background)
-        {
-            if (frame_count > 0)
-                background_alpha = 0.0;
-            old_background = background;
-            background = new_background;
-            redraw_background ();
-        }
+        background.current_background = new_background_file;
 
         change_background_timeout = 0;
         return false;
@@ -1082,7 +466,7 @@
                 user_selected (selected_entry.name);
             }
 
-            set_layout (selected_entry.keyboard_layout);
+            menubar.set_layout (selected_entry.keyboard_layout);
         }
     }
 
@@ -1108,7 +492,6 @@
 
     public override void realize ()
     {
-        background = old_background = make_background (default_background);
         change_background ();
 
         set_realized (true);
@@ -1161,15 +544,18 @@
         if (resized)
             debug ("Resized to %dx%d", get_allocated_width (), get_allocated_height ());
 
-        Gtk.Requisition natural_size;
-        menubar.get_preferred_size (null, out natural_size);
         var child_allocation = Gtk.Allocation ();
-        natural_size.height = 32;
-        natural_size.width = get_allocated_width ();
-        child_allocation.x = 0;
-        child_allocation.y = 0;
-        child_allocation.width = natural_size.width;
-        child_allocation.height = natural_size.height;
+
+        child_allocation.x = 0;
+        child_allocation.y = 0;
+        child_allocation.width = allocation.width;
+        child_allocation.height = allocation.height;
+        background.size_allocate (child_allocation);
+
+        child_allocation.x = 0;
+        child_allocation.y = 0;
+        child_allocation.width = allocation.width;
+        child_allocation.height = 32;
         menubar.size_allocate (child_allocation);
 
         child_allocation.x = box_x + 6;
@@ -1191,21 +577,13 @@
         child_allocation.width = grid_size;
         child_allocation.height = grid_size;
         options_button.size_allocate (child_allocation);
-
-        /* Regenerate backgrounds */
-        if (resized)
-        {
-            debug ("Regenerating backgrounds");
-            backgrounds.remove_all ();
-            change_background ();
-        }
     }
 
     private void draw_entry (Cairo.Context c, UserEntry entry, double alpha = 0.5, bool in_box = false)
     {
         c.save ();
         
-        if (high_contrast_item.active || in_box)
+        if (menubar.high_contrast || in_box)
             alpha = 1.0;
 
         if (entry.is_active)
@@ -1257,72 +635,6 @@
         }
     }
 
-    private void background_loaded_cb (Background b)
-    {
-        change_background ();
-        redraw_background ();
-    }
-
-    private Background make_background (string filename)
-    {
-        var b = backgrounds.lookup (filename);
-        if (b == null)
-        {
-            b = new Background (filename, get_allocated_width (), get_allocated_height (), this.draw_grid);
-            b.loaded.connect (background_loaded_cb);
-            backgrounds.insert (filename, b);
-        }
-
-        return b;
-    }
-    
-    public Background get_background ()
-    {
-        if (selected_entry != null)
-            return make_background (selected_entry.background);
-        else
-            return make_background (default_background);
-    }
-
-    private void draw_background (Cairo.Context c)
-    {
-        /* Test whether we ran into an error loading this background */
-        if (background.load () && background.pattern == null)
-        {
-            /* We couldn't load it, so swap it out for the default background
-               and remember that choice */
-            var new_background = make_background (default_background);
-            backgrounds.insert (background.filename, new_background);
-            if (old_background == background)
-                old_background = new_background;
-            background = new_background;
-        }
-
-        /* Fade to this background when loaded */
-        if (background.load () && background != old_background && !background_timer.is_running)
-            background_timer.reset ();
-
-        c.set_source_rgb (0x2C, 0x00, 0x1E);
-        var old_not_loaded = false;
-
-        /* Draw old background */
-        if (background_alpha < 1.0)
-        {
-            if (old_background.load ())
-                c.set_source (old_background.pattern);
-            else
-                old_not_loaded = true;
-            c.paint ();
-        }
-
-        /* Draw new background */
-        if (background.load () && background_alpha > 0.0)
-        {
-            c.set_source (background.pattern);
-            c.paint_with_alpha (old_not_loaded ? 1.0 : background_alpha);
-        }
-    }
-
     private void draw_entry_at_position (Cairo.Context c, UserEntry entry,
                                          double position, bool in_box = false)
     {
@@ -1344,8 +656,6 @@
 
         frame_count++;
 
-        draw_background (c);
-
         foreach (var child in children)
             propagate_draw (child, c);
 
@@ -1548,14 +858,4 @@
 
         return false;
     }
-
-    public override void unrealize ()
-    {
-        if (keyboard_pid != 0)
-        {
-            Posix.kill (keyboard_pid, Posix.SIGKILL);
-            int status;
-            Posix.waitpid (keyboard_pid, out status, 0);
-        }
-    }
 }