andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,543 Commits 86 Branches 473 Tags 48 MiB
61cb98da1c
Commit Graph

70 Commits

Author SHA1 Message Date
Keith Packard
9838b7032e Introduce a consistent coding style 
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:

	-bap
	-psl
	-T PrivatePtr
	-T pmWait
	-T _XFUNCPROTOBEGIN
	-T _XFUNCPROTOEND
	-T _X_EXPORT

The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.

The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.

The comparison was done with this script:

dir1=$1
dir2=$2

for dir in $dir1 $dir2; do
	(cd $dir && find . -name '*.o' | while read file; do
		dir=`dirname $file`
		base=`basename $file .o`
		dump=$dir/$base.dump
		objdump -d $file > $dump
	done)
done

find $dir1 -name '*.dump' | while read dump; do
	otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
	diff -u $dump $otherdump
done

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 2012-03-21 13:54:42 -07:00
Jeremy Huddleston
7413886d65 XQuartz: Silence clang warnings about shadow declarations 
X11Application.m:1272:26: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
                xp_error e;
                         ^
X11Application.m:1098:36: note: previous declaration is here
- (void) sendX11NSEvent:(NSEvent *)e {
                                   ^
1 warning generated.

bundle-main.c:648:36: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
                    int max_files, i;
                                   ^
bundle-main.c:594:9: note: previous declaration is here
    int i;
        ^
1 warning generated.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-05-22 11:17:59 -07:00
Jeremy Huddleston
96ac4e61f4 XQuartz: Update DEBUG_LOG to report to ASL 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-05-22 11:17:59 -07:00
Jeremy Huddleston
f46835a096 XQuartz: Redirect stdout/stderr to asl 
In order to improve logging in XQuartz, stdout and stderr should be redirected
to asl (syslog).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-05-12 20:19:40 -07:00
Jeremy Huddleston
c89a6f824e XQuartz: Don't call into CoreFoundation after fork() and before exec() 
After fork()ing, we should just limit ourselves to setting up
the environment, file descriptors, and exec()ing.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-05-10 23:55:19 -07:00
Jeremy Huddleston
6f29dbf5e3 XQuartz: Use ErrorF rather than fprintf to log errors 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-25 22:00:41 -07:00
Jeremy Huddleston
0a60192a85 XQuartz: Enable logging to a file for better debugging 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-25 18:57:04 -07:00
Jeremy Huddleston
de4023f194 XQuartz: Rename launchd-id-prefix to bundle-id-prefix 
It's used many other places than just for launchd.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-25 18:57:04 -07:00
Jeremy Huddleston
d0caa0e4cd XQuartz: Silence warnings about deprecated functionality where it is an intended fallback 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-25 18:57:03 -07:00
Jeremy Huddleston
034538ea9b XQuartz: Use dispatch_async to handoff the FD 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Jeremy Huddleston
3960115dbc XQuartz: Fix prototypes for thread functions 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Jeremy Huddleston
7524dbd061 XQuartz: Make the DarwinProcessFDAdditionQueue_thread wait 3 seconds to allow xinitrc to catch up 
Previously, we weren't always waiting the full three seconds.  This should
be better, but is still sub-optimal.  We really want to start processing
these once a WM has been started.

http://xquartz.macosforge.org/trac/ticket/416

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Jeremy Huddleston
14f00449eb XQuartz: Cleanup some compiler warnings 
Mark __crashreporter_info__ as __attribute__((__used__))

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-12-03 16:46:45 -08:00
Matt Turner
08adf41f63 Replace malloc/strlen/strcpy with strdup. 
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
 2010-08-27 19:05:48 -04:00
Mikhail Gusarov
7287ef9e6c Remove unnecessary parentheses around return values in functions 
This patch was generated by the following Perl code:

perl -i -pe 's/([^_])return\s*\(\s*([^(]+?)\s*\)s*;(\s+(\n))?/$1return $2;$4/g;'

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
 2010-06-10 06:42:42 -07:00
Jeremy Huddleston
37f0b45dbe XQuartz: Fix a build failure on Tiger 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-05-16 13:12:31 -07:00
Jeremy Huddleston
0e342add77 darwin: Correct inline assembly for ___crashreporter_info__ 
It was missing an underscore.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-04-01 15:32:51 -07:00
Jeremy Huddleston
436d0bb9cc darwin: Generate crash reports on FatalError() 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
 2010-03-29 09:37:17 -07:00
Jeremy Huddleston
4127e8e5be XQuartz: clang static analysis fixes 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-02-15 15:03:49 -08:00
Jeremy Huddleston
4677b5a800 XQuartz: Allow better compatability with older versions of xinit 
If we are id="org.x" and the launchd socket is ":0", we will claim
the socket to match the old behavior before we prefixed the
socket name with our id.

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
 2009-11-23 18:00:31 -08:00
Jeremy Huddleston
24e640e1fa XQuartz: Fix a possible minor memory leak 2009-10-02 19:20:24 -07:00
Jeremy Huddleston
f3223c71cf XQuartz: Remove the redundant xquartz_resetenv_display 
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d8)
 2009-09-29 00:34:41 -07:00
Jeremy Huddleston
9b98b88322 XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option. 
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50)
 2009-09-29 00:34:41 -07:00
Jeremy Huddleston
67a51cd9ef XQuartz: Fix a bunch of compilation warnings about style 
(cherry picked from commit 54000bdcbc)
 2009-09-27 23:31:35 -07:00
Jeremy Huddleston
081f72390a XQuartz: Fix "warning: function declaration isn’t a prototype" noise 
(cherry picked from commit 9a77905a97)
 2009-09-06 14:06:16 -07:00
Jeremy Huddleston
1747120043 XQuartz: Fix a strcpy/strcmp typo 
(cherry picked from commit 701c24da3e)
 2009-09-05 02:53:59 -07:00
Jeremy Huddleston
1f61bbeffd XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx. 
(cherry picked from commit 3d5e10cce3)
 2009-09-04 00:42:44 -07:00
Jeremy Huddleston
0a361d0e5f XQuartz: Use --with-launchd-id-prefix for consistency with xinit 
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab00)
 2009-09-04 00:42:31 -07:00
Jeremy Huddleston
b8050bb6de XQuartz: Don't leave zombied processes at startup 
(cherry picked from commit 40c1406830)
 2009-06-27 18:26:08 -07:00
Jeremy Huddleston
8f04a52373 XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing 
(cherry picked from commit 67455e716e)
 2008-12-21 21:35:33 -08:00
Jeremy Huddleston
76351d2faf XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment 
(cherry picked from commit f4b7ad9cc6)
 2008-12-10 15:07:52 -08:00
Jeremy Huddleston
e5ce6e198f XQuartz: unset DISPLAY if we didn't get a launchd socket handoff 
(cherry picked from commit b959727f38)
 2008-12-10 15:07:35 -08:00
Jeremy Huddleston
ecaaf0462d XQuartz: unsetenv(DISPLAY) if we're not org.x.X11 
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
 2008-12-10 15:07:26 -08:00
Jeremy Huddleston
ea94995982 XQuartz: Removed some debug spew 
(cherry picked from commit 370dcf11b3)
 2008-12-10 15:07:15 -08:00
Jeremy Huddleston
a9796c7bc4 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well... 
(cherry picked from commit cbae2b4473)
 2008-11-28 13:02:41 -08:00
Jeremy Huddleston
94df1ab7f0 XQuartz: Force X11Controller to reset a broken DISPLAY envvar. 
(cherry picked from commit f1a52b5b5a)
 2008-11-25 11:53:06 -08:00
Jeremy Huddleston
0b314c50a2 XQuartz: Removed hardcoded org.x.X11 from MachIPC as well 
(cherry picked from commit b4add7826d)
 2008-11-25 11:52:59 -08:00
Jeremy Huddleston
13df49dca2 XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD 
(cherry picked from commit fbf4b0d33f)
 2008-11-25 00:54:47 -08:00
Jeremy Huddleston
40187f782b XQuartz: Dead code removal 
(cherry picked from commit eeb323612e)
 2008-11-25 00:54:42 -08:00
Jeremy Huddleston
ab12c75162 XQuartz: More Tiger cleanup: bootstrap_strerror 
(cherry picked from commit 37f535aff3)
 2008-11-25 00:54:17 -08:00
Jeremy Huddleston
93d7cd31c5 XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option 
(cherry picked from commit 490756c7fb)
 2008-10-31 15:48:15 -07:00
Jeremy Huddleston
f12d7ad164 XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app 
(cherry picked from commit 183ca5d68b)
 2008-10-28 22:01:40 -07:00
Jeremy Huddleston
1119fe136f XQuartz: Changed around fd handoff model to be more robust 
(cherry picked from commit 4fe605c2bc)
 2008-09-12 15:26:01 -07:00
Jeremy Huddleston
b3836e5bdd XQuartz: Cleaned up our sleeping before adding the launchd socket. 
(cherry picked from commit ebfe49dfca)
(cherry picked from commit 2cf74a76d5)
 2008-09-03 09:24:59 -07:00
Jeremy Huddleston
8abcc12fdd XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew. 
(cherry picked from commit aaf0f71db1)
 2008-08-29 20:55:25 -07:00
Jeremy Huddleston
7930ea9116 XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it. 
(cherry picked from commit 54a882dcbd)
 2008-08-26 20:19:44 -07:00
Jeremy Huddleston
e72b1d21e4 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition 2008-08-06 13:37:21 -07:00
Jeremy Huddleston
26d31ad1c7 XQuartz: Added code and made comments more helpful for debugging first-client-auth bug. 
(cherry picked from commit a8f0d32216)
 2008-08-05 18:47:35 -07:00
Jeremy Huddleston
0ef3243fb5 XQuartz: More fd handoff cleanup. 
(cherry picked from commit 199d2dcb70)
 2008-08-05 18:47:35 -07:00
Jeremy Huddleston
6836f9aac8 XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize 
(cherry picked from commit d3157ca45c)
 2008-08-05 18:47:34 -07:00