aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/fc-match/fc-match.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-21 14:40:39 +0200
committermarha <marha@users.sourceforge.net>2011-06-21 14:40:39 +0200
commit8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (patch)
tree033ceda857988a1f0ca49e35eb848e37e281631f /fontconfig/fc-match/fc-match.c
parent4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff)
downloadvcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.gz
vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.bz2
vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.zip
fontconfig mesa git update 21 June 2011
Diffstat (limited to 'fontconfig/fc-match/fc-match.c')
-rw-r--r--fontconfig/fc-match/fc-match.c38
1 files changed, 9 insertions, 29 deletions
diff --git a/fontconfig/fc-match/fc-match.c b/fontconfig/fc-match/fc-match.c
index 48ba6cfe8..e64b4bcdd 100644
--- a/fontconfig/fc-match/fc-match.c
+++ b/fontconfig/fc-match/fc-match.c
@@ -195,6 +195,14 @@ main (int argc, char **argv)
}
FcPatternDestroy (pat);
+ if (!format)
+ {
+ if (os)
+ format = "%{=unparse}\n";
+ else
+ format = "%{=fcmatch}\n";
+ }
+
if (fs)
{
int j;
@@ -209,7 +217,7 @@ main (int argc, char **argv)
{
FcPatternPrint (font);
}
- else if (format)
+ else
{
FcChar8 *s;
@@ -220,34 +228,6 @@ main (int argc, char **argv)
free (s);
}
}
- else if (os)
- {
- FcChar8 *str;
- str = FcNameUnparse (font);
- printf ("%s\n", str);
- free (str);
- }
- else
- {
- FcChar8 *family;
- FcChar8 *style;
- FcChar8 *file;
-
- if (FcPatternGetString (font, FC_FILE, 0, &file) != FcResultMatch)
- file = (FcChar8 *) "<unknown filename>";
- else
- {
- FcChar8 *slash = (FcChar8 *) strrchr ((char *) file, '/');
- if (slash)
- file = slash+1;
- }
- if (FcPatternGetString (font, FC_FAMILY, 0, &family) != FcResultMatch)
- family = (FcChar8 *) "<unknown family>";
- if (FcPatternGetString (font, FC_STYLE, 0, &style) != FcResultMatch)
- style = (FcChar8 *) "<unknown style>";
-
- printf ("%s: \"%s\" \"%s\"\n", file, family, style);
- }
FcPatternDestroy (font);
}