face-hh · GStudiosX2 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024
diff --git a/napture/Cargo.lock b/napture/Cargo.lock
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
@@ -6,12 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-adw = { version = "0.6.0", package = "libadwaita", features = ["v1_5"] }
+adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
 base64 = "0.22.1"
 chrono = "0.4.38"
+const_format = "0.2.32"
 directories = "5.0.1"
 glib = "0.19.4"
-gtk = { version = "0.8.1", package = "gtk4", features = ["v4_14"] }
+gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] }
 html-escape = "0.2.13"
 html_parser = "0.7.0"
 lazy_static = "1.4.0"

diff --git a/napture/examples/base64_images/index.html b/napture/examples/base64_images/index.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+  <title>base64_images</title>
+</head>
+<body>
+  <p>base64 images</p>
+  <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAIAAADTED8xAAADMElEQVR4nOzVwQnAIBQFQYXff81RUkQCOyDj1YOPnbXWPmeTRef+/3O/OyBjzh3CD95BfqICMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMO0TAAD//2Anhf4QtqobAAAAAElFTkSuQmCC" />
+</body>
+</html>
diff --git a/napture/examples/clear_timeout/index.html b/napture/examples/clear_timeout/index.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+  <title>clear_timeout</title>
+  <script src="script.lua" />
+</head>
+<body>
+  <p>clear_timeout allows you to stop a set_timeout task</p>
+  <p class="text">Text</p>
+  <div>
+    <button class="timeout_btn">Test Timeout</button>
+    <button class="clear_timeout_btn">Clear Timeout</button>
+    <button class="reset_btn">Reset</button>
+  </div>
+</body>
+</html>
diff --git a/napture/examples/clear_timeout/script.lua b/napture/examples/clear_timeout/script.lua
@@ -0,0 +1,26 @@
+local timeout_btn = get("timeout_btn")
+local clear_timeout_btn = get("clear_timeout_btn")
+local reset_btn = get("reset_btn")
+local text = get("text")
+local timeout
+
+timeout_btn.on_click(function()
+  if timeout ~= nil then
+    return
+  end
+
+  timeout = set_timeout(function()
+    text.set_content("Different Text")
+    timeout = nil
+  end, 3000)
+end)
+
+clear_timeout_btn.on_click(function()
+  if timeout == nil then return end
+  clear_timeout(timeout)
+  timeout = nil
+end)
+
+reset_btn.on_click(function()
+  text.set_content("Text")
+end)
diff --git a/napture/test/index.html → napture/examples/full/index.html b/napture/test/index.html → napture/examples/full/index.html
diff --git a/napture/test/script.lua → napture/examples/full/script.lua b/napture/test/script.lua → napture/examples/full/script.lua
diff --git a/napture/test/styles.css → napture/examples/full/styles.css b/napture/test/styles.css → napture/examples/full/styles.css
diff --git a/napture/examples/inner_html/index.html b/napture/examples/inner_html/index.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+  <title>set_timeout</title>
+  <link href="styles.css" />
+  <script src="script.lua" />
+</head>
+<body>
+  <div class="text"><p>Text</p></div>
+  <div>
+    <button class="btn">Test</button>
+    <button class="btn2">Test 2</button>
+    <button class="reset_btn">Reset</button>
+  </div>
+</body>
+</html>
diff --git a/napture/examples/inner_html/script.lua b/napture/examples/inner_html/script.lua
@@ -0,0 +1,17 @@
+local btn = get("btn")
+local btn2 = get("btn2")
+local reset_btn = get("reset_btn")
+local text = get("text")
+
+btn.on_click(function()
+  text.append_html("<div class=\"test\"><a href=\"buss://dingle.it\">dingle</a></div>")
+end)
+
+btn2.on_click(function()
+  text.set_inner_html("<div class=\"test\"><a href=\"buss://dingle.it\">test</a></div>")
+  print(get(test))
+end)
+
+reset_btn.on_click(function()
+  text.set_inner_html("<p>Text</p>")
+end)
diff --git a/napture/examples/inner_html/styles.css b/napture/examples/inner_html/styles.css
@@ -0,0 +1,8 @@
+text {
+  direction: column;
+  gap: 5px;
+}
+
+test {
+  font-size: 20px;
+}
diff --git a/napture/examples/inputs/index.html b/napture/examples/inputs/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>inputs</title>
+  <link href="styles.css"/>
+</head>
+<body>
+  <p>Inputs!</p>
+  <input class="input-long" value="inputs can have default values" />
+  <input class="input-long" placeholder="they also have a placeholder" />
+  <p>default input:</p>
+  <input />
+</body>
+</html>
diff --git a/napture/examples/inputs/styles.css b/napture/examples/inputs/styles.css
@@ -0,0 +1,4 @@
+input-long {
+  width: 300px;
+  height: 35px;
+}
diff --git a/napture/examples/lists/index.html b/napture/examples/lists/index.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>lists</title>
+  <link href="styles.css">
+</head>
+<body>
+  <ol>
+    <li class="li">
+      <a href="buss://dingle.it">links ?</a>
+      <p>we got them 😎</p>
+    </li>
+    <li class="li">You can also just use text</li>
+  </ol>
+  <ul>
+    <li class="li">
+      <p>don't fancy a ordered style ?</p>
+    </li>
+    <li class="li">
+      <p class="text-big">we also have unordered lists</p>
+    </li>
+  </ul>
+</body>
+</html>
diff --git a/napture/examples/lists/styles.css b/napture/examples/lists/styles.css
@@ -0,0 +1,9 @@
+text-big {
+  font-size: 20px;
+}
+
+li {
+  gap: 5px;
+  direction: row;
+}
+
diff --git a/napture/examples/require/folder/anotherfolder/print.lua b/napture/examples/require/folder/anotherfolder/print.lua
@@ -0,0 +1,4 @@
+print(__script_path)
+return function(arg)
+  print("DEBUG: " .. arg)
+end
diff --git a/napture/examples/require/folder/hello.lua b/napture/examples/require/folder/hello.lua
@@ -0,0 +1,6 @@
+print(__script_path)
+local printtest = require("anotherfolder/print.lua")
+
+return function()
+  printtest("Hello, World!")
+end
diff --git a/napture/examples/require/index.html b/napture/examples/require/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>require</title>
+  <script src="script.lua" />
+</head>
+<body>
+  <p>script relative paths test</p>
+  <button class="startbtn">test</button>
+  <a class="startbtn">test</a>
+  <input class="input" />
+  <textarea class="textarea" />
+</body>
+</html>
diff --git a/napture/examples/require/script.lua b/napture/examples/require/script.lua
@@ -0,0 +1,7 @@
+print(__script_path)
+local printtest = require("folder/anotherfolder/print.lua")
+local hello = require("folder/hello.lua")
+hello()
+printtest("yo")
+
+require("https://raw.githubusercontent.com/face-hh/webx/master/napture/test/script.lua")
diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
@@ -12,6 +12,5 @@
     <button class="timeout_btn3">Test Timeout Cancel</button>
     <button class="reset_btn">Reset</button>
   </div>
-  <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAIAAADTED8xAAADMElEQVR4nOzVwQnAIBQFQYXff81RUkQCOyDj1YOPnbXWPmeTRef+/3O/OyBjzh3CD95BfqICMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMO0TAAD//2Anhf4QtqobAAAAAElFTkSuQmCC" />
 </body>
 </html>
diff --git a/napture/src/b9/css.rs b/napture/src/b9/css.rs
@@ -507,7 +507,7 @@ impl Styleable for gtk::Entry {
 
                     let width = properties.width;
                     let height = properties.height;
-                    
+
                     if width > 0 || height > 0 {
                         let normalized_width = if width > 0 { width } else { -1 };
                         let normalized_height = if height > 0 { height } else { -1 };
@@ -558,7 +558,7 @@ impl Styleable for gtk::Button {
                     self.set_margin_bottom(properties.margin_bottom.parse::<i32>().unwrap_or(0));
                     self.set_margin_start(properties.margin_left.parse::<i32>().unwrap_or(0));
                     self.set_margin_end(properties.margin_right.parse::<i32>().unwrap_or(0));
-                    
+
                     self.set_opacity(properties.opacity);
 
                     final_css += &compute_styling(class, &properties);
@@ -658,7 +658,7 @@ fn compute_styling(class: GString, properties: &Properties) -> String {
     if properties.border_style != "none" {
         borders.push_str(&format!("border-style: {};", properties.border_style));
     }
-    
+
     format!(
         "
 .{} {{
@@ -726,8 +726,8 @@ fn get_properties(rules: &[(String, String)]) -> Properties {
         .parse::<i32>()
         .unwrap_or(0);
     let opacity = get_rule(rules, "opacity", "1.0")
-    .parse::<f64>()
-    .unwrap_or(1.0);
+        .parse::<f64>()
+        .unwrap_or(1.0);
 
     Properties {
         direction,
@@ -757,6 +757,6 @@ fn get_properties(rules: &[(String, String)]) -> Properties {
         padding,
         gap,
         font_size,
-        opacity
+        opacity,
     }
 }