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

kbdfs: cleanup

Browse source
This commit is contained in:
cinap_lenrek 2011-05-13 02:04:17 +00:00
parent f09046cfe0
commit c7c882b4ae
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sys/src/cmd/aux/kbdfs.c
View file

@ -39,8 +39,8 @@ struct Scan {
int caps;
int num;
int shift;
int ctrl;
int latin;
int ctl;
int alt;
int altgr;
int leds;
};
@ -189,7 +189,7 @@ Rune kbtabaltgr[Nscan] =
[0x78] 0, Kup, 0, 0, 0, 0, 0, 0,
};
Rune kbtabctrl[Nscan] =
Rune kbtabctl[Nscan] =
{
[0x00] 0, '', '', '', '', '', '', '',
[0x08] '', '', '', '', ' ', '', '\b', '\t',
@ -209,15 +209,6 @@ Rune kbtabctrl[Nscan] =
[0x78] 0, '', 0, '\b', 0, 0, 0, 0,
};
Rune
mapold(Rune r)
{
switch(r){
default:
return r;
}
}
void reboot(void);
/*
@ -252,8 +243,8 @@ kbdputsc(Scan *scan, int c)
key.r = kbtabshift[key.c];
else if(scan->altgr)
key.r = kbtabaltgr[key.c];
else if(scan->ctrl)
key.r = kbtabctrl[key.c];
else if(scan->ctl)
key.r = kbtabctl[key.c];
else
key.r = kbtab[key.c];
@ -272,7 +263,7 @@ kbdputsc(Scan *scan, int c)
if(scan->caps && key.r<='z' && key.r>='a')
key.r += 'A' - 'a';
if(scan->ctrl && scan->latin && key.r == Kdel)
if(scan->ctl && scan->alt && key.r == Kdel)
reboot();
send(keychan, &key);
@ -287,13 +278,13 @@ kbdputsc(Scan *scan, int c)
scan->shift = key.down;
break;
case Kctl:
scan->ctrl = key.down;
scan->ctl = key.down;
break;
case Kaltgr:
scan->altgr = key.down;
break;
case Kalt:
scan->latin = key.down;
scan->alt = key.down;
break;
case Knum:
scan->num ^= key.down;
@ -702,7 +693,7 @@ kbmapent(int t, int sc)
case 3:
return &kbtabaltgr[sc];
case 4:
return &kbtabctrl[sc];
return &kbtabctl[sc];
}
}