Module Name: xsrc
Committed By: martin
Date: Sat May 11 14:34:48 UTC 2024
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src [netbsd-10]: ws.c
Log Message:
Pull up following revision(s) (requested by nia in ticket #683):
xsrc/external/mit/xf86-input-ws/dist/src/ws.c: revision 1.18
xsrc/external/mit/xf86-input-ws/dist/src/ws.c: revision 1.17
xf86-input-ws: print log message about touchpad scrolling only once.
Only limit the scroll warning, but continue to send the scroll events.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16.2.1
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16 Sat Dec 4 15:21:55 2021
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Sat May 11 14:34:48 2024
@@ -748,8 +748,12 @@ wsReadInput(InputInfoPtr pInfo)
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
if (hscroll || vscroll) {
- xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
- pInfo->name, hscroll, vscroll);
+ static int warned = 0;
+ if (!warned) {
+ warned = 1;
+ xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
+ pInfo->name, hscroll, vscroll);
+ }
valuator_mask_zero(priv->scroll_mask);
valuator_mask_set_double(priv->scroll_mask,
HSCROLL_AXIS, (double) hscroll);
