Changeset 25a76ab8 in mainline for uspace/srv/hid/fb/serial_console.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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/fb/serial_console.c (modified) (8 diffs)

uspace/srv/hid/fb/serial_console.c

@@ -84 +84 @@
         SGR_RESET       = 0,
         SGR_BOLD        = 1,
+        SGR_UNDERLINE   = 4,
         SGR_BLINK       = 5,
         SGR_REVERSE     = 7,
-        SGR_NORMAL_INT  = 22,
-        SGR_BLINK_OFF   = 25,
-        SGR_REVERSE_OFF = 27,
         SGR_FGCOLOR     = 30,
         SGR_BGCOLOR     = 40
@@ -153 +151 @@
         switch (style) {
         case STYLE_EMPHASIS:
+                serial_sgr(SGR_RESET);
                 if (color) {
-                        serial_sgr(SGR_RESET);
                         serial_sgr(SGR_FGCOLOR + CI_RED);
                         serial_sgr(SGR_BGCOLOR + CI_WHITE);
@@ -161 +159 @@
                 break;
         case STYLE_INVERTED:
+                serial_sgr(SGR_RESET);
                 if (color) {
-                        serial_sgr(SGR_RESET);
                         serial_sgr(SGR_FGCOLOR + CI_WHITE);
                         serial_sgr(SGR_BGCOLOR + CI_BLACK);
-                        serial_sgr(SGR_NORMAL_INT);
                 } else
                         serial_sgr(SGR_REVERSE);
                 break;
         case STYLE_SELECTED:
+                serial_sgr(SGR_RESET);
                 if (color) {
-                        serial_sgr(SGR_RESET);
                         serial_sgr(SGR_FGCOLOR + CI_WHITE);
                         serial_sgr(SGR_BGCOLOR + CI_RED);
-                        serial_sgr(SGR_NORMAL_INT);
-                } else {
-                        serial_sgr(SGR_BOLD);
-                        serial_sgr(SGR_REVERSE);
-                }
+                } else
+                        serial_sgr(SGR_UNDERLINE);
                 break;
         default:
+                serial_sgr(SGR_RESET);
                 if (color) {
-                        serial_sgr(SGR_RESET);
                         serial_sgr(SGR_FGCOLOR + CI_BLACK);
                         serial_sgr(SGR_BGCOLOR + CI_WHITE);
                 }
-                serial_sgr(SGR_NORMAL_INT);
         }
 }
@@ -193 +186 @@
     uint8_t flags)
 {
+        serial_sgr(SGR_RESET);
         if (color) {
-                serial_sgr(SGR_RESET);
-                serial_sgr(SGR_FGCOLOR + color_map[fgcolor]);
-                serial_sgr(SGR_BGCOLOR + color_map[bgcolor]);
+                serial_sgr(SGR_FGCOLOR + color_map[fgcolor & 7]);
+                serial_sgr(SGR_BGCOLOR + color_map[bgcolor & 7]);
+                if (flags & CATTR_BRIGHT)
+                        serial_sgr(SGR_BOLD);
         } else {
-                if (fgcolor < bgcolor)
-                        serial_sgr(SGR_RESET);
-                else
+                if (fgcolor >= bgcolor)
                         serial_sgr(SGR_REVERSE);
-        }       
+        }
 }
 
@@ -209 +202 @@
         serial_sgr(SGR_RESET);
         
-        if (fgcolor < bgcolor)
-                serial_sgr(SGR_REVERSE_OFF);
-        else
+        if (fgcolor >= bgcolor)
                 serial_sgr(SGR_REVERSE);
 }
@@ -283 +274 @@
 }
 
-
-
 /** Draw text data to viewport.
  *
- * @param vport Viewport id
- * @param data  Text data.
- * @param x     Leftmost column of the area.
- * @param y     Topmost row of the area.
- * @param w     Number of rows.
- * @param h     Number of columns.
+ * @param vport  Viewport id
+ * @param data   Text data.
+ * @param x0     Leftmost column of the area.
+ * @param y0     Topmost row of the area.
+ * @param width  Number of rows.
+ * @param height Number of columns.
  *
  */
-static void draw_text_data(keyfield_t *data, ipcarg_t x, ipcarg_t y,
-    ipcarg_t w, ipcarg_t h)
-{
-        serial_goto(x, y);
-        ipcarg_t i;
-        ipcarg_t j;
-        
+static void draw_text_data(keyfield_t *data, ipcarg_t x0, ipcarg_t y0,
+    ipcarg_t width, ipcarg_t height)
+{
         attrs_t *a0 = &data[0].attrs;
-        
-        for (j = 0; j < h; j++) {
-                if ((j > 0) && (w != scr_width))
-                        serial_goto(x, j);
+        serial_set_attrs(a0);
+        
+        ipcarg_t y;
+        for (y = 0; y < height; y++) {
+                serial_goto(x0, y0 + y);
                 
-                for (i = 0; i < w; i++) {
-                        attrs_t *a1 = &data[j * w + i].attrs;
-                        
-                        if (!attrs_same(*a0, *a1)) {
-                                serial_set_attrs(a1);
-                                a0 = a1;
+                ipcarg_t x;
+                for (x = 0; x < width; x++) {
+                        attrs_t *attr = &data[y * width + x].attrs;
+                        
+                        if (!attrs_same(*a0, *attr)) {
+                                serial_set_attrs(attr);
+                                a0 = attr;
                         }
                         
-                        serial_putchar(data[j * w + i].character);
+                        serial_putchar(data[y * width + x].character);
                 }
         }
@@ -352 +339 @@
                 ipcarg_t w;
                 ipcarg_t h;
-                attrs_t attr;
                 ssize_t rows;
                 
@@ -430 +416 @@
                         break;
                 case FB_SET_STYLE:
-                        attr.t = at_style;
-                        attr.a.s.style = IPC_GET_ARG1(call);
+                        cur_attr.t = at_style;
+                        cur_attr.a.s.style = IPC_GET_ARG1(call);
                         serial_set_attrs(&cur_attr);
                         retval = 0;
                         break;
                 case FB_SET_COLOR:
-                        attr.t = at_idx;
-                        attr.a.i.fg_color = IPC_GET_ARG1(call);
-                        attr.a.i.bg_color = IPC_GET_ARG2(call);
-                        attr.a.i.flags = IPC_GET_ARG3(call);
+                        cur_attr.t = at_idx;
+                        cur_attr.a.i.fg_color = IPC_GET_ARG1(call);
+                        cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+                        cur_attr.a.i.flags = IPC_GET_ARG3(call);
                         serial_set_attrs(&cur_attr);
                         retval = 0;
                         break;
                 case FB_SET_RGB_COLOR:
-                        attr.t = at_rgb;
-                        attr.a.r.fg_color = IPC_GET_ARG1(call);
-                        attr.a.r.bg_color = IPC_GET_ARG2(call);
+                        cur_attr.t = at_rgb;
+                        cur_attr.a.r.fg_color = IPC_GET_ARG1(call);
+                        cur_attr.a.r.bg_color = IPC_GET_ARG2(call);
                         serial_set_attrs(&cur_attr);
                         retval = 0;