mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-07 14:10:17 +00:00
Merge pull request #330 from a740g/font-cleanup
Tidy up font code Queued changes suggested in the comments in the next PR.
This commit is contained in:
commit
b5691c9db1
17 changed files with 177448 additions and 336831 deletions
6
Makefile
6
Makefile
|
@ -191,7 +191,7 @@ include $(PATH_INTERNAL_C)/parts/audio/extras/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/audio/build.mk
|
include $(PATH_INTERNAL_C)/parts/audio/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/core/build.mk
|
include $(PATH_INTERNAL_C)/parts/core/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/input/game_controller/build.mk
|
include $(PATH_INTERNAL_C)/parts/input/game_controller/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/video/font/ttf/build.mk
|
include $(PATH_INTERNAL_C)/parts/video/font/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/video/image/build.mk
|
include $(PATH_INTERNAL_C)/parts/video/image/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/gui/build.mk
|
include $(PATH_INTERNAL_C)/parts/gui/build.mk
|
||||||
include $(PATH_INTERNAL_C)/parts/network/http/build.mk
|
include $(PATH_INTERNAL_C)/parts/network/http/build.mk
|
||||||
|
@ -265,12 +265,12 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter y,$(DEP_FONT)),)
|
ifneq ($(filter y,$(DEP_FONT)),)
|
||||||
EXE_LIBS += $(QB_FONT_LIB)
|
EXE_LIBS += $(FREETYPE_OBJS) $(FONT_OBJS)
|
||||||
CXXFLAGS += -DDEPENDENCY_LOADFONT
|
|
||||||
QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME))
|
QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME))
|
||||||
|
|
||||||
LICENSE_IN_USE += freetype_ftl
|
LICENSE_IN_USE += freetype_ftl
|
||||||
else
|
else
|
||||||
|
EXE_LIBS += $(FONT_STUB_OBJS)
|
||||||
QBLIB_NAME := $(addsuffix 0,$(QBLIB_NAME))
|
QBLIB_NAME := $(addsuffix 0,$(QBLIB_NAME))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -16,19 +16,20 @@
|
||||||
# include <mach-o/dyld.h> //required for _NSGetExecutablePath
|
# include <mach-o/dyld.h> //required for _NSGetExecutablePath
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mutex.h"
|
|
||||||
#include "thread.h"
|
|
||||||
#include "completion.h"
|
|
||||||
#include "audio.h"
|
#include "audio.h"
|
||||||
#include "image.h"
|
#include "completion.h"
|
||||||
|
#include "compression.h"
|
||||||
|
#include "datetime.h"
|
||||||
|
#include "event.h"
|
||||||
|
#include "font.h"
|
||||||
|
#include "glut-thread.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "http.h"
|
#include "http.h"
|
||||||
|
#include "image.h"
|
||||||
#include "keyhandler.h"
|
#include "keyhandler.h"
|
||||||
#include "glut-thread.h"
|
#include "mutex.h"
|
||||||
#include "datetime.h"
|
|
||||||
#include "rounding.h"
|
#include "rounding.h"
|
||||||
#include "event.h"
|
#include "thread.h"
|
||||||
#include "compression.h"
|
|
||||||
|
|
||||||
int32 disableEvents = 0;
|
int32 disableEvents = 0;
|
||||||
|
|
||||||
|
@ -1064,7 +1065,7 @@ hardware_img_struct *get_hardware_img(int32 handle) {
|
||||||
}
|
}
|
||||||
int32 get_hardware_img_index(int32 handle) { return handle - HARDWARE_IMG_HANDLE_OFFSET; }
|
int32 get_hardware_img_index(int32 handle) { return handle - HARDWARE_IMG_HANDLE_OFFSET; }
|
||||||
|
|
||||||
static uint16 codepage437_to_unicode16[] = {
|
uint16_t codepage437_to_unicode16[] = {
|
||||||
0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, 0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C, 0x25BA, 0x25C4, 0x2195,
|
0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, 0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C, 0x25BA, 0x25C4, 0x2195,
|
||||||
0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8, 0x2191, 0x2193, 0x2192, 0x2190, 0x221F, 0x2194, 0x25B2, 0x25BC, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025,
|
0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8, 0x2191, 0x2193, 0x2192, 0x2190, 0x221F, 0x2194, 0x25B2, 0x25BC, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025,
|
||||||
0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
|
0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
|
||||||
|
@ -1080,12 +1081,6 @@ static uint16 codepage437_to_unicode16[] = {
|
||||||
0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7,
|
0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7,
|
||||||
0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x0020};
|
0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x0020};
|
||||||
|
|
||||||
#ifdef QB64_BACKSLASH_FILESYSTEM
|
|
||||||
# include "parts\\video\\font\\ttf\\src.c"
|
|
||||||
#else
|
|
||||||
# include "parts/video/font/ttf/src.c"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Restricted Functionality: (Security focused approach, does not include restricting sound etc)
|
/* Restricted Functionality: (Security focused approach, does not include restricting sound etc)
|
||||||
|
|
||||||
Block while compiling: (ONLY things that cannot be caught at runtime)
|
Block while compiling: (ONLY things that cannot be caught at runtime)
|
||||||
|
|
16
internal/c/libqb/include/font.h
Normal file
16
internal/c/libqb/include/font.h
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
//----------------------------------------------------------------------------------------------------------------------
|
||||||
|
// QB64-PE Font Library
|
||||||
|
// Powered by FreeType 2.4.12 (https://github.com/vinniefalco/FreeTypeAmalgam)
|
||||||
|
//----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
int32_t FontRenderTextUTF32(int32_t i, uint32_t *codepoint, int32_t codepoints, int32_t options, uint8_t **out_data, int32_t *out_x, int32_t *out_y,
|
||||||
|
int32_t *out_x_pre_increment, int32_t *out_x_post_increment);
|
||||||
|
int32_t FontLoad(uint8_t *content_original, int32_t content_bytes, int32_t default_pixel_height, int32_t which_font, int32_t options);
|
||||||
|
int32_t FontRenderTextASCII(int32_t i, uint8_t *codepoint, int32_t codepoints, int32_t options, uint8_t **out_data, int32_t *out_x, int32_t *out_y,
|
||||||
|
int32_t *out_x_pre_increment, int32_t *out_x_post_increment);
|
||||||
|
int32_t FontWidth(int32_t i);
|
||||||
|
void FontFree(int32_t i);
|
22
internal/c/parts/video/font/build.mk
Normal file
22
internal/c/parts/video/font/build.mk
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
FREETYPE_SRCS := \
|
||||||
|
freetypeamalgam.c
|
||||||
|
|
||||||
|
FONT_SRCS := \
|
||||||
|
font.cpp
|
||||||
|
|
||||||
|
FONT_STUB_SRCS := \
|
||||||
|
stub_font.cpp
|
||||||
|
|
||||||
|
FREETYPE_OBJS := $(patsubst %.c,$(PATH_INTERNAL_C)/parts/video/font/%.o,$(FREETYPE_SRCS))
|
||||||
|
|
||||||
|
FONT_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/video/font/%.o,$(FONT_SRCS))
|
||||||
|
|
||||||
|
FONT_STUB_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/video/font/%.o,$(FONT_STUB_SRCS))
|
||||||
|
|
||||||
|
$(PATH_INTERNAL_C)/parts/video/font/%.o: $(PATH_INTERNAL_C)/parts/video/font/%.c
|
||||||
|
$(CC) -O2 $(CFLAGS) -DDEPENDENCY_CONSOLE_ONLY -Wall $< -c -o $@
|
||||||
|
|
||||||
|
$(PATH_INTERNAL_C)/parts/video/font/%.o: $(PATH_INTERNAL_C)/parts/video/font/%.cpp
|
||||||
|
$(CXX) -O2 $(CXXFLAGS) -DDEPENDENCY_CONSOLE_ONLY -Wall $< -c -o $@
|
||||||
|
|
||||||
|
CLEAN_LIST += $(FREETYPE_OBJS) $(FONT_OBJS) $(FONT_STUB_OBJS)
|
|
@ -1,56 +1,47 @@
|
||||||
|
//----------------------------------------------------------------------------------------------------------------------
|
||||||
|
// QB64-PE Font Library
|
||||||
|
// Powered by FreeType 2.4.12 (https://github.com/vinniefalco/FreeTypeAmalgam)
|
||||||
|
//----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
//[ ]what if no glyph index could be found and it returns 0??
|
//[ ]what if no glyph index could be found and it returns 0??
|
||||||
//[ ]FT_Done_Face
|
//[ ]FT_Done_Face
|
||||||
//[ ]Check for memory leaks
|
//[ ]Check for memory leaks
|
||||||
|
|
||||||
#ifndef DEPENDENCY_LOADFONT
|
#include "font.h"
|
||||||
// Stubs
|
#include "freetypeamalgam.h"
|
||||||
int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 options, uint8 **out_data, int32 *out_x, int32 *out_y, int32 *out_x_pre_increment,
|
#include "rounding.h"
|
||||||
int32 *out_x_post_increment) {
|
|
||||||
return NULL;
|
extern uint16_t codepage437_to_unicode16[];
|
||||||
}
|
|
||||||
int32 FontLoad(uint8 *content_original, int32 content_bytes, int32 default_pixel_height, int32 which_font, int32 options) { return NULL; }
|
|
||||||
int32 FontRenderTextASCII(int32 i, uint8 *codepoint, int32 codepoints, int32 options, uint8 **out_data, int32 *out_x, int32 *out_y, int32 *out_x_pre_increment,
|
|
||||||
int32 *out_x_post_increment) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
int32 FontWidth(int32 i) { return NULL; }
|
|
||||||
void FontFree(int32 i) { return; }
|
|
||||||
#else
|
|
||||||
|
|
||||||
# ifdef QB64_BACKSLASH_FILESYSTEM
|
|
||||||
# include "src\\freetypeamalgam.h"
|
|
||||||
# else
|
|
||||||
# include "src/freetypeamalgam.h"
|
|
||||||
# endif
|
|
||||||
FT_Library ft_library;
|
FT_Library ft_library;
|
||||||
|
|
||||||
struct fonts_struct {
|
struct fonts_struct {
|
||||||
uint8 in_use;
|
uint8_t in_use;
|
||||||
uint8 *ttf_data;
|
uint8_t *ttf_data;
|
||||||
int32 default_pixel_height;
|
int32_t default_pixel_height;
|
||||||
uint8 bold;
|
uint8_t bold;
|
||||||
uint8 italic;
|
uint8_t italic;
|
||||||
uint8 underline;
|
uint8_t underline;
|
||||||
uint8 monospace;
|
uint8_t monospace;
|
||||||
int32 monospace_width;
|
int32_t monospace_width;
|
||||||
uint8 unicode;
|
uint8_t unicode;
|
||||||
//---------------------------------
|
//---------------------------------
|
||||||
FT_Face handle;
|
FT_Face handle;
|
||||||
int32 baseline;
|
int32_t baseline;
|
||||||
float default_pixel_height_scale;
|
float default_pixel_height_scale;
|
||||||
};
|
};
|
||||||
fonts_struct *fonts = (fonts_struct *)malloc(1);
|
fonts_struct *fonts = (fonts_struct *)malloc(1);
|
||||||
int32 fonts_last = 0;
|
int32_t fonts_last = 0;
|
||||||
|
|
||||||
struct fonts_render_struct {
|
struct fonts_render_struct {
|
||||||
uint8 *data;
|
uint8_t *data;
|
||||||
int32 w;
|
int32_t w;
|
||||||
int32 ox;
|
int32_t ox;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Master rendering routine (to be called by all other functions)
|
// Master rendering routine (to be called by all other functions)
|
||||||
int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 options, uint8 **out_data, int32 *out_x, int32 *out_y, int32 *out_x_pre_increment,
|
int32_t FontRenderTextUTF32(int32_t i, uint32_t *codepoint, int32_t codepoints, int32_t options, uint8_t **out_data, int32_t *out_x, int32_t *out_y,
|
||||||
int32 *out_x_post_increment) {
|
int32_t *out_x_pre_increment, int32_t *out_x_post_increment) {
|
||||||
// Notes:
|
// Notes:
|
||||||
// returns: success{1}/failure{0}
|
// returns: success{1}/failure{0}
|
||||||
// options: 1=black{0}&white{255}
|
// options: 1=black{0}&white{255}
|
||||||
|
@ -68,19 +59,19 @@ int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 op
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int32 monochrome;
|
static int32_t monochrome;
|
||||||
monochrome = options & 1;
|
monochrome = options & 1;
|
||||||
|
|
||||||
static int32 codepoint_w;
|
static int32_t codepoint_w;
|
||||||
static int32 codepoint_i, codepoint_ox;
|
static int32_t codepoint_i, codepoint_ox;
|
||||||
static uint32 codepoint_value;
|
static uint32_t codepoint_value;
|
||||||
static fonts_render_struct *render;
|
static fonts_render_struct *render;
|
||||||
static int32 value;
|
static int32_t value;
|
||||||
static uint8 *data1, *data2;
|
static uint8_t *data1, *data2;
|
||||||
static int w1, h1, ox, oy; // Note: Must be 'int' type
|
static int w1, h1, ox, oy; // Note: Must be 'int' type
|
||||||
static int32 w2, h2, ox2, oy2;
|
static int32_t w2, h2, ox2, oy2;
|
||||||
static int32 x1, y1;
|
static int32_t x1, y1;
|
||||||
static int32 x2, y2;
|
static int32_t x2, y2;
|
||||||
|
|
||||||
if (codepoints > 1) {
|
if (codepoints > 1) {
|
||||||
render = (fonts_render_struct *)malloc(sizeof(fonts_render_struct) * codepoints);
|
render = (fonts_render_struct *)malloc(sizeof(fonts_render_struct) * codepoints);
|
||||||
|
@ -91,7 +82,7 @@ int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 op
|
||||||
for (codepoint_i = 0; codepoint_i < codepoints; codepoint_i++) {
|
for (codepoint_i = 0; codepoint_i < codepoints; codepoint_i++) {
|
||||||
codepoint_value = codepoint[codepoint_i];
|
codepoint_value = codepoint[codepoint_i];
|
||||||
|
|
||||||
static int32 glyph_index;
|
static int32_t glyph_index;
|
||||||
glyph_index = FT_Get_Char_Index(fonts[i].handle, codepoint_value);
|
glyph_index = FT_Get_Char_Index(fonts[i].handle, codepoint_value);
|
||||||
if (!glyph_index) {
|
if (!glyph_index) {
|
||||||
// failed!
|
// failed!
|
||||||
|
@ -113,14 +104,14 @@ int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 op
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int32 pitch1;
|
static int32_t pitch1;
|
||||||
pitch1 = fonts[i].handle->glyph->bitmap.pitch;
|
pitch1 = fonts[i].handle->glyph->bitmap.pitch;
|
||||||
|
|
||||||
ox = fonts[i].handle->glyph->bitmap_left;
|
ox = fonts[i].handle->glyph->bitmap_left;
|
||||||
oy = 0;
|
oy = 0;
|
||||||
h1 = fonts[i].handle->glyph->bitmap.rows;
|
h1 = fonts[i].handle->glyph->bitmap.rows;
|
||||||
w1 = fonts[i].handle->glyph->bitmap.width;
|
w1 = fonts[i].handle->glyph->bitmap.width;
|
||||||
data1 = (uint8 *)fonts[i].handle->glyph->bitmap.buffer;
|
data1 = (uint8_t *)fonts[i].handle->glyph->bitmap.buffer;
|
||||||
|
|
||||||
h2 = fonts[i].default_pixel_height;
|
h2 = fonts[i].default_pixel_height;
|
||||||
|
|
||||||
|
@ -146,7 +137,7 @@ int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 op
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data2 = (uint8 *)calloc(w2 * h2, 1);
|
data2 = (uint8_t *)calloc(w2 * h2, 1);
|
||||||
|
|
||||||
oy2 = fonts[i].baseline - fonts[i].handle->glyph->bitmap_top;
|
oy2 = fonts[i].baseline - fonts[i].handle->glyph->bitmap_top;
|
||||||
|
|
||||||
|
@ -207,7 +198,7 @@ int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 op
|
||||||
// join&'blend' multiple codepoints
|
// join&'blend' multiple codepoints
|
||||||
w2 = codepoint_w;
|
w2 = codepoint_w;
|
||||||
h2 = fonts[i].default_pixel_height;
|
h2 = fonts[i].default_pixel_height;
|
||||||
data2 = (uint8 *)calloc(w2 * h2, 1);
|
data2 = (uint8_t *)calloc(w2 * h2, 1);
|
||||||
for (codepoint_i = 0; codepoint_i < codepoints; codepoint_i++) {
|
for (codepoint_i = 0; codepoint_i < codepoints; codepoint_i++) {
|
||||||
|
|
||||||
data1 = render[codepoint_i].data;
|
data1 = render[codepoint_i].data;
|
||||||
|
@ -239,9 +230,9 @@ int32 FontRenderTextUTF32(int32 i, uint32 *codepoint, int32 codepoints, int32 op
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32 FontLoad(uint8 *content_original, int32 content_bytes, int32 default_pixel_height, int32 which_font, int32 options) {
|
int32_t FontLoad(uint8_t *content_original, int32_t content_bytes, int32_t default_pixel_height, int32_t which_font, int32_t options) {
|
||||||
|
|
||||||
static int32 ft_init_called = 0;
|
static int32_t ft_init_called = 0;
|
||||||
if (!ft_init_called) {
|
if (!ft_init_called) {
|
||||||
ft_init_called = 1;
|
ft_init_called = 1;
|
||||||
if (FT_Init_FreeType(&ft_library))
|
if (FT_Init_FreeType(&ft_library))
|
||||||
|
@ -254,7 +245,7 @@ int32 FontLoad(uint8 *content_original, int32 content_bytes, int32 default_pixel
|
||||||
// options: 1=bold, 2=italic, 4=underline, 8=IGNORED, 16=monospace, 32=unicode
|
// options: 1=bold, 2=italic, 4=underline, 8=IGNORED, 16=monospace, 32=unicode
|
||||||
|
|
||||||
// get new index
|
// get new index
|
||||||
static int32 i;
|
static int32_t i;
|
||||||
for (i = 1; i <= fonts_last; i++) {
|
for (i = 1; i <= fonts_last; i++) {
|
||||||
if (!fonts[i].in_use) {
|
if (!fonts[i].in_use) {
|
||||||
goto got_index;
|
goto got_index;
|
||||||
|
@ -269,8 +260,8 @@ got_index:
|
||||||
memset(&fonts[i], 0, sizeof(fonts_struct));
|
memset(&fonts[i], 0, sizeof(fonts_struct));
|
||||||
|
|
||||||
// duplicate content
|
// duplicate content
|
||||||
static uint8 *content;
|
static uint8_t *content;
|
||||||
content = (uint8 *)malloc(content_bytes);
|
content = (uint8_t *)malloc(content_bytes);
|
||||||
memcpy(content, content_original, content_bytes);
|
memcpy(content, content_original, content_bytes);
|
||||||
fonts[i].ttf_data = content;
|
fonts[i].ttf_data = content;
|
||||||
|
|
||||||
|
@ -302,10 +293,10 @@ got_index:
|
||||||
|
|
||||||
if (options & 16) {
|
if (options & 16) {
|
||||||
// get the width of capital W
|
// get the width of capital W
|
||||||
static uint32 cp;
|
static uint32_t cp;
|
||||||
cp = 87;
|
cp = 87;
|
||||||
static uint8 *data1;
|
static uint8_t *data1;
|
||||||
int32 w1, h1, pre_x, post_x;
|
int32_t w1, h1, pre_x, post_x;
|
||||||
FontRenderTextUTF32(i, &cp, 1, 1, &data1, &w1, &h1, &pre_x, &post_x);
|
FontRenderTextUTF32(i, &cp, 1, 1, &data1, &w1, &h1, &pre_x, &post_x);
|
||||||
fonts[i].monospace_width = w1;
|
fonts[i].monospace_width = w1;
|
||||||
free(data1);
|
free(data1);
|
||||||
|
@ -318,19 +309,19 @@ got_index:
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FontFree(int32 i) {
|
void FontFree(int32_t i) {
|
||||||
FT_Done_Face(fonts[i].handle);
|
FT_Done_Face(fonts[i].handle);
|
||||||
free(fonts[i].ttf_data);
|
free(fonts[i].ttf_data);
|
||||||
fonts[i].in_use = 0;
|
fonts[i].in_use = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32 FontRenderTextASCII(int32 i, uint8 *codepoint, int32 codepoints, int32 options, uint8 **out_data, int32 *out_x, int32 *out_y, int32 *out_x_pre_increment,
|
int32_t FontRenderTextASCII(int32_t i, uint8_t *codepoint, int32_t codepoints, int32_t options, uint8_t **out_data, int32_t *out_x, int32_t *out_y,
|
||||||
int32 *out_x_post_increment) {
|
int32_t *out_x_pre_increment, int32_t *out_x_post_increment) {
|
||||||
static uint32 *utf32_codepoint;
|
static uint32_t *utf32_codepoint;
|
||||||
static int32 retval;
|
static int32_t retval;
|
||||||
if (codepoints >= 1) {
|
if (codepoints >= 1) {
|
||||||
utf32_codepoint = (uint32 *)malloc(codepoints * 4);
|
utf32_codepoint = (uint32_t *)malloc(codepoints * 4);
|
||||||
static int32 x;
|
static int32_t x;
|
||||||
for (x = 0; x < codepoints; x++) {
|
for (x = 0; x < codepoints; x++) {
|
||||||
utf32_codepoint[x] = codepage437_to_unicode16[codepoint[x]];
|
utf32_codepoint[x] = codepage437_to_unicode16[codepoint[x]];
|
||||||
}
|
}
|
||||||
|
@ -341,10 +332,8 @@ int32 FontRenderTextASCII(int32 i, uint8 *codepoint, int32 codepoints, int32 opt
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32 FontWidth(int32 i) {
|
int32_t FontWidth(int32_t i) {
|
||||||
if (fonts[i].monospace)
|
if (fonts[i].monospace)
|
||||||
return fonts[i].monospace_width;
|
return fonts[i].monospace_width;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
47
internal/c/parts/video/font/stub_font.cpp
Normal file
47
internal/c/parts/video/font/stub_font.cpp
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
// Font stubs
|
||||||
|
|
||||||
|
#include "font.h"
|
||||||
|
|
||||||
|
int32_t FontRenderTextUTF32(int32_t i, uint32_t *codepoint, int32_t codepoints, int32_t options, uint8_t **out_data, int32_t *out_x, int32_t *out_y,
|
||||||
|
int32_t *out_x_pre_increment, int32_t *out_x_post_increment) {
|
||||||
|
(void)i;
|
||||||
|
(void)codepoint;
|
||||||
|
(void)codepoints;
|
||||||
|
(void)options;
|
||||||
|
(void)out_data;
|
||||||
|
(void)out_x;
|
||||||
|
(void)out_y;
|
||||||
|
(void)out_x_pre_increment;
|
||||||
|
(void)out_x_post_increment;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t FontLoad(uint8_t *content_original, int32_t content_bytes, int32_t default_pixel_height, int32_t which_font, int32_t options) {
|
||||||
|
(void)content_original;
|
||||||
|
(void)content_bytes;
|
||||||
|
(void)default_pixel_height;
|
||||||
|
(void)which_font;
|
||||||
|
(void)options;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t FontRenderTextASCII(int32_t i, uint8_t *codepoint, int32_t codepoints, int32_t options, uint8_t **out_data, int32_t *out_x, int32_t *out_y,
|
||||||
|
int32_t *out_x_pre_increment, int32_t *out_x_post_increment) {
|
||||||
|
(void)i;
|
||||||
|
(void)codepoint;
|
||||||
|
(void)codepoints;
|
||||||
|
(void)options;
|
||||||
|
(void)out_data;
|
||||||
|
(void)out_x;
|
||||||
|
(void)out_y;
|
||||||
|
(void)out_x_pre_increment;
|
||||||
|
(void)out_x_post_increment;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t FontWidth(int32_t i) {
|
||||||
|
(void)i;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FontFree(int32_t i) { (void)i; }
|
|
@ -1,13 +0,0 @@
|
||||||
|
|
||||||
QB_FONT_OBJS := $(PATH_INTERNAL_C)/parts/video/font/ttf/src/freetypeamalgam.o
|
|
||||||
|
|
||||||
QB_FONT_LIB := $(PATH_INTERNAL_C)/parts/video/font/ttf/src.a
|
|
||||||
|
|
||||||
$(PATH_INTERNAL_C)/parts/video/font/ttf/src/%.o: $(PATH_INTERNAL_C)/parts/video/font/ttf/src/%.c
|
|
||||||
$(CC) -Wall $< -c -o $@
|
|
||||||
|
|
||||||
$(QB_FONT_LIB): $(QB_FONT_OBJS)
|
|
||||||
$(AR) rcs $@ $(QB_FONT_OBJS)
|
|
||||||
|
|
||||||
CLEAN_LIST += $(QB_FONT_OBJS) $(QB_FONT_LIB)
|
|
||||||
|
|
|
@ -1,169 +0,0 @@
|
||||||
The FreeType Project LICENSE
|
|
||||||
----------------------------
|
|
||||||
|
|
||||||
2006-Jan-27
|
|
||||||
|
|
||||||
Copyright 1996-2002, 2006 by
|
|
||||||
David Turner, Robert Wilhelm, and Werner Lemberg
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Introduction
|
|
||||||
============
|
|
||||||
|
|
||||||
The FreeType Project is distributed in several archive packages;
|
|
||||||
some of them may contain, in addition to the FreeType font engine,
|
|
||||||
various tools and contributions which rely on, or relate to, the
|
|
||||||
FreeType Project.
|
|
||||||
|
|
||||||
This license applies to all files found in such packages, and
|
|
||||||
which do not fall under their own explicit license. The license
|
|
||||||
affects thus the FreeType font engine, the test programs,
|
|
||||||
documentation and makefiles, at the very least.
|
|
||||||
|
|
||||||
This license was inspired by the BSD, Artistic, and IJG
|
|
||||||
(Independent JPEG Group) licenses, which all encourage inclusion
|
|
||||||
and use of free software in commercial and freeware products
|
|
||||||
alike. As a consequence, its main points are that:
|
|
||||||
|
|
||||||
o We don't promise that this software works. However, we will be
|
|
||||||
interested in any kind of bug reports. (`as is' distribution)
|
|
||||||
|
|
||||||
o You can use this software for whatever you want, in parts or
|
|
||||||
full form, without having to pay us. (`royalty-free' usage)
|
|
||||||
|
|
||||||
o You may not pretend that you wrote this software. If you use
|
|
||||||
it, or only parts of it, in a program, you must acknowledge
|
|
||||||
somewhere in your documentation that you have used the
|
|
||||||
FreeType code. (`credits')
|
|
||||||
|
|
||||||
We specifically permit and encourage the inclusion of this
|
|
||||||
software, with or without modifications, in commercial products.
|
|
||||||
We disclaim all warranties covering The FreeType Project and
|
|
||||||
assume no liability related to The FreeType Project.
|
|
||||||
|
|
||||||
|
|
||||||
Finally, many people asked us for a preferred form for a
|
|
||||||
credit/disclaimer to use in compliance with this license. We thus
|
|
||||||
encourage you to use the following text:
|
|
||||||
|
|
||||||
"""
|
|
||||||
Portions of this software are copyright © <year> The FreeType
|
|
||||||
Project (www.freetype.org). All rights reserved.
|
|
||||||
"""
|
|
||||||
|
|
||||||
Please replace <year> with the value from the FreeType version you
|
|
||||||
actually use.
|
|
||||||
|
|
||||||
|
|
||||||
Legal Terms
|
|
||||||
===========
|
|
||||||
|
|
||||||
0. Definitions
|
|
||||||
--------------
|
|
||||||
|
|
||||||
Throughout this license, the terms `package', `FreeType Project',
|
|
||||||
and `FreeType archive' refer to the set of files originally
|
|
||||||
distributed by the authors (David Turner, Robert Wilhelm, and
|
|
||||||
Werner Lemberg) as the `FreeType Project', be they named as alpha,
|
|
||||||
beta or final release.
|
|
||||||
|
|
||||||
`You' refers to the licensee, or person using the project, where
|
|
||||||
`using' is a generic term including compiling the project's source
|
|
||||||
code as well as linking it to form a `program' or `executable'.
|
|
||||||
This program is referred to as `a program using the FreeType
|
|
||||||
engine'.
|
|
||||||
|
|
||||||
This license applies to all files distributed in the original
|
|
||||||
FreeType Project, including all source code, binaries and
|
|
||||||
documentation, unless otherwise stated in the file in its
|
|
||||||
original, unmodified form as distributed in the original archive.
|
|
||||||
If you are unsure whether or not a particular file is covered by
|
|
||||||
this license, you must contact us to verify this.
|
|
||||||
|
|
||||||
The FreeType Project is copyright (C) 1996-2000 by David Turner,
|
|
||||||
Robert Wilhelm, and Werner Lemberg. All rights reserved except as
|
|
||||||
specified below.
|
|
||||||
|
|
||||||
1. No Warranty
|
|
||||||
--------------
|
|
||||||
|
|
||||||
THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
|
|
||||||
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO
|
|
||||||
USE, OF THE FREETYPE PROJECT.
|
|
||||||
|
|
||||||
2. Redistribution
|
|
||||||
-----------------
|
|
||||||
|
|
||||||
This license grants a worldwide, royalty-free, perpetual and
|
|
||||||
irrevocable right and license to use, execute, perform, compile,
|
|
||||||
display, copy, create derivative works of, distribute and
|
|
||||||
sublicense the FreeType Project (in both source and object code
|
|
||||||
forms) and derivative works thereof for any purpose; and to
|
|
||||||
authorize others to exercise some or all of the rights granted
|
|
||||||
herein, subject to the following conditions:
|
|
||||||
|
|
||||||
o Redistribution of source code must retain this license file
|
|
||||||
(`FTL.TXT') unaltered; any additions, deletions or changes to
|
|
||||||
the original files must be clearly indicated in accompanying
|
|
||||||
documentation. The copyright notices of the unaltered,
|
|
||||||
original files must be preserved in all copies of source
|
|
||||||
files.
|
|
||||||
|
|
||||||
o Redistribution in binary form must provide a disclaimer that
|
|
||||||
states that the software is based in part of the work of the
|
|
||||||
FreeType Team, in the distribution documentation. We also
|
|
||||||
encourage you to put an URL to the FreeType web page in your
|
|
||||||
documentation, though this isn't mandatory.
|
|
||||||
|
|
||||||
These conditions apply to any software derived from or based on
|
|
||||||
the FreeType Project, not just the unmodified files. If you use
|
|
||||||
our work, you must acknowledge us. However, no fee need be paid
|
|
||||||
to us.
|
|
||||||
|
|
||||||
3. Advertising
|
|
||||||
--------------
|
|
||||||
|
|
||||||
Neither the FreeType authors and contributors nor you shall use
|
|
||||||
the name of the other for commercial, advertising, or promotional
|
|
||||||
purposes without specific prior written permission.
|
|
||||||
|
|
||||||
We suggest, but do not require, that you use one or more of the
|
|
||||||
following phrases to refer to this software in your documentation
|
|
||||||
or advertising materials: `FreeType Project', `FreeType Engine',
|
|
||||||
`FreeType library', or `FreeType Distribution'.
|
|
||||||
|
|
||||||
As you have not signed this license, you are not required to
|
|
||||||
accept it. However, as the FreeType Project is copyrighted
|
|
||||||
material, only this license, or another one contracted with the
|
|
||||||
authors, grants you the right to use, distribute, and modify it.
|
|
||||||
Therefore, by using, distributing, or modifying the FreeType
|
|
||||||
Project, you indicate that you understand and accept all the terms
|
|
||||||
of this license.
|
|
||||||
|
|
||||||
4. Contacts
|
|
||||||
-----------
|
|
||||||
|
|
||||||
There are two mailing lists related to FreeType:
|
|
||||||
|
|
||||||
o freetype@nongnu.org
|
|
||||||
|
|
||||||
Discusses general use and applications of FreeType, as well as
|
|
||||||
future and wanted additions to the library and distribution.
|
|
||||||
If you are looking for support, start in this list if you
|
|
||||||
haven't found anything to help you in the documentation.
|
|
||||||
|
|
||||||
o freetype-devel@nongnu.org
|
|
||||||
|
|
||||||
Discusses bugs, as well as engine internals, design issues,
|
|
||||||
specific licenses, porting, etc.
|
|
||||||
|
|
||||||
Our home page can be found at
|
|
||||||
|
|
||||||
http://www.freetype.org
|
|
||||||
|
|
||||||
|
|
||||||
--- end of FTL.TXT ---
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,340 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
||||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
|
||||||
License is intended to guarantee your freedom to share and change free
|
|
||||||
software--to make sure the software is free for all its users. This
|
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
this service if you wish), that you receive source code or can get it
|
|
||||||
if you want it, that you can change the software or use pieces of it
|
|
||||||
in new free programs; and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
|
||||||
These restrictions translate to certain responsibilities for you if you
|
|
||||||
distribute copies of the software, or if you modify it.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
|
||||||
you have. You must make sure that they, too, receive or can get the
|
|
||||||
source code. And you must show them these terms so they know their
|
|
||||||
rights.
|
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
|
||||||
distribute and/or modify the software.
|
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
|
||||||
that everyone understands that there is no warranty for this free
|
|
||||||
software. If the software is modified by someone else and passed on, we
|
|
||||||
want its recipients to know that what they have is not the original, so
|
|
||||||
that any problems introduced by others will not reflect on the original
|
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
|
||||||
program will individually obtain patent licenses, in effect making the
|
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
|
||||||
covered by this License; they are outside its scope. The act of
|
|
||||||
running the Program is not restricted, and the output from the Program
|
|
||||||
is covered only if its contents constitute a work based on the
|
|
||||||
Program (independent of having been made by running the Program).
|
|
||||||
Whether that is true depends on what the Program does.
|
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
|
||||||
source code as you receive it, in any medium, provided that you
|
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
|
||||||
notices that refer to this License and to the absence of any warranty;
|
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
|
||||||
of it, thus forming a work based on the Program, and copy and
|
|
||||||
distribute such modifications or work under the terms of Section 1
|
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
|
||||||
stating that you changed the files and the date of any change.
|
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
|
||||||
whole or in part contains or is derived from the Program or any
|
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
|
||||||
parties under the terms of this License.
|
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
|
||||||
when run, you must cause it, when started running for such
|
|
||||||
interactive use in the most ordinary way, to print or display an
|
|
||||||
announcement including an appropriate copyright notice and a
|
|
||||||
notice that there is no warranty (or else, saying that you provide
|
|
||||||
a warranty) and that users may redistribute the program under
|
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
|
||||||
identifiable sections of that work are not derived from the Program,
|
|
||||||
and can be reasonably considered independent and separate works in
|
|
||||||
themselves, then this License, and its terms, do not apply to those
|
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
|
||||||
exercise the right to control the distribution of derivative or
|
|
||||||
collective works based on the Program.
|
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
|
||||||
a storage or distribution medium does not bring the other work under
|
|
||||||
the scope of this License.
|
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
|
||||||
under Section 2) in object code or executable form under the terms of
|
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
|
||||||
source code, which must be distributed under the terms of Sections
|
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
|
||||||
years, to give any third party, for a charge no more than your
|
|
||||||
cost of physically performing source distribution, a complete
|
|
||||||
machine-readable copy of the corresponding source code, to be
|
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
|
||||||
to distribute corresponding source code. (This alternative is
|
|
||||||
allowed only for noncommercial distribution and only if you
|
|
||||||
received the program in object code or executable form with such
|
|
||||||
an offer, in accord with Subsection b above.)
|
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
|
||||||
making modifications to it. For an executable work, complete source
|
|
||||||
code means all the source code for all modules it contains, plus any
|
|
||||||
associated interface definition files, plus the scripts used to
|
|
||||||
control compilation and installation of the executable. However, as a
|
|
||||||
special exception, the source code distributed need not include
|
|
||||||
anything that is normally distributed (in either source or binary
|
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
|
||||||
operating system on which the executable runs, unless that component
|
|
||||||
itself accompanies the executable.
|
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
|
||||||
access to copy from a designated place, then offering equivalent
|
|
||||||
access to copy the source code from the same place counts as
|
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
|
||||||
except as expressly provided under this License. Any attempt
|
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
|
||||||
void, and will automatically terminate your rights under this License.
|
|
||||||
However, parties who have received copies, or rights, from you under
|
|
||||||
this License will not have their licenses terminated so long as such
|
|
||||||
parties remain in full compliance.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
|
||||||
signed it. However, nothing else grants you permission to modify or
|
|
||||||
distribute the Program or its derivative works. These actions are
|
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
|
||||||
Program), the recipient automatically receives a license from the
|
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
|
||||||
these terms and conditions. You may not impose any further
|
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
|
||||||
You are not responsible for enforcing compliance by third parties to
|
|
||||||
this License.
|
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
|
||||||
infringement or for any other reason (not limited to patent issues),
|
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot
|
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you
|
|
||||||
may not distribute the Program at all. For example, if a patent
|
|
||||||
license would not permit royalty-free redistribution of the Program by
|
|
||||||
all those who receive copies directly or indirectly through you, then
|
|
||||||
the only way you could satisfy both it and this License would be to
|
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
|
||||||
any particular circumstance, the balance of the section is intended to
|
|
||||||
apply and the section as a whole is intended to apply in other
|
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
|
||||||
patents or other property right claims or to contest validity of any
|
|
||||||
such claims; this section has the sole purpose of protecting the
|
|
||||||
integrity of the free software distribution system, which is
|
|
||||||
implemented by public license practices. Many people have made
|
|
||||||
generous contributions to the wide range of software distributed
|
|
||||||
through that system in reliance on consistent application of that
|
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
|
||||||
be a consequence of the rest of this License.
|
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
|
||||||
original copyright holder who places the Program under this License
|
|
||||||
may add an explicit geographical distribution limitation excluding
|
|
||||||
those countries, so that distribution is permitted only in or among
|
|
||||||
countries not thus excluded. In such case, this License incorporates
|
|
||||||
the limitation as if written in the body of this License.
|
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies a version number of this License which applies to it and "any
|
|
||||||
later version", you have the option of following the terms and conditions
|
|
||||||
either of that version or of any later version published by the Free
|
|
||||||
Software Foundation. If the Program does not specify a version number of
|
|
||||||
this License, you may choose any version ever published by the Free Software
|
|
||||||
Foundation.
|
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
|
||||||
programs whose distribution conditions are different, write to the author
|
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
|
||||||
of preserving the free status of all derivatives of our free software and
|
|
||||||
of promoting the sharing and reuse of software generally.
|
|
||||||
|
|
||||||
NO WARRANTY
|
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
|
||||||
REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
convey the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) year name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. Here is a sample; alter the names:
|
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
|
||||||
Ty Coon, President of Vice
|
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Library General
|
|
||||||
Public License instead of this License.
|
|
|
@ -1,34 +0,0 @@
|
||||||
|
|
||||||
The FreeType 2 font engine is copyrighted work and cannot be used
|
|
||||||
legally without a software license. In order to make this project
|
|
||||||
usable to a vast majority of developers, we distribute it under two
|
|
||||||
mutually exclusive open-source licenses.
|
|
||||||
|
|
||||||
This means that *you* must choose *one* of the two licenses described
|
|
||||||
below, then obey all its terms and conditions when using FreeType 2 in
|
|
||||||
any of your projects or products.
|
|
||||||
|
|
||||||
- The FreeType License, found in the file `FTL.TXT', which is similar
|
|
||||||
to the original BSD license *with* an advertising clause that forces
|
|
||||||
you to explicitly cite the FreeType project in your product's
|
|
||||||
documentation. All details are in the license file. This license
|
|
||||||
is suited to products which don't use the GNU General Public
|
|
||||||
License.
|
|
||||||
|
|
||||||
Note that this license is compatible to the GNU General Public
|
|
||||||
License version 3, but not version 2.
|
|
||||||
|
|
||||||
- The GNU General Public License version 2, found in `GPLv2.TXT' (any
|
|
||||||
later version can be used also), for programs which already use the
|
|
||||||
GPL. Note that the FTL is incompatible with GPLv2 due to its
|
|
||||||
advertisement clause.
|
|
||||||
|
|
||||||
The contributed BDF and PCF drivers come with a license similar to that
|
|
||||||
of the X Window System. It is compatible to the above two licenses (see
|
|
||||||
file src/bdf/README and src/pcf/README).
|
|
||||||
|
|
||||||
The gzip module uses the zlib license (see src/gzip/zlib.h) which too is
|
|
||||||
compatible to the above two licenses.
|
|
||||||
|
|
||||||
|
|
||||||
--- end of LICENSE.TXT ---
|
|
|
@ -1,36 +0,0 @@
|
||||||
# FreeType Amalgamation
|
|
||||||
|
|
||||||
A distribution of the [FreeType][1] library in amalgamated source code form.
|
|
||||||
|
|
||||||
## What's an amalgamation?
|
|
||||||
|
|
||||||
An amalgamation is simply a collection of header and source files that have been
|
|
||||||
concatenated together to form one or more very large files. In this form, they
|
|
||||||
are easy to add to your existing project as source files (rather than linking
|
|
||||||
as a library). They are also easier to redistribute if you are making an open
|
|
||||||
source application and don't want to have any external dependencies.
|
|
||||||
|
|
||||||
## What is FreeType?
|
|
||||||
|
|
||||||
FreeType 2 is a software font engine that is designed to be small,
|
|
||||||
efficient, highly customizable, and portable while capable of producing
|
|
||||||
high-quality output (glyph images). It can be used in graphics libraries,
|
|
||||||
display servers, font conversion tools, text image generation tools, and
|
|
||||||
many other products as well.
|
|
||||||
|
|
||||||
## How do I use this?
|
|
||||||
|
|
||||||
Add FreeTypeAmalgam.c to your existing project, include FreeTypeAmalgam.h
|
|
||||||
in the source files where you want to use FreeType, and that's it!
|
|
||||||
|
|
||||||
The [FreeType Amalgmation][4] was built using the [Amalgamate Templates][3].
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
Copyright 2003-2007, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.<br>
|
|
||||||
FreeType is distributed under a dual license, see the file LICENSE.txt for details.
|
|
||||||
|
|
||||||
[1]: http://www.freetype.org "The FreeType Library"
|
|
||||||
[2]: http://rawmaterialsoftware.com/jucelicense.php "JUCE Commercial Licensing"
|
|
||||||
[3]: https://github.com/vinniefalco/Amalgams/ "Amalgamate Templates"
|
|
||||||
[4]: https://github.com/vinniefalco/FreeTypeAmalgam/ "FreeType Amalgamation"
|
|
|
@ -1,3 +0,0 @@
|
||||||
-https://github.com/vinniefalco/FreeTypeAmalgam
|
|
||||||
-makelib:
|
|
||||||
.\bin\g -s -c -w -Wall parts\video\font\ttf\src\FreeTypeAmalgam.c -o parts\video\font\ttf\src.o
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "compression.h"
|
#include "compression.h"
|
||||||
#include "datetime.h"
|
#include "datetime.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
|
#include "font.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "image.h"
|
#include "image.h"
|
||||||
#include "rounding.h"
|
#include "rounding.h"
|
||||||
|
@ -101,18 +102,6 @@ extern int32 func__resize();
|
||||||
extern int32 func__resizewidth();
|
extern int32 func__resizewidth();
|
||||||
extern int32 func__resizeheight();
|
extern int32 func__resizeheight();
|
||||||
|
|
||||||
extern int32 FontLoad(uint8 *content, int32 content_bytes,
|
|
||||||
int32 default_pixel_height, int32 which_font,
|
|
||||||
int32 options);
|
|
||||||
extern int32 FontRenderTextUTF32(int i, uint32 *codepoint, int32 codepoints,
|
|
||||||
int32 options, uint8 **out_data, int32 *out_x,
|
|
||||||
int32 *out_y, int32 *out_x_pre_increment,
|
|
||||||
int32 *out_x_post_increment);
|
|
||||||
extern int32 FontRenderTextASCII(int i, uint8 *codepoint, int32 codepoints,
|
|
||||||
int32 options, uint8 **out_data, int32 *out_x,
|
|
||||||
int32 *out_y, int32 *out_x_pre_increment,
|
|
||||||
int32 *out_x_post_increment);
|
|
||||||
|
|
||||||
extern void sub__title(qbs *title);
|
extern void sub__title(qbs *title);
|
||||||
extern void sub__echo(qbs *message);
|
extern void sub__echo(qbs *message);
|
||||||
extern void sub__assert(int32 expression, qbs *assert_message, int32 passed);
|
extern void sub__assert(int32 expression, qbs *assert_message, int32 passed);
|
||||||
|
|
Loading…
Reference in a new issue