mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
.uppdev
git-svn-id: svn://ultimatepp.org/upp/trunk@6255 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
864ac7cfe2
commit
30eafbdca2
9 changed files with 401 additions and 20 deletions
|
|
@ -1,9 +1,10 @@
|
|||
uses
|
||||
CtrlLib;
|
||||
|
||||
file
|
||||
main.cpp,
|
||||
Divisors.lay;
|
||||
|
||||
mainconfig
|
||||
"" = "GUI MT";
|
||||
uses
|
||||
CtrlLib;
|
||||
|
||||
file
|
||||
main.cpp,
|
||||
Divisors.lay;
|
||||
|
||||
mainconfig
|
||||
"" = "GUI MT";
|
||||
|
||||
|
|
|
|||
4
uppdev/GuiMTtest/init
Normal file
4
uppdev/GuiMTtest/init
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
#ifndef _GuiMTtest_icpp_init_stub
|
||||
#define _GuiMTtest_icpp_init_stub
|
||||
#include "CtrlLib/init"
|
||||
#endif
|
||||
359
uppdev/SDL20/Ft.cpp
Normal file
359
uppdev/SDL20/Ft.cpp
Normal file
|
|
@ -0,0 +1,359 @@
|
|||
#include "SDL20.h"
|
||||
|
||||
#include "freetype/ft2build.h"
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#define LLOG(x) // LOG(x)
|
||||
#define LTIMING(x) // TIMING(x)
|
||||
|
||||
NAMESPACE_UPP
|
||||
|
||||
struct FtFontStyle {
|
||||
String path;
|
||||
const byte *data;
|
||||
int size;
|
||||
|
||||
operator bool() const { return path.GetCount() || data; }
|
||||
|
||||
FtFontStyle() { data = NULL; size = 0; }
|
||||
};
|
||||
|
||||
struct FtFontData : Moveable<FtFontData> {
|
||||
FtFontStyle style[4];
|
||||
};
|
||||
|
||||
static Vector<FtFontData>& sFontData()
|
||||
{
|
||||
return Single<Vector<FtFontData> >();
|
||||
}
|
||||
|
||||
void sSetFont(int index, const String& path, const byte *data, int size, dword style)
|
||||
{
|
||||
Vector<FtFontData>& fd = sFontData();
|
||||
FtFontStyle& f = fd.At(index).style[style & 3];
|
||||
f.path = path;
|
||||
f.data = data;
|
||||
f.size = size;
|
||||
if(!fd.At(index).style[0])
|
||||
sSetFont(index, path, data, size, 0);
|
||||
if(!fd.At(0).style[0])
|
||||
sSetFont(0, path, data, size, 0);
|
||||
}
|
||||
|
||||
void SetFileFont(int face, const char *path, dword style)
|
||||
{
|
||||
sSetFont(face, path, NULL, 0, style);
|
||||
}
|
||||
|
||||
void SetMemoryFont(int face, const byte *data, int size, dword style)
|
||||
{
|
||||
sSetFont(face, Null, data, size, style);
|
||||
}
|
||||
|
||||
void GetStdFontSys(String& name, int& height)
|
||||
{
|
||||
name = "xxxx";
|
||||
}
|
||||
|
||||
FtFontStyle GetFontStyle(Font font)
|
||||
{
|
||||
Vector<FtFontData>& fd = sFontData();
|
||||
int face = font.GetFace();
|
||||
if(face >= 0 && face < fd.GetCount()) {
|
||||
const FtFontData& d = fd[face];
|
||||
int ii = font.IsBold() + 2 * font.IsItalic();
|
||||
if(d.style[ii])
|
||||
return d.style[ii];
|
||||
if(d.style[0])
|
||||
return d.style[0];
|
||||
}
|
||||
return fd.At(0).style[0];
|
||||
}
|
||||
|
||||
String GetFontDataSys(Font font)
|
||||
{
|
||||
return LoadFile(font.Fi().path);
|
||||
}
|
||||
|
||||
static FT_Library sFTlib;
|
||||
|
||||
EXITBLOCK
|
||||
{
|
||||
if(sFTlib)
|
||||
FT_Done_FreeType(sFTlib);
|
||||
}
|
||||
|
||||
bool sInitFt(void)
|
||||
{
|
||||
if(sFTlib)
|
||||
return true;
|
||||
return FT_Init_FreeType(&sFTlib) == 0;
|
||||
}
|
||||
|
||||
FT_Face CreateFTFace(Font fnt)
|
||||
{
|
||||
sInitFt();
|
||||
|
||||
FtFontStyle f = GetFontStyle(fnt);
|
||||
|
||||
if(f)
|
||||
return NULL;
|
||||
|
||||
FT_Face face;
|
||||
if(IsNull(f.path) ? FT_New_Face(sFTlib, f.path, 0, &face)
|
||||
: FT_New_Memory_Face(sFTlib, f.data, f.size, 0, &face))
|
||||
return NULL;
|
||||
|
||||
FT_Set_Pixel_Sizes(face, 0, fnt.GetHeight());
|
||||
return face;
|
||||
}
|
||||
|
||||
#define FONTCACHE 37
|
||||
|
||||
struct FtFaceEntry {
|
||||
Font font;
|
||||
FT_Face face;
|
||||
};
|
||||
|
||||
static FtFaceEntry ft_cache[FONTCACHE];
|
||||
|
||||
void ClearFtFaceCache()
|
||||
{
|
||||
for(int i = 0; i < FONTCACHE; i++)
|
||||
ft_cache[i].font.Height(-30000);
|
||||
}
|
||||
|
||||
FT_Face FTFace(Font fnt)
|
||||
{
|
||||
LTIMING("FTFace");
|
||||
ONCELOCK {
|
||||
ClearFtFaceCache();
|
||||
}
|
||||
FtFaceEntry be;
|
||||
be = ft_cache[0];
|
||||
for(int i = 0; i < FONTCACHE; i++) {
|
||||
FtFaceEntry e = ft_cache[i];
|
||||
if(i)
|
||||
ft_cache[i] = be;
|
||||
if(e.font == fnt && e.face) {
|
||||
if(i)
|
||||
ft_cache[0] = e;
|
||||
return e.face;
|
||||
}
|
||||
be = e;
|
||||
}
|
||||
LTIMING("FTFace2");
|
||||
if(be.face) {
|
||||
LLOG("Removing " << be.font << " - " << (void *)be.face);
|
||||
FT_Done_Face(be.face);
|
||||
}
|
||||
be.font = fnt;
|
||||
be.face = CreateFTFace(be.font);
|
||||
ft_cache[0] = be;
|
||||
return be.face;
|
||||
}
|
||||
|
||||
CommonFontInfo GetFontInfoSys(Font font)
|
||||
{
|
||||
sInitFt();
|
||||
CommonFontInfo fi;
|
||||
FT_Face face = FTFace(font);
|
||||
if(face) {
|
||||
fi.ascent = face->size->metrics.ascender >> 6;
|
||||
fi.descent = -(face->size->metrics.descender >> 6);
|
||||
fi.height = fi.ascent + fi.descent;
|
||||
fi.lineheight = face->size->metrics.height >> 6;
|
||||
fi.external = 0;
|
||||
fi.internal = 0;
|
||||
fi.overhang = 0;
|
||||
fi.maxwidth = face->size->metrics.max_advance >> 6;
|
||||
fi.avewidth = fi.maxwidth;
|
||||
fi.default_char = '?';
|
||||
fi.fixedpitch = font.GetFaceInfo() & Font::FIXEDPITCH;
|
||||
fi.ttf = true;//strcmp(FT_Get_X11_Font_Format(face), "TrueType") == 0; // ????
|
||||
}
|
||||
else
|
||||
memset(&fi, 0, sizeof(fi));
|
||||
|
||||
return fi;
|
||||
}
|
||||
|
||||
#define FLOOR(x) ((x) & -64)
|
||||
#define CEIL(x) (((x)+63) & -64)
|
||||
#define TRUNC(x) ((x) >> 6)
|
||||
#define ROUND(x) (((x)+32) & -64)
|
||||
|
||||
GlyphInfo GetGlyphInfoSys(Font font, int chr)
|
||||
{
|
||||
LTIMING("GetGlyphInfoSys");
|
||||
GlyphInfo gi;
|
||||
FT_Face face = FTFace(font);
|
||||
gi.lspc = gi.rspc = 0;
|
||||
gi.width = (int16)0x8000;
|
||||
LLOG("GetGlyphInfoSys " << font << " " << (char)chr << " " << FormatIntHex(chr));
|
||||
if(face) {
|
||||
LTIMING("GetGlyphInfoSys 2");
|
||||
int glyph_index = FT_Get_Char_Index(face, chr);
|
||||
if(glyph_index) {
|
||||
if(FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT|FT_LOAD_NO_BITMAP) == 0 ||
|
||||
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT) == 0) {
|
||||
FT_Glyph_Metrics& m = face->glyph->metrics;
|
||||
int left = FLOOR(m.horiBearingX);
|
||||
int width = TRUNC(CEIL(m.horiBearingX + m.width) - left);
|
||||
gi.width = TRUNC(ROUND(face->glyph->advance.x));
|
||||
gi.lspc = TRUNC(left);
|
||||
gi.rspc = gi.width - width - gi.lspc;
|
||||
gi.glyphi = glyph_index;
|
||||
}
|
||||
}
|
||||
}
|
||||
return gi;
|
||||
}
|
||||
|
||||
Vector<FaceInfo> GetAllFacesSys()
|
||||
{
|
||||
static const char *basic_fonts[] = {
|
||||
"sans-serif",
|
||||
"serif",
|
||||
"sans-serif",
|
||||
"monospace",
|
||||
};
|
||||
|
||||
Vector<FaceInfo> list;
|
||||
for(int i = 0; i < __countof(basic_fonts); i++) {
|
||||
FaceInfo& fi = list.Add();
|
||||
fi.name = basic_fonts[i];
|
||||
fi.info = (i == 3) ? Font::SCALEABLE|Font::FIXEDPITCH : Font::SCALEABLE;
|
||||
}
|
||||
|
||||
const Vector<FtFontData>& fd = sFontData();
|
||||
for(int i = __countof(basic_fonts); i < fd.GetCount(); i++) {
|
||||
FaceInfo& fi = list.Add();
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
static inline double ft_dbl(int p)
|
||||
{
|
||||
return double(p) / 64.0;
|
||||
}
|
||||
|
||||
bool RenderOutline(const FT_Outline& outline, FontGlyphConsumer& path, double xx, double yy)
|
||||
{
|
||||
FT_Vector v_last;
|
||||
FT_Vector v_control;
|
||||
FT_Vector v_start;
|
||||
FT_Vector* point;
|
||||
FT_Vector* limit;
|
||||
char* tags;
|
||||
int n; // index of contour in outline
|
||||
char tag; // current point's state
|
||||
int first = 0; // index of first point in contour
|
||||
for(n = 0; n < outline.n_contours; n++) {
|
||||
int last = outline.contours[n];
|
||||
limit = outline.points + last;
|
||||
v_start = outline.points[first];
|
||||
v_last = outline.points[last];
|
||||
v_control = v_start;
|
||||
point = outline.points + first;
|
||||
tags = outline.tags + first;
|
||||
tag = FT_CURVE_TAG(tags[0]);
|
||||
if(tag == FT_CURVE_TAG_CUBIC) return false;
|
||||
if(tag == FT_CURVE_TAG_CONIC) {
|
||||
if(FT_CURVE_TAG(outline.tags[last]) == FT_CURVE_TAG_ON) {
|
||||
// start at last point if it is on the curve
|
||||
v_start = v_last;
|
||||
limit--;
|
||||
}
|
||||
else {
|
||||
// if both first and last points are conic,
|
||||
// start at their middle and record its position
|
||||
// for closure
|
||||
v_start.x = (v_start.x + v_last.x) / 2;
|
||||
v_start.y = (v_start.y + v_last.y) / 2;
|
||||
v_last = v_start;
|
||||
}
|
||||
point--;
|
||||
tags--;
|
||||
}
|
||||
path.Move(Pointf(ft_dbl(v_start.x) + xx, -ft_dbl(v_start.y) + yy));
|
||||
while(point < limit) {
|
||||
point++;
|
||||
tags++;
|
||||
|
||||
tag = FT_CURVE_TAG(tags[0]);
|
||||
switch(tag) {
|
||||
case FT_CURVE_TAG_ON:
|
||||
path.Line(Pointf(ft_dbl(point->x) + xx, -ft_dbl(point->y) + yy));
|
||||
continue;
|
||||
case FT_CURVE_TAG_CONIC:
|
||||
v_control.x = point->x;
|
||||
v_control.y = point->y;
|
||||
Do_Conic:
|
||||
if(point < limit) {
|
||||
FT_Vector vec;
|
||||
FT_Vector v_middle;
|
||||
point++;
|
||||
tags++;
|
||||
tag = FT_CURVE_TAG(tags[0]);
|
||||
vec.x = point->x;
|
||||
vec.y = point->y;
|
||||
if(tag == FT_CURVE_TAG_ON) {
|
||||
path.Quadratic(Pointf(ft_dbl(v_control.x) + xx, -ft_dbl(v_control.y) + yy),
|
||||
Pointf(ft_dbl(vec.x) + xx, -ft_dbl(vec.y) + yy));
|
||||
continue;
|
||||
}
|
||||
if(tag != FT_CURVE_TAG_CONIC) return false;
|
||||
v_middle.x = (v_control.x + vec.x) / 2;
|
||||
v_middle.y = (v_control.y + vec.y) / 2;
|
||||
path.Quadratic(Pointf(ft_dbl(v_control.x) + xx, -ft_dbl(v_control.y) + yy),
|
||||
Pointf(ft_dbl(v_middle.x) + xx, -ft_dbl(v_middle.y) + yy));
|
||||
v_control = vec;
|
||||
goto Do_Conic;
|
||||
}
|
||||
path.Quadratic(Pointf(ft_dbl(v_control.x) + xx, -ft_dbl(v_control.y) + yy),
|
||||
Pointf(ft_dbl(v_start.x) + xx, -ft_dbl(v_start.y) + yy));
|
||||
goto Close;
|
||||
|
||||
default:
|
||||
FT_Vector vec1, vec2;
|
||||
if(point + 1 > limit || FT_CURVE_TAG(tags[1]) != FT_CURVE_TAG_CUBIC)
|
||||
return false;
|
||||
vec1.x = point[0].x;
|
||||
vec1.y = point[0].y;
|
||||
vec2.x = point[1].x;
|
||||
vec2.y = point[1].y;
|
||||
point += 2;
|
||||
tags += 2;
|
||||
if(point <= limit) {
|
||||
FT_Vector vec;
|
||||
vec.x = point->x;
|
||||
vec.y = point->y;
|
||||
path.Cubic(Pointf(ft_dbl(vec1.x) + xx, -ft_dbl(vec1.y) + yy),
|
||||
Pointf(ft_dbl(vec2.x) + xx, -ft_dbl(vec2.y) + yy),
|
||||
Pointf(ft_dbl(vec.x) + xx, -ft_dbl(vec.y) + yy));
|
||||
continue;
|
||||
}
|
||||
path.Cubic(Pointf(ft_dbl(vec1.x) + xx, -ft_dbl(vec1.y) + yy),
|
||||
Pointf(ft_dbl(vec2.x) + xx, -ft_dbl(vec2.y) + yy),
|
||||
Pointf(ft_dbl(v_start.x) + xx, -ft_dbl(v_start.y) + yy));
|
||||
goto Close;
|
||||
}
|
||||
}
|
||||
Close:
|
||||
path.Close();
|
||||
first = last + 1;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void RenderCharacterSys(FontGlyphConsumer& sw, double x, double y, int ch, Font fnt)
|
||||
{
|
||||
FT_Face face = FTFace(fnt);
|
||||
int glyph_index = FT_Get_Char_Index(face, ch);
|
||||
if(glyph_index && FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT) == 0)
|
||||
RenderOutline(face->glyph->outline, sw, x, y + fnt.GetAscent());
|
||||
}
|
||||
|
||||
END_UPP_NAMESPACE
|
||||
|
|
@ -10,7 +10,11 @@
|
|||
#define IMAGEFILE <SDL20/test.iml>
|
||||
#include <Draw/iml_source.h>
|
||||
|
||||
int main(int argc, char** argv){
|
||||
|
||||
CONSOLE_APP_MAIN {
|
||||
SetFileFont(Font::SANSSERIF, "C:\\u\\exsrc\\droid\\DroidSans.ttf");
|
||||
// SetFileFont(Font::SANSSERIF, "C:\\u\\exsrc\\droid\\DroidSans-Bold.ttf", FtBOLD);
|
||||
|
||||
SDL_Init(SDL_INIT_EVERYTHING);
|
||||
|
||||
SDLWindow win;
|
||||
|
|
@ -34,17 +38,18 @@ int main(int argc, char** argv){
|
|||
Size sz = Size(1024, 768);
|
||||
w.Init(sz);
|
||||
|
||||
w.DrawText(i++, i, "Hello world!", Arial(40));
|
||||
// w.DrawText(i++, i, "Hello world!", Arial(40));
|
||||
|
||||
/*
|
||||
|
||||
// w.DrawImage(300, 300, TestImg::pinkie());
|
||||
|
||||
w.DrawRect(0, 0, 1024, 768, White());
|
||||
RichText txt = ParseQTF(LoadFile(GetDataFile("text.qtf")));
|
||||
if(1) {
|
||||
RTIMING("SystemDraw");
|
||||
txt.Paint(Zoom(2, 10), w, 0, 0, sz.cx);
|
||||
}
|
||||
*/
|
||||
|
||||
win.Present();
|
||||
|
||||
SDL_Event e;
|
||||
|
|
@ -63,5 +68,4 @@ int main(int argc, char** argv){
|
|||
}
|
||||
|
||||
SDL_Quit();
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,20 @@
|
|||
|
||||
#include <Painter/Painter.h>
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
#include <SDL.h>
|
||||
|
||||
using namespace Upp;
|
||||
|
||||
NAMESPACE_UPP
|
||||
|
||||
enum FtStyle {
|
||||
FtBOLD = 1,
|
||||
FtITALIC = 2
|
||||
};
|
||||
|
||||
void SetFileFont(int face, const char *path, dword style = 0);
|
||||
void SetMemoryFont(int face, const byte *data, int size, dword style = 0);
|
||||
|
||||
struct SDLWindow {
|
||||
SDL_Window *win;
|
||||
SDL_Renderer *ren;
|
||||
|
|
@ -25,7 +33,8 @@ struct SDLWindow {
|
|||
~SDLWindow();
|
||||
};
|
||||
|
||||
struct SystemDraw : SDraw {
|
||||
class SystemDraw : public SDraw {
|
||||
public:
|
||||
SDLWindow *win;
|
||||
|
||||
virtual void PutImage(Point p, const Image& m, const Rect& src);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@ uses
|
|||
Core,
|
||||
Draw,
|
||||
Painter,
|
||||
RichText;
|
||||
RichText,
|
||||
freetype,
|
||||
freetype;
|
||||
|
||||
library(WIN32) "SDLmain.lib SDL.lib";
|
||||
|
||||
|
|
@ -10,6 +12,7 @@ library(POSIX) "SDL2 SDL2main";
|
|||
|
||||
file
|
||||
SDL20.h,
|
||||
Ft.cpp,
|
||||
Window.cpp,
|
||||
SDLDraw.cpp,
|
||||
text.qtf,
|
||||
|
|
@ -17,5 +20,5 @@ file
|
|||
test.iml;
|
||||
|
||||
mainconfig
|
||||
"" = "SSE2 MT";
|
||||
"" = "SSE2 MT CFONTS";
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ ImageSysData::~ImageSysData()
|
|||
|
||||
struct ImageSysDataMaker : LRUCache<ImageSysData, int64>::Maker {
|
||||
Image img;
|
||||
int wserial;
|
||||
int64 wserial;
|
||||
SDL_Renderer *renderer;
|
||||
|
||||
virtual int64 Key() const { return img.GetSerialId(); } // TODO! add ren_serial
|
||||
|
|
|
|||
|
|
@ -4,4 +4,5 @@
|
|||
#include "Draw/init"
|
||||
#include "Painter/init"
|
||||
#include "RichText/init"
|
||||
#include "freetype/init"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ and characters&]
|
|||
[s0; &]
|
||||
[s0; [*@4 . , ; ! ? % ( ) / < > #]&]
|
||||
[s0; &]
|
||||
[s0; and bytes greater than 127 are guaranteed to be never used as
|
||||
[s0; and bytes [* greater] than 127 are guaranteed to be never used as
|
||||
command characters (not even in future versions of QTF). Other
|
||||
characters should be prefixed with escape character `` (reverse
|
||||
apostrophe). Group of characters can be escaped using byte 1.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue