Merge lp:~bruce.ma/ubiquity/support-hidpi-lp1382291 into lp:ubiquity

[Bruce.Ma]

Merged Shih-Yuan's patch to fix a hidpi issue. (LP: #1382291)

[Dimitri John Ledkov (xnox)]

On 11 February 2015 at 10:01, Bruce.Ma <email address hidden> wrote:
> Bruce.Ma has proposed merging lp:~bruce.ma/ubiquity/support-hidpi-lp1382291 into lp:ubiquity.
>
> Requested reviews:
> Mathieu Trudel-Lapierre (mathieu-tl)
>
> For more details, see:
> https://code.launchpad.net/~bruce.ma/ubiquity/support-hidpi-lp1382291/+merge/249292
>
> Merged Shih-Yuan's patch to fix a hidpi issue. (LP: #1382291)
> --
> You are subscribed to branch lp:ubiquity.
>
> === modified file 'bin/ubiquity-dm'
> --- bin/ubiquity-dm 2015-01-28 19:08:36 +0000
> +++ bin/ubiquity-dm 2015-02-11 10:00:41 +0000
> @@ -367,6 +367,7 @@
>
> background_image = None
> for background in (
> + '/usr/share/backgrounds/warty-final-ubuntu.png',

On ubuntu, or well anywhere where unity- or gnome-settings-daemon are
used, the wallpaper is drawn by that, instead of ubiquity-dm.
Please don't introduce it.

Are you implying that unity-settings-daemon has regressed in its
high-dpi support and the background is not rendered correctly?

Does the background render correctly in the "Try Ubuntu" - aka live
desktop mode instead?

I really wish ubiquity-dm did nothing with respect to displaying
desktop background, and instead use the default DE native wallpaper
drawining mechanisms. Otherwise we will be forever out of sync, which
used to so common for ubiquity across all flavours.

> '/usr/share/xfce4/backdrops/ubuntustudio-1310.png',
> '/usr/share/xfce4/backdrops/xubuntu-wallpaper.png',
> '/usr/share/lubuntu/wallpapers/'
> @@ -378,6 +379,9 @@
>
> accessibility = False
> if gsettings._gsettings_exists():
> + usd = '/usr/lib/unity-settings-daemon/unity-settings-daemon'
> + gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
> +
> accessibility = gsettings.get(
> 'org.gnome.desktop.interface', 'toolkit-accessibility',
> self.username)
> @@ -443,6 +447,10 @@
> gsettings_keys.remove(
> ('org.gnome.desktop.wm.preferences', 'num-workspaces',
> '1'))
> + if osextras.find_on_path(usd):
> + gsettings_keys.append(
> + ('org.gnome.settings-daemon.plugins.background',
> + 'active', 'false'))
>
> for gs_schema, gs_key, gs_value in gsettings_keys:
> subprocess.call(
> @@ -450,14 +458,18 @@
> stdin=null, stdout=logfile, stderr=logfile,
> preexec_fn=self.drop_privileges)
>
> - usd = '/usr/lib/unity-settings-daemon/unity-settings-daemon'
> - gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
> msd = '/usr/bin/mate-settings-daemon'
>
> if osextras.find_on_path(usd):
> extras.append(subprocess.Popen(
> [usd], stdin=null, stdout=logfile, stderr=logfile,
> preexec_fn=self.drop_pr...

[Shih-Yuan Lee (fourdollars)]

gnome-settings-daemon and unity-settings-daemon have some problem to draw the background.
That is why we use `feh` to draw the background in ubiquity-dm.

In fact, the background of Unity desktop is drawn by Nautilus instead of unity-settings-daemon.
You can try to kill Nautilus by `killall nautilus` while the scale factor is 2.
Then you will see the problem immediately.

In short, the default DE native wallpaper drawing mechanism doesn't work well for HiDPI.

[Dimitri John Ledkov (xnox)]

On 12 February 2015 at 02:15, Shih-Yuan Lee <email address hidden> wrote:
> gnome-settings-daemon and unity-settings-daemon have some problem to draw the background.
> That is why we use `feh` to draw the background in ubiquity-dm.
>
> In fact, the background of Unity desktop is drawn by Nautilus instead of unity-settings-daemon.
> You can try to kill Nautilus by `killall nautilus` while the scale factor is 2.
> Then you will see the problem immediately.
>

It depends which release you are talking about. It could be
settings-daemon or Nautilus, and gsettings used.

> In short, the default DE native wallpaper drawing mechanism doesn't work well for HiDPI.

Ok, but isn't it more important to fix default DE native wallpaper
drawning then?

Given that ubiquity-dm / oem-config is only used briefly, does this
point to a bigger problem that on HiDPI machines the user will see bad
wallpaper rendering?

Is there a bug raised somewhere else for bad background rending in the
finally installed systems? Cause if that is fixed, ubiquity will gain
that fix as well, no?

For Ubuntu Desktop / Unity, feh cannot be used as it is not in main
and thus is not an available dependency. feh is only seeded on Lubuntu
desktop.

--
Regards,

Dimitri.

[Dimitri John Ledkov (xnox)]

* changelog, please describe the bug that is attempted to be fixed, rather than "how" or "who"
* the proposed change is not suitable for inclusion, as non-main components attempt to be used
* the referenced bug report has nothing w.r.t. incorrect wallpaper rending, it's the ubiquity window size which is wrong
* the ubiquity task on the bug report is marked incomplete

It seems like unity-settings-daemon is the one that needs patching.

review: Needs Resubmitting

Unmerged revisions

6265. By Bruce.Ma on 2015-02-10

Merged Shih-Yuan's patch to fix a hidpi issue(LP: #1382291) .

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2015-01-28 19:08:36 +0000
+++ bin/ubiquity-dm	2015-02-11 10:00:41 +0000
@@ -367,6 +367,7 @@
 
             background_image = None
             for background in (
+                    '/usr/share/backgrounds/warty-final-ubuntu.png',
                     '/usr/share/xfce4/backdrops/ubuntustudio-1310.png',
                     '/usr/share/xfce4/backdrops/xubuntu-wallpaper.png',
                     '/usr/share/lubuntu/wallpapers/'
@@ -378,6 +379,9 @@
 
             accessibility = False
             if gsettings._gsettings_exists():
+                usd = '/usr/lib/unity-settings-daemon/unity-settings-daemon'
+                gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
+
                 accessibility = gsettings.get(
                     'org.gnome.desktop.interface', 'toolkit-accessibility',
                     self.username)
@@ -443,6 +447,10 @@
                     gsettings_keys.remove(
                         ('org.gnome.desktop.wm.preferences', 'num-workspaces',
                          '1'))
+                    if osextras.find_on_path(usd):
+                        gsettings_keys.append(
+                            ('org.gnome.settings-daemon.plugins.background',
+                             'active', 'false'))
 
                 for gs_schema, gs_key, gs_value in gsettings_keys:
                     subprocess.call(
@@ -450,14 +458,18 @@
                         stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges)
 
-                usd = '/usr/lib/unity-settings-daemon/unity-settings-daemon'
-                gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
                 msd = '/usr/bin/mate-settings-daemon'
 
                 if osextras.find_on_path(usd):
                     extras.append(subprocess.Popen(
                         [usd], stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges))
+                    cmd = "xwininfo -root -tree | awk '{print $1}' | grep ^0x"
+                    cmd += " | while read id; do xprop -id $id; done | grep "
+                    cmd += "_XSETTINGS_SETTINGS > /dev/null"
+                    while not subprocess.call(cmd, shell=True):
+                        log('Waitting for xsettings plugin to be ready')
+                        time.sleep(1)
 
                 elif osextras.find_on_path(gsd):
                     extras.append(subprocess.Popen(
@@ -469,7 +481,7 @@
                         [msd], stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges))
 
-                elif background_image and osextras.find_on_path('feh'):
+                if background_image and osextras.find_on_path('feh'):
                     subprocess.call(
                         ['feh', '--bg-fill', background_image],
                         stdin=null, stdout=logfile, stderr=logfile,

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-05 03:13:40 +0000
+++ debian/changelog	2015-02-11 10:00:41 +0000
@@ -1,3 +1,9 @@
+ubiquity (2.21.9) vivid; urgency=medium
+
+  * Merged Shih-Yuan's patch to fix hidpi issue.(LP: #1382291)
+
+ -- Bruce Ma <[e-mail]>  Tue, 10 Feb 2015 19:10:25 +0800
+
 ubiquity (2.21.8) vivid; urgency=medium
 
   * Automatic update of included source packages: grub-installer