* PERFORMANCE OF THIS SOFTWARE.
*/
+#include "fcint.h"
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include "fcint.h"
+/* Please do not revoke any of these bindings. */
+/* The __DUMMY__ object enables callers to distinguish the error return
+ * of FcObjectToPtrLookup from FC_FAMILY's FcObjectPtr, which would
+ * otherwise be 0. */
static const FcObjectType _FcBaseObjectTypes[] = {
+ { "__DUMMY__", FcTypeVoid, },
{ FC_FAMILY, FcTypeString, },
{ FC_FAMILYLANG, FcTypeString, },
{ FC_STYLE, FcTypeString, },
{ FC_DPI, FcTypeDouble },
{ FC_RGBA, FcTypeInteger, },
{ FC_SCALE, FcTypeDouble, },
-/* { FC_RENDER, FcTypeBool, },*/
{ FC_MINSPACE, FcTypeBool, },
+/* { FC_RENDER, FcTypeBool, },*/
{ FC_CHAR_WIDTH, FcTypeInteger },
{ FC_CHAR_HEIGHT, FcTypeInteger },
{ FC_MATRIX, FcTypeMatrix },
{ FC_CAPABILITY, FcTypeString },
{ FC_FONTFORMAT, FcTypeString },
{ FC_EMBOLDEN, FcTypeBool },
+ { FC_EMBEDDED_BITMAP, FcTypeBool },
};
#define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])
+static FcObjectType * _FcUserObjectNames = 0;
+static int user_obj_alloc = 0;
+static int next_basic_offset = NUM_OBJECT_TYPES;
+
typedef struct _FcObjectTypeList FcObjectTypeList;
struct _FcObjectTypeList {
const FcObjectTypeList *next;
const FcObjectType *types;
int ntypes;
+ int basic_offset;
};
static const FcObjectTypeList _FcBaseObjectTypesList = {
0,
_FcBaseObjectTypes,
- NUM_OBJECT_TYPES
+ NUM_OBJECT_TYPES,
+ 0
};
static const FcObjectTypeList *_FcObjectTypes = &_FcBaseObjectTypesList;
l->types = types;
l->ntypes = ntypes;
l->next = _FcObjectTypes;
+ l->basic_offset = next_basic_offset;
+ next_basic_offset += ntypes;
_FcObjectTypes = l;
return FcTrue;
}
-FcBool
-FcNameUnregisterObjectTypes (const FcObjectType *types, int ntypes)
+static FcBool
+FcNameUnregisterObjectTypesFree (const FcObjectType *types, int ntypes,
+ FcBool do_free)
{
const FcObjectTypeList *l, **prev;
if (l->types == types && l->ntypes == ntypes)
{
*prev = l->next;
- FcMemFree (FC_MEM_OBJECTTYPE, sizeof (FcObjectTypeList));
- free ((void *) l);
+ if (do_free) {
+ FcMemFree (FC_MEM_OBJECTTYPE, sizeof (FcObjectTypeList));
+ free ((void *) l);
+ }
return FcTrue;
}
}
return FcFalse;
}
+FcBool
+FcNameUnregisterObjectTypes (const FcObjectType *types, int ntypes)
+{
+ return FcNameUnregisterObjectTypesFree (types, ntypes, FcTrue);
+}
+
const FcObjectType *
FcNameGetObjectType (const char *object)
{
for (l = _FcObjectTypes; l; l = l->next)
{
+ if (l == (FcObjectTypeList*)_FcUserObjectNames)
+ continue;
+
for (i = 0; i < l->ntypes; i++)
{
t = &l->types[i];
return 0;
}
-static int objectptr_count = 1;
-static int objectptr_alloc = 0;
-static int * objectptr_indices = 0;
+#define OBJECT_HASH_SIZE 31
+struct objectBucket {
+ struct objectBucket *next;
+ FcChar32 hash;
+ int id;
+};
+static struct objectBucket *FcObjectBuckets[OBJECT_HASH_SIZE];
-void
-FcObjectNewBank(void)
-{
- objectptr_count = 1;
- objectptr_alloc = 0;
- objectptr_indices = 0;
-}
+/* Design constraint: biggest_known_ntypes must never change
+ * after any call to FcNameRegisterObjectTypes. */
+static const FcObjectType *biggest_known_types = _FcBaseObjectTypes;
+static FcBool allocated_biggest_known_types;
+static int biggest_known_ntypes = NUM_OBJECT_TYPES;
+static int biggest_known_count = 0;
+static char * biggest_ptr;
-// XXX todo: introduce a hashtable for faster lookup
-FcObjectPtr
-FcObjectToPtr (const char * object)
+
+static FcObjectPtr
+FcObjectToPtrLookup (const char * object)
{
- int i;
+ FcObjectPtr i = 0, n;
const FcObjectTypeList *l;
- const FcObjectType *t;
-
+ FcObjectType *t = _FcUserObjectNames;
+ FcBool replace;
+
for (l = _FcObjectTypes; l; l = l->next)
{
for (i = 0; i < l->ntypes; i++)
{
- t = &l->types[i];
+ t = (FcObjectType *)&l->types[i];
if (!strcmp (object, t->object))
- return i;
+ {
+ if (l->types == _FcUserObjectNames)
+ return -i;
+ else
+ return l->basic_offset + i;
+ }
}
}
- abort();
- return 0;
+
+ /* We didn't match. Look for the application's FcObjectTypeList
+ * and replace it in-place. */
+ for (l = _FcObjectTypes; l; l = l->next)
+ {
+ if (l->types == _FcUserObjectNames)
+ break;
+ }
+
+ replace = l && l->types == _FcUserObjectNames;
+ if (!_FcUserObjectNames ||
+ (replace && user_obj_alloc <= l->ntypes))
+ {
+ int nt = user_obj_alloc + 4;
+ FcObjectType * tt = realloc (_FcUserObjectNames,
+ nt * sizeof (FcObjectType));
+ if (!tt)
+ return 0;
+ _FcUserObjectNames = tt;
+ user_obj_alloc = nt;
+ }
+
+ if (replace)
+ {
+ n = l->ntypes;
+ FcNameUnregisterObjectTypesFree (l->types, l->ntypes, FcFalse);
+ }
+ else
+ n = 0;
+
+ FcNameRegisterObjectTypes (_FcUserObjectNames, n+1);
+
+ if (!_FcUserObjectNames)
+ return 0;
+
+ _FcUserObjectNames[n].object = object;
+ _FcUserObjectNames[n].type = FcTypeVoid;
+
+ return -n;
+}
+
+FcObjectPtr
+FcObjectToPtr (const char * name)
+{
+ FcChar32 hash = FcStringHash ((const FcChar8 *) name);
+ struct objectBucket **p;
+ struct objectBucket *b;
+ int size;
+
+ for (p = &FcObjectBuckets[hash % OBJECT_HASH_SIZE]; (b = *p); p = &(b->next)
+)
+ if (b->hash == hash && !strcmp (name, (char *) (b + 1)))
+ return b->id;
+ size = sizeof (struct objectBucket) + strlen (name) + 1;
+ /* workaround glibc bug which reads strlen in groups of 4 */
+ b = malloc (size + sizeof (int));
+ FcMemAlloc (FC_MEM_STATICSTR, size + sizeof(int));
+ if (!b)
+ return 0;
+ b->next = 0;
+ b->hash = hash;
+ b->id = FcObjectToPtrLookup (name);
+ strcpy ((char *) (b + 1), name);
+ *p = b;
+ return b->id;
+}
+
+void
+FcObjectStaticNameFini (void)
+{
+ int i, size;
+ struct objectBucket *b, *next;
+ char *name;
+
+ for (i = 0; i < OBJECT_HASH_SIZE; i++)
+ {
+ for (b = FcObjectBuckets[i]; b; b = next)
+ {
+ next = b->next;
+ name = (char *) (b + 1);
+ size = sizeof (struct objectBucket) + strlen (name) + 1;
+ FcMemFree (FC_MEM_STATICSTR, size);
+ free (b);
+ }
+ FcObjectBuckets[i] = 0;
+ }
}
const char *
FcObjectPtrU (FcObjectPtr si)
{
- return _FcObjectTypes->types[si].object;
+ const FcObjectTypeList *l;
+ int i, j;
+
+ if (si > 0)
+ {
+ if (si < biggest_known_ntypes)
+ return biggest_known_types[si].object;
+
+ j = 0;
+ for (l = _FcObjectTypes; l; l = l->next)
+ for (i = 0; i < l->ntypes; i++, j++)
+ if (j == si)
+ return l->types[i].object;
+ }
+
+ return _FcUserObjectNames[-si].object;
}
int
-FcObjectNeededBytes (FcObjectPtr si)
+FcObjectNeededBytes ()
{
- return 0;
+ int num = 0, i;
+ for (i = 0; i < biggest_known_ntypes; i++)
+ {
+ const char * t = biggest_known_types[i].object;
+ num = num + strlen(t) + 1;
+ }
+ biggest_known_count = num;
+ return num + sizeof(int);
}
-void *
-FcObjectDistributeBytes (FcCache * metadata, void * block_ptr)
+int
+FcObjectNeededBytesAlign (void)
{
- return block_ptr;
+ return fc_alignof (int) + fc_alignof (char);
}
-FcObjectPtr
-FcObjectSerialize (FcObjectPtr si)
+void *
+FcObjectDistributeBytes (FcCache * metadata, void * block_ptr)
{
- return si;
+ block_ptr = ALIGN (block_ptr, int);
+ *(int *)block_ptr = biggest_known_ntypes;
+ block_ptr = (int *) block_ptr + 1;
+ block_ptr = ALIGN (block_ptr, char);
+ biggest_ptr = block_ptr;
+ block_ptr = (char *) block_ptr + biggest_known_count;
+ return block_ptr;
}
void
-FcObjectUnserialize (FcCache metadata, FcConfig * config, void *block_ptr)
+FcObjectSerialize (void)
{
+ int i;
+ for (i = 0; i < biggest_known_ntypes; i++)
+ {
+ const char * t = biggest_known_types[i].object;
+ strcpy (biggest_ptr, t);
+ biggest_ptr = biggest_ptr + strlen(t) + 1;
+ }
}
-int
-FcObjectPtrCompare (const FcObjectPtr a, const FcObjectPtr b)
+void *
+FcObjectUnserialize (FcCache * metadata, void *block_ptr)
{
- return a - b;
+ int new_biggest;
+ block_ptr = ALIGN (block_ptr, int);
+ new_biggest = *(int *)block_ptr;
+ block_ptr = (int *) block_ptr + 1;
+ if (biggest_known_ntypes < new_biggest)
+ {
+ int i;
+ char * bp = (char *)block_ptr;
+ FcObjectType * bn;
+
+ bn = malloc (sizeof (const FcObjectType) * (new_biggest + 1));
+ if (!bn)
+ return 0;
+
+ for (i = 0; i < new_biggest; i++)
+ {
+ const FcObjectType * t = FcNameGetObjectType(bp);
+ if (t)
+ bn[i].type = t->type;
+ else
+ bn[i].type = FcTypeVoid;
+ bn[i].object = bp;
+ bp = bp + strlen(bp) + 1;
+ }
+
+ FcNameUnregisterObjectTypesFree (biggest_known_types, biggest_known_ntypes, FcFalse);
+ if (allocated_biggest_known_types)
+ {
+ free ((FcObjectTypeList *)biggest_known_types);
+ }
+ else
+ allocated_biggest_known_types = FcTrue;
+
+ FcNameRegisterObjectTypes (bn, new_biggest);
+ biggest_known_ntypes = new_biggest;
+ biggest_known_types = (const FcObjectType *)bn;
+ }
+ block_ptr = ALIGN (block_ptr, char);
+ block_ptr = (char *) block_ptr + biggest_known_count;
+ return block_ptr;
}
static const FcConstant _FcBaseConstants[] = {
v.u.i = atoi ((char *) string);
break;
case FcTypeString:
- v.u.s = FcObjectStaticName(string);
+ v.u.s = FcStrStaticName(string);
break;
case FcTypeBool:
if (!FcNameBool (string, &v.u.b))
for (;;)
{
name = FcNameFindNext (name, ":,", save, &delim);
- if (t)
+ if (t && strcmp (t->object, _FcBaseObjectTypes[0].object))
{
v = FcNameConvert (t->type, save, &m);
if (!FcPatternAdd (pat, t->object, v, FcTrue))
static FcBool
FcNameUnparseValue (FcStrBuf *buf,
- int bank,
FcValue *v0,
FcChar8 *escape)
{
{
while (FcValueListPtrU(v))
{
- if (!FcNameUnparseValue (buf, v.bank, &FcValueListPtrU(v)->value, escape))
+ if (!FcNameUnparseValue (buf, &FcValueListPtrU(v)->value, escape))
return FcFalse;
if (FcValueListPtrU(v = FcValueListPtrU(v)->next))
if (!FcNameUnparseString (buf, (FcChar8 *) ",", 0))
FcChar8 *
FcNameUnparse (FcPattern *pat)
+{
+ return FcNameUnparseEscaped (pat, FcTrue);
+}
+
+FcChar8 *
+FcNameUnparseEscaped (FcPattern *pat, FcBool escape)
{
FcStrBuf buf;
FcChar8 buf_static[8192];
e = FcPatternFindElt (pat, FC_FAMILY);
if (e)
{
- if (!FcNameUnparseValueList (&buf, e->values, (FcChar8 *) FC_ESCAPE_FIXED))
+ if (!FcNameUnparseValueList (&buf, e->values, escape ? (FcChar8 *) FC_ESCAPE_FIXED : 0))
goto bail0;
}
e = FcPatternFindElt (pat, FC_SIZE);
{
if (!FcNameUnparseString (&buf, (FcChar8 *) "-", 0))
goto bail0;
- if (!FcNameUnparseValueList (&buf, e->values, (FcChar8 *) FC_ESCAPE_FIXED))
+ if (!FcNameUnparseValueList (&buf, e->values, escape ? (FcChar8 *) FC_ESCAPE_FIXED : 0))
goto bail0;
}
for (l = _FcObjectTypes; l; l = l->next)
{
if (!FcNameUnparseString (&buf, (FcChar8 *) ":", 0))
goto bail0;
- if (!FcNameUnparseString (&buf, (FcChar8 *) o->object, (FcChar8 *) FC_ESCAPE_VARIABLE))
+ if (!FcNameUnparseString (&buf, (FcChar8 *) o->object, escape ? (FcChar8 *) FC_ESCAPE_VARIABLE : 0))
goto bail0;
if (!FcNameUnparseString (&buf, (FcChar8 *) "=", 0))
goto bail0;
- if (!FcNameUnparseValueList (&buf, e->values,
- (FcChar8 *) FC_ESCAPE_VARIABLE))
+ if (!FcNameUnparseValueList (&buf, e->values, escape ?
+ (FcChar8 *) FC_ESCAPE_VARIABLE : 0))
goto bail0;
}
}
git.wh0rd.org / fontconfig.git / blobdiff