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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								fa47910045 
								
							 
						 
						
							
							
								
								Clean up many #if 0.  
							
							
							
						 
						
							2007-12-02 12:40:25 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								05f915050c 
								
							 
						 
						
							
							
								
								dix/events: take screen number, not pointer, in PostSyntheticMotion  
							
							... 
							
							
							
							Since we were using PostSyntheticMotion incorrectly anyway, update the
declared API to match. 
							
						 
						
							2006-12-27 16:38:06 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2d0a63126b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver  
							
							
							
						 
						
							2006-12-19 10:31:40 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ae3c24da34 
								
							 
						 
						
							
							
								
								dix:    Moving SpriteRec into DeviceIntRec  
							
							... 
							
							
							
							removing global sprite structure
	beginning to remove MPX ifdefs
xnest:  Fix to make xnest compile again 
							
						 
						
							2006-12-11 18:09:59 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1dcda4f3c5 
								
							 
						 
						
							
							
								
								Avoid dereferencing sprite.screen when Xinerama is not running. ( #8925 )  
							
							... 
							
							
							
							With Xinerama support built into the X server but not in use,
sprite.screen is NULL and yet the SyntheticMotion
macro would dereference it. Avoid that by just passing sprite.screen
to PostSyntheticMotion which can then dereference it when Xinerama is
enabled.
Also, define PostSyntheticMotion in dixevents.h and include dixevents.h in
getevents.c 
							
						 
						
							2006-11-07 01:29:51 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								825a95a1fa 
								
							 
						 
						
							
							
								
								Remove use of dix-config and xorg-config.h from public headers.  
							
							
							
						 
						
							2005-08-24 11:18:35 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9508a382f8 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-14 16:48:57 +00:00