Skip to content

Commit

Permalink
CHROMIUM: Input: synaptics - refactor y inversion
Browse files Browse the repository at this point in the history
Synaptics touchpads report increasing y from bottom to top.
This is inverted from normal userspace "top of screen is 0" coordinates.
Thus, the kernel driver reports inverted y coordinates to userspace.

This patch refactors this inversion.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Chase Douglas <chase.douglas@canonical.com>

Change-Id: Ib8dfb543f5b6017609eb133fdc7be325189ccbfa
BUG=chromium-os:19094
TEST=builds clean; cursor still moves up and down correctly
Reviewed-on: http://gerrit.chromium.org/gerrit/4254
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
  • Loading branch information
djkurtz committed Aug 18, 2011
1 parent 942201c commit 7f6fd4f
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/input/mouse/synaptics.c
Expand Up @@ -44,6 +44,16 @@
#define YMIN_NOMINAL 1408
#define YMAX_NOMINAL 4448

/*
* Synaptics touchpads report the y coordinate from bottom to top, which is
* opposite from what userspace expects.
* This function is used to invert y before reporting.
*/
static int invert_y(int y)
{
return YMAX_NOMINAL + YMIN_NOMINAL - y;
}


/*****************************************************************************
* Stuff we need even when we do not want native Synaptics support
Expand Down Expand Up @@ -502,8 +512,7 @@ static void synaptics_report_semi_mt_slot(struct input_dev *dev, int slot,
input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);
if (active) {
input_report_abs(dev, ABS_MT_POSITION_X, x);
input_report_abs(dev, ABS_MT_POSITION_Y,
YMAX_NOMINAL + YMIN_NOMINAL - y);
input_report_abs(dev, ABS_MT_POSITION_Y, invert_y(y));
}
}

Expand Down Expand Up @@ -597,7 +606,7 @@ static void synaptics_process_packet(struct psmouse *psmouse)

if (num_fingers > 0) {
input_report_abs(dev, ABS_X, hw.x);
input_report_abs(dev, ABS_Y, YMAX_NOMINAL + YMIN_NOMINAL - hw.y);
input_report_abs(dev, ABS_Y, invert_y(hw.y));
}
input_report_abs(dev, ABS_PRESSURE, hw.z);

Expand Down

0 comments on commit 7f6fd4f

Please sign in to comment.