Changeset 2f910b7 in mainline

Timestamp:

2021-09-27T12:42:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a330f2e

Parents:

b4b5f6a4

Message:

Search dialog

File:

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

uspace/app/edit/edit.c

@@ -126 +126 @@
         int ideal_column;
 
+        bool search_reverse;
         char *previous_search;
         bool previous_search_reverse;
@@ -183 +184 @@
 static char *range_get_str(spt_t const *spos, spt_t const *epos);
 
-static char *prompt(char const *prompt, char const *init_value);
-
 static errno_t pane_init(ui_window_t *, pane_t *);
 static void pane_fini(pane_t *);
@@ -277 +276 @@
         .bcancel = go_to_line_dialog_bcancel,
         .close =  go_to_line_dialog_close
+};
+
+static void search_dialog_bok(ui_prompt_dialog_t *, void *, const char *);
+static void search_dialog_bcancel(ui_prompt_dialog_t *, void *);
+static void search_dialog_close(ui_prompt_dialog_t *, void *);
+
+static ui_prompt_dialog_cb_t search_dialog_cb = {
+        .bok = search_dialog_bok,
+        .bcancel = search_dialog_bcancel,
+        .close =  search_dialog_close
 };
 
@@ -823 +832 @@
 
         ui_file_dialog_set_cb(dialog, &save_as_dialog_cb, &edit);
-}
-
-/** Ask for a string. */
-static char *prompt(char const *prompt, char const *init_value)
-{
-        return str_dup("42");
 }
 
@@ -1689 +1692 @@
 static void search_prompt(bool reverse)
 {
-        char *pattern;
-
-        const char *prompt_text = "Find next";
-        if (reverse)
-                prompt_text = "Find previous";
-
-        const char *default_value = "";
-        if (pane.previous_search)
-                default_value = pane.previous_search;
-
-        pattern = prompt(prompt_text, default_value);
-        if (pattern == NULL) {
-                status_display("Search cancelled.");
+        ui_prompt_dialog_params_t pdparams;
+        ui_prompt_dialog_t *dialog;
+        errno_t rc;
+
+        ui_prompt_dialog_params_init(&pdparams);
+        pdparams.caption = reverse ? "Reverse Search" : "Search";
+        pdparams.prompt = "Search text";
+
+//      const char *default_value = "";
+//      if (pane.previous_search)
+//              default_value = pane.previous_search;
+
+        rc = ui_prompt_dialog_create(edit.ui, &pdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating prompt dialog.\n");
                 return;
         }
 
-        if (pane.previous_search)
-                free(pane.previous_search);
-        pane.previous_search = pattern;
-        pane.previous_search_reverse = reverse;
-
-        search(pattern, reverse);
+        ui_prompt_dialog_set_cb(dialog, &search_dialog_cb, &edit);
+        pane.search_reverse = reverse;
 }
 
@@ -2260 +2261 @@
 }
 
+/** Search dialog OK button press.
+ *
+ * @param dialog Search dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param text Submitted text
+ */
+static void search_dialog_bok(ui_prompt_dialog_t *dialog, void *arg,
+    const char *text)
+{
+        edit_t *edit = (edit_t *) arg;
+        gfx_context_t *gc = ui_window_get_gc(edit->window);
+        char *pattern;
+        bool reverse;
+
+        ui_prompt_dialog_destroy(dialog);
+
+        /* Abort if search phrase is empty */
+        if (text[0] == '\0')
+                return;
+
+        pattern = str_dup(text);
+        reverse = pane.search_reverse;
+
+        if (pane.previous_search)
+                free(pane.previous_search);
+        pane.previous_search = pattern;
+        pane.previous_search_reverse = reverse;
+
+        search(pattern, reverse);
+
+        // TODO Smarter cursor management
+        (void) pane_update(&pane);
+        gfx_cursor_set_visible(gc, true);
+        (void) gfx_update(gc);
+}
+
+/** Search dialog cancel button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void search_dialog_bcancel(ui_prompt_dialog_t *dialog, void *arg)
+{
+        edit_t *edit = (edit_t *) arg;
+        gfx_context_t *gc = ui_window_get_gc(edit->window);
+
+        ui_prompt_dialog_destroy(dialog);
+        // TODO Smarter cursor management
+        pane.rflags |= REDRAW_CARET;
+        (void) pane_update(&pane);
+        gfx_cursor_set_visible(gc, true);
+}
+
+/** Search dialog close request.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void search_dialog_close(ui_prompt_dialog_t *dialog, void *arg)
+{
+        edit_t *edit = (edit_t *) arg;
+        gfx_context_t *gc = ui_window_get_gc(edit->window);
+
+        ui_prompt_dialog_destroy(dialog);
+        // TODO Smarter cursor management
+        pane.rflags |= REDRAW_CARET;
+        (void) pane_update(&pane);
+        gfx_cursor_set_visible(gc, true);
+}
+
 /** @}
  */