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

 #include "pointer_mask.xbm"
 #define DEFAULT_BGCOLOR  0xf0f0f0
 #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 */
 /** Function to render a pixel from a RGB value. */
 typedef void (*rgb_conv_t)(void *, uint32_t);
 /** 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);
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
 struct {
     uint8_t *fb_addr;
     unsigned int xres;
     unsigned int scanline;
     unsigned int glyphscanline;
     unsigned int pixelbytes;
     unsigned int glyphbytes;
+    /** Pre-rendered mask for rendering glyphs. Specific for the visual. */
+    uint8_t *glyphs;
     rgb_conv_t rgb_conv;
 } screen;
 /** Backbuffer character cell. */
 typedef struct {
-    uint8_t glyph;
+    uint32_t glyph;
     uint32_t fg_color;
     uint32_t bg_color;
 } bb_cell_t;
 typedef struct {
      */
     /** 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.*/
-    uint8_t *glyphs;
     uint8_t *bgpixel;
+    /**
-    /** Glyph drawing function for this viewport. */
+     * Glyph drawing function for this viewport.  Different viewports
+     * might use different drawing functions depending on whether their
+     * scanlines are aligned on a word boundary.
+     */
     dg_t dglyph;
     /* Auto-cursor position */
     bool cursor_active;
     unsigned int cur_col;
 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);
+    uint8_t *glyphs, uint32_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);
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
 static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
     unsigned int row);
  */
 static void vport_scroll(viewport_t *vport, int lines)
+{
     unsigned int row, col;
     unsigned int x, y;
-    uint8_t glyph;
+    uint32_t glyph;
     uint32_t fg_color;
     uint32_t bg_color;
     bb_cell_t *bbp, *xbp;
     /*
                 glyph = 0;
                 fg_color = vport->attr.fg_color;
                 bg_color = vport->attr.bg_color;
+            }
-            (*vport->dglyph)(x, y, false, vport->glyphs, glyph,
+            (*vport->dglyph)(x, y, false, screen.glyphs, glyph,
                 fg_color, bg_color);
             x += FONT_WIDTH;
+        }
         y += FONT_SCANLINES;
+    }
 /** Render glyphs
+ *
  * Convert glyphs from device independent font
  * description to current visual representation.
- *
- * @param vport Viewport
- *
  */
-static void render_glyphs(viewport_t* vport)
+static void render_glyphs(void)
+{
     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],
+                screen.rgb_conv(&screen.glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
-                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x)))
+                    (fb_font[glyph][y] & (1 << (7 - x)))
                     ? 0xffffff : 0x000000);
-                screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
+                screen.rgb_conv(&screen.glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
-                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x)))
+                    (fb_font[glyph][y] & (1 << (7 - x)))
                     ? 0x000000 : 0xffffff);
+            }
+        }
+    }
-    screen.rgb_conv(vport->bgpixel, vport->attr.bg_color);
+}
 /** Create new viewport
+ *
         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].rows = rows;
     viewports[i].attr.bg_color = DEFAULT_BGCOLOR;
     viewports[i].attr.fg_color = DEFAULT_FGCOLOR;
-    viewports[i].glyphs = glyphs;
     viewports[i].bgpixel = bgpixel;
     /*
      * Conditions necessary  to select aligned version:
+     *
     viewports[i].bbsize = bbsize;
     viewports[i].backbuf = backbuf;
     viewports[i].initialized = true;
-    render_glyphs(&viewports[i]);
+    screen.rgb_conv(viewports[i].bgpixel, viewports[i].attr.bg_color);
     return i;
+}
+ *
  */
 static bool screen_init(void *addr, unsigned int xres, unsigned int yres,
     unsigned int scan, unsigned int visual)
+{
+    unsigned int glyphsize;
+    uint8_t *glyphs;
     switch (visual) {
     case VISUAL_INDIRECT_8:
         screen.rgb_conv = rgb_323;
         screen.pixelbytes = 1;
         break;
     screen.yres = yres;
     screen.scanline = scan;
     screen.glyphscanline = FONT_WIDTH * screen.pixelbytes;
     screen.glyphbytes = screen.glyphscanline * FONT_SCANLINES;
+    glyphsize = 2 * FONT_GLYPHS * screen.glyphbytes;
+    glyphs = (uint8_t *) malloc(glyphsize);
+    if (!glyphs)
+        return false;
+    memset(glyphs, 0, glyphsize);
+    screen.glyphs = glyphs;
+    render_glyphs();
     /* Create first viewport */
     vport_create(0, 0, xres, yres);
     return true;
  * @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)
+    uint8_t *glyphs, uint32_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;
             fg_color);
         screen.rgb_conv(&((uint8_t *)&bg_buf)[i * screen.pixelbytes],
             bg_color);
+    }
     /* Pointer to the current position in the mask. */
     maskp = (unsigned long *) &glyphs[GLYPH_POS(glyph, 0, cursor)];
     /* Pointer to the current position on the screen. */
     dp = (unsigned long *) &screen.fb_addr[FB_POS(x, y)];
  * @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)
+    uint8_t *glyphs, uint32_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;
     /* 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];
+        b = fb_font[glyph][yd];
         for (i = 0; i < FONT_WIDTH; i++) {
             /* Choose color based on the current bit. */
             sp = (b & 0x80) ? fg_buf : bg_buf;
     unsigned int row)
+{
     unsigned int x = vport->x + COL2X(col);
     unsigned int y = vport->y + ROW2Y(row);
-    uint8_t glyph;
+    uint32_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,
+    (*vport->dglyph)(x, y, cursor, screen.glyphs, glyph,
         fg_color, bg_color);
+}
 /** Hide cursor if it is shown
+ *
  * @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)
+static void draw_char(viewport_t *vport, wchar_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->glyph = fb_font_glyph(c);
     bbp->fg_color = vport->attr.fg_color;
     bbp->bg_color = vport->attr.bg_color;
     draw_vp_glyph(vport, false, col, row);
+    }
     cursor_show(vport);
+}
-/** Draw text data to viewport
+/** Draw text data to viewport.
+ *
  * @param vport Viewport id
- * @param data  Text data fitting exactly into viewport
+ * @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.
  */
-static void draw_text_data(viewport_t *vport, keyfield_t *data)
+static void draw_text_data(viewport_t *vport, keyfield_t *data, unsigned int x,
+    unsigned int y, unsigned int w, unsigned int h)
+{
-    unsigned int i;
+    unsigned int i, j;
     bb_cell_t *bbp;
     attrs_t *a;
     attr_rgb_t rgb;
-    for (i = 0; i < vport->cols * vport->rows; i++) {
-        unsigned int col = i % vport->cols;
-        unsigned int row = i / vport->cols;
-        bbp = &vport->backbuf[BB_POS(vport, col, row)];
-        uint8_t glyph = bbp->glyph;
-        a = &data[i].attrs;
-        rgb_from_attr(&rgb, a);
+    for (j = 0; j < h; j++) {
+        for (i = 0; i < w; i++) {
+            unsigned int col = x + i;
+            unsigned int row = y + j;
+            bbp = &vport->backbuf[BB_POS(vport, col, row)];
+            a = &data[j * w + i].attrs;
+            rgb_from_attr(&rgb, a);
-        bbp->glyph = data[i].character;
+            bbp->glyph = fb_font_glyph(data[j * w + i].character);
-        bbp->fg_color = rgb.fg_color;
+            bbp->fg_color = rgb.fg_color;
-        bbp->bg_color = rgb.bg_color;
+            bbp->bg_color = rgb.bg_color;
-        draw_vp_glyph(vport, false, col, row);
+            draw_vp_glyph(vport, false, col, row);
+        }
+    }
     cursor_show(vport);
+}
     bool handled = true;
     int retval = EOK;
     viewport_t *vport = &viewports[vp];
     unsigned int x;
     unsigned int y;
+    unsigned int w;
+    unsigned int h;
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_SHARE_OUT:
         /* We accept one area for data interchange */
         if (IPC_GET_ARG1(*call) == shm_id) {
         ppm_draw(shm, shm_size, IPC_GET_ARG1(*call),
             IPC_GET_ARG2(*call), vport->width - x, vport->height - y, putpixel, (void *) vport);
         break;
     case FB_DRAW_TEXT_DATA:
+        x = IPC_GET_ARG1(*call);
+        y = IPC_GET_ARG2(*call);
+        w = IPC_GET_ARG3(*call);
+        h = IPC_GET_ARG4(*call);
         if (!interbuffer) {
             retval = EINVAL;
             break;
+        }
+        if (x + w > vport->cols || y + h > vport->rows) {
+            retval = EINVAL;
+            break;
+        }
-        if (intersize < vport->cols * vport->rows * sizeof(*interbuffer)) {
+        if (intersize < w * h * sizeof(*interbuffer)) {
             retval = EINVAL;
             break;
+        }
-        draw_text_data(vport, interbuffer);
+        draw_text_data(vport, interbuffer, x, y, w, h);
         break;
     default:
         handled = false;
+    }
         ipc_callid_t callid;
         ipc_call_t call;
         int retval;
         unsigned int i;
         int scroll;
-        uint8_t glyph;
+        wchar_t ch;
         unsigned int row, col;
         if ((vport->cursor_active) || (anims_enabled))
             callid = async_get_call_timeout(&call, 250000);
         else
             /* Exit thread */
             return;
         case FB_PUTCHAR:
-            glyph = IPC_GET_ARG1(call);
+            ch = IPC_GET_ARG1(call);
             row = IPC_GET_ARG2(call);
             col = IPC_GET_ARG3(call);
             if ((col >= vport->cols) || (row >= vport->rows)) {
                 retval = EINVAL;
                 break;
+            }
             ipc_answer_0(callid, EOK);
-            draw_char(vport, glyph, col, row);
+            draw_char(vport, ch, col, row);
             /* Message already answered */
             continue;
         case FB_CLEAR:
             vport_clear(vport);
             if (!viewports[i].initialized) {
                 retval = EADDRNOTAVAIL;
                 break;
+            }
             viewports[i].initialized = false;
-            if (viewports[i].glyphs)
-                free(viewports[i].glyphs);
             if (viewports[i].bgpixel)
                 free(viewports[i].bgpixel);
             if (viewports[i].backbuf)
                 free(viewports[i].backbuf);
             retval = EOK;

Subversion Repositories HelenOS

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