#include "fonts.h"
#include "language.h"
#include "vframe.h"
+#include "workarounds.h"
#include <string.h>
#include <iconv.h>
filebox_history[i].path[0] = 0;
#ifdef HAVE_XFT
- XftInitFtLibrary();
+ xftInit(0);
+ xftInitFtLibrary();
#endif
little_endian = (*(const u_int32_t*)"\01\0\0\0") & 1;
text_default = BLACK;
highlight_inverse = WHITE ^ BLUE;
text_background = WHITE;
+ text_background_disarmed = 0xc08080;
text_background_hi = LTYELLOW;
text_background_noborder_hi = LTGREY;
text_background_noborder = -1;
del_vframes(default_filebox_rename_images, 3);
del_vframes(default_filebox_delete_images, 3);
del_vframes(default_filebox_reload_images, 3);
- del_vframes(default_filebox_szfmt_images, 3);
+ del_vframes(default_filebox_szfmt_images, 12);
del_vframes(default_listbox_button, 4);
delete default_listbox_bg;
del_vframes(default_listbox_expand, 5);
FT_Library freetype_library = 0;
// FT_Face freetype_face = 0;
-// FT_Init_FreeType(&freetype_library);
+// ft_Init_FreeType(&freetype_library);
char line[BCTEXTLEN], current_dir[BCTEXTLEN];
current_dir[0] = 0;
FcConfig *config;
int i;
char tmpstring[BCTEXTLEN];
- if(!FcInit())
+ if(!fcInit())
return 1;
- config = FcConfigGetCurrent();
- FcConfigSetRescanInterval(config, 0);
+ config = fcConfigGetCurrent();
+ fcConfigSetRescanInterval(config, 0);
- pat = FcPatternCreate();
- os = FcObjectSetBuild ( FC_FAMILY, FC_FILE, FC_FOUNDRY, FC_WEIGHT,
+ pat = fcPatternCreate();
+ os = fcObjectSetBuild( FC_FAMILY, FC_FILE, FC_FOUNDRY, FC_WEIGHT,
FC_WIDTH, FC_SLANT, FC_FONTFORMAT, FC_SPACING, FC_STYLE, (char *) 0);
- FcPatternAddBool(pat, FC_SCALABLE, true);
+ fcPatternAddBool(pat, FC_SCALABLE, true);
if(language[0]) {
char langstr[LEN_LANG * 3];
strcat(langstr, region);
}
- FcLangSet *ls = FcLangSetCreate();
- if(FcLangSetAdd(ls, (const FcChar8*)langstr))
- if(FcPatternAddLangSet(pat, FC_LANG, ls))
- FcLangSetDestroy(ls);
+ FcLangSet *ls = fcLangSetCreate();
+ if(fcLangSetAdd(ls, (const FcChar8*)langstr))
+ if(fcPatternAddLangSet(pat, FC_LANG, ls))
+ fcLangSetDestroy(ls);
}
- fs = FcFontList(config, pat, os);
- FcPatternDestroy(pat);
- FcObjectSetDestroy(os);
+ fs = fcFontList(config, pat, os);
+ fcPatternDestroy(pat);
+ fcObjectSetDestroy(os);
for (i = 0; fs && i < fs->nfont; i++) {
FcPattern *font = fs->fonts[i];
force_style = 0;
- FcPatternGetString(font, FC_FONTFORMAT, 0, &format);
+ fcPatternGetString(font, FC_FONTFORMAT, 0, &format);
//on this point you can limit font search
if(limit_to_trutype && strcmp((char *)format, "TrueType"))
continue;
sprintf(tmpstring, "%s", format);
BC_FontEntry *entry = new BC_FontEntry;
- if(FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
+ if(fcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
entry->path = cstrdup((char*)file);
}
- if(FcPatternGetString(font, FC_FOUNDRY, 0, &foundry) == FcResultMatch) {
+ if(fcPatternGetString(font, FC_FOUNDRY, 0, &foundry) == FcResultMatch) {
entry->foundry = cstrdup((char*)foundry);
}
- if(FcPatternGetInteger(font, FC_WEIGHT, 0, &weight) == FcResultMatch) {
+ if(fcPatternGetInteger(font, FC_WEIGHT, 0, &weight) == FcResultMatch) {
switch(weight) {
case FC_WEIGHT_THIN:
case FC_WEIGHT_EXTRALIGHT:
}
}
- if(FcPatternGetString(font, FC_FAMILY, 0, &family) == FcResultMatch)
+ if(fcPatternGetString(font, FC_FAMILY, 0, &family) == FcResultMatch)
entry->family = cstrdup((char*)family);
- if(FcPatternGetInteger(font, FC_SLANT, 0, &slant) == FcResultMatch) {
+ if(fcPatternGetInteger(font, FC_SLANT, 0, &slant) == FcResultMatch) {
switch(slant) {
case FC_SLANT_ROMAN:
default:
}
}
- if(FcPatternGetInteger(font, FC_WIDTH, 0, &width) == FcResultMatch) {
+ if(fcPatternGetInteger(font, FC_WIDTH, 0, &width) == FcResultMatch) {
switch(width) {
case FC_WIDTH_ULTRACONDENSED:
entry->swidth = cstrdup("ultracondensed");
}
}
- if(FcPatternGetInteger(font, FC_SPACING, 0, &spacing) == FcResultMatch) {
+ if(fcPatternGetInteger(font, FC_SPACING, 0, &spacing) == FcResultMatch) {
switch(spacing) {
case 0:
default:
entry->registry = cstrdup("utf");
entry->encoding = cstrdup("8");
- if(!FcPatternGetString(font, FC_STYLE, 0, &style) == FcResultMatch)
+ if( fcPatternGetString(font, FC_STYLE, 0, &style) != FcResultMatch )
force_style = 0;
// If font has a style unmanaged by titler plugin, force style to be displayed on name
dump_font_entry(stdout, "font 1: ", entry);
}
- FcFontSetDestroy(fs);
+ fcFontSetDestroy(fs);
if(freetype_library)
- FT_Done_FreeType(freetype_library);
+ ft_Done_FreeType(freetype_library);
// for(int i = 0; i < fonts->total; i++)
// fonts->values[i]->dump();
- FcConfigAppFontAddDir(0, (const FcChar8*)search_path);
- FcConfigSetRescanInterval(0, 0);
+ fcConfigAppFontAddDir(0, (const FcChar8*)search_path);
+ fcConfigSetRescanInterval(0, 0);
- os = FcObjectSetBuild(FC_FAMILY, FC_FILE, FC_FOUNDRY, FC_WEIGHT,
+ os = fcObjectSetBuild(FC_FAMILY, FC_FILE, FC_FOUNDRY, FC_WEIGHT,
FC_WIDTH, FC_SLANT, FC_SPACING, FC_STYLE, (char *)0);
- pat = FcPatternCreate();
- FcPatternAddBool(pat, FC_SCALABLE, true);
+ pat = fcPatternCreate();
+ fcPatternAddBool(pat, FC_SCALABLE, true);
if(language[0])
{
strcat(langstr, region);
}
- FcLangSet *ls = FcLangSetCreate();
- if(FcLangSetAdd(ls, (const FcChar8*)langstr))
- if(FcPatternAddLangSet(pat, FC_LANG, ls))
- FcLangSetDestroy(ls);
+ FcLangSet *ls = fcLangSetCreate();
+ if(fcLangSetAdd(ls, (const FcChar8*)langstr))
+ if(fcPatternAddLangSet(pat, FC_LANG, ls))
+ fcLangSetDestroy(ls);
}
- fs = FcFontList(0, pat, os);
- FcPatternDestroy(pat);
- FcObjectSetDestroy(os);
+ fs = fcFontList(0, pat, os);
+ fcPatternDestroy(pat);
+ fcObjectSetDestroy(os);
for(int i = 0; i < fs->nfont; i++)
{
BC_FontEntry *entry = new BC_FontEntry;
FcChar8 *strvalue;
- if(FcPatternGetString(font, FC_FILE, 0, &strvalue) == FcResultMatch)
+ if(fcPatternGetString(font, FC_FILE, 0, &strvalue) == FcResultMatch)
{
entry->path = new char[strlen((char*)strvalue) + 1];
strcpy(entry->path, (char*)strvalue);
}
- if(FcPatternGetString(font, FC_FOUNDRY, 0, &strvalue) == FcResultMatch)
+ if(fcPatternGetString(font, FC_FOUNDRY, 0, &strvalue) == FcResultMatch)
{
entry->foundry = new char[strlen((char*)strvalue) + 1];
strcpy(entry->foundry, (char *)strvalue);
}
- if(FcPatternGetString(font, FC_FAMILY, 0, &strvalue) == FcResultMatch)
+ if(fcPatternGetString(font, FC_FAMILY, 0, &strvalue) == FcResultMatch)
{
entry->family = new char[strlen((char*)strvalue) + 2];
strcpy(entry->family, (char*)strvalue);
}
int intvalue;
- if(FcPatternGetInteger(font, FC_SLANT, 0, &intvalue) == FcResultMatch)
+ if(fcPatternGetInteger(font, FC_SLANT, 0, &intvalue) == FcResultMatch)
{
switch(intvalue)
{
}
}
- if(FcPatternGetInteger(font, FC_WEIGHT, 0, &intvalue) == FcResultMatch)
+ if(fcPatternGetInteger(font, FC_WEIGHT, 0, &intvalue) == FcResultMatch)
{
switch(intvalue)
{
}
}
- if(FcPatternGetInteger(font, FC_WIDTH, 0, &intvalue) == FcResultMatch)
+ if(fcPatternGetInteger(font, FC_WIDTH, 0, &intvalue) == FcResultMatch)
{
switch(intvalue)
{
break;
}
}
- if(FcPatternGetInteger(font, FC_SPACING, 0, &intvalue) == FcResultMatch)
+ if(fcPatternGetInteger(font, FC_SPACING, 0, &intvalue) == FcResultMatch)
{
switch(intvalue)
{
if( font_debug )
dump_font_entry(stdout, "font 2: ", entry);
}
- FcFontSetDestroy(fs);
+ fcFontSetDestroy(fs);
return 0;
}
return style_match;
}
+
+class utf8conv {
+ uint8_t *obfr, *out, *oend;
+ uint8_t *ibfr, *inp, *iend;
+public:
+ utf8conv(void *out, int olen, void *inp, int ilen) {
+ this->obfr = this->out = (uint8_t*)out;
+ this->oend = this->out + olen;
+ this->ibfr = this->inp = (uint8_t*)inp;
+ this->iend = this->inp + ilen;
+ }
+ int cur() { return inp>=iend ? -1 : *inp; }
+ int next() { return inp>=iend ? -1 : *inp++; }
+ int next(int ch) { return out>=oend ? -1 : *out++ = ch; }
+ int ilen() { return inp-ibfr; }
+ int olen() { return out-obfr; }
+ int wnext();
+ int wnext(unsigned int v);
+};
+
+int utf8conv::
+wnext(unsigned int v)
+{
+ if( v < 0x00000080 ) { next(v); return 1; }
+ int n = v < 0x00000800 ? 2 : v < 0x00010000 ? 3 :
+ v < 0x00200000 ? 4 : v < 0x04000000 ? 5 : 6;
+ int m = (0xff00 >> n), i = n-1;
+ next((v>>(6*i)) | m);
+ while( --i >= 0 ) next(((v>>(6*i)) & 0x3f) | 0x80);
+ return n;
+}
+
+int utf8conv::
+wnext()
+{
+ int v = 0, n = 0, ch = next();
+ if( ch == '\\' ) {
+ switch( (ch=next()) ) {
+ case 'n': return '\n';
+ case 't': return '\t';
+ case 'r': return '\r';
+ case 'b': return '\b';
+ case 'f': return '\f';
+ case 'v': return '\v';
+ case 'a': return '\a';
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
+ v = ch - '0';
+ for( int i=3; --i>0; v=v*8+ch, next() )
+ if( (ch=cur()-'0') < 0 || ch >= 8 ) break;
+ return v;
+ case 'x': n = 2; break;
+ case 'u': n = 4; break;
+ case 'U': n = 8; break;
+ default: return ch;
+ }
+ for( int i=n; --i>=0; v=v*16+ch, next() ) {
+ if( (ch=cur()-'0')>=0 && ch<10 ) continue;
+ if( (ch-='A'-'0'-10)>=10 && ch<16 ) continue;
+ if( (ch-='a'-'A')<10 || ch>=16 ) break;
+ }
+ }
+ else if( ch >= 0x80 ) {
+ static const unsigned char byts[] = {
+ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4, 5,
+ };
+ int i = ch - 0xc0;
+ n = i<0 ? 0 : byts[i/4];
+ for( v=ch, i=n; --i>=0; v+=next() ) v <<= 6;
+ static const unsigned int ofs[6] = {
+ 0x00000000U, 0x00003080U, 0x000E2080U,
+ 0x03C82080U, 0xFA082080U, 0x82082080U
+ };
+ v -= ofs[n];
+ }
+ else
+ v = ch;
+ return v;
+}
+
+
size_t BC_Resources::encode(const char *from_enc, const char *to_enc,
char *input, int input_length, char *output, int output_length)
{
- size_t inbytes, outbytes = 0;
- iconv_t cd;
- char *outbase = output;
-
- if(!from_enc || *from_enc == 0)
+ if( !from_enc || *from_enc == 0 ||
+ !strcmp(from_enc,"UTF8") || !strcmp(from_enc, "US-ASCII") )
from_enc = "UTF-8";
- if(!to_enc || *to_enc == 0)
+ if( !to_enc || *to_enc == 0 ||
+ !strcmp(to_enc,"UTF8") || !strcmp(to_enc, "US-ASCII") )
to_enc = "UTF-8";
- if(input_length < 0)
- inbytes = strlen(input);
- else
- inbytes = input_length;
-
- if(strcmp(from_enc, to_enc) && inbytes)
- {
- if((cd = iconv_open(to_enc, from_enc)) == (iconv_t)-1)
- {
+ iconv_t cd;
+ char *outbase = output;
+ size_t inbytes = input_length < 0 ? strlen(input) : input_length;
+ size_t outbytes = output_length;
+
+ if( inbytes && outbytes ) {
+ if( !strcmp(from_enc, to_enc) ) {
+ if( inbytes > outbytes ) inbytes = outbytes;
+ memcpy(output, input, inbytes);
+ output += inbytes;
+ outbytes -= inbytes;
+ }
+ else if( !strcmp(from_enc, "UTF-8") && !strcmp(to_enc,"UTF32LE") ) {
+ utf8conv uc(0,0, input,inbytes);
+ uint32_t *op = (uint32_t *)output;
+ uint32_t *ep = (uint32_t *)(output+output_length);
+ for( int wch; op<ep && (wch=uc.wnext())>=0; *op++=wch );
+ output = (char *)op;
+ outbytes = (char*)ep - output;
+ }
+ else if( !strcmp(from_enc, "UTF32LE") && !strcmp(to_enc,"UTF-8") ) {
+ utf8conv uc(output,output_length, 0,0);
+ uint32_t *ip = (uint32_t *)input;
+ uint32_t *ep = (uint32_t *)(input+inbytes);
+ for( ; ip<ep && uc.wnext(*ip)>=0; ++ip );
+ output += uc.olen();
+ outbytes -= uc.olen();
+ }
+ else if( (cd = iconv_open(to_enc, from_enc)) != (iconv_t)-1 ) {
+ iconv(cd, &input, &inbytes, &output, &outbytes);
+ iconv_close(cd);
+ }
+ else {
printf(_("Conversion from %s to %s is not available\n"),
from_enc, to_enc);
- return 0;
}
-
- outbytes = output_length - 1;
-
- iconv(cd, &input, &inbytes, &output, &outbytes);
-
- iconv_close(cd);
- inbytes = output - outbase;
}
- else if(inbytes)
- {
- memcpy(output, input, inbytes);
- outbytes -= inbytes;
- }
- for(int i = 0; i < 4; i++)
- {
+ if( outbytes > sizeof(uint32_t) )
+ outbytes = sizeof(uint32_t);
+ for( uint32_t i = 0; i < outbytes; i++)
output[i] = 0;
- if(outbytes-- == 0)
- break;
- }
- return inbytes;
+ return output - outbase;
}
void BC_Resources::encode_to_utf8(char *buffer, int buflen)
if(char_code < ' ')
return 0;
- if( (ofont = FcFreeTypeQueryFace(oldface, (const FcChar8*)"", 4097, 0)) != 0 ) {
+ if( (ofont = fcFreeTypeQueryFace(oldface, (const FcChar8*)"", 4097, 0)) != 0 ) {
if( (font = find_similar_font(char_code, ofont)) != 0 ) {
- if(FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
+ if(fcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
strcpy(path_new, (char*)file);
result = 1;
}
- FcPatternDestroy(font);
+ fcPatternDestroy(font);
}
- FcPatternDestroy(ofont);
+ fcPatternDestroy(ofont);
}
return result;
}
return 0;
fontconfig_lock.lock("BC_Resources::find_similar_font");
- pat = FcPatternCreate();
- os = FcObjectSetBuild(FC_FILE, FC_CHARSET, FC_SCALABLE, FC_FAMILY,
+ pat = fcPatternCreate();
+ os = fcObjectSetBuild(FC_FILE, FC_CHARSET, FC_SCALABLE, FC_FAMILY,
FC_SLANT, FC_WEIGHT, FC_WIDTH, (char *)0);
- FcPatternAddBool(pat, FC_SCALABLE, true);
- fcs = FcCharSetCreate();
- if(FcCharSetAddChar(fcs, char_code))
- FcPatternAddCharSet(pat, FC_CHARSET, fcs);
- FcCharSetDestroy(fcs);
+ fcPatternAddBool(pat, FC_SCALABLE, true);
+ fcs = fcCharSetCreate();
+ if(fcCharSetAddChar(fcs, char_code))
+ fcPatternAddCharSet(pat, FC_CHARSET, fcs);
+ fcCharSetDestroy(fcs);
for( int i=0; i<(int)LEN_FCPROP; ++i ) {
- if(FcPatternGetInteger(oldfont, fc_properties[i], 0, &ival) == FcResultMatch)
- FcPatternAddInteger(pat, fc_properties[i], ival);
+ if(fcPatternGetInteger(oldfont, fc_properties[i], 0, &ival) == FcResultMatch)
+ fcPatternAddInteger(pat, fc_properties[i], ival);
}
- fs = FcFontList(0, pat, os);
+ fs = fcFontList(0, pat, os);
for( int i=LEN_FCPROP; --i>=0 && !fs->nfont; ) {
- FcFontSetDestroy(fs);
- FcPatternDel(pat, fc_properties[i]);
- fs = FcFontList(0, pat, os);
+ fcFontSetDestroy(fs);
+ fcPatternDel(pat, fc_properties[i]);
+ fs = fcFontList(0, pat, os);
}
- FcPatternDestroy(pat);
- FcObjectSetDestroy(os);
+ fcPatternDestroy(pat);
+ fcObjectSetDestroy(os);
pat = 0;
for (int i = 0; i < fs->nfont; i++)
{
font = fs->fonts[i];
- if(FcPatternGetCharSet(font, FC_CHARSET, 0, &fcs) == FcResultMatch)
+ if(fcPatternGetCharSet(font, FC_CHARSET, 0, &fcs) == FcResultMatch)
{
- if(FcCharSetHasChar(fcs, char_code))
+ if(fcCharSetHasChar(fcs, char_code))
{
- pat = FcPatternDuplicate(font);
+ pat = fcPatternDuplicate(font);
break;
}
}
}
- FcFontSetDestroy(fs);
+ fcFontSetDestroy(fs);
fontconfig_lock.unlock();
return pat;