7 files changed, 70 insertions, 10 deletions

diff --git a/src/defs.h b/src/defs.h
index c54dc44c..530b6902 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -74,3 +74,8 @@ enum iFileVersion {
 #define rightAngle_Icon     "\U0001fba5"
 #define planet_Icon         "\U0001fa90"
 #define info_Icon           "\u2139"
+#define leftHalf_Icon       "\u25e7"
+#define rightHalf_Icon      "\u25e8"
+#define scissor_Icon        "\u2700"
+#define clipCopy_Icon       "\u2398"
+#define clipboard_Icon      "\U0001f4cb"
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index eac195b9..f4302887 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -314,9 +314,13 @@ void selectAll_InputWidget(iInputWidget *d) {
     refresh_Widget(as_Widget(d));
 }
 
+iLocalDef iBool isEditing_InputWidget_(const iInputWidget *d) {
+    return (flags_Widget(constAs_Widget(d)) & selected_WidgetFlag) != 0;
+}
+
 void begin_InputWidget(iInputWidget *d) {
     iWidget *w = as_Widget(d);
-    if (flags_Widget(w) & selected_WidgetFlag) {
+    if (isEditing_InputWidget_(d)) {
         /* Already active. */
         return;
     }
@@ -346,7 +350,7 @@ void begin_InputWidget(iInputWidget *d) {
 
 void end_InputWidget(iInputWidget *d, iBool accept) {
     iWidget *w = as_Widget(d);
-    if (~flags_Widget(w) & selected_WidgetFlag) {
+    if (!isEditing_InputWidget_(d)) {
         /* Was not active. */
         return;
     }
@@ -614,6 +618,15 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         end_InputWidget(d, iTrue);
         return iFalse;
     }
+    else if ((isCommand_UserEvent(ev, "copy") || isCommand_UserEvent(ev, "input.copy")) &&
+             isEditing_InputWidget_(d)) {
+        copy_InputWidget_(d, argLabel_Command(command_UserEvent(ev), "cut"));
+        return iTrue;
+    }
+    else if (isCommand_UserEvent(ev, "input.paste") && isEditing_InputWidget_(d)) {
+        paste_InputWidget_(d);
+        return iTrue;
+    }
     else if (isCommand_UserEvent(ev, "theme.changed")) {
         if (d->buffered) {
             updateBuffered_InputWidget_(d);
@@ -675,6 +688,17 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         case finished_ClickResult:
             return iTrue;
     }
+    if (ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT &&
+        contains_Widget(w, init_I2(ev->button.x, ev->button.y))) {
+        iWidget *clipMenu = findWidget_App("clipmenu");
+        if (isVisible_Widget(clipMenu)) {
+            closeMenu_Widget(clipMenu);
+        }
+        else {
+            openMenuFlags_Widget(clipMenu, mouseCoord_Window(get_Window()), iFalse);
+        }
+        return iTrue;
+    }
     if (ev->type == SDL_KEYUP && isFocused_Widget(w)) {
         return iTrue;
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 04dbe190..adb3c4b4 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -517,14 +517,21 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
 }
 
 void openMenu_Widget(iWidget *d, iInt2 coord) {
+    openMenuFlags_Widget(d, coord, iTrue);
+}
+
+void openMenuFlags_Widget(iWidget *d, iInt2 coord, iBool postCommands) {
     const iInt2 rootSize        = rootSize_Window(get_Window());
     const iBool isPortraitPhone = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
     const iBool isSlidePanel    = (flags_Widget(d) & horizontalOffset_WidgetFlag) != 0;
+    if (postCommands) {
+        postCommand_App("cancel"); /* dismiss any other menus */
+    }
     /* Menu closes when commands are emitted, so handle any pending ones beforehand. */
-    postCommand_App("cancel"); /* dismiss any other menus */
     processEvents_App(postedEventsOnly_AppEventMode);
     setFlags_Widget(d, hidden_WidgetFlag | disabled_WidgetFlag, iFalse);
     setFlags_Widget(d, commandOnMouseMiss_WidgetFlag, iTrue);
+    raise_Widget(d);
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iFalse);
     if (isPortraitPhone) {
         setFlags_Widget(d, arrangeWidth_WidgetFlag | resizeChildrenToWidestChild_WidgetFlag, iFalse);
@@ -576,7 +583,7 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
         float l, t, r, b;
         safeAreaInsets_iOS(&l, &t, &r, &b);
         topExcess    += t;
-        bottomExcess += b;
+        bottomExcess += iMax(b, get_Window()->keyboardHeight);
         leftExcess   += l;
         rightExcess  += r;
     }
@@ -594,7 +601,9 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
         d->rect.pos.x += leftExcess;
     }
     postRefresh_App();
-    postCommand_Widget(d, "menu.opened");
+    if (postCommands) {
+        postCommand_Widget(d, "menu.opened");
+    }
     if (isPortraitPhone) {
         setVisualOffset_Widget(d, isSlidePanel ? width_Widget(d) : height_Widget(d), 0, 0);
         setVisualOffset_Widget(d, 0, 330, easeOut_AnimFlag | softer_AnimFlag);
diff --git a/src/ui/util.h b/src/ui/util.h
index 7a66ebb3..e2461b9d 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -172,6 +172,7 @@ struct Impl_MenuItem {
 
 iWidget *   makeMenu_Widget     (iWidget *parent, const iMenuItem *items, size_t n); /* returns no ref */
 void        openMenu_Widget     (iWidget *, iInt2 coord);
+void        openMenuFlags_Widget(iWidget *d, iInt2 coord, iBool postCommands);
 void        closeMenu_Widget    (iWidget *);
 
 iLabelWidget *  findMenuItem_Widget (iWidget *menu, const char *command);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 4d319808..4fad3c86 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1207,6 +1207,15 @@ static void printTree_Widget_(const iWidget *d, int indent) {
     }
 }
 
+void raise_Widget(iWidget *d) {
+    iPtrArray *onTop = onTop_RootData_();
+    if (d->flags & keepOnTop_WidgetFlag) {
+        iAssert(indexOf_PtrArray(onTop, d) != iInvalidPos);
+        removeOne_PtrArray(onTop, d);
+        pushBack_PtrArray(onTop, d);
+    }
+}
+
 iBool hasVisibleChildOnTop_Widget(const iWidget *parent) {
     iConstForEach(ObjectList, i, parent->children) {
         const iWidget *child = i.object;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 37c8efdc..a00bb3b7 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -243,6 +243,7 @@ iWidget *   hover_Widget            (void);
 void        unhover_Widget          (void);
 void        setMouseGrab_Widget     (iWidget *);
 iWidget *   mouseGrab_Widget        (void);
+void        raise_Widget            (iWidget *);
 iBool       hasVisibleChildOnTop_Widget
                                     (const iWidget *parent);
 void        printTree_Widget        (const iWidget *);
diff --git a/src/ui/window.c b/src/ui/window.c
index 16f217a3..5b65f173 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -262,7 +262,10 @@ static const iMenuItem fileMenuItems_[] = {
 };
 
 static const iMenuItem editMenuItems_[] = {
+    { "Cut", SDLK_x, KMOD_PRIMARY, "input.copy cut:1" },
     { "Copy", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "Paste", SDLK_v, KMOD_PRIMARY, "input.paste" },
+    { "---", 0, 0, NULL },
     { "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" },
@@ -581,7 +584,6 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             iWidget *urlBar = findChild_Widget(navBar, "url");
             urlBar->rect.size.x = iMini(navBarAvailableSpace_(navBar), 167 * gap_UI);
             arrange_Widget(navBar);
-            printTree_Widget(urlBar);
         }
         refresh_Widget(navBar);
         postCommand_Widget(navBar, "layout.changed id:navbar");
@@ -1134,7 +1136,7 @@ static void setupUserInterface_Window(iWindow *d) {
     }
 #endif
     updatePadding_Window_(d);
-    /* Context menus. */ {
+    /* Global context menus. */ {
         iWidget *tabsMenu = makeMenu_Widget(d->root,
                                             (iMenuItem[]){
                                                 { close_Icon " Close Tab", 0, 0, "tabs.close" },
@@ -1145,13 +1147,22 @@ static void setupUserInterface_Window(iWindow *d) {
                                                 { barRightArrow_Icon " Close Tabs To Right", 0, 0, "tabs.close toright:1" },
                                             },
                                             6);
-        setId_Widget(tabsMenu, "doctabs.menu");
         iWidget *barMenu = makeMenu_Widget(d->root,
                                            (iMenuItem[]) {
-            { "Toggle Left Sidebar", 0, 0, "sidebar.toggle" },
-            { "Toggle Right Sidebar", 0, 0, "sidebar2.toggle" },
+            { leftHalf_Icon " Toggle Left Sidebar", 0, 0, "sidebar.toggle" },
+            { rightHalf_Icon " Toggle Right Sidebar", 0, 0, "sidebar2.toggle" },
         }, 2);
+        iWidget *clipMenu = makeMenu_Widget(d->root,
+                                            (iMenuItem[]){
+                                                { scissor_Icon " Cut", 0, 0, "input.copy cut:1" },
+                                                { clipCopy_Icon " Copy", 0, 0, "input.copy" },
+                                                { "---", 0, 0, NULL },
+                                                { clipboard_Icon " Paste", 0, 0, "input.paste" },
+                                            },
+                                            4);
+        setId_Widget(tabsMenu, "doctabs.menu");
         setId_Widget(barMenu, "barmenu");
+        setId_Widget(clipMenu, "clipmenu");
     }
     /* Global keyboard shortcuts. */ {
         addAction_Widget(d->root, 'l', KMOD_PRIMARY, "navigate.focus");