Jeremy Huddleston
1b8f90aa8b
Miscellaneous compilation warning fixes
...
main.c:134: warning: no previous prototype for 'dix_main'
rootlessScreen.c: In function 'RootlessMarkOverlappedWindows':
rootlessScreen.c:434: warning: function declaration isn't a prototype
backtrace.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
backtrace.c:54: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
set.c: In function 'RecordSetMemoryRequirements':
set.c:413: warning: old-style function definition
set.c: In function 'RecordCreateSet':
set.c:425: warning: old-style function definition
stub.c: In function ‘main’:
stub.c:236: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-08 15:50:28 -08:00
Jeremy Huddleston
f4fc340672
XQuartz: Drop calls to alloca
...
This makes us more consistent with the rest of the codebase, using xalloc/xfree
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-30 17:06:58 -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
Gaetan Nadon
c739beb439
.gitignore: use common defaults with custom section #24239
...
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-11 21:40:20 -08:00
Jeremy Huddleston
24e640e1fa
XQuartz: Fix a possible minor memory leak
2009-10-02 19:20:24 -07:00
Jeremy Huddleston
3d7cf468df
XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
...
Is fink really _still_ relying on this X11R7.x version string?
2009-10-01 11:58:18 -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
a2cd211778
XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
...
(cherry picked from commit 9f5bdd8960
)
2009-09-26 23:45:35 -07:00
Jeremy Huddleston
1e0caf9a2c
XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
...
(cherry picked from commit 647c871dc9
)
2009-09-06 14:06:28 -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
dab8de0368
XQuartz: Bump the reported version to X11R7.4
...
(cherry picked from commit c83f701aa7
)
2009-07-25 15:25:35 -07:00
Jeremy Huddleston
be4dd35ffe
XQuartz: Initial support for automatic updates through Sparkle
...
(cherry picked from commit c45f1be364
)
2009-07-20 22:04:18 -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
Peter Hutterer
c2c515ead3
dix: remove all but main() from main.c
...
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-28 16:03:56 +10:00
Jeremy Huddleston
6869efae74
XQuartz: Accept bundle version 2.1.6 to work with our startup method
...
(cherry picked from commit 7f29665573
)
2009-02-03 10:04:40 -08:00
Jeremy Huddleston
1c504dff8a
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
2009-01-15 21:03:27 -08:00
Jeremy Huddleston
1beff89810
XQuartz: misc 1.6 updates (still --disable-glx)
...
rlAccel is not longer compatable, and it's not worth fixing
Don't override DeviceCursorInitialize with a noop
Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f68168
)
2009-01-11 01:55:26 -08:00
Jeremy Huddleston
895186e026
XQuartz: Re-enable rlAccel
...
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd2
)
2008-12-28 22:17:03 -08: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
22b2811e6a
XQuartz: Name the startup shell script X11 for better compatability
...
(cherry picked from commit f84613d6fc
)
2008-12-21 21:33:17 -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
fa4f2527a5
XQuartz: pbproxy: Simplify linking
...
(cherry picked from commit 909cc5c4dc
)
2008-12-03 21:59:23 -08:00
Jeremy Huddleston
3d527b91b4
XQuartz: Added option to enable/disable test extensions
...
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3
)
(cherry picked from commit 635019ad18
)
2008-11-28 13:02:54 -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
ca64b5949d
XQuartz: Don't use LS to find X11.app on Tiger.
...
(cherry picked from commit e62107e552
)
2008-11-21 11:55:49 -08:00
Jeremy Huddleston
e8112784e8
XQuartz: Integrated xpbproxy into the server.
...
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 4294493632
)
2008-11-15 19:52:34 -08:00
Jeremy Huddleston
b078936571
XQuartz: Initial work on readding GLX to the 1.5 server
...
(cherry picked from commit a186cab6ae
)
2008-11-14 15:10:32 -08:00
Jeremy Huddleston
0fca8588a2
XQuartz: Added more debugging to handoff spew
...
(cherry picked from commit acefa7e3c8
)
2008-11-13 11:34:27 -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
6020c3fbfe
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
...
(cherry picked from commit 8edc5fb38c
)
(cherry picked from commit 88033a66a5
)
2008-10-03 11:11:47 -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
1885582444
XQuartz: Placate automake which doesn't like escaped newlines even in comments...
...
(cherry picked from commit 73db117012
)
2008-08-29 21:18:26 -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
Michel Dänzer
073116cc44
Remove commented out lines that make automake 1.9 puke.
2008-08-08 12:15:27 +02:00