xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vncv: backing out previous change, this needs another revision

Browse source
This commit is contained in:
cinap_lenrek 2020-12-08 15:15:13 +01:00
parent b1da2bb10b
commit 4db8a82f5a
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/src/cmd/vnc/kbdv.c
View file

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