diff options
| author | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2008-07-04 03:55:59 -0300 |
|---|---|---|
| committer | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2008-07-04 03:55:59 -0300 |
| commit | 3164288b121990a5990747c0f92d4af13b1c929a (patch) | |
| tree | 45f39bf2b7e56643199515f08dc2df0fb98384cc | |
| parent | d1031a8972490ebf0ef6dc2762036a7a7172466b (diff) | |
Remove deprecated function miPointerPosition().
| -rw-r--r-- | hw/xfree86/common/xf86RandR.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/dri.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/misym.c | 1 | ||||
| -rw-r--r-- | mi/mipointer.c | 6 | ||||
| -rw-r--r-- | mi/mipointer.h | 6 |
5 files changed, 2 insertions, 15 deletions
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 47023926c..b71924f09 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -243,7 +243,7 @@ xf86RandRSetConfig (ScreenPtr pScreen, Bool useVirtual = FALSE; Rotation oldRotation = randrp->rotation; - miPointerPosition (&px, &py); + miPointerGetPosition(inputInfo.pointermi, &px, &py); for (mode = scrp->modes; ; mode = mode->next) { if (mode->HDisplay == pSize->width && diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index ae8818932..ac40e0fe0 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -2301,7 +2301,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags) pScrn->frameY1 = pScrn->frameY0 + pDRIPriv->pSAREA->frame.height - 1; /* Fix up cursor */ - miPointerPosition(&px, &py); + miPointerGetPosition(inputInfo.pointer, &px, &py); if (px < pScrn->frameX0) px = pScrn->frameX0; if (px > pScrn->frameX1) px = pScrn->frameX1; if (py < pScrn->frameY0) py = pScrn->frameY0; diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index aa712c03a..c7542288e 100644 --- a/hw/xfree86/loader/misym.c +++ b/hw/xfree86/loader/misym.c @@ -160,7 +160,6 @@ _X_HIDDEN void *miLookupTab[] = { SYMFUNC(miPutImage) SYMFUNC(miPushPixels) SYMFUNC(miPointerInitialize) - SYMFUNC(miPointerPosition) SYMFUNC(miRecolorCursor) SYMFUNC(miPointerWarpCursor) SYMFUNC(miDCInitialize) diff --git a/mi/mipointer.c b/mi/mipointer.c index 4763e1269..809ce5e8b 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -560,12 +560,6 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time) } _X_EXPORT void -miPointerPosition (int *x, int *y) -{ - miPointerGetPosition(inputInfo.pointer, x, y); -} - -_X_EXPORT void miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y) { *x = MIPOINTER(pDev)->x; diff --git a/mi/mipointer.h b/mi/mipointer.h index d2e4455eb..179e4f371 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -134,12 +134,6 @@ extern void miPointerAbsoluteCursor( unsigned long /*time*/ ) _X_DEPRECATED; -/* Deprecated in favour of miPointerGetPosition. */ -extern void miPointerPosition( - int * /*x*/, - int * /*y*/ -) _X_DEPRECATED; - /* Deprecated in favour of miPointerSetScreen. */ extern void miPointerSetNewScreen( int, /*screen_no*/ |