Merge lp:~muktupavels/unity-greeter/add-primary-monitor-support into lp:unity-greeter

[Alberts Muktupāvels]

Add primary monitor support

In unity-greeter my monitor order was different from desktop session. Found
that I can copy ~/.config/monitors.xml to /var/lib/lightdm/.config/monitors.xml.

Now my monitors order is same in unity-greeter and desktop session, but primary
monitor is not respected. This commit will fix that.

[Robert Ancell (robert-ancell)]

The primary variable being added to the Monitor structure seems redundant - instead why not just have?

    private List<Monitor> monitors;
    private Monitor? primary_monitor;

...

    primary_monitor = null;

...

        var monitor = new Monitor (geometry.x, geometry.y, geometry.width, geometry.height)
        monitors.append (monitor);
        if (primary_monitor == null || i == primary)
            primary_monitor = monitor;

Otherwise logic looks good

review: Needs Fixing

[lp:~muktupavels/unity-greeter/add-primary-monitor-support]

1102. By Alberts Muktupāvels on 2014-02-27

Update

[Alberts Muktupāvels (muktupavels)]

Updated as you asked.

[Robert Ancell (robert-ancell)]

review: Approve

[Robert Ancell (robert-ancell)]

Thanks Alberts!

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[LukeKendall (luke-zeta)]

Thanks, I had the same problem on a desktop system with dual monitors (connected via HDMI and DVI). Primary monitor was HDMI when logged in, but before login, the authentication panel was plugged in to the 2nd display (which I normally have turned off). Which makes sense: how would the system know which user's monitors.xml file to use, before login?

BTW, it might be a good idea in a multi-monitor system, to choose the monitor that's powered on, rather than one that's powered off, to present tyhe login panel on. Just a thought.

luke

[Alberts Muktupāvels (muktupavels)]

On Wed, Jul 16, 2014 at 5:58 AM, LukeKendall <email address hidden> wrote:

> Thanks, I had the same problem on a desktop system with dual monitors
> (connected via HDMI and DVI). Primary monitor was HDMI when logged in, but
> before login, the authentication panel was plugged in to the 2nd display
> (which I normally have turned off). Which makes sense: how would the
> system know which user's monitors.xml file to use, before login?
>

System does not know it. It will use /var/lib/lightdm/.config/monitors.xml
if you create it. You can copy your configuration file
/home/[user]/.config/monitors.xml to /var/lib/lightdm/.config/ if you want.

> BTW, it might be a good idea in a multi-monitor system, to choose the
> monitor that's powered on, rather than one that's powered off, to present
> tyhe login panel on. Just a thought.
>

You could try open new bug for that. I don't know how to detect if monitor
is powered on or off.

[Christian González (droetker)]

For reference, the bug seems to be here: https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/813566

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2014-01-07 01:53:04 +0000
+++ src/main-window.vala	2014-02-27 05:09:49 +0000
@@ -24,6 +24,7 @@
     public MenuBar menubar;
 
     private List<Monitor> monitors;
+    private Monitor? primary_monitor;
     private Monitor active_monitor;
     private Background background;
     private Gtk.Box login_box;
@@ -181,8 +182,11 @@
 
     private void monitors_changed_cb (Gdk.Screen screen)
     {
+        int primary = screen.get_primary_monitor ();
         debug ("Screen is %dx%d pixels", screen.get_width (), screen.get_height ());
         monitors = new List<Monitor> ();
+        primary_monitor = null;
+
         for (var i = 0; i < screen.get_n_monitors (); i++)
         {
             Gdk.Rectangle geometry;
@@ -190,13 +194,19 @@
             debug ("Monitor %d is %dx%d pixels at %d,%d", i, geometry.width, geometry.height, geometry.x, geometry.y);
 
             if (monitor_is_unique_position (screen, i))
-                monitors.append (new Monitor (geometry.x, geometry.y, geometry.width, geometry.height));
+            {
+                var monitor = new Monitor (geometry.x, geometry.y, geometry.width, geometry.height);
+                monitors.append (monitor);
+
+                if (primary_monitor == null || i == primary)
+                    primary_monitor = monitor;
+            }
         }
 
         background.set_monitors (monitors);
         resize (screen.get_width (), screen.get_height ());
         move (0, 0);
-        move_to_monitor (monitors.nth_data (0));
+        move_to_monitor (primary_monitor);
     }
 
     /* Check if a monitor has a unique position */