diff options
| -rw-r--r-- | sys/src/9/port/devmouse.c | 6 | ||||
| -rw-r--r-- | sys/src/cmd/aux/kbdfs/kbdfs.c | 16 | ||||
| -rw-r--r-- | sys/src/libndb/ndbopen.c | 4 |
3 files changed, 19 insertions, 7 deletions
diff --git a/sys/src/9/port/devmouse.c b/sys/src/9/port/devmouse.c index 4ecf54511..cb3ebe716 100644 --- a/sys/src/9/port/devmouse.c +++ b/sys/src/9/port/devmouse.c @@ -57,6 +57,7 @@ enum CMbuttonmap, CMscrollswap, CMswap, + CMtwitch, CMwildcard, }; @@ -65,6 +66,7 @@ static Cmdtab mousectlmsg[] = CMbuttonmap, "buttonmap", 0, CMscrollswap, "scrollswap", 0, CMswap, "swap", 1, + CMtwitch, "twitch", 0, CMwildcard, "*", 0, }; @@ -419,6 +421,10 @@ mousewrite(Chan *c, void *va, long n, vlong) setbuttonmap(cb->f[1]); break; + case CMtwitch: + drawactive(1); + break; + case CMwildcard: mousectl(cb); break; diff --git a/sys/src/cmd/aux/kbdfs/kbdfs.c b/sys/src/cmd/aux/kbdfs/kbdfs.c index 55e3270a1..fb5c022db 100644 --- a/sys/src/cmd/aux/kbdfs/kbdfs.c +++ b/sys/src/cmd/aux/kbdfs/kbdfs.c @@ -394,15 +394,17 @@ keyproc(void *) rb[0] = 'k'; } if(rb[0]){ - if(key.r == Kshift && mctlfd >= 0){ - if(key.down){ - fprint(mctlfd, "buttonmap 132"); - } else { - fprint(mctlfd, "swap"); - fprint(mctlfd, "swap"); + if(mctlfd >= 0){ + if(key.r == Kshift){ + if(key.down){ + fprint(mctlfd, "buttonmap 132"); + } else { + fprint(mctlfd, "swap"); + fprint(mctlfd, "swap"); + } } + fprint(mctlfd, "twitch"); } - if(kbdopen){ s = utfconv(rb, nb+1); if(nbsendp(kbdchan, s) <= 0) diff --git a/sys/src/libndb/ndbopen.c b/sys/src/libndb/ndbopen.c index 3a95ccb31..36dd9a864 100644 --- a/sys/src/libndb/ndbopen.c +++ b/sys/src/libndb/ndbopen.c @@ -108,6 +108,10 @@ ndbreopen(Ndb *db) return -1; } + /* no hashfile for /net/ndb (avoids deadlock in cs) */ + if(d->type == 'I') + db->nohash = 1; + db->qid = d->qid; db->mtime = d->mtime; db->length = d->length; |