X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.h;h=1c73f71377c8d342b69ea02a7f464712ee19fb68;hb=0a0a29dd9e484b5622b46173d51bb6cefc0a5da4;hp=978425aeb86a7635fc07af00392e752284e6ec0e;hpb=65eb7d06c462c2caaa7fabcb8956add9e6b8abc7;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcresources.h b/cinelerra-5.1/guicast/bcresources.h index 978425ae..1c73f713 100644 --- a/cinelerra-5.1/guicast/bcresources.h +++ b/cinelerra-5.1/guicast/bcresources.h @@ -139,7 +139,8 @@ public: // color for progress text int progress_text; - +// set focus on enter + int grab_input_focus; int menu_highlighted_fontcolor; @@ -276,7 +277,7 @@ public: int drag_radius; // Filebox - static suffix_to_type_t suffix_to_type[TOTAL_SUFFIXES]; + static suffix_to_type_t suffix_to_type[]; VFrame **type_to_icon; // Display mode for fileboxes int filebox_mode; @@ -303,33 +304,32 @@ public: int directory_color; int file_color; double font_scale, icon_scale; - // fonts - static const char *small_font; - static const char *medium_font; - static const char *large_font; - static const char *big_font; -// Backup of fonts in case the first choices don't exist - static const char *small_font2; - static const char *medium_font2; - static const char *large_font2; - static const char *big_font2; + static const char *small_font, *small_font2; + static const char *medium_font, *medium_font2; + static const char *large_font, *large_font2; + static const char *big_font, *big_font2; + static const char *clock_font, *clock_font2; static const char *small_fontset; static const char *medium_fontset; static const char *large_fontset; static const char *big_fontset; + static const char *clock_fontset; static const char *small_font_xft, *small_b_font_xft; static const char *medium_font_xft, *medium_b_font_xft; static const char *large_font_xft, *large_b_font_xft; static const char *big_font_xft, *big_b_font_xft; + static const char *clock_font_xft, *clock_b_font_xft; // Backup of fonts in case the first choices don't exist static const char *small_font_xft2; static const char *medium_font_xft2; static const char *large_font_xft2; static const char *big_font_xft2; + static const char *clock_font_xft2; + void init_font_defs(double scale); void finit_font_defs(); @@ -359,7 +359,9 @@ public: static size_t encode(const char *from_enc, const char *to_enc, char *input, int input_length, char *output, int output_length); static int find_font_by_char(FT_ULong char_code, char *path_new, const FT_Face oldface); + static int font_debug; static void dump_fonts(FILE *fp = stdout); + static void dump_font_entry(FILE *fp, const char *cp, BC_FontEntry *ep); static void new_vframes(int n, VFrame *vframes[], ...); static void del_vframes(VFrame *vframes[], int n);