Changeset d31c3ea in mainline for uspace/lib

Timestamp:

2024-10-01T11:13:28Z (12 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

6907f26

Parents:

357d9dd

git-author:

Jiri Svoboda <jiri@…> (2024-09-30 19:13:18)

git-committer:

Jiri Svoboda <jiri@…> (2024-10-01 11:13:28)

Message:

Group vt callbacks into a callback structure

Location:

uspace/lib/vt

Files:

• include/vt/vt100.h (modified) (2 diffs)
• src/vt100.c (modified) (8 diffs)

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

@@ -71 +71 @@
 } 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 {
+        void (*putuchar)(void *, char32_t);
+        void (*control_puts)(void *, const char *);
+        void (*flush)(void *);
+} vt100_cb_t;
 
+/** VT100 instance */
 typedef struct {
+        /** Number of columns */
         sysarg_t cols;
+        /** Number of rows */
         sysarg_t rows;
 
+        /** Current column */
         sysarg_t cur_col;
+        /** Current row */
         sysarg_t cur_row;
+        /** Current attributes */
         char_attrs_t cur_attrs;
 
+        /** Enable RGB color */
         bool enable_rgb;
 
+        /** Callback functions */
+        vt100_cb_t *cb;
+        /** Argument to callback functions */
         void *arg;
-        vt100_putuchar_t putuchar;
-        vt100_control_puts_t control_puts;
-        vt100_flush_t flush;
 } vt100_t;
 
@@ -94 +103 @@
 
 extern vt100_t *vt100_create(void *, sysarg_t, sysarg_t,
-    vt100_putuchar_t, vt100_control_puts_t, vt100_flush_t);
+    vt100_cb_t *);
 extern void vt100_destroy(vt100_t *);
 

uspace/lib/vt/src/vt100.c

@@ -51 +51 @@
 void vt100_cls(vt100_t *state)
 {
-        state->control_puts(state->arg, "\033[2J");
+        state->cb->control_puts(state->arg, "\033[2J");
 }
 
@@ -60 +60 @@
 
         snprintf(control, MAX_CONTROL, "\033[%um", mode);
-        state->control_puts(state->arg, control);
+        state->cb->control_puts(state->arg, control);
 }
 
@@ -71 +71 @@
         snprintf(control, MAX_CONTROL, "\033[%u;%u;%u;%u;%um",
             a1, a2, a3, a4, a5);
-        state->control_puts(state->arg, control);
+        state->cb->control_puts(state->arg, control);
 }
 
@@ -80 +80 @@
         snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f",
             row + 1, col + 1);
-        state->control_puts(state->arg, control);
+        state->cb->control_puts(state->arg, control);
 }
 
@@ -147 +147 @@
 }
 
-vt100_t *vt100_create(void *arg, sysarg_t cols, sysarg_t rows,
-    vt100_putuchar_t putuchar_fn, vt100_control_puts_t control_puts_fn,
-    vt100_flush_t flush_fn)
+vt100_t *vt100_create(void *arg, sysarg_t cols, sysarg_t rows, vt100_cb_t *cb)
 {
         vt100_t *state = malloc(sizeof(vt100_t));
@@ -155 +153 @@
                 return NULL;
 
+        state->cb = cb;
         state->arg = arg;
-        state->putuchar = putuchar_fn;
-        state->control_puts = control_puts_fn;
-        state->flush = flush_fn;
 
         state->cols = cols;
@@ -217 +213 @@
 {
         if (visible)
-                state->control_puts(state->arg, "\033[?25h");
+                state->cb->control_puts(state->arg, "\033[?25h");
         else
-                state->control_puts(state->arg, "\033[?25l");
+                state->cb->control_puts(state->arg, "\033[?25l");
 }
 
 void vt100_putuchar(vt100_t *state, char32_t ch)
 {
-        state->putuchar(state->arg, ch == 0 ? ' ' : ch);
+        state->cb->putuchar(state->arg, ch == 0 ? ' ' : ch);
         state->cur_col++;
 
@@ -235 +231 @@
 void vt100_flush(vt100_t *state)
 {
-        state->flush(state->arg);
+        state->cb->flush(state->arg);
 }