X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.C;h=38053d0943d67970ebaf45fdbdd760788cbfad65;hb=0fbaff5c59fa1a3b93f5f9d344451f6aa57778d4;hp=e932af59411abeee197a8b2e7d415f4bb649d28b;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C
index e932af59..38053d09 100644
--- a/cinelerra-5.1/guicast/bcresources.C
+++ b/cinelerra-5.1/guicast/bcresources.C
@@ -59,6 +59,7 @@ char BC_Resources::region[LEN_LANG] = {0};
 char BC_Resources::encoding[LEN_ENCOD] = {0};
 const char *BC_Resources::wide_encoding = 0;
 ArrayList<BC_FontEntry*> *BC_Resources::fontlist = 0;
+int BC_Resources::font_debug = 0;
 const char *BC_Resources::fc_properties[] = { FC_SLANT, FC_WEIGHT, FC_WIDTH };
 #define LEN_FCPROP (sizeof(BC_Resources::fc_properties) / sizeof(const char*))
 
@@ -88,7 +89,7 @@ static const char *def_large_font_xft = "Sans:pixelsize=%.4f";           // 21.3
 static const char *def_large_b_font_xft = "Sans:bold:pixelsize=%.4f";    // 21.3333
 static const char *def_big_font_xft = "Sans:pixelsize=37.3333";          // 37.3333
 static const char *def_big_b_font_xft = "Sans:bold:pixelsize=37.33333";  // 37.3333
-static const char *def_clock_font_xft = "Sans:pixelsize=16";             // 16
+static const char *def_clock_font_xft = "Sans:pixelsize=%.4f";           // 16
 
 #define default_font_xft2 "-microsoft-verdana-*-*-*-*-*-*-*-*-*-*-*-*"
 
@@ -136,8 +137,8 @@ void BC_Resources::init_font_defs(double scale)
 	def_font(large_font2,      iround(scale*20));
 	def_font(big_font,         iround(scale*160), iround(scale*160));
 	def_font(big_font2,        iround(scale*16), iround(scale*16));
-	def_font(clock_font,       iround(scale*16), iround(scale*16));
-	def_font(clock_font2,      iround(scale*16), iround(scale*16));
+	def_font(clock_font,       iround(scale*16));
+	def_font(clock_font2,      iround(scale*18));
 	def_font(small_fontset,    iround(scale*10));
 	def_font(medium_fontset,   iround(scale*14));
 	def_font(large_fontset,    iround(scale*18));
@@ -151,7 +152,7 @@ void BC_Resources::init_font_defs(double scale)
 	def_font(large_b_font_xft, (scale*21.3333));
 	def_font(big_font_xft,     (scale*37.3333));
 	def_font(big_b_font_xft,   (scale*37.3333));
-	def_font(clock_font_xft,   (scale*16));
+	def_font(clock_font_xft,   (scale*16.));
 
 	set_font(small_font_xft2,  default_font_xft2);
 	set_font(medium_font_xft2, default_font_xft2);
@@ -199,22 +200,34 @@ suffix_to_type_t BC_Resources::suffix_to_type[] =
     { "aac", ICON_SOUND },
     { "ac3", ICON_SOUND },
     { "dts", ICON_SOUND },
+    { "f4a", ICON_SOUND },
     { "flac", ICON_SOUND },
+    { "m4a", ICON_SOUND },
     { "mp2", ICON_SOUND },
     { "mp3", ICON_SOUND },
+    { "mpc", ICON_SOUND },
+    { "oga", ICON_SOUND },
+    { "ogg", ICON_SOUND },
+    { "opus", ICON_SOUND },
+    { "ra", ICON_SOUND },
+    { "tta", ICON_SOUND },
+    { "vox", ICON_SOUND },
     { "wav", ICON_SOUND },
     { "wma", ICON_SOUND },
-    { "wmv", ICON_SOUND },
+    { "3gp", ICON_FILM },
     { "avi", ICON_FILM },
     { "bmp", ICON_FILM },
     { "cr2", ICON_FILM },
     { "dnxhd", ICON_FILM },
-    { "dvd", ICON_FILM },
+    { "drc", ICON_FILM },
     { "dv", ICON_FILM },
+    { "dvd", ICON_FILM },
+    { "exr", ICON_FILM },
     { "f4v", ICON_FILM },
     { "flv", ICON_FILM },
     { "gif", ICON_FILM },
     { "gxf", ICON_FILM },
+    { "h263", ICON_FILM },
     { "h264", ICON_FILM },
     { "h265", ICON_FILM },
     { "hevc", ICON_FILM },
@@ -224,15 +237,17 @@ suffix_to_type_t BC_Resources::suffix_to_type[] =
     { "m2t", ICON_FILM },
     { "m2ts", ICON_FILM },
     { "m2v", ICON_FILM },
+    { "m4p", ICON_FILM },
     { "m4v", ICON_FILM },
     { "mkv", ICON_FILM },
     { "mov", ICON_FILM },
     { "mp4", ICON_FILM },
+    { "mpe", ICON_FILM },
     { "mpeg", ICON_FILM },
     { "mpg", ICON_FILM },
+    { "mpv", ICON_FILM },
     { "mts", ICON_FILM },
     { "mxf", ICON_FILM },
-    { "ogg", ICON_FILM },
     { "ogv", ICON_FILM },
     { "pcm", ICON_FILM },
     { "pgm", ICON_FILM },
@@ -240,14 +255,17 @@ suffix_to_type_t BC_Resources::suffix_to_type[] =
     { "ppm", ICON_FILM },
     { "qt", ICON_FILM },
     { "rm", ICON_FILM },
+    { "rmvb", ICON_FILM },
+    { "rv", ICON_FILM },
     { "swf", ICON_FILM },
-    { "tiff", ICON_FILM },
     { "tif", ICON_FILM },
+    { "tiff", ICON_FILM },
     { "ts",  ICON_FILM },
     { "vob", ICON_FILM },
     { "vts", ICON_FILM },
     { "webm", ICON_FILM },
     { "webp", ICON_FILM },
+    { "wmv", ICON_FILM },
     { "xml", ICON_FILM },
     { "y4m", ICON_FILM },
     { 0, 0 },
@@ -344,7 +362,9 @@ BC_Resources::BC_Resources()
 	synchronous = 0;
 	vframe_shm = 0;
 	double default_scale = 1.0; // display_size/1000.;
-	char *env = getenv("BC_FONT_SCALE");
+	char *env = getenv("BC_FONT_DEBUG");
+	font_debug = env ? atoi(env) : 0;
+	env = getenv("BC_FONT_SCALE");
 	font_scale = env ? atof(env) : default_scale;
 	if( font_scale <= 0 ) font_scale = 1;
 	init_font_defs(font_scale);
@@ -966,17 +986,23 @@ int BC_Resources::init_fontconfig(const char *search_path)
 
 	char find_command[BCTEXTLEN];
 	char *fp = find_command, *ep = fp+sizeof(find_command)-1;
-	fp += snprintf(fp, ep-fp, "find '%s'", search_path);
+	fp += snprintf(fp, ep-fp, "%s", "find");
 	const char *bc_font_path = getenv("BC_FONT_PATH");
+// if BC_FONT_PATH starts with ':', omit default path
+	if( !(bc_font_path && bc_font_path[0] == ':') )
+		fp += snprintf(fp, ep-fp, " '%s'", search_path);
 	if( bc_font_path ) {
 		const char *path = bc_font_path;
-		for( int len=0; *path; path+=len ) {
-	                const char *cp = strchr(path,':');
-			len = !cp ? strlen(path) : cp-path;
+		while( *path ) {
 			char font_path[BCTEXTLEN];
-			memcpy(font_path, path, len);  font_path[len] = 0;
-			if( cp ) ++len;
-			fp += snprintf(fp, ep-fp, " '%s'", font_path);
+	                const char *cp = strchr(path,':');
+			int len = !cp ? strlen(path) : cp-path;
+			if( len > 0 ) {
+				memcpy(font_path, path, len);
+				font_path[len] = 0;  path += len;
+				fp += snprintf(fp, ep-fp, " '%s'", font_path);
+			}
+			if( cp ) ++path;
 		}
         }
 	fp += snprintf(fp, ep-fp, " -name 'fonts.scale' -print -exec cat {} \\;");
@@ -1123,11 +1149,16 @@ int BC_Resources::init_fontconfig(const char *search_path)
 			entry->style |= FL_WIDTH_NORMAL;
 
 		fontlist->append(entry);
+		if( font_debug )
+			dump_font_entry(stdout, "font 0: ", entry);
+
 //		printf("TitleMain::build_fonts %s: success\n",	entry->path);
 //printf("TitleMain::build_fonts 2\n");
 	}
 	pclose(in);
 
+	if( bc_font_path && bc_font_path[0] == ':' )
+		return 0;
 
 // Load all the fonts from fontconfig
 	FcPattern *pat;
@@ -1335,6 +1366,8 @@ int BC_Resources::init_fontconfig(const char *search_path)
 
 		}
 		fontlist->append(entry);
+		if( font_debug )
+			dump_font_entry(stdout, "font 1: ", entry);
 	}
 
 	FcFontSetDestroy(fs);
@@ -1544,6 +1577,8 @@ int BC_Resources::init_fontconfig(const char *search_path)
 			strcpy(entry->displayname, entry->family);
 		}
 		fontlist->append(entry);
+		if( font_debug )
+			dump_font_entry(stdout, "font 2: ", entry);
 	}
 	FcFontSetDestroy(fs);
 	return 0;
@@ -1753,13 +1788,16 @@ FcPattern* BC_Resources::find_similar_font(FT_ULong char_code, FcPattern *oldfon
 
 void BC_Resources::dump_fonts(FILE *fp)
 {
-	for( int i=0; i<fontlist->total; ++i ) {
-		BC_FontEntry *ep = fontlist->values[i];
-		fprintf(fp,"%s = %s\n",ep->displayname,ep->path);
-		fprintf(fp,"  %s:%s:%s:%s:%s:%s:%d:%d:%d:%d:%d:%s:%d:%s:%s:%d\n",
-			ep->foundry, ep->family, ep->weight, ep->slant, ep->swidth, ep->adstyle,
-			ep->pixelsize, ep->pointsize, ep->xres, ep->yres, ep->style, ep->spacing,
-			ep->avg_width, ep->registry, ep->encoding, ep->fixed_style);
-	}
+	for( int i=0; i<fontlist->total; ++i )
+		dump_font_entry(fp, "", fontlist->values[i]);
+}
+
+void BC_Resources::dump_font_entry(FILE *fp, const char *cp,  BC_FontEntry *ep)
+{
+	fprintf(fp,"%s%s = %s\n",cp,ep->displayname,ep->path);
+	fprintf(fp,"  %s:%s:%s:%s:%s:%s:%d:%d:%d:%d:%d:%s:%d:%s:%s:%d\n",
+		ep->foundry, ep->family, ep->weight, ep->slant, ep->swidth, ep->adstyle,
+		ep->pixelsize, ep->pointsize, ep->xres, ep->yres, ep->style, ep->spacing,
+		ep->avg_width, ep->registry, ep->encoding, ep->fixed_style);
 }