Inline FcDebug invocations and only initialize once, in FcInit*. Improve

[fontconfig.git] / src / fcdbg.c

diff --git a/src/fcdbg.c b/src/fcdbg.c
index e519d1057ab1f33d822ba076ff42ab4882a3cc13..607ddc1e46fc916759df50b4fc4801a367ed576b 100644 (file)
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcdbg.c,v 1.10 2002/08/22 18:53:22 keithp Exp $
+ * $RCSId: xc/lib/fontconfig/src/fcdbg.c,v 1.10 2002/08/22 18:53:22 keithp Exp $
  *
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2000 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -34,10 +34,10 @@ FcValuePrint (const FcValue v)
        printf (" <void>");
        break;
     case FcTypeInteger:
-       printf (" %d", v.u.i);
+       printf (" %d(i)", v.u.i);
        break;
     case FcTypeDouble:
-       printf (" %g", v.u.d);
+       printf (" %g(f)", v.u.d);
        break;
     case FcTypeString:
        printf (" \"%s\"", v.u.s);
@@ -52,7 +52,8 @@ FcValuePrint (const FcValue v)
        printf (" set");
        break;
     case FcTypeLangSet:
-       printf (" langset");
+       printf (" ");
+       FcLangSetPrint (v.u.l);
        break;
     case FcTypeFTFace:
        printf (" face");
@@ -61,16 +62,39 @@ FcValuePrint (const FcValue v)
 }
 
 void
-FcValueListPrint (const FcValueList *l)
+FcValueListPrint (FcValueListPtr l)
 {
-    for (; l; l = l->next)
+    for (; FcValueListPtrU(l); l = FcValueListPtrU(l)->next)
     {
-       FcValuePrint (l->value);
-       if (l->binding == FcValueBindingWeak)
+       FcValuePrint (FcValueCanonicalize(&FcValueListPtrU(l)->value));
+       switch (FcValueListPtrU(l)->binding) {
+       case FcValueBindingWeak:
            printf ("(w)");
+           break;
+       case FcValueBindingStrong:
+           printf ("(s)");
+           break;
+       case FcValueBindingSame:
+           printf ("(=)");
+           break;
+       }
     }
 }
 
+void
+FcLangSetPrint (const FcLangSet *ls)
+{
+    FcStrBuf   buf;
+    FcChar8    init_buf[1024];
+    
+    FcStrBufInit (&buf, init_buf, sizeof (init_buf));
+    if (FcNameUnparseLangSet (&buf, ls) && FcStrBufChar (&buf,'\0'))
+       printf ("%s", buf.buf);
+    else
+       printf ("langset (alloc error)");
+    FcStrBufDestroy (&buf);
+}
+
 void
 FcPatternPrint (const FcPattern *p)
 {
@@ -82,11 +106,11 @@ FcPatternPrint (const FcPattern *p)
        printf ("Null pattern\n");
        return;
     }
-    printf ("Pattern %d of %d\n", p->num, p->size);
+    printf ("Pattern has %d elts (size %d)\n", p->num, p->size);
     for (i = 0; i < p->num; i++)
     {
-       e = &p->elts[i];
-       printf ("\t%s:", e->object);
+       e = FcPatternEltU(p->elts) + i;
+       printf ("\t%s:", FcObjectPtrU(e->object));
        FcValueListPrint (e->values);
        printf ("\n");
     }
@@ -129,6 +153,11 @@ FcOpPrint (FcOp op)
     case FcOpNot: printf ("Not"); break;
     case FcOpNil: printf ("Nil"); break;
     case FcOpComma: printf ("Comma"); break;
+    case FcOpFloor: printf ("Floor"); break;
+    case FcOpCeil: printf ("Ceil"); break;
+    case FcOpRound: printf ("Round"); break;
+    case FcOpTrunc: printf ("Trunc"); break;
+    case FcOpListing: printf ("Listing"); break;
     case FcOpInvalid: printf ("Invalid"); break;
     }
 }
@@ -136,7 +165,8 @@ FcOpPrint (FcOp op)
 void
 FcExprPrint (const FcExpr *expr)
 {
-    switch (expr->op) {
+    if (!expr) printf ("none");
+    else switch (expr->op) {
     case FcOpInteger: printf ("%d", expr->u.ival); break;
     case FcOpDouble: printf ("%g", expr->u.dval); break;
     case FcOpString: printf ("\"%s\"", expr->u.sval); break;
@@ -172,6 +202,7 @@ FcExprPrint (const FcExpr *expr)
     case FcOpMore:
     case FcOpMoreEqual:
     case FcOpContains:
+    case FcOpListing:
     case FcOpNotContains:
     case FcOpPlus:
     case FcOpMinus:
@@ -196,6 +227,7 @@ FcExprPrint (const FcExpr *expr)
        case FcOpMore: printf ("More"); break;
        case FcOpMoreEqual: printf ("MoreEqual"); break;
        case FcOpContains: printf ("Contains"); break;
+       case FcOpListing: printf ("Listing"); break;
        case FcOpNotContains: printf ("NotContains"); break;
        case FcOpPlus: printf ("Plus"); break;
        case FcOpMinus: printf ("Minus"); break;
@@ -211,6 +243,22 @@ FcExprPrint (const FcExpr *expr)
        printf ("Not ");
        FcExprPrint (expr->u.tree.left);
        break;
+    case FcOpFloor:
+       printf ("Floor ");
+       FcExprPrint (expr->u.tree.left);
+       break;
+    case FcOpCeil:
+       printf ("Ceil ");
+       FcExprPrint (expr->u.tree.left);
+       break;
+    case FcOpRound:
+       printf ("Round ");
+       FcExprPrint (expr->u.tree.left);
+       break;
+    case FcOpTrunc:
+       printf ("Trunc ");
+       FcExprPrint (expr->u.tree.left);
+       break;
     case FcOpInvalid: printf ("Invalid"); break;
     }
 }
@@ -291,25 +339,19 @@ FcFontSetPrint (const FcFontSet *s)
     }
 }
 
-int
-FcDebug (void)
+int FcDebugVal;
+
+void
+FcInitDebug (void)
 {
-    static int  initialized;
-    static int  debug;
+    char    *e;
 
-    if (!initialized)
+    e = getenv ("FC_DEBUG");
+    if (e)
     {
-       char    *e;
-
-       initialized = 1;
-       e = getenv ("FC_DEBUG");
-       if (e)
-       {
-           printf ("FC_DEBUG=%s\n", e);
-           debug = atoi (e);
-           if (debug < 0)
-               debug = 0;
-       }
+        printf ("FC_DEBUG=%s\n", e);
+        FcDebugVal = atoi (e);
+        if (FcDebugVal < 0)
+           FcDebugVal = 0;
     }
-    return debug;
 }