diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-18 00:50:22 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-18 00:50:22 +0400 |
commit | 66a679d71f15b8c6b0ba4e1c8895ef1824b93a56 (patch) | |
tree | 9ca3086f7efa3560dfae8ab4c6c25f3ffbc7a415 /source/blender/editors | |
parent | e07b807357a4667db5de02df1e8f6b27775ca389 (diff) |
i18n: replace gnu unifont with droid sans font
- Static variables can be initialized with constants only.
- Removed bunifont.ttf.c from datafiles -- it's not actually a
data file. Unicode font loading stuff is not in blenkernel/font.c
- Allocate as much memory for unzipped data as it's needed.
Default read chunk is 512Kb.
- Fixed regression (or just a typo) in setting utf locale.
- Default locale set to en_US:en works fine now.
- Commented put Nepali language in user preferences -- it's
not supported by current droid font and imo it's better to
have nice font for languages we actually have translation for
rather than allowing to choose more languages in user preferences.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 1 | ||||
-rwxr-xr-x | source/blender/editors/datafiles/bunifont.ttf.c | 39 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_style.c | 13 |
3 files changed, 12 insertions, 41 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index fc85dcf5fa8..a31b3c3b2bd 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -32,7 +32,6 @@ set(INC_SYS set(SRC Bfont.c bfont.ttf.c - bunifont.ttf.c ) if(WITH_BLENDER) diff --git a/source/blender/editors/datafiles/bunifont.ttf.c b/source/blender/editors/datafiles/bunifont.ttf.c deleted file mode 100755 index 7af80842e50..00000000000 --- a/source/blender/editors/datafiles/bunifont.ttf.c +++ /dev/null @@ -1,39 +0,0 @@ -/** \file blender/editors/datafiles/bunifont.ttf.c - * \ingroup eddatafiles - */ -/* DataToC output of file <bfont_ttf> */ - -#include <stdio.h> -#include "BLI_path_util.h" -#include "BLI_string.h" -#include "BLI_fileops.h" -#include "BLI_memarena.h" -#include "MEM_guardedalloc.h" - -const int datatoc_bunifont_ttf_size = 16179552; -static char* datatoc_bunifont_ttf = 0; - -static char unifont_path[1024]; -const char unifont_filename[]="unifont.ttf.gz"; - -char *get_datatoc_bunifont_ttf(void) -{ - if( datatoc_bunifont_ttf==NULL ) - { - char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); - BLI_snprintf( unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename ); - - if( BLI_exists(unifont_path) ) - { - datatoc_bunifont_ttf = (char*)MEM_mallocN( datatoc_bunifont_ttf_size, "get_datatoc_bunifont_ttf" ); - BLI_ungzip_to_mem( unifont_path, datatoc_bunifont_ttf, datatoc_bunifont_ttf_size ); - } - } - return datatoc_bunifont_ttf; -} - -void free_datatoc_bunifont_ttf(void) -{ - if( datatoc_bunifont_ttf!=NULL ) - MEM_freeN( datatoc_bunifont_ttf ); -} diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index af3d1c2d5e6..d242da8e480 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -44,6 +44,7 @@ #include "BLI_string.h" #include "BKE_global.h" +#include "BKE_font.h" #include "BLF_api.h" @@ -321,7 +322,17 @@ void uiStyleInit(void) for(font= U.uifonts.first; font; font= font->next) { if(font->uifont_id==UIFONT_DEFAULT) { - font->blf_id= BLF_load_mem_unique("default", (unsigned char *)get_datatoc_bunifont_ttf(), datatoc_bunifont_ttf_size); +#ifdef INTERNATIONAL + int unifont_size; + unsigned char *unifont_ttf= BKE_font_get_unifont(&unifont_size); + + if(unifont_ttf) + font->blf_id= BLF_load_mem_unique("default", unifont_ttf, unifont_size); + else + font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); +#else + font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); +#endif } else { font->blf_id= BLF_load(font->filename); |