xinit: Changes to 'master'

[Hans de Goede]

 startx.cpp |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1b23094a8606bf383ec6c7803a9cd300b1bb96a7
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Apr 7 11:23:48 2014 +0200

    startx: Pass vtX as long as the user did not specify one
    
    Adding vtX to $defaultserverargs means that it will only be added when
    the user specifies no server arguments.
    
    This means that doing ie: "startx -- -depth 16" will cause the server to start
    on a different vt then just "startx", which does not meat the principle of
    least surprise.
    
    Instead always pass the vtX argument, except when the user has specified its
    own vtX argument. Note that vtX still only gets added for the default server,
    since for ie Xnest or Xephyr it makes no sense.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>
    Reviewed-by: James Cloos <cloos at jhcloos.com>