summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-24startx: Source XINITRC and XSERVERRC variablesTim Egenton
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>
2022-10-16Don't wait for X to finish starting if it has diedArthur Williams
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.
2022-10-16gitlab CI: stop requiring Signed-off-by in commitsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-07-17stop unsetting DBUS_SESSION_BUS_ADDRESS variableDominik 'Rathann' Mierzejewski
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>
2022-06-19darwin: Wait for font_cache to complete to avoid a race with `xset fb=`Jeremy Huddleston Sequoia
Partially fixes: https://github.com/XQuartz/XQuartz/issues/216 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-04-07startx: don't attempt to catch SIGKILLnia
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>
2021-12-06Build xz tarballs instead of bzip2Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-12-06gitlab CI: add a basic build testAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-06-04Remove non-portable grep usage from startxArthur Williams
startx uses non-portable grep flags (-o). grep isn't even needed for this and has been replaced with substring removal. Closes #6
2021-03-15darwin: Specify +extension GLX when the user requests IGLX supportJeremy Huddleston Sequoia
Fixes: https://github.com/XQuartz/XQuartz/issues/54 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-03-10darwin: Ensure we launch the user startx from $HOMEJeremy Huddleston Sequoia
Fixes: https://github.com/XQuartz/XQuartz/issues/114 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-03-10darwin: Drop support for macOS 10.7 and earlierJeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2020-08-28startx: use uname -n instead of hostnameRickie Schroeder
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.
2020-07-23Fix spelling/wording issuesAlan Coopersmith
Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2020-03-08man: Restore non-SCO UNIX bits of the man pageMatt Turner
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>
2019-03-03xinit 1.4.1xinit-1.4.1Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-09Buffer overflow with many arguments.Tobias Stoeckmann
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
2018-11-21Update configure.ac bug URL for gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-16Update README for gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-03-24Fix some miscellaneous stuffs in the manpagesLaurent Bigonville
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>
2018-03-09Make text about supplying X server arguments via startx more genericJon TURNEY
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>
2018-03-09xinit 1.4.0xinit-1.4.0Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-31xinit: check for correct fork error codeTobias Stoeckmann
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>
2017-01-26autogen: add default patch prefixMihail Konev
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26autogen.sh: use quoted string variablesEmil Velikov
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>
2017-01-26autogen.sh: use exec instead of waiting for configure to finishPeter Hutterer
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>
2016-05-28startx: Add support for enabling IGLX for XQuartzJeremy Huddleston Sequoia
https://bugs.freedesktop.org/show_bug.cgi?id=96260 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-28startx: Add -listen tcp if nolisten_tcp is disabled for XQuartzJeremy Huddleston Sequoia
https://bugs.freedesktop.org/show_bug.cgi?id=95379 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-12-29launchd: Install binaries into libexecdirJeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-09-03remove bogus \/ escapesIngo Schwarze
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>
2015-03-26startx: don't init defaultdisplay to :0Peter Hutterer
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>
2015-03-25startx: Fix startx picking an already used display number when -nolock is usedHans de Goede
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>
2015-03-25startx: fix comment typoPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-02-16Remove left over $(launchagents_DATA) in CLEANFILESGaetan Nadon
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>
2015-02-16Remove support for ancient A/UX 3.0 supportGaetan Nadon
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>
2015-02-16Remove SCO support for SHELL_CMD and startx man page.Gaetan Nadon
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>
2015-01-30startx: Don't use GNU expr extensionsMark Kettenis
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>
2015-01-23startx: Pass -keeptty when telling the server to start on the current ttyHans de Goede
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>
2014-09-11xinit 1.3.4xinit-1.3.4Hans de Goede
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2014-08-30Remove hardcoded path to OpenSSL for OpenBSDBrad Smith
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>
2014-08-26startx: Make the bugzilla reference in a comment survive cpp processingHans de Goede
https://bugs.freedesktop.org/show_bug.cgi?id=83019 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2014-06-02autogen.sh: Honor NOCONFIGURE=1Alan Coopersmith
See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-02configure: Drop AM_MAINTAINER_MODEAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-04-07startx: Pass vtX as long as the user did not specify oneHans de Goede
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>
2014-04-04startx: Under Linux start X on the current VTHans de Goede
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>
2014-04-02Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing cpp filesHans de Goede
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>
2014-04-02Bump required util-macros version to 1.19Hans de Goede
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2014-03-31Remove unixware / sco supportHans de Goede
We don't support SCO / Unixware anymore, so lets remove the SCO / Unixware specific bits from startx and xinitrc SCO support was removed from the server in 2010: http://lists.x.org/archives/xorg-devel/2010-December/017209.html Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2013-11-22Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 changeAlan Coopersmith
Fixes Bug 69439 - Empty lines before #!/bin/sh in startx https://bugs.freedesktop.org/show_bug.cgi?id=69439 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-09-08Fix warnings about parameters to startServer & startClient shadowing globalsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 03:16:10 +0000