Merge lp://staging/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/greeter-background into lp://staging/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Andrew P.
Status: Merged
Merged at revision: 295
Proposed branch: lp://staging/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/greeter-background
Merge into: lp://staging/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 2318 lines (+1554/-486) (has conflicts)
5 files modified
data/lightdm-gtk-greeter.conf (+3/-0)
src/Makefile.am (+1/-0)
src/greeterbackground.c (+1369/-0)
src/greeterbackground.h (+48/-0)
src/lightdm-gtk-greeter.c (+133/-486)
Text conflict in src/lightdm-gtk-greeter.c
To merge this branch: bzr merge lp://staging/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/greeter-background
Reviewer Review Type Date Requested Status
Sean Davis Approve
Review via email: mp+225019@code.staging.launchpad.net

Description of the change

Using GreeterBackground class to manage backgrounds.

[greeter]
# Sets monitor to display greeter windows.
# Special value - "#cursor".
active-monitor=monitor_name_1;monitor_name_2;...

# Default settings
background=...
user-background=...

# [monitor: name] or [monitor: number]
[monitor: VGA-0]
# Individual settings
background=...
user-background=...

[monitor: LVDS]
# Mark monitor as laptop display.
# Greeter will be moved to another monitor from the list
# (or first available) if lid is closed. false by default.
laptop=true

To post a comment you must log in.
294. By Andrew P.

"active-monitor" property: "#lid" tag has been replaced with "lid-monitor" property; new value - "#cursor"

295. By Andrew P.

Individual monitors configurations moved to separate sections ([monitor: name])

296. By Andrew P.

Fixed: possible crash with background=#skip (monitor->background == NULL in this case)

297. By Andrew P.

Fixed: lid state event

Revision history for this message
Simon Steinbeiß (ochosi) wrote :

I've tested the latest changes in the branch. While it generally seems to work fine, it all depends on whether the user has set up his monitors correctly in Xorg. E.g. my work machine defaults to cloning/mirroring the outputs, so whatever I set in the greeters conf-file, I get a rather garbled output.

I'm wondering whether we shouldn't just handle the display layout within the greeter instead of relying on Xorg's default setup.

Also: how would the user change the default Xorg layout (without xorg.conf) easily for the greeter? (You mentioned xrandr before, but that's only within a user-session so it wouldn't affect the greeter, right?)

Revision history for this message
Simon Steinbeiß (ochosi) wrote :

Ok, found the xrandr script for lightdm now.

As I said, this is far too complicated for the average user, I guess we should handle it ourselves by copy-pasting some code from e.g. xfce's display dialog/settings daemon.

(I guess that's the edge Ubuntu has over us with having gnome/unity-settings-daemon running in the greeter session already...)

Revision history for this message
Simon Steinbeiß (ochosi) wrote :

Another update: after setting up the script, the branch does everything it promises. Awesome work! Especially the #cursor option is great and I'm thinking we should use it by default.

However, the whole thing of initially setting up the displays should somehow be simplified.

Revision history for this message
Andrew P. (kalgasnik) wrote :

Sorry for so long response.

The best place for setting up displays (IMHO, of course) - "apply system-wide" button in xfce4-display-settings. It is the first place where average user will search for such settings.

Revision history for this message
Sean Davis (bluesabre) wrote :

I think it would be best if the greeter handled some basic monitor management. I'll think of some basic scenarios and simple code to add this in. In the meantime, this branch is approved for merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches