a8d760f567 
								
							 
						 
						
							
							
								
								Get modes code building with old X servers again.  
							
							... 
							
							
							
							This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2"
since XORG_VERSION current went backwards at some point. 
							
						 
						
							2008-03-06 14:42:00 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0ac1755977 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xext/sampleEVI.c 
							
						 
						
							2008-01-26 13:55:07 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1f83f40525 
								
							 
						 
						
							
							
								
								xf86Cursors: fix memset for non-square cursors  
							
							
							
						 
						
							2008-01-15 10:21:17 +10: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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								47ab4d648b 
								
							 
						 
						
							
							
								
								devPrivates rework: convert CursorRec and CursorBits over to new interface.  
							
							
							
						 
						
							2007-08-30 11:40:39 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								81f8b652d9 
								
							 
						 
						
							
							
								
								Add _X_EXPORT to exported functions in hw/xfree86/modes/*  
							
							... 
							
							
							
							Also add missing exports to hw/xfree86/loader/xf86sym.c 
							
						 
						
							2007-08-22 19:26:34 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								7dc8531548 
								
							 
						 
						
							
							
								
								Ref count cursors used in hw/xfree86/modes code.  
							
							... 
							
							
							
							The multi-crtc cursor code in hw/xfree86/modes holds a reference to the
current cursor. This reference must be correctly ref counted so the cursor
is not freed out from underneath this code. 
							
						 
						
							2007-08-20 23:24:12 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f367285fd5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c 
							
						 
						
							2007-08-12 15:31:10 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								722d73a0ef 
								
							 
						 
						
							
							
								
								Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms."  
							
							... 
							
							
							
							This reverts commit 0f057ebb27 
							
						 
						
							2007-07-31 10:34:56 +10:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0f057ebb27 
								
							 
						 
						
							
							
								
								Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms.  
							
							... 
							
							
							
							Doesn't seem necessary to do anything here... 
							
						 
						
							2007-07-25 17:04:04 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								393171034c 
								
							 
						 
						
							
							
								
								Add RandR reflection support.  
							
							... 
							
							
							
							Replace the ad-hoc transformation mechanisms with matrices.
Prepares for more general transformation as well. 
							
						 
						
							2007-07-14 09:03:47 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								015d728bcd 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	dix/devices.c
	dix/events.c
	mi/misprite.c 
							
						 
						
							2007-03-19 09:42:56 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9562b6abe1 
								
							 
						 
						
							
							
								
								Allow xf86_reload_cursors during server init.  
							
							... 
							
							
							
							xf86_reload_cursors is supposed to be called from the crtc mode setting
commit hook; as that happens during server initialization, check for this
case.
(cherry picked from commit 5b77bf2d020b1ee56c1c5f2db089a8f7f64a76a6) 
							
						 
						
							2007-03-15 19:32:48 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ae75019ccf 
								
							 
						 
						
							
							
								
								Create driver-independent CRTC-based cursor layer.  
							
							... 
							
							
							
							This moves most of the cursor management code out of the intel driver and
into the general server code. Of course, the hope is that this code will be
useful for other driver writers as well.
Check out xf86Crtc.h for the usage information, making sure you add the
needed hooks to the crtc funcs structure for your driver.
(cherry picked from commit 4d81c99a4660a0bf9014f789de55edabd185bd14) 
							
						 
						
							2007-03-15 00:02:40 -07:00