diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/samterm | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/samterm')
| -rw-r--r-- | src/cmd/samterm/icons.c | 8 | ||||
| -rw-r--r-- | src/cmd/samterm/io.c | 2 | ||||
| -rw-r--r-- | src/cmd/samterm/main.c | 4 | ||||
| -rw-r--r-- | src/cmd/samterm/mesg.c | 2 | ||||
| -rw-r--r-- | src/cmd/samterm/samterm.h | 1 |
5 files changed, 8 insertions, 9 deletions
diff --git a/src/cmd/samterm/icons.c b/src/cmd/samterm/icons.c index 5ccd999a..0b04d0b0 100644 --- a/src/cmd/samterm/icons.c +++ b/src/cmd/samterm/icons.c @@ -22,13 +22,13 @@ Cursor bullseye={ }; Cursor deadmouse={ {-7, -7}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x8E, 0x1D, 0xC7, - 0xFF, 0xE3, 0xFF, 0xF3, 0xFF, 0xFF, 0x7F, 0xFE, + 0xFF, 0xE3, 0xFF, 0xF3, 0xFF, 0xFF, 0x7F, 0xFE, 0x3F, 0xF8, 0x17, 0xF0, 0x03, 0xE0, 0x00, 0x00,}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x82, - 0x04, 0x41, 0xFF, 0xE1, 0x5F, 0xF1, 0x3F, 0xFE, + 0x04, 0x41, 0xFF, 0xE1, 0x5F, 0xF1, 0x3F, 0xFE, 0x17, 0xF0, 0x03, 0xE0, 0x00, 0x00, 0x00, 0x00,} }; Cursor lockarrow={ diff --git a/src/cmd/samterm/io.c b/src/cmd/samterm/io.c index 7c653aa4..e1dd148a 100644 --- a/src/cmd/samterm/io.c +++ b/src/cmd/samterm/io.c @@ -170,7 +170,7 @@ again: goto again; } got |= 1<<type; - return got; + return got; } int diff --git a/src/cmd/samterm/main.c b/src/cmd/samterm/main.c index 78d4fa1b..8bd02ca0 100644 --- a/src/cmd/samterm/main.c +++ b/src/cmd/samterm/main.c @@ -467,7 +467,7 @@ flushtyping(int clearesc) ulong n; if(clearesc) - typeesc = -1; + typeesc = -1; if(typestart == typeend) { modified = 0; return; @@ -561,7 +561,7 @@ nontypingkey(int c) case SCROLLKEY: case CUT: case COPY: - case PASTE: + case PASTE: return 1; } return 0; diff --git a/src/cmd/samterm/mesg.c b/src/cmd/samterm/mesg.c index 1e9cd561..32478ea2 100644 --- a/src/cmd/samterm/mesg.c +++ b/src/cmd/samterm/mesg.c @@ -472,7 +472,7 @@ void outcopy(int count, uchar *data) { while(count--) - outdata[HSIZE+outcount++] = *data++; + outdata[HSIZE+outcount++] = *data++; } void diff --git a/src/cmd/samterm/samterm.h b/src/cmd/samterm/samterm.h index ac564ecf..2e1a645d 100644 --- a/src/cmd/samterm/samterm.h +++ b/src/cmd/samterm/samterm.h @@ -181,4 +181,3 @@ void outshort(int); void outlong(long); void outvlong(vlong); void outsend(void); - |