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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6869efae74 
								
							 
						 
						
							
							
								
								XQuartz: Accept bundle version 2.1.6 to work with our startup method  
							
							... 
							
							
							
							(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78) 
							
						 
						
							2009-02-03 10:04:40 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1c504dff8a 
								
							 
						 
						
							
							
								
								XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation  
							
							
							
						 
						
							2009-01-15 21:03:27 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 c137f681680e1d04b1513a8be68aeda4d1c56fd5) 
							
						 
						
							2009-01-11 01:55:26 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 8121f30bd29591fc74fbc680fbbf20210271fa58) 
							
						 
						
							2008-12-28 22:17:03 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8f04a52373 
								
							 
						 
						
							
							
								
								XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing  
							
							... 
							
							
							
							(cherry picked from commit 67455e716e3ecffd528930479192785958d37988) 
							
						 
						
							2008-12-21 21:35:33 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								22b2811e6a 
								
							 
						 
						
							
							
								
								XQuartz: Name the startup shell script X11 for better compatability  
							
							... 
							
							
							
							(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf) 
							
						 
						
							2008-12-21 21:33:17 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148) 
							
						 
						
							2008-12-10 15:07:52 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e5ce6e198f 
								
							 
						 
						
							
							
								
								XQuartz: unset DISPLAY if we didn't get a launchd socket handoff  
							
							... 
							
							
							
							(cherry picked from commit b959727f38733009c6381cc8ca06b5984257bdac) 
							
						 
						
							2008-12-10 15:07:35 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ecaaf0462d 
								
							 
						 
						
							
							
								
								XQuartz: unsetenv(DISPLAY) if we're not org.x.X11  
							
							... 
							
							
							
							Also some prefix related fixes.
(cherry picked from commit fd459e96581a883e30323c840b71004aa0747169) 
							
						 
						
							2008-12-10 15:07:26 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ea94995982 
								
							 
						 
						
							
							
								
								XQuartz: Removed some debug spew  
							
							... 
							
							
							
							(cherry picked from commit 370dcf11b360b87aa24cace35eb615419057fda0) 
							
						 
						
							2008-12-10 15:07:15 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								fa4f2527a5 
								
							 
						 
						
							
							
								
								XQuartz: pbproxy: Simplify linking  
							
							... 
							
							
							
							(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc) 
							
						 
						
							2008-12-03 21:59:23 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								3d527b91b4 
								
							 
						 
						
							
							
								
								XQuartz: Added option to enable/disable test extensions  
							
							... 
							
							
							
							defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9)
(cherry picked from commit 635019ad18db921fec99256294debd8571074abf) 
							
						 
						
							2008-11-28 13:02:54 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a9796c7bc4 
								
							 
						 
						
							
							
								
								XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...  
							
							... 
							
							
							
							(cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600) 
							
						 
						
							2008-11-28 13:02:41 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								94df1ab7f0 
								
							 
						 
						
							
							
								
								XQuartz: Force X11Controller to reset a broken DISPLAY envvar.  
							
							... 
							
							
							
							(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f) 
							
						 
						
							2008-11-25 11:53:06 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0b314c50a2 
								
							 
						 
						
							
							
								
								XQuartz: Removed hardcoded org.x.X11 from MachIPC as well  
							
							... 
							
							
							
							(cherry picked from commit b4add7826d485600a13eba6a9c7be533f2c02d51) 
							
						 
						
							2008-11-25 11:52:59 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 fbf4b0d33fa5dc618c3191a4e823232dfa33cd95) 
							
						 
						
							2008-11-25 00:54:47 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								40187f782b 
								
							 
						 
						
							
							
								
								XQuartz: Dead code removal  
							
							... 
							
							
							
							(cherry picked from commit eeb323612e0adbea37befed31bbaa1d295728385) 
							
						 
						
							2008-11-25 00:54:42 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ab12c75162 
								
							 
						 
						
							
							
								
								XQuartz: More Tiger cleanup: bootstrap_strerror  
							
							... 
							
							
							
							(cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622) 
							
						 
						
							2008-11-25 00:54:17 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ca64b5949d 
								
							 
						 
						
							
							
								
								XQuartz: Don't use LS to find X11.app on Tiger.  
							
							... 
							
							
							
							(cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560) 
							
						 
						
							2008-11-21 11:55:49 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 42944936326ef8732f622db9f75b79a92980550d) 
							
						 
						
							2008-11-15 19:52:34 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b078936571 
								
							 
						 
						
							
							
								
								XQuartz: Initial work on readding GLX to the 1.5 server  
							
							... 
							
							
							
							(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb) 
							
						 
						
							2008-11-14 15:10:32 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0fca8588a2 
								
							 
						 
						
							
							
								
								XQuartz: Added more debugging to handoff spew  
							
							... 
							
							
							
							(cherry picked from commit acefa7e3c8706ffedc052effd50b36ce10e72c22) 
							
						 
						
							2008-11-13 11:34:27 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								93d7cd31c5 
								
							 
						 
						
							
							
								
								XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option  
							
							... 
							
							
							
							(cherry picked from commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7) 
							
						 
						
							2008-10-31 15:48:15 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f12d7ad164 
								
							 
						 
						
							
							
								
								XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app  
							
							... 
							
							
							
							(cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b) 
							
						 
						
							2008-10-28 22:01:40 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6020c3fbfe 
								
							 
						 
						
							
							
								
								XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.  
							
							... 
							
							
							
							(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b) 
							
						 
						
							2008-10-03 11:11:47 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1119fe136f 
								
							 
						 
						
							
							
								
								XQuartz: Changed around fd handoff model to be more robust  
							
							... 
							
							
							
							(cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b) 
							
						 
						
							2008-09-12 15:26:01 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b3836e5bdd 
								
							 
						 
						
							
							
								
								XQuartz: Cleaned up our sleeping before adding the launchd socket.  
							
							... 
							
							
							
							(cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
(cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d) 
							
						 
						
							2008-09-03 09:24:59 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1885582444 
								
							 
						 
						
							
							
								
								XQuartz: Placate automake which doesn't like escaped newlines even in comments...  
							
							... 
							
							
							
							(cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1) 
							
						 
						
							2008-08-29 21:18:26 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 aaf0f71db197526b6b866cc1b39fbdfe051879ef) 
							
						 
						
							2008-08-29 20:55:25 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 54a882dcbdccef3f3eb4e6398e13c88185a8986c) 
							
						 
						
							2008-08-26 20:19:44 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								073116cc44 
								
							 
						 
						
							
							
								
								Remove commented out lines that make automake 1.9 puke.  
							
							
							
						 
						
							2008-08-08 12:15:27 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4a0947bf06 
								
							 
						 
						
							
							
								
								XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...  
							
							... 
							
							
							
							(cherry picked from commit 4545ba91e9d6ad62b6cafde3c73a672d3ded91a2) 
							
						 
						
							2008-08-08 01:53:36 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								26d31ad1c7 
								
							 
						 
						
							
							
								
								XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.  
							
							... 
							
							
							
							(cherry picked from commit a8f0d32216e321b8ae6da182be9b1ea792f6e004) 
							
						 
						
							2008-08-05 18:47:35 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0ef3243fb5 
								
							 
						 
						
							
							
								
								XQuartz: More fd handoff cleanup.  
							
							... 
							
							
							
							(cherry picked from commit 199d2dcb708c9f9d6b9ede149ea0fe9fba6c007c) 
							
						 
						
							2008-08-05 18:47:35 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6836f9aac8 
								
							 
						 
						
							
							
								
								XQUartz: UI Cleanup.  Removed done/cancel buttons from Applications->Customize  
							
							... 
							
							
							
							(cherry picked from commit d3157ca45c1f88edd040d721c1e944b9d2c090aa) 
							
						 
						
							2008-08-05 18:47:34 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								30851efdd4 
								
							 
						 
						
							
							
								
								XQuartz: Fixed first-client-can't-connect bug  
							
							... 
							
							
							
							Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c) 
							
						 
						
							2008-08-05 12:54:51 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								90dd2de845 
								
							 
						 
						
							
							
								
								XQuartz: Some fd handoff cleanup.  
							
							... 
							
							
							
							(cherry picked from commit 9c20a4804d97e67a988f00f49866997209cce518) 
							
						 
						
							2008-07-11 10:13:32 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e69b9f9ca4 
								
							 
						 
						
							
							
								
								XQuartz: Set noPanoramixExtension earlier to avoid a possible race.  
							
							... 
							
							
							
							(cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba) 
							
						 
						
							2008-07-11 10:13:13 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c180a52332 
								
							 
						 
						
							
							
								
								XQuartz: Removed code path for old startup  
							
							... 
							
							
							
							(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c) 
							
						 
						
							2008-06-10 10:51:58 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								5170c169db 
								
							 
						 
						
							
							
								
								XQuartz: Fixed the "laggy" startup under the new model.  This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.  
							
							... 
							
							
							
							(cherry picked from commit ee92aced10d0743c4658e53b58b5d9f5a094a415) 
							
						 
						
							2008-06-10 01:46:01 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								40855d8000 
								
							 
						 
						
							
							
								
								XQuartz: Removed async debugging sleep  
							
							... 
							
							
							
							(cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d) 
							
						 
						
							2008-06-04 12:24:15 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ee86b75119 
								
							 
						 
						
							
							
								
								XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling  
							
							... 
							
							
							
							(cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e) 
							
						 
						
							2008-06-04 12:24:12 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								38da26cd36 
								
							 
						 
						
							
							
								
								XQuartz: Don't forget to destroy the mutex and cond after we're done with them  
							
							... 
							
							
							
							(cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72) 
							
						 
						
							2008-06-04 12:24:10 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ea40fcf434 
								
							 
						 
						
							
							
								
								XQuartz: Fork for trigger  
							
							... 
							
							
							
							(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e) 
							
						 
						
							2008-06-04 12:24:06 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2393dae6ff 
								
							 
						 
						
							
							
								
								XQuartz: Switched over to new startup path for testing.  Cleaned it up a bit.  Server still crashes when using the icon to launch =/  
							
							... 
							
							
							
							(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5) 
							
						 
						
							2008-06-04 12:24:04 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								7082929ef7 
								
							 
						 
						
							
							
								
								XQuartz: A 2 second delay for launchd socket connections should be sufficient.  
							
							... 
							
							
							
							(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529) 
							
						 
						
							2008-05-23 02:32:37 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								225dddbaed 
								
							 
						 
						
							
							
								
								XQuartz: Move the launchd display grabbing into mach_startup  
							
							... 
							
							
							
							(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e) 
							
						 
						
							2008-05-23 02:31:41 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								3a22190061 
								
							 
						 
						
							
							
								
								XQuartz: Fixed a few issues with fd passing... still not working =(  
							
							... 
							
							
							
							(cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa) 
							
						 
						
							2008-05-23 02:31:38 -07:00