Changeset 7e38970d in mainline for uspace/app/terminal/main.c

Timestamp:

2020-12-07T00:08:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (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.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/app/terminal/main.c (moved) (moved from uspace/app/vterm/vterm.c ) (5 diffs)

uspace/app/terminal/main.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2020 Jiri Svoboda
- * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup vterm
+/** @addtogroup terminal
  * @{
  */
@@ -34 +33 @@
  */
 
-#include <stdbool.h>
 #include <stdio.h>
-#include <io/pixel.h>
 #include <task.h>
-#include <window.h>
-#include <terminal.h>
+#include <ui/ui.h>
+#include "terminal.h"
 
-#define NAME  "vterm"
+#define NAME  "terminal"
 
+/** Print syntax. */
 static void print_syntax(void)
 {
-        printf("Syntax: %s [-d <display>]\n", NAME);
+        printf("Syntax: %s [<options>]\n", NAME);
+        printf("\t-d <display-spec> Use the specified display\n");
+        printf("\t-topleft]         Place window to the top-left corner of "
+            "the screen\n");
 }
 
 int main(int argc, char *argv[])
 {
-        const char *display_svc = DISPLAY_DEFAULT;
+        const char *display_spec = UI_DISPLAY_DEFAULT;
+        terminal_t *terminal = NULL;
+        terminal_flags_t flags = 0;
+        errno_t rc;
         int i;
 
         i = 1;
-        while (i < argc) {
+        while (i < argc && argv[i][0] == '-') {
                 if (str_cmp(argv[i], "-d") == 0) {
                         ++i;
@@ -63 +67 @@
                         }
 
-                        display_svc = argv[i++];
+                        display_spec = argv[i++];
+                } else if (str_cmp(argv[i], "-topleft") == 0) {
+                        ++i;
+                        flags |= tf_topleft;
                 } else {
                         printf("Invalid option '%s'.\n", argv[i]);
@@ -71 +78 @@
         }
 
-        window_t *main_window = window_open(display_svc, NULL,
-            WINDOW_MAIN | WINDOW_DECORATED, "vterm");
-        if (!main_window) {
-                printf("%s: Cannot open main window.\n", NAME);
-                return 2;
+        if (i < argc) {
+                print_syntax();
+                return 1;
         }
 
-        window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_TOP |
-            WINDOW_PLACEMENT_LEFT);
-        terminal_t *terminal_widget =
-            create_terminal(window_root(main_window), NULL, 640, 480);
-        if (!terminal_widget) {
-                window_close(main_window);
-                printf("%s: Cannot create widgets.\n", NAME);
-                return 3;
-        }
+        rc = terminal_create(display_spec, 640, 480, flags, &terminal);
+        if (rc != EOK)
+                return 1;
 
-        window_exec(main_window);
         task_retval(0);
         async_manager();
-
         return 0;
 }