summaryrefslogtreecommitdiff
path: root/startx.cpp
AgeCommit message (Collapse)Author
2011-11-08Use default clientargs, serverargs, and display if none were setJeremy Huddleston
Previously, we did not use the default values unless server or client weren't set, but we should still use the defaults if they were not set but the server was. This is most evident when you want to tell startx which server to use, but you want startx to figure out which display to use automatically. This fixes a regression introduced by the previous patch on XQuartz: http://xquartz.macosforge.org/trac/ticket/523 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-17startx: Choose an unused $DISPLAY by default on all platformsJeremy Huddleston
Now everyone can benefit from this code that I previously added for darwin https://bugs.freedesktop.org/show_bug.cgi?id=1789 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-11Rename launchd-id-prefix to bundle-id-prefixJeremy Huddleston
It's used many other places than just for launchd. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-24Fix minor typos in startx's comments.Cyril Brulebois
Signed-off-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-05-03darwin: Make __APPLE__ path in startx POSIX compliantJeremy Huddleston
http://xquartz.macosforge.org/trac/ticket/399 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-11darwin: Handle home directories that contain a single-quote (')Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2009-10-27Apple: Export X11_PREFS_DOMAIN for children (quartz-wm)Jeremy Huddleston
2009-10-03Strip RCS/CVS tagsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-09-02launchd: Added --with-launchd-id-prefix option to set non-standard launchd ↵Jeremy Huddleston
id prefix (org.x is still default)
2009-08-03app/xinit: make startx's $? a useful valueAndres Salomon
When startx fails to start X, it's most likely xinit that failed. xinit returns a proper return code (1), but that gets clobbed in the startx script by clean-up commands. This patch saves $? from xinit and forces startx to exit with that value. This way, if startx actually fails to start X, $? reflects that. Signed-off-by: Andres Salomon <dilinger@debian.org>
2009-03-06Cygwin can also have spaces in $HOMEJon TURNEY
2009-01-16startx: fix misparsing of initial client and server arguments which begin ↵Robert Macomber
with / or ./ If you invoke startx with a client whose initial command-line arguments begin with / or ./, it uses the last such argument as the base command for the client. E.g.: startx /usr/bin/xterm /usr/bin/mutt will use /usr/bin/mutt as the client to run instead of /usr/bin/xterm. This is because of the way in which startx parses its arguments. It's a loop over a case with three clauses; the bug is in the first. When it's looking at one of startx's args it checks to see if $clientargs is empty in order to see if it should set $client or add the argument to $clientargs. It should also check to see whether $client is set. There is a similar bug in parsing server args, where it checks to see if $serverargs is empty to decide whether to set $server. Debian bug#511717 (http://bugs.debian.org/511717) Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-12-17Apple: Allow defaults option that maps to a -dpi server command line in startxJeremy Huddleston
2008-12-09OSX: More prefix fixesJeremy Huddleston
2008-12-02Apple: Honor X11_PREFS_DOMAIN if it's set (1.4.2-apple26 and later)Jeremy Huddleston
2008-07-02Apple: Using eval to protect people who have spaces in their home path.Jeremy Huddleston
2008-06-29startx.cpp: Made some things a little more friendly for people who have ↵Jeremy Huddleston
spaces in pathnames.
2008-05-28Properly handle using xserverrcJeremy Huddleston
2008-05-21Unset session environment variables so startx works within a running session.Adam Jackson
2008-05-13Check for proper cookie creation on all platformsAlan Coopersmith
2008-04-19Cleaned up handling of defaultserver{,args}Jeremy Huddleston
Per comments from Jeremy Reed on the list... basically doing for everyone what I do for Apple
2008-04-14Apple: Wait for privileged_startx to finish, so we don't race to create ↵Jeremy Huddleston
/tmp/.X11-unix
2008-04-13Apple: We renamed font_cache.sh to font_cache for better consistency... ↵Jeremy Huddleston
Changing startx to work with this
2008-04-13Apple: privileged_startx is in XINITDIRJeremy Huddleston
2008-04-04Apple: Execute /usr/X11/bin/privileged_startx if it's presentJeremy Huddleston
2008-04-04Apple: Fixed issue where display would not be passed correctly to the server ↵Jeremy Huddleston
if nolisten tcp was enabled.
2008-03-15Use /dev/urandom for cookie it it existsJeremy C. Reed
else fall back to /dev/random. Not doing in configure.ac because can't easily check for existence when doing cross-builds. (Alternative would be to define this for every operating system in configure.ac. Currently only is defined for OpenBSD. Systems that have mcookie also will not be effected.)
2008-02-18Apple: font caching and defaultsJeremy Huddleston
Quieted defaults "error" messages by initializing default values Do font caching in startx, so users with custom ~/.xinitrc won't have to worry about updating it. Add "cache_fonts" defaults item to toggle whether or not to cache fonts at startup Fall back on fc-cache if font_cache.sh is not present.
2008-02-01OS-X: Fixed typoJeremy Huddleston
2008-01-09OS-X: Add bindir to $PATH in startx if it's not thereJeremy Huddleston
This should also fix this on SCO since it was using the incorrect BINDIR instead of __bindir__ in that code block...
2008-01-04OS-X: Properly set enable_xauth if the user has no defaults set and choose a ↵Jeremy Huddleston
valid $display for fast-user-switching.
2007-12-20OS-X: Made defaults test more robustJeremy Huddleston
2007-12-20Added support for OS-X preferences to disable tcp/ip connections and xauthJeremy Huddleston
2007-09-17Bug #12448: Don't try to trap 'ERR'.Tilman Sauerbeck
startx is advertised as a POSIX sh script. These shells don't necessarily support trapping 'ERR'. This makes startx work again with dash (and probably others).
2007-09-15remove .serverauth.$$ file on signals or errorsMatthieu Herrb
2007-09-04Fix broken test for /dev/random cookie generation failure.Eric Anholt
2007-07-13Use /dev/random to generate the cookie if mcookie is unavailable.Eric Anholt
Setting XAUTHORITY without having actually generated a cookie and created .Xauthority led to issues if somebody like ssh later came around and made the .Xauthority file for their own setup. So, simply make it so that we never fail to create one.
2006-05-27In comments, change contractions to be spelled out to fix cpp "missingJeremy C. Reed
terminating" errors with single quotes.
2006-02-25Bug #4449 <https://bugs.freedesktop.org/show_bug.cgi?id=4449> Be moreXORG-7_0_99_901Jeremy C. Reed
portable (for different /bin/sh shells) for the arithmetic. NetBSD's /bin/sh didn't like: dummy=$((dummy+1)) and complained: startx: arith: syntax error: "dummy+1" This was fixed by NetBSD and also by Gentoo, see: https://launchpad.net/distros/ubuntu/+source/xinit/+bug/31241
2005-11-15Make using full paths in the xinit scripts optional.XORG-6_8_99_903Kevin E Martin
2005-11-08See ChangeLog entry 2005-11-07 for details.XORG-6_8_99_902Kean Johnson
2005-07-25Bug #3860: Avoid a bashism. (Diego Pettenò)Adam Jackson
2005-07-20Use kbd_mode -a to restore console keyboard on Solaris x86 too.XORG-6_8_99_16Alan Coopersmith
2005-04-20Separate server auth and client .Xautority file in startx. .Xautority mightsco_port_update-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10Egbert Eich
have credentials from other Xservers which we might not want to enable on ours Bugzilla #3078).
2004-04-23Merging XORG-CURRENT into trunkxprint_packagertest_20041217_basexprint_packagertest_20041125_baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGExprint_packagertest_20041217xprint_packagertest_20041125lg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAPEgbert Eich
2004-03-14Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1Egbert Eich
2004-03-03Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENTEgbert Eich
2004-02-26readding XFree86's cvs IDsxf86-4_3_99_903Egbert Eich
2004-02-26Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004Egbert Eich
2003-11-25XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16Kaleb Keithley