From 4db8a82f5a5afbd72abb6d251f67edb0b251d556 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Tue, 8 Dec 2020 15:15:13 +0100
Subject: [PATCH] vncv: backing out previous change, this needs another
 revision

---
 sys/src/cmd/vnc/kbdv.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/sys/src/cmd/vnc/kbdv.c b/sys/src/cmd/vnc/kbdv.c
index 4da3eafa5..967843b0c 100644
--- a/sys/src/cmd/vnc/kbdv.c
+++ b/sys/src/cmd/vnc/kbdv.c
@@ -6,8 +6,7 @@ enum {
 	Xshift = 0xFFE1,
 	Xctl = 0xFFE3,
 	Xmeta = 0xFFE7,
-	Xalt = 0xFFE9,
-	Xsuper = 0xFFEB,
+	Xalt = 0xFFE9
 };
 
 static struct {
@@ -42,11 +41,10 @@ static struct {
 	{KF|10,	0xffc7},
 	{KF|11,	0xffc8},
 	{KF|12,	0xffc9},
-	{Kaltgr, 0xfe03},
 
 	{Kshift, Xshift},
 	{Kalt, Xalt},
-	{Kmod4, Xsuper},
+	{Kaltgr, Xmeta},
 	{Kctl, Xctl},
 };
 
@@ -97,7 +95,7 @@ readcons(Vnc *v)
 {
 	char buf[256], k[10];
 	ulong ks;
-	int ctlfd, fd, kr, kn, w, shift, ctl, alt, mod4;
+	int ctlfd, fd, kr, kn, w, shift, ctl, alt;
 	Rune r;
 
 	snprint(buf, sizeof buf, "%s/cons", display->devdir);
@@ -110,7 +108,7 @@ readcons(Vnc *v)
 	write(ctlfd, "rawon", 5);
 
 	kn = 0;
-	shift = alt = ctl = mod4 = 0;
+	shift = alt = ctl = 0;
 	for(;;){
 		while(!fullrune(k, kn)){
 			kr = read(fd, k+kn, sizeof k - kn);
@@ -136,10 +134,6 @@ readcons(Vnc *v)
 			shift = !shift;
 			keyevent(v, Xshift, shift);
 			break;
-		case Kmod4:
-			mod4 = !mod4;
-			keyevent(v, Xsuper, alt);
-			break;
 		default:
 			if(r == ks && r < 0x1A){	/* control key */
 				keyevent(v, Xctl, 1);
@@ -182,10 +176,6 @@ readcons(Vnc *v)
 				keyevent(v, Xshift, 0);
 				shift = 0;
 			}
-			if(mod4){
-				keyevent(v, Xsuper, 0);
-				shift = 0;
-			}
 			break;
 		}
 	}
@@ -238,7 +228,7 @@ readkbd(Vnc *v)
 					if((r == Kshift) ||
 					   utfrune(buf+1, Kctl) || 
 					   utfrune(buf+1, Kalt) ||
-					   utfrune(buf+1, Kmod4))
+					   utfrune(buf+1, Kaltgr))
 						keyevent(v, runetovnc(r), 1);
 			}
 			break;
@@ -251,7 +241,7 @@ readkbd(Vnc *v)
 			}
 			break;
 		case 'c':
-			if(utfrune(buf2+1, Kctl) || utfrune(buf2+1, Kalt) || utfrune(buf2+1, Kmod4))
+			if(utfrune(buf2+1, Kctl) || utfrune(buf2+1, Kalt) || utfrune(buf2+1, Kaltgr))
 				continue;
 			chartorune(&r, buf+1);
 			keyevent(v, runetovnc(r), 1);