ICU-5438 Convert Linux version of layout sample to use Freetype2, Cairo.
X-SVN-Rev: 20813
This commit is contained in:
Eric Mader
parent
76e2c08bee
commit
eeac26a68e
@ -1,6 +1,6 @@
|
||||
/*
|
||||
******************************************************************************
|
||||
* Copyright (C) 1998-2005, International Business Machines Corporation and *
|
||||
* Copyright (C) 1998-2006, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
******************************************************************************
|
||||
*/
|
||||
@ -25,11 +25,13 @@ FontMap::FontMap(const char *fileName, le_int16 pointSize, GUISupport *guiSuppor
|
||||
le_int32 defaultFont = -1, i, script;
|
||||
le_bool haveFonts = FALSE;
|
||||
|
||||
/**/
|
||||
for (i = 0; i < scriptCodeCount; i += 1) {
|
||||
fFontIndices[i] = -1;
|
||||
fFontNames[i] = NULL;
|
||||
fFontInstances[i] = NULL;
|
||||
}
|
||||
/**/
|
||||
|
||||
if (LE_FAILURE(status)) {
|
||||
return;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
*
|
||||
* Copyright (C) 1999-2005, International Business Machines
|
||||
* Copyright (C) 1999-2006, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*
|
||||
*******************************************************************************
|
||||
@ -13,7 +13,13 @@
|
||||
*/
|
||||
|
||||
#include <gnome.h>
|
||||
#include "freetype/freetype.h"
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
#include FT_GLYPH_H
|
||||
#include FT_RENDER_H
|
||||
#include FT_TRUETYPE_TABLES_H
|
||||
#include <cairo.h>
|
||||
#include <cairo-ft.h>
|
||||
|
||||
#include "layout/LETypes.h"
|
||||
#include "layout/LESwaps.h"
|
||||
@ -25,100 +31,55 @@
|
||||
GnomeSurface::GnomeSurface(GtkWidget *theWidget)
|
||||
: fWidget(theWidget)
|
||||
{
|
||||
// nothing else to do
|
||||
fCairo = gdk_cairo_create(fWidget->window);
|
||||
}
|
||||
|
||||
GnomeSurface::~GnomeSurface()
|
||||
{
|
||||
// nothing to do
|
||||
cairo_destroy(fCairo);
|
||||
}
|
||||
|
||||
void GnomeSurface::drawGlyphs(const LEFontInstance *font, const LEGlyphID *glyphs, le_int32 count,
|
||||
const float *positions, le_int32 x, le_int32 y, le_int32 /*width*/, le_int32 /*height*/)
|
||||
{
|
||||
GnomeFontInstance *gFont = (GnomeFontInstance *) font;
|
||||
TT_Instance instance = gFont->getFont();
|
||||
le_int32 *dx = LE_NEW_ARRAY(le_int32, count);
|
||||
le_int32 *dy = LE_NEW_ARRAY(le_int32, count);
|
||||
le_int32 xOffset, yOffset;
|
||||
TT_Raster_Map *raster;
|
||||
// TT_Error error;
|
||||
|
||||
for (le_int32 g = 0; g < count; g += 1) {
|
||||
dx[g] = (le_int32) (positions[g * 2 + 2] - positions[g * 2]);
|
||||
dy[g] = (le_int32) - positions[g * 2 + 1];
|
||||
}
|
||||
|
||||
raster = gFont->rasterizeGlyphs(glyphs, count, dx, dy, xOffset, yOffset);
|
||||
|
||||
if (raster->width > 0 && raster->rows > 0) {
|
||||
GdkBitmap *bitmap = gdk_bitmap_create_from_data(NULL, (const gchar *) raster->bitmap, raster->width, raster->rows);
|
||||
|
||||
gint bitsx = x + (gint) positions[0] + xOffset;
|
||||
gint bitsy = y - yOffset;
|
||||
|
||||
gdk_gc_set_clip_origin(fWidget->style->black_gc, bitsx, bitsy);
|
||||
gdk_gc_set_clip_mask(fWidget->style->black_gc, bitmap);
|
||||
|
||||
gdk_draw_rectangle(fWidget->window,
|
||||
fWidget->style->black_gc,
|
||||
TRUE,
|
||||
bitsx, bitsy,
|
||||
raster->width, raster->rows);
|
||||
|
||||
gdk_gc_set_clip_origin(fWidget->style->black_gc, 0, 0);
|
||||
gdk_gc_set_clip_mask(fWidget->style->black_gc, NULL);
|
||||
|
||||
gdk_bitmap_unref(bitmap);
|
||||
}
|
||||
|
||||
gFont->freeRaster(raster);
|
||||
LE_DELETE_ARRAY(dy);
|
||||
LE_DELETE_ARRAY(dx);
|
||||
gFont->rasterizeGlyphs(fCairo, glyphs, count, positions, x, y);
|
||||
}
|
||||
|
||||
GnomeFontInstance::GnomeFontInstance(TT_Engine engine, const TT_Text *fontPathName, le_int16 pointSize, LEErrorCode &status)
|
||||
GnomeFontInstance::GnomeFontInstance(FT_Library engine, const char *fontPathName, le_int16 pointSize, LEErrorCode &status)
|
||||
: FontTableCache(), fPointSize(pointSize), fUnitsPerEM(0), fAscent(0), fDescent(0), fLeading(0),
|
||||
fDeviceScaleX(1), fDeviceScaleY(1), fMapper(NULL)
|
||||
{
|
||||
TT_Error error;
|
||||
TT_Face_Properties faceProperties;
|
||||
FT_Error error;
|
||||
|
||||
fFace.z = NULL;
|
||||
fFace = NULL;
|
||||
fCairoFace = NULL;
|
||||
|
||||
error = TT_Open_Face(engine, fontPathName, &fFace);
|
||||
error = FT_New_Face(engine, fontPathName, 0, &fFace);
|
||||
|
||||
if (error != 0) {
|
||||
printf("OOPS! Got error code %d\n", error);
|
||||
status = LE_FONT_FILE_NOT_FOUND_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
error = TT_New_Instance(fFace, &fInstance);
|
||||
|
||||
if (error != 0) {
|
||||
status = LE_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
// FIXME: what about the display resolution?
|
||||
// TT_Set_Instance_Resolutions(fInstance, 72, 72);
|
||||
fDeviceScaleX = ((float) 96) / 72;
|
||||
fDeviceScaleY = ((float) 96) / 72;
|
||||
|
||||
TT_Set_Instance_CharSize(fInstance, pointSize << 6);
|
||||
error = FT_Set_Char_Size(fFace, 0, pointSize << 6, 92, 92);
|
||||
|
||||
fCairoFace = cairo_ft_font_face_create_for_ft_face(fFace, 0);
|
||||
|
||||
TT_Get_Face_Properties(fFace, &faceProperties);
|
||||
fUnitsPerEM = fFace->units_per_EM;
|
||||
|
||||
fUnitsPerEM = faceProperties.header->Units_Per_EM;
|
||||
|
||||
fAscent = (le_int32) (yUnitsToPoints(faceProperties.horizontal->Ascender) * fDeviceScaleY);
|
||||
fDescent = (le_int32) -(yUnitsToPoints(faceProperties.horizontal->Descender) * fDeviceScaleY);
|
||||
fLeading = (le_int32) (yUnitsToPoints(faceProperties.horizontal->Line_Gap) * fDeviceScaleY);
|
||||
fAscent = (le_int32) (yUnitsToPoints(fFace->ascender) * fDeviceScaleY);
|
||||
fDescent = (le_int32) -(yUnitsToPoints(fFace->descender) * fDeviceScaleY);
|
||||
fLeading = (le_int32) (yUnitsToPoints(fFace->height) * fDeviceScaleY) - fAscent - fDescent;
|
||||
|
||||
// printf("Face = %s, unitsPerEM = %d, ascent = %d, descent = %d\n", fontPathName, fUnitsPerEM, fAscent, fDescent);
|
||||
|
||||
error = TT_New_Glyph(fFace, &fGlyph);
|
||||
|
||||
if (error != 0) {
|
||||
status = LE_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
@ -129,8 +90,10 @@ GnomeFontInstance::GnomeFontInstance(TT_Engine engine, const TT_Text *fontPathNa
|
||||
|
||||
GnomeFontInstance::~GnomeFontInstance()
|
||||
{
|
||||
if (fFace.z != NULL) {
|
||||
TT_Close_Face(fFace);
|
||||
cairo_font_face_destroy(fCairoFace);
|
||||
|
||||
if (fFace != NULL) {
|
||||
FT_Done_Face(fFace);
|
||||
}
|
||||
}
|
||||
|
||||
@ -159,14 +122,14 @@ const void *GnomeFontInstance::getFontTable(LETag tableTag) const
|
||||
|
||||
const void *GnomeFontInstance::readFontTable(LETag tableTag) const
|
||||
{
|
||||
TT_Long len = 0;
|
||||
void *result = NULL;
|
||||
FT_ULong len = 0;
|
||||
FT_Byte *result = NULL;
|
||||
|
||||
TT_Get_Font_Data(fFace, tableTag, 0, NULL, &len);
|
||||
FT_Load_Sfnt_Table(fFace, tableTag, 0, NULL, &len);
|
||||
|
||||
if (len > 0) {
|
||||
result = LE_NEW_ARRAY(char, len);
|
||||
TT_Get_Font_Data(fFace, tableTag, 0, result, &len);
|
||||
result = LE_NEW_ARRAY(FT_Byte, len);
|
||||
FT_Load_Sfnt_Table(fFace, tableTag, 0, result, &len);
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -181,153 +144,61 @@ void GnomeFontInstance::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
|
||||
return;
|
||||
}
|
||||
|
||||
TT_Glyph_Metrics metrics;
|
||||
TT_Error error;
|
||||
FT_Error error;
|
||||
|
||||
error = TT_Load_Glyph(fInstance, fGlyph, glyph, TTLOAD_SCALE_GLYPH | TTLOAD_HINT_GLYPH);
|
||||
error = FT_Load_Glyph(fFace, glyph, FT_LOAD_DEFAULT);
|
||||
|
||||
if (error != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
TT_Get_Glyph_Metrics(fGlyph, &metrics);
|
||||
|
||||
advance.fX = metrics.advance >> 6;
|
||||
advance.fX = fFace->glyph->metrics.horiAdvance >> 6;
|
||||
return;
|
||||
}
|
||||
|
||||
le_bool GnomeFontInstance::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const
|
||||
{
|
||||
TT_Outline outline;
|
||||
TT_Error error;
|
||||
FT_Error error;
|
||||
|
||||
error = TT_Load_Glyph(fInstance, fGlyph, glyph, TTLOAD_SCALE_GLYPH | TTLOAD_HINT_GLYPH);
|
||||
error = FT_Load_Glyph(fFace, glyph, FT_LOAD_DEFAULT);
|
||||
|
||||
if (error != 0) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
error = TT_Get_Glyph_Outline(fGlyph, &outline);
|
||||
|
||||
if (error != 0 || pointNumber >= outline.n_points) {
|
||||
FT_OutlineGlyph oglyph = (FT_OutlineGlyph) fFace->glyph;
|
||||
|
||||
if (pointNumber >= oglyph->outline.n_points) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
point.fX = outline.points[pointNumber].x >> 6;
|
||||
point.fY = outline.points[pointNumber].y >> 6;
|
||||
point.fX = oglyph->outline.points[pointNumber].x >> 6;
|
||||
point.fY = oglyph->outline.points[pointNumber].y >> 6;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// This table was generated by a little Java program.
|
||||
const char bitReverse[256] = {
|
||||
0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
|
||||
0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
|
||||
0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
|
||||
0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
|
||||
0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
|
||||
0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
|
||||
0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
|
||||
0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
|
||||
0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
|
||||
0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
|
||||
0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
|
||||
0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
|
||||
0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
|
||||
0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
|
||||
0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
|
||||
0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
|
||||
};
|
||||
|
||||
// FIXME: this would be much faster if we cached the TT_Glyph objects based on the glyph ID...
|
||||
TT_Raster_Map *GnomeFontInstance::rasterizeGlyphs(const LEGlyphID *glyphs, le_int32 glyphCount,
|
||||
const le_int32 *dx, const le_int32 *dy, le_int32 &xOffset, le_int32 &yOffset) const
|
||||
void GnomeFontInstance::rasterizeGlyphs(cairo_t *cairo, const LEGlyphID *glyphs, le_int32 glyphCount, const float *positions,
|
||||
le_int32 x, le_int32 y) const
|
||||
{
|
||||
le_int32 i, xx = 0, yy = 0, zz;
|
||||
le_int32 minx = 0, maxx = 0, miny = 0, maxy = 0;
|
||||
TT_Raster_Map *raster = new TT_Raster_Map;
|
||||
TT_Glyph_Metrics metrics;
|
||||
TT_Error error;
|
||||
|
||||
for (i = 0; i < glyphCount; i += 1) {
|
||||
error = TT_Load_Glyph(fInstance, fGlyph, (TT_UShort) LE_GET_GLYPH(glyphs[i]), TTLOAD_SCALE_GLYPH | TTLOAD_HINT_GLYPH);
|
||||
if (error == 0) {
|
||||
TT_Get_Glyph_Metrics(fGlyph, &metrics);
|
||||
|
||||
zz = xx + metrics.bbox.xMin;
|
||||
if (minx > zz) {
|
||||
minx = zz;
|
||||
}
|
||||
|
||||
zz = xx + metrics.bbox.xMax;
|
||||
if (maxx < zz) {
|
||||
maxx = zz;
|
||||
}
|
||||
|
||||
yy = dy[i] * 64;
|
||||
zz = yy + metrics.bbox.yMin;
|
||||
if (miny > zz) {
|
||||
miny = zz;
|
||||
}
|
||||
|
||||
zz = yy + metrics.bbox.yMax;
|
||||
if (maxy < zz) {
|
||||
maxy = zz;
|
||||
}
|
||||
}
|
||||
|
||||
xx += (dx[i] * 64);
|
||||
}
|
||||
|
||||
|
||||
minx = (minx & -64) >> 6;
|
||||
miny = (miny & -64) >> 6;
|
||||
|
||||
maxx = ((maxx + 63) & -64) >> 6;
|
||||
maxy = ((maxy + 63) & -64) >> 6;
|
||||
|
||||
//printf("minx = %d, maxx = %d, miny = %d, maxy = %d\n", minx, maxx, miny, maxy);
|
||||
|
||||
unsigned char *bits;
|
||||
|
||||
raster->flow = TT_Flow_Down;
|
||||
raster->width = maxx - minx;
|
||||
raster->rows = maxy - miny;
|
||||
raster->cols = (raster->width + 7) / 8;
|
||||
raster->size = raster->cols * raster->rows;
|
||||
|
||||
raster->bitmap = bits = LE_NEW_ARRAY(unsigned char, raster->size);
|
||||
|
||||
for (i = 0; i < raster->size; i += 1) {
|
||||
bits[i] = 0;
|
||||
}
|
||||
|
||||
xx = (-minx) * 64; yy = (-miny) * 64;
|
||||
|
||||
for (i = 0; i < glyphCount; i += 1) {
|
||||
if (glyphs[i] < 0xFFFE) {
|
||||
error = TT_Load_Glyph(fInstance, fGlyph, (TT_UShort) LE_GET_GLYPH(glyphs[i]), TTLOAD_SCALE_GLYPH | TTLOAD_HINT_GLYPH);
|
||||
cairo_glyph_t *glyph_t = LE_NEW_ARRAY(cairo_glyph_t, glyphCount);
|
||||
le_int32 in, out;
|
||||
|
||||
for (in = 0, out = 0; in < glyphCount; in += 1) {
|
||||
TTGlyphID glyph = LE_GET_GLYPH(glyphs[in]);
|
||||
|
||||
if (error == 0) {
|
||||
TT_Get_Glyph_Bitmap(fGlyph, raster, xx, yy + (dy[i] * 64));
|
||||
}
|
||||
if (glyph < 0xFFFE) {
|
||||
glyph_t[out].index = glyph;
|
||||
glyph_t[out].x = x + positions[in*2];
|
||||
glyph_t[out].y = y + positions[in*2 + 1];
|
||||
|
||||
out += 1;
|
||||
}
|
||||
|
||||
xx += (dx[i] * 64);
|
||||
}
|
||||
|
||||
for (i = 0; i < raster->size; i += 1) {
|
||||
bits[i] = bitReverse[bits[i]];
|
||||
}
|
||||
|
||||
xOffset = minx;
|
||||
yOffset = maxy;
|
||||
|
||||
return raster;
|
||||
}
|
||||
|
||||
void GnomeFontInstance::freeRaster(TT_Raster_Map *raster)
|
||||
{
|
||||
LE_DELETE_ARRAY(raster->bitmap);
|
||||
delete raster;
|
||||
|
||||
cairo_set_font_face(cairo, fCairoFace);
|
||||
cairo_set_font_size(cairo, getXPixelsPerEm() * getScaleFactorX());
|
||||
cairo_show_glyphs(cairo, glyph_t, out);
|
||||
|
||||
LE_DELETE_ARRAY(glyph_t);
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
*
|
||||
* Copyright (C) 1999-2003, International Business Machines
|
||||
* Copyright (C) 1999-2006, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*
|
||||
*******************************************************************************
|
||||
@ -16,7 +16,10 @@
|
||||
#define __GNOMEFONTINSTANCE_H
|
||||
|
||||
#include <gnome.h>
|
||||
#include "freetype/freetype.h"
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
#include FT_GLYPH_H
|
||||
#include <cairo.h>
|
||||
|
||||
#include "layout/LETypes.h"
|
||||
#include "layout/LEFontInstance.h"
|
||||
@ -39,14 +42,16 @@ public:
|
||||
|
||||
private:
|
||||
GtkWidget *fWidget;
|
||||
cairo_t *fCairo;
|
||||
};
|
||||
|
||||
class GnomeFontInstance : public LEFontInstance, protected FontTableCache
|
||||
{
|
||||
protected:
|
||||
TT_Face fFace;
|
||||
TT_Instance fInstance;
|
||||
TT_Glyph fGlyph;
|
||||
FT_Face fFace;
|
||||
// FT_Glyph fGlyph;
|
||||
|
||||
cairo_font_face_t *fCairoFace;
|
||||
|
||||
le_int32 fPointSize;
|
||||
le_int32 fUnitsPerEM;
|
||||
@ -64,12 +69,10 @@ class GnomeFontInstance : public LEFontInstance, protected FontTableCache
|
||||
virtual LEErrorCode initMapper();
|
||||
|
||||
public:
|
||||
GnomeFontInstance(TT_Engine engine, const TT_Text *fontPathName, le_int16 pointSize, LEErrorCode &status);
|
||||
GnomeFontInstance(FT_Library engine, const char *fontPathName, le_int16 pointSize, LEErrorCode &status);
|
||||
|
||||
virtual ~GnomeFontInstance();
|
||||
|
||||
TT_Instance getFont() const;
|
||||
|
||||
virtual const void *getFontTable(LETag tableTag) const;
|
||||
|
||||
virtual le_int32 getUnitsPerEM() const;
|
||||
@ -94,10 +97,8 @@ class GnomeFontInstance : public LEFontInstance, protected FontTableCache
|
||||
|
||||
float getScaleFactorY() const;
|
||||
|
||||
TT_Raster_Map *rasterizeGlyphs(const LEGlyphID *glyphs, le_int32 glyphCount, const le_int32 *dx, const le_int32 *dy,
|
||||
le_int32 &xOffset, le_int32 &yOffset) const;
|
||||
|
||||
void freeRaster(TT_Raster_Map *raster);
|
||||
void rasterizeGlyphs(cairo_t *cairo, const LEGlyphID *glyphs, le_int32 glyphCount, const float *positions,
|
||||
le_int32 x, le_int32 y) const;
|
||||
};
|
||||
|
||||
inline GtkWidget *GnomeSurface::getWidget() const
|
||||
@ -110,10 +111,12 @@ inline void GnomeSurface::setWidget(GtkWidget *theWidget)
|
||||
fWidget = theWidget;
|
||||
}
|
||||
|
||||
inline TT_Instance GnomeFontInstance::getFont() const
|
||||
/*
|
||||
inline FT_Instance GnomeFontInstance::getFont() const
|
||||
{
|
||||
return fInstance;
|
||||
}
|
||||
*/
|
||||
|
||||
inline le_int32 GnomeFontInstance::getUnitsPerEM() const
|
||||
{
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
/*
|
||||
******************************************************************************
|
||||
* Copyright (C) 1998-2003, International Business Machines Corporation and *
|
||||
* Copyright (C) 1998-2006, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "freetype/freetype.h"
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#include "layout/LEFontInstance.h"
|
||||
#include "GnomeFontInstance.h"
|
||||
@ -16,7 +17,7 @@
|
||||
#include "FontMap.h"
|
||||
#include "GnomeFontMap.h"
|
||||
|
||||
GnomeFontMap::GnomeFontMap(TT_Engine engine, const char *fileName, le_int16 pointSize, GUISupport *guiSupport, LEErrorCode &status)
|
||||
GnomeFontMap::GnomeFontMap(FT_Library engine, const char *fileName, le_int16 pointSize, GUISupport *guiSupport, LEErrorCode &status)
|
||||
: FontMap(fileName, pointSize, guiSupport, status), fEngine(engine)
|
||||
{
|
||||
// nothing to do?
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
******************************************************************************
|
||||
* Copyright (C) 1998-2003, International Business Machines Corporation and *
|
||||
* Copyright (C) 1998-2006, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
******************************************************************************
|
||||
*/
|
||||
@ -8,7 +8,8 @@
|
||||
#ifndef __GNOMEFONTMAP_H
|
||||
#define __GNOMEFONTMAP_H
|
||||
|
||||
#include "freetype/freetype.h"
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#include "unicode/uscript.h"
|
||||
|
||||
@ -23,7 +24,7 @@
|
||||
class GnomeFontMap : public FontMap
|
||||
{
|
||||
public:
|
||||
GnomeFontMap(TT_Engine engine, const char *fileName, le_int16 pointSize, GUISupport *guiSupport, LEErrorCode &status);
|
||||
GnomeFontMap(FT_Library engine, const char *fileName, le_int16 pointSize, GUISupport *guiSupport, LEErrorCode &status);
|
||||
|
||||
virtual ~GnomeFontMap();
|
||||
|
||||
@ -31,7 +32,7 @@ class GnomeFontMap : public FontMap
|
||||
virtual const LEFontInstance *openFont(const char *fontName, le_int16 pointSize, LEErrorCode &status);
|
||||
|
||||
private:
|
||||
TT_Engine fEngine;
|
||||
FT_Library fEngine;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -22,13 +22,9 @@ CLEANFILES = *~ $(DEPS)
|
||||
## Target information
|
||||
TARGET = gnomelayout
|
||||
|
||||
CPPFLAGS += `gnome-config --cflags gnomeui` -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/layoutex -I$(top_srcdir)/layout -I$(top_srcdir) -g
|
||||
|
||||
# Change the following as needed to locate freetype.
|
||||
CPPFLAGS += -DLE_USE_CMEMORY -I/usr/include/freetype1
|
||||
|
||||
LIBS = $(LIBICULX) $(LIBICULE) $(LIBICUUC) $(LIBICUI18N) @LIBS@ @LIB_M@ `gnome-config --libs gnomeui` -lttf
|
||||
CPPFLAGS += -DLE_USE_CMEMORY `pkg-config --cflags libgnomeui-2.0 freetype2 cairo` -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/layoutex -I$(top_srcdir)/layout -I$(top_srcdir) -g
|
||||
|
||||
LIBS = $(LIBICULX) $(LIBICULE) $(LIBICUUC) $(LIBICUI18N) @LIBS@ @LIB_M@ `pkg-config --libs libgnomeui-2.0 freetype2 cairo`
|
||||
|
||||
OBJECTS=cmaps.o UnicodeReader.o GnomeGUISupport.o FontMap.o GnomeFontMap.o ScriptCompositeFontInstance.o GnomeFontInstance.o FontTableCache.o paragraph.o gnomelayout.o
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/*
|
||||
****************************************************************************** *
|
||||
*
|
||||
* Copyright (C) 1999-2005, International Business Machines
|
||||
* Copyright (C) 1999-2006, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*
|
||||
****************************************************************************** *
|
||||
@ -13,7 +13,8 @@
|
||||
*/
|
||||
|
||||
#include <gnome.h>
|
||||
#include "freetype/freetype.h"
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#include "unicode/ustring.h"
|
||||
#include "unicode/uscript.h"
|
||||
@ -36,7 +37,7 @@ struct Context
|
||||
Paragraph *paragraph;
|
||||
};
|
||||
|
||||
static TT_Engine engine;
|
||||
static FT_Library engine;
|
||||
static GnomeGUISupport *guiSupport;
|
||||
static GnomeFontMap *fontMap;
|
||||
static ScriptCompositeFontInstance *font;
|
||||
@ -49,6 +50,7 @@ void closeSample(GtkWidget *sample);
|
||||
void showabout(GtkWidget */*widget*/, gpointer /*data*/)
|
||||
{
|
||||
GtkWidget *aboutBox;
|
||||
const gchar *documentedBy[] = {NULL};
|
||||
const gchar *writtenBy[] = {
|
||||
"Eric Mader",
|
||||
NULL
|
||||
@ -56,9 +58,11 @@ void showabout(GtkWidget */*widget*/, gpointer /*data*/)
|
||||
|
||||
aboutBox = gnome_about_new("Gnome Layout Sample",
|
||||
"0.1",
|
||||
"Copyright (C) 1998-2002 By International Business Machines Corporation and others. All Rights Reserved.",
|
||||
writtenBy,
|
||||
"Copyright (C) 1998-2006 By International Business Machines Corporation and others. All Rights Reserved.",
|
||||
"A simple demo of the ICU LayoutEngine.",
|
||||
writtenBy,
|
||||
documentedBy,
|
||||
"",
|
||||
NULL);
|
||||
|
||||
gtk_widget_show(aboutBox);
|
||||
@ -71,7 +75,7 @@ void notimpl(GtkObject */*object*/, gpointer /*data*/)
|
||||
|
||||
gchar *prettyTitle(const gchar *path)
|
||||
{
|
||||
gchar *name = g_basename(path);
|
||||
const gchar *name = g_basename(path);
|
||||
gchar *title = g_strconcat("Gnome Layout Sample - ", name, NULL);
|
||||
|
||||
return title;
|
||||
@ -297,7 +301,7 @@ int main (int argc, char *argv[])
|
||||
LEErrorCode fontStatus = LE_NO_ERROR;
|
||||
GtkWidget *app;
|
||||
|
||||
TT_Init_FreeType(&engine);
|
||||
FT_Init_FreeType(&engine);
|
||||
|
||||
gnome_init("gnomelayout", "0.1", argc, argv);
|
||||
|
||||
@ -306,7 +310,7 @@ int main (int argc, char *argv[])
|
||||
font = new ScriptCompositeFontInstance(fontMap);
|
||||
|
||||
if (LE_FAILURE(fontStatus)) {
|
||||
TT_Done_FreeType(engine);
|
||||
FT_Done_FreeType(engine);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -327,7 +331,7 @@ int main (int argc, char *argv[])
|
||||
delete font;
|
||||
delete guiSupport;
|
||||
|
||||
TT_Done_FreeType(engine);
|
||||
FT_Done_FreeType(engine);
|
||||
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@ Paragraph::Paragraph(const LEUnicode chars[], int32_t charCount, const FontRuns
|
||||
fLineCount(0), fLinesMax(LINE_GROW), fLinesGrow(LINE_GROW), fLines(NULL), fChars(NULL),
|
||||
fLineHeight(-1), fAscent(-1), fWidth(-1), fHeight(-1), fParagraphLevel(UBIDI_DEFAULT_LTR)
|
||||
{
|
||||
static const LEUnicode separators[] = {CH_LF, CH_CR, CH_LSEP, CH_PSEP};
|
||||
static const LEUnicode separators[] = {CH_LF, CH_CR, CH_LSEP, CH_PSEP, 0x0000};
|
||||
|
||||
if (LE_FAILURE(status)) {
|
||||
return;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user