From dd302e79dda3a6655a54f52ca515a7beb901f2d9 Mon Sep 17 00:00:00 2001
From: nia <nia@NetBSD.org>
Date: Sat, 14 Mar 2020 19:29:39 +0000
Subject: [PATCH] synaptics: Set up_down_emulation=3 by default.

It's a less surprising default for modern hardware.
---
 share/man/man4/pms.4         | 18 ++++++++++--------
 sys/dev/pckbport/synaptics.c |  6 +++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/share/man/man4/pms.4 b/share/man/man4/pms.4
index db1917760bbb..f9a3a43c91a3 100644
--- a/share/man/man4/pms.4
+++ b/share/man/man4/pms.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: pms.4,v 1.35 2020/03/14 13:08:18 nia Exp $
+.\" $NetBSD: pms.4,v 1.36 2020/03/14 19:29:39 nia Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd February 11, 2020
+.Dd March 14, 2020
 .Dt PMS 4
 .Os
 .Sh NAME
@@ -102,19 +102,21 @@ The following
 variables control behavior of Synaptics touchpads:
 .Bl -tag -width 8n
 .It Dv hw.synaptics.up_down_emulation
-If the touchpad reports the existence of Up/Down buttons, this value
-determines if they should be reported as button 4 and 5 events or if
-they should be used to emulate some other event.
+If the touchpad reports the existence of extra ("Up/Down") buttons, this
+value determines what kind of mouse events they should generate.
+On certain clickpads, the Up/Down buttons may be physical buttons that
+can be used instead of pressing the pad down, or used as additional
+buttons.
 .Bl -bullet
 .It
 If set to 0, Up/Down events generate button 4 and 5 clicks.
 .It
 If set to 1, Up/Down events generate middle button clicks.
 .It
-If set to 2 (default), the Up and Down buttons are used for Z-axis
-emulation, which more closely resembles how mouse wheels operate.
+If set to 2, the Up and Down buttons are used for Z-axis emulation,
+which more closely resembles how mouse wheels operate.
 .It
-If set to 3, Up/Down events generate left/right clicks.
+If set to 3 (default), Up/Down events generate left/right clicks.
 .El
 .It Dv hw.synaptics.up_down_motion_delta
 When the Up/Down buttons are used for Z-axis emulation, this value specifies
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index 6c7d363f009d..c6a37ca3e729 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: synaptics.c,v 1.55 2020/03/14 13:08:18 nia Exp $	*/
+/*	$NetBSD: synaptics.c,v 1.56 2020/03/14 19:29:39 nia Exp $	*/
 
 /*
  * Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
 #include "opt_pms.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.55 2020/03/14 13:08:18 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.56 2020/03/14 19:29:39 nia Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -98,7 +98,7 @@ static void pms_sysctl_synaptics(struct sysctllog **);
 static int pms_sysctl_synaptics_verify(SYSCTLFN_ARGS);
 
 /* Controlled by sysctl. */
-static int synaptics_up_down_emul = 2;
+static int synaptics_up_down_emul = 3;
 static int synaptics_up_down_motion_delta = 1;
 static int synaptics_gesture_move = 200;
 static int synaptics_gesture_length = 20;