Changeset 9f1362d4 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2010-04-19T19:58:18Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

369a5f8

Parents:

caad59a

Message:

console output improvements

• define new generic styles (STYLE_INVERTED for inverted print and STYLE_SELECTION for selections), use them primarily instead of specifying colors or RGBs
• use console_set_style(fphone(stdout), STYLE_NORMAL) as the correct mean for reseting console settings (instead of specifying conrete hardcoded colors)
• rename console_goto() to console_set_pos() (consistency with console_get_pos())
• use semantically correct unsigned types for console sizes and cursor positions (instead of signed types)
• use unsigned types for sizes and positions in libclui
• top: nicer screen redrawing (do not use console_clear() which causes flickering, but repaint the screen properly — not entirely finished yet)
• initialize mouse pointer coordinates (so the mouse cursor does not behave erratic after boot, unfortunatelly this does not solve ticket #223)

File:

• uspace/srv/hid/fb/fb.c (modified) (4 diffs)

uspace/srv/hid/fb/fb.c

@@ -72 +72 @@
 #define DEFAULT_FGCOLOR  0x000000
 
-#define GLYPH_UNAVAIL    '?'
-
-#define MAX_ANIM_LEN     8
-#define MAX_ANIMATIONS   4
-#define MAX_PIXMAPS      256  /**< Maximum number of saved pixmaps */
-#define MAX_VIEWPORTS    128  /**< Viewport is a rectangular area on the screen */
+#define GLYPH_UNAVAIL  '?'
+
+#define MAX_ANIM_LEN    8
+#define MAX_ANIMATIONS  4
+#define MAX_PIXMAPS     256  /**< Maximum number of saved pixmaps */
+#define MAX_VIEWPORTS   128  /**< Viewport is a rectangular area on the screen */
 
 /** Function to render a pixel from a RGB value. */
@@ -956 +956 @@
         bb_cell_t *bbp;
         attrs_t *a;
-        attr_rgb_t rgb;
         
         for (j = 0; j < h; j++) {
@@ -966 +965 @@
                         
                         a = &data[j * w + i].attrs;
+                        
+                        attr_rgb_t rgb;
+                        rgb.fg_color = 0;
+                        rgb.bg_color = 0;
                         rgb_from_attr(&rgb, a);
                         
@@ -1511 +1514 @@
                 rgb->bg_color = color_table[COLOR_WHITE];
                 break;
+        case STYLE_INVERTED:
+                rgb->fg_color = color_table[COLOR_WHITE];
+                rgb->bg_color = color_table[COLOR_BLACK];
+                break;
+        case STYLE_SELECTED:
+                rgb->fg_color = color_table[COLOR_WHITE];
+                rgb->bg_color = color_table[COLOR_RED];
+                break;
         default:
                 return EINVAL;
         }
-
+        
         return EOK;
 }