ref: f293da429bb36dc9e61d13c8e76e1e9996297600
parent: bdf1f9cc711899febb3956f57b8303cab7a6f774
author: cinap_lenrek <cinap_lenrek@localhost>
date: Thu May 12 22:04:17 EDT 2011
kbdfs: cleanup
--- a/sys/src/cmd/aux/kbdfs.c
+++ b/sys/src/cmd/aux/kbdfs.c
@@ -39,8 +39,8 @@
int caps;
int num;
int shift;
- int ctrl;
- int latin;
+ int ctl;
+ int alt;
int altgr;
int leds;
};
@@ -189,7 +189,7 @@
[0x78] 0, Kup, 0, 0, 0, 0, 0, 0,
};
-Rune kbtabctrl[Nscan] =
+Rune kbtabctl[Nscan] =
{[0x00] 0, '', '', '', '', '', '', '',
[0x08] '', '', '', '', ' ', ' ', '\b', '\t',
@@ -209,15 +209,6 @@
[0x78] 0, '', 0, '\b', 0, 0, 0, 0,
};
-Rune
-mapold(Rune r)
-{- switch(r){- default:
- return r;
- }
-}
-
void reboot(void);
/*
@@ -252,8 +243,8 @@
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 @@
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 @@
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 @@
case 3:
return &kbtabaltgr[sc];
case 4:
- return &kbtabctrl[sc];
+ return &kbtabctl[sc];
}
}
--
⑨