summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-08Fix warnings about parameters to startServer & startClient shadowing globalsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-09-08xinit 1.3.3xinit-1.3.3Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-09-08Add Apple copyright/license notice from launchd files to COPYINGAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-08-24Use pid_t instead of int for type of pidsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-08-18Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2013-08-07Check for openssl as mkcookie fallback on all platforms, not just OpenBSDAlan Coopersmith
Configure will notify the builder which cookie maker it chooses, so that packagers can add a dependency on the program needed. (Matthieu says the -hex flag to the openssl command was originally OpenBSD-specific but has since been added in upstream OpenSSL.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
2013-08-04Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2013-07-18Declare processTimeout() as taking a const string argAlan Coopersmith
Fixes gcc const warnings on every call to it Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-18If we have to forcibly kill the Xserver on Solaris, reset kbd_modeAlan Coopersmith
If the Xserver hangs when xinit is waiting for it to die, and xinit sends a kill -9 to it, then it will leave the keyboard in a state that can't be used on the text console, so fix it up ourselves. Upstreaming from Solaris, where it was originally implemented to fix Sun bug 4221128 “If Xserver is slow to exit, xinit does "kill -9" and kbd_mode -a is required” Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-05-31Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2013-05-31Use xinitrc.d/?*.sh as the matching pattern instead of needing a fragile sed ↵Thomas Klausner
substitution XSLASHGLOB to produce xinitrc.d/*.sh. (If that were used literally the slash-star would confuse cpp.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-03-02Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2013-02-23Add printf attributes suggested by gccAlan Coopersmith
Also moves existing noreturn attributes up to function prototypes for functions with forward declarations. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-13Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
Conflicts: configure.ac
2013-01-07install: Use sysconfdir instead of libdir for config files.Egbert Eich
Most X packages today install their config files in sysconfigdir, only a few are left which still put their configuration in libdir. Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-04man: Set correct config file location in man pageEgbert Eich
Change the config file location from a hard coded path to what is set during build. Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-11-16Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2012-09-20privileged_startx: use root:wheel instead of 0:0Jeremy Huddleston Sequoia
http://xquartz.macosforge.org/trac/ticket/637 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2012-08-12Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2012-07-24XQuartz: Fix an issue where -dpi was not being passed to the server despite ↵Jeremy Huddleston
being set For some reason 'defaults' sometimes shows dpi in quotes and sometimes doesn't. Regression-from: 335937217a51e5e159a14463e0b1e3aedf35c6be Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-05-19Annotate Fatal and Fatalx as _X_NORETURNJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-05-19laucnhd: Silence some syslog spamJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-05-19darwin: Silence a syslog message from defaultsJeremy Huddleston
Unfortunately defaults has no way to check if a preference exists, and it prints a message to syslog if we read one that doesn't exist. dpi is one that commonly doesn't exist and results in user confusion when they read syslog. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-28Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2012-04-18launchd: Fix the destination of moved-aside directories in privileged_startxJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-18launchd: Load privileged_startx properly on TigerJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-18launchd: Provide more verbose error reporting for launchd checkin failuresJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-18launchd: Don't provide the LaunchAgent on TigerJeremy Huddleston
Tiger's launchd doesn't support all the features we need from it. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-18Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2012-02-27Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2012-02-24launchd/privileged_startx: Improved error resolutionJeremy Huddleston
Rather than just failing to do anything when directories aren't what we want them to be, we now try our best to fix the situation. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-27configure.ac: 1.3.2xinit-1.3.2Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-01Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
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-19launchd: Add an option (--with-launchagent-xserver) to set the default X11 ↵Jeremy Huddleston
server This allows the LaunchAgent and startx to have different default servers which will be useful as the Xorg DDX becomes available on darwin. 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-10-01Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
Conflicts: xinit.c
2011-09-08Include <sys/time.h> and <sys/resource.h> unconditionallyJulien Cristau
Suggested by Mark Kettenis. X.Org bug#40632 <https://bugs.freedesktop.org/show_bug.cgi?id=40632> Signed-off-by: Julien Cristau <jcristau@debian.org>
2011-08-21Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2011-07-31darwin: Buildfix for Tiger which doesn't have posix_spawnJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-31Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2011-07-24configure.ac: Bump version to 1.3.1xinit-1.3.1Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-03Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
Conflicts: Makefile.am
2011-06-19DIST_SUBDIRS is not required when using AM_CONDITIONALsGaetan Nadon
LAUNCHD is an Automake conditional which means that Automake will traverse the launchd directory when running the dist target. http://www.gnu.org/software/automake/manual/automake.html One less variables to maintain. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-18Move man pages in the man directoryGaetan Nadon
Now that the cpp tool is no longer needed, normalize the man pages build. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-18Use XORG_MANPAGE_SECTIONS rather than cpprules.in to build man pagesGaetan Nadon
As for all other manpages, use sed rather than the C preprocessor from the Imake days. Use SCOMAN Automake variable and groff .if for conditional text We can therefore remove ARCHMANDEFS Remove man page related code from cpprules.in Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-05Merge remote-tracking branch 'origin/master' into obsdMatthieu Herrb
2011-05-14launchd: Fix an array-index-out-of-bounds crasherJeremy Huddleston
Found-by: GuardMalloc Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12launchd: Update console redirection to work with libdispatchJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12launchd Set the correct id for privileged_startxJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>