On Tue, Jul 22, 2014 at 11:46 AM, Adam Jackson <[email protected]> wrote: > Signed-off-by: Adam Jackson <[email protected]>
Reviewed-by: Alex Deucher <[email protected]> > --- > hw/xfree86/common/xf86Cursor.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c > index c6abf12..92c08af 100644 > --- a/hw/xfree86/common/xf86Cursor.c > +++ b/hw/xfree86/common/xf86Cursor.c > @@ -74,8 +74,6 @@ static miPointerScreenFuncRec xf86PointerScreenFuncs = { > > static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS]; > > -static Bool HardEdges; > - > /* > * xf86InitViewport -- > * Initialize paning & zooming parameters, so that a driver must only > @@ -429,16 +427,6 @@ xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y) > } > } > > -#if 0 > - /* This presents problems for overlapping screens when > - HardEdges is used. Have to think about the logic more */ > - if ((*x < 0) || (*x >= (*pScreen)->width) || > - (*y < 0) || (*y >= (*pScreen)->height)) { > - /* We may have crossed more than one screen */ > - xf86CursorOffScreen(pScreen, x, y); > - } > -#endif > - > return TRUE; > } > > @@ -582,9 +570,6 @@ xf86InitOrigins(void) > xf86ScreenLayoutPtr pLayout; > Bool OldStyleConfig = FALSE; > > - /* need to have this set up with a config file option */ > - HardEdges = FALSE; > - > memset(xf86ScreenLayout, 0, MAXSCREENS * sizeof(xf86ScreenLayoutRec)); > > screensLeft = prevScreensLeft = (1 << xf86NumScreens) - 1; > @@ -836,7 +821,7 @@ xf86InitOrigins(void) > } > } > > - if (!HardEdges && !OldStyleConfig) { > + if (!OldStyleConfig) { > for (i = 0; i < xf86NumScreens; i++) { > pLayout = &xf86ScreenLayout[i]; > pScreen = xf86Screens[i]->pScreen; > -- > 1.9.3 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
