Changeset 7e38970d in mainline for uspace/app/terminal/terminal.h

Timestamp:

2020-12-07T00:08:37Z (3 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/terminal.h (moved) (moved from uspace/lib/gui/terminal.h ) (4 diffs)

uspace/app/terminal/terminal.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -27 +28 @@
  */
 
-/** @addtogroup gui
+/** @addtogroup terminal
  * @{
  */
@@ -34 +35 @@
  */
 
-#ifndef GUI_TERMINAL_H_
-#define GUI_TERMINAL_H_
+#ifndef TERMINAL_H
+#define TERMINAL_H
 
-#include <stddef.h>
+#include <errno.h>
 #include <fibril_synch.h>
-#include <draw/font.h>
+#include <gfx/bitmap.h>
+#include <gfx/context.h>
+#include <gfx/coord.h>
 #include <io/chargrid.h>
 #include <io/con_srv.h>
 #include <loc.h>
-#include <adt/list.h>
 #include <adt/prodcons.h>
 #include <stdatomic.h>
 #include <str.h>
-#include "widget.h"
+#include <ui/ui.h>
+#include <ui/window.h>
 
 #define UTF8_CHAR_BUFFER_SIZE  (STR_BOUNDS(1) + 1)
 
-typedef struct terminal {
-        widget_t widget;
+typedef enum {
+        tf_topleft = 1
+} terminal_flags_t;
+
+typedef struct {
+        ui_t *ui;
+        ui_window_t *window;
+        ui_resource_t *ui_res;
+        gfx_context_t *gc;
+
+        gfx_bitmap_t *bmp;
+        sysarg_t w;
+        sysarg_t h;
+        gfx_rect_t update;
+        gfx_coord2_t off;
+        bool is_focused;
 
         fibril_mutex_t mtx;
@@ -72 +89 @@
 } terminal_t;
 
-extern bool init_terminal(terminal_t *, widget_t *, const void *, sysarg_t,
-    sysarg_t);
-extern terminal_t *create_terminal(widget_t *, const void *, sysarg_t,
-    sysarg_t);
-extern void deinit_terminal(terminal_t *);
+extern errno_t terminal_create(const char *, sysarg_t, sysarg_t,
+    terminal_flags_t, terminal_t **);
+extern void terminal_destroy(terminal_t *);
 
 #endif