Changeset 06d0c81 in mainline for uspace/app

Timestamp:

2020-11-19T22:38:17Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

20667af

Parents:

2e0a2e7

Message:

Window placement

Needed to recreate the current 'desktop' and keep CI tests working

Location:

uspace/app

Files:

• barber/barber.c (modified) (1 diff)
• init/init.c (modified) (3 diffs)
• launcher/launcher.c (modified) (1 diff)
• terminal/main.c (modified) (4 diffs)
• terminal/terminal.c (modified) (2 diffs)
• terminal/terminal.h (modified) (2 diffs)

uspace/app/barber/barber.c

@@ -362 +362 @@
         ui_wnd_params_init(&params);
         params.caption = "";
+        params.placement = ui_wnd_place_bottom_right;
         /*
          * Compute window rectangle such that application area corresponds

uspace/app/init/init.c

@@ -277 +277 @@
 }
 
-static int app_start(const char *app)
+static int app_start(const char *app, const char *arg)
 {
         printf("%s: Spawning %s\n", NAME, app);
@@ -283 +283 @@
         task_id_t id;
         task_wait_t wait;
-        errno_t rc = task_spawnl(&id, &wait, app, app, NULL);
+        errno_t rc = task_spawnl(&id, &wait, app, app, arg, NULL);
         if (rc != EOK) {
                 oom_check(rc, app);
@@ -471 +471 @@
                 rc = display_server();
                 if (rc == EOK) {
-                        app_start("/app/terminal");
-                        app_start("/app/launcher");
-                        app_start("/app/barber");
+                        app_start("/app/launcher", NULL);
+                        app_start("/app/barber", NULL);
+                        app_start("/app/terminal", "-topleft");
                 }
         }

uspace/app/launcher/launcher.c

@@ -184 +184 @@
         ui_wnd_params_init(&params);
         params.caption = "Launcher";
+        params.placement = ui_wnd_place_top_right;
         params.rect.p0.x = 0;
         params.rect.p0.y = 0;

uspace/app/terminal/main.c

@@ -43 +43 @@
 static void print_syntax(void)
 {
-        printf("Syntax: %s [-d <display-spec>]\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");
 }
 
@@ -50 +53 @@
         const char *display_spec = UI_DISPLAY_DEFAULT;
         terminal_t *terminal = NULL;
+        terminal_flags_t flags = 0;
         errno_t rc;
         int i;
@@ -64 +68 @@
 
                         display_spec = argv[i++];
+                } else if (str_cmp(argv[i], "-topleft") == 0) {
+                        ++i;
+                        flags |= tf_topleft;
                 } else {
                         printf("Invalid option '%s'.\n", argv[i]);
@@ -76 +83 @@
         }
 
-        rc = terminal_create(display_spec, 640, 480, &terminal);
+        rc = terminal_create(display_spec, 640, 480, flags, &terminal);
         if (rc != EOK)
                 return 1;

uspace/app/terminal/terminal.c

@@ -756 +756 @@
 
 errno_t terminal_create(const char *display_spec, sysarg_t width,
-    sysarg_t height, terminal_t **rterm)
+    sysarg_t height, terminal_flags_t flags, terminal_t **rterm)
 {
         terminal_t *term;
@@ -811 +811 @@
         ui_wnd_params_init(&wparams);
         wparams.caption = "Terminal";
+        if ((flags & tf_topleft) != 0)
+                wparams.placement = ui_wnd_place_top_left;
 
         /*

uspace/app/terminal/terminal.h

@@ -54 +54 @@
 #define UTF8_CHAR_BUFFER_SIZE  (STR_BOUNDS(1) + 1)
 
+typedef enum {
+        tf_topleft = 1
+} terminal_flags_t;
+
 typedef struct {
         ui_t *ui;
@@ -85 +89 @@
 } terminal_t;
 
-extern errno_t terminal_create(const char *, sysarg_t, sysarg_t, terminal_t **);
+extern errno_t terminal_create(const char *, sysarg_t, sysarg_t,
+    terminal_flags_t, terminal_t **);
 extern void terminal_destroy(terminal_t *);