Minor

[framework/uifw/harfbuzz.git] / src / hb-common.cc

diff --git a/src/hb-common.cc b/src/hb-common.cc
index 368789a..a886474 100644 (file)
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -28,7 +28,12 @@
 
 #include "hb-private.hh"
 
+#include "hb-version.h"
+
 #include "hb-mutex-private.hh"
+#include "hb-object-private.hh"
+
+#include <locale.h>
 
 HB_BEGIN_DECLS
 
@@ -157,25 +162,46 @@ struct hb_language_item_t {
   void finish (void) { free (lang); }
 };
 
-static hb_threadsafe_set_t<hb_language_item_t> langs;
+static hb_static_mutex_t langs_lock;
+static hb_lockable_set_t<hb_language_item_t, hb_static_mutex_t> langs;
 
 hb_language_t
 hb_language_from_string (const char *str)
 {
   if (!str || !*str)
-    return NULL;
+    return HB_LANGUAGE_INVALID;
 
-  hb_language_item_t *item = langs.find_or_insert (str);
+  hb_language_item_t *item = langs.find_or_insert (str, langs_lock);
 
-  return likely (item) ? item->lang : NULL;
+  return likely (item) ? item->lang : HB_LANGUAGE_INVALID;
 }
 
 const char *
 hb_language_to_string (hb_language_t language)
 {
+  /* This is actually NULL-safe! */
   return language->s;
 }
 
+hb_language_t
+hb_language_get_default (void)
+{
+  static hb_language_t default_language;
+
+  if (!default_language) {
+    /* This block is not quite threadsafe, but is not as bad as
+     * it looks since it's idempotent.  As long as pointer ops
+     * are atomic, we are safe. */
+
+    /* I hear that setlocale() doesn't honor env vars on Windows,
+     * but for now we ignore that. */
+
+    default_language = hb_language_from_string (setlocale (LC_CTYPE, NULL));
+  }
+
+  return default_language;
+}
+
 
 /* hb_script_t */
 
@@ -261,4 +287,74 @@ hb_script_get_horizontal_direction (hb_script_t script)
 }
 
 
+/* hb_user_data_array_t */
+
+
+/* NOTE: Currently we use a global lock for user_data access
+ * threadsafety.  If one day we add a mutex to any object, we
+ * should switch to using that insted for these too.
+ */
+
+static hb_static_mutex_t user_data_lock;
+
+bool
+hb_user_data_array_t::set (hb_user_data_key_t *key,
+                          void *              data,
+                          hb_destroy_func_t   destroy)
+{
+  if (!key)
+    return false;
+
+  if (!data && !destroy) {
+    items.remove (key, user_data_lock);
+    return true;
+  }
+  hb_user_data_item_t item = {key, data, destroy};
+  bool ret = !!items.replace_or_insert (item, user_data_lock);
+
+  return ret;
+}
+
+void *
+hb_user_data_array_t::get (hb_user_data_key_t *key)
+{
+  hb_user_data_item_t item = {NULL };
+
+  return items.find (key, &item, user_data_lock) ? item.data : NULL;
+}
+
+void
+hb_user_data_array_t::finish (void)
+{
+  items.finish (user_data_lock);
+}
+
+
+/* hb_version */
+
+void
+hb_version (unsigned int *major,
+           unsigned int *minor,
+           unsigned int *micro)
+{
+  *major = HB_VERSION_MAJOR;
+  *minor = HB_VERSION_MINOR;
+  *micro = HB_VERSION_MICRO;
+}
+
+const char *
+hb_version_string (void)
+{
+  return HB_VERSION_STRING;
+}
+
+hb_bool_t
+hb_version_check (unsigned int major,
+                 unsigned int minor,
+                 unsigned int micro)
+{
+  return HB_VERSION_CHECK (major, minor, micro);
+}
+
+
 HB_END_DECLS