Changeset f03d1308 in mainline for uspace/app/terminal/terminal.h

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/terminal.h (modified) (4 diffs)

uspace/app/terminal/terminal.h

@@ -38 +38 @@
 #define TERMINAL_H
 
-#include <display.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -50 +49 @@
 #include <stdatomic.h>
 #include <str.h>
-#include <ui/resource.h>
-#include <ui/wdecor.h>
+#include <ui/ui.h>
+#include <ui/window.h>
 
 #define UTF8_CHAR_BUFFER_SIZE  (STR_BOUNDS(1) + 1)
 
 typedef struct {
-        display_window_t *window;
+        ui_t *ui;
+        ui_window_t *window;
+        ui_resource_t *ui_res;
         gfx_context_t *gc;
+
         gfx_bitmap_t *bmp;
         sysarg_t w;
@@ -64 +66 @@
         gfx_coord2_t off;
         bool is_focused;
-
-        ui_resource_t *ui_res;
-        ui_wdecor_t *wdecor;
 
         fibril_mutex_t mtx;
@@ -86 +85 @@
 } terminal_t;
 
-extern errno_t terminal_create(display_t *, sysarg_t, sysarg_t, terminal_t **);
+extern errno_t terminal_create(const char *, sysarg_t, sysarg_t, terminal_t **);
 extern void terminal_destroy(terminal_t *);