Changeset ebb1489 in mainline for uspace/app

Timestamp:

2024-10-13T08:23:40Z (18 months ago)

Author:

GitHub <noreply@…>

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

Location:

uspace/app

Files:

• bdsh/cmds/modules/help/help.c (modified) (1 diff)
• blkdump/blkdump.c (modified) (2 diffs)
• contacts/contacts.c (deleted)
• contacts/doc/doxygroups.h (deleted)
• dltest/dltest.c (modified) (4 diffs)
• download/main.c (modified) (1 diff)
• edit/edit.c (modified) (30 diffs)
• edit/sheet.c (modified) (2 diffs)
• edit/sheet.h (modified) (2 diffs)
• getterm/welcome.c (modified) (1 diff)
• gfxdemo/gfxdemo.c (modified) (9 diffs)
• hbench/benchlist.c (modified) (2 diffs)
• hbench/disk/randread.c (added)
• hbench/disk/seqread.c (added)
• hbench/hbench.h (modified) (2 diffs)
• hbench/meson.build (modified) (3 diffs)
• init/init.c (modified) (10 diffs)
• init/meson.build (modified) (1 diff)
• init/untar.c (modified) (2 diffs)
• meson.build (modified) (1 diff)
• mkexfat/mkexfat.c (modified) (2 diffs)
• mkfat/mkfat.c (modified) (6 diffs)
• mkmfs/mkmfs.c (modified) (2 diffs)
• pkg/pkg.c (modified) (1 diff)
• sysinst/meson.build (modified) (1 diff)
• sysinst/sysinst.c (modified) (10 diffs)
• taskbar-cfg/main.c (modified) (2 diffs)
• taskbar-cfg/smeedit.c (modified) (2 diffs)
• taskbar-cfg/startmenu.c (modified) (8 diffs)
• taskbar/taskbar.c (modified) (1 diff)
• taskbar/taskbar.sif (modified) (1 diff)
• terminal/meson.build (modified) (1 diff)
• terminal/terminal.c (modified) (38 diffs)
• terminal/terminal.h (modified) (4 diffs)
• tester/print/print2.c (modified) (1 diff)
• tetris/screen.c (modified) (7 diffs)
• tetris/screen.h (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)
• uidemo/uidemo.c (modified) (1 diff)
• viewer/viewer.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/help/help.c

@@ -154 +154 @@
             "This is but a small glimpse of what you can do with HelenOS. "
             "To learn more please point your browser to the HelenOS User's "
-            "Guide: http://trac.helenos.org/wiki/UsersGuide\n\n",
+            "Guide: https://www.helenos.org/wiki/UsersGuide\n\n",
             ALIGN_LEFT);
 }

uspace/app/blkdump/blkdump.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Sucha
- * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -150 +150 @@
         }
 
-        rc = block_init(service_id, 2048);
+        rc = block_init(service_id);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");

uspace/app/dltest/dltest.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2016 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -571 +571 @@
 #ifdef DLTEST_LINKED
 
+/** Test if we can read the correct value of a public pointer variable.
+ *
+ * dl_public_ptr_var is initialized in libdltest to point to dl_public_var.
+ * This is done using a relocation. The main program (unless compiled with
+ * PIC or PIE) will contain a copy of dl_public_ptr_var. This needs
+ * to be copied using a COPY relocation. The relocations in the main
+ * program need to be processed after the relocations in the shared
+ * libraries (so that we copy the correct value).
+ */
+static bool test_public_ptr_var(void)
+{
+        int *ptr;
+
+        printf("Read dl_public_ptr_var directly...\n");
+        ptr = dl_public_ptr_var;
+
+        if (ptr != &dl_public_var) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
 /** Test directly calling function that returns a constant */
 static bool test_lnk_dl_get_constant(void)
@@ -920 +945 @@
 
 #ifndef STATIC_EXE
+
         if (!test_dlfcn_dl_get_private_fib_var())
                 return 1;
@@ -974 +1000 @@
 
         if (!test_lnk_read_public_uvar())
+                return 1;
+
+        if (!test_public_ptr_var())
                 return 1;
 

uspace/app/download/main.c

@@ -61 +61 @@
         fprintf(stderr, "  to redirect the output, e.g.\n");
         fprintf(stderr, "\n");
-        fprintf(stderr, "    download http://helenos.org/ | to helenos.html\n\n");
+        fprintf(stderr, "    download http://test-ipv4.helenos.org/ | to test.html\n\n");
 }
 

uspace/app/edit/edit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Martin Sucha
  * All rights reserved.
@@ -177 +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);
@@ -238 +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 *);
@@ -269 +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 *);
@@ -301 +328 @@
 int main(int argc, char *argv[])
 {
-        bool new_file;
         errno_t rc;
 
@@ -307 +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 */
@@ -353 +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);
@@ -378 +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;
@@ -431 +432 @@
         }
 
+        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) {
@@ -437 +440 @@
         }
 
+        rc = ui_menu_entry_create(mfile, "~N~ew", "Ctrl-N", &mnew);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        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) {
@@ -541 +560 @@
         ui_menu_entry_set_cb(mfindr, edit_search_reverse_find, (void *) edit);
 
-        rc = ui_menu_entry_create(msearch, "Find ~N~ext", "Ctrl-N", &mfindn);
+        rc = ui_menu_entry_create(msearch, "Find ~N~ext", "Ctrl-R", &mfindn);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -727 +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)
@@ -760 +785 @@
                 search_prompt(false);
                 break;
-        case KC_N:
+        case KC_R:
                 search_repeat();
                 break;
@@ -899 +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 : "";
@@ -935 +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;
@@ -952 +1093 @@
  * of the caret.
  */
-static errno_t file_insert(char *fname)
+static errno_t file_insert(const char *fname)
 {
         FILE *f;
@@ -2221 +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
  *
@@ -2242 +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.
  *
@@ -2397 +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);
@@ -2423 +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)
@@ -2441 +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);
 }
 
@@ -2458 +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);
 }
 
@@ -2477 +2748 @@
 {
         edit_t *edit = (edit_t *) arg;
-        gfx_context_t *gc = ui_window_get_gc(edit->window);
         char *endptr;
         int line;
@@ -2489 +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);
 }
 
@@ -2503 +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);
 }
 
@@ -2520 +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);
 }
 
@@ -2539 +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);
 
@@ -2559 +2819 @@
         search(pattern, reverse);
 
-        // TODO Smarter cursor management
         (void) pane_update(&pane);
-        gfx_cursor_set_visible(gc, true);
-        (void) gfx_update(gc);
 }
 
@@ -2573 +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);
 }
 
@@ -2590 +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);
 }
 

uspace/app/edit/sheet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -90 +90 @@
 }
 
+/** Destroy sheet. */
+void sheet_destroy(sheet_t *sh)
+{
+        free(sh->data);
+        free(sh);
+}
+
 /** Insert text into sheet.
  *

uspace/app/edit/sheet.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -91 +91 @@
 
 extern errno_t sheet_create(sheet_t **);
+extern void sheet_destroy(sheet_t *);
 extern errno_t sheet_insert(sheet_t *, spt_t *, enum dir_spec, char *);
 extern errno_t sheet_delete(sheet_t *, spt_t *, spt_t *);

uspace/app/getterm/welcome.c

@@ -41 +41 @@
 {
         printf("Welcome to HelenOS!\n");
-        printf("http://www.helenos.org/\n\n");
+        printf("https://www.helenos.org/\n\n");
         printf("Type 'help' [Enter] to see a few survival tips.\n\n");
 }

uspace/app/gfxdemo/gfxdemo.c

@@ -78 +78 @@
 static gfx_coord_t vpad;
 static console_ctrl_t *con = NULL;
+static bool textmode;
 static ui_t *ui;
 
 /** Determine if we are running in text mode.
  *
- * @param w Screen width
- * @param h Screen height
  * @return @c true iff we are running in text mode
  */
-static bool demo_is_text(gfx_coord_t w, gfx_coord_t h)
-{
-        // XXX Need a proper way to determine text mode
-        return w <= 80;
+static bool demo_is_text(void)
+{
+        return textmode;
 }
 
@@ -181 +179 @@
 
         /* XXX Crude way of detecting text mode */
-        if (w < 256) {
+        if (demo_is_text()) {
                 /* Create dummy font for text mode */
                 rc = gfx_typeface_create(gc, &tface);
@@ -270 +268 @@
 
         if (font != NULL) {
-                if (demo_is_text(w, h)) {
+                if (demo_is_text()) {
                         rc = gfx_color_new_ega(0x1e, &color);
                         if (rc != EOK)
@@ -719 +717 @@
         gfx_color_delete(color);
 
-        if (demo_is_text(w, h)) {
+        if (demo_is_text()) {
                 rc = gfx_color_new_ega(0x1f, &color);
                 if (rc != EOK)
@@ -807 +805 @@
 
         for (i = 0; i < 8; i++) {
-                if (demo_is_text(w, h)) {
+                if (demo_is_text()) {
                         rc = gfx_color_new_ega(i != 0 ? i : 0x10, &color);
                         if (rc != EOK)
@@ -884 +882 @@
                 gfx_color_delete(color);
 
-                if (demo_is_text(w, h)) {
+                if (demo_is_text()) {
                         rc = gfx_color_new_ega(0x1f, &color);
                         if (rc != EOK)
@@ -1093 +1091 @@
 
         gc = console_gc_get_ctx(cgc);
+
+        /* Currently console is always text. */
+        textmode = true;
 
         rc = demo_loop(gc, cols, rows);
@@ -1192 +1193 @@
                 task_retval(0);
 
+        textmode = ui_is_textmode(ui);
+
         args.gc = gc;
         args.dims = dims;
@@ -1252 +1255 @@
 
         task_retval(0);
+
+        /* FIXME Assuming display service is not text mode. */
+        textmode = false;
 
         rc = demo_loop(gc, 400, 300);

uspace/app/hbench/benchlist.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2018 Vojtech Horky
  * All rights reserved.
@@ -42 +42 @@
         &benchmark_fibril_mutex,
         &benchmark_file_read,
+        &benchmark_rand_read,
+        &benchmark_seq_read,
         &benchmark_malloc1,
         &benchmark_malloc2,

uspace/app/hbench/hbench.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2019 Vojtech Horky
  * All rights reserved.
@@ -135 +135 @@
 extern benchmark_t benchmark_fibril_mutex;
 extern benchmark_t benchmark_file_read;
+extern benchmark_t benchmark_rand_read;
+extern benchmark_t benchmark_seq_read;
 extern benchmark_t benchmark_malloc1;
 extern benchmark_t benchmark_malloc2;

uspace/app/hbench/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2023 Jiri Svoboda
+# Copyright (c) 2024 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'math', 'ipctest' ]
+deps = [ 'block', 'math', 'ipctest' ]
 src = files(
         'benchlist.c',
@@ -34 +34 @@
         'main.c',
         'utils.c',
+        'disk/randread.c',
+        'disk/seqread.c',
         'fs/dirread.c',
         'fs/fileread.c',

uspace/app/init/init.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -35 +36 @@
 
 #include <fibril.h>
+#include <futil.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -78 +80 @@
 static const char *sys_dirs[] = {
         "/w/cfg",
-        "/w/data"
+        "/w/data",
+        NULL,
 };
 
@@ -351 +354 @@
         vol_info_t vinfo;
         volume_id_t *volume_ids = NULL;
+        service_id_t *part_ids = NULL;
+        vol_part_info_t pinfo;
         size_t nvols;
+        size_t nparts;
+        bool sv_mounted;
         size_t i;
         errno_t rc;
@@ -385 +392 @@
         }
 
-        vol_destroy(vol);
         free(volume_ids);
+        volume_ids = NULL;
 
         if (!found_cfg) {
@@ -397 +404 @@
                                 printf("%s: Error creating directory '%s'.\n",
                                     NAME, *cp);
-                                return rc;
+                                goto error;
                         }
 
                         ++cp;
                 }
+
+                /* Copy initial configuration files */
+                rc = futil_rcopy_contents("/cfg", "/w/cfg");
+                if (rc != EOK)
+                        goto error;
         } else {
                 printf("%s: System volume is configured.\n", NAME);
-        }
-
+
+                /* Wait until system volume is mounted */
+                sv_mounted = false;
+
+                while (true) {
+                        rc = vol_get_parts(vol, &part_ids, &nparts);
+                        if (rc != EOK) {
+                                printf("Error getting list of volumes.\n");
+                                goto error;
+                        }
+
+                        for (i = 0; i < nparts; i++) {
+                                rc = vol_part_info(vol, part_ids[i], &pinfo);
+                                if (rc != EOK) {
+                                        printf("Error getting partition "
+                                            "information.\n");
+                                        rc = EIO;
+                                        goto error;
+                                }
+
+                                if (str_cmp(pinfo.cur_mp, "/w") == 0) {
+                                        sv_mounted = true;
+                                        break;
+                                }
+                        }
+
+                        if (sv_mounted)
+                                break;
+
+                        free(part_ids);
+                        part_ids = NULL;
+
+                        fibril_sleep(1);
+                        printf("Sleeping(1) for system volume.\n");
+                }
+        }
+
+        vol_destroy(vol);
         return EOK;
 error:
@@ -411 +459 @@
         if (volume_ids != NULL)
                 free(volume_ids);
+        if (part_ids != NULL)
+                free(part_ids);
 
         return rc;
@@ -438 +488 @@
         srv_start("/srv/klog");
         srv_start("/srv/fs/locfs");
-        srv_start("/srv/taskmon");
 
         if (!mount_locfs()) {
@@ -454 +503 @@
         srv_start("/srv/volsrv");
 
+        init_sysvol();
+
+        srv_start("/srv/taskmon");
+
         srv_start("/srv/net/loopip");
         srv_start("/srv/net/ethip");
+        srv_start("/srv/net/dhcp");
         srv_start("/srv/net/inetsrv");
         srv_start("/srv/net/tcp");
         srv_start("/srv/net/udp");
         srv_start("/srv/net/dnsrsrv");
-        srv_start("/srv/net/dhcp");
-        srv_start("/srv/net/nconfsrv");
 
         srv_start("/srv/clipboard");
@@ -469 +521 @@
         srv_start("/srv/hid/output", HID_OUTPUT);
         srv_start("/srv/audio/hound");
-
-        init_sysvol();
 
 #ifdef CONFIG_WINSYS

uspace/app/init/meson.build

@@ -28 +28 @@
 #
 
-deps = [ 'untar', 'block' ]
+deps = [ 'block', 'futil', 'untar' ]
 link_args += '-static'
 src = files('init.c', 'untar.c')

uspace/app/init/untar.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2018 Martin Decky
  * All rights reserved.
@@ -59 +60 @@
                 return ret;
 
-        ret = block_init(state->sid, 4096);
+        ret = block_init(state->sid);
         if (ret != EOK)
                 return ret;

uspace/app/meson.build

@@ -34 +34 @@
         'blkdump',
         'calculator',
-        'contacts',
         'corecfg',
         'cpptest',

uspace/app/mkexfat/mkexfat.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Maurizio Lombardi
  * All rights reserved.
@@ -858 +859 @@
         }
 
-        rc = block_init(service_id, 2048);
+        rc = block_init(service_id);
         if (rc != EOK) {
                 printf(NAME ": Error initializing libblock.\n");

uspace/app/mkfat/mkfat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -66 +66 @@
         default_fat_count               = 2,
         default_reserved_clusters       = 2,
-        default_media_descriptor        = 0xF8 /**< fixed disk */
+        default_media_descriptor        = 0xF8 /**< fixed disk */,
+        fat32_root_cluster              = 2
 };
 
@@ -198 +199 @@
         }
 
-        rc = block_init(service_id, 2048);
+        rc = block_init(service_id);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
@@ -313 +314 @@
         cfg->reserved_sectors = 1 + cfg->addt_res_sectors;
 
-        /* Only correct for FAT12/16 (FAT32 has root dir stored in clusters */
+        /* Only correct for FAT12/16 (FAT32 has root dir stored in clusters) */
         rd_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
             cfg->sector_size);
@@ -434 +435 @@
         }
 
+        if (cfg->fat_type == FAT32) {
+                /* Root dir is stored in cluster fat32_root_cluster */
+                addr += fat32_root_cluster * cfg->sectors_per_cluster;
+        }
+
         /* Root directory */
         printf("Writing root directory.\n");
@@ -529 +535 @@
                 bs->fat32.ebs = 0x29;
                 bs->fat32.id = host2uint32_t_be(vsn);
-                bs->fat32.root_cluster = 2;
+                bs->fat32.root_cluster = fat32_root_cluster;
 
                 (void) fat_label_encode(&bs->fat32.label, bs_label);

uspace/app/mkmfs/mkmfs.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Maurizio Lombardi
  * All rights reserved.
@@ -211 +212 @@
         }
 
-        rc = block_init(service_id, 2048);
+        rc = block_init(service_id);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");

uspace/app/pkg/pkg.c

@@ -116 +116 @@
         pkg_name = argv[2];
 
-        ret = asprintf(&src_uri, "http://ci.helenos.org/latest/" STRING(UARCH)
+        ret = asprintf(&src_uri, "http://ci-ipv4.helenos.org/latest/" STRING(UARCH)
             "/%s-for-helenos-" STRING(UARCH) ".tar.gz",
             pkg_name);

uspace/app/sysinst/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'block', 'fdisk', 'sif' ]
+deps = [ 'block', 'fdisk', 'futil', 'sif' ]
 src = files(
-        'futil.c',
         'rdimg.c',
         'sysinst.c',

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <errno.h>
 #include <fdisk.h>
+#include <futil.h>
 #include <loc.h>
 #include <stdio.h>
@@ -49 +50 @@
 #include <vol.h>
 
-#include "futil.h"
 #include "grub.h"
 #include "rdimg.h"
@@ -62 +62 @@
  * in Grub notation).
  */
-#define DEFAULT_DEV "devices/\\hw\\sys\\00:01.0\\ata-c1\\d0"
+#define DEFAULT_DEV_0 "devices/\\hw\\sys\\00:01.1\\c0d0"
+#define DEFAULT_DEV_1 "devices/\\hw\\sys\\00:01.0\\ata1\\c0d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
 /** Volume label for the new file system */
@@ -79 +80 @@
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
+#define CFG_FILES_SRC "/cfg"
+#define CFG_FILES_DEST MOUNT_POINT "/cfg"
+
+static const char *default_devs[] = {
+        DEFAULT_DEV_0,
+        DEFAULT_DEV_1,
+        NULL
+};
+
 static const char *sys_dirs[] = {
         "/cfg",
-        "/data"
+        "/data",
+        NULL
 };
+
+/** Check the if the destination device exists.
+ *
+ * @param dev Disk device
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_check_dev(const char *dev)
+{
+        service_id_t sid;
+        errno_t rc;
+
+        rc = loc_service_get_id(dev, &sid, 0);
+        if (rc != EOK)
+                return rc;
+
+        (void)sid;
+        return EOK;
+}
 
 /** Label the destination device.
@@ -200 +230 @@
         path = NULL;
 
+        /* Copy initial configuration files */
+        rc = futil_rcopy_contents(CFG_FILES_SRC, CFG_FILES_DEST);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 error:
@@ -244 +279 @@
         }
 
-        rv = asprintf(&path, "%s%s", rdpath, "/cfg/volsrv.sif");
+        rv = asprintf(&path, "%s%s", rdpath, "/cfg/initvol.sif");
         if (rv < 0) {
                 rc = ENOMEM;
@@ -271 +306 @@
                 printf("Error creating system partition configuration.\n");
                 rc = EIO;
+                goto error;
+        }
+
+        rc = vol_volumes_sync(volumes);
+        if (rc != EOK) {
+                printf("Error saving volume confiuration.\n");
                 goto error;
         }
@@ -361 +402 @@
 
         printf("sysinst_copy_boot_blocks: block_init.\n");
-        rc = block_init(sid, 512);
+        rc = block_init(sid);
         if (rc != EOK)
                 return rc;
@@ -490 +531 @@
 int main(int argc, char *argv[])
 {
-        const char *dev = DEFAULT_DEV;
-        return sysinst_install(dev);
+        unsigned i;
+        errno_t rc;
+
+        i = 0;
+        while (default_devs[i] != NULL) {
+                rc = sysinst_check_dev(default_devs[i]);
+                if (rc == EOK)
+                        break;
+        }
+
+        if (default_devs[i] == NULL) {
+                printf("Cannot determine installation device.\n");
+                return 1;
+        }
+
+        return sysinst_install(default_devs[i]);
 }
 

uspace/app/taskbar-cfg/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -77 +77 @@
                 return 1;
 
-        rc = taskbar_cfg_open(tbcfg, "/cfg/taskbar.sif");
+        rc = taskbar_cfg_open(tbcfg, "/w/cfg/taskbar.sif");
         if (rc != EOK)
                 return 1;

uspace/app/taskbar-cfg/smeedit.c

@@ -403 +403 @@
 
                 startmenu_repaint(smee->startmenu);
+                (void)tbarcfg_sync(smee->startmenu->tbarcfg->tbarcfg);
                 (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
         } else {
@@ -418 +419 @@
                         return;
 
-                (void)smenu_entry_save(smee->smentry->entry);
+                (void)tbarcfg_sync(smee->startmenu->tbarcfg->tbarcfg);
                 startmenu_entry_update(smee->smentry);
+                (void)tbarcfg_sync(smee->startmenu->tbarcfg->tbarcfg);
                 (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
         }

uspace/app/taskbar-cfg/startmenu.c

@@ -515 +515 @@
 
         (void)smee;
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -534 +535 @@
         (void)startmenu_insert(smenu, entry, &smentry);
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -620 +622 @@
         startmenu_t *smenu = (startmenu_t *)arg;
         startmenu_entry_t *smentry;
-        errno_t rc;
 
         (void)pbutton;
@@ -628 +629 @@
                 return;
 
-        rc = smenu_entry_destroy(smentry->entry);
-        if (rc != EOK)
-                return;
-
+        smenu_entry_destroy(smentry->entry);
         ui_list_entry_delete(smentry->lentry);
         free(smentry);
+
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -673 +673 @@
         startmenu_t *smenu = (startmenu_t *)arg;
         startmenu_entry_t *smentry;
-        errno_t rc;
 
         (void)pbutton;
@@ -681 +680 @@
                 return;
 
-        rc = smenu_entry_move_up(smentry->entry);
-        if (rc != EOK)
-                return;
-
+        smenu_entry_move_up(smentry->entry);
         ui_list_entry_move_up(smentry->lentry);
 
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -700 +697 @@
         startmenu_t *smenu = (startmenu_t *)arg;
         startmenu_entry_t *smentry;
-        errno_t rc;
 
         (void)pbutton;
@@ -708 +704 @@
                 return;
 
-        rc = smenu_entry_move_down(smentry->entry);
-        if (rc != EOK)
-                return;
-
+        smenu_entry_move_down(smentry->entry);
         ui_list_entry_move_down(smentry->lentry);
 
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }

uspace/app/taskbar/taskbar.c

@@ -48 +48 @@
 #include "wndlist.h"
 
-#define TASKBAR_CONFIG_FILE "/cfg/taskbar.sif"
+#define TASKBAR_CONFIG_FILE "/w/cfg/taskbar.sif"
 
 static void taskbar_wnd_close(ui_window_t *, void *);

uspace/app/taskbar/taskbar.sif

@@ -1 @@
-[sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/nav][terminal]=[y]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/edit][terminal]=[y]){}[entry]([caption]=[Co~m~mand Line][cmd]=[/app/bdsh][terminal]=[y]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator -d %d][terminal]=[n]){}[entry]([caption]=[~I~mage Viewer][cmd]=[/app/viewer -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo -d %d][terminal]=[n]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo -d %d ui][terminal]=[n]){}[entry]([caption]=[~B~arber Pole][cmd]=[/app/barber -d %d][terminal]=[n]){}[entry]([caption]=[~T~etris][cmd]=[/app/tetris][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~D~isplay Configuration][cmd]=[/app/display-cfg -d %d][terminal]=[n]){}[entry]([caption]=[Ta~s~kbar Configuration][cmd]=[/app/taskbar-cfg -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[Tas~k~ Monitor (top)][cmd]=[/app/top][terminal]=[y]){}[entry]([caption]=[~F~disk Disk Editor][cmd]=[/app/fdisk][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~A~bout HelenOS][cmd]=[/app/aboutos -d %d][terminal]=[n]){}}}
+<sif>
+<entries>
+<entry caption="~N~avigator" cmd="/app/nav" terminal="y">
+</entry>
+<entry caption="Text ~E~ditor" cmd="/app/edit" terminal="y">
+</entry>
+<entry caption="Co~m~mand Line" cmd="/app/bdsh" terminal="y">
+</entry>
+<entry caption="~C~alculator" cmd="/app/calculator -d %d" terminal="n">
+</entry>
+<entry caption="~I~mage Viewer" cmd="/app/viewer -d %d" terminal="n">
+</entry>
+<entry separator="y">
+</entry>
+<entry caption="~U~I Demo" cmd="/app/uidemo -d %d" terminal="n">
+</entry>
+<entry caption="~G~FX Demo" cmd="/app/gfxdemo -d %d ui" terminal="n">
+</entry>
+<entry caption="~B~arber Pole" cmd="/app/barber -d %d" terminal="n">
+</entry>
+<entry caption="~T~etris" cmd="/app/tetris" terminal="y">
+</entry>
+<entry separator="y">
+</entry>
+<entry caption="~D~isplay Configuration" cmd="/app/display-cfg -d %d" terminal="n">
+</entry>
+<entry caption="Ta~s~kbar Configuration" cmd="/app/taskbar-cfg -d %d" terminal="n">
+</entry>
+<entry separator="y">
+</entry>
+<entry caption="Tas~k~ Monitor (top)" cmd="/app/top" terminal="y">
+</entry>
+<entry caption="~F~disk Disk Editor" cmd="/app/fdisk" terminal="y">
+</entry>
+<entry separator="y">
+</entry>
+<entry caption="~A~bout HelenOS" cmd="/app/aboutos -d %d" terminal="n">
+</entry>
+</entries>
+</sif>

uspace/app/terminal/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'fbfont', 'display', 'ui' ]
+deps = [ 'fbfont', 'display', 'ui', 'termui' ]
 src = files(
         'main.c',

uspace/app/terminal/terminal.c

@@ -40 +40 @@
 #include <errno.h>
 #include <fbfont/font-8x16.h>
-#include <io/chargrid.h>
 #include <fibril.h>
 #include <gfx/bitmap.h>
@@ -49 +48 @@
 #include <io/console.h>
 #include <io/pixelmap.h>
-#include <task.h>
+#include <macros.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <str_error.h>
 #include <str.h>
+#include <task.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
@@ -69 +70 @@
 
 #define TERM_CAPS \
-        (CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED | CONSOLE_CAP_RGB)
+        (CONSOLE_CAP_CURSORCTL | CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED | \
+        CONSOLE_CAP_RGB)
+
+#define SCROLLBACK_MAX_LINES 1000
+#define MIN_WINDOW_COLS 8
+#define MIN_WINDOW_ROWS 4
 
 static LIST_INITIALIZE(terms);
+
+#define COLOR_BRIGHT 8
+
+static const pixel_t _basic_colors[16] = {
+        [COLOR_BLACK]       = PIXEL(255, 0, 0, 0),
+        [COLOR_RED]         = PIXEL(255, 170, 0, 0),
+        [COLOR_GREEN]       = PIXEL(255, 0, 170, 0),
+        [COLOR_YELLOW]      = PIXEL(255, 170, 85, 0),
+        [COLOR_BLUE]        = PIXEL(255, 0, 0, 170),
+        [COLOR_MAGENTA]     = PIXEL(255, 170, 0, 170),
+        [COLOR_CYAN]        = PIXEL(255, 0, 170, 170),
+        [COLOR_WHITE]       = PIXEL(255, 170, 170, 170),
+
+        [COLOR_BLACK   | COLOR_BRIGHT] = PIXEL(255, 85, 85, 85),
+        [COLOR_RED     | COLOR_BRIGHT] = PIXEL(255, 255, 85, 85),
+        [COLOR_GREEN   | COLOR_BRIGHT] = PIXEL(255, 85, 255, 85),
+        [COLOR_YELLOW  | COLOR_BRIGHT] = PIXEL(255, 255, 255, 85),
+        [COLOR_BLUE    | COLOR_BRIGHT] = PIXEL(255, 85, 85, 255),
+        [COLOR_MAGENTA | COLOR_BRIGHT] = PIXEL(255, 255, 85, 255),
+        [COLOR_CYAN    | COLOR_BRIGHT] = PIXEL(255, 85, 255, 255),
+        [COLOR_WHITE   | COLOR_BRIGHT] = PIXEL(255, 255, 255, 255),
+};
 
 static errno_t term_open(con_srvs_t *, con_srv_t *);
@@ -119 +147 @@
 static void terminal_close_event(ui_window_t *, void *);
 static void terminal_focus_event(ui_window_t *, void *, unsigned);
+static void terminal_resize_event(ui_window_t *, void *);
 static void terminal_kbd_event(ui_window_t *, void *, kbd_event_t *);
 static void terminal_pos_event(ui_window_t *, void *, pos_event_t *);
 static void terminal_unfocus_event(ui_window_t *, void *, unsigned);
+static void terminal_maximize_event(ui_window_t *, void *);
+static void terminal_unmaximize_event(ui_window_t *, void *);
 
 static ui_window_cb_t terminal_window_cb = {
         .close = terminal_close_event,
         .focus = terminal_focus_event,
+        .resize = terminal_resize_event,
         .kbd = terminal_kbd_event,
         .pos = terminal_pos_event,
-        .unfocus = terminal_unfocus_event
+        .unfocus = terminal_unfocus_event,
+        .maximize = terminal_maximize_event,
+        .unmaximize = terminal_unmaximize_event,
 };
 
@@ -144 +178 @@
 }
 
-static pixel_t color_table[16] = {
-        [COLOR_BLACK]       = PIXEL(255, 0, 0, 0),
-        [COLOR_BLUE]        = PIXEL(255, 0, 0, 170),
-        [COLOR_GREEN]       = PIXEL(255, 0, 170, 0),
-        [COLOR_CYAN]        = PIXEL(255, 0, 170, 170),
-        [COLOR_RED]         = PIXEL(255, 170, 0, 0),
-        [COLOR_MAGENTA]     = PIXEL(255, 170, 0, 170),
-        [COLOR_YELLOW]      = PIXEL(255, 170, 85, 0),
-        [COLOR_WHITE]       = PIXEL(255, 170, 170, 170),
-
-        [COLOR_BLACK + 8]   = PIXEL(255, 85, 85, 85),
-        [COLOR_BLUE + 8]    = PIXEL(255, 85, 85, 255),
-        [COLOR_GREEN + 8]   = PIXEL(255, 85, 255, 85),
-        [COLOR_CYAN + 8]    = PIXEL(255, 85, 255, 255),
-        [COLOR_RED + 8]     = PIXEL(255, 255, 85, 85),
-        [COLOR_MAGENTA + 8] = PIXEL(255, 255, 85, 255),
-        [COLOR_YELLOW + 8]  = PIXEL(255, 255, 255, 85),
-        [COLOR_WHITE + 8]   = PIXEL(255, 255, 255, 255),
-};
-
-static inline void attrs_rgb(char_attrs_t attrs, pixel_t *bgcolor, pixel_t *fgcolor)
-{
-        switch (attrs.type) {
+static pixel_t termui_color_to_pixel(termui_color_t c)
+{
+        uint8_t r, g, b;
+        termui_color_to_rgb(c, &r, &g, &b);
+        return PIXEL(255, r, g, b);
+}
+
+static termui_color_t termui_color_from_pixel(pixel_t pixel)
+{
+        return termui_color_from_rgb(RED(pixel), GREEN(pixel), BLUE(pixel));
+}
+
+static termui_cell_t charfield_to_termui_cell(terminal_t *term, const charfield_t *cf)
+{
+        termui_cell_t cell = { };
+
+        cell.glyph_idx = fb_font_glyph(cf->ch, NULL);
+
+        switch (cf->attrs.type) {
         case CHAR_ATTR_STYLE:
-                switch (attrs.val.style) {
+                switch (cf->attrs.val.style) {
                 case STYLE_NORMAL:
-                        *bgcolor = color_table[COLOR_WHITE + 8];
-                        *fgcolor = color_table[COLOR_BLACK];
+                        cell.bgcolor = term->default_bgcolor;
+                        cell.fgcolor = term->default_fgcolor;
                         break;
                 case STYLE_EMPHASIS:
-                        *bgcolor = color_table[COLOR_WHITE + 8];
-                        *fgcolor = color_table[COLOR_RED + 8];
+                        cell.bgcolor = term->emphasis_bgcolor;
+                        cell.fgcolor = term->emphasis_fgcolor;
                         break;
                 case STYLE_INVERTED:
-                        *bgcolor = color_table[COLOR_BLACK];
-                        *fgcolor = color_table[COLOR_WHITE + 8];
+                        cell.bgcolor = term->default_bgcolor;
+                        cell.fgcolor = term->default_fgcolor;
+                        cell.inverted = 1;
                         break;
                 case STYLE_SELECTED:
-                        *bgcolor = color_table[COLOR_RED + 8];
-                        *fgcolor = color_table[COLOR_WHITE + 8];
+                        cell.bgcolor = term->selection_bgcolor;
+                        cell.fgcolor = term->selection_fgcolor;
                         break;
                 }
                 break;
+
         case CHAR_ATTR_INDEX:
-                *bgcolor = color_table[(attrs.val.index.bgcolor & 7)];
-                *fgcolor = color_table[(attrs.val.index.fgcolor & 7) |
-                    ((attrs.val.index.attr & CATTR_BRIGHT) ? 8 : 0)];
+                char_attr_index_t index = cf->attrs.val.index;
+
+                int bright = (index.attr & CATTR_BRIGHT) ? COLOR_BRIGHT : 0;
+                pixel_t bgcolor = _basic_colors[index.bgcolor];
+                pixel_t fgcolor = _basic_colors[index.fgcolor | bright];
+                cell.bgcolor = termui_color_from_pixel(bgcolor);
+                cell.fgcolor = termui_color_from_pixel(fgcolor);
+
+                if (index.attr & CATTR_BLINK)
+                        cell.blink = 1;
+
                 break;
+
         case CHAR_ATTR_RGB:
-                *bgcolor = 0xff000000 | attrs.val.rgb.bgcolor;
-                *fgcolor = 0xff000000 | attrs.val.rgb.fgcolor;
+                cell.bgcolor = termui_color_from_pixel(cf->attrs.val.rgb.bgcolor);
+                cell.fgcolor = termui_color_from_pixel(cf->attrs.val.rgb.fgcolor);
                 break;
         }
+
+        return cell;
 }
 
@@ -214 +257 @@
 }
 
-static void term_update_char(terminal_t *term, pixelmap_t *pixelmap,
-    sysarg_t sx, sysarg_t sy, sysarg_t col, sysarg_t row)
-{
-        charfield_t *field =
-            chargrid_charfield_at(term->backbuf, col, row);
-
-        bool inverted = chargrid_cursor_at(term->backbuf, col, row);
-
-        sysarg_t bx = sx + (col * FONT_WIDTH);
-        sysarg_t by = sy + (row * FONT_SCANLINES);
-
-        pixel_t bgcolor = 0;
-        pixel_t fgcolor = 0;
-
-        if (inverted)
-                attrs_rgb(field->attrs, &fgcolor, &bgcolor);
-        else
-                attrs_rgb(field->attrs, &bgcolor, &fgcolor);
-
-        // FIXME: Glyph type should be actually uint32_t
-        //        for full UTF-32 coverage.
-
-        uint16_t glyph = fb_font_glyph(field->ch, NULL);
+static void term_draw_cell(terminal_t *term, pixelmap_t *pixelmap, int col, int row, const termui_cell_t *cell)
+{
+        termui_color_t bg = cell->bgcolor;
+        if (bg == TERMUI_COLOR_DEFAULT)
+                bg = term->default_bgcolor;
+
+        termui_color_t fg = cell->fgcolor;
+        if (fg == TERMUI_COLOR_DEFAULT)
+                fg = term->default_fgcolor;
+
+        pixel_t bgcolor = termui_color_to_pixel(bg);
+        pixel_t fgcolor = termui_color_to_pixel(fg);
+
+        int bx = col * FONT_WIDTH;
+        int by = row * FONT_SCANLINES;
+
+        // TODO: support bold/italic/underline/strike/blink styling
+
+        if (cell->inverted ^ cell->cursor) {
+                pixel_t tmp = bgcolor;
+                bgcolor = fgcolor;
+                fgcolor = tmp;
+        }
+
+        uint32_t glyph = cell->glyph_idx;
+        assert(glyph < FONT_GLYPHS);
+
+        if (glyph == 0)
+                glyph = fb_font_glyph(U' ', NULL);
 
         for (unsigned int y = 0; y < FONT_SCANLINES; y++) {
@@ -248 +297 @@
                 }
         }
+
         term_update_region(term, bx, by, FONT_WIDTH, FONT_SCANLINES);
 }
 
-static bool term_update_scroll(terminal_t *term, pixelmap_t *pixelmap,
-    sysarg_t sx, sysarg_t sy)
-{
-        sysarg_t top_row = chargrid_get_top_row(term->frontbuf);
-
-        if (term->top_row == top_row) {
-                return false;
-        }
-
-        term->top_row = top_row;
-
-        for (sysarg_t row = 0; row < term->rows; row++) {
-                for (sysarg_t col = 0; col < term->cols; col++) {
-                        charfield_t *front_field =
-                            chargrid_charfield_at(term->frontbuf, col, row);
-                        charfield_t *back_field =
-                            chargrid_charfield_at(term->backbuf, col, row);
-                        bool update = false;
-
-                        if (front_field->ch != back_field->ch) {
-                                back_field->ch = front_field->ch;
-                                update = true;
-                        }
-
-                        if (!attrs_same(front_field->attrs, back_field->attrs)) {
-                                back_field->attrs = front_field->attrs;
-                                update = true;
-                        }
-
-                        front_field->flags &= ~CHAR_FLAG_DIRTY;
-
-                        if (update) {
-                                term_update_char(term, pixelmap, sx, sy, col, row);
-                        }
-                }
-        }
-
-        return true;
-}
-
-static bool term_update_cursor(terminal_t *term, pixelmap_t *pixelmap,
-    sysarg_t sx, sysarg_t sy)
-{
-        bool update = false;
-
-        sysarg_t front_col;
-        sysarg_t front_row;
-        chargrid_get_cursor(term->frontbuf, &front_col, &front_row);
-
-        sysarg_t back_col;
-        sysarg_t back_row;
-        chargrid_get_cursor(term->backbuf, &back_col, &back_row);
-
-        bool front_visibility =
-            chargrid_get_cursor_visibility(term->frontbuf) &&
-            term->is_focused;
-        bool back_visibility =
-            chargrid_get_cursor_visibility(term->backbuf);
-
-        if (front_visibility != back_visibility) {
-                chargrid_set_cursor_visibility(term->backbuf,
-                    front_visibility);
-                term_update_char(term, pixelmap, sx, sy, back_col, back_row);
-                update = true;
-        }
-
-        if ((front_col != back_col) || (front_row != back_row)) {
-                chargrid_set_cursor(term->backbuf, front_col, front_row);
-                term_update_char(term, pixelmap, sx, sy, back_col, back_row);
-                term_update_char(term, pixelmap, sx, sy, front_col, front_row);
-                update = true;
-        }
-
-        return update;
-}
-
-static void term_update(terminal_t *term)
-{
-        pixelmap_t pixelmap;
+static void term_render(terminal_t *term)
+{
+        (void) gfx_bitmap_render(term->bmp, &term->update, &term->off);
+
+        term->update.p0.x = 0;
+        term->update.p0.y = 0;
+        term->update.p1.x = 0;
+        term->update.p1.y = 0;
+}
+
+static void termui_refresh_cb(void *userdata)
+{
+        terminal_t *term = userdata;
+
+        termui_force_viewport_update(term->termui, 0, termui_get_rows(term->termui));
+}
+
+static void termui_scroll_cb(void *userdata, int delta)
+{
+        (void) delta;
+
+        // Until we have support for hardware accelerated scrolling, just redraw everything.
+        termui_refresh_cb(userdata);
+}
+
+static pixelmap_t term_get_pixelmap(terminal_t *term)
+{
+        pixelmap_t pixelmap = { };
         gfx_bitmap_alloc_t alloc;
-        gfx_coord2_t pos;
-        errno_t rc;
-
-        rc = gfx_bitmap_get_alloc(term->bmp, &alloc);
-        if (rc != EOK) {
-                return;
-        }
-
-        fibril_mutex_lock(&term->mtx);
+
+        errno_t rc = gfx_bitmap_get_alloc(term->bmp, &alloc);
+        if (rc != EOK)
+                return pixelmap;
+
         pixelmap.width = term->w;
         pixelmap.height = term->h;
         pixelmap.data = alloc.pixels;
-
-        bool update = false;
-        sysarg_t sx = 0;
-        sysarg_t sy = 0;
-
-        if (term_update_scroll(term, &pixelmap, sx, sy)) {
-                update = true;
-        } else {
-                for (sysarg_t y = 0; y < term->rows; y++) {
-                        for (sysarg_t x = 0; x < term->cols; x++) {
-                                charfield_t *front_field =
-                                    chargrid_charfield_at(term->frontbuf, x, y);
-                                charfield_t *back_field =
-                                    chargrid_charfield_at(term->backbuf, x, y);
-                                bool cupdate = false;
-
-                                if ((front_field->flags & CHAR_FLAG_DIRTY) ==
-                                    CHAR_FLAG_DIRTY) {
-                                        if (front_field->ch != back_field->ch) {
-                                                back_field->ch = front_field->ch;
-                                                cupdate = true;
-                                        }
-
-                                        if (!attrs_same(front_field->attrs,
-                                            back_field->attrs)) {
-                                                back_field->attrs = front_field->attrs;
-                                                cupdate = true;
-                                        }
-
-                                        front_field->flags &= ~CHAR_FLAG_DIRTY;
-                                }
-
-                                if (cupdate) {
-                                        term_update_char(term, &pixelmap, sx, sy, x, y);
-                                        update = true;
-                                }
-                        }
-                }
-        }
-
-        if (term_update_cursor(term, &pixelmap, sx, sy))
-                update = true;
-
-        if (update) {
-                pos.x = 4;
-                pos.y = 26;
-                (void) gfx_bitmap_render(term->bmp, &term->update, &pos);
-
-                term->update.p0.x = 0;
-                term->update.p0.y = 0;
-                term->update.p1.x = 0;
-                term->update.p1.y = 0;
-        }
-
-        fibril_mutex_unlock(&term->mtx);
-}
-
-static void term_repaint(terminal_t *term)
-{
-        pixelmap_t pixelmap;
-        gfx_bitmap_alloc_t alloc;
-        errno_t rc;
-
-        rc = gfx_bitmap_get_alloc(term->bmp, &alloc);
-        if (rc != EOK) {
-                printf("Error getting bitmap allocation info.\n");
+        return pixelmap;
+}
+
+static void term_clear_bitmap(terminal_t *term, pixel_t color)
+{
+        pixelmap_t pixelmap = term_get_pixelmap(term);
+        if (pixelmap.data == NULL)
                 return;
-        }
-
-        fibril_mutex_lock(&term->mtx);
-
-        pixelmap.width = term->w;
-        pixelmap.height = term->h;
-        pixelmap.data = alloc.pixels;
-
-        sysarg_t sx = 0;
-        sysarg_t sy = 0;
-
-        if (!term_update_scroll(term, &pixelmap, sx, sy)) {
-                for (sysarg_t y = 0; y < term->rows; y++) {
-                        for (sysarg_t x = 0; x < term->cols; x++) {
-                                charfield_t *front_field =
-                                    chargrid_charfield_at(term->frontbuf, x, y);
-                                charfield_t *back_field =
-                                    chargrid_charfield_at(term->backbuf, x, y);
-
-                                back_field->ch = front_field->ch;
-                                back_field->attrs = front_field->attrs;
-                                front_field->flags &= ~CHAR_FLAG_DIRTY;
-
-                                term_update_char(term, &pixelmap, sx, sy, x, y);
-                        }
-                }
-        }
-
-        term_update_cursor(term, &pixelmap, sx, sy);
-
-        fibril_mutex_unlock(&term->mtx);
+
+        sysarg_t pixels = pixelmap.height * pixelmap.width;
+        for (sysarg_t i = 0; i < pixels; i++)
+                pixelmap.data[i] = color;
+
+        term_update_region(term, 0, 0, pixelmap.width, pixelmap.height);
+}
+
+static void termui_update_cb(void *userdata, int col, int row, const termui_cell_t *cell, int len)
+{
+        terminal_t *term = userdata;
+
+        pixelmap_t pixelmap = term_get_pixelmap(term);
+        if (pixelmap.data == NULL)
+                return;
+
+        for (int i = 0; i < len; i++)
+                term_draw_cell(term, &pixelmap, col + i, row, &cell[i]);
 }
 
@@ -480 +403 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&term->input_pc);
-                        cons_event_t *event = list_get_instance(link, cons_event_t, link);
+                        terminal_event_t *qevent = list_get_instance(link,
+                            terminal_event_t, link);
+                        cons_event_t *event = &qevent->ev;
 
                         /* Accept key presses of printable chars only. */
@@ -494 +419 @@
                         }
 
-                        free(event);
+                        free(qevent);
                 }
         }
@@ -504 +429 @@
 static void term_write_char(terminal_t *term, wchar_t ch)
 {
-        sysarg_t updated = 0;
-
-        fibril_mutex_lock(&term->mtx);
-
         switch (ch) {
-        case '\n':
-                updated = chargrid_newline(term->frontbuf);
+        case L'\n':
+                termui_put_crlf(term->termui);
                 break;
-        case '\r':
+        case L'\r':
+                termui_put_cr(term->termui);
                 break;
-        case '\t':
-                updated = chargrid_tabstop(term->frontbuf, 8);
+        case L'\t':
+                termui_put_tab(term->termui);
                 break;
-        case '\b':
-                updated = chargrid_backspace(term->frontbuf);
+        case L'\b':
+                termui_put_backspace(term->termui);
                 break;
         default:
-                updated = chargrid_putuchar(term->frontbuf, ch, true);
-        }
-
-        fibril_mutex_unlock(&term->mtx);
-
-        if (updated > 1)
-                term_update(term);
+                // TODO: For some languages, we might need support for combining
+                //       characters. Currently, we assume every unicode code point is
+                //       an individual printed character, which is not always the case.
+                termui_put_glyph(term->termui, fb_font_glyph(ch, NULL), 1);
+                break;
+        }
 }
 
@@ -533 +454 @@
 {
         terminal_t *term = srv_to_terminal(srv);
+
+        fibril_mutex_lock(&term->mtx);
 
         size_t off = 0;
@@ -538 +461 @@
                 term_write_char(term, str_decode(data, &off, size));
 
+        fibril_mutex_unlock(&term->mtx);
+
+        term_render(term);
         gfx_update(term->gc);
         *nwritten = size;
+
         return EOK;
 }
@@ -547 +474 @@
         terminal_t *term = srv_to_terminal(srv);
 
-        term_update(term);
+        term_render(term);
         gfx_update(term->gc);
 }
@@ -556 +483 @@
 
         fibril_mutex_lock(&term->mtx);
-        chargrid_clear(term->frontbuf);
-        fibril_mutex_unlock(&term->mtx);
-
-        term_update(term);
+        termui_clear_screen(term->termui);
+        fibril_mutex_unlock(&term->mtx);
+
+        term_render(term);
         gfx_update(term->gc);
 }
@@ -568 +495 @@
 
         fibril_mutex_lock(&term->mtx);
-        chargrid_set_cursor(term->frontbuf, col, row);
-        fibril_mutex_unlock(&term->mtx);
-
-        term_update(term);
+        termui_set_pos(term->termui, col, row);
+        fibril_mutex_unlock(&term->mtx);
+
+        term_render(term);
         gfx_update(term->gc);
 }
@@ -580 +507 @@
 
         fibril_mutex_lock(&term->mtx);
-        chargrid_get_cursor(term->frontbuf, col, row);
-        fibril_mutex_unlock(&term->mtx);
+        int irow, icol;
+        termui_get_pos(term->termui, &icol, &irow);
+        fibril_mutex_unlock(&term->mtx);
+
+        *col = icol;
+        *row = irow;
 
         return EOK;
@@ -591 +522 @@
 
         fibril_mutex_lock(&term->mtx);
-        *cols = term->cols;
-        *rows = term->rows;
+        *cols = termui_get_cols(term->termui);
+        *rows = termui_get_rows(term->termui);
         fibril_mutex_unlock(&term->mtx);
 
@@ -610 +541 @@
         terminal_t *term = srv_to_terminal(srv);
 
-        fibril_mutex_lock(&term->mtx);
-        chargrid_set_style(term->frontbuf, style);
+        termui_cell_t cellstyle = { };
+
+        switch (style) {
+        case STYLE_NORMAL:
+                cellstyle.bgcolor = term->default_bgcolor;
+                cellstyle.fgcolor = term->default_fgcolor;
+                break;
+        case STYLE_EMPHASIS:
+                cellstyle.bgcolor = term->emphasis_bgcolor;
+                cellstyle.fgcolor = term->emphasis_fgcolor;
+                break;
+        case STYLE_INVERTED:
+                cellstyle.bgcolor = term->default_bgcolor;
+                cellstyle.fgcolor = term->default_fgcolor;
+                cellstyle.inverted = 1;
+                break;
+        case STYLE_SELECTED:
+                cellstyle.bgcolor = term->selection_bgcolor;
+                cellstyle.fgcolor = term->selection_fgcolor;
+                break;
+        }
+
+        fibril_mutex_lock(&term->mtx);
+        termui_set_style(term->termui, cellstyle);
         fibril_mutex_unlock(&term->mtx);
 }
@@ -620 +573 @@
         terminal_t *term = srv_to_terminal(srv);
 
-        fibril_mutex_lock(&term->mtx);
-        chargrid_set_color(term->frontbuf, bgcolor, fgcolor, attr);
+        int bright = (attr & CATTR_BRIGHT) ? COLOR_BRIGHT : 0;
+
+        termui_cell_t cellstyle = { };
+        cellstyle.bgcolor = termui_color_from_pixel(_basic_colors[bgcolor]);
+        cellstyle.fgcolor = termui_color_from_pixel(_basic_colors[fgcolor | bright]);
+
+        if (attr & CATTR_BLINK)
+                cellstyle.blink = 1;
+
+        fibril_mutex_lock(&term->mtx);
+        termui_set_style(term->termui, cellstyle);
         fibril_mutex_unlock(&term->mtx);
 }
@@ -629 +591 @@
 {
         terminal_t *term = srv_to_terminal(srv);
-
-        fibril_mutex_lock(&term->mtx);
-        chargrid_set_rgb_color(term->frontbuf, bgcolor, fgcolor);
+        termui_cell_t cellstyle = {
+                .bgcolor = termui_color_from_pixel(bgcolor),
+                .fgcolor = termui_color_from_pixel(fgcolor),
+        };
+
+        fibril_mutex_lock(&term->mtx);
+        termui_set_style(term->termui, cellstyle);
         fibril_mutex_unlock(&term->mtx);
 }
@@ -640 +606 @@
 
         fibril_mutex_lock(&term->mtx);
-        chargrid_set_cursor_visibility(term->frontbuf, visible);
-        fibril_mutex_unlock(&term->mtx);
-
-        term_update(term);
+        termui_set_cursor_visibility(term->termui, visible);
+        fibril_mutex_unlock(&term->mtx);
+
+        term_render(term);
         gfx_update(term->gc);
 }
@@ -662 +628 @@
         fibril_mutex_unlock(&term->mtx);
 
-        term_update(term);
+        term_render(term);
         gfx_update(term->gc);
         return EOK;
@@ -671 +637 @@
         terminal_t *term = srv_to_terminal(srv);
         link_t *link = prodcons_consume(&term->input_pc);
-        cons_event_t *ev = list_get_instance(link, cons_event_t, link);
-
-        *event = *ev;
+        terminal_event_t *ev = list_get_instance(link, terminal_event_t, link);
+
+        *event = ev->ev;
         free(ev);
         return EOK;
@@ -710 +676 @@
         term->urows = rows;
         term->ubuf = buf;
+
+        /* Scroll back to active screen. */
+        termui_history_scroll(term->termui, INT_MAX);
+
         fibril_mutex_unlock(&term->mtx);
 
@@ -730 +700 @@
         term->ubuf = NULL;
 
+        termui_wipe_screen(term->termui, 0);
+
+        fibril_mutex_unlock(&term->mtx);
+
+        /* Update terminal */
+        term_render(term);
+        gfx_update(term->gc);
+
         if (buf != NULL)
                 as_area_destroy(buf);
-
-        fibril_mutex_unlock(&term->mtx);
 }
 
@@ -748 +724 @@
 {
         terminal_t *term = srv_to_terminal(srv);
-        charfield_t *ch;
-        sysarg_t col, row;
 
         fibril_mutex_lock(&term->mtx);
@@ -759 +733 @@
 
         /* Make sure we have meaningful coordinates, within bounds */
-
-        if (c1 > term->ucols)
-                c1 = term->ucols;
-        if (c1 > term->cols)
-                c1 = term->cols;
-        if (c0 >= c1) {
+        c1 = min(c1, term->ucols);
+        c1 = min(c1, (sysarg_t) termui_get_cols(term->termui));
+        r1 = min(r1, term->urows);
+        r1 = min(r1, (sysarg_t) termui_get_rows(term->termui));
+
+        if (c0 >= c1 || r0 >= r1) {
                 fibril_mutex_unlock(&term->mtx);
                 return;
         }
-        if (r1 > term->urows)
-                r1 = term->urows;
-        if (r1 > term->rows)
-                r1 = term->rows;
-        if (r0 >= r1) {
-                fibril_mutex_unlock(&term->mtx);
-                return;
-        }
 
         /* Update front buffer from user buffer */
 
-        for (row = r0; row < r1; row++) {
-                for (col = c0; col < c1; col++) {
-                        ch = chargrid_charfield_at(term->frontbuf, col, row);
-                        *ch = term->ubuf[row * term->ucols + col];
+        for (sysarg_t row = r0; row < r1; row++) {
+                termui_cell_t *cells = termui_get_active_row(term->termui, row);
+
+                for (sysarg_t col = c0; col < c1; col++) {
+                        cells[col] = charfield_to_termui_cell(term, &term->ubuf[row * term->ucols + col]);
                 }
+
+                termui_update_cb(term, c0, row, &cells[c0], c1 - c0);
         }
 
@@ -789 +758 @@
 
         /* Update terminal */
-        term_update(term);
+        term_render(term);
         gfx_update(term->gc);
 }
 
-static void deinit_terminal(terminal_t *term)
+static errno_t terminal_window_resize(terminal_t *term)
+{
+        gfx_rect_t rect;
+        ui_window_get_app_rect(term->window, &rect);
+
+        int width = rect.p1.x - rect.p0.x;
+        int height = rect.p1.y - rect.p0.y;
+
+        if (!term->gc)
+                term->gc = ui_window_get_gc(term->window);
+        else
+                assert(term->gc == ui_window_get_gc(term->window));
+
+        if (!term->ui_res)
+                term->ui_res = ui_window_get_res(term->window);
+        else
+                assert(term->ui_res == ui_window_get_res(term->window));
+
+        gfx_bitmap_t *new_bmp;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = width;
+        params.rect.p1.y = height;
+
+        errno_t rc = gfx_bitmap_create(term->gc, &params, NULL, &new_bmp);
+        if (rc != EOK) {
+                fprintf(stderr, "Error allocating new screen bitmap: %s\n", str_error(rc));
+                return rc;
+        }
+
+        if (term->bmp) {
+                rc = gfx_bitmap_destroy(term->bmp);
+                if (rc != EOK)
+                        fprintf(stderr, "Error deallocating old screen bitmap: %s\n", str_error(rc));
+        }
+
+        term->bmp = new_bmp;
+        term->w = width;
+        term->h = height;
+
+        term_clear_bitmap(term, termui_color_to_pixel(term->default_bgcolor));
+
+        return EOK;
+}
+
+void terminal_destroy(terminal_t *term)
 {
         list_remove(&term->link);
 
-        if (term->frontbuf)
-                chargrid_destroy(term->frontbuf);
-
-        if (term->backbuf)
-                chargrid_destroy(term->backbuf);
-}
-
-void terminal_destroy(terminal_t *term)
-{
-        deinit_terminal(term);
+        termui_destroy(term->termui);
+
+        if (term->ubuf)
+                as_area_destroy(term->ubuf);
+
+        ui_destroy(term->ui);
         free(term);
 }
@@ -813 +825 @@
 {
         /* Got key press/release event */
-        cons_event_t *event =
-            (cons_event_t *) malloc(sizeof(cons_event_t));
+        terminal_event_t *event =
+            (terminal_event_t *) malloc(sizeof(terminal_event_t));
         if (event == NULL)
                 return;
 
-        *event = *ev;
+        event->ev = *ev;
         link_initialize(&event->link);
 
@@ -840 +852 @@
         (void)nfocus;
         term->is_focused = true;
-        term_update(term);
+        term_render(term);
         gfx_update(term->gc);
+}
+
+static void terminal_resize_handler(ui_window_t *window, void *arg)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        fibril_mutex_lock(&term->mtx);
+
+        errno_t rc = terminal_window_resize(term);
+        if (rc == EOK) {
+                (void) termui_resize(term->termui, term->w / FONT_WIDTH, term->h / FONT_SCANLINES, SCROLLBACK_MAX_LINES);
+                termui_refresh_cb(term);
+                term_render(term);
+                gfx_update(term->gc);
+
+                cons_event_t event = { .type = CEV_RESIZE };
+                terminal_queue_cons_event(term, &event);
+        }
+
+        fibril_mutex_unlock(&term->mtx);
+}
+
+static void terminal_resize_event(ui_window_t *window, void *arg)
+{
+        ui_window_def_resize(window);
+        terminal_resize_handler(window, arg);
+}
+
+static void terminal_maximize_event(ui_window_t *window, void *arg)
+{
+        ui_window_def_maximize(window);
+        terminal_resize_handler(window, arg);
+}
+
+static void terminal_unmaximize_event(ui_window_t *window, void *arg)
+{
+        ui_window_def_unmaximize(window);
+        terminal_resize_handler(window, arg);
 }
 
@@ -854 +904 @@
         event.ev.key = *kbd_event;
 
-        terminal_queue_cons_event(term, &event);
+        const int PAGE_ROWS = (termui_get_rows(term->termui) * 2) / 3;
+
+        fibril_mutex_lock(&term->mtx);
+
+        if (!term->ubuf && kbd_event->type == KEY_PRESS &&
+            (kbd_event->key == KC_PAGE_UP || kbd_event->key == KC_PAGE_DOWN)) {
+
+                termui_history_scroll(term->termui,
+                    (kbd_event->key == KC_PAGE_UP) ? -PAGE_ROWS : PAGE_ROWS);
+
+                term_render(term);
+                gfx_update(term->gc);
+        } else {
+                terminal_queue_cons_event(term, &event);
+        }
+
+        fibril_mutex_unlock(&term->mtx);
 }
 
@@ -863 +929 @@
         terminal_t *term = (terminal_t *) arg;
 
-        sysarg_t sx = -term->off.x;
-        sysarg_t sy = -term->off.y;
-
-        if (event->type == POS_PRESS || event->type == POS_RELEASE ||
-            event->type == POS_DCLICK) {
-                cevent.type = CEV_POS;
-                cevent.ev.pos.type = event->type;
-                cevent.ev.pos.pos_id = event->pos_id;
-                cevent.ev.pos.btn_num = event->btn_num;
-
-                cevent.ev.pos.hpos = (event->hpos - sx) / FONT_WIDTH;
-                cevent.ev.pos.vpos = (event->vpos - sy) / FONT_SCANLINES;
+        switch (event->type) {
+        case POS_UPDATE:
+                return;
+
+        case POS_PRESS:
+        case POS_RELEASE:
+        case POS_DCLICK:
+        }
+
+        /* Ignore mouse events when we're in scrollback mode. */
+        if (termui_scrollback_is_active(term->termui))
+                return;
+
+        sysarg_t sx = term->off.x;
+        sysarg_t sy = term->off.y;
+
+        if (event->hpos < sx || event->vpos < sy)
+                return;
+
+        cevent.type = CEV_POS;
+        cevent.ev.pos.type = event->type;
+        cevent.ev.pos.pos_id = event->pos_id;
+        cevent.ev.pos.btn_num = event->btn_num;
+
+        cevent.ev.pos.hpos = (event->hpos - sx) / FONT_WIDTH;
+        cevent.ev.pos.vpos = (event->vpos - sy) / FONT_SCANLINES;
+
+        /* Filter out events outside the terminal area. */
+        int cols = termui_get_cols(term->termui);
+        int rows = termui_get_rows(term->termui);
+
+        if (cevent.ev.pos.hpos < (sysarg_t) cols && cevent.ev.pos.vpos < (sysarg_t) rows)
                 terminal_queue_cons_event(term, &cevent);
-        }
 }
 
@@ -887 +972 @@
         if (nfocus == 0) {
                 term->is_focused = false;
-                term_update(term);
+                term_render(term);
                 gfx_update(term->gc);
         }
@@ -909 +994 @@
 
         if (!atomic_flag_test_and_set(&term->refcnt))
-                chargrid_set_cursor_visibility(term->frontbuf, true);
+                termui_set_cursor_visibility(term->termui, true);
 
         con_conn(icall, &term->srvs);
+}
+
+static errno_t term_init_window(terminal_t *term, const char *display_spec,
+    gfx_coord_t width, gfx_coord_t height,
+    gfx_coord_t min_width, gfx_coord_t min_height,
+    terminal_flags_t flags)
+{
+        gfx_rect_t min_rect = { { 0, 0 }, { min_width, min_height } };
+        gfx_rect_t wmin_rect;
+        gfx_rect_t wrect;
+
+        errno_t rc = ui_create(display_spec, &term->ui);
+        if (rc != EOK) {
+                printf("Error creating UI on %s.\n", display_spec);
+                return rc;
+        }
+
+        ui_wnd_params_t wparams;
+        ui_wnd_params_init(&wparams);
+        wparams.caption = "Terminal";
+        wparams.style |= ui_wds_maximize_btn | ui_wds_resizable;
+
+        if ((flags & tf_topleft) != 0)
+                wparams.placement = ui_wnd_place_top_left;
+
+        if (ui_is_fullscreen(term->ui)) {
+                wparams.placement = ui_wnd_place_full_screen;
+                wparams.style &= ~ui_wds_decorated;
+        }
+
+        /* Compute wrect such that application area corresponds to rect. */
+        ui_wdecor_rect_from_app(term->ui, wparams.style, &min_rect, &wrect);
+        gfx_rect_rtranslate(&wrect.p0, &wrect, &wmin_rect);
+        wparams.min_size = wmin_rect.p1;
+
+        gfx_rect_t rect = { { 0, 0 }, { width, height } };
+        ui_wdecor_rect_from_app(term->ui, wparams.style, &rect, &rect);
+        term->off.x = -rect.p0.x;
+        term->off.y = -rect.p0.y;
+        printf("off=%d,%d\n", term->off.x, term->off.y);
+        gfx_rect_translate(&term->off, &rect, &wparams.rect);
+        printf("wparams.rect=%d,%d,%d,%d\n",
+            wparams.rect.p0.x,
+            wparams.rect.p1.x,
+            wparams.rect.p0.y,
+            wparams.rect.p1.y);
+
+        rc = ui_window_create(term->ui, &wparams, &term->window);
+        if (rc != EOK)
+                return rc;
+
+        ui_window_set_cb(term->window, &terminal_window_cb, (void *) term);
+        return terminal_window_resize(term);
 }
 
@@ -918 +1056 @@
     terminal_t **rterm)
 {
-        terminal_t *term;
-        gfx_bitmap_params_t params;
-        ui_wnd_params_t wparams;
-        gfx_rect_t rect;
-        gfx_coord2_t off;
-        gfx_rect_t wrect;
         errno_t rc;
 
-        term = calloc(1, sizeof(terminal_t));
+        terminal_t *term = calloc(1, sizeof(terminal_t));
         if (term == NULL) {
                 printf("Out of memory.\n");
@@ -939 +1071 @@
         term->char_remains_len = 0;
 
-        term->w = width;
-        term->h = height;
-
-        term->cols = width / FONT_WIDTH;
-        term->rows = height / FONT_SCANLINES;
-
-        term->frontbuf = NULL;
-        term->backbuf = NULL;
-
-        term->frontbuf = chargrid_create(term->cols, term->rows,
-            CHARGRID_FLAG_NONE);
-        if (!term->frontbuf) {
-                printf("Error creating front buffer.\n");
+        term->default_bgcolor = termui_color_from_pixel(_basic_colors[COLOR_WHITE | COLOR_BRIGHT]);
+        term->default_fgcolor = termui_color_from_pixel(_basic_colors[COLOR_BLACK]);
+
+        term->emphasis_bgcolor = termui_color_from_pixel(_basic_colors[COLOR_WHITE | COLOR_BRIGHT]);
+        term->emphasis_fgcolor = termui_color_from_pixel(_basic_colors[COLOR_RED | COLOR_BRIGHT]);
+
+        term->selection_bgcolor = termui_color_from_pixel(_basic_colors[COLOR_RED | COLOR_BRIGHT]);
+        term->selection_fgcolor = termui_color_from_pixel(_basic_colors[COLOR_WHITE | COLOR_BRIGHT]);
+
+        rc = term_init_window(term, display_spec, width, height,
+            MIN_WINDOW_COLS * FONT_WIDTH, MIN_WINDOW_ROWS * FONT_SCANLINES, flags);
+        if (rc != EOK) {
+                printf("Error creating window (%s).\n", str_error(rc));
+                goto error;
+        }
+
+        term->termui = termui_create(term->w / FONT_WIDTH,
+            term->h / FONT_SCANLINES, SCROLLBACK_MAX_LINES);
+        if (!term->termui) {
+                printf("Error creating terminal UI.\n");
                 rc = ENOMEM;
                 goto error;
         }
 
-        term->backbuf = chargrid_create(term->cols, term->rows,
-            CHARGRID_FLAG_NONE);
-        if (!term->backbuf) {
-                printf("Error creating back buffer.\n");
-                rc = ENOMEM;
-                goto error;
-        }
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = width;
-        rect.p1.y = height;
-
-        ui_wnd_params_init(&wparams);
-        wparams.caption = "Terminal";
-        if ((flags & tf_topleft) != 0)
-                wparams.placement = ui_wnd_place_top_left;
-
-        rc = ui_create(display_spec, &term->ui);
-        if (rc != EOK) {
-                printf("Error creating UI on %s.\n", display_spec);
-                goto error;
-        }
-
-        /*
-         * Compute window rectangle such that application area corresponds
-         * to rect
-         */
-        ui_wdecor_rect_from_app(term->ui, wparams.style, &rect, &wrect);
-        off = wrect.p0;
-        gfx_rect_rtranslate(&off, &wrect, &wparams.rect);
-
-        term->off = off;
-
-        rc = ui_window_create(term->ui, &wparams, &term->window);
-        if (rc != EOK) {
-                printf("Error creating window.\n");
-                goto error;
-        }
-
-        term->gc = ui_window_get_gc(term->window);
-        term->ui_res = ui_window_get_res(term->window);
-
-        ui_window_set_cb(term->window, &terminal_window_cb, (void *) term);
-
-        gfx_bitmap_params_init(&params);
-        params.rect.p0.x = 0;
-        params.rect.p0.y = 0;
-        params.rect.p1.x = width;
-        params.rect.p1.y = height;
-
-        rc = gfx_bitmap_create(term->gc, &params, NULL, &term->bmp);
-        if (rc != EOK) {
-                printf("Error allocating screen bitmap.\n");
-                goto error;
-        }
-
-        chargrid_clear(term->frontbuf);
-        chargrid_clear(term->backbuf);
-        term->top_row = 0;
+        termui_set_refresh_cb(term->termui, termui_refresh_cb, term);
+        termui_set_scroll_cb(term->termui, termui_scroll_cb, term);
+        termui_set_update_cb(term->termui, termui_update_cb, term);
 
         async_set_fallback_port_handler(term_connection, NULL);
@@ -1053 +1135 @@
         term->is_focused = true;
 
-        term->update.p0.x = 0;
-        term->update.p0.y = 0;
-        term->update.p1.x = 0;
-        term->update.p1.y = 0;
-
-        term_repaint(term);
+        termui_refresh_cb(term);
 
         *rterm = term;
@@ -1071 +1148 @@
         if (term->ui != NULL)
                 ui_destroy(term->ui);
-        if (term->frontbuf != NULL)
-                chargrid_destroy(term->frontbuf);
-        if (term->backbuf != NULL)
-                chargrid_destroy(term->backbuf);
+        if (term->termui != NULL)
+                termui_destroy(term->termui);
         free(term);
         return rc;

uspace/app/terminal/terminal.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -45 +45 @@
 #include <gfx/context.h>
 #include <gfx/coord.h>
-#include <io/chargrid.h>
 #include <io/con_srv.h>
+#include <io/cons_event.h>
 #include <loc.h>
 #include <stdatomic.h>
 #include <str.h>
 #include <task.h>
+#include <termui.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -81 +82 @@
         size_t char_remains_len;
 
-        sysarg_t cols;
-        sysarg_t rows;
-        chargrid_t *frontbuf;
-        chargrid_t *backbuf;
-        sysarg_t top_row;
+        termui_t *termui;
+
+        termui_color_t default_bgcolor;
+        termui_color_t default_fgcolor;
+        termui_color_t emphasis_bgcolor;
+        termui_color_t emphasis_fgcolor;
+        termui_color_t selection_bgcolor;
+        termui_color_t selection_fgcolor;
 
         sysarg_t ucols;
@@ -99 +103 @@
 } terminal_t;
 
+/** Terminal event */
+typedef struct {
+        /** Link to list of events */
+        link_t link;
+        /** Console event */
+        cons_event_t ev;
+} terminal_event_t;
+
 extern errno_t terminal_create(const char *, sysarg_t, sysarg_t,
     terminal_flags_t, const char *, terminal_t **);

uspace/app/tester/print/print2.c

@@ -62 +62 @@
         TPRINTF("Real output:     [%td] [%tu] [%tx] [%ti] [%to]\n\n", d, neg_d, neg_d, d, neg_d);
 
+        TPRINTF("Testing printf(\"%%lf\", 768.0):\n");
+        TPRINTF("Expected output: [768.000000]\n");
+        TPRINTF("Real output:     [%lf]\n", 768.0);
+
         return NULL;
 }

uspace/app/tetris/screen.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -79 +80 @@
 static usec_t timeleft = 0;
 
+bool size_changed;
 console_ctrl_t *console;
 
@@ -142 +144 @@
         console_cursor_visibility(console, 0);
         resume_normal();
-        scr_clear();
+        scr_set();
 }
 
@@ -169 +171 @@
         }
 
+        if ((ccap & CONSOLE_CAP_CURSORCTL) == 0) {
+                stop("Your screen does not support cursor control.\n");
+                return;
+        }
         *rgb = ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
         *color = ((ccap & CONSOLE_CAP_INDEXED) == CONSOLE_CAP_INDEXED);
@@ -194 +200 @@
 
                 snprintf(smallscr, sizeof(smallscr),
-                    "the screen is too small (must be at least %dx%d)",
+                    "the screen is too small (must be at least %dx%d)\n",
                     MINROWS, MINCOLS);
                 stop(smallscr);
@@ -217 +223 @@
 
         fprintf(stderr, "aborting: %s", why);
-        abort();
+        exit(1);
 }
 
@@ -410 +416 @@
                         exit(1);
 
+                if (event.type == CEV_RESIZE)
+                        size_changed = true;
+
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
                         c = event.ev.key.c;

uspace/app/tetris/screen.h

@@ -67 +67 @@
 extern console_ctrl_t *console;
 extern winsize_t winsize;
+extern bool size_changed;
 
 extern void moveto(sysarg_t r, sysarg_t c);

uspace/app/tetris/tetris.c

@@ -330 +330 @@
 
                 while (true) {
+                        if (size_changed) {
+                                size_changed = false;
+                                scr_set();
+                                scr_msg(key_msg, 1);
+                        }
+
                         place(curshape, pos, 1);
                         scr_update();

uspace/app/uidemo/uidemo.c

@@ -741 +741 @@
         }
 
+        /* Only allow making the window larger */
+        gfx_rect_dims(&params.rect, &params.min_size);
+
         rc = ui_window_create(ui, &params, &window);
         if (rc != EOK) {

uspace/app/viewer/viewer.c

@@ -517 +517 @@
         if (viewer != NULL && viewer->imgs != NULL) {
                 for (u = 0; u < viewer->imgs_count; u++) {
-                        if (viewer->imgs[i] != NULL)
-                                free(viewer->imgs[i]);
+                        if (viewer->imgs[u] != NULL)
+                                free(viewer->imgs[u]);
                 }
                 free(viewer->imgs);