Attachment #212350 for bug #296084

Lines 61-66 Link Here

(-)old/include/synaptics.h (+1 lines)
61	typedef struct _SynapticsSHM	61	typedef struct _SynapticsSHM
62	{	62	{
63	int version; /* Driver version */	63	int version; /* Driver version */
		64	int xrandr;
64		65
65	/* Current device state */	66	/* Current device state */
66	int x, y; /* actual x, y coordinates */	67	int x, y; /* actual x, y coordinates */

Lines 192-197 Link Here

(-)old/src/eventcomm.c (-2 / +18 lines)
192	struct input_event ev;	192	struct input_event ev;
193	Bool v;	193	Bool v;
194	struct SynapticsHwState *hw = &(comm->hwState);	194	struct SynapticsHwState *hw = &(comm->hwState);
		195	SynapticsPrivate priv = (SynapticsPrivate ) (local->private);
		196	SynapticsSHM *para = priv->synpara;
195		197
196	while (SynapticsReadEvent(comm, &ev)) {	198	while (SynapticsReadEvent(comm, &ev)) {
197	switch (ev.type) {	199	switch (ev.type) {
Lines 272-281 Link Here
272	case EV_ABS:	274	case EV_ABS:
273	switch (ev.code) {	275	switch (ev.code) {
274	case ABS_X:	276	case ABS_X:
275	hw->x = ev.value;	277	if (para->xrandr==0)
		278	hw->x = ev.value;
		279	if (para->xrandr==1)
		280	hw->y = -ev.value;
		281	if (para->xrandr==2)
		282	hw->y = ev.value;
		283	if (para->xrandr==3)
		284	hw->x = -ev.value;
276	break;	285	break;
277	case ABS_Y:	286	case ABS_Y:
278	hw->y = ev.value;	287	if (para->xrandr==0)
		288	hw->y = ev.value;
		289	if (para->xrandr==1)
		290	hw->x = ev.value;
		291	if (para->xrandr==2)
		292	hw->x = -ev.value;
		293	if (para->xrandr==3)
		294	hw->y = -ev.value;
279	break;	295	break;
280	case ABS_PRESSURE:	296	case ABS_PRESSURE:
281	hw->z = ev.value;	297	hw->z = ev.value;

Lines 384-389 Link Here

(-)old/src/synaptics.c (+1 lines)
384	/* read the parameters */	384	/* read the parameters */
385	pars = &priv->synpara_default;	385	pars = &priv->synpara_default;
386	pars->version = (PACKAGE_VERSION_MAJOR10000+PACKAGE_VERSION_MINOR100+PACKAGE_VERSION_PATCHLEVEL);	386	pars->version = (PACKAGE_VERSION_MAJOR10000+PACKAGE_VERSION_MINOR100+PACKAGE_VERSION_PATCHLEVEL);
		387	pars->xrandr = xf86SetIntOption(opts, "Xrandr", 0);
387		388
388	/* The synaptics specs specify typical edge widths of 4% on x, and 5.4% on	389	/* The synaptics specs specify typical edge widths of 4% on x, and 5.4% on
389	* y (page 7) [Synaptics TouchPad Interfacing Guide, 510-000080 - A	390	* y (page 7) [Synaptics TouchPad Interfacing Guide, 510-000080 - A

Lines 60-65 Link Here

(-)old/tools/synclient.c (+1 lines)
60	{ name, offsetof(SynapticsSHM, memb), (type), (min_val), (max_val) }	60	{ name, offsetof(SynapticsSHM, memb), (type), (min_val), (max_val) }
61		61
62	static struct Parameter params[] = {	62	static struct Parameter params[] = {
		63	DEFINE_PAR("Xrandr", xrandr, PT_INT, 0, 3),
63	DEFINE_PAR("LeftEdge", left_edge, PT_INT, 0, 10000),	64	DEFINE_PAR("LeftEdge", left_edge, PT_INT, 0, 10000),
64	DEFINE_PAR("RightEdge", right_edge, PT_INT, 0, 10000),	65	DEFINE_PAR("RightEdge", right_edge, PT_INT, 0, 10000),
65	DEFINE_PAR("TopEdge", top_edge, PT_INT, 0, 10000),	66	DEFINE_PAR("TopEdge", top_edge, PT_INT, 0, 10000),

Return to bug 296084