ref: f52ddd573b8fd62af7fc55686309e9e37b2b27ba
parent: f15bad44f907649e8b4c97d19555fe669afdf742
author: Sigrid Solveig Haflínudóttir <[email protected]>
date: Mon Dec 7 10:50:09 EST 2020
updates due to 9front updates
--- a/9front.diff
+++ b/9front.diff
@@ -1,64 +1,7 @@
-diff -r 35459627f401 sys/lib/kbmap/fi
---- a/sys/lib/kbmap/fi Wed May 13 18:50:01 2020 -0700
-+++ b/sys/lib/kbmap/fi Fri May 15 17:06:40 2020 +0200
-@@ -32,6 +32,8 @@
- 1 52 ':
- 1 53 '_
- 1 86 '>
-+2 91 0xf868
-+2 125 0xf868
- 3 3 '@
- 3 4 '£
- 3 5 '$
-@@ -44,3 +46,5 @@
- 3 27 '~
- 3 46 '¢
- 3 86 '|
-+3 91 0xf022
-+4 91 0xf022
-diff -r 35459627f401 sys/lib/kbmap/us
---- a/sys/lib/kbmap/us Wed May 13 18:50:01 2020 -0700
-+++ b/sys/lib/kbmap/us Fri May 15 17:06:40 2020 +0200
-@@ -345,7 +345,7 @@
- 2 88 0
- 2 89 0
- 2 90 0
--2 91 0
-+2 91 0xf868
- 2 92 0
- 2 93 0
- 2 94 0
-@@ -379,7 +379,7 @@
- 2 122 0
- 2 123 0
- 2 124 0
--2 125 0
-+2 125 0xf868
- 2 126 0
- 2 127 0
- 3 0 0
-@@ -473,7 +473,7 @@
- 3 88 0
- 3 89 0
- 3 90 0
--3 91 0
-+3 91 0xf868
- 3 92 0
- 3 93 0
- 3 94 0
-@@ -601,7 +601,7 @@
- 4 88 ^L
- 4 89 0
- 4 90 0
--4 91 0
-+4 91 0xf868
- 4 92 0
- 4 93 0
- 4 94 0
-diff -r 35459627f401 sys/src/cmd/rio/dat.h
---- a/sys/src/cmd/rio/dat.h Wed May 13 18:50:01 2020 -0700
-+++ b/sys/src/cmd/rio/dat.h Fri May 15 17:06:40 2020 +0200
-@@ -344,11 +344,15 @@
+diff -r ab6ef2653d12 sys/src/cmd/rio/dat.h
+--- a/sys/src/cmd/rio/dat.h Mon Dec 07 15:15:02 2020 +0100
++++ b/sys/src/cmd/rio/dat.h Mon Dec 07 15:56:46 2020 +0100
+@@ -346,11 +346,15 @@
char *startdir;
int sweeping;
int wctlfd;
@@ -74,9 +17,9 @@
int shiftdown;
+int mod4down;
int debug;
-diff -r 35459627f401 sys/src/cmd/rio/fsys.c
---- a/sys/src/cmd/rio/fsys.c Wed May 13 18:50:01 2020 -0700
-+++ b/sys/src/cmd/rio/fsys.c Fri May 15 17:06:40 2020 +0200
+diff -r ab6ef2653d12 sys/src/cmd/rio/fsys.c
+--- a/sys/src/cmd/rio/fsys.c Mon Dec 07 15:15:02 2020 +0100
++++ b/sys/src/cmd/rio/fsys.c Mon Dec 07 15:56:46 2020 +0100
@@ -50,6 +50,7 @@
char srvpipe[64];
@@ -120,13 +63,13 @@
Filsys*
filsysinit(Channel *cxfidalloc)
{-@@ -152,6 +181,12 @@
+@@ -142,6 +171,12 @@
post(srvwctl, "wctl", p0);
close(p0);
+ if(cexecpipe(&p0, &gkbdfd) < 0)
+ goto Rescue;
-+ snprint(srvgkbd, sizeof(srvgkbd), "/srv/riogkbd.%s.%d", fs->user, pid);
++ snprint(srvgkbd, sizeof(srvgkbd), "/srv/riogkbd.%s.%lud", fs->user, (ulong)getpid());
+ post(srvgkbd, "gkbd", p0);
+ close(p0);
+
@@ -133,7 +76,7 @@
/*
* Start server processes
*/
-@@ -160,6 +195,12 @@
+@@ -150,6 +185,12 @@
error("wctl channel");proccreate(wctlproc, c, 4096);
threadcreate(wctlthread, c, 4096);
@@ -146,9 +89,9 @@
proccreate(filsysproc, fs, 10000);
/*
-diff -r 35459627f401 sys/src/cmd/rio/rio.c
---- a/sys/src/cmd/rio/rio.c Wed May 13 18:50:01 2020 -0700
-+++ b/sys/src/cmd/rio/rio.c Fri May 15 17:06:40 2020 +0200
+diff -r ab6ef2653d12 sys/src/cmd/rio/rio.c
+--- a/sys/src/cmd/rio/rio.c Mon Dec 07 15:15:02 2020 +0100
++++ b/sys/src/cmd/rio/rio.c Mon Dec 07 15:56:46 2020 +0100
@@ -340,13 +340,20 @@
keyboardthread(void*)
{--- a/riow
+++ b/riow
@@ -2,7 +2,7 @@
rfork ne
# these are shown on every desktop
-sticky=('cat clock' clock desktop faces kbmap stats winwatch)+sticky=(bar 'cat clock' clock desktop faces kbmap stats winwatch)
alt=0
ctl=0
@@ -10,13 +10,13 @@
curdesktop=1
fn scrsize {- s=`{syscall -o read 0 buf 60 </dev/screen >[2]/dev/null}+ s=`{dd -quiet 1 -if /dev/screen -bs 60 -count 1 >[2]/dev/null}screenw=$s(4)
screenh=$s(5)
}
fn winread {- syscall -o read 0 buf 120 <$1/wctl >[2]/dev/null
+ dd -quiet 1 -if $1/wctl -bs 120 -count 1 >[2]/dev/null
}
fn winlabel {@@ -39,11 +39,11 @@
scrsize
if(~ $a(1) 0 && ~ $a(2) 0 && ~ $a(3) $screenw && ~ $a(4) $screenh){if(test -f /env/winsize_^$winid)
- echo resize -r `{cat /env/winsize_^$winid} >$f/wctl+ echo resize -r `{cat /env/winsize_^$winid} >$f/wctl >[2]/dev/null}
if not {echo -n $a(1 2 3 4) >/env/winsize_^$winid
- echo resize -r 0 0 9999 9999 >$f/wctl
+ echo resize -r 0 0 9999 9999 >$f/wctl >[2]/dev/null
}
}
}
@@ -85,7 +85,7 @@
if(~ $windesk $1){ # unhide if should be shown now# unless it's supposed to stay hidden, of course
if(! test -f /env/winhidden_^$winid)
- echo unhide >$f/wctl
+ echo unhide >$f/wctl >[2]/dev/null
}
# and remember it was hidden on the desktop we're still on
if(~ $windesk $curdesktop && ! test -f /env/winhidden_^$winid)
@@ -98,7 +98,7 @@
if(test -f /env/windeskcur_^$1){ winid=`{cat /env/windeskcur_^$1} if(test -d /dev/wsys/^$winid && test -f /env/windesk_^$winid && ~ `{cat /env/windesk_^$winid} $1)- echo current >/dev/wsys/^$winid^/wctl
+ echo current >/dev/wsys/^$winid^/wctl >[2]/dev/null
}
curdesktop=$1
}