diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-11-06 10:27:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-11-19 12:12:23 +1000 |
| commit | fd214aabf77c44ba0ca3fd438f0c3c8eb22c7211 (patch) | |
| tree | 1d74e5ba62bfb4a451ef3cc1d19a37baa9de56f7 /Xi/xiquerypointer.c | |
| parent | 011f8458805e443ac9130865d2840a929a00cabf (diff) | |
input: drop FP1616 macro
The double_to_f1616() functions do the same thing, and they're tested.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xi/xiquerypointer.c')
| -rw-r--r-- | Xi/xiquerypointer.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index 7e6852dd0..e9bdd428d 100644 --- a/Xi/xiquerypointer.c +++ b/Xi/xiquerypointer.c @@ -50,6 +50,7 @@ #include "panoramiXsrv.h" #endif +#include "inpututils.h" #include "xiquerypointer.h" /*********************************************************************** @@ -127,8 +128,8 @@ ProcXIQueryPointer(ClientPtr client) .sequenceNumber = client->sequence, .length = 6, .root = (GetCurrentRootWindow(pDev))->drawable.id, - .root_x = FP1616(pSprite->hot.x, 0), - .root_y = FP1616(pSprite->hot.y, 0), + .root_x = double_to_fp1616(pSprite->hot.x), + .root_y = double_to_fp1616(pSprite->hot.y), .child = None }; @@ -166,8 +167,8 @@ ProcXIQueryPointer(ClientPtr client) if (pSprite->hot.pScreen == pWin->drawable.pScreen) { rep.same_screen = xTrue; - rep.win_x = FP1616(pSprite->hot.x - pWin->drawable.x, 0); - rep.win_y = FP1616(pSprite->hot.y - pWin->drawable.y, 0); + rep.win_x = double_to_fp1616(pSprite->hot.x - pWin->drawable.x); + rep.win_y = double_to_fp1616(pSprite->hot.y - pWin->drawable.y); for (t = pSprite->win; t; t = t->parent) if (t->parent == pWin) { rep.child = t->drawable.id; @@ -182,11 +183,11 @@ ProcXIQueryPointer(ClientPtr client) #ifdef PANORAMIX if (!noPanoramiXExtension) { - rep.root_x += FP1616(screenInfo.screens[0]->x, 0); - rep.root_y += FP1616(screenInfo.screens[0]->y, 0); + rep.root_x += double_to_fp1616(screenInfo.screens[0]->x); + rep.root_y += double_to_fp1616(screenInfo.screens[0]->y); if (stuff->win == rep.root) { - rep.win_x += FP1616(screenInfo.screens[0]->x, 0); - rep.win_y += FP1616(screenInfo.screens[0]->y, 0); + rep.win_x += double_to_fp1616(screenInfo.screens[0]->x); + rep.win_y += double_to_fp1616(screenInfo.screens[0]->y); } } #endif |