working links

Author: ranfdev

Cargo.lock

@@ -19,9 +19,6 @@ features = ["v2_60"]
 [dependencies.gio]
 version = "0.15.1"
 
-[dependencies.gdk]
-version = "0.15.1"
-
 [dependencies]
 async-net = "1.4.7"
 async-fs = "1.5.0"
@@ -36,7 +33,6 @@ async-trait = "0.1.38"
 async-native-tls = "0.3.3"
 toml = "0.5.6"
 serde = { version = "1.0.116", features = ["derive"] }
-pango = { version = "0.9.0" }
 env_logger = "0.8.1"
 log = "0.4.0"
 adw = { package = "libadwaita", version = "0.1.0" }

Cargo.toml

@@ -1,7 +1,8 @@
 { stdenv
 , cargo
 , glib
-, gtk3
+, gtk4
+, libadwaita
 , pango
 , rust
 , rustc
@@ -27,7 +28,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     glib
-    gtk3
+    gtk4
+    libadwaita
     pango
     openssl
   ];

nix/geopard.nix

@@ -1,4 +1,4 @@
-{pkgs ? import <nixos-unstable> {}}:
+{pkgs ? import <nixpkgs-unstable> {}}:
 pkgs.mkShell {
   buildInputs = with pkgs; [
     cargo
@@ -9,13 +9,14 @@ pkgs.mkShell {
     meson
     ninja
     python3
+    gtk4
+    libadwaita
     rustc
     rustfmt
     wrapGAppsHook
     dbus
     gdk-pixbuf
     glib
-    gtk3
     openssl
     pkg-config
     rust-analyzer

shell.nix

@@ -1,11 +1,12 @@
 use async_trait::async_trait;
 use futures::prelude::*;
-use gdk::prelude::*;
 use glib::subclass::prelude::*;
 use glib::Boxed;
+use gtk::gdk::prelude::*;
 use gtk::prelude::*;
 use log::{debug, info};
 use std::borrow::Cow;
+use std::collections::HashMap;
 use url::Url;
 
 use crate::config;
@@ -21,15 +22,11 @@ pub static ABOUT_PAGE: &str = std::include_str!("../../README.gemini");
 
 pub const MARGIN: i32 = 20;
 
-pub static DATA_DIR_PATH: Lazy<std::path::PathBuf> = Lazy::new(|| {
-    glib::user_data_dir()
-        .join("geopard")
-});
+pub static DATA_DIR_PATH: Lazy<std::path::PathBuf> =
+    Lazy::new(|| glib::user_data_dir().join("geopard"));
 
-pub static CONFIG_DIR_PATH: Lazy<std::path::PathBuf> = Lazy::new(|| {
-    glib::user_config_dir()
-        .join("geopard")
-});
+pub static CONFIG_DIR_PATH: Lazy<std::path::PathBuf> =
+    Lazy::new(|| glib::user_config_dir().join("geopard"));
 
 pub static BOOKMARK_FILE_PATH: Lazy<std::path::PathBuf> =
     Lazy::new(|| DATA_DIR_PATH.join("bookmarks.gemini"));
@@ -112,7 +109,6 @@ pub struct HistoryItem {
 pub struct RequestCtx {
     pub gemini_client: gemini::Client,
     pub draw_ctx: DrawCtx,
-    pub in_chan_tx: flume::Sender<TabMsg>,
     pub url: Url,
 }
 
@@ -314,29 +310,20 @@ impl DrawCtx {
         let tag_table = self.text_buffer.tag_table();
         tag_table.add(&tag);
 
-        self.text_buffer.apply_tag(
-            &tag,
-            &self.text_buffer.iter_at_offset(start),
-            &text_iter,
-        );
+        self.text_buffer
+            .apply_tag(&tag, &self.text_buffer.iter_at_offset(start), &text_iter);
     }
 
-    fn set_linkhandler(tag: &gtk::TextTag, s: Link) {
-        // I hope using a GBoxed type manages memory for me
-        // TODO: Ask a glib mantainer if this is true
+    fn set_linkhandler(tag: &gtk::TextTag, l: Link) {
         unsafe {
-            tag.set_data("linkhandler", GLink(s).to_value());
+            tag.set_data("linkhandler", l);
         }
     }
-    pub fn linkhandler(tag: &gtk::TextTag) -> Option<Link> {
-        /*FIXME: unsafe {
-            let handler: Option<&glib::Value> = tag.data("linkhandler");
-            handler
+    pub fn linkhandler(tag: &gtk::TextTag) -> Option<&Link> {
+        unsafe {
+            let handler: Option<std::ptr::NonNull<Link>> = tag.data("linkhandler");
+            handler.map(|n| n.as_ref())
         }
-        .and_then(|gl| gl.get::<&GLink>().ok())
-        .and_then(|l| l.to_owned())
-        .map(|l| l.0.clone())*/
-        None
     }
     pub fn clear(&mut self) {
         let b = &self.text_buffer;

src/common/mod.rs

@@ -29,7 +29,7 @@ pub struct Fonts {
 impl Fonts {
     pub fn default_heading() -> Font {
         Font {
-            family: String::from("sans-serif"),
+            family: String::from("Cantarell"),
             size: 18,
             weight: 800,
         }
@@ -45,15 +45,15 @@ impl Fonts {
 
     pub fn default_quote() -> Font {
         Font {
-            family: String::from("sans-serif"),
+            family: String::from("Cantarell"),
             size: 13,
             weight: 500,
         }
     }
 
     pub fn default_paragraph() -> Font {
         Font {
-            family: String::from("sans-serif"),
+            family: String::from("Cantarell"),
             size: 13,
             weight: 500,
         }

src/config.rs

@@ -113,7 +113,7 @@ impl ClientBuilder {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct Client {
     options: ClientOptions,
 }