cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kbmap, kbremap: open kbmap file with OTRUNC and bugfixes

Browse source 
Now that kbdfs supports reseting the map to
the default itself we no longer need to
manually load the ascii maps.

This also fixes a 'bug in the making' in
the buffer read logic that would cause it
to cut lines in half when writing to the
kbmap file. All of our kbmaps are under
8k so this never showed up.

Also fix a small bug in kbremap where it
was not writing out the last null when writing out
kbd events.
This commit is contained in:
Jacob Moody 2023-05-23 13:56:43 +00:00
parent 169ace060c
commit e23bb0103b
3 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/man/1/kbmap
View file

@ -74,6 +74,3 @@ kbremap us de uk </dev/kbdtap >/dev/kbdtap
.B /sys/src/cmd/kbremap.c
.SH "SEE ALSO"
.IR kbdfs (8)
.SH BUGS
Not all keyboards map the entire set of characters, so one has to
switch back to the default map before changing to another.

34
sys/src/cmd/kbmap.c
View file

@ -140,21 +140,39 @@ writemap(char *file)
{
int i, fd, ofd;
char buf[8192];
int n;
char *p;
if((fd = open(file, OREAD)) < 0){
fprint(2, "cannot open %s: %r", file);
fprint(2, "cannot open %s: %r\n", file);
return -1;
}
if((ofd = open("/dev/kbmap", OWRITE)) < 0) {
fprint(2, "cannot open /dev/kbmap: %r");
if((ofd = open("/dev/kbmap", OWRITE|OTRUNC)) < 0){
fprint(2, "cannot open /dev/kbmap: %r\n");
close(fd);
return -1;
}
while((i = read(fd, buf, sizeof buf)) > 0)
if(write(ofd, buf, i) != i){
fprint(2, "writing /dev/kbmap: %r");
/* do not write half lines */
n = 0;
while((i = read(fd, buf + n, sizeof buf - 1 - n)) > 0){
n += i;
buf[n] = '\0';
p = strrchr(buf, '\n');
if(p == nil){
if(n == sizeof buf - 1){
fprint(2, "writing /dev/kbmap: line too long\n");
break;
}
continue;
}
p++;
if(write(ofd, buf, p - buf) != p - buf){
fprint(2, "writing /dev/kbmap: %r\n");
break;
}
n -= p - buf;
memmove(buf, p, n);
}
close(fd);
close(ofd);
@ -165,7 +183,6 @@ void
click(Mouse m)
{
int i, j;
char buf[128];
if(m.buttons == 0 || (m.buttons & ~4))
return;
@ -193,9 +210,6 @@ click(Mouse m)
if(j != i)
return;
/* since maps are often just a delta of the distributed map... */
snprint(buf, sizeof buf, "%s/ascii", dir);
writemap(buf);
writemap(map[i].file);
/* clean the previous current map */

26
sys/src/cmd/kbremap.c
View file

@ -10,16 +10,32 @@ writemap(char *file)
{
int i, fd, ofd;
char buf[8192];
int n;
char *p;
if((fd = open(file, OREAD)) < 0)
sysfatal("cannot open %s: %r", file);
if((ofd = open("/dev/kbmap", OWRITE)) < 0)
if((ofd = open("/dev/kbmap", OWRITE|OTRUNC)) < 0)
sysfatal("cannot open /dev/kbmap: %r");
while((i = read(fd, buf, sizeof buf)) > 0)
if(write(ofd, buf, i) != i)
/* do not write half lines */
n = 0;
while((i = read(fd, buf + n, sizeof buf - 1 - n)) > 0){
n += i;
buf[n] = '\0';
p = strrchr(buf, '\n');
if(p == nil){
if(n == sizeof buf - 1)
sysfatal("writing /dev/kbmap: line too long");
continue;
}
p++;
if(write(ofd, buf, p - buf) != p - buf)
sysfatal("writing /dev/kbmap: %r");
n -= p - buf;
memmove(buf, p, n);
}
fprint(ofd, "%s\t%s\t0x%X\n", mod, key, Kswitch);
close(fd);
@ -56,7 +72,6 @@ main(int argc, char **argv)
usage();
chdir("/sys/lib/kbmap");
writemap("ascii");
writemap(argv[0]);
for(;;){
n = read(0, buf, sizeof buf - 1);
@ -66,13 +81,12 @@ main(int argc, char **argv)
for(p = buf; p < buf+n; p += strlen(p) + 1){
chartorune(&r, p+1);
if(*p != 'c' || r != Kswitch){
write(1, p, strlen(p));
write(1, p, strlen(p) + 1);
continue;
}
index++;
if(argv[index] == nil)
index = 0;
writemap("ascii");
writemap(argv[index]);
}
}