Merge lp:~cqql/lightdm/cpp into lp:lightdm

[Marten Lienen]

Enable the C preprocessor when loading X resources

A common use for X resource files is customization of a user's terminal. Widely
used color schemes use the C preprocessor to avoid repetition. See for example
solarized[1] or base-16[2].

The counter argument, that -nocpp leads to a performance improvement for the
general audience, was disproved by igel and roelof000 in lp:1244578. To
summarize, the speed improvement is in the range of 0.01 seconds and the
commands will not even be executed if you do not have X resource files.

[1] https://github.com/altercation/solarized/blob/master/xresources/solarized
[2] https://github.com/chriskempson/base16-xresources

Enable the C preprocessor when loading X resources

A common use for X resource files is customization of a user's terminal. Widely
used color schemes use the C preprocessor to avoid repetition. See for example
solarized[1] or base-16[2].

The counter argument, that -nocpp leads to a performance improvement for the
general audience, was disproved by igel and roelof000 in lp:1244578. To
summarize, the speed improvement is in the range of 0.01 seconds and the
commands will not even be executed if you do not have X resource files.

[1] https://github.com/altercation/solarized/blob/master/xresources/solarized
[2] https://github.com/chriskempson/base16-xresources

[lp:~cqql/lightdm/cpp]

2140. By Marten Lienen on 2015-04-27

Enable the C preprocessor when loading X resources

A common use for X resource files is customization of a user's terminal. Widely
used color schemes use the C preprocessor to avoid repetition. See for example
solarized[1] or base-16[2].

The counter argument, that -nocpp leads to a performance improvement for the
general audience, was disproved by igel and roelof000 in lp:1244578. To
summarize, the speed improvement is in the range of 0.01 seconds and the
commands will not even be executed if you do not have X resource files.

[1] https://github.com/altercation/solarized/blob/master/xresources/solarized
[2] https://github.com/chriskempson/base16-xresources

[iGEL (igel)]

Thanks Marten!

Dear LightDM Team, could we get a review for these 3 lines here?

Regards, Johannes

review: Approve

[Robert Ancell (robert-ancell)]

This code was copied from GDM so the exact reasoning for the nocpp option is not completely clear (I assume performance). Given the number of people wanting it and the lack of strong evidence that it has a significant performance hit lets enable it and see if anyone complains.

review: Approve

=== modified file 'debian/lightdm-session'
--- debian/lightdm-session	2014-11-24 19:52:08 +0000
+++ debian/lightdm-session	2015-04-26 23:49:27 +0000
@@ -47,15 +47,15 @@
     if [ -d "$xresourcedir" ]; then
         for file in $xresourcedir/*; do
             echo "Loading resource: $file"
-            xrdb -nocpp -merge "$file"
+            xrdb -merge "$file"
         done
     fi
     xresourcefile="$HOME/.Xresources"
     if [ -f "$xresourcefile" ]; then
         echo "Loading resource: $xresourcefile"
-        xrdb -nocpp -merge "$xresourcefile"
+        xrdb -merge "$xresourcefile"
     fi
-fi    
+fi
 
 # Load keymaps
 if type setxkbmap >/dev/null 2>&1; then