Changes in uspace/lib/gfxfont/src/text.c [4583015:f2d4a46] in mainline

File:

• uspace/lib/gfxfont/src/text.c (modified) (11 diffs)

uspace/lib/gfxfont/src/text.c

@@ -97 +97 @@
 /** Print string using text characters in text mode.
  *
- * @param font Font
  * @param pos Position of top-left corner of text
- * @param color Text color
+ * @param fmt Formatting
  * @param str String
  * @return EOK on success or an error code
  */
-static errno_t gfx_puttext_textmode(gfx_font_t *font, gfx_coord2_t *pos,
-    gfx_color_t *color, const char *str)
-{
-        gfx_context_t *gc = font->typeface->gc;
+static errno_t gfx_puttext_textmode(gfx_coord2_t *pos, gfx_text_fmt_t *fmt,
+    const char *str)
+{
+        gfx_context_t *gc = fmt->font->typeface->gc;
         gfx_bitmap_params_t params;
         gfx_bitmap_t *bitmap;
         gfx_bitmap_alloc_t alloc;
+        gfx_coord_t width;
         uint8_t attr;
         pixelmap_t pmap;
         gfx_coord_t x;
+        gfx_coord_t rmargin;
         pixel_t pixel;
         char32_t c;
         size_t off;
+        bool ellipsis;
         errno_t rc;
+
+        width = str_width(str);
+        if (fmt->abbreviate && width > fmt->width) {
+                ellipsis = true;
+                width = fmt->width;
+                if (width > 3)
+                        rmargin = width - 3;
+                else
+                        rmargin = width;
+        } else {
+                ellipsis = false;
+                rmargin = width;
+        }
 
         /*
@@ -123 +138 @@
          */
 
-        gfx_color_get_ega(color, &attr);
+        gfx_color_get_ega(fmt->color, &attr);
 
         gfx_bitmap_params_init(&params);
         params.rect.p0.x = 0;
         params.rect.p0.y = 0;
-        params.rect.p1.x = str_width(str);
+        params.rect.p1.x = width;
         params.rect.p1.y = 1;
 
@@ -151 +166 @@
 
         off = 0;
-        for (x = 0; x < params.rect.p1.x; x++) {
+        for (x = 0; x < rmargin; x++) {
                 c = str_decode(str, &off, STR_NO_LIMIT);
                 pixel = PIXEL(attr,
@@ -160 +175 @@
         }
 
+        if (ellipsis) {
+                for (x = rmargin; x < params.rect.p1.x; x++) {
+                        c = '.';
+                        pixel = PIXEL(attr,
+                            (c >> 16) & 0xff,
+                            (c >> 8) & 0xff,
+                            c & 0xff);
+                        pixelmap_put_pixel(&pmap, x, 0, pixel);
+                }
+        }
+
         rc = gfx_bitmap_render(bitmap, NULL, pos);
 
@@ -183 +209 @@
         /* Adjust position for horizontal alignment */
         if (fmt->halign != gfx_halign_left) {
+                /* Compute text width */
                 width = gfx_text_width(fmt->font, str);
+                if (fmt->abbreviate && width > fmt->width)
+                        width = fmt->width;
+
                 switch (fmt->halign) {
                 case gfx_halign_center:
@@ -233 +263 @@
         gfx_coord2_t spos;
         gfx_rect_t rect;
+        gfx_coord_t width;
+        gfx_coord_t rmargin;
+        bool ellipsis;
         errno_t rc;
 
@@ -239 +272 @@
         /* Text mode */
         if ((fmt->font->finfo->props.flags & gff_text_mode) != 0)
-                return gfx_puttext_textmode(fmt->font, &spos, fmt->color, str);
+                return gfx_puttext_textmode(&spos, fmt, str);
 
         rc = gfx_set_color(fmt->font->typeface->gc, fmt->color);
         if (rc != EOK)
                 return rc;
+
+        width = gfx_text_width(fmt->font, str);
+
+        if (fmt->abbreviate && width > fmt->width) {
+                /* Need to append ellipsis */
+                ellipsis = true;
+                rmargin = spos.x + fmt->width - gfx_text_width(fmt->font, "...");
+        } else {
+                ellipsis = false;
+                rmargin = spos.x + width;
+        }
 
         cpos = spos;
@@ -256 +300 @@
                 gfx_glyph_get_metrics(glyph, &gmetrics);
 
+                /* Stop if we would run over the right margin */
+                if (fmt->abbreviate && cpos.x + gmetrics.advance > rmargin)
+                        break;
+
                 rc = gfx_glyph_render(glyph, &cpos);
                 if (rc != EOK)
@@ -274 +322 @@
 
                 rc = gfx_fill_rect(fmt->font->typeface->gc, &rect);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        /* Render ellipsis, if required */
+        if (ellipsis) {
+                rc = gfx_font_search_glyph(fmt->font, ".", &glyph, &stradv);
+                if (rc != EOK)
+                        return EOK;
+
+                gfx_glyph_get_metrics(glyph, &gmetrics);
+
+                rc = gfx_glyph_render(glyph, &cpos);
+                if (rc != EOK)
+                        return rc;
+
+                cpos.x += gmetrics.advance;
+
+                rc = gfx_glyph_render(glyph, &cpos);
+                if (rc != EOK)
+                        return rc;
+
+                cpos.x += gmetrics.advance;
+
+                rc = gfx_glyph_render(glyph, &cpos);
                 if (rc != EOK)
                         return rc;
@@ -376 +449 @@
         tfmt.valign = gfx_valign_baseline;
 
+        /* Remaining available width */
+        tfmt.width = fmt->width - (cpos->x - spos.x);
+
         *cfmt = tfmt;
 }
@@ -390 +466 @@
 {
         gfx_coord2_t spos;
+        gfx_coord_t width;
 
         gfx_text_start_pos(pos, fmt, str, &spos);
+        width = gfx_text_width(fmt->font, str);
+        if (fmt->abbreviate && width > fmt->width)
+                width = fmt->width;
 
         rect->p0.x = spos.x;
         rect->p0.y = spos.y - fmt->font->metrics.ascent;
-        rect->p1.x = spos.x + gfx_text_width(fmt->font, str);
+        rect->p1.x = spos.x + width;
         rect->p1.y = spos.y +  fmt->font->metrics.descent + 1;
 }