aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-22 16:03:43 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-26 19:41:25 +0000
commit3252131dd4330a5eacd4053f850c249e0b153308 (patch)
tree520b399bb7b52739985986ca1d8464187f35f501
parentchangelog: add bug ref to the ‘FreeBSD support’ entry (diff)
terminal: fix encoding of mouse buttons 6 and 7 in mouse events
These two buttons were encoded using the *exact* same numbers as button 4 and 5 (scroll wheel up/down), making it impossible to distinguish them. The relevant section from XTerm’s control sequences documentation is: Some wheel mice can send additional button events, e.g., by tilting the scroll wheel left and right. Additional buttons are encoded like the wheel mice, o by adding 64 (for buttons 6 and 7), or o by adding 128 (for buttons 8 through 11).
-rw-r--r--CHANGELOG.md1
-rw-r--r--terminal.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7ade8b..5a30366b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
* Sixel “current geometry” query response not being bounded by the
current window dimensions (fixes `lsix` output)
* Crash on keyboard input when repeat rate was zero (i.e. no repeat).
+* Wrong button encoding of mouse buttons 6 and 7 in mouse events.
### Security
diff --git a/terminal.c b/terminal.c
index e07ac50e..1208474d 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2321,14 +2321,10 @@ encode_xbutton(int xbutton)
case 1: case 2: case 3:
return xbutton - 1;
- case 4: case 5:
+ case 4: case 5: case 6: case 7:
/* Like button 1 and 2, but with 64 added */
return xbutton - 4 + 64;
- case 6: case 7:
- /* Same as 4 and 5. Note: the offset should be something else? */
- return xbutton - 6 + 64;
-
case 8: case 9: case 10: case 11:
/* Similar to 4 and 5, but adding 128 instead of 64 */
return xbutton - 8 + 128;