5 files changed, 42 insertions, 18 deletions

diff --git a/README.md b/README.md
index 84b52c82..30e5ba41 100644
--- a/README.md
+++ b/README.md
@@ -77,11 +77,12 @@ Once you have compiled a working binary under MSYS2, there is still an additiona
 
 ### Compiling on Raspberry Pi
 
-You should use a version of SDL that is compiled to take advantage of the Broadcom VideoCore OpenGL ES hardware. This provides the best performance when running Lagrange in a console.
+On Raspberry Pi 4/400, you can compile and run Lagrange just like on a regular desktop PC. Accelerated OpenGL graphics should work fine under X11.
 
-At present time, OpenGL under X11 on Raspberry Pi is still quite slow/experimental. When running under X11, software rendering is the best choice and the SDL from Raspbian etc. is sufficient.
+On Raspberry Pi 3 or earlier, you should use a version of SDL that is compiled to take advantage of the Broadcom VideoCore OpenGL ES hardware. This provides the best performance when running Lagrange in a console. OpenGL under X11 on Raspberry Pi 2/3 is quite 
+slow/experimental. When running under X11, software rendering is the best choice and the SDL from Raspbian etc. is sufficient.
 
-The following build options are recommended on Raspberry Pi:
+The following build options are recommended on Raspberry Pi 2/3:
 
 * `ENABLE_KERNING=NO`: faster text rendering without noticeable loss of quality
 * `ENABLE_WINDOWPOS_FIX=YES`: workaround for window position restore issues (SDL bug)
diff --git a/src/app.c b/src/app.c
index 0cc93b12..d7cedc42 100644
--- a/src/app.c
+++ b/src/app.c
@@ -415,8 +415,9 @@ static void init_App_(iApp *d, int argc, char **argv) {
         for (size_t i = 1; i < size_StringList(args_CommandLine(&d->args)); i++) {
             const iString *arg = constAt_StringList(args_CommandLine(&d->args), i);
             const iBool    isKnownScheme =
-                startsWithCase_String(arg, "gemini:") || startsWithCase_String(arg, "file:") ||
-                startsWithCase_String(arg, "data:")   || startsWithCase_String(arg, "about:");
+                startsWithCase_String(arg, "gemini:") || startsWithCase_String(arg, "gopher:") ||
+                startsWithCase_String(arg, "file:")   || startsWithCase_String(arg, "data:")   ||
+                startsWithCase_String(arg, "about:");
             if (isKnownScheme || fileExists_FileInfo(arg)) {
                 postCommandf_App("open newtab:%d url:%s",
                                  newTab,
diff --git a/src/macos.m b/src/macos.m
index 1d972ebd..28ebcc43 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -25,6 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "ui/command.h"
 #include "ui/widget.h"
 #include "ui/color.h"
+#include "ui/window.h"
+
+#include <SDL_timer.h>
 
 #import <AppKit/AppKit.h>
 
@@ -217,7 +220,6 @@ static void appearanceChanged_MacOS_(NSString *name) {
     }
 }
 
-#if 1
 - (NSTouchBar *)makeTouchBar {
     NSTouchBar *bar = [[NSTouchBar alloc] init];
     bar.delegate = self;
@@ -235,7 +237,6 @@ static void appearanceChanged_MacOS_(NSString *name) {
     }
     return bar;
 }
-#endif
 
 - (void)showPreferences {
     postCommand_App("preferences");
@@ -249,6 +250,11 @@ static void appearanceChanged_MacOS_(NSString *name) {
     NSString *command = [menuCommands objectForKey:[(NSMenuItem *)sender title]];
     if (command) {
         postCommand_App([command cStringUsingEncoding:NSUTF8StringEncoding]);
+        /* Shouldn't double-activate menu items in case the same key is used in our widgets.
+           SDL ignores menu key equivalents so the keydown events will be posted regardless.
+           This is quite a kludge, but we can achieve this by taking advantage of Window's
+           focus-acquisition threshold for ignoring key events. */
+        get_Window()->focusGainedAt = SDL_GetTicks();
     }
 }
 
@@ -513,6 +519,12 @@ void insertMenuItems_MacOS(const char *menuLabel, int atIndex, const iMenuItem *
             else if (items[i].key == SDLK_RIGHT) {
                 appendChar_String(&key, 0x2192);
             }
+            else if (items[i].key == SDLK_UP) {
+                appendChar_String(&key, 0x2191);
+            }
+            else if (items[i].key == SDLK_DOWN) {
+                appendChar_String(&key, 0x2193);
+            }
             else if (items[i].key) {
                 appendChar_String(&key, items[i].key);
             }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 537afb00..fbcbd4c2 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -479,6 +479,21 @@ static size_t coordIndex_InputWidget_(const iInputWidget *d, iInt2 coord) {
     return index;
 }
 
+static iBool copy_InputWidget_(iInputWidget *d, iBool doCut) {
+    if (!isEmpty_Range(&d->mark)) {
+        const iRanges m = mark_InputWidget_(d);
+        SDL_SetClipboardText(cstrCollect_String(
+            newUnicodeN_String(constAt_Array(&d->text, m.start), size_Range(&m))));
+        if (doCut) {
+            pushUndo_InputWidget_(d);
+            deleteMarked_InputWidget_(d);
+            contentsWereChanged_InputWidget_(d);
+        }
+        return iTrue;
+    }
+    return iFalse;
+}
+
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isCommand_Widget(w, ev, "focus.gained")) {
@@ -495,6 +510,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iFalse;
     }
+    else if (isFocused_Widget(d) && isCommand_UserEvent(ev, "copy")) {
+        copy_InputWidget_(d, iFalse);
+        return iTrue;
+    }
     switch (processEvent_Click(&d->click, ev)) {
         case none_ClickResult:
             break;
@@ -531,16 +550,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
             switch (key) {
                 case 'c':
                 case 'x':
-                    if (!isEmpty_Range(&d->mark)) {
-                        const iRanges m = mark_InputWidget_(d);
-                        SDL_SetClipboardText(cstrCollect_String(
-                            newUnicodeN_String(constAt_Array(&d->text, m.start), size_Range(&m))));
-                        if (key == 'x') {
-                            pushUndo_InputWidget_(d);
-                            deleteMarked_InputWidget_(d);
-                            contentsWereChanged_InputWidget_(d);
-                        }
-                    }
+                    copy_InputWidget_(d, key == 'x');
                     return iTrue;
                 case 'v':
                     if (SDL_HasClipboardText()) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 2b2dae46..115dd04b 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -125,7 +125,7 @@ static const iMenuItem fileMenuItems[] = {
 };
 
 static const iMenuItem editMenuItems[] = {
-    { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "Copy", SDLK_c, KMOD_PRIMARY, "copy" },
     { "Copy Link to Page", SDLK_c, KMOD_PRIMARY | KMOD_SHIFT, "document.copylink" },
     { "---", 0, 0, NULL },
     { "Find", SDLK_f, KMOD_PRIMARY, "focus.set id:find.input" },