node-gtk 0.14.0 → 2.0.0

package/src/gobject.cc

@@ -4,13 +4,11 @@
 #include "boxed.h"
 #include "callback.h"
 #include "closure.h"
-#include "debug.h"
 #include "error.h"
 #include "function.h"
 #include "gi.h"
 #include "gobject.h"
 #include "macros.h"
-#include "type.h"
 #include "util.h"
 #include "value.h"
 
@@ -21,7 +19,6 @@ using v8::Function;
 using v8::FunctionTemplate;
 using v8::Local;
 using v8::MaybeLocal;
-using v8::Number;
 using v8::Object;
 using v8::String;
 using Nan::New;
@@ -62,12 +59,18 @@ static GObject* CreateGObjectFromObject(GType gtype, Local<Value> object) {
 
     for (int i = 0; i < n_properties; i++) {
         Local<String> name = TO_STRING (Nan::Get(properties, i).ToLocalChecked());
-        const char *name_string = g_strdup (*Nan::Utf8String(name));
+        // Accept camelCase property names (e.g. iconName) in addition to
+        // dashed/underscored ones; GObject canonicalizes '_' to '-' but not
+        // camelCase, so convert here (#320). The original spelling is kept so
+        // an unknown name is reported as the user wrote it.
+        Nan::Utf8String name_original (name);
+        char *name_string = Util::ToDashed (*name_original);
         Local<Value> value = Nan::Get(property_hash, name).ToLocalChecked();
 
         auto value_spec = g_object_class_find_property (G_OBJECT_CLASS (klass), name_string);
         if (value_spec == NULL) {
-            Throw::InvalidPropertyName(name_string);
+            Throw::InvalidPropertyName(*name_original);
+            g_free(name_string);
             goto out;
         }
 
@@ -75,7 +78,7 @@ static GObject* CreateGObjectFromObject(GType gtype, Local<Value> object) {
 
         g_value_init(&values[index], value_spec->value_type);
 
-        if (!V8ToGValue(&values[index], value, true)) {
+        if (!V8ToGValue(&values[index], value, kCopy)) {
             // V8ToGValue throws the error
             goto out;
         }
@@ -102,7 +105,7 @@ static void ToggleNotify(gpointer user_data, GObject *gobject, gboolean toggle_d
 
     g_assert (data != NULL);
 
-    auto *persistent = (Persistent<Object> *) data;
+    auto *persistent = (Nan::Persistent<Object> *) data;
 
     if (toggle_down) {
         /* We're dropping from 2 refs to 1 ref. We are the last holder. Make
@@ -120,7 +123,7 @@ static void AssociateGObject(Local<Object> object, GObject *gobject, GType gtype
 
     SET_OBJECT_GTYPE(object, gtype);
 
-    Persistent<Object> *persistent = new Persistent<Object>(object);
+    auto *persistent = new Nan::Persistent<Object>(object);
     g_object_set_qdata (gobject, GNodeJS::object_quark(), persistent);
 
     // Because we can't sink floating ref and add toggle ref at the same time,
@@ -184,7 +187,7 @@ static void GObjectDestroyed(const Nan::WeakCallbackInfo<GObject> &data) {
     GObject *gobject = data.GetParameter ();
 
     void *type_data = g_object_get_qdata (gobject, GNodeJS::object_quark());
-    Persistent<Object> *persistent = (Persistent<Object> *) type_data;
+    auto *persistent = (Nan::Persistent<Object> *) type_data;
     delete persistent;
 
     /* We're destroying the wrapper object, so make sure to clear out
@@ -200,9 +203,9 @@ static void GObjectClassDestroyed(const Nan::WeakCallbackInfo<GType> &info) {
 
     DestroyVFuncs(gtype);
 
-    auto persistentTpl = (Persistent<FunctionTemplate> *)
+    auto persistentTpl = (Nan::Persistent<FunctionTemplate> *)
         g_type_get_qdata (gtype, GNodeJS::template_quark());
-    auto persistentFn  = (Persistent<Function> *)
+    auto persistentFn  = (Nan::Persistent<Function> *)
         g_type_get_qdata (gtype, GNodeJS::function_quark());
     delete persistentTpl;
     delete persistentFn;
@@ -212,8 +215,18 @@ static void GObjectClassDestroyed(const Nan::WeakCallbackInfo<GType> &info) {
     g_free(gtypePtr);
 }
 
-static void GObjectFallbackPropertyGetter(Local<v8::Name> property,
-                                            const v8::PropertyCallbackInfo<Value>& info) {
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 12 || \
+    (V8_MAJOR_VERSION == 12 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION > 4))
+#define PROPERTY_CALLBACK_RETURN_TYPE v8::Intercepted
+#define PROPERTY_CALLBACK_INFO_TYPE v8::PropertyCallbackInfo<void>
+#else
+#define PROPERTY_CALLBACK_RETURN_TYPE void
+#define PROPERTY_CALLBACK_INFO_TYPE v8::PropertyCallbackInfo<Value>
+#endif
+
+static PROPERTY_CALLBACK_RETURN_TYPE
+GObjectFallbackPropertyGetter(Local<v8::Name> property,
+                              const v8::PropertyCallbackInfo<Value>& info) {
     auto self = info.Holder();
     GObject *gobject = GObjectFromWrapper (self);
 
@@ -225,20 +238,25 @@ static void GObjectFallbackPropertyGetter(Local<v8::Name> property,
     if (strstr(prop_name_camel, "-")) {
         // Has dash, not a camel-case property name.
         RETURN(Nan::Undefined());
-        return;
+        return Nan::Intercepted::Yes();
     }
 
     char *prop_name = Util::ToDashed(prop_name_camel);
 
     auto value = GetGObjectProperty(gobject, prop_name);
-    if (!value.IsEmpty())
+    if (!value.IsEmpty()) {
         RETURN(value.ToLocalChecked());
+        g_free(prop_name);
+        return Nan::Intercepted::Yes();
+    }
 
     g_free(prop_name);
+    return Nan::Intercepted::No();
 }
 
-static void GObjectFallbackPropertySetter (Local<v8::Name> property, Local<Value> value,
-                                            const v8::PropertyCallbackInfo<Value>& info) {
+static PROPERTY_CALLBACK_RETURN_TYPE
+GObjectFallbackPropertySetter(Local<v8::Name> property, Local<Value> value,
+                              const PROPERTY_CALLBACK_INFO_TYPE& info) {
     auto self = info.Holder();
     GObject *gobject = GNodeJS::GObjectFromWrapper (self);
 
@@ -247,7 +265,7 @@ static void GObjectFallbackPropertySetter (Local<v8::Name> property, Local<Value
 
     if (strstr(prop_name_camel, "-")) {
         // Has dash, not a camel-case property name.
-        return;
+        return Nan::Intercepted::No();
     }
 
     char *prop_name = Util::ToDashed(prop_name_camel);
@@ -255,20 +273,22 @@ static void GObjectFallbackPropertySetter (Local<v8::Name> property, Local<Value
     if (gobject == NULL) {
         WARN("Can't set \"%s\" on null GObject", prop_name);
         g_free(prop_name);
-        return;
+        return Nan::Intercepted::No();
     }
 
     auto setResult = SetGObjectProperty(gobject, prop_name, value);
     if (setResult.IsEmpty()) {
         // Non-existent property. Let node consider the set not intercepted
         // by not setting return value;
+        g_free(prop_name);
+        return Nan::Intercepted::No();
     } else {
         // Property exists. Whether we can convert the value and set the
         // property or not, consider the set intercepted.
         RETURN(value);
+        g_free(prop_name);
+        return Nan::Intercepted::Yes();
     }
-
-    g_free(prop_name);
 }
 
 static GISignalInfo* FindSignalInfo(GIObjectInfo *info, const char *signal_detail) {
@@ -319,8 +339,7 @@ static void StoreVFunc(GType gtype, Callback *callback) {
 static void DestroyVFuncs(GType gtype) {
     /* Destroy vfunc list, if any */
     GSList *list = (GSList *) g_type_get_qdata (gtype, GNodeJS::vfuncs_quark());
-    GSList *item = list;
-    while ((item = g_slist_next (item)) != NULL) {
+    for (GSList *item = list; item != NULL; item = item->next) {
         auto callback = (Callback *) item->data;
         delete callback;
     }
@@ -463,9 +482,9 @@ NAN_METHOD(SignalEmit) {
         g_value_init(gvalue, signal_query.param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE);
 
         if ((signal_query.param_types[i] & G_SIGNAL_TYPE_STATIC_SCOPE) != 0)
-            failed = !V8ToGValue(gvalue, info[i + 1], false); // no-copy
+            failed = !V8ToGValue(gvalue, info[i + 1], kNone); // no-copy
         else
-            failed = !V8ToGValue(gvalue, info[i + 1], true); // copy
+            failed = !V8ToGValue(gvalue, info[i + 1], kCopy); // copy
 
         if (failed)
             break;
@@ -551,9 +570,8 @@ static MaybeLocal<FunctionTemplate> NewClassTemplate (GType gtype) {
     // Set the fallback accessor to allow non-introspected property.
     // Nan::SetNamedPropertyHandler() does not support flags. Thus, using
     // V8 interface directly.
-    v8::NamedPropertyHandlerConfiguration config;
-    config.getter = GObjectFallbackPropertyGetter;
-    config.setter = GObjectFallbackPropertySetter;
+    v8::NamedPropertyHandlerConfiguration config(GObjectFallbackPropertyGetter,
+        GObjectFallbackPropertySetter);
     config.flags = static_cast<v8::PropertyHandlerFlags>(
         static_cast<int>(v8::PropertyHandlerFlags::kNonMasking) |
         static_cast<int>(v8::PropertyHandlerFlags::kOnlyInterceptStrings));
@@ -566,7 +584,7 @@ static MaybeLocal<FunctionTemplate> GetClassTemplate(GType gtype) {
     void *data = g_type_get_qdata (gtype, GNodeJS::template_quark());
 
     if (data) {
-        auto *persistent = (Persistent<FunctionTemplate> *) data;
+        auto *persistent = (Nan::Persistent<FunctionTemplate> *) data;
         auto tpl = New<FunctionTemplate> (*persistent);
         return tpl;
     }
@@ -577,8 +595,8 @@ static MaybeLocal<FunctionTemplate> GetClassTemplate(GType gtype) {
 
     auto tpl = maybeTpl.ToLocalChecked();
     auto fn = Nan::GetFunction (tpl).ToLocalChecked();
-    auto persistentTpl = new Persistent<FunctionTemplate>(tpl);
-    auto persistentFn  = new Persistent<Function>(fn);
+    auto persistentTpl = new Nan::Persistent<FunctionTemplate>(tpl);
+    auto persistentFn  = new Nan::Persistent<Function>(fn);
 
     GType *gtypePtr = g_new(GType, 1);
     *gtypePtr = gtype;
@@ -596,7 +614,7 @@ static MaybeLocal<Function> GetClass(GType gtype) {
     void *data = g_type_get_qdata (gtype, GNodeJS::function_quark());
 
     if (data) {
-        auto persistent = (Persistent<Function> *) data;
+        auto persistent = (Nan::Persistent<Function> *) data;
         auto fn = New<Function> (*persistent);
         return MaybeLocal<Function> (fn);
     }
@@ -611,7 +629,7 @@ static MaybeLocal<Function> GetClass(GType gtype) {
     data = g_type_get_qdata (gtype, GNodeJS::function_quark());
 
     if (data) {
-        auto persistent = (Persistent<Function> *) data;
+        auto persistent = (Nan::Persistent<Function> *) data;
         auto fn = New<Function> (*persistent);
         return MaybeLocal<Function> (fn);
     }
@@ -640,7 +658,7 @@ Local<Value> WrapperFromGObject(GObject *gobject) {
 
     if (data) {
         /* Easy case: we already have an object. */
-        auto *persistent = (Persistent<Object> *) data;
+        auto *persistent = (Nan::Persistent<Object> *) data;
         auto obj = New<Object> (*persistent);
         return obj;
     }
@@ -680,7 +698,7 @@ MaybeLocal<Value> GetGObjectProperty(GObject * gobject, const char *prop_name) {
     g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
     g_object_get_property (gobject, prop_name, &value);
 
-    auto ret = GNodeJS::GValueToV8(&value, true);
+    auto ret = GNodeJS::GValueToV8(&value, kCopy);
 
     g_value_unset(&value);
 
@@ -699,7 +717,7 @@ MaybeLocal<v8::Boolean> SetGObjectProperty(GObject * gobject, const char *prop_n
     GValue gvalue = G_VALUE_INIT;
     g_value_init(&gvalue, G_PARAM_SPEC_VALUE_TYPE (pspec));
 
-    if (GNodeJS::V8ToGValue (&gvalue, value, true)) {
+    if (GNodeJS::V8ToGValue (&gvalue, value, kCopy)) {
         g_object_set_property (gobject, prop_name, &gvalue);
         ret = Nan::True();
     } else {

package/src/loop.cc

@@ -73,7 +73,7 @@ static gboolean loop_source_dispatch (GSource *base, GSourceFunc callback, gpoin
     v8::Context::Scope context_scope(context);
 
     // Perform microtask checkpoint after running JavaScript.
-    MicrotasksScope micro_scope(isolate, MicrotasksScope::kRunMicrotasks);
+    MicrotasksScope micro_scope(isolate, NULL, MicrotasksScope::kRunMicrotasks);
 
     // Deal with uv events.
     uv_run (source->loop, UV_RUN_NOWAIT);

package/src/modules/cairo/glyph.cc

@@ -103,6 +103,7 @@ NAN_INDEX_GETTER(Glyph::IndexGetter) {
   Nan::Set (returnValue, UTF8("x"),     Nan::New<Number> (glyph->x));
   Nan::Set (returnValue, UTF8("y"),     Nan::New<Number> (glyph->y));
   RETURN(returnValue);
+  return Nan::Intercepted::Yes();
 }
 
 

package/src/modules/cairo/text-cluster.cc

@@ -110,6 +110,7 @@ NAN_INDEX_GETTER(TextCluster::IndexGetter) {
   Nan::Set (returnValue, UTF8("num_bytes"),  Nan::New<Number> (text_cluster->num_bytes));
   Nan::Set (returnValue, UTF8("num_glyphs"), Nan::New<Number> (text_cluster->num_glyphs));
   RETURN(returnValue);
+  return Nan::Intercepted::Yes();
 }
 
 

package/src/modules/system.cc

@@ -65,8 +65,8 @@ NAN_METHOD(ConvertGValue) {
         return;
     }
     void *ptr = obj->GetAlignedPointerFromInternalField (0);
-    bool mustCopy = true;
-    RETURN(GValueToV8(reinterpret_cast<GValue *>(ptr), mustCopy));
+    ResourceOwnership ownership = kCopy;
+    RETURN(GValueToV8(reinterpret_cast<GValue *>(ptr), ownership));
 }
 
 NAN_METHOD(GetMemoryContent) {

package/src/type.cc

@@ -15,11 +15,12 @@ char *GetInfoName (GIBaseInfo* info) {
 
     char* name = g_strdup (info_name);
 
-    GIBaseInfo *parent;
-    while ((parent = g_base_info_get_container (info)) != NULL) {
+    GIBaseInfo *parent = g_base_info_get_container (info);
+    while (parent != NULL) {
         char *new_name = g_strconcat (g_base_info_get_name(parent), ".", name, NULL);
         g_free (name);
         name = new_name;
+        parent = g_base_info_get_container (parent);
     }
 
     char *new_name = g_strconcat (g_base_info_get_namespace(info), ".", name, NULL);