From 00b50225c203e06a4f23e1d2eb41e84116933e53 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sat, 15 Jul 2017 20:22:59 -0600 Subject: devdraw: fix Mac Kcmd+Shift Change-Id: Ide32a9397701085b17fbd42f0866eb3de11e4190 Reviewed-on: https://plan9port-review.googlesource.com/2940 Reviewed-by: Russ Cox --- src/cmd/devdraw/cocoa-screen.m | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m index 7aebae21..6a3f70f0 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; -- cgit v1.2.3 From b15fd97627767291628309677c40b3f40b868497 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sat, 15 Jul 2017 20:23:15 -0600 Subject: acme: implement Cmd-Shift-Z for Redo on Mac Change-Id: Ie9332ed473609bd6ca156be0843dc5411cbf7b93 Reviewed-on: https://plan9port-review.googlesource.com/2941 Reviewed-by: Russ Cox --- src/cmd/acme/text.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/cmd/acme/text.c b/src/cmd/acme/text.c index 7634d921..c53694c6 100644 --- a/src/cmd/acme/text.c +++ b/src/cmd/acme/text.c @@ -757,6 +757,10 @@ 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; Tagdown: /* expand tag to show all text */ -- cgit v1.2.3 From 4a8c0c75ffd40d08837d6937e1e995c68ceb276e Mon Sep 17 00:00:00 2001 From: Michael Stroucken Date: Fri, 21 Jul 2017 19:33:55 -0400 Subject: venti: fix venti graph on 64-bit A pixel is 32 bits wide in RGBA, regardless of system's word size. Change-Id: Iea36a8dafdec9ce8d593f944ef5ed1ea08e11d25 Reviewed-on: https://plan9port-review.googlesource.com/2980 Reviewed-by: David du Colombier <0intro@gmail.com> --- src/cmd/venti/srv/png.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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; -- cgit v1.2.3