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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6adeba1730 
								
							 
						 
						
							
							
								
								dix: Add a new "registry" mechanism for registering string names of things.  
							
							... 
							
							
							
							Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it. 
							
						 
						
							2007-10-11 14:18:59 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9a183d7ba5 
								
							 
						 
						
							
							
								
								dix: remove caching of drawables and graphics contexts.  The security checks  
							
							... 
							
							
							
							simply bypass the cached values so they are unused. 
							
						 
						
							2007-08-14 11:39:26 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ed75b05651 
								
							 
						 
						
							
							
								
								dix: add new, combined resource lookup function.  Move all dix lookup API  
							
							... 
							
							
							
							deprecated so far to a new file dix/deprecated.c.  Remove the deprecation
warnings for the time being. 
							
						 
						
							2007-04-04 16:00:15 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c9fb8a3533 
								
							 
						 
						
							
							
								
								dix: move access codes to separate header file, add DixCreateAccess.  
							
							
							
						 
						
							2007-03-22 17:23:26 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b9cff1670f 
								
							 
						 
						
							
							
								
								Add ResourceStateCallback similar in function to ClientStateCallback.  
							
							
							
						 
						
							2007-03-08 12:13:52 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2fcb45eb5d 
								
							 
						 
						
							
							
								
								devPrivates rework: redo field offset registration, drop RC_PRIVATES class.  
							
							
							
						 
						
							2007-03-08 12:13:36 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e684824709 
								
							 
						 
						
							
							
								
								devPrivates rework: redo interface and implementation.  
							
							
							
						 
						
							2007-03-05 11:50:45 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								74f1de1de9 
								
							 
						 
						
							
							
								
								devPrivates rework: unhook resource system; will try a different approach.  
							
							
							
						 
						
							2007-03-01 12:17:29 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								81372f9096 
								
							 
						 
						
							
							
								
								devPrivates rework: hook up new interface in resource system; add new  
							
							... 
							
							
							
							resource-adding function that takes an additional ScreenPtr argument. 
							
						 
						
							2007-02-23 13:23:12 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9a3eb0357e 
								
							 
						 
						
							
							
								
								devPrivates rework: add RC_PRIVATES class, make ResourceRec visible in  
							
							... 
							
							
							
							the API, and add extra fields and structure supporting private storage. 
							
						 
						
							2007-02-21 07:46:44 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6c46645cfc 
								
							 
						 
						
							
							
								
								Naming change: Security*Access -> Dix*Access  
							
							
							
						 
						
							2006-12-14 14:45:42 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								52ba722e4c 
								
							 
						 
						
							
							
								
								Merge branch 'XACE-modular' into my-XACE-modular  
							
							
							
						 
						
							2006-08-21 18:49:31 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c2535f6792 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular  
							
							
							
						 
						
							2006-08-10 10:37:59 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9138d5a51e 
								
							 
						 
						
							
							
								
								Make SecurityLookupIDBy* part of the base functionality.  
							
							
							
						 
						
							2006-08-03 18:24:04 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								37f0ae0245 
								
							 
						 
						
							
							
								
								Replace XC-SECURITY code with XACE security hooks  
							
							... 
							
							
							
							(cherry picked from 8526cd6395 
							
						 
						
							2006-06-19 17:09:37 -07: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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								657b4cb8aa 
								
							 
						 
						
							
							
								
								Change all misc.h and os.h references to <X11/foo.h>.  
							
							
							
						 
						
							2005-07-01 22:32:34 +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