summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* startx: Assign XSERVERRC to correct userserverrcHEADmasterayekat2023-01-122-2/+2
| | | | | | Also fix same mistake in the startx manpage. Signed-off-by: ayekat <takeya@bluewin.ch>
* darwin: Remove bashism from 10-tmpdirs scriptJeremy Huddleston Sequoia2023-01-111-1/+1
| | | | | | | | possible bashism in 10-tmpdirs line 57 (should be >word 2>&1): if ${MKTEMP} -d ${dir} >& /dev/null ; then Fixes: https://github.com/XQuartz/XQuartz/issues/316 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* xinit 1.4.2xinit-1.4.2Alan Coopersmith2022-12-031-2/+2
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* man page: Update remote display example from rsh to sshAlan Coopersmith2022-11-091-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* startx: Source XINITRC and XSERVERRC variablesTim Egenton2022-10-242-7/+30
| | | | | | | | | Fix issue #14 Check XINITRC and XSERVERRC, if those files do not exist then just use ~/.xinitrc and ~/.xserverc as normal. Signed-off-by: Tim Egenton <tegenton@splattim.me>
* Don't wait for X to finish starting if it has diedArthur Williams2022-10-161-1/+1
| | | | | | | | | | | On my setup, when X first starts there aren't any screens available so it immediately dies. Half a second later, screens become available but xinit would still be waiting for the dead X process to signal that it is ready. It'll take 15s for it to timeout and respawn X. This patch makes xinit listen for its child's death and if X dies, it'll immediately stop waiting for it to finish starting and attempt to start it again.
* gitlab CI: stop requiring Signed-off-by in commitsAlan Coopersmith2022-10-161-2/+2
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* stop unsetting DBUS_SESSION_BUS_ADDRESS variableDominik 'Rathann' Mierzejewski2022-07-171-1/+0
| | | | | | | | | It's not necessary as we no longer support running startx from an existing X session. Fixes #9. Signed-off-by: Dominik Mierzejewski <dominik@greysector.net>
* darwin: Wait for font_cache to complete to avoid a race with `xset fb=`Jeremy Huddleston Sequoia2022-06-192-8/+8
| | | | | Partially fixes: https://github.com/XQuartz/XQuartz/issues/216 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* startx: don't attempt to catch SIGKILLnia2022-04-071-1/+1
| | | | | | | | Most shells ignore attempts to catch SIGKILL. Some, such as NetBSD's /bin/sh, print an annoying message helpfully reminding you that it isn't possible to catch SIGKILL whenever X starts. Signed-off-by: Nia Alarie <nia@NetBSD.org>
* Build xz tarballs instead of bzip2Alan Coopersmith2021-12-061-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* gitlab CI: add a basic build testAlan Coopersmith2021-12-061-0/+98
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove non-portable grep usage from startxArthur Williams2021-06-041-1/+1
| | | | | | | startx uses non-portable grep flags (-o). grep isn't even needed for this and has been replaced with substring removal. Closes #6
* darwin: Specify +extension GLX when the user requests IGLX supportJeremy Huddleston Sequoia2021-03-151-1/+1
| | | | | Fixes: https://github.com/XQuartz/XQuartz/issues/54 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* darwin: Ensure we launch the user startx from $HOMEJeremy Huddleston Sequoia2021-03-101-0/+5
| | | | | Fixes: https://github.com/XQuartz/XQuartz/issues/114 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* darwin: Drop support for macOS 10.7 and earlierJeremy Huddleston Sequoia2021-03-109-506/+5
| | | | Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* startx: use uname -n instead of hostnameRickie Schroeder2020-08-281-12/+1
| | | | | startx calls hostname to obtain the hostname, but this is not defined by POSIX, so not guaranteed to work. The script already does some checks to deal with different hostname implementations on Linux. Using uname -n instead fixes this in a portable way.
* Fix spelling/wording issuesAlan Coopersmith2020-07-233-3/+3
| | | | | | | Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* man: Restore non-SCO UNIX bits of the man pageMatt Turner2020-03-081-12/+8
| | | | | | | | | | It looks to me like commit 5268936259c5 (Remove SCO support for SHELL_CMD and startx man page.) removed the wrong bits of the man page. This commit replaces the SCO UNIX bits of the man page with the non-SCO UNIX bits. Signed-off-by: Matt Turner <mattst88@gmail.com>
* xinit 1.4.1xinit-1.4.1Alan Coopersmith2019-03-031-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Buffer overflow with many arguments.Tobias Stoeckmann2019-02-091-3/+4
| | | | | | | | | | | Command line arguments are copied into clientargv and serverargv without verifying that enough space is available. A high amount of arguments can therefore trigger a buffer overflow like this: $ xinit $(seq 1 500) Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org> Reviewed-by: Walter Harms wharms@bfs,de
* Update configure.ac bug URL for gitlab migrationAlan Coopersmith2018-11-211-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Update README for gitlab migrationAlan Coopersmith2018-11-162-13/+6
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Fix some miscellaneous stuffs in the manpagesLaurent Bigonville2018-03-242-5/+5
| | | | | | | See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726962 https://bugs.freedesktop.org/show_bug.cgi?id=83797 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Make text about supplying X server arguments via startx more genericJon TURNEY2018-03-091-9/+3
| | | | | | | | | | Make text about supplying X server arguments via startx more generic, rather than assuming the started server will be Xorg, and hence will take Xorg's arguments. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* xinit 1.4.0xinit-1.4.0Alan Coopersmith2018-03-091-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* xinit: check for correct fork error codeTobias Stoeckmann2017-01-311-1/+1
| | | | | | | Even though this code is only active on __sun machines, the fork return value should be checked for -1, not 1, to detect an error situation. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* autogen: add default patch prefixMihail Konev2017-01-261-0/+3
| | | | Signed-off-by: Mihail Konev <k.mvc@ya.ru>
* autogen.sh: use quoted string variablesEmil Velikov2017-01-261-4/+4
| | | | | | | | | Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* autogen.sh: use exec instead of waiting for configure to finishPeter Hutterer2017-01-261-1/+1
| | | | | | | Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
* startx: Add support for enabling IGLX for XQuartzJeremy Huddleston Sequoia2016-05-281-0/+10
| | | | | | https://bugs.freedesktop.org/show_bug.cgi?id=96260 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* startx: Add -listen tcp if nolisten_tcp is disabled for XQuartzJeremy Huddleston Sequoia2016-05-281-0/+2
| | | | | | https://bugs.freedesktop.org/show_bug.cgi?id=95379 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* launchd: Install binaries into libexecdirJeremy Huddleston Sequoia2015-12-295-10/+9
| | | | Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* remove bogus \/ escapesIngo Schwarze2015-09-031-1/+1
| | | | | | | | | | | some X manuals use then escape sequence \/ when they want to render a slash. That's bad because \/ is not a slash but an italic correction, never producing any output, having no effect at all in terminal output, and only changing spacing in a minor way in typeset output. Signed-off-by: Matthieu Herrb <matthieu@herrb.eu> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
* startx: don't init defaultdisplay to :0Peter Hutterer2015-03-261-1/+1
| | | | | | | | This is misleading - it is always overwritten after looping through the lock files. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
* startx: Fix startx picking an already used display number when -nolock is usedHans de Goede2015-03-251-1/+1
| | | | | | | | | | | | | | Currently startx relies on /tmp/.X?-lock being present for automatically picking a free display number. This does not work if -nolock is used when starting the server, or if the server is started with -displayfd as -displayfd implies -nolock. This is becoming a problem now that -displayfd is getting used by display-managers (e.g. gdm), this fixes this by also checking for /tmp/.X11-unix/X? Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* startx: fix comment typoPeter Hutterer2015-03-251-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove left over $(launchagents_DATA) in CLEANFILESGaetan Nadon2015-02-161-1/+1
| | | | | | | | This was left over when reorganizing layout of launchd sources in commit 567f59d3f8189b92bc46e2af1260f9340f462bdb Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove support for ancient A/UX 3.0 supportGaetan Nadon2015-02-161-5/+0
| | | | | | | | This was Apple Computer’s implementation of the Unix operating system for some of their Macintosh computers. From 1988 to 1995. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove SCO support for SHELL_CMD and startx man page.Gaetan Nadon2015-02-163-32/+0
| | | | | | | | | | | SCO support was removed from startx.cpp and xinitrc.cpp earlier. Remove unixware / sco support http://cgit.freedesktop.org/xorg/app/xinit/commit/ ?id=fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* startx: Don't use GNU expr extensionsMark Kettenis2015-01-301-2/+2
| | | | | | | | | | | Use the ':' operator instead of "match" and avoid the use of "\+". Both constructions aren't specified by POSIX and not supported in BSD expr. Also drop the '^' from the regular expressions as it is implicit and POSIX leaves its behaviour undefined. Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
* startx: Pass -keeptty when telling the server to start on the current ttyHans de Goede2015-01-231-1/+1
| | | | | | | | | | | | Detaching from the tty causes systemd-logind to refuse service to the xserver, the xserver already tries to detect that it is being asked to run on the current tty and then automatically enables -keeptty, but this code fails if all of stdin, stdout and stderr are redirected to a file. So explicitly tell the xserver to not detach when we're telling it to run on the current tty. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513 Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
* xinit 1.3.4xinit-1.3.4Hans de Goede2014-09-111-1/+1
| | | | Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* Remove hardcoded path to OpenSSL for OpenBSDBrad Smith2014-08-301-3/+0
| | | | | | | | | Since xinit's autoconf script was changed to use AC_PATH_PROGS() to find openssl this hardcoded path to openssl can be removed. This was noticed recently when openssl was moved from /usr/sbin to /usr/bin and developers were looking for anything having hardcoded paths. Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
* startx: Make the bugzilla reference in a comment survive cpp processingHans de Goede2014-08-261-1/+1
| | | | | | https://bugs.freedesktop.org/show_bug.cgi?id=83019 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* autogen.sh: Honor NOCONFIGURE=1Alan Coopersmith2014-06-021-2/+3
| | | | | | See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* configure: Drop AM_MAINTAINER_MODEAlan Coopersmith2014-06-022-2/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* startx: Pass vtX as long as the user did not specify oneHans de Goede2014-04-071-1/+13
| | | | | | | | | | | | | | | | 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@redhat.com> Reviewed-by: James Cloos <cloos@jhcloos.com>
* startx: Under Linux start X on the current VTHans de Goede2014-04-041-0/+11
| | | | | | | | | | | | | | | | | | | | | When we let X allocate a new VT, systemd-logind will not recognize any processes running on this VT as belonging to a valid session (since there was no pam session opened on that tty). This causes problems like PolicyKit denials for these processes. ConsoleKit under Linux has been deprecated for a few years now and is no longer being maintained, so simply make this the default under Linux. Note we do not pass in the vt if the user has specified an alternative server to start, as the vtX argument is only valid for the Xorg server, likewise we omit it if the user has specified any other server arguments. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=806491 Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing cpp filesHans de Goede2014-04-021-1/+1
| | | | | | | | | | | Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__ these have been broken (all #ifdef-s always seen as false) since: http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258 This commit makes these work again by removing -undef from the cpp flags. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>