lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/text-freetype2/data/locale/de-DE.ini
View file

@ -1,7 +1,7 @@
TextFreetype2="Text (FreeType 2)"
Font="Schriftart"
Text="Text"
TextFile="Textdatei (UTF-8 oder UTF-16)"
TextFile="Textdatei (UTF‐8 oder UTF‐16)"
TextFileFilter="Textdateien (*.txt);;"
ChatLogMode="Chatprotokollmodus"
ChatLogLines="Chatprotokollzeilen"

4
plugins/text-freetype2/data/locale/gl-ES.ini
View file

@ -1,8 +1,10 @@
TextFreetype2="Texto (FreeType 2)"
Font="Fonte"
Font="Tipo de letra"
Text="Texto"
TextFile="Ficheiro de texto (UTF-8 ou UTF-16)"
TextFileFilter="Ficheiros de texto (*.txt);;"
ChatLogMode="Modo de rexistro da conversa"
ChatLogLines="Liñas de rexistro da conversa"
Color1="Cor 1"
Color2="Cor 2"
Outline="Contorno"

19
plugins/text-freetype2/data/locale/sl-SI.ini
View file

@ -1,12 +1,15 @@
TextFreetype2="Besedilo (FreeType 2)"
Font="Pisava"
Text="Tekst"
TextFile="Besedilna datoteka (UTF-8 or UTF-16)"
TextFileFilter="Besedilne Datoteke (*.txt);;"
Color1="Barva 1"
Color2="Barva 2"
Text="Besedilo"
TextFile="Besedilna datoteka (UTF-8 ali UTF-16)"
TextFileFilter="Besedilne datoteke (*.txt);;"
ChatLogMode="Način dnevnika klepeta"
ChatLogLines="Št. vrstic dnevnika klepeta"
Color1="1. barva"
Color2="2. barva"
Outline="Oris"
DropShadow="Odajaj senco"
ReadFromFile="Preberi iz datoteka"
CustomWidth="Širina poljubnega besedila"
WordWrap="Prelom besedila"
ReadFromFile="Preberi iz datoteke"
CustomWidth="Širina besedila po meri"
WordWrap="Prelomi besedilo"

34
plugins/text-freetype2/find-font-cocoa.m
View file

@ -30,12 +30,12 @@ static void add_path_fonts(NSFileManager *file_manager, NSString *path)
files = [file_manager contentsOfDirectoryAtPath:path error:nil];
for (NSString *file in files) {
NSString *full_path = [path stringByAppendingPathComponent:file];
NSString *full_path =
[path stringByAppendingPathComponent:file];
BOOL is_dir = FALSE;
bool folder_exists = [file_manager
fileExistsAtPath:full_path
isDirectory:&is_dir];
bool folder_exists = [file_manager fileExistsAtPath:full_path
isDirectory:&is_dir];
if (folder_exists && is_dir) {
add_path_fonts(file_manager, full_path);
@ -50,7 +50,7 @@ void load_os_font_list(void)
@autoreleasepool {
BOOL is_dir;
NSArray *paths = NSSearchPathForDirectoriesInDomains(
NSLibraryDirectory, NSAllDomainsMask, true);
NSLibraryDirectory, NSAllDomainsMask, true);
for (NSString *path in paths) {
NSFileManager *file_manager =
@ -59,8 +59,8 @@ void load_os_font_list(void)
[path stringByAppendingPathComponent:@"Fonts"];
bool folder_exists = [file_manager
fileExistsAtPath:font_path
isDirectory:&is_dir];
fileExistsAtPath:font_path
isDirectory:&is_dir];
if (folder_exists && is_dir)
add_path_fonts(file_manager, font_path);
@ -78,17 +78,19 @@ static uint32_t add_font_checksum(uint32_t checksum, const char *path)
}
static uint32_t add_font_checksum_path(uint32_t checksum,
NSFileManager *file_manager, NSString *path)
NSFileManager *file_manager,
NSString *path)
{
NSArray *files = NULL;
files = [file_manager contentsOfDirectoryAtPath:path error:nil];
for (NSString *file in files) {
NSString *full_path = [path stringByAppendingPathComponent:file];
NSString *full_path =
[path stringByAppendingPathComponent:file];
checksum = add_font_checksum(checksum,
full_path.fileSystemRepresentation);
checksum = add_font_checksum(
checksum, full_path.fileSystemRepresentation);
}
return checksum;
@ -101,7 +103,7 @@ uint32_t get_font_checksum(void)
@autoreleasepool {
BOOL is_dir;
NSArray *paths = NSSearchPathForDirectoriesInDomains(
NSLibraryDirectory, NSAllDomainsMask, true);
NSLibraryDirectory, NSAllDomainsMask, true);
for (NSString *path in paths) {
NSFileManager *file_manager =
@ -110,12 +112,12 @@ uint32_t get_font_checksum(void)
[path stringByAppendingPathComponent:@"Fonts"];
bool folder_exists = [file_manager
fileExistsAtPath:font_path
isDirectory:&is_dir];
fileExistsAtPath:font_path
isDirectory:&is_dir];
if (folder_exists && is_dir)
checksum = add_font_checksum_path(checksum,
file_manager, font_path);
checksum = add_font_checksum_path(
checksum, file_manager, font_path);
}
}

132
plugins/text-freetype2/find-font-iconv.c
View file

@ -5,80 +5,51 @@
struct mac_font_mapping {
unsigned short encoding_id;
unsigned short language_id;
const char *code_page;
const char *code_page;
};
#define TT_MAC_LANGID_ANY 0xFFFF
static const struct mac_font_mapping mac_codes[] = {
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ENGLISH, "macintosh"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ICELANDIC,"x-mac-icelandic"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_TURKISH, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_POLISH, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ROMANIAN, "x-mac-romanian"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_CZECH, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_SLOVAK, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ANY, "macintosh"},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_JAPANESE, "Shift_JIS"},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_ANY, "Shift_JIS"},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_KOREAN, "EUC-KR"},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_ANY, "EUC-KR"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ARABIC, "x-mac-arabic"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_URDU, "x-mac-farsi"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_FARSI, "x-mac-farsi"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ANY, "x-mac-arabic"},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_HEBREW, "x-mac-hebrew"},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_ANY, "x-mac-hebrew"},
{TT_MAC_ID_GREEK, TT_MAC_LANGID_ANY, "x-mac-greek"},
{TT_MAC_ID_RUSSIAN, TT_MAC_LANGID_ANY, "x-mac-cyrillic"},
{TT_MAC_ID_DEVANAGARI, TT_MAC_LANGID_ANY, "x-mac-devanagari"},
{TT_MAC_ID_GURMUKHI, TT_MAC_LANGID_ANY, "x-mac-gurmukhi"},
{TT_MAC_ID_GUJARATI, TT_MAC_LANGID_ANY, "x-mac-gujarati"},
{
TT_MAC_ID_TRADITIONAL_CHINESE,
TT_MAC_LANGID_CHINESE_SIMPLIFIED,
"Big5"
},
{
TT_MAC_ID_TRADITIONAL_CHINESE,
TT_MAC_LANGID_ANY,
"Big5"
},
{
TT_MAC_ID_SIMPLIFIED_CHINESE,
TT_MAC_LANGID_CHINESE_SIMPLIFIED,
"GB2312"
},
{
TT_MAC_ID_SIMPLIFIED_CHINESE,
TT_MAC_LANGID_ANY,
"GB2312"
}
};
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ENGLISH, "macintosh"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ICELANDIC, "x-mac-icelandic"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_TURKISH, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_POLISH, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ROMANIAN, "x-mac-romanian"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_CZECH, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_SLOVAK, "x-mac-ce"},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ANY, "macintosh"},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_JAPANESE, "Shift_JIS"},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_ANY, "Shift_JIS"},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_KOREAN, "EUC-KR"},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_ANY, "EUC-KR"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ARABIC, "x-mac-arabic"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_URDU, "x-mac-farsi"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_FARSI, "x-mac-farsi"},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ANY, "x-mac-arabic"},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_HEBREW, "x-mac-hebrew"},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_ANY, "x-mac-hebrew"},
{TT_MAC_ID_GREEK, TT_MAC_LANGID_ANY, "x-mac-greek"},
{TT_MAC_ID_RUSSIAN, TT_MAC_LANGID_ANY, "x-mac-cyrillic"},
{TT_MAC_ID_DEVANAGARI, TT_MAC_LANGID_ANY, "x-mac-devanagari"},
{TT_MAC_ID_GURMUKHI, TT_MAC_LANGID_ANY, "x-mac-gurmukhi"},
{TT_MAC_ID_GUJARATI, TT_MAC_LANGID_ANY, "x-mac-gujarati"},
{TT_MAC_ID_TRADITIONAL_CHINESE, TT_MAC_LANGID_CHINESE_SIMPLIFIED,
"Big5"},
{TT_MAC_ID_TRADITIONAL_CHINESE, TT_MAC_LANGID_ANY, "Big5"},
{TT_MAC_ID_SIMPLIFIED_CHINESE, TT_MAC_LANGID_CHINESE_SIMPLIFIED,
"GB2312"},
{TT_MAC_ID_SIMPLIFIED_CHINESE, TT_MAC_LANGID_ANY, "GB2312"}};
const char *iso_codes[] = {
"us-ascii",
NULL,
"iso-8859-1"
};
const char *iso_codes[] = {"us-ascii", NULL, "iso-8859-1"};
const char *ms_codes[] = {
"UTF-16BE",
"UTF-16BE",
"Shift_JIS",
NULL,
"Big5",
NULL,
NULL,
NULL,
NULL,
NULL,
"UTF-16BE"
};
const char *ms_codes[] = {"UTF-16BE", "UTF-16BE", "Shift_JIS", NULL,
"Big5", NULL, NULL, NULL,
NULL, NULL, "UTF-16BE"};
static const size_t mac_code_count = sizeof(mac_codes) / sizeof(mac_codes[0]);
static const size_t iso_code_count = sizeof(iso_codes) / sizeof(iso_codes[0]);
static const size_t ms_code_count = sizeof(ms_codes) / sizeof(ms_codes[0]);
static const size_t ms_code_count = sizeof(ms_codes) / sizeof(ms_codes[0]);
static const char *get_mac_code(uint16_t encoding_id, uint16_t language_id)
{
@ -94,7 +65,8 @@ static const char *get_mac_code(uint16_t encoding_id, uint16_t language_id)
}
static const char *get_code_page_for_font(uint16_t platform_id,
uint16_t encoding_id, uint16_t language_id)
uint16_t encoding_id,
uint16_t language_id)
{
const char *ret;
@ -122,38 +94,40 @@ static const char *get_code_page_for_font(uint16_t platform_id,
char *sfnt_name_to_utf8(FT_SfntName *sfnt_name)
{
const char *charset = get_code_page_for_font(sfnt_name->platform_id,
sfnt_name->encoding_id, sfnt_name->language_id);
sfnt_name->encoding_id,
sfnt_name->language_id);
char utf8[256];
char *conv_in, *conv_out;
size_t in_len, out_len;
if (!charset) {
blog(LOG_DEBUG, "invalid character set found, "
"platform_id: %d, encoding_id: %d, "
"language_id: %d",
sfnt_name->platform_id,
sfnt_name->encoding_id,
sfnt_name->language_id);
blog(LOG_DEBUG,
"invalid character set found, "
"platform_id: %d, encoding_id: %d, "
"language_id: %d",
sfnt_name->platform_id, sfnt_name->encoding_id,
sfnt_name->language_id);
return NULL;
}
iconv_t ic = iconv_open("UTF-8", charset);
if (ic == (iconv_t)-1) {
blog(LOG_DEBUG, "couldn't intialize font code page "
"conversion: '%s' to 'utf-8': errno = %d",
charset, (int)errno);
blog(LOG_DEBUG,
"couldn't intialize font code page "
"conversion: '%s' to 'utf-8': errno = %d",
charset, (int)errno);
return NULL;
}
conv_in = (char*)sfnt_name->string;
conv_in = (char *)sfnt_name->string;
conv_out = utf8;
in_len = sfnt_name->string_len;
out_len = 256;
in_len = sfnt_name->string_len;
out_len = 256;
size_t n = iconv(ic, &conv_in, &in_len, &conv_out, &out_len);
if (n == (size_t)-1) {
blog(LOG_WARNING, "couldn't convert font name text: errno = %d",
(int)errno);
(int)errno);
iconv_close(ic);
return NULL;
}

37
plugins/text-freetype2/find-font-unix.c
View file

@ -22,38 +22,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "find-font.h"
#include "text-freetype2.h"
void free_os_font_list(void)
{
}
void free_os_font_list(void) {}
bool load_cached_os_font_list(void)
{
return true;
}
void load_os_font_list(void)
{
}
void load_os_font_list(void) {}
const char *get_font_path(const char *family, uint16_t size, const char *style,
uint32_t flags, FT_Long *idx)
uint32_t flags, FT_Long *idx)
{
bool bold = !!(flags & OBS_FONT_BOLD);
bool italic = !!(flags & OBS_FONT_ITALIC);
bool bold = !!(flags & OBS_FONT_BOLD);
bool italic = !!(flags & OBS_FONT_ITALIC);
FcPattern *pattern = FcPatternCreate();
FcPattern *match = NULL;
bool success = false;
FcResult match_result;
FcPattern *match = NULL;
bool success = false;
FcResult match_result;
/* somewhat of a cheap hack */
static __thread char result[512];
FcPatternAddString(pattern, FC_FAMILY, (const FcChar8*)family);
FcPatternAddString(pattern, FC_STYLE, (const FcChar8*)style);
FcPatternAddString(pattern, FC_FAMILY, (const FcChar8 *)family);
FcPatternAddString(pattern, FC_STYLE, (const FcChar8 *)style);
FcPatternAddInteger(pattern, FC_WEIGHT,
bold ? FC_WEIGHT_BOLD : FC_WEIGHT_REGULAR);
bold ? FC_WEIGHT_BOLD : FC_WEIGHT_REGULAR);
FcPatternAddInteger(pattern, FC_SLANT,
italic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN);
italic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN);
FcPatternAddDouble(pattern, FC_SIZE, (double)size);
FcConfigSubstitute(NULL, pattern, FcMatchPattern);
@ -61,9 +57,9 @@ const char *get_font_path(const char *family, uint16_t size, const char *style,
match = FcFontMatch(NULL, pattern, &match_result);
if (match) {
FcChar8 *path = FcPatternFormat(match,
(const FcChar8*)"%{file}");
strncpy(result, (char*)path, 511);
FcChar8 *path =
FcPatternFormat(match, (const FcChar8 *)"%{file}");
strncpy(result, (char *)path, 511);
FcStrFree(path);
int fc_index = 0;
@ -73,8 +69,7 @@ const char *get_font_path(const char *family, uint16_t size, const char *style,
FcPatternDestroy(match);
success = true;
} else {
blog(LOG_WARNING, "no matching font for '%s' found",
family);
blog(LOG_WARNING, "no matching font for '%s' found", family);
}
FcPatternDestroy(pattern);

142
plugins/text-freetype2/find-font-windows.c
View file

@ -15,64 +15,47 @@ extern void save_font_list(void);
struct mac_font_mapping {
unsigned short encoding_id;
unsigned short language_id;
unsigned int code_page;
unsigned int code_page;
};
#define TT_MAC_LANGID_ANY 0xFFFF
static const struct mac_font_mapping mac_codes[] = {
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ENGLISH, 10000},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ICELANDIC, 10079},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_TURKISH, 10081},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_POLISH, 10029},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ROMANIAN, 10010},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_CZECH, 10029},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_SLOVAK, 10029},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ANY, 10000},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_JAPANESE, 932},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_ANY, 932},
{TT_MAC_ID_TRADITIONAL_CHINESE,TT_MAC_LANGID_CHINESE_SIMPLIFIED, 950},
{TT_MAC_ID_TRADITIONAL_CHINESE,TT_MAC_LANGID_ANY, 950},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_KOREAN, 51949},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_ANY, 51949},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ARABIC, 10004},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_URDU, 0},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_FARSI, 0},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ANY, 10004},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_HEBREW, 10005},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_ANY, 10005},
{TT_MAC_ID_GREEK, TT_MAC_LANGID_ANY, 10006},
{TT_MAC_ID_RUSSIAN, TT_MAC_LANGID_ANY, 10007},
{TT_MAC_ID_DEVANAGARI, TT_MAC_LANGID_ANY, 0},
{TT_MAC_ID_GURMUKHI, TT_MAC_LANGID_ANY, 0},
{TT_MAC_ID_GUJARATI, TT_MAC_LANGID_ANY, 0},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ENGLISH, 10000},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ICELANDIC, 10079},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_TURKISH, 10081},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_POLISH, 10029},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ROMANIAN, 10010},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_CZECH, 10029},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_SLOVAK, 10029},
{TT_MAC_ID_ROMAN, TT_MAC_LANGID_ANY, 10000},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_JAPANESE, 932},
{TT_MAC_ID_JAPANESE, TT_MAC_LANGID_ANY, 932},
{TT_MAC_ID_TRADITIONAL_CHINESE, TT_MAC_LANGID_CHINESE_SIMPLIFIED, 950},
{TT_MAC_ID_TRADITIONAL_CHINESE, TT_MAC_LANGID_ANY, 950},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_KOREAN, 51949},
{TT_MAC_ID_KOREAN, TT_MAC_LANGID_ANY, 51949},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ARABIC, 10004},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_URDU, 0},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_FARSI, 0},
{TT_MAC_ID_ARABIC, TT_MAC_LANGID_ANY, 10004},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_HEBREW, 10005},
{TT_MAC_ID_HEBREW, TT_MAC_LANGID_ANY, 10005},
{TT_MAC_ID_GREEK, TT_MAC_LANGID_ANY, 10006},
{TT_MAC_ID_RUSSIAN, TT_MAC_LANGID_ANY, 10007},
{TT_MAC_ID_DEVANAGARI, TT_MAC_LANGID_ANY, 0},
{TT_MAC_ID_GURMUKHI, TT_MAC_LANGID_ANY, 0},
{TT_MAC_ID_GUJARATI, TT_MAC_LANGID_ANY, 0},
{TT_MAC_ID_SIMPLIFIED_CHINESE, TT_MAC_LANGID_CHINESE_SIMPLIFIED, 936},
{TT_MAC_ID_SIMPLIFIED_CHINESE, TT_MAC_LANGID_ANY, 936}
};
{TT_MAC_ID_SIMPLIFIED_CHINESE, TT_MAC_LANGID_ANY, 936}};
unsigned int iso_codes[] = {
20127,
0,
28591
};
unsigned int iso_codes[] = {20127, 0, 28591};
unsigned int ms_codes[] = {
1201,
1201,
932,
0,
950,
0,
0,
0,
0,
0,
1201
};
unsigned int ms_codes[] = {1201, 1201, 932, 0, 950, 0, 0, 0, 0, 0, 1201};
static const size_t mac_code_count = sizeof(mac_codes) / sizeof(mac_codes[0]);
static const size_t iso_code_count = sizeof(iso_codes) / sizeof(iso_codes[0]);
static const size_t ms_code_count = sizeof(ms_codes) / sizeof(ms_codes[0]);
static const size_t ms_code_count = sizeof(ms_codes) / sizeof(ms_codes[0]);
static unsigned int get_mac_code(uint16_t encoding_id, uint16_t language_id)
{
@ -88,7 +71,8 @@ static unsigned int get_mac_code(uint16_t encoding_id, uint16_t language_id)
}
static unsigned int get_code_page_for_font(uint16_t platform_id,
uint16_t encoding_id, uint16_t language_id)
uint16_t encoding_id,
uint16_t language_id)
{
unsigned int ret;
@ -116,15 +100,16 @@ static unsigned int get_code_page_for_font(uint16_t platform_id,
static char *wide_to_utf8(const wchar_t *str, size_t len)
{
size_t utf8_len;
char *utf8_str = NULL;
char *utf8_str = NULL;
utf8_len = (size_t)WideCharToMultiByte(CP_UTF8, 0, str, (int)len,
NULL, 0, NULL, false);
utf8_len = (size_t)WideCharToMultiByte(CP_UTF8, 0, str, (int)len, NULL,
0, NULL, false);
if (utf8_len) {
utf8_str = bzalloc(utf8_len + 1);
utf8_len = (size_t)WideCharToMultiByte(CP_UTF8, 0,
str, (int)len,
utf8_str, (int)utf8_len + 1, NULL, false);
utf8_len = (size_t)WideCharToMultiByte(CP_UTF8, 0, str,
(int)len, utf8_str,
(int)utf8_len + 1, NULL,
false);
if (!utf8_len) {
bfree(utf8_str);
@ -137,16 +122,16 @@ static char *wide_to_utf8(const wchar_t *str, size_t len)
static char *convert_utf16_be_to_utf8(FT_SfntName *sfnt_name)
{
size_t utf16_len = sfnt_name->string_len / 2;
size_t utf16_len = sfnt_name->string_len / 2;
wchar_t *utf16_str = malloc((utf16_len + 1) * sizeof(wchar_t));
char *utf8_str = NULL;
char *utf8_str = NULL;
utf16_str[utf16_len] = 0;
/* convert to little endian */
for (size_t i = 0; i < utf16_len; i++) {
size_t pos = i * 2;
wchar_t ch = *(wchar_t *)&sfnt_name->string[pos];
size_t pos = i * 2;
wchar_t ch = *(wchar_t *)&sfnt_name->string[pos];
utf16_str[i] = ((ch >> 8) & 0xFF) | ((ch << 8) & 0xFF00);
}
@ -159,28 +144,27 @@ static char *convert_utf16_be_to_utf8(FT_SfntName *sfnt_name)
char *sfnt_name_to_utf8(FT_SfntName *sfnt_name)
{
unsigned int code_page = get_code_page_for_font(
sfnt_name->platform_id,
sfnt_name->encoding_id,
sfnt_name->language_id);
unsigned int code_page = get_code_page_for_font(sfnt_name->platform_id,
sfnt_name->encoding_id,
sfnt_name->language_id);
char *utf8_str = NULL;
char *utf8_str = NULL;
wchar_t *utf16_str;
size_t utf16_len;
size_t utf16_len;
if (code_page == 1201)
return convert_utf16_be_to_utf8(sfnt_name);
else if (code_page == 0)
return NULL;
utf16_len = MultiByteToWideChar(code_page, 0,
(char*)sfnt_name->string, sfnt_name->string_len,
NULL, 0);
utf16_len = MultiByteToWideChar(code_page, 0, (char *)sfnt_name->string,
sfnt_name->string_len, NULL, 0);
if (utf16_len) {
utf16_str = malloc((utf16_len + 1) * sizeof(wchar_t));
utf16_len = MultiByteToWideChar(code_page, 0,
(char*)sfnt_name->string, sfnt_name->string_len,
utf16_str, (int)utf16_len);
(char *)sfnt_name->string,
sfnt_name->string_len,
utf16_str, (int)utf16_len);
if (utf16_len) {
utf16_str[utf16_len] = 0;
@ -195,15 +179,15 @@ char *sfnt_name_to_utf8(FT_SfntName *sfnt_name)
uint32_t get_font_checksum(void)
{
uint32_t checksum = 0;
struct dstr path = {0};
HANDLE handle;
uint32_t checksum = 0;
struct dstr path = {0};
HANDLE handle;
WIN32_FIND_DATAA wfd;
dstr_reserve(&path, MAX_PATH);
HRESULT res = SHGetFolderPathA(NULL, CSIDL_FONTS, NULL,
SHGFP_TYPE_CURRENT, path.array);
SHGFP_TYPE_CURRENT, path.array);
if (res != S_OK) {
blog(LOG_WARNING, "Error finding windows font folder");
return 0;
@ -220,9 +204,9 @@ uint32_t get_font_checksum(void)
do {
checksum = calc_crc32(checksum, &wfd.ftLastWriteTime,
sizeof(FILETIME));
sizeof(FILETIME));
checksum = calc_crc32(checksum, wfd.cFileName,
strlen(wfd.cFileName));
strlen(wfd.cFileName));
} while (FindNextFileA(handle, &wfd));
FindClose(handle);
@ -234,14 +218,14 @@ free_string:
void load_os_font_list(void)
{
struct dstr path = {0};
HANDLE handle;
struct dstr path = {0};
HANDLE handle;
WIN32_FIND_DATAA wfd;
dstr_reserve(&path, MAX_PATH);
HRESULT res = SHGetFolderPathA(NULL, CSIDL_FONTS, NULL,
SHGFP_TYPE_CURRENT, path.array);
SHGFP_TYPE_CURRENT, path.array);
if (res != S_OK) {
blog(LOG_WARNING, "Error finding windows font folder");
return;
@ -271,7 +255,7 @@ void load_os_font_list(void)
while (idx < max_faces) {
FT_Error ret = FT_New_Face(ft2_lib, full_path.array,
idx, &face);
idx, &face);
if (ret != 0)
break;

105
plugins/text-freetype2/find-font.c
View file

@ -12,7 +12,7 @@ static inline bool read_data(struct serializer *s, void *data, size_t size)
}
static inline bool write_data(struct serializer *s, const void *data,
size_t size)
size_t size)
{
return s_write(s, data, size) == size;
}
@ -56,20 +56,23 @@ static bool load_cached_font_list(struct serializer *s)
int count;
success = read_var(s, count);
if (!success) return false;
if (!success)
return false;
da_init(font_list);
da_resize(font_list, count);
#define do_read(var) \
#define do_read(var) \
success = read_var(s, var); \
if (!success) break
if (!success) \
break
for (int i = 0; i < count; i++) {
struct font_path_info *info = &font_list.array[i];
success = read_str(s, &info->face_and_style);
if (!success) break;
if (!success)
break;
do_read(info->full_len);
do_read(info->face_len);
@ -78,13 +81,15 @@ static bool load_cached_font_list(struct serializer *s)
info->sizes = bmalloc(sizeof(int) * info->num_sizes);
success = read_data(s, info->sizes,
sizeof(int) * info->num_sizes);
if (!success) break;
sizeof(int) * info->num_sizes);
if (!success)
break;
do_read(info->bold);
success = read_str(s, &info->path);
if (!success) break;
if (!success)
break;
do_read(info->italic);
do_read(info->index);
@ -149,29 +154,34 @@ void save_font_list(void)
bool success = false;
if (font_checksum)
success = file_output_serializer_init_safe(&s, file_name,
"tmp");
success =
file_output_serializer_init_safe(&s, file_name, "tmp");
bfree(file_name);
if (!success)
return;
success = write_var(&s, font_cache_ver);
if (!success) return;
if (!success)
return;
success = write_var(&s, font_checksum);
if (!success) return;
if (!success)
return;
success = write_var(&s, font_count);
if (!success) return;
if (!success)
return;
#define do_write(var) \
#define do_write(var) \
success = write_var(&s, var); \
if (!success) break
if (!success) \
break
for (size_t i = 0; i < font_list.num; i++) {
struct font_path_info *info = &font_list.array[i];
success = write_str(&s, info->face_and_style);
if (!success) break;
if (!success)
break;
do_write(info->full_len);
do_write(info->face_len);
@ -179,13 +189,15 @@ void save_font_list(void)
do_write(info->num_sizes);
success = write_data(&s, info->sizes,
sizeof(int) * info->num_sizes);
if (!success) break;
sizeof(int) * info->num_sizes);
if (!success)
break;
do_write(info->bold);
success = write_str(&s, info->path);
if (!success) break;
if (!success)
break;
do_write(info->italic);
do_write(info->index);
@ -202,7 +214,7 @@ static void create_bitmap_sizes(struct font_path_info *info, FT_Face face)
if (!info->is_bitmap) {
info->num_sizes = 0;
info->sizes = NULL;
info->sizes = NULL;
return;
}
@ -214,15 +226,12 @@ static void create_bitmap_sizes(struct font_path_info *info, FT_Face face)
da_push_back(sizes, &val);
}
info->sizes = sizes.array;
info->sizes = sizes.array;
info->num_sizes = (uint32_t)face->num_fixed_sizes;
}
static void add_font_path(FT_Face face,
FT_Long idx,
const char *family_in,
const char *style_in,
const char *path)
static void add_font_path(FT_Face face, FT_Long idx, const char *family_in,
const char *style_in, const char *path)
{
struct dstr face_and_style = {0};
struct font_path_info info;
@ -249,15 +258,15 @@ static void add_font_path(FT_Face face,
}
info.face_and_style = face_and_style.array;
info.full_len = (uint32_t)face_and_style.len;
info.face_len = (uint32_t)strlen(family_in);
info.full_len = (uint32_t)face_and_style.len;
info.face_len = (uint32_t)strlen(family_in);
info.is_bitmap = !!(face->face_flags & FT_FACE_FLAG_FIXED_SIZES);
info.bold = !!(face->style_flags & FT_STYLE_FLAG_BOLD);
info.italic = !!(face->style_flags & FT_STYLE_FLAG_ITALIC);
info.index = idx;
info.is_bitmap = !!(face->face_flags & FT_FACE_FLAG_FIXED_SIZES);
info.bold = !!(face->style_flags & FT_STYLE_FLAG_BOLD);
info.italic = !!(face->style_flags & FT_STYLE_FLAG_ITALIC);
info.index = idx;
info.path = bstrdup(path);
info.path = bstrdup(path);
create_bitmap_sizes(&info, face);
da_push_back(font_list, &info);
@ -271,15 +280,15 @@ static void add_font_path(FT_Face face,
void build_font_path_info(FT_Face face, FT_Long idx, const char *path)
{
FT_UInt num_names = FT_Get_Sfnt_Name_Count(face);
DARRAY(char*) family_names;
DARRAY(char *) family_names;
da_init(family_names);
da_push_back(family_names, &face->family_name);
for (FT_UInt i = 0; i < num_names; i++) {
FT_SfntName name;
char *family;
FT_Error ret = FT_Get_Sfnt_Name(face, i, &name);
char *family;
FT_Error ret = FT_Get_Sfnt_Name(face, i, &name);
if (ret != 0 || name.name_id != TT_NAME_ID_FONT_FAMILY)
continue;
@ -302,7 +311,7 @@ void build_font_path_info(FT_Face face, FT_Long idx, const char *path)
for (size_t i = 0; i < family_names.num; i++) {
add_font_path(face, idx, family_names.array[i],
face->style_name, path);
face->style_name, path);
/* first item isn't our allocation */
if (i > 0)
@ -339,14 +348,14 @@ static inline size_t get_rating(struct font_path_info *info, struct dstr *cmp)
}
const char *get_font_path(const char *family, uint16_t size, const char *style,
uint32_t flags, FT_Long *idx)
uint32_t flags, FT_Long *idx)
{
const char *best_path = NULL;
double best_rating = 0.0;
const char *best_path = NULL;
double best_rating = 0.0;
struct dstr face_and_style = {0};
struct dstr style_str = {0};
bool bold = !!(flags & OBS_FONT_BOLD);
bool italic = !!(flags & OBS_FONT_ITALIC);
struct dstr style_str = {0};
bool bold = !!(flags & OBS_FONT_BOLD);
bool italic = !!(flags & OBS_FONT_ITALIC);
if (!family || !*family)
return NULL;
@ -383,12 +392,14 @@ const char *get_font_path(const char *family, uint16_t size, const char *style,
rating /= (double)(best_diff + 1.0);
}
if (info->bold == bold) rating += 1.0;
if (info->italic == italic) rating += 1.0;
if (info->bold == bold)
rating += 1.0;
if (info->italic == italic)
rating += 1.0;
if (rating > best_rating) {
best_path = info->path;
*idx = info->index;
best_path = info->path;
*idx = info->index;
best_rating = rating;
}
}

17
plugins/text-freetype2/find-font.h
View file

@ -9,19 +9,19 @@
#include <util/darray.h>
struct font_path_info {
char *face_and_style;
char *face_and_style;
uint32_t full_len;
uint32_t face_len;
bool is_bitmap;
bool is_bitmap;
uint32_t num_sizes;
int *sizes;
int *sizes;
bool bold;
bool italic;
bool bold;
bool italic;
char *path;
FT_Long index;
char *path;
FT_Long index;
};
static inline void font_path_info_free(struct font_path_info *info)
@ -38,4 +38,5 @@ extern bool load_cached_os_font_list(void);
extern void load_os_font_list(void);
extern void free_os_font_list(void);
extern const char *get_font_path(const char *family, uint16_t size,
const char *style, uint32_t flags, FT_Long *idx);
const char *style, uint32_t flags,
FT_Long *idx);

20
plugins/text-freetype2/obs-convenience.c
View file

@ -21,7 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <graphics/vec4.h>
#include "obs-convenience.h"
gs_vertbuffer_t *create_uv_vbuffer(uint32_t num_verts, bool add_color) {
gs_vertbuffer_t *create_uv_vbuffer(uint32_t num_verts, bool add_color)
{
obs_enter_graphics();
gs_vertbuffer_t *tmp = NULL;
@ -36,13 +37,13 @@ gs_vertbuffer_t *create_uv_vbuffer(uint32_t num_verts, bool add_color) {
vrect->tvarray[0].width = 2;
vrect->tvarray[0].array = bmalloc(sizeof(struct vec2) * num_verts);
if (add_color)
vrect->colors = (uint32_t *)bmalloc
(sizeof(uint32_t)* num_verts);
vrect->colors =
(uint32_t *)bmalloc(sizeof(uint32_t) * num_verts);
memset(vrect->points, 0, sizeof(struct vec3) * num_verts);
memset(vrect->tvarray[0].array, 0, sizeof(struct vec2) * num_verts);
if (add_color)
memset(vrect->colors, 0, sizeof(uint32_t)* num_verts);
memset(vrect->colors, 0, sizeof(uint32_t) * num_verts);
tmp = gs_vertexbuffer_create(vrect, GS_DYNAMIC);
@ -56,14 +57,15 @@ gs_vertbuffer_t *create_uv_vbuffer(uint32_t num_verts, bool add_color) {
}
void draw_uv_vbuffer(gs_vertbuffer_t *vbuf, gs_texture_t *tex,
gs_effect_t *effect, uint32_t num_verts)
gs_effect_t *effect, uint32_t num_verts)
{
gs_texture_t *texture = tex;
gs_texture_t *texture = tex;
gs_technique_t *tech = gs_effect_get_technique(effect, "Draw");
gs_eparam_t *image = gs_effect_get_param_by_name(effect, "image");
size_t passes;
gs_eparam_t *image = gs_effect_get_param_by_name(effect, "image");
size_t passes;
if (vbuf == NULL || tex == NULL) return;
if (vbuf == NULL || tex == NULL)
return;
gs_vertexbuffer_flush(vbuf);
gs_load_vertexbuffer(vbuf);

20
plugins/text-freetype2/obs-convenience.h
View file

@ -21,10 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
gs_vertbuffer_t *create_uv_vbuffer(uint32_t num_verts, bool add_color);
void draw_uv_vbuffer(gs_vertbuffer_t *vbuf, gs_texture_t *tex,
gs_effect_t *effect, uint32_t num_verts);
gs_effect_t *effect, uint32_t num_verts);
#define set_v3_rect(a, x, y, w, h) \
vec3_set(a, x, y, 0.0f); \
#define set_v3_rect(a, x, y, w, h) \
vec3_set(a, x, y, 0.0f); \
vec3_set(a + 1, x + w, y, 0.0f); \
vec3_set(a + 2, x, y + h, 0.0f); \
vec3_set(a + 3, x, y + h, 0.0f); \
@ -32,14 +32,14 @@ void draw_uv_vbuffer(gs_vertbuffer_t *vbuf, gs_texture_t *tex,
vec3_set(a + 5, x + w, y + h, 0.0f);
#define set_v2_uv(a, u, v, u2, v2) \
vec2_set(a, u, v); \
vec2_set(a + 1, u2, v); \
vec2_set(a + 2, u, v2); \
vec2_set(a + 3, u, v2); \
vec2_set(a + 4, u2, v); \
vec2_set(a, u, v); \
vec2_set(a + 1, u2, v); \
vec2_set(a + 2, u, v2); \
vec2_set(a + 3, u, v2); \
vec2_set(a + 4, u2, v); \
vec2_set(a + 5, u2, v2);
#define set_rect_colors2(a, c1, c2) \
uint32_t *b = a; \
b[0] = b[1] = b[4] = c1; \
uint32_t *b = a; \
b[0] = b[1] = b[4] = c1; \
b[2] = b[3] = b[5] = c2;

120
plugins/text-freetype2/text-freetype2.c
View file

@ -40,9 +40,9 @@ static struct obs_source_info freetype2_source_info = {
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_VIDEO |
#ifdef _WIN32
OBS_SOURCE_DEPRECATED |
OBS_SOURCE_DEPRECATED |
#endif
OBS_SOURCE_CUSTOM_DRAW,
OBS_SOURCE_CUSTOM_DRAW,
.get_name = ft2_source_get_name,
.create = ft2_source_create,
.destroy = ft2_source_destroy,
@ -128,42 +128,38 @@ static obs_properties_t *ft2_source_properties(void *unused)
// Better/pixel shader outline/drop shadow
// Some way to pull text files from network, I dunno
obs_properties_add_font(props, "font",
obs_module_text("Font"));
obs_properties_add_font(props, "font", obs_module_text("Font"));
obs_properties_add_text(props, "text",
obs_module_text("Text"), OBS_TEXT_MULTILINE);
obs_properties_add_text(props, "text", obs_module_text("Text"),
OBS_TEXT_MULTILINE);
obs_properties_add_bool(props, "from_file",
obs_module_text("ReadFromFile"));
obs_module_text("ReadFromFile"));
obs_properties_add_bool(props, "log_mode",
obs_module_text("ChatLogMode"));
obs_module_text("ChatLogMode"));
obs_properties_add_int(props, "log_lines",
obs_module_text("ChatLogLines"), 1, 1000, 1);
obs_module_text("ChatLogLines"), 1, 1000, 1);
obs_properties_add_path(props,
"text_file", obs_module_text("TextFile"),
OBS_PATH_FILE, obs_module_text("TextFileFilter"), NULL);
obs_properties_add_path(props, "text_file", obs_module_text("TextFile"),
OBS_PATH_FILE,
obs_module_text("TextFileFilter"), NULL);
obs_properties_add_color(props, "color1",
obs_module_text("Color1"));
obs_properties_add_color(props, "color1", obs_module_text("Color1"));
obs_properties_add_color(props, "color2",
obs_module_text("Color2"));
obs_properties_add_color(props, "color2", obs_module_text("Color2"));
obs_properties_add_bool(props, "outline",
obs_module_text("Outline"));
obs_properties_add_bool(props, "outline", obs_module_text("Outline"));
obs_properties_add_bool(props, "drop_shadow",
obs_module_text("DropShadow"));
obs_module_text("DropShadow"));
obs_properties_add_int(props, "custom_width",
obs_module_text("CustomWidth"), 0, 4096, 1);
obs_module_text("CustomWidth"), 0, 4096, 1);
obs_properties_add_bool(props, "word_wrap",
obs_module_text("WordWrap"));
obs_module_text("WordWrap"));
return props;
}
@ -220,17 +216,22 @@ static void ft2_source_destroy(void *data)
static void ft2_source_render(void *data, gs_effect_t *effect)
{
struct ft2_source *srcdata = data;
if (srcdata == NULL) return;
if (srcdata == NULL)
return;
if (srcdata->tex == NULL || srcdata->vbuf == NULL) return;
if (srcdata->text == NULL || *srcdata->text == 0) return;
if (srcdata->tex == NULL || srcdata->vbuf == NULL)
return;
if (srcdata->text == NULL || *srcdata->text == 0)
return;
gs_reset_blend_state();
if (srcdata->outline_text) draw_outlines(srcdata);
if (srcdata->drop_shadow) draw_drop_shadow(srcdata);
if (srcdata->outline_text)
draw_outlines(srcdata);
if (srcdata->drop_shadow)
draw_drop_shadow(srcdata);
draw_uv_vbuffer(srcdata->vbuf, srcdata->tex,
srcdata->draw_effect, (uint32_t)wcslen(srcdata->text) * 6);
draw_uv_vbuffer(srcdata->vbuf, srcdata->tex, srcdata->draw_effect,
(uint32_t)wcslen(srcdata->text) * 6);
UNUSED_PARAMETER(effect);
}
@ -238,8 +239,10 @@ static void ft2_source_render(void *data, gs_effect_t *effect)
static void ft2_video_tick(void *data, float seconds)
{
struct ft2_source *srcdata = data;
if (srcdata == NULL) return;
if (!srcdata->from_file || !srcdata->text_file) return;
if (srcdata == NULL)
return;
if (!srcdata->from_file || !srcdata->text_file)
return;
if (os_gettime_ns() - srcdata->last_checked >= 1000000000) {
time_t t = get_modified_timestamp(srcdata->text_file);
@ -250,7 +253,7 @@ static void ft2_video_tick(void *data, float seconds)
read_from_end(srcdata, srcdata->text_file);
else
load_text_from_file(srcdata,
srcdata->text_file);
srcdata->text_file);
cache_glyphs(srcdata, srcdata->text);
set_up_vertex_buffer(srcdata);
srcdata->update_file = false;
@ -269,7 +272,8 @@ static bool init_font(struct ft2_source *srcdata)
{
FT_Long index;
const char *path = get_font_path(srcdata->font_name, srcdata->font_size,
srcdata->font_style, srcdata->font_flags, &index);
srcdata->font_style,
srcdata->font_flags, &index);
if (!path)
return false;
@ -290,10 +294,10 @@ static void ft2_source_update(void *data, obs_data_t *settings)
uint32_t color[2];
uint32_t custom_width = 0;
const char *font_name = obs_data_get_string(font_obj, "face");
const char *font_name = obs_data_get_string(font_obj, "face");
const char *font_style = obs_data_get_string(font_obj, "style");
uint16_t font_size = (uint16_t)obs_data_get_int(font_obj, "size");
uint32_t font_flags = (uint32_t)obs_data_get_int(font_obj, "flags");
uint16_t font_size = (uint16_t)obs_data_get_int(font_obj, "size");
uint32_t font_flags = (uint32_t)obs_data_get_int(font_obj, "flags");
if (!font_obj)
return;
@ -311,8 +315,7 @@ static void ft2_source_update(void *data, obs_data_t *settings)
srcdata->custom_width = custom_width;
vbuf_needs_update = true;
}
}
else {
} else {
if (srcdata->custom_width >= 100)
vbuf_needs_update = true;
srcdata->custom_width = 0;
@ -339,14 +342,14 @@ static void ft2_source_update(void *data, obs_data_t *settings)
}
srcdata->log_mode = chat_log_mode;
if (ft2_lib == NULL) goto error;
if (ft2_lib == NULL)
goto error;
if (srcdata->draw_effect == NULL) {
char *effect_file = NULL;
char *error_string = NULL;
effect_file =
obs_module_file("text_default.effect");
effect_file = obs_module_file("text_default.effect");
if (effect_file) {
obs_enter_graphics();
@ -360,18 +363,17 @@ static void ft2_source_update(void *data, obs_data_t *settings)
}
}
if (srcdata->font_size != font_size ||
srcdata->from_file != from_file)
if (srcdata->font_size != font_size || srcdata->from_file != from_file)
vbuf_needs_update = true;
srcdata->file_load_failed = false;
srcdata->from_file = from_file;
if (srcdata->font_name != NULL) {
if (strcmp(font_name, srcdata->font_name) == 0 &&
if (strcmp(font_name, srcdata->font_name) == 0 &&
strcmp(font_style, srcdata->font_style) == 0 &&
font_flags == srcdata->font_flags &&
font_size == srcdata->font_size)
font_size == srcdata->font_size)
goto skip_font_load;
bfree(srcdata->font_name);
@ -382,17 +384,16 @@ static void ft2_source_update(void *data, obs_data_t *settings)
vbuf_needs_update = true;
}
srcdata->font_name = bstrdup(font_name);
srcdata->font_name = bstrdup(font_name);
srcdata->font_style = bstrdup(font_style);
srcdata->font_size = font_size;
srcdata->font_size = font_size;
srcdata->font_flags = font_flags;
if (!init_font(srcdata) || srcdata->font_face == NULL) {
blog(LOG_WARNING, "FT2-text: Failed to load font %s",
srcdata->font_name);
srcdata->font_name);
goto error;
}
else {
} else {
FT_Set_Pixel_Sizes(srcdata->font_face, 0, srcdata->font_size);
FT_Select_Charmap(srcdata->font_face, FT_ENCODING_UNICODE);
}
@ -417,14 +418,15 @@ skip_font_load:
srcdata->text = NULL;
os_utf8_to_wcs_ptr(emptystr, strlen(emptystr),
&srcdata->text);
blog(LOG_WARNING, "FT2-text: Failed to open %s for "
"reading", tmp);
}
else {
&srcdata->text);
blog(LOG_WARNING,
"FT2-text: Failed to open %s for "
"reading",
tmp);
} else {
if (srcdata->text_file != NULL &&
strcmp(srcdata->text_file, tmp) == 0 &&
!vbuf_needs_update)
strcmp(srcdata->text_file, tmp) == 0 &&
!vbuf_needs_update)
goto error;
bfree(srcdata->text_file);
@ -436,10 +438,10 @@ skip_font_load:
load_text_from_file(srcdata, tmp);
srcdata->last_checked = os_gettime_ns();
}
}
else {
} else {
const char *tmp = obs_data_get_string(settings, "text");
if (!tmp || !*tmp) goto error;
if (!tmp || !*tmp)
goto error;
if (srcdata->text != NULL) {
bfree(srcdata->text);

6
plugins/text-freetype2/text-freetype2.h
View file

@ -30,8 +30,8 @@ struct glyph_info {
};
struct ft2_source {
char *font_name;
char *font_style;
char *font_name;
char *font_style;
uint16_t font_size;
uint32_t font_flags;
@ -54,7 +54,7 @@ struct ft2_source {
struct glyph_info *cacheglyphs[num_cache_slots];
FT_Face font_face;
FT_Face font_face;
uint8_t *texbuf;
gs_vertbuffer_t *vbuf;

137
plugins/text-freetype2/text-functionality.c
View file

@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "text-freetype2.h"
#include "obs-convenience.h"
float offsets[16] = { -2.0f, 0.0f, 0.0f, -2.0f, 2.0f, 0.0f, 2.0f, 0.0f,
0.0f, 2.0f, 0.0f, 2.0f, -2.0f, 0.0f, -2.0f, 0.0f };
float offsets[16] = {-2.0f, 0.0f, 0.0f, -2.0f, 2.0f, 0.0f, 2.0f, 0.0f,
0.0f, 2.0f, 0.0f, 2.0f, -2.0f, 0.0f, -2.0f, 0.0f};
extern uint32_t texbuf_w, texbuf_h;
@ -44,10 +44,10 @@ void draw_outlines(struct ft2_source *srcdata)
gs_matrix_push();
for (int32_t i = 0; i < 8; i++) {
gs_matrix_translate3f(offsets[i * 2], offsets[(i * 2) + 1],
0.0f);
0.0f);
draw_uv_vbuffer(srcdata->vbuf, srcdata->tex,
srcdata->draw_effect,
(uint32_t)wcslen(srcdata->text) * 6);
srcdata->draw_effect,
(uint32_t)wcslen(srcdata->text) * 6);
}
gs_matrix_identity();
gs_matrix_pop();
@ -70,8 +70,8 @@ void draw_drop_shadow(struct ft2_source *srcdata)
gs_matrix_push();
gs_matrix_translate3f(4.0f, 4.0f, 0.0f);
draw_uv_vbuffer(srcdata->vbuf, srcdata->tex,
srcdata->draw_effect, (uint32_t)wcslen(srcdata->text) * 6);
draw_uv_vbuffer(srcdata->vbuf, srcdata->tex, srcdata->draw_effect,
(uint32_t)wcslen(srcdata->text) * 6);
gs_matrix_identity();
gs_matrix_pop();
@ -105,16 +105,19 @@ void set_up_vertex_buffer(struct ft2_source *srcdata)
return;
}
srcdata->vbuf = create_uv_vbuffer((uint32_t)wcslen(srcdata->text) * 6,
true);
srcdata->vbuf =
create_uv_vbuffer((uint32_t)wcslen(srcdata->text) * 6, true);
if (srcdata->custom_width <= 100) goto skip_word_wrap;
if (!srcdata->word_wrap) goto skip_word_wrap;
if (srcdata->custom_width <= 100)
goto skip_word_wrap;
if (!srcdata->word_wrap)
goto skip_word_wrap;
len = wcslen(srcdata->text);
for (uint32_t i = 0; i <= len; i++) {
if (i == wcslen(srcdata->text)) goto eos_check;
if (i == wcslen(srcdata->text))
goto eos_check;
if (srcdata->text[i] != L' ' && srcdata->text[i] != L'\n')
goto next_char;
@ -125,7 +128,8 @@ void set_up_vertex_buffer(struct ft2_source *srcdata)
srcdata->text[space_pos] = L'\n';
x = 0;
}
if (i == wcslen(srcdata->text)) goto eos_skip;
if (i == wcslen(srcdata->text))
goto eos_skip;
x += word_width;
word_width = 0;
@ -134,8 +138,8 @@ void set_up_vertex_buffer(struct ft2_source *srcdata)
if (srcdata->text[i] == L' ')
space_pos = i;
next_char:;
glyph_index = FT_Get_Char_Index(srcdata->font_face,
srcdata->text[i]);
glyph_index =
FT_Get_Char_Index(srcdata->font_face, srcdata->text[i]);
word_width += src_glyph->xadv;
eos_skip:;
}
@ -148,7 +152,8 @@ skip_word_wrap:;
void fill_vertex_buffer(struct ft2_source *srcdata)
{
struct gs_vb_data *vdata = gs_vertexbuffer_get_data(srcdata->vbuf);
if (vdata == NULL || !srcdata->text) return;
if (vdata == NULL || !srcdata->text)
return;
struct vec2 *tvarray = (struct vec2 *)vdata->tvarray[0].array;
uint32_t *col = (uint32_t *)vdata->colors;
@ -163,28 +168,35 @@ void fill_vertex_buffer(struct ft2_source *srcdata)
bfree(srcdata->colorbuf);
srcdata->colorbuf = NULL;
}
srcdata->colorbuf = bzalloc(sizeof(uint32_t)*wcslen(srcdata->text) * 6);
srcdata->colorbuf =
bzalloc(sizeof(uint32_t) * wcslen(srcdata->text) * 6);
for (size_t i = 0; i < len * 6; i++) {
srcdata->colorbuf[i] = 0xFF000000;
}
for (size_t i = 0; i < len; i++) {
add_linebreak:;
if (srcdata->text[i] != L'\n') goto draw_glyph;
dx = 0; i++;
if (srcdata->text[i] != L'\n')
goto draw_glyph;
dx = 0;
i++;
dy += srcdata->max_h + 4;
if (i == wcslen(srcdata->text)) goto skip_glyph;
if (srcdata->text[i] == L'\n') goto add_linebreak;
if (i == wcslen(srcdata->text))
goto skip_glyph;
if (srcdata->text[i] == L'\n')
goto add_linebreak;
draw_glyph:;
// Skip filthy dual byte Windows line breaks
if (srcdata->text[i] == L'\r') goto skip_glyph;
if (srcdata->text[i] == L'\r')
goto skip_glyph;
glyph_index = FT_Get_Char_Index(srcdata->font_face,
srcdata->text[i]);
glyph_index =
FT_Get_Char_Index(srcdata->font_face, srcdata->text[i]);
if (src_glyph == NULL)
goto skip_glyph;
if (srcdata->custom_width < 100) goto skip_custom_width;
if (srcdata->custom_width < 100)
goto skip_custom_width;
if (dx + src_glyph->xadv > srcdata->custom_width) {
dx = 0;
@ -194,18 +206,13 @@ void fill_vertex_buffer(struct ft2_source *srcdata)
skip_custom_width:;
set_v3_rect(vdata->points + (cur_glyph * 6),
(float)dx + (float)src_glyph->xoff,
(float)dy - (float)src_glyph->yoff,
(float)src_glyph->w,
(float)src_glyph->h);
set_v2_uv(tvarray + (cur_glyph * 6),
src_glyph->u,
src_glyph->v,
src_glyph->u2,
src_glyph->v2);
set_rect_colors2(col + (cur_glyph * 6),
srcdata->color[0],
srcdata->color[1]);
(float)dx + (float)src_glyph->xoff,
(float)dy - (float)src_glyph->yoff,
(float)src_glyph->w, (float)src_glyph->h);
set_v2_uv(tvarray + (cur_glyph * 6), src_glyph->u, src_glyph->v,
src_glyph->u2, src_glyph->v2);
set_rect_colors2(col + (cur_glyph * 6), srcdata->color[0],
srcdata->color[1]);
dx += src_glyph->xadv;
if (dy - (float)src_glyph->yoff + src_glyph->h > max_y)
max_y = dy - src_glyph->yoff + src_glyph->h;
@ -228,12 +235,12 @@ void cache_standard_glyphs(struct ft2_source *srcdata)
srcdata->texbuf_x = 0;
srcdata->texbuf_y = 0;
cache_glyphs(srcdata, L"abcdefghijklmnopqrstuvwxyz" \
L"ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" \
L"!@#$%^&*()-_=+,<.>/?\\|[]{}`~ \'\"\0");
cache_glyphs(srcdata, L"abcdefghijklmnopqrstuvwxyz"
L"ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
L"!@#$%^&*()-_=+,<.>/?\\|[]{}`~ \'\"\0");
}
#define glyph_pos x + (y*slot->bitmap.pitch)
#define glyph_pos x + (y * slot->bitmap.pitch)
#define buf_pos (dx + x) + ((dy + y) * texbuf_w)
void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
@ -252,8 +259,8 @@ void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
size_t len = wcslen(cache_glyphs);
for (size_t i = 0; i < len; i++) {
glyph_index = FT_Get_Char_Index(srcdata->font_face,
cache_glyphs[i]);
glyph_index =
FT_Get_Char_Index(srcdata->font_face, cache_glyphs[i]);
if (src_glyph != NULL)
goto skip_glyph;
@ -264,7 +271,8 @@ void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
uint32_t g_w = slot->bitmap.width;
uint32_t g_h = slot->bitmap.rows;
if (srcdata->max_h < g_h) srcdata->max_h = g_h;
if (srcdata->max_h < g_h)
srcdata->max_h = g_h;
if (dx + g_w >= texbuf_w) {
dx = 0;
@ -272,7 +280,8 @@ void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
}
if (dy + g_h >= texbuf_h) {
blog(LOG_WARNING, "Out of space trying to render glyphs");
blog(LOG_WARNING,
"Out of space trying to render glyphs");
break;
}
@ -317,8 +326,9 @@ void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
gs_texture_destroy(tmp_texture);
}
srcdata->tex = gs_texture_create(texbuf_w, texbuf_h,
GS_A8, 1, (const uint8_t **)&srcdata->texbuf, 0);
srcdata->tex = gs_texture_create(
texbuf_w, texbuf_h, GS_A8, 1,
(const uint8_t **)&srcdata->texbuf, 0);
obs_leave_graphics();
}
@ -336,7 +346,7 @@ time_t get_modified_timestamp(char *filename)
return stats.st_mtime;
}
static void remove_cr(wchar_t* source)
static void remove_cr(wchar_t *source)
{
int j = 0;
for (int i = 0; source[i] != '\0'; ++i) {
@ -393,9 +403,9 @@ void load_text_from_file(struct ft2_source *srcdata, const char *filename)
bfree(srcdata->text);
srcdata->text = NULL;
}
srcdata->text = bzalloc((strlen(tmp_read) + 1)*sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, strlen(tmp_read),
srcdata->text, (strlen(tmp_read) + 1));
srcdata->text = bzalloc((strlen(tmp_read) + 1) * sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, strlen(tmp_read), srcdata->text,
(strlen(tmp_read) + 1));
remove_cr(srcdata->text);
bfree(tmp_read);
@ -431,16 +441,17 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
log_lines = srcdata->log_lines;
while (line_breaks <= log_lines && cur_pos != 0) {
if (!utf16) cur_pos--;
else cur_pos -= 2;
if (!utf16)
cur_pos--;
else
cur_pos -= 2;
fseek(tmp_file, cur_pos, SEEK_SET);
if (!utf16) {
bytes_read = fread(&bvalue, 1, 1, tmp_file);
if (bytes_read == 1 && bvalue == '\n')
line_breaks++;
}
else {
} else {
bytes_read = fread(&value, 2, 1, tmp_file);
if (bytes_read == 2 && value == L'\n')
line_breaks++;
@ -458,8 +469,8 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
srcdata->text = NULL;
}
srcdata->text = bzalloc(filesize - cur_pos);
bytes_read = fread(srcdata->text, (filesize - cur_pos), 1,
tmp_file);
bytes_read =
fread(srcdata->text, (filesize - cur_pos), 1, tmp_file);
remove_cr(srcdata->text);
bfree(tmp_read);
@ -476,9 +487,9 @@ void read_from_end(struct ft2_source *srcdata, const char *filename)
bfree(srcdata->text);
srcdata->text = NULL;
}
srcdata->text = bzalloc((strlen(tmp_read) + 1)*sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, strlen(tmp_read),
srcdata->text, (strlen(tmp_read) + 1));
srcdata->text = bzalloc((strlen(tmp_read) + 1) * sizeof(wchar_t));
os_utf8_to_wcs(tmp_read, strlen(tmp_read), srcdata->text,
(strlen(tmp_read) + 1));
remove_cr(srcdata->text);
bfree(tmp_read);
@ -499,10 +510,12 @@ uint32_t get_ft2_text_width(wchar_t *text, struct ft2_source *srcdata)
glyph_index = FT_Get_Char_Index(srcdata->font_face, text[i]);
FT_Load_Glyph(srcdata->font_face, glyph_index, FT_LOAD_DEFAULT);
if (text[i] == L'\n') w = 0;
if (text[i] == L'\n')
w = 0;
else {
w += slot->advance.x >> 6;
if (w > max_w) max_w = w;
if (w > max_w)
max_w = w;
}
}