Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h lang.c tclass.c tclass.h text.c ttfont.c
Log Message:
Refactor font drawing code.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -3 -r1.567 -r1.568
--- E.h 19 Sep 2006 16:55:16 -0000 1.567
+++ E.h 18 Oct 2006 18:19:14 -0000 1.568
@@ -673,6 +673,7 @@
#define EDBUG_TYPE_SYNC 145
#define EDBUG_TYPE_PAGER 146
#define EDBUG_TYPE_SELECTION 147
+#define EDBUG_TYPE_FONTS 148
int EventDebug(unsigned int type);
void EventDebugSet(unsigned int type, int value);
===================================================================
RCS file: /cvs/e/e16/e/src/lang.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- lang.c 21 Apr 2006 23:47:30 -0000 1.11
+++ lang.c 18 Oct 2006 18:19:14 -0000 1.12
@@ -243,8 +243,8 @@
if (EventDebug(EDBUG_TYPE_VERBOSE))
{
Eprintf("Locale: %s\n", setlocale(LC_ALL, NULL));
- Eprintf("Character encoding: locale=%s internal=%s\n", enc_loc,
- enc_int);
+ Eprintf("Character encoding: locale=%s internal=%s MB_CUR_MAX=%d\n",
+ enc_loc, enc_int, MB_CUR_MAX);
}
if (!strcasecmp(enc_loc, "utf8") || !strcasecmp(enc_loc, "utf-8"))
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- tclass.c 24 Jul 2006 21:10:59 -0000 1.47
+++ tclass.c 18 Oct 2006 18:19:14 -0000 1.48
@@ -55,12 +55,8 @@
if (!ts)
return NULL;
- ts->fontname = NULL;
ts->style.mode = MODE_WRAP_CHAR;
ts->style.orientation = FONT_TO_RIGHT;
- ts->efont = NULL;
- ts->xfont = NULL;
- ts->xfontset = 0;
return ts;
}
@@ -70,10 +66,8 @@
{
if (ts->fontname)
Efree(ts->fontname);
- if (ts->xfont)
- XFreeFont(disp, ts->xfont);
- if (ts->efont)
- Efont_free(ts->efont);
+ if (ts->ops)
+ ts->ops->Destroy(ts);
Efree(ts);
}
@@ -440,7 +434,7 @@
break;
case TEXT_EFFECT:
if (ts)
- ts->effect = atoi(s2);
+ ts->style.effect = atoi(s2);
break;
case TEXT_FG_COL:
if (ts)
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- tclass.h 25 May 2006 00:18:10 -0000 1.12
+++ tclass.h 18 Oct 2006 18:19:14 -0000 1.13
@@ -27,33 +27,85 @@
#include "etypes.h"
#include "xwin.h"
-#define MODE_VERBATIM 0
-#define MODE_WRAP_CHAR 1
-#define MODE_WRAP_WORD 2
-
-#define FONT_TO_RIGHT 0
-#define FONT_TO_DOWN 1
-#define FONT_TO_UP 2
-#define FONT_TO_LEFT 3
+#define MODE_VERBATIM 0
+#define MODE_WRAP_CHAR 1
+#define MODE_WRAP_WORD 2
+
+#define FONT_TO_RIGHT 0
+#define FONT_TO_DOWN 1
+#define FONT_TO_UP 2
+#define FONT_TO_LEFT 3
+
+#define FONT_TYPE_UNKNOWN 0
+#define FONT_TYPE_IFT 1 /* Imlib2/FreeType */
+#define FONT_TYPE_XFS 2 /* XFontSet */
+#define FONT_TYPE_XFONT 3 /* XFontStruct */
+
+#if FONT_TYPE_IFT
+typedef void EFont;
+#endif
-typedef struct _efont Efont;
+typedef struct
+{
+ Win win;
+ EImage *im;
+ Drawable draw;
+ GC gc;
+ int r, g, b;
+} FontDrawContext;
+
+typedef struct
+{
+ int (*Load) (TextState * ts);
+ void (*Destroy) (TextState * ts);
+ void (*TextSize) (TextState * ts, const char *text, int len,
+ int *width, int *height, int *ascent);
+ void (*TextMangle) (TextState * ts, char **ptext,
+ int *pwidth, int textwidth_limit);
+ void (*TextDraw) (TextState * ts, FontDrawContext * ctx,
+ int x, int y, const char *text, int len);
+ void (*FdcInit) (TextState * ts, FontDrawContext * ctx,
+ Win win);
+ void (*FdcSetColor) (TextState * ts, FontDrawContext * ctx,
+ XColor * xc);
+} FontOps;
struct _textstate
{
char *fontname;
+ char type;
+ char need_utf8;
struct
{
char mode;
char orientation;
+ char effect;
} style;
XColor fg_col;
XColor bg_col;
- int effect;
- Efont *efont;
- XFontStruct *xfont;
- XFontSet xfontset;
- int xfontset_ascent;
- char need_utf8;
+ union
+ {
+#if FONT_TYPE_IFT
+ struct
+ {
+ EFont *font;
+ } ift;
+#endif
+#if FONT_TYPE_XFS
+ struct
+ {
+ XFontSet font;
+ int ascent;
+ } xfs;
+#endif
+#if FONT_TYPE_XFONT
+ struct
+ {
+ XFontStruct *font;
+ } xf;
+#endif
+ } f;
+ const FontOps *ops;
};
struct _textclass
@@ -93,17 +145,5 @@
int active, int sticky, int state,
const char *text, int x, int y, int w, int h,
int fsize, int justification);
-
-/* ttfont.c */
-void Efont_extents(Efont * f, const char *text,
- int *font_ascent_return,
- int *font_descent_return, int *width_return,
- int *max_ascent_return,
- int *max_descent_return, int *lbearing_return,
- int *rbearing_return);
-Efont *Efont_load(const char *file, int size);
-void Efont_free(Efont * f);
-void EFont_draw_string(EImage * im, Efont * f, int x, int y,
- int r, int g, int b, const char *text);
#endif /* _TCLASS_H */
===================================================================
RCS file: /cvs/e/e16/e/src/text.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- text.c 25 May 2006 00:18:10 -0000 1.73
+++ text.c 18 Oct 2006 18:19:14 -0000 1.74
@@ -26,8 +26,31 @@
#include "tclass.h"
#include "xwin.h"
-#define ExTextExtents XmbTextExtents
-#define ExDrawString XmbDrawString
+#if FONT_TYPE_IFT
+extern const FontOps FontOpsIft;
+#endif
+
+static GC
+_get_gc(Win win)
+{
+ static GC gc = None;
+ static Visual *last_vis = NULL;
+ Visual *vis;
+
+ vis = WinGetVisual(win);
+ if (vis != last_vis)
+ {
+ if (gc)
+ EXFreeGC(gc);
+ gc = None;
+ last_vis = vis;
+ }
+
+ if (!gc)
+ gc = EXCreateGC(WinGetXwin(win), 0, NULL);
+
+ return gc;
+}
static void
TextDrawRotTo(Win win, Drawable src, Drawable dst, int x, int y,
@@ -95,6 +118,7 @@
}
}
+#if FONT_TYPE_IFT
static EImage *
TextImageGet(Win win __UNUSED__, Drawable src, int x, int y, int w, int h,
TextState * ts)
@@ -154,6 +178,7 @@
}
EImageFree(im);
}
+#endif /* FONT_TYPE_IFT */
TextState *
TextclassGetTextState(TextClass * tclass, int state, int active, int sticky)
@@ -229,6 +254,379 @@
return NULL;
}
+#if FONT_TYPE_XFS
+/*
+ * XFontSet - XCreateFontSet
+ */
+extern const FontOps FontOpsXfs;
+
+static int
+XfsLoad(TextState * ts)
+{
+ int i, missing_cnt, font_cnt;
+ char **missing_list, *def_str, **fn;
+ XFontStruct **fs;
+
+ ts->f.xfs.font = XCreateFontSet(disp, ts->fontname, &missing_list,
+ &missing_cnt, &def_str);
+ if (missing_cnt)
+ XFreeStringList(missing_list);
+
+ if (!ts->f.xfs.font)
+ {
+ ts->f.xfs.font = XCreateFontSet(disp, "fixed", &missing_list,
+ &missing_cnt, &def_str);
+ if (missing_cnt)
+ XFreeStringList(missing_list);
+ }
+
+ if (!ts->f.xfs.font)
+ return -1;
+
+ if (EventDebug(EDBUG_TYPE_FONTS))
+ {
+ Eprintf("- XBaseFontNameListOfFontSet %s\n",
+ XBaseFontNameListOfFontSet(ts->f.xfs.font));
+ font_cnt = XFontsOfFontSet(ts->f.xfs.font, &fs, &fn);
+ for (i = 0; i < font_cnt; i++)
+ Eprintf("- XFontsOfFontSet %d: %s\n", i, fn[i]);
+ }
+
+ ts->f.xfs.ascent = 0;
+ font_cnt = XFontsOfFontSet(ts->f.xfs.font, &fs, &fn);
+ for (i = 0; i < font_cnt; i++)
+ ts->f.xfs.ascent = MAX(fs[i]->ascent, ts->f.xfs.ascent);
+
+ ts->type = FONT_TYPE_XFS;
+ ts->ops = &FontOpsXfs;
+ return 0;
+}
+
+static void
+XfsUnload(TextState * ts)
+{
+ XFreeFontSet(disp, ts->f.xfs.font);
+}
+
+static void
+XfsTextSize(TextState * ts, const char *text, int len,
+ int *width, int *height, int *ascent)
+{
+ XRectangle ret2;
+
+ if (len == 0)
+ len = strlen(text);
+ XmbTextExtents(ts->f.xfs.font, text, len, NULL, &ret2);
+ *height = ret2.height;
+ *width = ret2.width;
+ *ascent = ts->f.xfs.ascent;
+}
+
+static void
+XfsTextDraw(TextState * ts, FontDrawContext * fdc, int x, int y,
+ const char *text, int len)
+{
+ XmbDrawString(disp, fdc->draw, ts->f.xfs.font, fdc->gc, x, y, text, len);
+}
+
+static void
+XfsFdcInit(TextState * ts __UNUSED__, FontDrawContext * fdc, Win win)
+{
+ fdc->win = win;
+ fdc->gc = _get_gc(win);
+}
+
+static void
+XfsFdcSetColor(TextState * ts __UNUSED__, FontDrawContext * fdc, XColor * xc)
+{
+ EAllocColor(WinGetCmap(fdc->win), xc);
+ XSetForeground(disp, fdc->gc, xc->pixel);
+}
+
+static void
+XfsTextMangle(TextState * ts, char **ptext, int *pw, int textwidth_limit)
+{
+ char *text = *ptext;
+ int hh, ascent;
+ char *new_line;
+ int nuke_count = 0;
+ int len;
+ wchar_t *wc_line = NULL;
+ int wc_len;
+
+ len = strlen(text);
+ new_line = Emalloc(len + 10);
+ if (!new_line)
+ return;
+
+ wc_len = mbstowcs(NULL, text, 0);
+ if (wc_len > 0)
+ {
+ wc_line = (wchar_t *) Emalloc((wc_len + 1) * sizeof(wchar_t));
+ mbstowcs(wc_line, text, len);
+ wc_line[wc_len] = (wchar_t) '\0';
+ }
+
+ while (*pw > textwidth_limit)
+ {
+ nuke_count++;
+ if (nuke_count > wc_len)
+ {
+ int mlen;
+
+ new_line[0] = 0;
+ if (MB_CUR_MAX > 1 && wc_len > 0)
+ { /* if multibyte locale,... */
+ mlen = mblen(text, MB_CUR_MAX);
+ if (mlen < 0)
+ mlen = 1;
+ }
+ else
+ mlen = 1;
+
+ strncat(new_line, text, mlen);
+ strcat(new_line, "...");
+ break;
+ }
+ new_line[0] = 0;
+ if (MB_CUR_MAX > 1 && wc_len > 0)
+ {
+ int j, k, len_mb;
+
+ for (j = k = 0; k < (wc_len - nuke_count) / 2; k++)
+ {
+ len_mb = wctomb(new_line + j, wc_line[k]);
+ if (len_mb > 0)
+ j += len_mb;
+ }
+ new_line[j] = '\0';
+ strcat(new_line, "...");
+ j += 3;
+ len_mb = wcstombs(new_line + j,
+ wc_line + (wc_len - nuke_count) / 2 +
+ nuke_count, len + 10 - j);
+ if (len_mb > 0)
+ j += len_mb;
+ new_line[j] = '\0';
+ }
+ else
+ {
+ strncat(new_line, text, (len - nuke_count) / 2);
+ strcat(new_line, "...");
+ strcat(new_line, text + ((len - nuke_count) / 2) + nuke_count);
+ }
+ ts->ops->TextSize(ts, new_line, 0, pw, &hh, &ascent);
+ }
+ Efree(text);
+ *ptext = new_line;
+ if (wc_line)
+ Efree(wc_line);
+}
+
+const FontOps FontOpsXfs = {
+ XfsLoad, XfsUnload, XfsTextSize, XfsTextMangle, XfsTextDraw,
+ XfsFdcInit, XfsFdcSetColor
+};
+#endif /* FONT_TYPE_XFS */
+
+#if FONT_TYPE_XFONT
+/*
+ * XFontStruct - XLoadQueryFont
+ */
+extern const FontOps FontOpsXfont;
+
+static int
+XfontLoad(TextState * ts)
+{
+ if (strchr(ts->fontname, ',') == NULL)
+ ts->f.xf.font = XLoadQueryFont(disp, ts->fontname);
+ if (ts->f.xf.font)
+ goto done;
+
+ /* This one really should succeed! */
+ ts->f.xf.font = XLoadQueryFont(disp, "fixed");
+ if (ts->f.xf.font)
+ goto done;
+
+ return -1; /* Failed */
+
+ done:
+ ts->type = FONT_TYPE_XFONT;
+ ts->ops = &FontOpsXfont;
+ return -1;
+}
+
+static void
+XfontUnload(TextState * ts __UNUSED__)
+{
+ if (ts->f.xf.font)
+ XFreeFont(disp, ts->f.xf.font);
+}
+
+static void
+XfontTextSize(TextState * ts, const char *text, int len,
+ int *width, int *height, int *ascent)
+{
+ if (len == 0)
+ len = strlen(text);
+ if (ts->f.xf.font->min_byte1 == 0 && ts->f.xf.font->max_byte1 == 0)
+ *width = XTextWidth(ts->f.xf.font, text, len);
+ else
+ *width = XTextWidth16(ts->f.xf.font, (XChar2b *) text, len / 2);
+ *height = ts->f.xf.font->ascent + ts->f.xf.font->descent;
+ *ascent = ts->f.xf.font->ascent;
+}
+
+static void
+XfontTextDraw(TextState * ts, FontDrawContext * fdc, int x, int y,
+ const char *text, int len)
+{
+ if (ts->f.xf.font->min_byte1 == 0 && ts->f.xf.font->max_byte1 == 0)
+ XDrawString(disp, fdc->draw, fdc->gc, x, y, text, len);
+ else
+ XDrawString16(disp, fdc->draw, fdc->gc, x, y, (XChar2b *) text, len);
+}
+
+static void
+XfontFdcInit(TextState * ts __UNUSED__, FontDrawContext * fdc, Win win)
+{
+ fdc->win = win;
+ fdc->gc = _get_gc(win);
+
+ XSetFont(disp, fdc->gc, ts->f.xf.font->fid);
+}
+
+static void
+XfontFdcSetColor(TextState * ts __UNUSED__, FontDrawContext * fdc, XColor * xc)
+{
+ EAllocColor(WinGetCmap(fdc->win), xc);
+ XSetForeground(disp, fdc->gc, xc->pixel);
+}
+
+static void
+XfontTextMangle(TextState * ts, char **ptext, int *pw, int textwidth_limit)
+{
+ char *text = *ptext;
+ int hh, ascent;
+ char *new_line;
+ int nuke_count = 0;
+ int len;
+
+ if (1)
+ {
+ len = strlen(text);
+ new_line = Emalloc(len + 10);
+ if (!new_line)
+ return;
+
+ while (*pw > textwidth_limit)
+ {
+ nuke_count++;
+ if (nuke_count > len)
+ {
+ new_line[0] = 0;
+ strncat(new_line, text, 1);
+ strcat(new_line, "...");
+ break;
+ }
+ new_line[0] = 0;
+ strncat(new_line, text, (len - nuke_count) / 2);
+ strcat(new_line, "...");
+ strcat(new_line, text + ((len - nuke_count) / 2) + nuke_count);
+ ts->ops->TextSize(ts, new_line, 0, pw, &hh, &ascent);
+ }
+ }
+ else
+ {
+ len = strlen(text);
+ new_line = Emalloc(len + 20);
+ if (!new_line)
+ return;
+
+ while (*pw > textwidth_limit)
+ {
+ nuke_count += 2;
+ if (nuke_count > len)
+ {
+ new_line[0] = 0;
+ strncat(new_line, text, 1);
+ strcat(new_line, ". . . ");
+ break;
+ }
+ new_line[0] = 0;
+ strncat(new_line, text, (len - nuke_count) / 4);
+ strcat(new_line, ". . . ");
+ strcat(new_line, text + ((len - nuke_count) / 4) + nuke_count);
+ ts->ops->TextSize(ts, new_line, 0, pw, &hh, &ascent);
+ }
+ }
+ Efree(text);
+ *ptext = new_line;
+}
+
+const FontOps FontOpsXfont = {
+ XfontLoad, XfontUnload, XfontTextSize, XfontTextMangle, XfontTextDraw,
+ XfontFdcInit, XfontFdcSetColor
+};
+#endif /* FONT_TYPE_XFONT */
+
+#if FONT_TYPE_IFT
+static void
+IftTextMangle(TextState * ts, char **ptext, int *pw, int textwidth_limit)
+{
+ char *text = *ptext;
+ int hh, ascent;
+ char *new_line;
+ int nuke_count = 0;
+ int len;
+
+ len = strlen(text);
+ new_line = Emalloc(len + 10);
+ if (!new_line)
+ return;
+
+ while (*pw > textwidth_limit)
+ {
+ nuke_count++;
+ if (nuke_count > len)
+ {
+ new_line[0] = 0;
+ strncat(new_line, text, 1);
+ strcat(new_line, "...");
+ break;
+ }
+ new_line[0] = 0;
+ strncat(new_line, text, (len - nuke_count) / 2);
+ strcat(new_line, "...");
+ strcat(new_line, text + ((len - nuke_count) / 2) + nuke_count);
+ ts->ops->TextSize(ts, new_line, 0, pw, &hh, &ascent);
+ }
+ Efree(text);
+ *ptext = new_line;
+}
+#endif /* FONT_TYPE_IFT */
+
+static void
+TsTextDraw(TextState * ts, FontDrawContext * fdc, int x, int y,
+ const char *text, int len)
+{
+ if (ts->style.effect == 1)
+ {
+ ts->ops->FdcSetColor(ts, fdc, &(ts->bg_col));
+ ts->ops->TextDraw(ts, fdc, x + 1, y + 1, text, len);
+ }
+ else if (ts->style.effect == 2)
+ {
+ ts->ops->FdcSetColor(ts, fdc, &(ts->bg_col));
+ ts->ops->TextDraw(ts, fdc, x - 1, y, text, len);
+ ts->ops->TextDraw(ts, fdc, x + 1, y, text, len);
+ ts->ops->TextDraw(ts, fdc, x, y - 1, text, len);
+ ts->ops->TextDraw(ts, fdc, x, y + 1, text, len);
+ }
+ ts->ops->FdcSetColor(ts, fdc, &(ts->fg_col));
+ ts->ops->TextDraw(ts, fdc, x, y, text, len);
+}
+
static void
TextStateLoadFont(TextState * ts)
{
@@ -236,73 +634,27 @@
return;
/* Quit if already done */
- if ((ts->efont) || (ts->xfont) || (ts->xfontset))
+ if (ts->type)
return;
ts->need_utf8 = Mode.locale.utf8_int;
- /* Try FreeType */
- {
- char s[4096], *s2, *ss;
-
- s2 = Estrdup(ts->fontname);
- if (!s2)
- return;
- ss = strchr(s2, '/');
- if (ss)
- {
- *ss++ = '\0';
- Esnprintf(s, sizeof(s), "%s.ttf", s2);
- ts->efont = Efont_load(s2, atoi(ss));
- }
- Efree(s2);
-
- if (ts->efont)
- ts->need_utf8 = 1;
- }
- if (ts->efont)
+#if FONT_TYPE_IFT
+ if (!FontOpsIft.Load(ts)) /* Imlib2/FreeType */
goto done;
-
- /* Try X11 XCreateFontSet */
- {
- int i, missing_cnt, font_cnt;
- char **missing_list, *def_str, **fn;
- XFontStruct **fs;
-
- ts->xfontset = XCreateFontSet(disp, ts->fontname, &missing_list,
- &missing_cnt, &def_str);
- if (missing_cnt)
- XFreeStringList(missing_list);
-
- if (!ts->xfontset)
- {
- ts->xfontset = XCreateFontSet(disp, "fixed", &missing_list,
- &missing_cnt, &def_str);
- if (missing_cnt)
- XFreeStringList(missing_list);
- }
-
- if (ts->xfontset)
- {
- ts->xfontset_ascent = 0;
- font_cnt = XFontsOfFontSet(ts->xfontset, &fs, &fn);
- for (i = 0; i < font_cnt; i++)
- ts->xfontset_ascent = MAX(fs[i]->ascent, ts->xfontset_ascent);
- }
- }
- if (ts->xfontset)
+#endif
+#if FONT_TYPE_XFS
+ if (!FontOpsXfs.Load(ts)) /* XFontSet - XCreateFontSet */
goto done;
-
- /* Try X11 XLoadQueryFont */
- if (strchr(ts->fontname, ',') == NULL)
- ts->xfont = XLoadQueryFont(disp, ts->fontname);
- if (ts->xfont)
+#endif
+#if FONT_TYPE_XFONT
+ if (!FontOpsXfont.Load(ts)) /* XFontStruct - XLoadQueryFont */
goto done;
-
- /* This one really should succeed! */
- ts->xfont = XLoadQueryFont(disp, "fixed");
+#endif
done:
+ if (EventDebug(EDBUG_TYPE_FONTS))
+ Eprintf("TextStateLoadFont %s: type=%d\n", ts->fontname, ts->type);
return;
}
@@ -312,7 +664,7 @@
{
const char *str;
char **lines;
- int i, num_lines;
+ int i, num_lines, ww, hh, asc;
TextState *ts;
*width = 0;
@@ -326,6 +678,8 @@
return;
TextStateLoadFont(ts);
+ if (!ts->ops)
+ return;
/* Do encoding conversion, if necessary */
str = EstrInt2Enc(text, ts->need_utf8);
@@ -334,90 +688,17 @@
if (!lines)
return;
- if (ts->efont)
- {
- for (i = 0; i < num_lines; i++)
- {
- int ascent, descent, wid;
-
- Efont_extents(ts->efont, lines[i], &ascent, &descent, &wid, NULL,
- NULL, NULL, NULL);
- *height += ascent + descent;
- if (wid > *width)
- *width = wid;
- }
- }
- else if (ts->xfontset)
- {
- for (i = 0; i < num_lines; i++)
- {
- XRectangle ret1, ret2;
-
- ExTextExtents(ts->xfontset, lines[i], strlen(lines[i]), &ret1,
- &ret2);
- *height += ret2.height;
- if (ret2.width > *width)
- *width = ret2.width;
- }
- }
- else if ((ts->xfont) && (ts->xfont->min_byte1 == 0)
- && (ts->xfont->max_byte1 == 0))
+ for (i = 0; i < num_lines; i++)
{
- for (i = 0; i < num_lines; i++)
- {
- int wid;
-
- wid = XTextWidth(ts->xfont, lines[i], strlen(lines[i]));
- *height += ts->xfont->ascent + ts->xfont->descent;
- if (wid > *width)
- *width = wid;
- }
+ ts->ops->TextSize(ts, lines[i], strlen(lines[i]), &ww, &hh, &asc);
+ *height += hh;
+ if (ww > *width)
+ *width = ww;
}
- else if ((ts->xfont))
- {
- for (i = 0; i < num_lines; i++)
- {
- int wid;
- wid = XTextWidth16(ts->xfont, (XChar2b *) lines[i],
- strlen(lines[i]) / 2);
- *height += ts->xfont->ascent + ts->xfont->descent;
- if (wid > *width)
- *width = wid;
- }
- }
StrlistFree(lines, num_lines);
}
-static GC
-_get_gc(Win win)
-{
- static GC gc = None;
- static Visual *last_vis = NULL;
- Visual *vis;
-
- vis = WinGetVisual(win);
- if (vis != last_vis)
- {
- if (gc)
- EXFreeGC(gc);
- gc = None;
- last_vis = vis;
- }
-
- if (!gc)
- gc = EXCreateGC(WinGetXwin(win), 0, NULL);
-
- return gc;
-}
-
-static void
-_set_gc_color(Win win, GC gc, XColor * pxc)
-{
- EAllocColor(WinGetCmap(win), pxc);
- XSetForeground(disp, gc, pxc->pixel);
-}
-
void
TextstateDrawText(TextState * ts, Win win, Drawable draw, const char *text,
int x, int y, int w, int h, const EImageBorder * pad,
@@ -426,15 +707,17 @@
const char *str;
char **lines;
int i, num_lines;
- int xx, yy;
int textwidth_limit, offset_x, offset_y;
- GC gc;
+ int xx, yy, ww, hh, ascent;
Pixmap drawable;
+ FontDrawContext fdc;
if (w <= 0 || h <= 0)
return;
TextStateLoadFont(ts);
+ if (!ts->ops)
+ return;
/* Do encoding conversion, if necessary */
str = EstrInt2Enc(text, ts->need_utf8);
@@ -470,287 +753,73 @@
textwidth_limit = h;
}
+#if 0
+ Eprintf("TextstateDrawText %d,%d %dx%d(%d): %s\n", x, y, w, h,
+ textwidth_limit, text);
+#endif
+
xx = x;
yy = y;
- if (ts->efont)
+#if FONT_TYPE_IFT
+ if (ts->type == FONT_TYPE_IFT)
{
- EImage *im;
- int r, g, b;
+ ts->ops->FdcInit(ts, &fdc, win);
for (i = 0; i < num_lines; i++)
{
- int ascent, descent, wid;
+ ts->ops->TextSize(ts, lines[i], 0, &ww, &hh, &ascent);
+ if (ww > textwidth_limit)
+#if 0
+ ts->ops->TextMangle(ts, &lines[i], &ww, textwidth_limit);
+#else
+ IftTextMangle(ts, &lines[i], &ww, textwidth_limit);
+#endif
- Efont_extents(ts->efont, lines[i], &ascent, &descent, &wid, NULL,
- NULL, NULL, NULL);
- if (wid > textwidth_limit)
- {
- char *new_line;
- int nuke_count = 0;
- int len;
-
- len = strlen(lines[i]);
- new_line = Emalloc(len + 10);
- if (!new_line)
- goto done;
- while (wid > textwidth_limit)
- {
- nuke_count++;
- if (nuke_count > len)
- {
- new_line[0] = 0;
- strncat(new_line, lines[i], 1);
- strcat(new_line, "...");
- break;
- }
- new_line[0] = 0;
- strncat(new_line, lines[i], (len - nuke_count) / 2);
- strcat(new_line, "...");
- strcat(new_line,
- lines[i] + ((len - nuke_count) / 2) + nuke_count);
- Efont_extents(ts->efont, new_line, &ascent, &descent,
- &wid, NULL, NULL, NULL, NULL);
- }
- Efree(lines[i]);
- lines[i] = new_line;
- }
if (i == 0)
yy += ascent;
- xx = x + (((textwidth_limit - wid) * justification) >> 10);
+ xx = x + (((textwidth_limit - ww) * justification) >> 10);
- im = TextImageGet(win, draw, xx - 1, yy - 1 - ascent,
- wid + 2, ascent + descent + 2, ts);
- if (!im)
+ fdc.im = TextImageGet(win, draw, xx - 1, yy - 1 - ascent,
+ ww + 2, hh + 2, ts);
+ if (!fdc.im)
break;
offset_x = 1;
offset_y = ascent + 1;
- if (ts->effect == 1)
- {
- EGetColor(&(ts->bg_col), &r, &g, &b);
- EFont_draw_string(im, ts->efont, offset_x + 1,
- offset_y + 1, r, g, b, lines[i]);
- }
- else if (ts->effect == 2)
- {
- EGetColor(&(ts->bg_col), &r, &g, &b);
- EFont_draw_string(im, ts->efont, offset_x - 1,
- offset_y, r, g, b, lines[i]);
- EFont_draw_string(im, ts->efont, offset_x + 1,
- offset_y, r, g, b, lines[i]);
- EFont_draw_string(im, ts->efont, offset_x,
- offset_y - 1, r, g, b, lines[i]);
- EFont_draw_string(im, ts->efont, offset_x,
- offset_y + 1, r, g, b, lines[i]);
- }
- EGetColor(&(ts->fg_col), &r, &g, &b);
- EFont_draw_string(im, ts->efont, offset_x, offset_y,
- r, g, b, lines[i]);
+ TsTextDraw(ts, &fdc, offset_x, offset_y, lines[i],
+ strlen(lines[i]));
- TextImagePut(im, win, draw, xx - 1, yy - 1 - ascent,
- wid + 2, ascent + descent + 2, ts);
+ TextImagePut(fdc.im, win, draw, xx - 1, yy - 1 - ascent,
+ ww + 2, hh + 2, ts);
- yy += ascent + descent;
+ yy += hh;
}
}
- else if (ts->xfontset)
+ else
+#endif /* FONT_TYPE_IFT */
{
- gc = _get_gc(win);
+ ts->ops->FdcInit(ts, &fdc, win);
for (i = 0; i < num_lines; i++)
{
- XRectangle ret1, ret2;
+ ts->ops->TextSize(ts, lines[i], 0, &ww, &hh, &ascent);
+ if (ww > textwidth_limit)
+ ts->ops->TextMangle(ts, &lines[i], &ww, textwidth_limit);
- ExTextExtents(ts->xfontset, lines[i], strlen(lines[i]), &ret1,
- &ret2);
- if (ret2.width > textwidth_limit)
- {
- char *new_line;
- int nuke_count = 0;
- int len;
- wchar_t *wc_line = NULL;
- int wc_len;
-
- len = strlen(lines[i]);
- new_line = Emalloc(len + 10);
- if (!new_line)
- goto done;
- wc_len = mbstowcs(NULL, lines[i], 0);
- if (wc_len > 0)
- {
- wc_line =
- (wchar_t *) Emalloc((wc_len + 1) * sizeof(wchar_t));
- mbstowcs(wc_line, lines[i], len);
- wc_line[wc_len] = (wchar_t) '\0';
- }
-
- while (ret2.width > textwidth_limit)
- {
- nuke_count++;
- if (nuke_count > wc_len)
- {
- int mlen;
-
- new_line[0] = 0;
- if (MB_CUR_MAX > 1 && wc_len > 0)
- { /* if multibyte locale,... */
- mlen = mblen(lines[i], MB_CUR_MAX);
- if (mlen < 0)
- mlen = 1;
- }
- else
- mlen = 1;
-
- strncat(new_line, lines[i], mlen);
- strcat(new_line, "...");
- break;
- }
- new_line[0] = 0;
- if (MB_CUR_MAX > 1 && wc_len > 0)
- {
- int j, k, len_mb;
-
- for (j = k = 0; k < (wc_len - nuke_count) / 2; k++)
- {
- len_mb = wctomb(new_line + j, wc_line[k]);
- if (len_mb > 0)
- j += len_mb;
- }
- new_line[j] = '\0';
- strcat(new_line, "...");
- j += 3;
- len_mb =
- wcstombs(new_line + j,
- wc_line + (wc_len - nuke_count) / 2 +
- nuke_count, len + 10 - j);
- if (len_mb > 0)
- j += len_mb;
- new_line[j] = '\0';
- }
- else
- {
- strncat(new_line, lines[i], (len - nuke_count) / 2);
- strcat(new_line, "...");
- strcat(new_line,
- lines[i] + ((len - nuke_count) / 2) +
- nuke_count);
- }
- ExTextExtents(ts->xfontset, new_line, strlen(new_line),
- &ret1, &ret2);
- }
- Efree(lines[i]);
- lines[i] = new_line;
- if (wc_len > 0)
- Efree(wc_line);
- }
if (i == 0)
- yy += ts->xfontset_ascent;
- xx = x + (((textwidth_limit - ret2.width) * justification) >> 10);
+ yy += ascent;
+ xx = x + (((textwidth_limit - ww) * justification) >> 10);
if (ts->style.orientation != FONT_TO_RIGHT)
- drawable =
- ECreatePixmap(win, ret2.width + 2, ret2.height + 2, 0);
+ drawable = ECreatePixmap(win, ww + 2, hh + 2, 0);
else
drawable = draw;
- TextDrawRotTo(win, draw, drawable, xx - 1,
- yy - (ts->xfontset_ascent) - 1, ret2.width + 2,
- ret2.height + 2, ts);
- if (ts->style.orientation == FONT_TO_RIGHT)
- {
- offset_x = xx;
- offset_y = yy;
- }
- else
- {
- offset_x = 1;
- offset_y = ts->xfontset_ascent + 1;
- }
+ fdc.draw = drawable;
+ TextDrawRotTo(win, draw, drawable, xx - 1, yy - 1 - ascent,
+ ww + 2, hh + 2, ts);
- if (ts->effect == 1)
- {
- _set_gc_color(win, gc, &ts->bg_col);
- ExDrawString(disp, drawable, ts->xfontset, gc, offset_x + 1,
- offset_y + 1, lines[i], strlen(lines[i]));
- }
- else if (ts->effect == 2)
- {
- _set_gc_color(win, gc, &ts->bg_col);
- ExDrawString(disp, drawable, ts->xfontset, gc, offset_x - 1,
- offset_y, lines[i], strlen(lines[i]));
- ExDrawString(disp, drawable, ts->xfontset, gc, offset_x + 1,
- offset_y, lines[i], strlen(lines[i]));
- ExDrawString(disp, drawable, ts->xfontset, gc, offset_x,
- offset_y - 1, lines[i], strlen(lines[i]));
- ExDrawString(disp, drawable, ts->xfontset, gc, offset_x,
- offset_y + 1, lines[i], strlen(lines[i]));
- }
- _set_gc_color(win, gc, &ts->fg_col);
- ExDrawString(disp, drawable, ts->xfontset, gc, offset_x, offset_y,
- lines[i], strlen(lines[i]));
-
- TextDrawRotBack(win, draw, drawable, xx - 1,
- yy - (ts->xfontset_ascent) - 1, ret2.width + 2,
- ret2.height + 2, ts);
- if (drawable != draw)
- EFreePixmap(drawable);
- yy += ret2.height;
- }
- }
- else if ((ts->xfont) && (ts->xfont->min_byte1 == 0)
- && (ts->xfont->max_byte1 == 0))
- {
- gc = _get_gc(win);
-
- XSetFont(disp, gc, ts->xfont->fid);
- for (i = 0; i < num_lines; i++)
- {
- int wid, ascent, descent;
-
- wid = XTextWidth(ts->xfont, lines[i], strlen(lines[i]));
- ascent = ts->xfont->ascent;
- descent = ts->xfont->descent;
- if (wid > textwidth_limit)
- {
- char *new_line;
- int nuke_count = 0;
- int len;
-
- len = strlen(lines[i]);
- new_line = Emalloc(len + 10);
- if (!new_line)
- goto done;
- while (wid > textwidth_limit)
- {
- nuke_count++;
- if (nuke_count > len)
- {
- new_line[0] = 0;
- strncat(new_line, lines[i], 1);
- strcat(new_line, "...");
- break;
- }
- new_line[0] = 0;
- strncat(new_line, lines[i], (len - nuke_count) / 2);
- strcat(new_line, "...");
- strcat(new_line,
- lines[i] + ((len - nuke_count) / 2) + nuke_count);
- wid = XTextWidth(ts->xfont, new_line, strlen(new_line));
- }
- Efree(lines[i]);
- lines[i] = new_line;
- }
- if (i == 0)
- yy += ts->xfont->ascent;
- xx = x + (((textwidth_limit - wid) * justification) >> 10);
-
- if (ts->style.orientation != FONT_TO_RIGHT)
- drawable = ECreatePixmap(win, wid + 2, ascent + descent + 2, 0);
- else
- drawable = draw;
- TextDrawRotTo(win, draw, drawable, xx - 1, yy - ascent - 1,
- wid + 2, ascent + descent + 2, ts);
if (ts->style.orientation == FONT_TO_RIGHT)
{
offset_x = xx;
@@ -762,131 +831,18 @@
offset_y = ascent + 1;
}
- if (ts->effect == 1)
- {
- _set_gc_color(win, gc, &ts->bg_col);
- XDrawString(disp, drawable, gc, offset_x + 1, offset_y + 1,
- lines[i], strlen(lines[i]));
- }
- else if (ts->effect == 2)
- {
- _set_gc_color(win, gc, &ts->bg_col);
- XDrawString(disp, drawable, gc, offset_x - 1, offset_y,
- lines[i], strlen(lines[i]));
- XDrawString(disp, drawable, gc, offset_x + 1, offset_y,
- lines[i], strlen(lines[i]));
- XDrawString(disp, drawable, gc, offset_x, offset_y - 1,
- lines[i], strlen(lines[i]));
- XDrawString(disp, drawable, gc, offset_x, offset_y + 1,
- lines[i], strlen(lines[i]));
- }
- _set_gc_color(win, gc, &ts->fg_col);
- XDrawString(disp, drawable, gc, offset_x, offset_y, lines[i],
- strlen(lines[i]));
+ TsTextDraw(ts, &fdc, offset_x, offset_y, lines[i],
+ strlen(lines[i]));
TextDrawRotBack(win, draw, drawable, xx - 1, yy - 1 - ascent,
- wid + 2, ascent + descent + 2, ts);
+ ww + 2, hh + 2, ts);
if (drawable != draw)
EFreePixmap(drawable);
- yy += ts->xfont->ascent + ts->xfont->descent;
- }
- }
- else if ((ts->xfont))
- {
- gc = _get_gc(win);
-
- XSetFont(disp, gc, ts->xfont->fid);
- for (i = 0; i < num_lines; i++)
- {
- int wid, ascent, descent;
-
- wid = XTextWidth16(ts->xfont, (XChar2b *) lines[i],
- strlen(lines[i]) / 2);
- ascent = ts->xfont->ascent;
- descent = ts->xfont->descent;
- if (wid > textwidth_limit)
- {
- char *new_line;
- int nuke_count = 0;
- int len;
-
- len = strlen(lines[i]);
- new_line = Emalloc(len + 20);
- if (!new_line)
- goto done;
- while (wid > textwidth_limit)
- {
- nuke_count += 2;
- if (nuke_count > len)
- {
- new_line[0] = 0;
- strncat(new_line, lines[i], 1);
- strcat(new_line, ". . . ");
- break;
- }
- new_line[0] = 0;
- strncat(new_line, lines[i], (len - nuke_count) / 4);
- strcat(new_line, ". . . ");
- strcat(new_line,
- lines[i] + ((len - nuke_count) / 4) + nuke_count);
- wid =
- XTextWidth16(ts->xfont, (XChar2b *) new_line,
- strlen(new_line) / 2);
- }
- Efree(lines[i]);
- lines[i] = new_line;
- }
- if (i == 0)
- yy += ts->xfont->ascent;
- xx = x + (((textwidth_limit - wid) * justification) >> 10);
- if (ts->style.orientation != FONT_TO_RIGHT)
- drawable = ECreatePixmap(win, wid + 2, ascent + descent + 2, 0);
- else
- drawable = draw;
- TextDrawRotTo(win, draw, drawable, xx - 1, yy - ascent - 1,
- wid + 2, ascent + descent + 2, ts);
- if (ts->style.orientation == FONT_TO_RIGHT)
- {
- offset_x = xx;
- offset_y = yy;
- }
- else
- {
- offset_x = 1;
- offset_y = ascent + 1;
- }
-
- if (ts->effect == 1)
- {
- _set_gc_color(win, gc, &ts->bg_col);
- XDrawString16(disp, drawable, gc, offset_x + 1, offset_y + 1,
- (XChar2b *) lines[i], strlen(lines[i]) / 2);
- }
- else if (ts->effect == 2)
- {
- _set_gc_color(win, gc, &ts->bg_col);
- XDrawString16(disp, drawable, gc, offset_x - 1, offset_y,
- (XChar2b *) lines[i], strlen(lines[i]) / 2);
- XDrawString16(disp, drawable, gc, offset_y + 1, offset_y,
- (XChar2b *) lines[i], strlen(lines[i]) / 2);
- XDrawString16(disp, drawable, gc, offset_x, offset_y - 1,
- (XChar2b *) lines[i], strlen(lines[i]) / 2);
- XDrawString16(disp, drawable, gc, offset_x, offset_y + 1,
- (XChar2b *) lines[i], strlen(lines[i]) / 2);
- }
- _set_gc_color(win, gc, &ts->fg_col);
- XDrawString16(disp, drawable, gc, offset_x, offset_y,
- (XChar2b *) lines[i], strlen(lines[i]) / 2);
-
- TextDrawRotBack(win, draw, drawable, xx - 1, yy - 1 - ascent,
- wid + 2, ascent + descent + 2, ts);
- if (drawable != draw)
- EFreePixmap(drawable);
- yy += ts->xfont->ascent + ts->xfont->descent;
+ yy += hh;
}
}
- done:
+
StrlistFree(lines, num_lines);
}
===================================================================
RCS file: /cvs/e/e16/e/src/ttfont.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ttfont.c 21 May 2006 18:44:16 -0000 1.52
+++ ttfont.c 18 Oct 2006 18:19:14 -0000 1.53
@@ -26,10 +26,7 @@
#include "tclass.h"
#include <Imlib2.h>
-struct _efont
-{
- Imlib_Font *face;
-};
+#if FONT_TYPE_IFT
static void
EFonts_Init(void)
@@ -48,98 +45,137 @@
#endif
}
-#if 0 /* Unused - Remove? */
-void
-EFont_draw_string(Win win, Drawable draw, Efont * f, int x, int y,
- int r, int g, int b, const char *text)
+static EFont *
+Efont_load(const char *file, int size)
{
- EImage *im;
- int w, h, ascent, descent;
+ static char ttfont_path_set = 0;
+ char s[4096];
+ EFont *f;
- Efont_extents(f, text, &ascent, &descent, &w, NULL, NULL, NULL, NULL);
- h = ascent + descent;
+ if (!ttfont_path_set)
+ {
+ EFonts_Init();
+ ttfont_path_set = 1;
+ }
- im = EImageGrabDrawable(draw, None, x, y - ascent, w, h, 0);
- imlib_context_set_image(im);
- imlib_context_set_color(r, g, b, 255);
- imlib_context_set_font(f->face);
- imlib_text_draw(0, 0, text);
- EImageRenderOnDrawable(im, win, draw, x, y - ascent, w, h, 0);
- EImageFree(im);
+ Esnprintf(s, sizeof(s), "%s/%d", file, size);
+ f = imlib_load_font(s);
+
+ return f;
}
-#endif
-void
-EFont_draw_string(EImage * im, Efont * f, int x, int y,
+static void
+Efont_free(EFont * f)
+{
+ imlib_context_set_font(f);
+ imlib_free_font();
+}
+
+static void
+Efont_extents(EFont * f, const char *text, int len __UNUSED__,
+ int *width, int *height, int *ascent)
+{
+ int h, asc, dsc;
+
+ imlib_context_set_font(f);
+ imlib_get_text_advance(text, width, &h);
+ asc = imlib_get_font_ascent();
+ dsc = imlib_get_font_descent();
+ *height = asc + dsc;
+ *ascent = asc;
+}
+
+static void
+EFont_draw_string(EImage * im, EFont * f, int x, int y,
int r, int g, int b, const char *text)
{
imlib_context_set_image(im);
imlib_context_set_color(r, g, b, 255);
- imlib_context_set_font(f->face);
+ imlib_context_set_font(f);
imlib_text_draw(x, y - imlib_get_font_ascent(), text);
}
-void
-Efont_free(Efont * f)
-{
- if (!f)
- return;
+extern const FontOps FontOpsIft;
- imlib_context_set_font(f->face);
- imlib_free_font();
+/*
+ * Imlib2/FreeType
+ */
+extern const FontOps FontOpsIft;
+
+static int
+IftLoad(TextState * ts)
+{
+ char s[4096], *s2, *ss;
+
+ s2 = Estrdup(ts->fontname);
+ if (!s2)
+ return -1;
+ ss = strchr(s2, '/');
+ if (ss)
+ {
+ *ss++ = '\0';
+ Esnprintf(s, sizeof(s), "%s.ttf", s2);
+ ts->f.ift.font = Efont_load(s2, atoi(ss));
+ }
+ Efree(s2);
+
+ if (!ts->f.ift.font)
+ return -1;
- Efree(f);
+ ts->need_utf8 = 1;
+ ts->type = FONT_TYPE_IFT;
+ ts->ops = &FontOpsIft;
+ return 0;
}
-Efont *
-Efont_load(const char *file, int size)
+static void
+IftUnload(TextState * ts)
{
- static char ttfont_path_set = 0;
- char s[4096];
- Efont *f;
- Imlib_Font *ff;
+ Efont_free(ts->f.ift.font);
+}
- if (!ttfont_path_set)
- {
- EFonts_Init();
- ttfont_path_set = 1;
- }
+static void
+IftTextSize(TextState * ts, const char *text, int len,
+ int *width, int *height, int *ascent)
+{
+ Efont_extents(ts->f.ift.font, text, len, width, height, ascent);
+}
- Esnprintf(s, sizeof(s), "%s/%d", file, size);
- ff = imlib_load_font(s);
- if (ff == NULL)
- return NULL;
+static void
+IftTextDraw(TextState * ts, FontDrawContext * fdc, int x, int y,
+ const char *text, int len __UNUSED__)
+{
+ EFont_draw_string(fdc->im, ts->f.ift.font, x, y, fdc->r, fdc->g, fdc->b,
+ text);
+}
- f = Emalloc(sizeof(Efont));
- f->face = ff;
+static void
+IftFdcInit(TextState * ts __UNUSED__, FontDrawContext * fdc __UNUSED__,
+ Win win __UNUSED__)
+{
+}
- return f;
+static void
+IftFdcSetColor(TextState * ts __UNUSED__, FontDrawContext * fdc, XColor * xc)
+{
+ EGetColor(xc, &(fdc->r), &(fdc->g), &(fdc->b));
}
-void
-Efont_extents(Efont * f, const char *text, int *font_ascent_return,
- int *font_descent_return, int *width_return,
- int *max_ascent_return, int *max_descent_return,
- int *lbearing_return __UNUSED__, int *rbearing_return __UNUSED__)
-{
- int w, h;
-
- if (!f)
- return;
-
- imlib_context_set_font(f->face);
- imlib_get_text_advance(text, &w, &h);
- if (width_return)
- *width_return = w;
- if (font_ascent_return)
- *font_ascent_return = imlib_get_font_ascent();
- if (font_descent_return)
- *font_descent_return = imlib_get_font_descent();
- if (max_ascent_return)
- *max_ascent_return = imlib_get_maximum_font_ascent();
- if (max_descent_return)
- *max_descent_return = imlib_get_maximum_font_descent();
+#if 0 /* Well... */
+static void
+IftTextMangle(TextState * ts, char **ptext, int *pw, int textwidth_limit)
+{
+ ts = NULL;
+ ptext = NULL;
+ pw = NULL;
+ textwidth_limit = 0;
}
+#endif
+
+const FontOps FontOpsIft = {
+ IftLoad, IftUnload, IftTextSize, NULL, IftTextDraw,
+ IftFdcInit, IftFdcSetColor
+};
#if TEST_TTFONT
#include <time.h>
@@ -196,3 +232,5 @@
}
#endif
+
+#endif /* FONT_TYPE_IFT */
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
