Changeset 52c4264 in mainline for uspace/srv/hid/output/proto/vt100.c

Timestamp:

2012-08-17T12:23:52Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

267f235

Parents:

ae2c925 (diff), ad78054 (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 mainline changes

File:

• uspace/srv/hid/output/proto/vt100.c (moved) (moved from uspace/srv/hid/fb/proto/vt100.c ) (8 diffs)

uspace/srv/hid/output/proto/vt100.c

@@ -32 +32 @@
 #include <sys/types.h>
 #include <inttypes.h>
+#include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <malloc.h>
 #include <io/color.h>
-#include <malloc.h>
-#include <errno.h>
 #include "vt100.h"
 
 #define MAX_CONTROL  20
-
-#define BACKBUF_POS(state, x, y)  ((y) * ((state)->width) + (x))
-
-struct vt100_state {
-        vt100_putchar_t putchar;
-        vt100_control_puts_t control_puts;
-        
-        sysarg_t width;
-        sysarg_t height;
-        
-        sysarg_t cur_col;
-        sysarg_t cur_row;
-        
-        char_attrs_t cur_attrs;
-        
-        charfield_t backbuf[];
-};
 
 typedef enum {
@@ -154 +138 @@
 }
 
-vt100_state_t *vt100_state_create(sysarg_t width, sysarg_t height,
+vt100_state_t *vt100_state_create(sysarg_t cols, sysarg_t rows,
     vt100_putchar_t putchar_fn, vt100_control_puts_t control_puts_fn)
 {
-        size_t sz = width * height * sizeof(charfield_t);
-        
         vt100_state_t *state =
-            malloc(sizeof(vt100_state_t) + sz);
+            malloc(sizeof(vt100_state_t));
         if (state == NULL)
                 return NULL;
@@ -167 +149 @@
         state->control_puts = control_puts_fn;
         
-        state->width = width;
-        state->height = height;
+        state->cols = cols;
+        state->rows = rows;
         
         state->cur_col = (sysarg_t) -1;
@@ -175 +157 @@
         state->cur_attrs.type = CHAR_ATTR_STYLE;
         state->cur_attrs.val.style = STYLE_NORMAL;
-        
-        memset(state->backbuf, 0, sz);
         
         /* Initialize graphic rendition attributes */
@@ -183 +163 @@
         vt100_sgr(state, SGR_BGCOLOR + CI_WHITE);
         state->control_puts("\033[2J");
+        state->control_puts("\033[?25l");
         
         return state;
 }
 
-void vt100_get_resolution(vt100_state_t *state, sysarg_t *width,
-    sysarg_t *height)
-{
-        *width = state->width;
-        *height = state->height;
+void vt100_state_destroy(vt100_state_t *state)
+{
+        free(state);
+}
+
+void vt100_get_dimensions(vt100_state_t *state, sysarg_t *cols,
+    sysarg_t *rows)
+{
+        *cols = state->cols;
+        *rows = state->rows;
 }
 
@@ -201 +187 @@
 int vt100_claim(vt100_state_t *state)
 {
-        for (sysarg_t row = 0; row < state->height; row++) {
-                vt100_set_pos(state, 0, row);
-                for (sysarg_t col = 0; col < state->width; col++) {
-                        charfield_t *field = state->backbuf +
-                            BACKBUF_POS(state, col, row);
-                        vt100_set_sgr(state, field->attrs);
-                        state->putchar(field->ch);
-                }
-        }
-        
-        vt100_set_pos(state, state->cur_col, state->cur_row);
-        vt100_set_sgr(state, state->cur_attrs);
-        
         return EOK;
 }
 
-void vt100_putchar(vt100_state_t *state, wchar_t ch)
-{
-        charfield_t *field = state->backbuf +
-            BACKBUF_POS(state, state->cur_col, state->cur_row);
-        field->ch = ch;
-        field->attrs = state->cur_attrs;
-        
-        state->putchar(ch);
-        state->cur_col++;
-        
-        if (state->cur_col >= state->width) {
-                state->cur_row += state->cur_col / state->width;
-                state->cur_col %= state->width;
-        }
-}
-
-void vt100_set_attr(vt100_state_t *state, char_attrs_t attrs)
-{
-        if (!attrs_same(state->cur_attrs, attrs)) {
-                vt100_set_sgr(state, attrs);
-                state->cur_attrs = attrs;
-        }
-}
-
 void vt100_goto(vt100_state_t *state, sysarg_t col, sysarg_t row)
 {
-        if ((col >= state->width) || (row >= state->height))
+        if ((col >= state->cols) || (row >= state->rows))
                 return;
         
@@ -253 +202 @@
 }
 
+void vt100_set_attr(vt100_state_t *state, char_attrs_t attrs)
+{
+        if (!attrs_same(state->cur_attrs, attrs)) {
+                vt100_set_sgr(state, attrs);
+                state->cur_attrs = attrs;
+        }
+}
+
 void vt100_cursor_visibility(vt100_state_t *state, bool visible)
 {
@@ -261 +218 @@
 }
 
+void vt100_putchar(vt100_state_t *state, wchar_t ch)
+{
+        state->putchar(ch == 0 ? ' ' : ch);
+        state->cur_col++;
+        
+        if (state->cur_col >= state->cols) {
+                state->cur_row += state->cur_col / state->cols;
+                state->cur_col %= state->cols;
+        }
+}
+
 /** @}
  */