mipointer: Remove deprecated miPointerCurrentScreen
The only remaining use was in some debugging code in DMX. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
		
							parent
							
								
									b5d66b9513
								
							
						
					
					
						commit
						e4b15125bb
					
				| 
						 | 
				
			
			@ -419,10 +419,9 @@ dmxBackendCollectEvents(DevicePtr pDev,
 | 
			
		|||
            }
 | 
			
		||||
            break;
 | 
			
		||||
        case MotionNotify:
 | 
			
		||||
            DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d (mi %d)"
 | 
			
		||||
            DMXDBG8("dmxBackendCollectEvents: MotionNotify %d/%d"
 | 
			
		||||
                    " newscreen=%d: %d %d (e=%d; last=%d,%d)\n",
 | 
			
		||||
                    dmxScreen->index, priv->myScreen,
 | 
			
		||||
                    miPointerCurrentScreen()->myNum,
 | 
			
		||||
                    priv->newscreen,
 | 
			
		||||
                    X.xmotion.x, X.xmotion.y,
 | 
			
		||||
                    entered, priv->lastX, priv->lastY);
 | 
			
		||||
| 
						 | 
				
			
			@ -579,9 +578,6 @@ dmxBackendLateReInit(DevicePtr pDev)
 | 
			
		|||
    GETPRIVFROMPDEV;
 | 
			
		||||
    int x, y;
 | 
			
		||||
 | 
			
		||||
    DMXDBG1("dmxBackendLateReInit miPointerCurrentScreen() = %p\n",
 | 
			
		||||
            miPointerCurrentScreen());
 | 
			
		||||
 | 
			
		||||
    dmxBackendSameDisplay(NULL, 0);     /* Invalidate cache */
 | 
			
		||||
    dmxBackendInitPrivate(pDev);
 | 
			
		||||
    dmxBackendComputeCenter(priv);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -480,15 +480,6 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
 | 
			
		|||
    pPointer->limits.y2 = pScreen->height;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * @return The current screen of the VCP
 | 
			
		||||
 */
 | 
			
		||||
ScreenPtr
 | 
			
		||||
miPointerCurrentScreen(void)
 | 
			
		||||
{
 | 
			
		||||
    return miPointerGetScreen(inputInfo.pointer);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * @return The current screen of the given device or NULL.
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -91,11 +91,6 @@ extern _X_EXPORT void miPointerWarpCursor(DeviceIntPtr /*pDev */ ,
 | 
			
		|||
                                          int   /*y */
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
/* Deprecated in favour of miPointerGetScreen. */
 | 
			
		||||
extern _X_EXPORT ScreenPtr
 | 
			
		||||
miPointerCurrentScreen(void
 | 
			
		||||
) _X_DEPRECATED;
 | 
			
		||||
 | 
			
		||||
extern _X_EXPORT ScreenPtr
 | 
			
		||||
miPointerGetScreen(DeviceIntPtr pDev);
 | 
			
		||||
extern _X_EXPORT void
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue