This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/xawtv3.git tree:
Subject: Re-add locale to xawtv/motv/mtt Author: Mauro Carvalho Chehab <[email protected]> Date: Thu Feb 3 15:41:58 2011 -0200 Found a set of fonts that won't show warnings and work with the test setups we have. So, re-enable locales. Signed-off-by: Mauro Carvalho Chehab <[email protected]> x11/Xawtv.ad | 44 ++++++++++++-------------------------------- x11/motv.c | 18 +----------------- x11/mtt.c | 15 --------------- x11/xawtv.c | 17 ----------------- 4 files changed, 13 insertions(+), 81 deletions(-) --- http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=58c8c82d53541345bd75321609b1acd8bfcd0d89 diff --git a/x11/Xawtv.ad b/x11/Xawtv.ad index e83c0f3..63ca194 100644 --- a/x11/Xawtv.ad +++ b/x11/Xawtv.ad @@ -3,31 +3,16 @@ ! Strings Xawtv*international: true -! Modern X (with fontconfig system and unicode locales) -! works acceptable with these lines commented out. -! Feel free to uncomment it and choose the proper font(s) if needed. -!Xawtv*fontSet: \ -! -*-fixed-bold-r-normal-*-14-*-*-*-*-*-iso10646-1, \ -! -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -! -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -! -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \ -! -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \ -! -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \ -! -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \ -! -*-*-*-*-*-*-16-*-*-*-*-*-*-*, * +Xawtv*fontSet: \ + -misc-fixed-bold-r-normal--13-*-*-*-*-*-iso10646-1, \ + -misc-fixed-bold-r-normal--13-*-*-*-*-*-iso8859-* \ + -*-*-*-*--13-*-*-*-*-*-*-*,* TopLevelShell*international: true -! Modern X (with fontconfig system and unicode locales) -! works acceptable with these lines commented out. -! Feel free to uncomment it and choose the proper font(s) if needed. -!TopLevelShell*fontSet: \ -! -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -! -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -! -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \ -! -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \ -! -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \ -! -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \ -! -*-*-*-*-*-*-16-*-*-*-*-*-*-*,* +TopLevelShell*fontSet: \ + -misc-fixed-bold-r-normal--13-*-*-*-*-*-iso10646-1, \ + -misc-fixed-bold-r-normal--13-*-*-*-*-*-iso8859-* \ + -*-*-*-*--13-*-*-*-*-*-*-*,* *popup_help.title: Welcome to xawtv! xawtv.tv.help: \ @@ -387,15 +372,10 @@ xawtv.onscreen*background: black xawtv.onscreen*borderColor: black xawtv.onscreen*foreground: lightgreen xawtv.onscreen.label.justify: left -! Modern X (with fontconfig system and unicode locales) -! works acceptable with these lines commented out. -! Feel free to uncomment it and choose the proper font(s) if needed. -!xawtv.onscreen.label.fontSet: \ -! -*-ledfixed-medium-r-semicondensed--39-*-*-*-c-*-*-*, \ -! -*-bitstream vera sans-medium-r-normal--39-*-*-*-*-*-*-*, \ -! -*-luxi sans-medium-r-normal--39-*-*-*-*-*-*-*, \ -! -*-*-r-normal--39-*-*-*-*-*-*-*, \ -! -*-*-*-*--39-*-*-*-*-*-*-*,* +xawtv.onscreen.label.fontSet: \ + -misc-fixed-medium-r-normal--20-*-*-*-*-*-iso10646-1, \ + -misc-fixed-medium-r-normal--20-*-*-*-*-*-iso8859-* \ + -*-*-*-*--20-*-*-*-*-*-*-*,* xawtv.vtx.allowShellResize: true xawtv.vtx.label.resize: true diff --git a/x11/motv.c b/x11/motv.c index d8fb4a9..be0b126 100644 --- a/x11/motv.c +++ b/x11/motv.c @@ -3252,23 +3252,7 @@ main(int argc, char *argv[]) unsigned long freq; hello_world("motv"); -#if 0 - /* - * There are several issues with modern Xorg servers and - * UTF-8 fonts. Basically, on several setups, xawtv won't - * find a proper UTF-8, failing to load with: - * Warning: Missing charsets in String to FontSet conversion - * Warning: Unable to load any usable fontset - * Error: Aborting: no fontset found - * - * While disabling locale is not that a good idea, it is better - * to disable it than to fail completely. A proper fix would be - * to change its code to use some newer Xorg libraries, but this - * would be a major change. - */ - - XtSetLanguageProc(NULL,NULL,NULL); -#endif + XtSetLanguageProc(NULL,NULL,NULL); app_shell = XtVaAppInitialize(&app_context, "MoTV", opt_desc, opt_count, &argc, argv, diff --git a/x11/mtt.c b/x11/mtt.c index e9b4a01..eb4a622 100644 --- a/x11/mtt.c +++ b/x11/mtt.c @@ -204,22 +204,7 @@ main(int argc, char **argv) av = malloc(sizeof(char*)*(argc+1)); memcpy(av,argv,sizeof(char*)*(argc+1)); -#if 0 - /* - * There are several issues with modern Xorg servers and - * UTF-8 fonts. Basically, on several setups, xawtv won't - * find a proper UTF-8, failing to load with: - * Warning: Missing charsets in String to FontSet conversion - * Warning: Unable to load any usable fontset - * Error: Aborting: no fontset found - * - * While disabling locale is not that a good idea, it is better - * to disable it than to fail completely. A proper fix would be - * to change its code to use some newer Xorg libraries, but this - * would be a major change. - */ XtSetLanguageProc(NULL,NULL,NULL); -#endif XtToolkitInitialize(); app_context = XtCreateApplicationContext(); XtAppSetFallbackResources(app_context,fallback_ressources); diff --git a/x11/xawtv.c b/x11/xawtv.c index 144948a..bccf713 100644 --- a/x11/xawtv.c +++ b/x11/xawtv.c @@ -1585,24 +1585,7 @@ main(int argc, char *argv[]) progname = strdup(argv[0]); /* toplevel */ -#if 0 - /* - * There are several issues with modern Xorg servers and - * UTF-8 fonts. Basically, on several setups, xawtv won't - * find a proper UTF-8, failing to load with: - * Warning: Missing charsets in String to FontSet conversion - * Warning: Unable to load any usable fontset - * Error: Aborting: no fontset found - * - * While disabling locale is not that a good idea, it is better - * to disable it than to fail completely. A proper fix would be - * to change its code to use some newer Xorg libraries, but this - * would be a major change. - */ - XtSetLanguageProc(NULL,NULL,NULL); -#endif - app_shell = XtVaAppInitialize(&app_context, "Xawtv", opt_desc, opt_count, &argc, argv, _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
