fd06e8f8c1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into dcdc_rework  
							
							... 
							
							
							
							Conflicts:
	Xext/xevie.c
	dix/dispatch.c 
							
						 
						
							2008-04-07 07:56:41 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4f2cd0ed96 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c 
							
						 
						
							2008-03-04 18:11:10 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								cc76ea6e3a 
								
							 
						 
						
							
							
								
								XACE: Add generic support for property and selection polyinstantiation.  
							
							
							
						 
						
							2008-02-29 18:01:37 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d5715f7bea 
								
							 
						 
						
							
							
								
								dix: Refactoring of property code to allow for polyinstantiation.  
							
							... 
							
							
							
							Introduces dixLookupProperty() API. 
							
						 
						
							2008-02-29 18:01:37 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								bb1a577a68 
								
							 
						 
						
							
							
								
								XACE: Move the property access hook to its own function.  
							
							
							
						 
						
							2008-02-05 20:07:08 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8da83836b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c 
							
						 
						
							2008-01-03 17:04:54 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0b729051c0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c 
							
						 
						
							2007-11-07 15:37:23 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a52c9b2a59 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c 
							
						 
						
							2007-11-05 19:08:36 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								914922fd61 
								
							 
						 
						
							
							
								
								DIX: Remove usage of alloca  
							
							... 
							
							
							
							Replace with heap allocations. 
							
						 
						
							2007-11-05 14:34:43 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8f23d40068 
								
							 
						 
						
							
							
								
								xace: move the property deletion hook inside the DeleteProperty function.  
							
							
							
						 
						
							2007-10-10 19:56:03 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								473bc6ec4c 
								
							 
						 
						
							
							
								
								xace: remove the special-cased "ignore" functionality from the property code.  
							
							... 
							
							
							
							There will be no more faking of Success to hide things.  XACE does not
provide polyinstantiation. 
							
						 
						
							2007-10-10 19:43:12 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8b508f5d6b 
								
							 
						 
						
							
							
								
								dix: unify ErrorFs. prepend all with [dix].  
							
							
							
						 
						
							2007-09-26 15:19:53 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b424e01ec5 
								
							 
						 
						
							
							
								
								xace: add hooks + new access codes: core protocol property requests  
							
							
							
						 
						
							2007-08-15 14:13:27 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e34fcd2bf4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	dix/devices.c
	dix/property.c
	include/dix.h 
							
						 
						
							2007-08-02 14:27:03 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								7da38bb6a1 
								
							 
						 
						
							
							
								
								Partial redundancy elimination in PropertyNotify generation.  
							
							
							
						 
						
							2007-07-21 15:27:40 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9cee4ec5e6 
								
							 
						 
						
							
							
								
								xace: change the semantics of the return value of XACE hooks to allow  
							
							... 
							
							
							
							arbitrary X status codes instead of just TRUE/FALSE.
The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however.  There is more error propagation
work to do. 
							
						 
						
							2007-04-17 16:01:56 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0331c6a8fc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							
							
						 
						
							2007-03-26 10:28:05 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								84a066cc88 
								
							 
						 
						
							
							
								
								xace: pass serverClient as default argument to dixChangeWindowProperty  
							
							... 
							
							
							
							instead of NullClient. 
							
						 
						
							2007-03-23 10:33:53 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e1cc68add0 
								
							 
						 
						
							
							
								
								xace: drop the name argument from the property callback.  
							
							
							
						 
						
							2007-03-22 17:33:16 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1b766ffc06 
								
							 
						 
						
							
							
								
								dix: reorganize property code to better support xace hook; requires new API for  
							
							... 
							
							
							
							changing a property, dixChangeWindowProperty, taking an additional client argument. 
							
						 
						
							2007-03-22 15:55:35 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1b58304ac8 
								
							 
						 
						
							
							
								
								xace: add new argument to property hook for property structure itself.  
							
							
							
						 
						
							2007-03-22 14:07:01 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								5486be4898 
								
							 
						 
						
							
							
								
								dix: devPrivates support for PropertyRec.  
							
							
							
						 
						
							2007-03-22 10:59:21 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								63169ce52d 
								
							 
						 
						
							
							
								
								dix: remove 'register' keyword for all variables.  
							
							
							
						 
						
							2007-03-08 17:50:25 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								25d5e0a629 
								
							 
						 
						
							
							
								
								Convert callers of SecurityLookupWindow() to dixLookupWindow().  
							
							
							
						 
						
							2006-12-15 15:50:46 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6c46645cfc 
								
							 
						 
						
							
							
								
								Naming change: Security*Access -> Dix*Access  
							
							
							
						 
						
							2006-12-14 14:45:42 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ac90ce58ba 
								
							 
						 
						
							
							
								
								Naming change: Security*Operation -> Xace*Operation  
							
							
							
						 
						
							2006-12-01 21:15:41 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f44f14fe56 
								
							 
						 
						
							
							
								
								Define calls away when not building XACE, allowing ifdef's to be removed.  
							
							
							
						 
						
							2006-12-01 21:15:41 -05: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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d44b2a0a57 
								
							 
						 
						
							
							
								
								Move Xserver API for security extension to securitysrv.h  
							
							
							
						 
						
							2006-06-20 18:22:51 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								37f0ae0245 
								
							 
						 
						
							
							
								
								Replace XC-SECURITY code with XACE security hooks  
							
							... 
							
							
							
							(cherry picked from 8526cd6395 
							
						 
						
							2006-06-19 17:09:37 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a9ed5a8790 
								
							 
						 
						
							
							
								
								Kill LBX, too.  
							
							
							
						 
						
							2006-06-01 22:06:41 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f105b8da11 
								
							 
						 
						
							
							
								
								Mark everything in dixsym.c as _X_EXPORT.  
							
							
							
						 
						
							2006-02-15 20:44:13 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8d0e520721 
								
							 
						 
						
							
							
								
								xc/programs/Xserver/dix/atom.c  
							
							... 
							
							
							
							xc/programs/Xserver/dix/colormap.c
xc/programs/Xserver/dix/cursor.c
xc/programs/Xserver/dix/devices.c
xc/programs/Xserver/dix/dispatch.c
xc/programs/Xserver/dix/dixfonts.c
xc/programs/Xserver/dix/dixutils.c
xc/programs/Xserver/dix/events.c
xc/programs/Xserver/dix/extension.c
xc/programs/Xserver/dix/gc.c
xc/programs/Xserver/dix/glyphcurs.c
xc/programs/Xserver/dix/grabs.c
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/pixmap.c
xc/programs/Xserver/dix/privates.c
xc/programs/Xserver/dix/property.c
xc/programs/Xserver/dix/resource.c
xc/programs/Xserver/dix/swaprep.c
xc/programs/Xserver/dix/swapreq.c
//bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037 
    (https://bugs.freedesktop.org/attachment.cgi?id=2037 ) ANSI-fy
    Xserver/dix code. The conversion preserves the comments which annotate
    variables. These have been moved into doxygen(esque?) "stubs" above
    each function. Patch by Mike Owens <etc@filespanker.com>. 
							
						 
						
							2005-03-07 23:02:59 +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