diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-26 20:24:15 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-09-26 20:24:15 -0700 |
| commit | afb1fe695d197187a301c19863a128a65389b15c (patch) | |
| tree | d1ec3b11b8ca521cb77ff1d6821786d3dfc6a5e1 /mi/mipointer.c | |
| parent | 7fb4bef0394a5d09680985d34bce8252b61493cb (diff) | |
| parent | c7163fdd302f706a3d67f0fdf93eeb3396bb3332 (diff) | |
Merge remote-tracking branch 'whot/next'
Diffstat (limited to 'mi/mipointer.c')
| -rw-r--r-- | mi/mipointer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mi/mipointer.c b/mi/mipointer.c index 7680ca19b..670f63b6e 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -569,9 +569,9 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen, * * @param pDev The device to move * @param mode Movement mode (Absolute or Relative) - * @param[in,out] x The x coordiante in screen coordinates (in regards to total + * @param[in,out] x The x coordinate in screen coordinates (in regards to total * desktop size) - * @param[in,out] y The y coordiante in screen coordinates (in regards to total + * @param[in,out] y The y coordinate in screen coordinates (in regards to total * desktop size) */ void @@ -603,7 +603,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, int *x, int *y) pScreen = newScreen; (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, FALSE); - /* Smash the confine to the new screen */ + /* Smash the confine to the new screen */ pPointer->limits.x2 = pScreen->width; pPointer->limits.y2 = pScreen->height; } @@ -622,8 +622,8 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, int *x, int *y) if (pScreen->ConstrainCursorHarder) pScreen->ConstrainCursorHarder(pDev, pScreen, mode, x, y); - if (pPointer->x == *x && pPointer->y == *y && - pPointer->pScreen == pScreen) + if (pPointer->x == *x && pPointer->y == *y && + pPointer->pScreen == pScreen) return; miPointerMoveNoEvent(pDev, pScreen, *x, *y); |