Fix text selection + Minor fixes/improvements. (#25)

* Fix text selection.

* Check for exact mask match.

* Remove unused function in C++ AppExample.

* Add platforms section to README.

* Update project structure focus.

* Update file structure.

* Adjust file_path when inspector requested.

* Update godot_file_system.hpp

* Change render call order based on UL docs.

* Properly check bitmask.

* Add a proper signal example.

Author: Decapitated

.gitignore

@@ -7,6 +7,7 @@ demo/ultralight.log
 demo/default
 demo/inspector/
 demo/addons/gdhtml/resources/
+demo/addons/gdhtml/inspector/
 demo/addons/gdhtml/bin/*.*.*.*.dll
 demo/addons/gdhtml/bin/*.*.*.*.exp
 demo/addons/gdhtml/bin/*.*.*.*.lib

README.md

@@ -11,6 +11,19 @@ A GDExtension, using Ultralight, to render HTML.
 - Godot 4.3+
 - Ultralight 1.4.0 Beta
 
+## Platforms
+| Platform | x64 | arm64 | x32 |
+| - | :-: | :-: | :-: |
+| Windows | :white_check_mark: |  :warning: | :x: |
+| Linux | :white_check_mark: |  :warning: | :x: |
+| Mac | :white_check_mark: | :white_check_mark: | :x: |
+
+> :white_check_mark: = Successfully ran the demo project.
+
+> :warning: = Supported, but not tested.
+
+> :x: = Not supported.
+
 ## Table of contents
 - [What can this plugin do?](#can-do)
 - [What's left to do?](#to-do)
@@ -49,27 +62,21 @@ Some of the notable limitations are:
 - Download [Ultralight](https://ultralig.ht/download/)
 
 ## Project Structure
-Your project structure should look like this before building and running.
+Your project structure should look like this before running with this extension.
 ```
-main_folder/
-+--demo/                    # game example/demo to test the extension
-| +--addons/                # addons
-| | +--gdhtml/              # plugin folder
-| |   +--bin/               # plugin build folder / Other libraries
-| |   | +--windows/
-| |   |   +--Ultralight.dll
-| |   |   +--UltralightCore.dll
-| |   |   +--WebCore.dll
-| |   |   +--AppCore.dll
-| |   +--resources/         # Ultralight resources folder (Copied from SDK folder)
-| +--inspector/             # Ultralight inspector folder (Copied from SDK folder)
-+--godot-cpp/               # C++ bindings
-+--src/                     # Source code of the extension we are building
-+--ultralight/              # Ultralight SDK
-  +--bin                    # Ultralight libraries
-  +--include                # Ultralight Headers
-  +--lib                    # Ultralight .lib for windows build
-  +--license                # Ultralight Licenses
+demo/                             # Godot project (Root)
+  addons/                         # Addons
+    gdhtml/                      # Godot-HTML extension
+      bin/                       # Extension libraries
+      |  windows/                # Library platform
+      |    x86_64/               # Platform arch
+      |      gdhtml.*.dll        # Extension library
+      |      Ultralight.dll      # Ultralight libraries
+      |      UltralightCore.dll  # ...
+      |      WebCore.dll         # ...
+      |      AppCore.dll         # ...
+      inspector/                 # Ultralight inspector
+      resources/                 # Ultralight resources
 ```
 
 ## Building

SConstruct

@@ -111,12 +111,14 @@ elif env["platform"] == "macos":
     )
 
 copy_resources = env.Install(
-    f"{projectdir}/addons/{libname}/resources",
-    source = [ 
-        "ultralight/resources/cacert.pem",
-        "ultralight/resources/icudt67l.dat"
-    ]
+    f"{projectdir}/addons/{libname}/",
+    source = ["ultralight/resources/"]
 )
 
-default_args = [library, copy, copy_libraries, copy_resources]
+copy_inspector = env.Install(
+    f"{projectdir}/addons/{libname}/",
+    source = ["ultralight/inspector/"]
+)
+
+default_args = [library, copy, copy_libraries, copy_resources, copy_inspector]
 Default(*default_args)

demo/app_example.gd

@@ -23,7 +23,7 @@ func _on_dom_ready(_url):
 		},
 		"array": [1, 2, 3, 4, 5],
 		"object": self,
-		"signal_test": signal_test
+		"signal": _signal_to_dictionary(test_signal)
 	}
 
 func test_callable(temp = ""):
@@ -37,5 +37,16 @@ func test_nested_callable():
 	print("test_nested_callable")
 	return 420
 
-func signal_test():
-	test_signal.emit()
+func _signal_to_dictionary(p_signal: Signal):
+	return {
+		"connect": p_signal.connect,
+		# "disconnect": p_signal.disconnect, # ALERT: Disconnect does not work yet.
+		"emit": p_signal.emit,
+		"get_connections": p_signal.get_connections,
+		"get_name": p_signal.get_name,
+		"get_object": p_signal.get_object,
+		"get_object_id": p_signal.get_object_id,
+		"has_connections": p_signal.has_connections,
+		# "is_connected": p_signal.is_connected, # ALERT: Is_connected probably doesn't work. Same reason as above.
+		"is_null": p_signal.is_null
+	}

src/app_example.hpp

@@ -8,9 +8,6 @@ namespace godot {
     class AppExample : public HtmlRect {
         GDCLASS(AppExample, HtmlRect)
 
-        private:
-            static JSValueRef ExampleCallback(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
-
         protected:
             static void _bind_methods();
 

src/convert/convert.cpp

@@ -167,7 +167,7 @@ JSValueRef Convert::ToJSValue(JSContextRef context, Variant variant)
                 Variant::Type type = static_cast<Variant::Type>((int)property_info["type"]);
                 PropertyUsageFlags usage = static_cast<PropertyUsageFlags>((uint64_t)property_info["usage"]);
 
-                if(type != Variant::NIL &&  !(usage & PROPERTY_USAGE_INTERNAL))
+                if(type != Variant::NIL && (usage & PROPERTY_USAGE_INTERNAL) != PROPERTY_USAGE_INTERNAL)
                 {
                     Variant property = object->get(name);
                     JSValueRef js_value;

src/godot/js_callable/js_callable.cpp

@@ -4,6 +4,7 @@
 
 using namespace godot;
 
+// ALERT: Find a way to fix hash & compare to allow disconnecting callables from signals.
 uint32_t JSCallable::hash() const
 {
     return 420;

src/godot/ultralight_manager/ultralight_manager.cpp

@@ -78,8 +78,8 @@ void UltralightManager::UpdateLogic() {
 }
 
 void UltralightManager::RenderFrame() {
-    renderer->Render();
     renderer->RefreshDisplay(0);
+    renderer->Render();
 }
 
 }

src/godot/view_rect/view_rect.cpp

@@ -125,6 +125,8 @@ void ViewRect::_draw()
 
 #pragma region ViewRect Private methods.
 
+MouseEvent::Button latest_mouse_button = MouseEvent::Button::kButton_None;
+
 void ViewRect::HandleMouseButton(InputEventMouseButton *event)
 {
     MouseButton index = event->get_button_index();
@@ -158,6 +160,7 @@ void ViewRect::HandleMouseButton(InputEventMouseButton *event)
                 evt.button = MouseEvent::Button::kButton_Right;
                 break;
         };
+        latest_mouse_button = evt.button;
         mouse_events.push(evt);
         events.push(Event::mouse);
     }
@@ -170,7 +173,7 @@ void ViewRect::HandleMouseMotion(InputEventMouseMotion *event)
     evt.type = MouseEvent::kType_MouseMoved;
     evt.x = (int)pos.x;
     evt.y = (int)pos.y;
-    evt.button = MouseEvent::kButton_None;
+    evt.button = latest_mouse_button;
     mouse_events.push(evt);
     events.push(Event::mouse);
 }
@@ -206,7 +209,7 @@ void ViewRect::HandleKey(InputEventKey *event)
     auto modifiers = event->get_modifiers_mask();
     uint8_t ultralightModifier = 0;
     for (const auto& [godotMask, ultralightMask] : ModifierMap) {
-        if (modifiers & godotMask) {
+        if ((modifiers & godotMask) == godotMask) {
             ultralightModifier |= ultralightMask;
         }
     }

src/ultralight/godot_file_system.hpp

@@ -13,9 +13,23 @@ namespace ultralight
         GodotFileSystem() {}
         ~GodotFileSystem() override {}
 
+        godot::String AdjustPath(godot::String file_path)
+        {
+            if(file_path.begins_with("inspector/"))
+            {
+                file_path = "addons/gdhtml/" + file_path;
+            }
+            return file_path;
+        }
+
         String SetupPath(const String& file_path)
         {
-            return ("res://"+file_path);
+            auto adjusted_file_path = String(
+                AdjustPath(
+                    godot::String(file_path.utf8().data())
+                ).utf8().get_data()
+            );
+            return "res://" + adjusted_file_path;
         }
 
         bool FileExists(const String& file_path) override
@@ -38,7 +52,6 @@ namespace ultralight
             godot::PackedByteArray data = godot::FileAccess::get_file_as_bytes(SetupPath(file_path).utf8().data());
             return Buffer::CreateFromCopy(data.ptr(), data.size());
         }
-
     };
 };