linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tammo Block <tammo.block@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>
Subject: [PATCH v3 4/6] vt/vt: Add SRG mouse reporting protocol
Date: Mon, 6 Jul 2020 12:58:45 +0200	[thread overview]
Message-ID: <f2da517c43f206624ee2da817238968f792c251f.1594032517.git.tammo.block@gmail.com> (raw)
In-Reply-To: <cover.1594032517.git.tammo.block@gmail.com>

The SRG protocol indicates a button release by appending a "m" to the
report. In this case the button number is not 3 (RELEASEEVENT) but
the number of the button that was released. As release events are only
reported for the first three buttons (LOWBUTTON_MASK), we need to store
the number on click events because it is not sent to us from userspace.

We also need to check for the case where no button state change occurred
at all (bit 6 set), in this case a value of 3 is OK even in SRG.

Signed-off-by: Tammo Block <tammo.block@gmail.com>
---
 drivers/tty/vt/vt.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 3699e488ef19..766983a848bb 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1838,13 +1838,32 @@ static inline void respond_ID(struct tty_struct *tty)
 	respond_string(vt102_id, strlen(vt102_id), tty->port);
 }
 
+#define ANYBUTTON_MASK	0xc3
+#define LOWBUTTON_MASK	0x03
+#define RELEASEEVENT	0x03
+
 void mouse_report(struct tty_struct *tty, int butt, int mrx, int mry)
 {
-	char buf[8];
+	static char last_btn = RELEASEEVENT;
+	char buf[20];
+	bool rel;
 	int len;
 
-	len = sprintf(buf, "\033[M%c%c%c", (char)(' ' + butt),
-			(char)('!' + mrx), (char)('!' + mry));
+	switch (vc_cons[fg_console].d->vc_protocol_mouse) {
+	case VC_PMOUSE_SRG:
+		rel = (butt & ANYBUTTON_MASK) == RELEASEEVENT;
+		if ((butt & ANYBUTTON_MASK) < RELEASEEVENT)
+			last_btn = butt & LOWBUTTON_MASK;
+		if ((butt & TIOCL_SELBUTTONMASK) == RELEASEEVENT)
+			butt = (butt & ~LOWBUTTON_MASK) | last_btn;
+		len = sprintf(buf, "\033[<%d;%d;%d%c", butt,
+				mrx + 1, mry + 1, rel ? 'm' : 'M');
+		break;
+	default:
+		len = sprintf(buf, "\033[M%c%c%c", (char)(' ' + butt),
+				(char)('!' + mrx), (char)('!' + mry));
+		break;
+	}
 	respond_string(buf, len, tty->port);
 }
 
-- 
2.27.0


  parent reply	other threads:[~2020-07-06 10:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-06 10:57 [PATCH v3 0/6] vt: Add SRG mouse reporting features Tammo Block
2020-07-06 10:57 ` [PATCH v3 1/6] tiocl.h: Change/Add defines for mouse report Tammo Block
2020-07-06 10:58 ` [PATCH v3 2/6] console_struct.h: Add members " Tammo Block
2020-07-06 10:58 ` [PATCH v3 3/6] vt/vt: Enable mode change via escape sequence Tammo Block
2020-07-06 10:58 ` Tammo Block [this message]
2020-07-06 10:59 ` [PATCH v3 5/6] vt/vt: Add URXVT mouse reporting protocol Tammo Block
2020-07-06 11:00 ` [PATCH v3 6/6] Documentation: Describe console mouse reporting Tammo Block
2020-07-06 18:43   ` Randy Dunlap
2020-10-02 12:30 ` [PATCH v3 0/6] vt: Add SRG mouse reporting features Greg Kroah-Hartman
2020-10-05  8:06   ` Tammo Block
2020-10-05  8:19     ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f2da517c43f206624ee2da817238968f792c251f.1594032517.git.tammo.block@gmail.com \
    --to=tammo.block@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).