Changeset 294fc3cc in mainline

Timestamp:

2021-09-25T18:47:29Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45b7d4d

Parents:

c1c7c20

Message:

Make editor window non-decorated and full-screen

Need to enhance ui_window_create() to support full-screen placement
in the console.

Location:

uspace

Files:

• app/edit/edit.c (modified) (6 diffs)
• lib/ui/src/window.c (modified) (2 diffs)

uspace/app/edit/edit.c

@@ -156 +156 @@
 static pane_t pane;
 
-static sysarg_t scr_rows;
-static sysarg_t scr_columns;
-
 #define ROW_BUF_SIZE 4096
 #define BUF_SIZE 64
@@ -269 +266 @@
         (void) pane_row_display;
 
-//      console_get_size(con, &scr_columns, &scr_rows);
-        scr_columns = 80;
-        scr_rows = 25;
-
-        pane.rows = scr_rows - 1;
-        pane.columns = scr_columns;
         pane.sh_row = 1;
         pane.sh_column = 1;
@@ -310 +301 @@
         /* Move to beginning of file. */
         pt_get_sof(&sof);
-        caret_move(sof, true, true);
 
         /* Create UI */
@@ -316 +306 @@
         if (rc != EOK)
                 return 1;
+
+        caret_move(sof, true, true);
 
         /* Initial display */
@@ -363 +355 @@
         ui_wnd_params_init(&params);
         params.caption = "Text Editor";
-        params.rect.p0.x = 0;
-        params.rect.p0.y = 0;
-        params.rect.p1.x = 80;
-        params.rect.p1.y = 25;
+        params.style &= ~ui_wds_decorated;
+        params.placement = ui_wnd_place_full_screen;
 
         rc = ui_window_create(edit->ui, &params, &edit->window);
@@ -1291 +1281 @@
                 /* If it already fits, we're done */
                 n = str_width(text);
-                if (n <= scr_columns - 2)
+                if ((int)n <= pane->columns - 2)
                         break;
 
                 /* Compute number of excess characters */
-                nextra = n - (scr_columns - 2);
+                nextra = n - (pane->columns - 2);
                 /** With of the file name part */
                 fnw = str_width(fname);

uspace/lib/ui/src/window.c

@@ -256 +256 @@
         } else if (ui->console != NULL) {
                 gc = console_gc_get_ctx(ui->cgc);
+
+                if (params->placement == ui_wnd_place_full_screen) {
+                        /* Make window the size of the screen */
+                        gfx_rect_dims(&ui->rect, &scr_dims);
+                        gfx_coord2_add(&dparams.rect.p0, &scr_dims,
+                            &dparams.rect.p1);
+                }
         } else {
                 /* Needed for unit tests */
@@ -275 +282 @@
 
         /* Move rectangle so that top-left corner is 0,0 */
-        gfx_rect_rtranslate(&params->rect.p0, &params->rect, &bparams.rect);
+        gfx_rect_rtranslate(&dparams.rect.p0, &dparams.rect, &bparams.rect);
 
         rc = gfx_bitmap_create(gc, &bparams, NULL, &bmp);