Changeset 2cf8f994 in mainline

Timestamp:

2024-09-19T22:04:13Z (4 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3fcea34

Parents:

84cc190

Message:

Improve terminal behavior in console mode.

Location:

uspace

Files:

• app/terminal/terminal.c (modified) (7 diffs)
• lib/termui/src/termui.c (modified) (1 diff)

uspace/app/terminal/terminal.c

@@ -302 +302 @@
 static void term_render(terminal_t *term)
 {
-        gfx_coord2_t pos = { .x = 4, .y = 26 };
-        (void) gfx_bitmap_render(term->bmp, &term->update, &pos);
+        (void) gfx_bitmap_render(term->bmp, &term->update, &term->off);
 
         term->update.p0.x = 0;
@@ -816 +815 @@
                 as_area_destroy(term->ubuf);
 
+        ui_destroy(term->ui);
         free(term);
 }
@@ -939 +939 @@
                 return;
 
-        sysarg_t sx = -term->off.x;
-        sysarg_t sy = -term->off.y;
+        sysarg_t sx = term->off.x;
+        sysarg_t sy = term->off.y;
 
         if (event->hpos < sx || event->vpos < sy)
@@ -1005 +1005 @@
         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;
 
-        errno_t rc = ui_create(display_spec, &term->ui);
-        if (rc != EOK) {
-                printf("Error creating UI on %s.\n", display_spec);
-                return rc;
+        if (ui_is_fullscreen(term->ui)) {
+                wparams.placement = ui_wnd_place_full_screen;
+                wparams.style &= ~ui_wds_decorated;
         }
 
@@ -1025 +1031 @@
         gfx_rect_t rect = { { 0, 0 }, { width, height } };
         ui_wdecor_rect_from_app(term->ui, wparams.style, &rect, &rect);
-        term->off = rect.p0;
-        gfx_rect_rtranslate(&term->off, &rect, &wparams.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);
@@ -1063 +1076 @@
         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]);
-
-        term->termui = termui_create(width / FONT_WIDTH, height / FONT_SCANLINES,
-            SCROLLBACK_MAX_LINES);
-        if (!term->termui) {
-                printf("Error creating terminal UI.\n");
-                rc = ENOMEM;
-                goto error;
-        }
-
-        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);
 
         rc = term_init_window(term, display_spec, width, height,
@@ -1082 +1083 @@
                 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;
+        }
+
+        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);

uspace/lib/termui/src/termui.c

@@ -190 +190 @@
         }
 
-        termui->row++;
+        if (termui->rows > 1)
+                termui->row++;
 
         if (termui->row >= termui->used_rows)