Changeset d3109ff in mainline for uspace/lib/vt/include

Timestamp:

2024-09-24T17:59:36Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

6a753a9c

Parents:

3fcea34

Message:

Cursor and color control in remote console + RGB

Move vt100 module from output server into separate vt library
Add cursor and color control to remcons using libvt
Add RGB color control to serial console and remote console

File:

• uspace/lib/vt/include/vt/vt100.h (moved) (moved from uspace/srv/hid/output/proto/vt100.h ) (5 diffs)

uspace/lib/vt/include/vt/vt100.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -27 +28 @@
  */
 
-/** @addtogroup output
+/** @addtogroup libvt
  * @{
  */
 
-#ifndef OUTPUT_PROTO_VT100_H_
-#define OUTPUT_PROTO_VT100_H_
+#ifndef LIBVT_VT100_H_
+#define LIBVT_VT100_H_
 
 #include <io/charfield.h>
+#include <ipc/common.h>
+#include <uchar.h>
 
-typedef void (*vt100_putuchar_t)(char32_t ch);
-typedef void (*vt100_control_puts_t)(const char *str);
-typedef void (*vt100_flush_t)(void);
+/** Buffer size when creating actual VT100 commands.
+ *
+ * This is absurdly large but since we accept numbers via sysarg_t,
+ * we make it big enough for the largest value to be on the safe side
+ * (and to silence compiler too).
+ *
+ * TODO: find out if VT100 has some hard limits or perhaps simply cut-out
+ * values larger than 16 bits or something.
+ */
+#define MAX_CONTROL 64
+
+typedef enum {
+        CI_BLACK   = 0,
+        CI_RED     = 1,
+        CI_GREEN   = 2,
+        CI_BROWN   = 3,
+        CI_BLUE    = 4,
+        CI_MAGENTA = 5,
+        CI_CYAN    = 6,
+        CI_WHITE   = 7
+} sgr_color_index_t;
+
+typedef enum {
+        SGR_RESET       = 0,
+        SGR_BOLD        = 1,
+        SGR_UNDERLINE   = 4,
+        SGR_BLINK       = 5,
+        SGR_REVERSE     = 7,
+        SGR_FGCOLOR     = 30,
+        SGR_BGCOLOR     = 40
+} sgr_command_t;
+
+typedef void (*vt100_putuchar_t)(void *, char32_t ch);
+typedef void (*vt100_control_puts_t)(void *, const char *str);
+typedef void (*vt100_flush_t)(void *);
 
 typedef struct {
@@ -48 +83 @@
         char_attrs_t cur_attrs;
 
+        bool enable_rgb;
+
+        void *arg;
         vt100_putuchar_t putuchar;
         vt100_control_puts_t control_puts;
@@ -53 +91 @@
 } vt100_state_t;
 
-extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putuchar_t,
-    vt100_control_puts_t, vt100_flush_t);
+extern sgr_color_index_t color_map[];
+
+extern vt100_state_t *vt100_state_create(void *, sysarg_t, sysarg_t,
+    vt100_putuchar_t, vt100_control_puts_t, vt100_flush_t);
 extern void vt100_state_destroy(vt100_state_t *);
 
@@ -61 +101 @@
 extern void vt100_get_dimensions(vt100_state_t *, sysarg_t *, sysarg_t *);
 
+extern void vt100_cls(vt100_state_t *);
+extern void vt100_set_pos(vt100_state_t *, sysarg_t, sysarg_t);
 extern void vt100_goto(vt100_state_t *, sysarg_t, sysarg_t);
+extern void vt100_set_sgr(vt100_state_t *, char_attrs_t);
 extern void vt100_set_attr(vt100_state_t *, char_attrs_t);
 extern void vt100_cursor_visibility(vt100_state_t *, bool);