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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e96d926d64 
								
							 
						 
						
							
							
								
								Xi: remove trailing whitespaces.  
							
							
							
						 
						
							2007-11-13 17:14:35 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a05f43bf3e 
								
							 
						 
						
							
							
								
								dix: When the last slave is removed, set master to the original classes.  
							
							... 
							
							
							
							DeviceClassesChangedEvent is sent to the client, where device == new slave. 
							
						 
						
							2007-11-12 11:35:18 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								7a81bafc9b 
								
							 
						 
						
							
							
								
								Xi, dix: Add ability to change MD classes + send event when doing so.  
							
							... 
							
							
							
							Each time a different slave device sends through a master, an
DeviceClassesChangedEvent is enqueued. When this event is processed, all
classes of the matching master device are changed, and the event is sent to
the clients.
Next time the master is queried, it thus shows the evclasses of the last slave
device. The original classes are stored in the devPrivates.
TODO: if all slave devices are removed, the master's original classes need to
be restored. 
							
						 
						
							2007-11-09 23:10:24 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6dcde0e9c1 
								
							 
						 
						
							
							
								
								Xi: set master device's id in ListDevices Reply.  
							
							
							
						 
						
							2007-10-19 11:28:50 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								cfcc6e14b9 
								
							 
						 
						
							
							
								
								Xi: return all master devices as type IsXPointer/Keyboard when listing devs.  
							
							... 
							
							
							
							Slave devices are reported as IsXExtensionPointer/Keyboard. 
							
						 
						
							2007-10-19 11:28:44 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								5c03d13181 
								
							 
						 
						
							
							
								
								xace: add new hooks + access controls: XInput extension.  
							
							... 
							
							
							
							Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice. 
							
						 
						
							2007-09-28 08:02:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e8777a91f3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c 
							
						 
						
							2007-04-02 15:36:26 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a12054757d 
								
							 
						 
						
							
							
								
								Xi:     fix ProcXListInputDevices to include the virtual core devices.  
							
							
							
						 
						
							2007-04-02 11:20:44 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								307d2b57bb 
								
							 
						 
						
							
							
								
								Xi:     remove 'register' keywords.  
							
							
							
						 
						
							2007-03-29 15:23:41 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e88fa75c9b 
								
							 
						 
						
							
							
								
								Static cleanup on Xi/  
							
							
							
						 
						
							2007-03-25 21:18:39 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								458c63a841 
								
							 
						 
						
							
							
								
								enable adding devices after removal of a middle device  
							
							... 
							
							
							
							Allow new devices to be added after a device that _wasn't_ the last on the
list was removed, by ensuring inputInfo.numDevices always increases, and
never decreases. 
							
						 
						
							2006-08-07 23:02:17 +03:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0a2068d123 
								
							 
						 
						
							
							
								
								Xi: add XExtension{Keyboard,Pointer} types  
							
							... 
							
							
							
							Report XExtensionKeyboard for non-core keyboards, and XExtensionPointer for
non-core pointers/mice. 
							
						 
						
							2006-07-21 15:19:52 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6d7083bd69 
								
							 
						 
						
							
							
								
								indent fixes (OMG SO UGLY), and nuke old RCS keywords.  
							
							
							
						 
						
							2006-02-20 22:16:49 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								5480c537ce 
								
							 
						 
						
							
							
								
								ANSIfy Xi/. Mostly automated via protoize(1).  
							
							
							
						 
						
							2006-02-20 21:50:49 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0664db19bf 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							
							
						 
						
							2004-04-23 18:54:16 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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