Hello community, here is the log from the commit of package xfontsel for openSUSE:Factory checked in at 2013-06-25 07:38:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfontsel (Old) and /work/SRC/openSUSE:Factory/.xfontsel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfontsel" Changes: -------- --- /work/SRC/openSUSE:Factory/xfontsel/xfontsel.changes 2012-05-08 12:05:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfontsel.new/xfontsel.changes 2013-06-25 14:47:28.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jun 23 17:58:30 UTC 2013 - [email protected] + +- Update to version 1.0.5: + + Use C99 struct initializer for parseRec in GetFontNames(). + + When font fails to load, grey out text instead of unmapping + text widget. + + Prevent memory leak in GetFontNames if no fonts are matched. + + Combine usage message strings. + +------------------------------------------------------------------- Old: ---- xfontsel-1.0.4.tar.bz2 New: ---- xfontsel-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfontsel.spec ++++++ --- /var/tmp/diff_new_pack.oXesfW/_old 2013-06-25 14:47:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oXesfW/_new 2013-06-25 14:47:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfontsel # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xfontsel -Version: 1.0.4 -Release: 1 -License: MIT +Version: 1.0.5 +Release: 0 Summary: Utility to display X11 font names -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(x11) ++++++ xfontsel-1.0.4.tar.bz2 -> xfontsel-1.0.5.tar.bz2 ++++++ ++++ 5902 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-1.0.4/ChangeLog new/xfontsel-1.0.5/ChangeLog --- old/xfontsel-1.0.4/ChangeLog 2012-03-23 06:31:15.000000000 +0100 +++ new/xfontsel-1.0.5/ChangeLog 2013-05-18 03:01:12.000000000 +0200 @@ -1,3 +1,64 @@ +commit f8aaa4ffae00fd97a393d2589f9c9579b5bac5ad +Author: Alan Coopersmith <[email protected]> +Date: Fri May 17 18:00:41 2013 -0700 + + xfontsel 1.0.5 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8de6cf335b27e89866d9b443f7f44f33ace8fad9 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 25 13:42:28 2013 -0800 + + Use C99 struct initializer for parseRec in GetFontNames() + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit afc3ec190b28caa4b470ca6617db7d9f009f586e +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 19 18:24:21 2013 -0800 + + When font fails to load, grey out text instead of unmapping text widget + + Before if you selected a pattern that couldn't load, such as a strange + encoding, the text widget would simply stop updating, giving the user + no feedback that they weren't seeing the selected font, and leaving + repaint turds from menus in the text area. Now we are more clear that + something is wrong, and clean up when menus overlap the text. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1c6e89d9dda4d41709abfed4522fd801799bfd30 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 19 17:13:28 2013 -0800 + + Remove extraneous braces left from commit 1d6970a838d4ed42a + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit bc51dd4cdf617ba44ed1231d411eb8d63616e371 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 26 22:58:14 2012 -0700 + + Prevent memory leak in GetFontNames if no fonts are matched + + Defer creating ParseRec until after we check for numFonts = 0 and return. + + Fixes error found by Parfait 0.5.0.2 bug checking tool: + Memory leak of pointer '<unknown>' allocated with XtMalloc(40) + at line 466 of app/xfontsel/xfontsel.c in function 'GetFontNames'. + pointer allocated at line 447 with XtMalloc(40). + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4faa8afa1856a015a63efb12a466b5fd060c1af5 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 14 01:08:43 2012 -0700 + + Combine usage message strings + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 67309809fee4ea1b7b4334d6245788ddea626dcf Author: Alan Coopersmith <[email protected]> Date: Thu Mar 22 22:30:31 2012 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-1.0.4/configure.ac new/xfontsel-1.0.5/configure.ac --- old/xfontsel-1.0.4/configure.ac 2012-03-23 06:30:42.000000000 +0100 +++ new/xfontsel-1.0.5/configure.ac 2013-05-18 03:00:51.000000000 +0200 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xfontsel], [1.0.4], +AC_INIT([xfontsel], [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xfontsel]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-1.0.4/missing new/xfontsel-1.0.5/missing --- old/xfontsel-1.0.4/missing 2012-03-23 06:30:52.000000000 +0100 +++ new/xfontsel-1.0.5/missing 2013-05-18 03:00:57.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-1.0.4/xfontsel.c new/xfontsel-1.0.5/xfontsel.c --- old/xfontsel-1.0.4/xfontsel.c 2012-03-23 06:30:42.000000000 +0100 +++ new/xfontsel-1.0.5/xfontsel.c 2013-05-18 03:00:51.000000000 +0200 @@ -148,27 +148,18 @@ {"-scaled", "scaledFonts", XrmoptionNoArg, "True"}, }; -static void Syntax(char *call) +static void Syntax(const char *call) { - fprintf (stderr, "usage: %s [-options ...] -fn font\n\n", call); - fprintf (stderr, "where options include:\n"); - fprintf (stderr, - " -display dpy X server to contact\n"); - fprintf (stderr, - " -geometry geom size and location of window\n"); - fprintf (stderr, - " -pattern fontspec font name pattern to match against\n"); - fprintf (stderr, - " -print print selected font name on exit\n"); - fprintf (stderr, - " -sample string sample text to use for 1-byte fonts\n"); - fprintf (stderr, - " -sample16 string sample text to use for 2-byte fonts\n"); - fprintf (stderr, - " -sampleUCS string sample text to use for ISO10646 fonts\n"); - fprintf (stderr, + fprintf (stderr, "usage: %s [-options ...] -fn font\n\n%s\n", call, + "where options include:\n" + " -display dpy X server to contact\n" + " -geometry geom size and location of window\n" + " -pattern fontspec font name pattern to match against\n" + " -print print selected font name on exit\n" + " -sample string sample text to use for 1-byte fonts\n" + " -sample16 string sample text to use for 2-byte fonts\n" + " -sampleUCS string sample text to use for ISO10646 fonts\n" " -scaled use scaled instances of fonts\n"); - fprintf (stderr, "\n"); exit (1); } @@ -341,10 +332,8 @@ viewPort = XtCreateManagedWidget("viewPort",viewportWidgetClass,pane,NZ); - { - sampleText = - XtCreateManagedWidget("sampleText",ucsLabelWidgetClass,viewPort,NZ); - } + sampleText = + XtCreateManagedWidget("sampleText",ucsLabelWidgetClass,viewPort,NZ); } XtRealizeWidget(topLevel); @@ -453,14 +442,13 @@ void GetFontNames(XtPointer closure) { Display *dpy = (Display*)closure; - ParseRec *parseRec = XtNew(ParseRec); + ParseRec *parseRec; int f, field, count; String *fontNames; Boolean *b; int work_priority = 0; - fontNames = parseRec->fontNames = - XListFonts(dpy, AppRes.pattern, 32767, &numFonts); + fontNames = XListFonts(dpy, AppRes.pattern, 32767, &numFonts); fonts = (FontValues*)XtMalloc( numFonts*sizeof(FontValues) ); fontInSet = (Boolean*)XtMalloc( numFonts*sizeof(Boolean) ); @@ -474,11 +462,16 @@ SetNoFonts(); return; } + count = matchingFontCount = numFonts; numBadFonts = 0; - parseRec->fonts = fonts; - parseRec->num_fonts = count = matchingFontCount = numFonts; - parseRec->fieldValues = fieldValues; - parseRec->start = 0; + parseRec = XtNew(ParseRec); + *parseRec = (ParseRec) { + .fontNames = fontNames, + .num_fonts = count, + .start = 0, + .fonts = fonts, + .fieldValues = fieldValues + }; /* this is bogus; the task should be responsible for quantizing...*/ while (count > PARSE_QUANTUM) { ParseRec *prevRec = parseRec; @@ -1122,7 +1115,7 @@ XFontStruct *font = XLoadQueryFont(dpy, currentFontNameString); String sample_text; if (font == NULL) - XtUnmapWidget(mapWidget); + XtSetSensitive(mapWidget, False); else { int nargs = 1; Arg args[3]; @@ -1147,6 +1140,7 @@ nargs = 3; } XtSetValues( sampleText, args, nargs ); + XtSetSensitive(mapWidget, True); XtMapWidget(mapWidget); if (sampleFont) XFreeFont( dpy, sampleFont ); sampleFont = font; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
