Changeset f03d1308 in mainline for uspace/app/terminal/main.c

Timestamp:

2020-10-28T12:42:11Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8009dc27

Parents:

d284ce9

git-author:

Jiri Svoboda <jiri@…> (2020-10-28 12:41:11)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-28 12:42:11)

Message:

Convert terminal to using ui_window

File:

• uspace/app/terminal/main.c (modified) (5 diffs)

uspace/app/terminal/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#include <display.h>
 #include <stdio.h>
 #include <task.h>
+#include <ui/ui.h>
 #include "terminal.h"
 
@@ -43 +43 @@
 static void print_syntax(void)
 {
-        printf("Syntax: %s [-d <display>]\n", NAME);
+        printf("Syntax: %s [-d <display-spec>]\n", NAME);
 }
 
 int main(int argc, char *argv[])
 {
-        const char *display_svc = DISPLAY_DEFAULT;
-        display_t *display = NULL;
+        const char *display_spec = UI_DISPLAY_DEFAULT;
         terminal_t *terminal = NULL;
         errno_t rc;
@@ -64 +63 @@
                         }
 
-                        display_svc = argv[i++];
+                        display_spec = argv[i++];
                 } else {
                         printf("Invalid option '%s'.\n", argv[i]);
@@ -77 +76 @@
         }
 
-        rc = display_open(display_svc, &display);
-        if (rc != EOK) {
-                printf("%s: Error opening display.\n", NAME);
+        rc = terminal_create(display_spec, 640, 480, &terminal);
+        if (rc != EOK)
                 return 1;
-        }
-
-        rc = terminal_create(display, 640, 480, &terminal);
-        if (rc != EOK) {
-                display_close(display);
-                return 1;
-        }
 
         task_retval(0);