WebSVN – HelenOS – Diff – //branches/network/uspace/srv/fb/fb.c

 /*
+ * Copyright (c) 2008 Martin Decky
  * Copyright (c) 2006 Jakub Vana
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
 /**
  * @defgroup fb Graphical framebuffer
  * @brief   HelenOS graphical framebuffer.
  * @ingroup fbs
  * @{
  */
 /** @file
  */
 #include <stdlib.h>
 #include <ipc/ipc.h>
 #include <ipc/ns.h>
 #include <ipc/services.h>
 #include <kernel/errno.h>
 #include <kernel/genarch/fb/visuals.h>
+#include <console/color.h>
+#include <console/style.h>
 #include <async.h>
 #include <bool.h>
 #include "font-8x16.h"
 #include "fb.h"
 #include "ppm.h"
 #include "pointer.xbm"
 #include "pointer_mask.xbm"
-#define DEFAULT_BGCOLOR                0xf0f0f0
+#define DEFAULT_BGCOLOR  0xf0f0f0
-#define DEFAULT_FGCOLOR                0x0
+#define DEFAULT_FGCOLOR  0x000000
-/***************************************************************/
-/* Pixel specific fuctions */
+#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. */
-typedef void (*conv2scr_fn_t)(void *, int);
+typedef void (*rgb_conv_t)(void *, uint32_t);
-typedef int (*conv2rgb_fn_t)(void *);
+/** Function to draw a glyph. */
+typedef void (*dg_t)(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint8_t glyph, uint32_t fg_color, uint32_t bg_color);
 struct {
-    uint8_t *fbaddress;
+    uint8_t *fb_addr;
     unsigned int xres;
     unsigned int yres;
     unsigned int scanline;
+    unsigned int glyphscanline;
     unsigned int pixelbytes;
-    unsigned int invert_colors;
+    unsigned int glyphbytes;
-    conv2scr_fn_t rgb2scr;
+    rgb_conv_t rgb_conv;
-    conv2rgb_fn_t scr2rgb;
 } screen;
+/** Backbuffer character cell. */
 typedef struct {
-    int initialized;
+    uint8_t glyph;
-    unsigned int x, y;
+    uint32_t fg_color;
-    unsigned int width, height;
+    uint32_t bg_color;
+} bb_cell_t;
+typedef struct {
+    bool initialized;
+    unsigned int x;
+    unsigned int y;
+    unsigned int width;
+    unsigned int height;
     /* Text support in window */
+    unsigned int cols;
-    unsigned int rows, cols;
+    unsigned int rows;
+    /*
-    /* Style for text printing */
+     * Style and glyphs for text printing
+     */
+    /** Current attributes. */
+    attr_rgb_t attr;
+    /** Pre-rendered mask for rendering glyphs. Different viewports
+     * might use different drawing functions depending on whether their
+     * scanlines are aligned on a word boundary.*/
-    style_t style;
+    uint8_t *glyphs;
+    uint8_t *bgpixel;
+    /** Glyph drawing function for this viewport. */
+    dg_t dglyph;
     /* Auto-cursor position */
-    int cursor_active, cur_col, cur_row;
+    bool cursor_active;
+    unsigned int cur_col;
+    unsigned int cur_row;
-    int cursor_shown;
+    bool cursor_shown;
-    /* Double buffering */
+    /* Back buffer */
-    uint8_t *dbdata;
+    bb_cell_t *backbuf;
-    unsigned int dboffset;
+    unsigned int bbsize;
-    unsigned int paused;
 } viewport_t;
-#define MAX_ANIM_LEN    8
-#define MAX_ANIMATIONS  4
 typedef struct {
-    int initialized;
+    bool initialized;
-    int enabled;
+    bool enabled;
     unsigned int vp;
     unsigned int pos;
     unsigned int animlen;
     unsigned int pixmaps[MAX_ANIM_LEN];
 } animation_t;
 static animation_t animations[MAX_ANIMATIONS];
-static int anims_enabled;
+static bool anims_enabled;
-/** Maximum number of saved pixmaps
- * Pixmap is a saved rectangle
- */
-#define MAX_PIXMAPS        256
 typedef struct {
     unsigned int width;
     unsigned int height;
     uint8_t *data;
 } pixmap_t;
-static pixmap_t pixmaps[MAX_PIXMAPS];
-/* Viewport is a rectangular area on the screen */
+static pixmap_t pixmaps[MAX_PIXMAPS];
-#define MAX_VIEWPORTS 128
 static viewport_t viewports[128];
-/* Allow only 1 connection */
-static int client_connected = 0;
+static bool client_connected = false;  /**< Allow only 1 connection */
-#define RED(x, bits)    ((x >> (16 + 8 - bits)) & ((1 << bits) - 1))
-#define GREEN(x, bits)  ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
-#define BLUE(x, bits)   ((x >> (8 - bits)) & ((1 << bits) - 1))
+static uint32_t color_table[16] = {
+    [COLOR_BLACK]       = 0x000000,
+    [COLOR_BLUE]        = 0x0000f0,
+    [COLOR_GREEN]       = 0x00f000,
+    [COLOR_CYAN]        = 0x00f0f0,
+    [COLOR_RED]     = 0xf00000,
+    [COLOR_MAGENTA]     = 0xf000f0,
+    [COLOR_YELLOW]      = 0xf0f000,
+    [COLOR_WHITE]       = 0xf0f0f0,
+    [8 + COLOR_BLACK]   = 0x000000,
+    [8 + COLOR_BLUE]    = 0x0000ff,
+    [8 + COLOR_GREEN]   = 0x00ff00,
+    [8 + COLOR_CYAN]    = 0x00ffff,
+    [8 + COLOR_RED]     = 0xff0000,
+    [8 + COLOR_MAGENTA] = 0xff00ff,
+    [8 + COLOR_YELLOW]  = 0xffff00,
+    [8 + COLOR_WHITE]   = 0xffffff,
+};
+static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
+static int rgb_from_style(attr_rgb_t *rgb, int style);
+static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t flags);
+static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t attr);
+static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint8_t glyph, uint32_t fg_color, uint32_t bg_color);
+static void draw_glyph_fallback(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint8_t glyph, uint32_t fg_color, uint32_t bg_color);
+static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
-#define COL_WIDTH   8
+    unsigned int row);
+#define RED(x, bits)                 ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1))
+#define GREEN(x, bits)               ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
+#define BLUE(x, bits)                ((x >> (8 - bits)) & ((1 << bits) - 1))
+#define COL2X(col)                   ((col) * FONT_WIDTH)
+#define ROW2Y(row)                   ((row) * FONT_SCANLINES)
+#define X2COL(x)                     ((x) / FONT_WIDTH)
-#define ROW_BYTES   (screen.scanline * FONT_SCANLINES)
+#define Y2ROW(y)                     ((y) / FONT_SCANLINES)
+#define FB_POS(x, y)                 ((y) * screen.scanline + (x) * screen.pixelbytes)
+#define BB_POS(vport, col, row)      ((row) * vport->cols + (col))
+#define GLYPH_POS(glyph, y, cursor)  (((glyph) + (cursor) * FONT_GLYPHS) * screen.glyphbytes + (y) * screen.glyphscanline)
-#define POINTPOS(x, y)  ((y) * screen.scanline + (x) * screen.pixelbytes)
-static inline int COLOR(int color)
+/** ARGB 8:8:8:8 conversion
-{
+ *
-    return screen.invert_colors ? ~color : color;
-}
+ */
-/* Conversion routines between different color representations */
-static void
-rgb_byte0888(void *dst, int rgb)
+static void rgb_0888(void *dst, uint32_t rgb)
-{
-    *(int *)dst = rgb;
-}
-static int
-byte0888_rgb(void *src)
+{
-    return (*(int *)src) & 0xffffff;
+    *((uint32_t *) dst) = rgb & 0xffffff;
+}
-static void
-bgr_byte0888(void *dst, int rgb)
-{
-    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 |
-        RED(rgb, 8);
-}
-static int
-byte0888_bgr(void *src)
+/** ABGR 8:8:8:8 conversion
-{
+ *
-    int color = *(uint32_t *)(src);
-    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) |
-        ((color >> 16) & 0xff);
-}
+ */
-static void
-rgb_byte888(void *dst, int rgb)
+static void bgr_0888(void *dst, uint32_t rgb)
+{
-    uint8_t *scr = dst;
+    *((uint32_t *) dst)
-#if defined(FB_INVERT_ENDIAN)
-    scr[0] = RED(rgb, 8);
-    scr[1] = GREEN(rgb, 8);
-    scr[2] = BLUE(rgb, 8);
-#else
-    scr[2] = RED(rgb, 8);
-    scr[1] = GREEN(rgb, 8);
+        = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8);
-    scr[0] = BLUE(rgb, 8);
-#endif
+}
-static int
-byte888_rgb(void *src)
-{
-    uint8_t *scr = src;
-#if defined(FB_INVERT_ENDIAN)
-    return scr[0] << 16 | scr[1] << 8 | scr[2];
-#else
-    return scr[2] << 16 | scr[1] << 8 | scr[0];
-#endif
-}
-/**  16-bit depth (5:5:5) */
+/** RGB 8:8:8 conversion
+ *
-static void
+ */
-rgb_byte555(void *dst, int rgb)
+static void rgb_888(void *dst, uint32_t rgb)
+{
-    /* 5-bit, 5-bits, 5-bits */
+    ((uint8_t *) dst)[0] = BLUE(rgb, 8);
-    *((uint16_t *)(dst)) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 |
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-        BLUE(rgb, 5);
+    ((uint8_t *) dst)[2] = RED(rgb, 8);
+}
-/** 16-bit depth (5:5:5) */
-static int
-byte555_rgb(void *src)
-{
-    int color = *(uint16_t *)(src);
-    return (((color >> 10) & 0x1f) << (16 + 3)) |
-        (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3);
-}
-/**  16-bit depth (5:6:5) */
+/** BGR 8:8:8 conversion
+ *
-static void
+ */
-rgb_byte565(void *dst, int rgb)
+static void bgr_888(void *dst, uint32_t rgb)
+{
-    /* 5-bit, 6-bits, 5-bits */
+    ((uint8_t *) dst)[0] = RED(rgb, 8);
-    *((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 |
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-        BLUE(rgb, 5);
+    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
+}
-/** 16-bit depth (5:6:5) */
-static int
-byte565_rgb(void *src)
-{
-    int color = *(uint16_t *)(src);
-    return (((color >> 11) & 0x1f) << (16 + 3)) |
-        (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
-}
-/** Put pixel - 8-bit depth (3:2:3) */
+/** RGB 5:5:5 conversion
+ *
-static void
+ */
-rgb_byte8(void *dst, int rgb)
+static void rgb_555(void *dst, uint32_t rgb)
+{
+    *((uint16_t *) dst)
-    *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
+        = (RED(rgb, 5) << 10) | (GREEN(rgb, 5) << 5) | BLUE(rgb, 5);
+}
-/** Return pixel color - 8-bit depth (3:2:3) */
-static int
-byte8_rgb(void *src)
-{
-    int color = *(uint8_t *)src;
-    return (((color >> 5) & 0x7) << (16 + 5)) |
-        (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
-}
-/** Put pixel into viewport
+/** RGB 5:6:5 conversion
+ *
- * @param vport Viewport identification
- * @param x X coord relative to viewport
- * @param y Y coord relative to viewport
- * @param color RGB color
  */
-static void
-putpixel(viewport_t *vport, unsigned int x, unsigned int y, int color)
+static void rgb_565(void *dst, uint32_t rgb)
+{
-    int dx = vport->x + x;
-    int dy = vport->y + y;
-    if (! (vport->paused && vport->dbdata))
-        (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)],
-            COLOR(color));
-    if (vport->dbdata) {
+    *((uint16_t *) dst)
-        int dline = (y + vport->dboffset) % vport->height;
-        int doffset = screen.pixelbytes * (dline * vport->width + x);
+        = (RED(rgb, 5) << 11) | (GREEN(rgb, 6) << 5) | BLUE(rgb, 5);
-        (*screen.rgb2scr)(&vport->dbdata[doffset], COLOR(color));
-    }
+}
-/** Get pixel from viewport */
-static int
-getpixel(viewport_t *vport, unsigned int x, unsigned int y)
-{
-    int dx = vport->x + x;
-    int dy = vport->y + y;
-    return COLOR((*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx, dy)]));
-}
-static inline void
+/** RGB 3:2:3
+ *
+ */
-putpixel_mem(char *mem, unsigned int x, unsigned int y, int color)
+static void rgb_323(void *dst, uint32_t rgb)
+{
+    *((uint8_t *) dst)
-    (*screen.rgb2scr)(&mem[POINTPOS(x, y)], COLOR(color));
+        = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3));
+}
+/** Draw a filled rectangle.
+ *
+ * @note Need real implementation that does not access VRAM twice.
-static void
+ */
-draw_rectangle(viewport_t *vport, unsigned int sx, unsigned int sy,
+static void draw_filled_rect(unsigned int x0, unsigned int y0, unsigned int x1,
-    unsigned int width, unsigned int height, int color)
+    unsigned int y1, uint32_t color)
+{
     unsigned int x, y;
-    static void *tmpline;
+    unsigned int copy_bytes;
-    if (!tmpline)
+    uint8_t *sp, *dp;
-        tmpline = malloc(screen.scanline * screen.pixelbytes);
+    uint8_t cbuf[4];
-    /* Clear first line */
-    for (x = 0; x < width; x++)
+    if (y0 >= y1 || x0 >= x1) return;
-        putpixel_mem(tmpline, x, 0, color);
+    screen.rgb_conv(cbuf, color);
-    if (!vport->paused) {
-        /* Recompute to screen coords */
+    sp = &screen.fb_addr[FB_POS(x0, y0)];
-        sx += vport->x;
-        sy += vport->y;
+    dp = sp;
-        /* Copy the rest */
-        for (y = sy;y < sy+height; y++)
-            memcpy(&screen.fbaddress[POINTPOS(sx,y)], tmpline,
-                screen.pixelbytes * width);
-    }
-    if (vport->dbdata) {
+    /* Draw the first line. */
-        for (y = sy; y < sy + height; y++) {
+    for (x = x0; x < x1; x++) {
-            int rline = (y + vport->dboffset) % vport->height;
-            int rpos = (rline * vport->width + sx) *
-                screen.pixelbytes;
+        memcpy(dp, cbuf, screen.pixelbytes);
-            memcpy(&vport->dbdata[rpos], tmpline,
-                screen.pixelbytes * width);
+        dp += screen.pixelbytes;
-        }
+    }
-}
+    dp = sp + screen.scanline;
+    copy_bytes = (x1 - x0) * screen.pixelbytes;
-/** Fill viewport with background color */
+    /* Draw the remaining lines by copying. */
-static void
-clear_port(viewport_t *vport)
+    for (y = y0 + 1; y < y1; y++) {
-{
-    draw_rectangle(vport, 0, 0, vport->width, vport->height,
+        memcpy(dp, sp, copy_bytes);
-        vport->style.bg_color);
+        dp += screen.scanline;
+    }
+}
+/** Redraw viewport.
+ *
-/** Scroll unbuffered viewport up/down
+ * @param vport Viewport to redraw
+ *
- * @param vport Viewport to scroll
- * @param lines Positive number - scroll up, negative - scroll down
  */
-static void
-scroll_port_nodb(viewport_t *vport, int lines)
+static void vport_redraw(viewport_t *vport)
+{
-    int y;
+    unsigned int row, col;
-    if (lines > 0) {
-        for (y = vport->y; y < vport->y+vport->height - lines; y++)
+    for (row = 0; row < vport->rows; row++) {
-            memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
-                &screen.fbaddress[POINTPOS(vport->x,y + lines)],
-                screen.pixelbytes * vport->width);
+        for (col = 0; col < vport->cols; col++) {
-        draw_rectangle(vport, 0, vport->height - lines, vport->width,
-            lines, vport->style.bg_color);
+            draw_vp_glyph(vport, false, col, row);
-    } else if (lines < 0) {
-        lines = -lines;
+        }
-        for (y = vport->y + vport->height-1; y >= vport->y + lines; y--)
-            memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
-                &screen.fbaddress[POINTPOS(vport->x,y - lines)],
-                screen.pixelbytes * vport->width);
-        draw_rectangle(vport, 0, 0, vport->width, lines,
-            vport->style.bg_color);
+    }
-}
-/** Refresh given viewport from double buffer */
-static void
-refresh_viewport_db(viewport_t *vport)
-{
-    unsigned int y, srcy, srcoff, dsty, dstx;
-    for (y = 0; y < vport->height; y++) {
+    if (COL2X(vport->cols) < vport->width) {
+        draw_filled_rect(
-        srcy = (y + vport->dboffset) % vport->height;
+            vport->x + COL2X(vport->cols), vport->y,
-        srcoff = (vport->width * srcy) * screen.pixelbytes;
+            vport->x + vport->width, vport->y + vport->height,
-        dstx = vport->x;
+            vport->attr.bg_color);
-        dsty = vport->y + y;
+    }
+    if (ROW2Y(vport->rows) < vport->height) {
+        draw_filled_rect(
-        memcpy(&screen.fbaddress[POINTPOS(dstx,dsty)],
+            vport->x, vport->y + ROW2Y(vport->rows),
-            &vport->dbdata[srcoff], vport->width * screen.pixelbytes);
+            vport->x + vport->width, vport->y + vport->height,
+            vport->attr.bg_color);
+    }
+}
-/** Scroll viewport that has double buffering enabled */
+static void backbuf_clear(bb_cell_t *backbuf, size_t len, uint32_t fg_color,
-static void
+    uint32_t bg_color)
-scroll_port_db(viewport_t *vport, int lines)
+{
-    ++vport->paused;
-    if (lines > 0) {
-        draw_rectangle(vport, 0, 0, vport->width, lines,
-            vport->style.bg_color);
-        vport->dboffset += lines;
-        vport->dboffset %= vport->height;
-    } else if (lines < 0) {
-        lines = -lines;
+    unsigned i;
-        draw_rectangle(vport, 0, vport->height-lines, vport->width,
-            lines, vport->style.bg_color);
-        if (vport->dboffset < lines)
+    for (i = 0; i < len; i++) {
+        backbuf[i].glyph = 0;
-            vport->dboffset += vport->height;
+        backbuf[i].fg_color = fg_color;
-        vport->dboffset -= lines;
+        backbuf[i].bg_color = bg_color;
+    }
-    --vport->paused;
-    refresh_viewport_db(vport);
+}
-/** Scrolls viewport given number of lines */
-static void
+/** Clear viewport.
-scroll_port(viewport_t *vport, int lines)
-{
+ *
-    if (vport->dbdata)
-        scroll_port_db(vport, lines);
+ * @param vport Viewport to clear
-    else
-        scroll_port_nodb(vport, lines);
+ *
-}
+ */
-static void
-invert_pixel(viewport_t *vport, unsigned int x, unsigned int y)
+static void vport_clear(viewport_t *vport)
+{
-    putpixel(vport, x, y, ~getpixel(vport, x, y));
+    backbuf_clear(vport->backbuf, vport->cols * vport->rows,
+        vport->attr.fg_color, vport->attr.bg_color);
+    vport_redraw(vport);
+}
+/** Scroll viewport by the specified number of lines.
+ *
-/***************************************************************/
-/* Character-console functions */
+ * @param vport Viewport to scroll
-/** Draw character at given position
+ * @param lines Number of lines to scroll
+ *
- * @param vport Viewport where the character is printed
- * @param sx Coordinates of top-left of the character
- * @param sy Coordinates of top-left of the character
- * @param style Color of the character
- * @param transparent If false, print background color
  */
-static void
-draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy,
+static void vport_scroll(viewport_t *vport, int lines)
-    style_t style, int transparent)
+{
-    int i;
+    unsigned int row, col;
-    unsigned int y;
+    unsigned int x, y;
-    unsigned int glline;
+    uint8_t glyph;
+    uint32_t fg_color;
+    uint32_t bg_color;
+    bb_cell_t *bbp, *xbp;
+    /*
+     * Redraw.
+     */
+    y = vport->y;
+    for (row = 0; row < vport->rows; row++) {
+        x = vport->x;
+        for (col = 0; col < vport->cols; col++) {
+            if ((row + lines >= 0) && (row + lines < vport->rows)) {
+                xbp = &vport->backbuf[BB_POS(vport, col, row + lines)];
+                bbp = &vport->backbuf[BB_POS(vport, col, row)];
+                glyph = xbp->glyph;
+                fg_color = xbp->fg_color;
+                bg_color = xbp->bg_color;
+                if (bbp->glyph == glyph &&
+                    bbp->fg_color == xbp->fg_color &&
+                    bbp->bg_color == xbp->bg_color) {
+                    x += FONT_WIDTH;
+                    continue;
+                }
+            } else {
+                glyph = 0;
+                fg_color = vport->attr.fg_color;
+                bg_color = vport->attr.bg_color;
+            }
-    for (y = 0; y < FONT_SCANLINES; y++) {
-        glline = fb_font[glyph * FONT_SCANLINES + y];
+            (*vport->dglyph)(x, y, false, vport->glyphs, glyph,
-        for (i = 0; i < 8; i++) {
+                fg_color, bg_color);
-            if (glline & (1 << (7 - i)))
-                putpixel(vport, sx + i, sy + y, style.fg_color);
-            else if (!transparent)
+            x += FONT_WIDTH;
-                putpixel(vport, sx + i, sy + y, style.bg_color);
+        }
+        y += FONT_SCANLINES;
+    }
-}
-/** Invert character at given position */
-static void
-invert_char(viewport_t *vport,unsigned int row, unsigned int col)
-{
+    /*
-    unsigned int x;
+     * Scroll backbuffer.
-    unsigned int y;
+     */
-    for (x = 0; x < COL_WIDTH; x++)
+    if (lines > 0) {
+        memmove(vport->backbuf, vport->backbuf + vport->cols * lines,
-        for (y = 0; y < FONT_SCANLINES; y++)
+            vport->cols * (vport->rows - lines) * sizeof(bb_cell_t));
+        backbuf_clear(&vport->backbuf[BB_POS(vport, 0, vport->rows - lines)],
+            vport->cols * lines, vport->attr.fg_color, vport->attr.bg_color);
+    } else {
+        memmove(vport->backbuf - vport->cols * lines, vport->backbuf,
+            vport->cols * (vport->rows + lines) * sizeof(bb_cell_t));
-            invert_pixel(vport, col * COL_WIDTH + x, row *
+        backbuf_clear(vport->backbuf, - vport->cols * lines,
-                FONT_SCANLINES + y);
+            vport->attr.fg_color, vport->attr.bg_color);
+    }
+}
+/** Render glyphs
+ *
+ * Convert glyphs from device independent font
+ * description to current visual representation.
+ *
+ * @param vport Viewport
+ *
+ */
+static void render_glyphs(viewport_t* vport)
+{
+    unsigned int glyph;
+    for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
+        unsigned int y;
+        for (y = 0; y < FONT_SCANLINES; y++) {
+            unsigned int x;
+            for (x = 0; x < FONT_WIDTH; x++) {
+                screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
-/***************************************************************/
+                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x)))
-/* Stdout specific functions */
+                    ? 0xffffff : 0x000000);
+                screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
+                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x)))
+                    ? 0x000000 : 0xffffff);
+            }
+        }
+    }
+    screen.rgb_conv(vport->bgpixel, vport->attr.bg_color);
+}
 /** Create new viewport
+ *
+ * @param x      Origin of the viewport (x).
+ * @param y      Origin of the viewport (y).
+ * @param width  Width of the viewport.
+ * @param height Height of the viewport.
+ *
- * @return New viewport number
+ * @return New viewport number.
+ *
  */
-static int
-viewport_create(unsigned int x, unsigned int y,unsigned int width,
+static int vport_create(unsigned int x, unsigned int y,
-    unsigned int height)
+    unsigned int width, unsigned int height)
+{
-    int i;
+    unsigned int i;
     for (i = 0; i < MAX_VIEWPORTS; i++) {
         if (!viewports[i].initialized)
             break;
+    }
     if (i == MAX_VIEWPORTS)
         return ELIMIT;
+    unsigned int cols = width / FONT_WIDTH;
+    unsigned int rows = height / FONT_SCANLINES;
+    unsigned int bbsize = cols * rows * sizeof(bb_cell_t);
+    unsigned int glyphsize = 2 * FONT_GLYPHS * screen.glyphbytes;
+    unsigned int word_size = sizeof(unsigned long);
+    bb_cell_t *backbuf = (bb_cell_t *) malloc(bbsize);
+    if (!backbuf)
+        return ENOMEM;
+    uint8_t *glyphs = (uint8_t *) malloc(glyphsize);
+    if (!glyphs) {
+        free(backbuf);
+        return ENOMEM;
+    }
+    uint8_t *bgpixel = (uint8_t *) malloc(screen.pixelbytes);
+    if (!bgpixel) {
+        free(glyphs);
+        free(backbuf);
+        return ENOMEM;
+    }
+    backbuf_clear(backbuf, cols * rows, DEFAULT_FGCOLOR, DEFAULT_BGCOLOR);
+    memset(glyphs, 0, glyphsize);
+    memset(bgpixel, 0, screen.pixelbytes);
     viewports[i].x = x;
     viewports[i].y = y;
     viewports[i].width = width;
     viewports[i].height = height;
-    viewports[i].rows = height / FONT_SCANLINES;
+    viewports[i].cols = cols;
-    viewports[i].cols = width / COL_WIDTH;
+    viewports[i].rows = rows;
-    viewports[i].style.bg_color = DEFAULT_BGCOLOR;
-    viewports[i].style.fg_color = DEFAULT_FGCOLOR;
+    viewports[i].attr.bg_color = DEFAULT_BGCOLOR;
-    viewports[i].cur_col = 0;
+    viewports[i].attr.fg_color = DEFAULT_FGCOLOR;
-    viewports[i].cur_row = 0;
+    viewports[i].glyphs = glyphs;
-    viewports[i].cursor_active = 0;
+    viewports[i].bgpixel = bgpixel;
+    /*
+     * Conditions necessary  to select aligned version:
+     *
+     *   - word size is divisible by pixelbytes
+     *   - cell scanline size is divisible by word size
+     *   - cell scanlines are word-aligned
+     */
+    if ((word_size % screen.pixelbytes) == 0 &&
+        (FONT_WIDTH * screen.pixelbytes) % word_size == 0 &&
+        (x * screen.pixelbytes) % word_size == 0 &&
-    viewports[i].initialized = 1;
+        screen.scanline % word_size == 0) {
+        viewports[i].dglyph = draw_glyph_aligned;
+    } else {
+        viewports[i].dglyph = draw_glyph_fallback;
+    }
+    viewports[i].cur_col = 0;
+    viewports[i].cur_row = 0;
+    viewports[i].cursor_active = false;
+    viewports[i].cursor_shown = false;
+    viewports[i].bbsize = bbsize;
+    viewports[i].backbuf = backbuf;
+    viewports[i].initialized = true;
+    render_glyphs(&viewports[i]);
     return i;
+}
 /** Initialize framebuffer as a chardev output device
+ *
- * @param addr          Address of theframebuffer
+ * @param addr   Address of the framebuffer
- * @param xres          Screen width in pixels
+ * @param xres   Screen width in pixels
- * @param yres          Screen height in pixels
+ * @param yres   Screen height in pixels
- * @param visual        Bits per pixel (8, 16, 24, 32)
+ * @param visual Bits per pixel (8, 16, 24, 32)
- * @param scan          Bytes per one scanline
+ * @param scan   Bytes per one scanline
- * @param invert_colors Inverted colors.
+ *
  */
-static bool
-screen_init(void *addr, unsigned int xres, unsigned int yres,
+static bool screen_init(void *addr, unsigned int xres, unsigned int yres,
-    unsigned int scan, unsigned int visual, bool invert_colors)
+    unsigned int scan, unsigned int visual)
+{
     switch (visual) {
     case VISUAL_INDIRECT_8:
-        screen.rgb2scr = rgb_byte8;
+        screen.rgb_conv = rgb_323;
-        screen.scr2rgb = byte8_rgb;
         screen.pixelbytes = 1;
         break;
     case VISUAL_RGB_5_5_5:
-        screen.rgb2scr = rgb_byte555;
+        screen.rgb_conv = rgb_555;
-        screen.scr2rgb = byte555_rgb;
         screen.pixelbytes = 2;
         break;
     case VISUAL_RGB_5_6_5:
-        screen.rgb2scr = rgb_byte565;
+        screen.rgb_conv = rgb_565;
-        screen.scr2rgb = byte565_rgb;
         screen.pixelbytes = 2;
         break;
     case VISUAL_RGB_8_8_8:
-        screen.rgb2scr = rgb_byte888;
+        screen.rgb_conv = rgb_888;
+        screen.pixelbytes = 3;
+        break;
+    case VISUAL_BGR_8_8_8:
-        screen.scr2rgb = byte888_rgb;
+        screen.rgb_conv = bgr_888;
         screen.pixelbytes = 3;
         break;
     case VISUAL_RGB_8_8_8_0:
-        screen.rgb2scr = rgb_byte888;
+        screen.rgb_conv = rgb_888;
-        screen.scr2rgb = byte888_rgb;
         screen.pixelbytes = 4;
         break;
     case VISUAL_RGB_0_8_8_8:
-        screen.rgb2scr = rgb_byte0888;
+        screen.rgb_conv = rgb_0888;
-        screen.scr2rgb = byte0888_rgb;
         screen.pixelbytes = 4;
         break;
     case VISUAL_BGR_0_8_8_8:
-        screen.rgb2scr = bgr_byte0888;
+        screen.rgb_conv = bgr_0888;
-        screen.scr2rgb = byte0888_bgr;
         screen.pixelbytes = 4;
         break;
     default:
         return false;
+    }
-    screen.fbaddress = (unsigned char *) addr;
+    screen.fb_addr = (unsigned char *) addr;
     screen.xres = xres;
     screen.yres = yres;
     screen.scanline = scan;
-    screen.invert_colors = invert_colors;
+    screen.glyphscanline = FONT_WIDTH * screen.pixelbytes;
+    screen.glyphbytes = screen.glyphscanline * FONT_SCANLINES;
     /* Create first viewport */
-    viewport_create(0, 0, xres, yres);
+    vport_create(0, 0, xres, yres);
     return true;
+}
+/** Draw a glyph, takes advantage of alignment.
+ *
+ * This version can only be used if the following conditions are met:
+ *
+ *   - word size is divisible by pixelbytes
-/** Hide cursor if it is shown */
+ *   - cell scanline size is divisible by word size
+ *   - cell scanlines are word-aligned
+ *
+ * It makes use of the pre-rendered mask to process (possibly) several
+ * pixels at once (word size / pixelbytes pixels at a time are processed)
+ * making it very fast. Most notably this version is not applicable at 24 bits
-static void
+ * per pixel.
+ *
+ * @param x     x coordinate of top-left corner on screen.
+ * @param y     y coordinate of top-left corner on screen.
-cursor_hide(viewport_t *vport)
+ * @param cursor    Draw glyph with cursor
+ * @param glyphs    Pointer to font bitmap.
+ * @param glyph     Code of the glyph to draw.
+ * @param fg_color  Foreground color.
+ * @param bg_color  Backgroudn color.
+ */
+static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint8_t glyph, uint32_t fg_color, uint32_t bg_color)
+{
+    unsigned int i, yd;
+    unsigned long fg_buf, bg_buf;
+    unsigned long *maskp, *dp;
+    unsigned long mask;
+    unsigned int ww, d_add;
+    /*
+     * Prepare a pair of words, one filled with foreground-color
+     * pattern and the other filled with background-color pattern.
+     */
+    for (i = 0; i < sizeof(unsigned long) / screen.pixelbytes; i++) {
+        screen.rgb_conv(&((uint8_t *)&fg_buf)[i * screen.pixelbytes],
+            fg_color);
+        screen.rgb_conv(&((uint8_t *)&bg_buf)[i * screen.pixelbytes],
+            bg_color);
+    }
-    if (vport->cursor_active && vport->cursor_shown) {
+    /* Pointer to the current position in the mask. */
+    maskp = (unsigned long *) &glyphs[GLYPH_POS(glyph, 0, cursor)];
-        invert_char(vport, vport->cur_row, vport->cur_col);
+    /* Pointer to the current position on the screen. */
+    dp = (unsigned long *) &screen.fb_addr[FB_POS(x, y)];
+    /* Width of the character cell in words. */
+    ww = FONT_WIDTH * screen.pixelbytes / sizeof(unsigned long);
+    /* Offset to add when moving to another screen scanline. */
+    d_add = screen.scanline - FONT_WIDTH * screen.pixelbytes;
+    for (yd = 0; yd < FONT_SCANLINES; yd++) {
+        /*
+         * Now process the cell scanline, combining foreground
+         * and background color patters using the pre-rendered mask.
+         */
-        vport->cursor_shown = 0;
+        for (i = 0; i < ww; i++) {
+            mask = *maskp++;
+            *dp++ = (fg_buf & mask) | (bg_buf & ~mask);
+        }
+        /* Move to the beginning of the next scanline of the cell. */
+        dp = (unsigned long *) ((uint8_t *) dp + d_add);
+    }
+}
+/** Draw a glyph, fallback version.
+ *
+ * This version does not make use of the pre-rendered mask, it uses
+ * the font bitmap directly. It works always, but it is slower.
+ *
+ * @param x     x coordinate of top-left corner on screen.
+ * @param y     y coordinate of top-left corner on screen.
+ * @param cursor    Draw glyph with cursor
+ * @param glyphs    Pointer to font bitmap.
+ * @param glyph     Code of the glyph to draw.
+ * @param fg_color  Foreground color.
+ * @param bg_color  Backgroudn color.
+ */
+void draw_glyph_fallback(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint8_t glyph, uint32_t fg_color, uint32_t bg_color)
+{
+    unsigned int i, j, yd;
+    uint8_t fg_buf[4], bg_buf[4];
+    uint8_t *dp, *sp;
+    unsigned int d_add;
+    uint8_t b;
+    /* Pre-render 1x the foreground and background color pixels. */
+    if (cursor) {
+        screen.rgb_conv(fg_buf, bg_color);
+        screen.rgb_conv(bg_buf, fg_color);
+    } else {
+        screen.rgb_conv(fg_buf, fg_color);
+        screen.rgb_conv(bg_buf, bg_color);
+    }
+    /* Pointer to the current position on the screen. */
+    dp = (uint8_t *) &screen.fb_addr[FB_POS(x, y)];
+    /* Offset to add when moving to another screen scanline. */
+    d_add = screen.scanline - FONT_WIDTH * screen.pixelbytes;
+    for (yd = 0; yd < FONT_SCANLINES; yd++) {
+        /* Byte containing bits of the glyph scanline. */
+        b = fb_font[glyph * FONT_SCANLINES + yd];
+        for (i = 0; i < FONT_WIDTH; i++) {
+            /* Choose color based on the current bit. */
+            sp = (b & 0x80) ? fg_buf : bg_buf;
+            /* Copy the pixel. */
+            for (j = 0; j < screen.pixelbytes; j++) {
+                *dp++ = *sp++;
+            }
+            /* Move to the next bit. */
+            b = b << 1;
+        }
+        /* Move to the beginning of the next scanline of the cell. */
+        dp += d_add;
+    }
+}
+/** Draw glyph at specified position in viewport.
+ *
+ * @param vport  Viewport identification
+ * @param cursor Draw glyph with cursor
+ * @param col    Screen position relative to viewport
+ * @param row    Screen position relative to viewport
+ *
+ */
+static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
+    unsigned int row)
+{
+    unsigned int x = vport->x + COL2X(col);
+    unsigned int y = vport->y + ROW2Y(row);
+    uint8_t glyph;
+    uint32_t fg_color;
+    uint32_t bg_color;
+    glyph = vport->backbuf[BB_POS(vport, col, row)].glyph;
+    fg_color = vport->backbuf[BB_POS(vport, col, row)].fg_color;
+    bg_color = vport->backbuf[BB_POS(vport, col, row)].bg_color;
+    (*vport->dglyph)(x, y, cursor, vport->glyphs, glyph,
+        fg_color, bg_color);
+}
+/** Hide cursor if it is shown
+ *
+ */
+static void cursor_hide(viewport_t *vport)
+{
+    if ((vport->cursor_active) && (vport->cursor_shown)) {
+        draw_vp_glyph(vport, false, vport->cur_col, vport->cur_row);
+        vport->cursor_shown = false;
+    }
+}
-/** Show cursor if cursor showing is enabled */
+/** Show cursor if cursor showing is enabled
+ *
-static void
+ */
-cursor_print(viewport_t *vport)
+static void cursor_show(viewport_t *vport)
+{
     /* Do not check for cursor_shown */
     if (vport->cursor_active) {
-        invert_char(vport, vport->cur_row, vport->cur_col);
+        draw_vp_glyph(vport, true, vport->cur_col, vport->cur_row);
-        vport->cursor_shown = 1;
+        vport->cursor_shown = true;
+    }
+}
-/** Invert cursor, if it is enabled */
+/** Invert cursor, if it is enabled
+ *
-static void
+ */
-cursor_blink(viewport_t *vport)
+static void cursor_blink(viewport_t *vport)
+{
     if (vport->cursor_shown)
         cursor_hide(vport);
     else
-        cursor_print(vport);
+        cursor_show(vport);
+}
-/** Draw character at given position relative to viewport
- *
- * @param vport Viewport identification
- * @param c Character to print
- * @param row Screen position relative to viewport
- * @param col Screen position relative to viewport
- * @param transparent If false, print background color with character
- */
-static void
-draw_char(viewport_t *vport, char c, unsigned int row, unsigned int col,
-    style_t style, int transparent)
-{
-    /* Optimize - do not hide cursor if we are going to overwrite it */
-    if (vport->cursor_active && vport->cursor_shown &&
-        (vport->cur_col != col || vport->cur_row != row))
-        invert_char(vport, vport->cur_row, vport->cur_col);
-    draw_glyph(vport, c, col * COL_WIDTH, row * FONT_SCANLINES, style,
-        transparent);
+/** Draw character at given position relative to viewport
+ *
+ * @param vport  Viewport identification
+ * @param c      Character to draw
+ * @param col    Screen position relative to viewport
+ * @param row    Screen position relative to viewport
+ *
+ */
+static void draw_char(viewport_t *vport, uint8_t c, unsigned int col, unsigned int row)
+{
+    bb_cell_t *bbp;
+    /* Do not hide cursor if we are going to overwrite it */
+    if ((vport->cursor_active) && (vport->cursor_shown) &&
+        ((vport->cur_col != col) || (vport->cur_row != row)))
+        cursor_hide(vport);
+    bbp = &vport->backbuf[BB_POS(vport, col, row)];
+    bbp->glyph = c;
+    bbp->fg_color = vport->attr.fg_color;
+    bbp->bg_color = vport->attr.bg_color;
+    draw_vp_glyph(vport, false, col, row);
     vport->cur_col = col;
     vport->cur_row = row;
     vport->cur_col++;
     if (vport->cur_col >= vport->cols) {
         vport->cur_col = 0;
         vport->cur_row++;
         if (vport->cur_row >= vport->rows)
             vport->cur_row--;
+    }
-    cursor_print(vport);
+    cursor_show(vport);
+}
 /** Draw text data to viewport
+ *
  * @param vport Viewport id
- * @param data Text data fitting exactly into viewport
+ * @param data  Text data fitting exactly into viewport
+ *
  */
-static void
-draw_text_data(viewport_t *vport, keyfield_t *data)
+static void draw_text_data(viewport_t *vport, keyfield_t *data)
+{
-    int i;
+    unsigned int i;
+    bb_cell_t *bbp;
-    int col,row;
+    attrs_t *a;
+    attr_rgb_t rgb;
-    clear_port(vport);
     for (i = 0; i < vport->cols * vport->rows; i++) {
-        if (data[i].character == ' ' && style_same(data[i].style,
+        unsigned int col = i % vport->cols;
-            vport->style))
+        unsigned int row = i / vport->cols;
-            continue;
+        bbp = &vport->backbuf[BB_POS(vport, col, row)];
-        col = i % vport->cols;
+        uint8_t glyph = bbp->glyph;
-        row = i / vport->cols;
+        a = &data[i].attrs;
+        rgb_from_attr(&rgb, a);
-        draw_glyph(vport, data[i].character, col * COL_WIDTH, row *
+        bbp->glyph = data[i].character;
+        bbp->fg_color = rgb.fg_color;
-            FONT_SCANLINES, data[i].style, style_same(data[i].style,
+        bbp->bg_color = rgb.bg_color;
-            vport->style));
+        draw_vp_glyph(vport, false, col, row);
+    }
-    cursor_print(vport);
+    cursor_show(vport);
+}
-/** Return first free pixmap */
-static int
-find_free_pixmap(void)
+static void putpixel_pixmap(void *data, unsigned int x, unsigned int y, uint32_t color)
+{
-    int i;
+    int pm = *((int *) data);
+    pixmap_t *pmap = &pixmaps[pm];
+    unsigned int pos = (y * pmap->width + x) * screen.pixelbytes;
-    for (i = 0;i < MAX_PIXMAPS;i++)
+    screen.rgb_conv(&pmap->data[pos], color);
-        if (!pixmaps[i].data)
-            return i;
-    return -1;
+}
-static void
-putpixel_pixmap(int pm, unsigned int x, unsigned int y, int color)
+static void putpixel(void *data, unsigned int x, unsigned int y, uint32_t color)
+{
+    viewport_t *vport = (viewport_t *) data;
+    unsigned int dx = vport->x + x;
-    pixmap_t *pmap = &pixmaps[pm];
+    unsigned int dy = vport->y + y;
-    int pos = (y * pmap->width + x) * screen.pixelbytes;
+    screen.rgb_conv(&screen.fb_addr[FB_POS(dx, dy)], color);
+}
+/** Return first free pixmap
+ *
+ */
-    (*screen.rgb2scr)(&pmap->data[pos],COLOR(color));
+static int find_free_pixmap(void)
+{
+    unsigned int i;
+    for (i = 0; i < MAX_PIXMAPS; i++)
+        if (!pixmaps[i].data)
+            return i;
+    return -1;
+}
-/** Create a new pixmap and return appropriate ID */
+/** Create a new pixmap and return appropriate ID
+ *
-static int
+ */
-shm2pixmap(unsigned char *shm, size_t size)
+static int shm2pixmap(unsigned char *shm, size_t size)
+{
     int pm;
     pixmap_t *pmap;
     pm = find_free_pixmap();
     if (pm == -1)
         return ELIMIT;
     pmap = &pixmaps[pm];
     if (ppm_get_data(shm, size, &pmap->width, &pmap->height))
         return EINVAL;
     pmap->data = malloc(pmap->width * pmap->height * screen.pixelbytes);
     if (!pmap->data)
         return ENOMEM;
-    ppm_draw(shm, size, 0, 0, pmap->width, pmap->height,
+    ppm_draw(shm, size, 0, 0, pmap->width, pmap->height, putpixel_pixmap, (void *) &pm);
-        (putpixel_cb_t)putpixel_pixmap, (void *)pm);
     return pm;
+}
 /** Handle shared memory communication calls
+ *
  * Protocol for drawing pixmaps:
  * - FB_PREPARE_SHM(client shm identification)
  * - IPC_M_AS_AREA_SEND
- * - FB_DRAW_PPM(startx,starty)
+ * - FB_DRAW_PPM(startx, starty)
  * - FB_DROP_SHM
+ *
  * Protocol for text drawing
  * - IPC_M_AS_AREA_SEND
  * - FB_DRAW_TEXT_DATA
+ *
  * @param callid Callid of the current call
- * @param call Current call data
+ * @param call   Current call data
- * @param vp Active viewport
+ * @param vp     Active viewport
+ *
- * @return 0 if the call was not handled byt this function, 1 otherwise
+ * @return false if the call was not handled byt this function, true otherwise
+ *
- * note: this function is not threads safe, you would have
+ * Note: this function is not threads safe, you would have
  * to redefine static variables with __thread
+ *
  */
-static int
-shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+static bool shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+{
     static keyfield_t *interbuffer = NULL;
     static size_t intersize = 0;
     static unsigned char *shm = NULL;
     static ipcarg_t shm_id = 0;
     static size_t shm_size;
-    int handled = 1;
+    bool handled = true;
-    int retval = 0;
+    int retval = EOK;
     viewport_t *vport = &viewports[vp];
+    unsigned int x;
-    unsigned int x, y;
+    unsigned int y;
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_SHARE_OUT:
         /* We accept one area for data interchange */
         if (IPC_GET_ARG1(*call) == shm_id) {
             void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
             shm_size = IPC_GET_ARG2(*call);
             if (!ipc_answer_1(callid, EOK, (sysarg_t) dest))
                 shm = dest;
             else
                 shm_id = 0;
             if (shm[0] != 'P')
-                while (1)
+                return false;
-                    ;
-            return 1;
+            return true;
         } else {
             intersize = IPC_GET_ARG2(*call);
             receive_comm_area(callid, call, (void *) &interbuffer);
+        }
-        return 1;
+        return true;
     case FB_PREPARE_SHM:
         if (shm_id)
             retval = EBUSY;
         else
             shm_id = IPC_GET_ARG1(*call);
             as_area_destroy(shm);
             shm = NULL;
+        }
         shm_id = 0;
         break;
     case FB_SHM2PIXMAP:
         if (!shm) {
             retval = EINVAL;
             break;
+        }
             retval = EINVAL;
             break;
+        }
         x = IPC_GET_ARG1(*call);
         y = IPC_GET_ARG2(*call);
-        if (x > vport->width || y > vport->height) {
+        if ((x > vport->width) || (y > vport->height)) {
             retval = EINVAL;
             break;
+        }
         ppm_draw(shm, shm_size, IPC_GET_ARG1(*call),
-            IPC_GET_ARG2(*call), vport->width - x, vport->height - y,
+            IPC_GET_ARG2(*call), vport->width - x, vport->height - y, putpixel, (void *) vport);
-            (putpixel_cb_t)putpixel, vport);
         break;
     case FB_DRAW_TEXT_DATA:
         if (!interbuffer) {
             retval = EINVAL;
             break;
+        }
-        if (intersize < vport->cols * vport->rows *
+        if (intersize < vport->cols * vport->rows * sizeof(*interbuffer)) {
-            sizeof(*interbuffer)) {
             retval = EINVAL;
             break;
+        }
         draw_text_data(vport, interbuffer);
         break;
     default:
-        handled = 0;
+        handled = false;
+    }
     if (handled)
         ipc_answer_0(callid, retval);
     return handled;
+}
-static void
-copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap)
-{
-    int y;
-    int tmp, srcrowsize;
-    int realwidth, realheight, realrowsize;
-    int width = vport->width;
-    int height = vport->height;
+static void copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap)
+{
+    unsigned int width = vport->width;
+    unsigned int height = vport->height;
     if (width + vport->x > screen.xres)
         width = screen.xres - vport->x;
     if (height + vport->y > screen.yres)
         height = screen.yres - vport->y;
-    realwidth = pmap->width <= width ? pmap->width : width;
+    unsigned int realwidth = pmap->width <= width ? pmap->width : width;
-    realheight = pmap->height <= height ? pmap->height : height;
+    unsigned int realheight = pmap->height <= height ? pmap->height : height;
-    srcrowsize = vport->width * screen.pixelbytes;
-    realrowsize = realwidth * screen.pixelbytes;
+    unsigned int srcrowsize = vport->width * screen.pixelbytes;
+    unsigned int realrowsize = realwidth * screen.pixelbytes;
+    unsigned int y;
     for (y = 0; y < realheight; y++) {
-        tmp = (vport->y + y) * screen.scanline +
+        unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
-            vport->x * screen.pixelbytes;
-        memcpy(pmap->data + srcrowsize * y, screen.fbaddress + tmp,
+        memcpy(pmap->data + srcrowsize * y, screen.fb_addr + tmp, realrowsize);
-            realrowsize);
+    }
+}
-/** Save viewport to pixmap */
+/** Save viewport to pixmap
+ *
-static int
+ */
-save_vp_to_pixmap(viewport_t *vport)
+static int save_vp_to_pixmap(viewport_t *vport)
+{
     int pm;
     pixmap_t *pmap;
     pm = find_free_pixmap();
     if (pm == -1)
         return ELIMIT;
     pmap = &pixmaps[pm];
     pmap->data = malloc(screen.pixelbytes * vport->width * vport->height);
     if (!pmap->data)
         return ENOMEM;
     pmap->width = vport->width;
     pmap->height = vport->height;
     copy_vp_to_pixmap(vport, pmap);
     return pm;
+}
 /** Draw pixmap on screen
+ *
  * @param vp Viewport to draw on
  * @param pm Pixmap identifier
+ *
  */
 static int draw_pixmap(int vp, int pm)
+{
     pixmap_t *pmap = &pixmaps[pm];
     viewport_t *vport = &viewports[vp];
-    int y;
-    int tmp, srcrowsize;
-    int realwidth, realheight, realrowsize;
-    int width = vport->width;
+    unsigned int width = vport->width;
-    int height = vport->height;
+    unsigned int height = vport->height;
     if (width + vport->x > screen.xres)
         width = screen.xres - vport->x;
     if (height + vport->y > screen.yres)
         height = screen.yres - vport->y;
     if (!pmap->data)
         return EINVAL;
-    realwidth = pmap->width <= width ? pmap->width : width;
+    unsigned int realwidth = pmap->width <= width ? pmap->width : width;
-    realheight = pmap->height <= height ? pmap->height : height;
+    unsigned int realheight = pmap->height <= height ? pmap->height : height;
-    srcrowsize = vport->width * screen.pixelbytes;
+    unsigned int srcrowsize = vport->width * screen.pixelbytes;
-    realrowsize = realwidth * screen.pixelbytes;
+    unsigned int realrowsize = realwidth * screen.pixelbytes;
+    unsigned int y;
     for (y = 0; y < realheight; y++) {
-        tmp = (vport->y + y) * screen.scanline +
+        unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
-            vport->x * screen.pixelbytes;
-        memcpy(screen.fbaddress + tmp, pmap->data + y * srcrowsize,
+        memcpy(screen.fb_addr + tmp, pmap->data + y * srcrowsize, realrowsize);
-            realrowsize);
+    }
-    return 0;
+    return EOK;
+}
-/** Tick animation one step forward */
+/** Tick animation one step forward
+ *
-static void
+ */
-anims_tick(void)
+static void anims_tick(void)
+{
-    int i;
+    unsigned int i;
     static int counts = 0;
     /* Limit redrawing */
     counts = (counts + 1) % 8;
     if (counts)
         return;
     for (i = 0; i < MAX_ANIMATIONS; i++) {
-        if (!animations[i].animlen || !animations[i].initialized ||
+        if ((!animations[i].animlen) || (!animations[i].initialized) ||
-            !animations[i].enabled)
+            (!animations[i].enabled))
             continue;
-        draw_pixmap(animations[i].vp,
-            animations[i].pixmaps[animations[i].pos]);
+        draw_pixmap(animations[i].vp, animations[i].pixmaps[animations[i].pos]);
-        animations[i].pos = (animations[i].pos + 1) %
+        animations[i].pos = (animations[i].pos + 1) % animations[i].animlen;
-            animations[i].animlen;
+    }
+}
+static unsigned int pointer_x;
-static int pointer_x, pointer_y;
+static unsigned int pointer_y;
-static int pointer_shown, pointer_enabled;
+static bool pointer_shown, pointer_enabled;
 static int pointer_vport = -1;
 static int pointer_pixmap = -1;
-static void
-mouse_show(void)
+static void mouse_show(void)
+{
     int i, j;
     int visibility;
     int color;
     int bytepos;
-    if (pointer_shown || !pointer_enabled)
+    if ((pointer_shown) || (!pointer_enabled))
         return;
-    /* Save image under the cursor */
+    /* Save image under the pointer. */
     if (pointer_vport == -1) {
-        pointer_vport = viewport_create(pointer_x, pointer_y,
+        pointer_vport = vport_create(pointer_x, pointer_y, pointer_width, pointer_height);
-            pointer_width, pointer_height);
         if (pointer_vport < 0)
             return;
     } else {
         viewports[pointer_vport].x = pointer_x;
         viewports[pointer_vport].y = pointer_y;
+    }
     if (pointer_pixmap == -1)
         pointer_pixmap = save_vp_to_pixmap(&viewports[pointer_vport]);
     else
-        copy_vp_to_pixmap(&viewports[pointer_vport],
+        copy_vp_to_pixmap(&viewports[pointer_vport], &pixmaps[pointer_pixmap]);
-            &pixmaps[pointer_pixmap]);
-    /* Draw cursor */
+    /* Draw mouse pointer. */
     for (i = 0; i < pointer_height; i++)
         for (j = 0; j < pointer_width; j++) {
             bytepos = i * ((pointer_width - 1) / 8 + 1) + j / 8;
             visibility = pointer_mask_bits[bytepos] &
                 (1 << (j % 8));
+            }
+        }
     pointer_shown = 1;
+}
-static void
-mouse_hide(void)
+static void mouse_hide(void)
+{
-    /* Restore image under the cursor */
+    /* Restore image under the pointer. */
     if (pointer_shown) {
         draw_pixmap(pointer_vport, pointer_pixmap);
         pointer_shown = 0;
+    }
+}
-static void
-mouse_move(unsigned int x, unsigned int y)
+static void mouse_move(unsigned int x, unsigned int y)
+{
     mouse_hide();
     pointer_x = x;
     pointer_y = y;
     mouse_show();
+}
-static int
-anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+static int anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+{
-    int handled = 1;
+    bool handled = true;
-    int retval = 0;
+    int retval = EOK;
-    int i,nvp;
+    int i, nvp;
     int newval;
     switch (IPC_GET_METHOD(*call)) {
     case FB_ANIM_CREATE:
         nvp = IPC_GET_ARG1(*call);
         if (nvp == -1)
             nvp = vp;
     if (handled)
         ipc_answer_0(callid, retval);
     return handled;
+}
-/** Handler for messages concerning pixmap handling */
-static int
-pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
-{
-    int handled = 1;
-    int retval = 0;
-    int i,nvp;
+/** Handler for messages concerning pixmap handling
+ *
+ */
+static int pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+{
+    bool handled = true;
+    int retval = EOK;
+    int i, nvp;
     switch (IPC_GET_METHOD(*call)) {
     case FB_VP_DRAW_PIXMAP:
         nvp = IPC_GET_ARG1(*call);
         if (nvp == -1)
             nvp = vp;
+        }
         break;
     default:
         handled = 0;
+    }
     if (handled)
         ipc_answer_0(callid, retval);
     return handled;
+}
+static int rgb_from_style(attr_rgb_t *rgb, int style)
+{
+    switch (style) {
+    case STYLE_NORMAL:
+        rgb->fg_color = color_table[COLOR_BLACK];
+        rgb->bg_color = color_table[COLOR_WHITE];
+        break;
+    case STYLE_EMPHASIS:
+        rgb->fg_color = color_table[COLOR_RED];
+        rgb->bg_color = color_table[COLOR_WHITE];
+        break;
+    default:
+        return EINVAL;
+    }
+    return EOK;
+}
+static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t flags)
+{
+    fg_color = (fg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
+    bg_color = (bg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
+    rgb->fg_color = color_table[fg_color];
+    rgb->bg_color = color_table[bg_color];
+    return EOK;
+}
+static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a)
+{
+    int rc;
+    switch (a->t) {
+    case at_style:
+        rc = rgb_from_style(rgb, a->a.s.style);
+        break;
+    case at_idx:
+        rc = rgb_from_idx(rgb, a->a.i.fg_color,
+            a->a.i.bg_color, a->a.i.flags);
+        break;
+    case at_rgb:
+        *rgb = a->a.r;
+        rc = EOK;
+        break;
+    }
+    return rc;
+}
+static int fb_set_style(viewport_t *vport, ipcarg_t style)
+{
+    return rgb_from_style(&vport->attr, (int) style);
+}
+static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t flags)
+{
+    return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
+}
 /** Function for handling connections to FB
+ *
  */
-static void
-fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
-    ipc_callid_t callid;
-    ipc_call_t call;
-    int retval;
-    int i;
-    unsigned int row,col;
+    unsigned int vp = 0;
-    char c;
-    int vp = 0;
-    viewport_t *vport = &viewports[0];
+    viewport_t *vport = &viewports[vp];
     if (client_connected) {
         ipc_answer_0(iid, ELIMIT);
         return;
+    }
+    /* Accept connection */
-    client_connected = 1;
+    client_connected = true;
-    ipc_answer_0(iid, EOK); /* Accept connection */
+    ipc_answer_0(iid, EOK);
-    while (1) {
+    while (true) {
+        ipc_callid_t callid;
+        ipc_call_t call;
+        int retval;
+        unsigned int i;
+        int scroll;
+        uint8_t glyph;
+        unsigned int row, col;
-        if (vport->cursor_active || anims_enabled)
+        if ((vport->cursor_active) || (anims_enabled))
             callid = async_get_call_timeout(&call, 250000);
         else
             callid = async_get_call(&call);
         mouse_hide();
         if (!callid) {
             cursor_blink(vport);
             anims_tick();
             mouse_show();
             continue;
+        }
         if (shm_handle(callid, &call, vp))
             continue;
         if (pixmap_handle(callid, &call, vp))
             continue;
         if (anim_handle(callid, &call, vp))
             continue;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
-            client_connected = 0;
+            client_connected = false;
-            /* cleanup other viewports */
+            /* Cleanup other viewports */
             for (i = 1; i < MAX_VIEWPORTS; i++)
-                vport->initialized = 0;
+                vport->initialized = false;
-            return; /* Exit thread */
+            /* Exit thread */
+            return;
         case FB_PUTCHAR:
-        case FB_TRANS_PUTCHAR:
-            c = IPC_GET_ARG1(call);
+            glyph = IPC_GET_ARG1(call);
             row = IPC_GET_ARG2(call);
             col = IPC_GET_ARG3(call);
-            if (row >= vport->rows || col >= vport->cols) {
+            if ((col >= vport->cols) || (row >= vport->rows)) {
                 retval = EINVAL;
                 break;
+            }
             ipc_answer_0(callid, EOK);
-            draw_char(vport, c, row, col, vport->style,
+            draw_char(vport, glyph, col, row);
-                IPC_GET_METHOD(call) == FB_TRANS_PUTCHAR);
+            /* Message already answered */
-            continue; /* msg already answered */
+            continue;
         case FB_CLEAR:
-            clear_port(vport);
+            vport_clear(vport);
-            cursor_print(vport);
+            cursor_show(vport);
-            retval = 0;
+            retval = EOK;
             break;
         case FB_CURSOR_GOTO:
             row = IPC_GET_ARG1(call);
             col = IPC_GET_ARG2(call);
-            if (row >= vport->rows || col >= vport->cols) {
+            if ((col >= vport->cols) || (row >= vport->rows)) {
                 retval = EINVAL;
                 break;
+            }
-            retval = 0;
+            retval = EOK;
             cursor_hide(vport);
             vport->cur_col = col;
             vport->cur_row = row;
-            cursor_print(vport);
+            cursor_show(vport);
             break;
         case FB_CURSOR_VISIBILITY:
             cursor_hide(vport);
             vport->cursor_active = IPC_GET_ARG1(call);
-            cursor_print(vport);
+            cursor_show(vport);
-            retval = 0;
+            retval = EOK;
             break;
         case FB_GET_CSIZE:
             ipc_answer_2(callid, EOK, vport->rows, vport->cols);
             continue;
         case FB_SCROLL:
-            i = IPC_GET_ARG1(call);
+            scroll = IPC_GET_ARG1(call);
-            if (i > vport->rows || i < (- (int)vport->rows)) {
+            if ((scroll > (int) vport->rows) || (scroll < (-(int) vport->rows))) {
                 retval = EINVAL;
                 break;
+            }
             cursor_hide(vport);
-            scroll_port(vport, i*FONT_SCANLINES);
+            vport_scroll(vport, scroll);
-            cursor_print(vport);
+            cursor_show(vport);
-            retval = 0;
-            break;
-        case FB_VIEWPORT_DB:
-            /* Enable double buffering */
-            i = IPC_GET_ARG1(call);
-            if (i == -1)
-                i = vp;
-            if (i < 0 || i >= MAX_VIEWPORTS) {
-                retval = EINVAL;
-                break;
-            }
-            if (!viewports[i].initialized ) {
-                retval = EADDRNOTAVAIL;
-                break;
-            }
-            viewports[i].dboffset = 0;
-            if (IPC_GET_ARG2(call) == 1 && !viewports[i].dbdata)
-                viewports[i].dbdata =
-                    malloc(screen.pixelbytes *
-                    viewports[i].width * viewports[i].height);
-            else if (IPC_GET_ARG2(call) == 0 &&
-                viewports[i].dbdata) {
-                free(viewports[i].dbdata);
-                viewports[i].dbdata = NULL;
-            }
-            retval = 0;
+            retval = EOK;
             break;
         case FB_VIEWPORT_SWITCH:
             i = IPC_GET_ARG1(call);
-            if (i < 0 || i >= MAX_VIEWPORTS) {
+            if (i >= MAX_VIEWPORTS) {
                 retval = EINVAL;
                 break;
+            }
-            if (! viewports[i].initialized ) {
+            if (!viewports[i].initialized) {
                 retval = EADDRNOTAVAIL;
                 break;
+            }
             cursor_hide(vport);
             vp = i;
             vport = &viewports[vp];
-            cursor_print(vport);
+            cursor_show(vport);
-            retval = 0;
+            retval = EOK;
             break;
         case FB_VIEWPORT_CREATE:
-            retval = viewport_create(IPC_GET_ARG1(call) >> 16,
+            retval = vport_create(IPC_GET_ARG1(call) >> 16,
                 IPC_GET_ARG1(call) & 0xffff,
                 IPC_GET_ARG2(call) >> 16,
                 IPC_GET_ARG2(call) & 0xffff);
             break;
         case FB_VIEWPORT_DELETE:
             i = IPC_GET_ARG1(call);
-            if (i < 0 || i >= MAX_VIEWPORTS) {
+            if (i >= MAX_VIEWPORTS) {
                 retval = EINVAL;
                 break;
+            }
-            if (! viewports[i].initialized ) {
+            if (!viewports[i].initialized) {
                 retval = EADDRNOTAVAIL;
                 break;
+            }
-            viewports[i].initialized = 0;
+            viewports[i].initialized = false;
-            if (viewports[i].dbdata) {
+            if (viewports[i].glyphs)
-                free(viewports[i].dbdata);
+                free(viewports[i].glyphs);
+            if (viewports[i].bgpixel)
-                viewports[i].dbdata = NULL;
+                free(viewports[i].bgpixel);
-            }
+            if (viewports[i].backbuf)
+                free(viewports[i].backbuf);
-            retval = 0;
+            retval = EOK;
             break;
         case FB_SET_STYLE:
+            retval = fb_set_style(vport, IPC_GET_ARG1(call));
+            break;
+        case FB_SET_COLOR:
+            retval = fb_set_color(vport, IPC_GET_ARG1(call),
+                IPC_GET_ARG2(call), IPC_GET_ARG3(call));
+            break;
+        case FB_SET_RGB_COLOR:
-            vport->style.fg_color = IPC_GET_ARG1(call);
+            vport->attr.fg_color = IPC_GET_ARG1(call);
-            vport->style.bg_color = IPC_GET_ARG2(call);
+            vport->attr.bg_color = IPC_GET_ARG2(call);
-            retval = 0;
+            retval = EOK;
             break;
         case FB_GET_RESOLUTION:
             ipc_answer_2(callid, EOK, screen.xres, screen.yres);
             continue;
         case FB_POINTER_MOVE:
-            pointer_enabled = 1;
+            pointer_enabled = true;
             mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-            retval = 0;
+            retval = EOK;
             break;
         default:
             retval = ENOENT;
+        }
         ipc_answer_0(callid, retval);
+    }
+}
-/** Initialization of framebuffer */
+/** Initialization of framebuffer
+ *
-int
+ */
-fb_init(void)
+int fb_init(void)
 {
-    void *fb_ph_addr;
-    unsigned int fb_width;
-    unsigned int fb_height;
-    unsigned int fb_scanline;
-    unsigned int fb_visual;
-    bool fb_invert_colors;
-    void *fb_addr;
-    size_t asz;
     async_set_client_connection(fb_client_connection);
-    fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
-    fb_width = sysinfo_value("fb.width");
-    fb_height = sysinfo_value("fb.height");
-    fb_scanline = sysinfo_value("fb.scanline");
-    fb_visual = sysinfo_value("fb.visual");
-    fb_invert_colors = sysinfo_value("fb.invert-colors");
-    asz = fb_scanline * fb_height;
-    fb_addr = as_get_mappable_page(asz);
+    void *fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
+    unsigned int fb_offset = sysinfo_value("fb.offset");
+    unsigned int fb_width = sysinfo_value("fb.width");
+    unsigned int fb_height = sysinfo_value("fb.height");
+    unsigned int fb_scanline = sysinfo_value("fb.scanline");
+    unsigned int fb_visual = sysinfo_value("fb.visual");
+    unsigned int fbsize = fb_scanline * fb_height;
+    void *fb_addr = as_get_mappable_page(fbsize);
-    physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>
+    if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
-        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
-    if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual,
+    if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
-        fb_invert_colors))
         return 0;
     return -1;
+}
 /**
  * @}
  */

Subversion Repositories HelenOS

(root)//branches/network/uspace/srv/fb/fb.c – Rev 3386 → 4153