diff mbox

[4/4] Input: synaptics - Add support for ABS_RECT_*

Message ID 1292361672-2581-5-git-send-email-chase.douglas@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chase Douglas Dec. 14, 2010, 9:21 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 2e300a4..7cebdce 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -525,6 +525,13 @@  static void synaptics_process_packet(struct psmouse *psmouse)
 	}
 	input_report_abs(dev, ABS_PRESSURE, hw.z);
 
+	if (priv->multitouch && num_fingers >= 2) {
+		input_report_abs(dev, ABS_RECT_MIN_X, min(hw.x, priv->mt.x));
+		input_report_abs(dev, ABS_RECT_MAX_X, max(hw.x, priv->mt.x));
+		input_report_abs(dev, ABS_RECT_MIN_Y, min(hw.y, priv->mt.y));
+		input_report_abs(dev, ABS_RECT_MAX_Y, max(hw.y, priv->mt.y));
+	}
+
 	if (SYN_CAP_PALMDETECT(priv->capabilities))
 		input_report_abs(dev, ABS_TOOL_WIDTH, finger_width);
 
@@ -667,6 +674,17 @@  static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
 		__clear_bit(BTN_RIGHT, dev->keybit);
 		__clear_bit(BTN_MIDDLE, dev->keybit);
 	}
+
+	if (priv->multitouch) {
+		input_set_abs_params(dev, ABS_RECT_MIN_X, XMIN_NOMINAL,
+				     priv->x_max ?: XMAX_NOMINAL, 0, 0);
+		input_set_abs_params(dev, ABS_RECT_MAX_X, XMIN_NOMINAL,
+				     priv->x_max ?: XMAX_NOMINAL, 0, 0);
+		input_set_abs_params(dev, ABS_RECT_MIN_Y, YMIN_NOMINAL,
+				     priv->y_max ?: YMAX_NOMINAL, 0, 0);
+		input_set_abs_params(dev, ABS_RECT_MAX_Y, YMIN_NOMINAL,
+				     priv->y_max ?: YMAX_NOMINAL, 0, 0);
+	}
 }
 
 static void synaptics_disconnect(struct psmouse *psmouse)