cx/cy are legacy names (core x, core y). These days, sx/sy is more descriptive and less confusing.
Signed-off-by: Peter Hutterer <[email protected]> --- dix/getevents.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dix/getevents.c b/dix/getevents.c index 6a5ff51..511c96c 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -1143,8 +1143,8 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons DeviceEvent *event; RawDeviceEvent *raw; int x = 0, y = 0, /* device coords */ - cx, cy; /* only screen coordinates */ - float x_frac = 0.0, y_frac = 0.0, cx_frac, cy_frac; + sx, sy; /* only screen coordinates */ + float x_frac = 0.0, y_frac = 0.0, sx_frac, sy_frac; ScreenPtr scr = miPointerGetScreen(pDev); ValuatorMask mask; @@ -1227,7 +1227,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons set_raw_valuators(raw, &mask, raw->valuators.data); positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, - &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac); + &x, &y, x_frac, y_frac, scr, &sx, &sy, &sx_frac, &sy_frac); updateHistory(pDev, &mask, ms); /* Update the valuators with the true value sent to the client*/ @@ -1257,10 +1257,10 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons event->detail.button = buttons; } - event->root_x = cx; /* root_x/y always in screen coords */ - event->root_y = cy; - event->root_x_frac = cx_frac; - event->root_y_frac = cy_frac; + event->root_x = sx; /* root_x/y always in screen coords */ + event->root_y = sy; + event->root_x_frac = sx_frac; + event->root_y_frac = sy_frac; set_valuators(pDev, event, &mask); -- 1.7.6 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
