Changes in uspace/app/edit/edit.c [e0cf963:994f87b] in mainline

File:

• uspace/app/edit/edit.c (modified) (48 diffs)

uspace/app/edit/edit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Martin Sucha
  * All rights reserved.
@@ -60 +60 @@
 #include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
 #include <ui/promptdialog.h>
@@ -176 +177 @@
 static void pos_handle(pos_event_t *ev);
 
+static errno_t file_new(void);
+static void file_open(void);
+static errno_t file_open_file(const char *fname);
 static errno_t file_save(char const *fname);
 static void file_save_as(void);
-static errno_t file_insert(char *fname);
+static errno_t file_insert(const char *fname);
 static errno_t file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos);
@@ -237 +241 @@
 
 static void edit_wnd_close(ui_window_t *, void *);
+static void edit_wnd_focus(ui_window_t *, void *, unsigned);
 static void edit_wnd_kbd_event(ui_window_t *, void *, kbd_event_t *);
+static void edit_wnd_unfocus(ui_window_t *, void *, unsigned);
 
 static ui_window_cb_t edit_window_cb = {
         .close = edit_wnd_close,
-        .kbd = edit_wnd_kbd_event
+        .focus = edit_wnd_focus,
+        .kbd = edit_wnd_kbd_event,
+        .unfocus = edit_wnd_unfocus
 };
 
+static void edit_menubar_activate(ui_menu_bar_t *, void *);
+static void edit_menubar_deactivate(ui_menu_bar_t *, void *);
+
+static ui_menu_bar_cb_t edit_menubar_cb = {
+        .activate = edit_menubar_activate,
+        .deactivate = edit_menubar_deactivate
+};
+
+static void edit_file_new(ui_menu_entry_t *, void *);
+static void edit_file_open(ui_menu_entry_t *, void *);
 static void edit_file_save(ui_menu_entry_t *, void *);
 static void edit_file_save_as(ui_menu_entry_t *, void *);
@@ -268 +286 @@
 };
 
+static void open_dialog_bok(ui_file_dialog_t *, void *, const char *);
+static void open_dialog_bcancel(ui_file_dialog_t *, void *);
+static void open_dialog_close(ui_file_dialog_t *, void *);
+
+static ui_file_dialog_cb_t open_dialog_cb = {
+        .bok = open_dialog_bok,
+        .bcancel = open_dialog_bcancel,
+        .close = open_dialog_close
+};
+
 static void save_as_dialog_bok(ui_file_dialog_t *, void *, const char *);
 static void save_as_dialog_bcancel(ui_file_dialog_t *, void *);
@@ -300 +328 @@
 int main(int argc, char *argv[])
 {
-        bool new_file;
         errno_t rc;
 
@@ -306 +333 @@
         pane.sh_column = 1;
 
-        /* Start with an empty sheet. */
-        rc = sheet_create(&doc.sh);
-        if (rc != EOK) {
-                printf("Out of memory.\n");
-                return -1;
-        }
-
-        /* Place caret at the beginning of file. */
-        spt_t sof;
-        pt_get_sof(&sof);
-        sheet_place_tag(doc.sh, &sof, &pane.caret_pos);
-        pane.ideal_column = 1;
+        /* Create UI */
+        rc = edit_ui_create(&edit);
+        if (rc != EOK)
+                return 1;
 
         if (argc == 2) {
                 doc.file_name = str_dup(argv[1]);
+                rc = file_open_file(argv[1]);
+                if (rc != EOK) {
+                        status_display("File not found. Starting empty file.");
+                        rc = file_new();
+                }
         } else if (argc > 1) {
                 printf("Invalid arguments.\n");
                 return -2;
         } else {
-                doc.file_name = NULL;
-        }
-
-        new_file = false;
-
-        if (doc.file_name == NULL || file_insert(doc.file_name) != EOK)
-                new_file = true;
-
-        /* Place selection start tag. */
-        sheet_place_tag(doc.sh, &sof, &pane.sel_start);
-
-        /* Move to beginning of file. */
-        pt_get_sof(&sof);
-
-        /* Create UI */
-        rc = edit_ui_create(&edit);
-        if (rc != EOK)
-                return 1;
-
-        caret_move(sof, true, true);
+                rc = file_new();
+        }
 
         /* Initial display */
@@ -352 +358 @@
                 return rc;
         }
-
-        pane_status_display(&pane);
-        if (new_file && doc.file_name != NULL)
-                status_display("File not found. Starting empty file.");
-        pane_caret_display(&pane);
-        cursor_setvis(true);
 
         ui_run(edit.ui);
@@ -377 +377 @@
         ui_menu_t *mfile = NULL;
         ui_menu_t *medit = NULL;
+        ui_menu_entry_t *mnew = NULL;
+        ui_menu_entry_t *mopen = NULL;
         ui_menu_entry_t *msave = NULL;
         ui_menu_entry_t *msaveas = NULL;
@@ -430 +432 @@
         }
 
-        rc = ui_menu_create(edit->menubar, "File", &mfile);
+        ui_menu_bar_set_cb(edit->menubar, &edit_menubar_cb, (void *) edit);
+
+        rc = ui_menu_dd_create(edit->menubar, "~F~ile", NULL, &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -436 +440 @@
         }
 
-        rc = ui_menu_entry_create(mfile, "Save", "Ctrl-S", &msave);
+        rc = ui_menu_entry_create(mfile, "~N~ew", "Ctrl-N", &mnew);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -442 +446 @@
         }
 
+        ui_menu_entry_set_cb(mnew, edit_file_new, (void *) edit);
+
+        rc = ui_menu_entry_create(mfile, "~O~pen", "Ctrl-O", &mopen);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        ui_menu_entry_set_cb(mopen, edit_file_open, (void *) edit);
+
+        rc = ui_menu_entry_create(mfile, "~S~ave", "Ctrl-S", &msave);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
         ui_menu_entry_set_cb(msave, edit_file_save, (void *) edit);
 
-        rc = ui_menu_entry_create(mfile, "Save As", "Ctrl-E", &msaveas);
+        rc = ui_menu_entry_create(mfile, "Save ~A~s", "Ctrl-E", &msaveas);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -458 +478 @@
         }
 
-        rc = ui_menu_entry_create(mfile, "Exit", "Ctrl-Q", &mexit);
+        rc = ui_menu_entry_create(mfile, "E~x~it", "Ctrl-Q", &mexit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -466 +486 @@
         ui_menu_entry_set_cb(mexit, edit_file_exit, (void *) edit);
 
-        rc = ui_menu_create(edit->menubar, "Edit", &medit);
+        rc = ui_menu_dd_create(edit->menubar, "~E~dit", NULL, &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -472 +492 @@
         }
 
-        rc = ui_menu_entry_create(medit, "Cut", "Ctrl-X", &mcut);
+        rc = ui_menu_entry_create(medit, "Cu~t~", "Ctrl-X", &mcut);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -480 +500 @@
         ui_menu_entry_set_cb(mcut, edit_edit_cut, (void *) edit);
 
-        rc = ui_menu_entry_create(medit, "Copy", "Ctrl-C", &mcopy);
+        rc = ui_menu_entry_create(medit, "~C~opy", "Ctrl-C", &mcopy);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -488 +508 @@
         ui_menu_entry_set_cb(mcopy, edit_edit_copy, (void *) edit);
 
-        rc = ui_menu_entry_create(medit, "Paste", "Ctrl-V", &mpaste);
+        rc = ui_menu_entry_create(medit, "~P~aste", "Ctrl-V", &mpaste);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -496 +516 @@
         ui_menu_entry_set_cb(mpaste, edit_edit_paste, (void *) edit);
 
-        rc = ui_menu_entry_create(medit, "Delete", "Del", &mdelete);
+        rc = ui_menu_entry_create(medit, "~D~elete", "Del", &mdelete);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -510 +530 @@
         }
 
-        rc = ui_menu_entry_create(medit, "Select All", "Ctrl-A", &mselall);
+        rc = ui_menu_entry_create(medit, "Select ~A~ll", "Ctrl-A", &mselall);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -518 +538 @@
         ui_menu_entry_set_cb(mselall, edit_edit_select_all, (void *) edit);
 
-        rc = ui_menu_create(edit->menubar, "Search", &msearch);
+        rc = ui_menu_dd_create(edit->menubar, "~S~earch", NULL, &msearch);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -524 +544 @@
         }
 
-        rc = ui_menu_entry_create(msearch, "Find", "Ctrl-F", &mfind);
+        rc = ui_menu_entry_create(msearch, "~F~ind", "Ctrl-F", &mfind);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -532 +552 @@
         ui_menu_entry_set_cb(mfind, edit_search_find, (void *) edit);
 
-        rc = ui_menu_entry_create(msearch, "Reverse Find", "Ctrl-Shift-F", &mfindr);
+        rc = ui_menu_entry_create(msearch, "~R~everse Find", "Ctrl-Shift-F", &mfindr);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -540 +560 @@
         ui_menu_entry_set_cb(mfindr, edit_search_reverse_find, (void *) edit);
 
-        rc = ui_menu_entry_create(msearch, "Find Next", "Ctrl-N", &mfindn);
+        rc = ui_menu_entry_create(msearch, "Find ~N~ext", "Ctrl-R", &mfindn);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -554 +574 @@
         }
 
-        rc = ui_menu_entry_create(msearch, "Go To Line", "Ctrl-L", &mgoto);
+        rc = ui_menu_entry_create(msearch, "Go To ~L~ine", "Ctrl-L", &mgoto);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -726 +746 @@
                 ui_quit(edit.ui);
                 break;
+        case KC_N:
+                file_new();
+                break;
+        case KC_O:
+                file_open();
+                break;
         case KC_S:
                 if (doc.file_name != NULL)
@@ -759 +785 @@
                 search_prompt(false);
                 break;
-        case KC_N:
+        case KC_R:
                 search_repeat();
                 break;
@@ -898 +924 @@
 }
 
-/** Save the document. */
-static errno_t file_save(char const *fname)
-{
-        spt_t sp, ep;
+/** Create new document. */
+static errno_t file_new(void)
+{
         errno_t rc;
-
-        status_display("Saving...");
-        pt_get_sof(&sp);
-        pt_get_eof(&ep);
-
-        rc = file_save_range(fname, &sp, &ep);
-
-        switch (rc) {
-        case EINVAL:
-                status_display("Error opening file!");
-                break;
-        case EIO:
-                status_display("Error writing data!");
-                break;
-        default:
-                status_display("File saved.");
-                break;
-        }
-
-        return rc;
-}
-
-/** Open Save As dialog. */
-static void file_save_as(void)
+        sheet_t *sh;
+
+        /* Create empty sheet. */
+        rc = sheet_create(&sh);
+        if (rc != EOK) {
+                printf("Out of memory.\n");
+                return ENOMEM;
+        }
+
+        if (doc.sh != NULL)
+                sheet_destroy(doc.sh);
+
+        doc.sh = sh;
+
+        /* Place caret at the beginning of file. */
+        spt_t sof;
+        pt_get_sof(&sof);
+        sheet_place_tag(doc.sh, &sof, &pane.caret_pos);
+        pane.ideal_column = 1;
+
+        doc.file_name = NULL;
+
+        /* Place selection start tag. */
+        sheet_place_tag(doc.sh, &sof, &pane.sel_start);
+
+        /* Move to beginning of file. */
+        pt_get_sof(&sof);
+
+        caret_move(sof, true, true);
+
+        pane_status_display(&pane);
+        pane_caret_display(&pane);
+        pane_text_display(&pane);
+        cursor_setvis(true);
+
+        return EOK;
+}
+
+/** Open Open File dialog. */
+static void file_open(void)
 {
         const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
@@ -934 +975 @@
 
         ui_file_dialog_params_init(&fdparams);
+        fdparams.caption = "Open File";
+        fdparams.ifname = old_fname;
+
+        rc = ui_file_dialog_create(edit.ui, &fdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating message dialog.\n");
+                return;
+        }
+
+        ui_file_dialog_set_cb(dialog, &open_dialog_cb, &edit);
+}
+
+/** Open exising document. */
+static errno_t file_open_file(const char *fname)
+{
+        errno_t rc;
+        sheet_t *sh;
+        char *fn;
+
+        /* Create empty sheet. */
+        rc = sheet_create(&sh);
+        if (rc != EOK) {
+                printf("Out of memory.\n");
+                return ENOMEM;
+        }
+
+        fn = str_dup(fname);
+        if (fn == NULL) {
+                sheet_destroy(sh);
+                return ENOMEM;
+        }
+
+        if (doc.sh != NULL)
+                sheet_destroy(doc.sh);
+
+        doc.sh = sh;
+
+        /* Place caret at the beginning of file. */
+        spt_t sof;
+        pt_get_sof(&sof);
+        sheet_place_tag(doc.sh, &sof, &pane.caret_pos);
+        pane.ideal_column = 1;
+
+        rc = file_insert(fname);
+        if (rc != EOK)
+                return rc;
+
+        doc.file_name = fn;
+
+        /* Place selection start tag. */
+        sheet_place_tag(doc.sh, &sof, &pane.sel_start);
+
+        /* Move to beginning of file. */
+        pt_get_sof(&sof);
+
+        caret_move(sof, true, true);
+
+        pane_status_display(&pane);
+        pane_caret_display(&pane);
+        pane_text_display(&pane);
+        cursor_setvis(true);
+
+        return EOK;
+}
+
+/** Save the document. */
+static errno_t file_save(char const *fname)
+{
+        spt_t sp, ep;
+        errno_t rc;
+
+        status_display("Saving...");
+        pt_get_sof(&sp);
+        pt_get_eof(&ep);
+
+        rc = file_save_range(fname, &sp, &ep);
+
+        switch (rc) {
+        case EINVAL:
+                status_display("Error opening file!");
+                break;
+        case EIO:
+                status_display("Error writing data!");
+                break;
+        default:
+                status_display("File saved.");
+                break;
+        }
+
+        return rc;
+}
+
+/** Open Save As dialog. */
+static void file_save_as(void)
+{
+        const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+        ui_file_dialog_params_t fdparams;
+        ui_file_dialog_t *dialog;
+        errno_t rc;
+
+        ui_file_dialog_params_init(&fdparams);
         fdparams.caption = "Save As";
         fdparams.ifname = old_fname;
@@ -951 +1093 @@
  * of the caret.
  */
-static errno_t file_insert(char *fname)
+static errno_t file_insert(const char *fname)
 {
         FILE *f;
@@ -978 +1120 @@
 
                 bcnt -= off;
-                memcpy(buf, buf + off, bcnt);
+                memmove(buf, buf + off, bcnt);
 
                 insert_char(c);
@@ -1259 +1401 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = font;
         fmt.color = pane->color;
 
@@ -1318 +1461 @@
                                         return rc;
 
-                                rc = gfx_puttext(font, &tpos, &fmt, cbuf);
+                                rc = gfx_puttext(&tpos, &fmt, cbuf);
                                 if (rc != EOK)
                                         return rc;
@@ -1408 +1551 @@
          */
         while (true) {
-                int rc = asprintf(&text, "%d, %d (%d): File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
-                    "Ctrl-E Save As", coord.row, coord.column, last_row, fname);
+                int rc = asprintf(&text, "%d, %d (%d): File '%s'. Ctrl-Q Quit  "
+                    "F10 Menu", coord.row, coord.column, last_row, fname);
                 if (rc < 0) {
                         n = 0;
@@ -2219 +2362 @@
 }
 
+/** Window focus event
+ *
+ * @param window Window
+ * @param arg Argument (edit_t *)
+ * @param focus Focus number
+ */
+static void edit_wnd_focus(ui_window_t *window, void *arg, unsigned focus)
+{
+        edit_t *edit = (edit_t *)arg;
+
+        (void)edit;
+        pane_caret_display(&pane);
+        cursor_setvis(true);
+}
+
 /** Window keyboard event
  *
@@ -2229 +2387 @@
 {
         pane.keymod = event->mods;
+
+        if (ui_window_def_kbd(window, event) == ui_claimed)
+                return;
 
         if (event->type == KEY_PRESS) {
@@ -2237 +2398 @@
 }
 
+/** Window unfocus event
+ *
+ * @param window Window
+ * @param arg Argument (edit_t *)
+ * @param focus Focus number
+ */
+static void edit_wnd_unfocus(ui_window_t *window, void *arg, unsigned focus)
+{
+        edit_t *edit = (edit_t *) arg;
+
+        (void)edit;
+        cursor_setvis(false);
+}
+
+/** Menu bar activate event
+ *
+ * @param mbar Menu bar
+ * @param arg Argument (edit_t *)
+ */
+static void edit_menubar_activate(ui_menu_bar_t *mbar, void *arg)
+{
+        edit_t *edit = (edit_t *)arg;
+
+        (void)edit;
+        cursor_setvis(false);
+}
+
+/** Menu bar deactivate event
+ *
+ * @param mbar Menu bar
+ * @param arg Argument (edit_t *)
+ */
+static void edit_menubar_deactivate(ui_menu_bar_t *mbar, void *arg)
+{
+        edit_t *edit = (edit_t *)arg;
+
+        (void)edit;
+        pane_caret_display(&pane);
+        cursor_setvis(true);
+}
+
+/** File / New menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (edit_t *)
+ */
+static void edit_file_new(ui_menu_entry_t *mentry, void *arg)
+{
+        edit_t *edit = (edit_t *) arg;
+
+        (void)edit;
+        file_new();
+        (void) gfx_update(ui_window_get_gc(edit->window));
+}
+
+/** File / Open menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (edit_t *)
+ */
+static void edit_file_open(ui_menu_entry_t *mentry, void *arg)
+{
+        edit_t *edit = (edit_t *) arg;
+
+        (void)edit;
+        file_open();
+}
+
 /** File / Save menu entry selected.
  *
@@ -2392 +2621 @@
 }
 
-/** Save As dialog OK button press.
- *
- * @param dialog Save As dialog
+/** Open File dialog OK button press.
+ *
+ * @param dialog Open File dialog
  * @param arg Argument (ui_demo_t *)
  * @param fname File name
  */
-static void save_as_dialog_bok(ui_file_dialog_t *dialog, void *arg,
+static void open_dialog_bok(ui_file_dialog_t *dialog, void *arg,
     const char *fname)
 {
         edit_t *edit = (edit_t *)arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
         char *cname;
         errno_t rc;
 
+        (void)edit;
         ui_file_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 
         cname = str_dup(fname);
@@ -2418 +2643 @@
         }
 
+        rc = file_open_file(fname);
+        if (rc != EOK)
+                return;
+
+        if (doc.file_name != NULL)
+                free(doc.file_name);
+        doc.file_name = cname;
+
+        (void) gfx_update(ui_window_get_gc(edit->window));
+}
+
+/** Open File dialog cancel button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void open_dialog_bcancel(ui_file_dialog_t *dialog, void *arg)
+{
+        edit_t *edit = (edit_t *)arg;
+
+        (void)edit;
+        ui_file_dialog_destroy(dialog);
+}
+
+/** Open File dialog close request.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void open_dialog_close(ui_file_dialog_t *dialog, void *arg)
+{
+        edit_t *edit = (edit_t *)arg;
+
+        (void)edit;
+        ui_file_dialog_destroy(dialog);
+}
+
+/** Save As dialog OK button press.
+ *
+ * @param dialog Save As dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param fname File name
+ */
+static void save_as_dialog_bok(ui_file_dialog_t *dialog, void *arg,
+    const char *fname)
+{
+        edit_t *edit = (edit_t *)arg;
+        char *cname;
+        errno_t rc;
+
+        (void)edit;
+        ui_file_dialog_destroy(dialog);
+
+        cname = str_dup(fname);
+        if (cname == NULL) {
+                printf("Out of memory.\n");
+                return;
+        }
+
         rc = file_save(fname);
         if (rc != EOK)
@@ -2436 +2720 @@
 {
         edit_t *edit = (edit_t *)arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
-
+
+        (void)edit;
         ui_file_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 }
 
@@ -2453 +2733 @@
 {
         edit_t *edit = (edit_t *)arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
-
+
+        (void)edit;
         ui_file_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 }
 
@@ -2472 +2748 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
         char *endptr;
         int line;
@@ -2484 +2759 @@
 
         caret_move_absolute(line, pane.ideal_column, dir_before, false);
-        // TODO Smarter cursor management
+        (void)edit;
         (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
-        (void) gfx_update(gc);
 }
 
@@ -2498 +2771 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
-
+
+        (void)edit;
         ui_prompt_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 }
 
@@ -2515 +2784 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
-
+
+        (void)edit;
         ui_prompt_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 }
 
@@ -2534 +2799 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
         char *pattern;
         bool reverse;
 
+        (void)edit;
         ui_prompt_dialog_destroy(dialog);
 
@@ -2554 +2819 @@
         search(pattern, reverse);
 
-        // TODO Smarter cursor management
         (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
-        (void) gfx_update(gc);
 }
 
@@ -2568 +2830 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
-
+
+        (void)edit;
         ui_prompt_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 }
 
@@ -2585 +2843 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
-
+
+        (void)edit;
         ui_prompt_dialog_destroy(dialog);
-        // TODO Smarter cursor management
-        pane.rflags |= REDRAW_CARET;
-        (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
 }