cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devdraw, libdraw: handle keyboard runes > U+FFFF

Browse source 
Runes in Plan 9 were limited to the 16-bit BMP when I drew up
the RPC protocol between graphical programs and devdraw
a long time ago. Now that they can be 32-bit, use a 32-bit wire
encoding too. A new message number to avoid problems with
other clients (like 9fans.net/go).

Add keyboard shortcut alt : , for U+1F602, face with tears of joy,
to test that it all works.
This commit is contained in:
Russ Cox 2020-05-18 23:45:03 -04:00
parent b4cc38f943
commit d25d0ca1a3
7 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/drawfcall.h
View file

@ -22,6 +22,9 @@ tag[1] Rbouncemouse
tag[1] Trdkbd
tag[1] Rrdkbd rune[2]
tag[1] Trdkbd4
tag[1] Rrdkbd4 rune[4]
tag[1] Tlabel label[s]
tag[1] Rlabel
@ -99,6 +102,8 @@ enum {
Rcursor2,
Tctxt = 30,
Rctxt,
Trdkbd4 = 32,
Rrdkbd4,
Tmax,
};

1
lib/keyboard
View file

@ -584,3 +584,4 @@
F015 ZA  raw alt (plan 9 specific)
F016 ZS  raw shift (plan 9 specific)
F017 ZC  raw ctl (plan 9 specific)
1F602 :, 😂 face with tears of joy

2
src/cmd/devdraw/mklatinkbd.c
View file

@ -191,7 +191,7 @@ readfile(char *fname)
r = strtol(line, nil, 16);
p = strchr(line, ' ');
if(r == 0 || p != line+4 || p[0] != ' ' || p[1] != ' ') {
if(r == 0 || (p != line+4 && p != line+5) || p[0] != ' ' || (p == line+4 && p[1] != ' ')) {
fprint(2, "%s:%d: cannot parse line\n", fname, lineno);
continue;
}

9
src/cmd/devdraw/srv.c
View file

@ -229,6 +229,7 @@ runmsg(Client *c, Wsysmsg *m)
break;
case Trdkbd:
case Trdkbd4:
qlock(&c->eventlk);
if((c->kbdtags.wi+1)%nelem(c->kbdtags.t) == c->kbdtags.ri) {
qunlock(&c->eventlk);
@ -236,7 +237,7 @@ runmsg(Client *c, Wsysmsg *m)
replyerror(c, m);
break;
}
c->kbdtags.t[c->kbdtags.wi++] = m->tag;
c->kbdtags.t[c->kbdtags.wi++] = (m->tag<<1) | (m->type==Trdkbd4);
if(c->kbdtags.wi == nelem(c->kbdtags.t))
c->kbdtags.wi = 0;
c->kbd.stall = 0;
@ -357,13 +358,17 @@ replymsg(Client *c, Wsysmsg *m)
static void
matchkbd(Client *c)
{
int tag;
Wsysmsg m;
if(c->kbd.stall)
return;
while(c->kbd.ri != c->kbd.wi && c->kbdtags.ri != c->kbdtags.wi){
tag = c->kbdtags.t[c->kbdtags.ri++];
m.type = Rrdkbd;
m.tag = c->kbdtags.t[c->kbdtags.ri++];
if(tag&1)
m.type = Rrdkbd4;
m.tag = tag>>1;
if(c->kbdtags.ri == nelem(c->kbdtags.t))
c->kbdtags.ri = 0;
m.rune = c->kbd.r[c->kbd.ri++];

2
src/libdraw/drawclient.c
View file

@ -333,7 +333,7 @@ _displayrdkbd(Display *d, Rune *r)
{
Wsysmsg tx, rx;
tx.type = Trdkbd;
tx.type = Trdkbd4;
if(displayrpc(d, &tx, &rx, nil) < 0)
return -1;
*r = rx.rune;

15
src/libdraw/drawfcall.c
View file

@ -50,6 +50,7 @@ sizeW2M(Wsysmsg *m)
case Rcursor:
case Rcursor2:
case Trdkbd:
case Trdkbd4:
case Rlabel:
case Rctxt:
case Rinit:
@ -73,6 +74,8 @@ sizeW2M(Wsysmsg *m)
return 4+1+1+_stringsize(m->error);
case Rrdkbd:
return 4+1+1+2;
case Rrdkbd4:
return 4+1+1+4;
case Tlabel:
return 4+1+1+_stringsize(m->label);
case Tctxt:
@ -117,6 +120,7 @@ convW2M(Wsysmsg *m, uchar *p, uint n)
case Rcursor:
case Rcursor2:
case Trdkbd:
case Trdkbd4:
case Rlabel:
case Rctxt:
case Rinit:
@ -166,6 +170,9 @@ convW2M(Wsysmsg *m, uchar *p, uint n)
case Rrdkbd:
PUT2(p+6, m->rune);
break;
case Rrdkbd4:
PUT(p+6, m->rune);
break;
case Tlabel:
PUTSTRING(p+6, m->label);
break;
@ -221,6 +228,7 @@ convM2W(uchar *p, uint n, Wsysmsg *m)
case Rcursor:
case Rcursor2:
case Trdkbd:
case Trdkbd4:
case Rlabel:
case Rctxt:
case Rinit:
@ -270,6 +278,9 @@ convM2W(uchar *p, uint n, Wsysmsg *m)
case Rrdkbd:
GET2(p+6, m->rune);
break;
case Rrdkbd4:
GET(p+6, m->rune);
break;
case Tlabel:
GETSTRING(p+6, &m->label);
break;
@ -360,6 +371,10 @@ drawfcallfmt(Fmt *fmt)
return fmtprint(fmt, "Trdkbd");
case Rrdkbd:
return fmtprint(fmt, "Rrdkbd rune=%C", m->rune);
case Trdkbd4:
return fmtprint(fmt, "Trdkbd4");
case Rrdkbd4:
return fmtprint(fmt, "Rrdkbd4 rune=%C", m->rune);
case Tlabel:
return fmtprint(fmt, "Tlabel label='%s'", m->label);
case Rlabel:

2
src/libdraw/event.c
View file

@ -284,7 +284,7 @@ extract(int canblock)
}
}else if(i == Skeyboard){
if(eslave[i].rpc == nil)
eslave[i].rpc = startrpc(Trdkbd);
eslave[i].rpc = startrpc(Trdkbd4);
if(eslave[i].rpc){
/* if ready, don't block in select */
if(eslave[i].rpc->p)