Module Name: xsrc
Committed By: mlelstv
Date: Sun Apr 14 20:10:29 UTC 2024
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c
Log Message:
Only limit the scroll warning, but continue to send the scroll events.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.17 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.18
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.17 Wed Feb 7 18:01:48 2024
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Sun Apr 14 20:10:29 2024
@@ -747,11 +747,13 @@ wsReadInput(InputInfoPtr pInfo)
dw = 0;
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
- static int warned = 0;
- if ((hscroll || vscroll) && !warned) {
- warned = 1;
- xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
- pInfo->name, hscroll, vscroll);
+ if (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);
