Changeset b4b5f6a4 in mainline

Timestamp:

2021-09-26T07:15:58Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2f910b7

Parents:

8e253ac

Message:

Go To Line dialog

Need to restore cursor after closing dialog. This is not how it should
be done. Either the cursor should be restored by pane activation
handler (so we still treat cursor as a global resource and the
individual controls need to responsibly manage it), or, the UI library
should somehow virtualize it, e.g. each window would remember its
cursor state and cursor would be automatically updated when a different
window is activated.

File:

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

uspace/app/edit/edit.c

@@ -61 +61 @@
 #include <ui/menubar.h>
 #include <ui/menuentry.h>
+#include <ui/promptdialog.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
@@ -268 +269 @@
 };
 
+static void go_to_line_dialog_bok(ui_prompt_dialog_t *, void *, const char *);
+static void go_to_line_dialog_bcancel(ui_prompt_dialog_t *, void *);
+static void go_to_line_dialog_close(ui_prompt_dialog_t *, void *);
+
+static ui_prompt_dialog_cb_t go_to_line_dialog_cb = {
+        .bok = go_to_line_dialog_bok,
+        .bcancel = go_to_line_dialog_bcancel,
+        .close =  go_to_line_dialog_close
+};
 
 int main(int argc, char *argv[])
@@ -1045 +1055 @@
         return EOK;
 }
-
 
 /** Display pane text.
@@ -1609 +1618 @@
 static void caret_go_to_line_ask(void)
 {
-        char *sline;
-
-        sline = prompt("Go to line", "");
-        if (sline == NULL) {
-                status_display("Go to line cancelled.");
+        ui_prompt_dialog_params_t pdparams;
+        ui_prompt_dialog_t *dialog;
+        errno_t rc;
+
+        ui_prompt_dialog_params_init(&pdparams);
+        pdparams.caption = "Go To Line";
+        pdparams.prompt = "Line Number";
+
+        rc = ui_prompt_dialog_create(edit.ui, &pdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating prompt dialog.\n");
                 return;
         }
 
-        char *endptr;
-        int line = strtol(sline, &endptr, 10);
-        if (*endptr != '\0') {
-                free(sline);
-                status_display("Invalid number entered.");
-                return;
-        }
-        free(sline);
-
-        caret_move_absolute(line, pane.ideal_column, dir_before, false);
+        ui_prompt_dialog_set_cb(dialog, &go_to_line_dialog_cb, &edit);
 }
 
@@ -2131 +2137 @@
     const char *fname)
 {
+        edit_t *edit = (edit_t *)arg;
+        gfx_context_t *gc = ui_window_get_gc(edit->window);
         char *cname;
         errno_t rc;
 
         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);
@@ -2160 +2172 @@
 {
         edit_t *edit = (edit_t *)arg;
-
-        (void)edit;
+        gfx_context_t *gc = ui_window_get_gc(edit->window);
+
         ui_file_dialog_destroy(dialog);
+        // TODO Smarter cursor management
+        pane.rflags |= REDRAW_CARET;
+        (void) pane_update(&pane);
+        gfx_cursor_set_visible(gc, true);
 }
 
@@ -2173 +2189 @@
 {
         edit_t *edit = (edit_t *)arg;
-
-        (void)edit;
+        gfx_context_t *gc = ui_window_get_gc(edit->window);
+
         ui_file_dialog_destroy(dialog);
+        // TODO Smarter cursor management
+        pane.rflags |= REDRAW_CARET;
+        (void) pane_update(&pane);
+        gfx_cursor_set_visible(gc, true);
+}
+
+/** Go To Line dialog OK button press.
+ *
+ * @param dialog Go To Line dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param text Submitted text
+ */
+static void go_to_line_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 *endptr;
+        int line;
+
+        ui_prompt_dialog_destroy(dialog);
+        line = strtol(text, &endptr, 10);
+        if (*endptr != '\0') {
+                status_display("Invalid number entered.");
+                return;
+        }
+
+        caret_move_absolute(line, pane.ideal_column, dir_before, false);
+        // TODO Smarter cursor management
+        (void) pane_update(&pane);
+        gfx_cursor_set_visible(gc, true);
+        (void) gfx_update(gc);
+}
+
+/** Go To Line dialog cancel button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void go_to_line_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);
+}
+
+/** Go To Line dialog close request.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void go_to_line_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);
 }