andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.

Browse Source 
(cherry picked from commit 767b4c9d9d)
This commit is contained in:
Jeremy Huddleston 2007-12-16 01:14:32 -08:00
parent 58c2898b62
commit bf20c4374a
4 changed files with 0 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/Makefile.am
View File

@ -9,12 +9,6 @@ AM_CPPFLAGS = \
if X11APP
X11APP_SUBDIRS = bundle
if LAUNCHD
libexec_PROGRAMS = x11-exec
x11_exec_LDFLAGS = -framework CoreServices
endif
endif
SUBDIRS = . xpr $(X11APP_SUBDIRS)

12
hw/xquartz/bundle/Makefile.am
View File

@ -8,17 +8,6 @@ x11app:
install-data-hook:
xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
if LAUNCHD
launchagents_PRE = org.x.X11.plist.pre
launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
CPP_FILES_FLAGS = -D__libexecdir__="${libexecdir}"
CLEANFILES = $(launchagents_DATA)
endif
include $(top_srcdir)/cpprules.in
clean-local:
rm -rf build
@ -26,7 +15,6 @@ resourcedir=$(libdir)/X11/xserver
resource_DATA = Xquartz.plist
EXTRA_DIST = \
org.x.X11.plist \
Info.plist \
X11.icns \
bundle-main.c \

23
hw/xquartz/bundle/org.x.X11.plist.pre
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>org.x.X11</string>
<key>ProgramArguments</key>
<array>
<string>__libexecdir__/x11-exec</string>
<string>-launchd</string>
</array>
<key>Sockets</key>
<dict>
<key>:0</key>
<dict>
<key>SecureSocketWithKey</key>
<string>DISPLAY</string>
</dict>
</dict>
<key>ServiceIPC</key>
<true/>
</dict>
</plist>

84
hw/xquartz/x11-exec.c
View File

@ -1,84 +0,0 @@
/* x11-exec.c -- Find X11.app by bundle-id and exec it. This is so launchd
can correctly find X11.app, even if the user moved it.
Copyright (c) 2007 Apple, Inc.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name(s) of the above
copyright holders shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software without
prior written authorization. */
#include <CoreServices/CoreServices.h>
#include <stdio.h>
#define kX11AppBundleId "org.x.X11"
#define kX11AppBundlePath "/Contents/MacOS/X11"
int main(int argc, char **argv) {
char x11_path[PATH_MAX];
char** args = NULL;
CFURLRef appURL = NULL;
OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId),
nil, nil, &appURL);
switch (osstatus) {
case noErr:
if (appURL == NULL) {
fprintf(stderr, "%s: Invalid response from LSFindApplicationForInfo(%s)\n",
argv[0], kX11AppBundleId);
exit(1);
}
if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
fprintf(stderr, "%s: Error resolving URL for %s\n", argv[0], kX11AppBundleId);
exit(2);
}
args = (char**)malloc(sizeof (char*) * (argc + 1));
strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
if (args) {
int i;
args[0] = x11_path;
for (i = 1; i < argc; ++i) {
args[i] = argv[i];
}
args[i] = NULL;
}
fprintf(stderr, "X11.app = %s\n", x11_path);
execv(x11_path, args);
fprintf(stderr, "Error executing X11.app (%s):", x11_path);
perror(NULL);
exit(3);
break;
case kLSApplicationNotFoundErr:
fprintf(stderr, "%s: Unable to find application for %s\n", argv[0], kX11AppBundleId);
exit(4);
default:
fprintf(stderr, "%s: Unable to find application for %s, error code = %d\n",
argv[0], kX11AppBundleId, osstatus);
exit(5);
}
/* not reached */
}