diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-08-01 23:51:51 +0200 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-08-01 23:51:51 +0200 |
| commit | 810cecc30d4cefe40401051a8e877665292a594d (patch) | |
| tree | 6565ac720dede033d0ad88bee1fc29ee38b4baad /src/cmd | |
| parent | 7d0663b7c023cd7dd2764cb232798f8bc1309c20 (diff) | |
| parent | 4a8c0c75ffd40d08837d6937e1e995c68ceb276e (diff) | |
| download | plan9port-810cecc30d4cefe40401051a8e877665292a594d.tar.gz plan9port-810cecc30d4cefe40401051a8e877665292a594d.tar.bz2 plan9port-810cecc30d4cefe40401051a8e877665292a594d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/acme/text.c | 6 | ||||
| -rw-r--r-- | src/cmd/devdraw/cocoa-screen.m | 3 | ||||
| -rw-r--r-- | src/cmd/venti/srv/png.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/cmd/acme/text.c b/src/cmd/acme/text.c index e1b52859..e82a3a30 100644 --- a/src/cmd/acme/text.c +++ b/src/cmd/acme/text.c @@ -802,13 +802,15 @@ texttype(Text *t, Rune r) typecommit(t); undo(t, nil, nil, TRUE, 0, nil, 0); return; + case Kcmd+'Z': /* %-shift-Z: redo */ + typecommit(t); + undo(t, nil, nil, FALSE, 0, nil, 0); + return; case Kcmd+'s': /* %S: save/put file */ typecommit(t); put(&t->w->body, nil, nil, XXX, XXX, nil, 0); return; - - Tagdown: /* expand tag to show all text */ if(!t->w->tagexpand){ diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m index 3cc7ad22..d01e3503 100644 --- a/src/cmd/devdraw/cocoa-screen.m +++ b/src/cmd/devdraw/cocoa-screen.m @@ -30,6 +30,7 @@ // Use non-deprecated names. #define NSKeyDown NSEventTypeKeyDown +#define NSShiftKeyMask NSEventModifierFlagShift #define NSAlternateKeyMask NSEventModifierFlagOption #define NSCommandKeyMask NSEventModifierFlagCommand #define NSResizableWindowMask NSWindowStyleMaskResizable @@ -903,6 +904,8 @@ getkeyboard(NSEvent *e) interpretdeadkey(e); if(m & NSCommandKeyMask){ + if((m & NSShiftKeyMask) && 'a' <= c && c <= 'z') + c += 'A' - 'a'; if(' '<=c && c<='~') keystroke(Kcmd+c); break; diff --git a/src/cmd/venti/srv/png.c b/src/cmd/venti/srv/png.c index ca456415..8805ada4 100644 --- a/src/cmd/venti/srv/png.c +++ b/src/cmd/venti/srv/png.c @@ -212,7 +212,7 @@ writepng(Hio *io, Memimage *m) /* image data */ zr.dx = Dx(m->r); zr.dy = Dy(m->r); - zr.width = rgb->width * sizeof(ulong); + zr.width = rgb->width * sizeof(u32int); zr.data = rgb->data->bdata; zr.x = 0; zr.y = 0; |