diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-28 09:25:06 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-28 09:25:06 +0930 |
| commit | 3005e9c7eb10e212c956e87b3631548e268c794e (patch) | |
| tree | ee8702d148302809153a857b7ff12deb6c96863a | |
| parent | 94b9029e335ddbe7c22a8fe4bf69858b75179219 (diff) | |
Fix build (missing device pointers).
miPointerGetScreen, miPointerGetPosition and pScreen->SetCursorPosition all
require a device argument now. For lack of other choices, just pass in the
VCP.
| -rw-r--r-- | src/gx_randr.c | 6 | ||||
| -rw-r--r-- | src/lx_randr.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gx_randr.c b/src/gx_randr.c index 98a86f7..46dba30 100644 --- a/src/gx_randr.c +++ b/src/gx_randr.c @@ -247,7 +247,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation, pRandr->virtualY = pScrni->virtualY; } - miPointerPosition(&px, &py); + miPointerGetPosition(inputInfo.pointer, &px, &py); for (mode = pScrni->modes;; mode = mode->next) { if (pRandr->maxX == 0 || pRandr->maxY == 0) { @@ -286,13 +286,13 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation, return FALSE; } - if (pScreen == miPointerCurrentScreen()) { + if (pScreen == miPointerGetScreen(inputInfo.pointer)) { px = (px >= pScreen->width ? (pScreen->width - 1) : px); py = (py >= pScreen->height ? (pScreen->height - 1) : py); xf86SetViewport(pScreen, px, py); - (*pScreen->SetCursorPosition) (pScreen, px, py, FALSE); + (*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, px, py, FALSE); } return TRUE; diff --git a/src/lx_randr.c b/src/lx_randr.c index 0d2a8e5..6b12fef 100644 --- a/src/lx_randr.c +++ b/src/lx_randr.c @@ -246,7 +246,7 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation, pRandr->virtualY = pScrni->virtualY; } - miPointerPosition(&px, &py); + miPointerGetPosition(inputInfo.pointer, &px, &py); for (mode = pScrni->modes;; mode = mode->next) { if (pRandr->maxX == 0 || pRandr->maxY == 0) { @@ -285,13 +285,13 @@ LXRandRSetConfig(ScreenPtr pScreen, Rotation rotation, return FALSE; } - if (pScreen == miPointerCurrentScreen()) { + if (pScreen == miPointerGetScreen(inputInfo.pointer)) { px = (px >= pScreen->width ? (pScreen->width - 1) : px); py = (py >= pScreen->height ? (pScreen->height - 1) : py); xf86SetViewport(pScreen, px, py); - (*pScreen->SetCursorPosition) (pScreen, px, py, FALSE); + (*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, px, py, FALSE); } return TRUE; |