Peter Hutterer
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								eb8dc11d19 
								
							 
						 
						
							
							
								
								Remove some MAX* #defines that never get used.  
							
							 
							
							
							
						 
						
							2008-02-14 07:11:07 +11:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Peter Hutterer
							
						 
						
							
							
							
							
								
							
							
								5ccc09b182 
								
							 
						 
						
							
							
								
								Use the same struct for generic event masks throughout the code.  
							
							 
							
							... 
							
							
							
							Renaming those structs too.
Previously grabs were using a different struct than windows, which was
reasonably stupid. 
							
						 
						
							2007-07-06 15:43:08 +09:30  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Peter Hutterer
							
						 
						
							
							
							
							
								
							
							
								1f97a76476 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							 
							
							... 
							
							
							
							Conflicts:
	dix/devices.c
	hw/xfree86/common/xf86Xinput.c
	hw/xfree86/loader/xf86sym.c
	mi/mieq.c 
							
						 
						
							2007-06-19 17:20:52 +09:30  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Soren Sandmann Pedersen
							
						 
						
							
							
							
							
								
							
							
								e037052ac5 
								
							 
						 
						
							
							
								
								Turn boxes and regions into typedefs for pixman types  
							
							 
							
							
							
						 
						
							2007-05-15 11:13:14 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Peter Hutterer
							
						 
						
							
							
							
							
								
							
							
								4dc973f08c 
								
							 
						 
						
							
							
								
								Add ExtendedGrabDevice handling.  
							
							 
							
							... 
							
							
							
							Add XGE handling in DeliverGrabbedEvent.
We can now grab something selecting XGE events, but the current code is a
bit messy and doesn't work too well yet. 
							
						 
						
							2007-05-14 10:42:03 +09:30  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							 
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								84683f19b4 
								
							 
						 
						
							
							
								
								get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE  
							
							 
							
							... 
							
							
							
							Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone. 
							
						 
						
							2006-07-18 18:17:38 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								0bb669638f 
								
							 
						 
						
							
							
								
								Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".  
							
							 
							
							
							
						 
						
							2005-07-03 08:53:54 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								9b1debcdb6 
								
							 
						 
						
							
							
								
								Change all misc.h and os.h references to <X11/foo.h>.  
							
							 
							
							
							
						 
						
							2005-07-01 22:43:43 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kevin E Martin
							
						 
						
							
							
							
							
								
							
							
								7f9e263658 
								
							 
						 
						
							
							
								
								Revert change to MAXFORMATS to maintain binary compatibility  
							
							 
							
							
							
						 
						
							2004-07-17 20:44:14 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kevin E Martin
							
						 
						
							
							
							
							
								
							
							
								7976ee51af 
								
							 
						 
						
							
							
								
								Add Distributed Multihead X (DMX) support  
							
							 
							
							
							
						 
						
							2004-06-30 20:06:56 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								2fb5886200 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							 
							
							
							
						 
						
							2004-04-23 19:54:30 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								df0313d35b 
								
							 
						 
						
							
							
								
								readding XFree86's cvs IDs  
							
							 
							
							
							
						 
						
							2004-02-26 13:36:15 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kaleb Keithley
							
						 
						
							
							
							
							
								
							
							
								adc7f9a4eb 
								
							 
						 
						
							
							
								
								XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks  
							
							 
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kaleb Keithley
							
						 
						
							
							
							
							
								
							
							
								d568221710 
								
							 
						 
						
							
							
								
								XFree86 4.3.0.1  
							
							 
							
							
							
						 
						
							2003-11-14 16:49:22 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kaleb Keithley
							
						 
						
							
							
							
							
								
							
							
								ded6147bfb 
								
							 
						 
						
							
							
								
								R6.6 is the Xorg base-line  
							
							 
							
							
							
						 
						
							2003-11-14 15:54:54 +00:00