c8feb73f58 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h
Trying to pick up the pieces from the darwin churn here... 
							
						 
						
							2007-12-13 18:38:25 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0ad1c359c5 
								
							 
						 
						
							
							
								
								Darwin: Use __APPLE__ instead of __DARWIN__  
							
							... 
							
							
							
							(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175) 
							
						 
						
							2007-12-07 18:54:58 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								60be452c2e 
								
							 
						 
						
							
							
								
								xace: restore the old SaveScreens function and introduce new API, since the  
							
							... 
							
							
							
							old version is called from drivers... 
							
						 
						
							2007-11-19 16:59:34 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4017d31902 
								
							 
						 
						
							
							
								
								devPrivates rework: since API is already broken, switch everything  
							
							... 
							
							
							
							over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates. 
							
						 
						
							2007-08-28 09:28:25 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b82557c9fb 
								
							 
						 
						
							
							
								
								xace: add hooks + new access codes: core protocol screensaver requests  
							
							
							
						 
						
							2007-08-16 10:36:05 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2763056ab5 
								
							 
						 
						
							
							
								
								xace: add hooks + new access codes: core protocol window requests  
							
							
							
						 
						
							2007-08-13 13:44:33 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4d76075dbb 
								
							 
						 
						
							
							
								
								Death to RCS tags.  
							
							
							
						 
						
							2007-06-29 14:06:52 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4b5802ddbd 
								
							 
						 
						
							
							
								
								General DIX static and dead code cleanup.  
							
							
							
						 
						
							2007-03-25 17:57:54 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								96c19a3ec1 
								
							 
						 
						
							
							
								
								put function prototype for ShapeExtensionInit() in proper place  
							
							... 
							
							
							
							based on FIXME in mi/miinitext.c 
							
						 
						
							2006-06-09 09:51:28 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e31e8ace10 
								
							 
						 
						
							
							
								
								Fix composite overlay window bug 6411  
							
							
							
						 
						
							2006-03-29 17:51:54 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c2dedf4d17 
								
							 
						 
						
							
							
								
								Thu Jan 12 17:09:18 2006 Søren Sandmann <sandmann@redhat.com>  
							
							... 
							
							
							
							Add new functions to enable and disable events on Map and Unmap.
Use them here to make sure Composite redirect doesn't cause Map/UnmapNotify
    events that would confuse window managers. 
							
						 
						
							2006-01-12 22:14:56 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								825a95a1fa 
								
							 
						 
						
							
							
								
								Remove use of dix-config and xorg-config.h from public headers.  
							
							
							
						 
						
							2005-08-24 11:18:35 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0bb669638f 
								
							 
						 
						
							
							
								
								Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".  
							
							
							
						 
						
							2005-07-03 08:53:54 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e03198972c 
								
							 
						 
						
							
							
								
								Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.  
							
							... 
							
							
							
							Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>. 
							
						 
						
							2005-07-03 07:02:09 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9b1debcdb6 
								
							 
						 
						
							
							
								
								Change all misc.h and os.h references to <X11/foo.h>.  
							
							
							
						 
						
							2005-07-01 22:43:43 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								292c4cff26 
								
							 
						 
						
							
							
								
								Fix includes right throughout the Xserver tree:  
							
							... 
							
							
							
							change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. 
							
						 
						
							2005-04-20 12:25:48 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								813d75f9d3 
								
							 
						 
						
							
							
								
								Use LibraryTargetName when not building a loadable server  
							
							... 
							
							
							
							Move extern function declarations to window.h
Cleaned up code since client's saveSet is no longer defined as a pointer*
Added externs back in
Change #if to #ifdef to fix compiler warning
Add function declarations that were inadvertently removed by previous check
    in
Disable extensions that are not (yet) supported by DMX 
							
						 
						
							2004-07-29 23:43:40 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e1281790bb 
								
							 
						 
						
							
							
								
								Integration of DAMAGE-XFIXES branch to trunk  
							
							... 
							
							
							
							https://freedesktop.org/bugzilla/show_bug.cgi?id=859 
Modified Files: cursorstr.h dix.h dixstruct.h regionstr.h window.h 
						
							2004-07-29 18:16:56 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2fb5886200 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							
							
						 
						
							2004-04-23 19:54:30 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								dae90c3af9 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004  
							
							
							
						 
						
							2004-03-14 08:34:49 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								867451f1ab 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004  
							
							
							
						 
						
							2004-03-03 12:12:50 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								df0313d35b 
								
							 
						 
						
							
							
								
								readding XFree86's cvs IDs  
							
							
							
						 
						
							2004-02-26 13:36:15 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								147aae87fd 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004  
							
							
							
						 
						
							2004-02-26 09:23:53 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								adc7f9a4eb 
								
							 
						 
						
							
							
								
								XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks  
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d568221710 
								
							 
						 
						
							
							
								
								XFree86 4.3.0.1  
							
							
							
						 
						
							2003-11-14 16:49:22 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ded6147bfb 
								
							 
						 
						
							
							
								
								R6.6 is the Xorg base-line  
							
							
							
						 
						
							2003-11-14 15:54:54 +00:00