Compare commits
11 Commits
markdown-p
...
08d8237726
| Author | SHA1 | Date | |
|---|---|---|---|
| 08d8237726 | |||
| 43afb9dfd3 | |||
| 6b5bbfbc54 | |||
b39419888b
|
|||
|
4e9eacc7b0
|
|||
|
8251937be9
|
|||
|
5ca9dfabb8
|
|||
|
1df81509df
|
|||
|
7d234641cb
|
|||
| 1ed278cc55 | |||
|
2a830f0539
|
318
Cargo.lock
generated
318
Cargo.lock
generated
@ -163,6 +163,12 @@ dependencies = [
|
|||||||
"x11rb",
|
"x11rb",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "arrayref"
|
||||||
|
version = "0.3.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arrayvec"
|
name = "arrayvec"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@ -523,6 +529,12 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
|
checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "data-url"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dispatch"
|
name = "dispatch"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@ -696,6 +708,21 @@ dependencies = [
|
|||||||
"winit",
|
"winit",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "egui_extras"
|
||||||
|
version = "0.31.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "624659a2e972a46f4d5f646557906c55f1cd5a0836eddbe610fdf1afba1b4226"
|
||||||
|
dependencies = [
|
||||||
|
"ahash",
|
||||||
|
"egui",
|
||||||
|
"enum-map",
|
||||||
|
"log",
|
||||||
|
"mime_guess2",
|
||||||
|
"profiling",
|
||||||
|
"resvg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "egui_glow"
|
name = "egui_glow"
|
||||||
version = "0.31.1"
|
version = "0.31.1"
|
||||||
@ -745,6 +772,27 @@ version = "1.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "enum-map"
|
||||||
|
version = "2.7.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
|
||||||
|
dependencies = [
|
||||||
|
"enum-map-derive",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "enum-map-derive"
|
||||||
|
version = "0.17.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "enumn"
|
name = "enumn"
|
||||||
version = "0.1.14"
|
version = "0.1.14"
|
||||||
@ -853,6 +901,12 @@ dependencies = [
|
|||||||
"miniz_oxide",
|
"miniz_oxide",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "float-cmp"
|
||||||
|
version = "0.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "foldhash"
|
name = "foldhash"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@ -1326,6 +1380,12 @@ dependencies = [
|
|||||||
"tiff",
|
"tiff",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "imagesize"
|
||||||
|
version = "0.12.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indenter"
|
name = "indenter"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
@ -1344,11 +1404,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "inkr"
|
name = "inkr"
|
||||||
version = "0.1.0"
|
version = "1.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"eframe",
|
"eframe",
|
||||||
"egui",
|
"egui",
|
||||||
|
"egui_extras",
|
||||||
"egui_glow 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"egui_glow 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"eyre",
|
"eyre",
|
||||||
@ -1356,7 +1417,7 @@ dependencies = [
|
|||||||
"half",
|
"half",
|
||||||
"insta",
|
"insta",
|
||||||
"log",
|
"log",
|
||||||
"rand",
|
"rand 0.9.1",
|
||||||
"rfd",
|
"rfd",
|
||||||
"serde",
|
"serde",
|
||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
@ -1471,6 +1532,15 @@ version = "3.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "kurbo"
|
||||||
|
version = "0.9.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
|
||||||
|
dependencies = [
|
||||||
|
"arrayvec",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.172"
|
version = "0.2.172"
|
||||||
@ -1580,6 +1650,24 @@ dependencies = [
|
|||||||
"paste",
|
"paste",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mime"
|
||||||
|
version = "0.3.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mime_guess2"
|
||||||
|
version = "2.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1706dc14a2e140dec0a7a07109d9a3d5890b81e85bd6c60b906b249a77adf0ca"
|
||||||
|
dependencies = [
|
||||||
|
"mime",
|
||||||
|
"phf",
|
||||||
|
"phf_shared",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.8.8"
|
version = "0.8.8"
|
||||||
@ -2047,6 +2135,56 @@ version = "2.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
|
||||||
|
dependencies = [
|
||||||
|
"phf_macros",
|
||||||
|
"phf_shared",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_generator"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
|
||||||
|
dependencies = [
|
||||||
|
"phf_shared",
|
||||||
|
"rand 0.8.5",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_macros"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
|
||||||
|
dependencies = [
|
||||||
|
"phf_generator",
|
||||||
|
"phf_shared",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_shared"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
|
||||||
|
dependencies = [
|
||||||
|
"siphasher 1.0.1",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pico-args"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-project"
|
name = "pin-project"
|
||||||
version = "1.1.10"
|
version = "1.1.10"
|
||||||
@ -2179,6 +2317,15 @@ version = "5.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
|
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.8.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.6.4",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.9.1"
|
version = "0.9.1"
|
||||||
@ -2186,7 +2333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rand_chacha",
|
"rand_chacha",
|
||||||
"rand_core",
|
"rand_core 0.9.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2196,9 +2343,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ppv-lite86",
|
"ppv-lite86",
|
||||||
"rand_core",
|
"rand_core 0.9.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.6.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand_core"
|
name = "rand_core"
|
||||||
version = "0.9.3"
|
version = "0.9.3"
|
||||||
@ -2214,6 +2367,12 @@ version = "0.6.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rctree"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
@ -2267,6 +2426,20 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "resvg"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
"pico-args",
|
||||||
|
"rgb",
|
||||||
|
"svgtypes",
|
||||||
|
"tiny-skia",
|
||||||
|
"usvg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rfd"
|
name = "rfd"
|
||||||
version = "0.15.3"
|
version = "0.15.3"
|
||||||
@ -2291,6 +2464,15 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rgb"
|
||||||
|
version = "0.8.50"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
|
||||||
|
dependencies = [
|
||||||
|
"bytemuck",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ron"
|
name = "ron"
|
||||||
version = "0.8.1"
|
version = "0.8.1"
|
||||||
@ -2303,6 +2485,12 @@ dependencies = [
|
|||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "roxmltree"
|
||||||
|
version = "0.19.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc-hash"
|
name = "rustc-hash"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@ -2396,6 +2584,27 @@ version = "2.7.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
|
checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "simplecss"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "siphasher"
|
||||||
|
version = "0.3.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "siphasher"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "slab"
|
name = "slab"
|
||||||
version = "0.4.9"
|
version = "0.4.9"
|
||||||
@ -2486,6 +2695,15 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strict-num"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
|
||||||
|
dependencies = [
|
||||||
|
"float-cmp",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strum"
|
name = "strum"
|
||||||
version = "0.26.3"
|
version = "0.26.3"
|
||||||
@ -2508,6 +2726,16 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "svgtypes"
|
||||||
|
version = "0.13.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
|
||||||
|
dependencies = [
|
||||||
|
"kurbo",
|
||||||
|
"siphasher 0.3.11",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "2.0.100"
|
version = "2.0.100"
|
||||||
@ -2609,6 +2837,32 @@ dependencies = [
|
|||||||
"weezl",
|
"weezl",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tiny-skia"
|
||||||
|
version = "0.11.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
|
||||||
|
dependencies = [
|
||||||
|
"arrayref",
|
||||||
|
"arrayvec",
|
||||||
|
"bytemuck",
|
||||||
|
"cfg-if",
|
||||||
|
"log",
|
||||||
|
"png",
|
||||||
|
"tiny-skia-path",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tiny-skia-path"
|
||||||
|
version = "0.11.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
|
||||||
|
dependencies = [
|
||||||
|
"arrayref",
|
||||||
|
"bytemuck",
|
||||||
|
"strict-num",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinystr"
|
name = "tinystr"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@ -2684,6 +2938,12 @@ dependencies = [
|
|||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicase"
|
||||||
|
version = "2.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.18"
|
version = "1.0.18"
|
||||||
@ -2719,6 +2979,50 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usvg"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756"
|
||||||
|
dependencies = [
|
||||||
|
"base64 0.21.7",
|
||||||
|
"log",
|
||||||
|
"pico-args",
|
||||||
|
"usvg-parser",
|
||||||
|
"usvg-tree",
|
||||||
|
"xmlwriter",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usvg-parser"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
|
||||||
|
dependencies = [
|
||||||
|
"data-url",
|
||||||
|
"flate2",
|
||||||
|
"imagesize",
|
||||||
|
"kurbo",
|
||||||
|
"log",
|
||||||
|
"roxmltree",
|
||||||
|
"simplecss",
|
||||||
|
"siphasher 0.3.11",
|
||||||
|
"svgtypes",
|
||||||
|
"usvg-tree",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usvg-tree"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
|
||||||
|
dependencies = [
|
||||||
|
"rctree",
|
||||||
|
"strict-num",
|
||||||
|
"svgtypes",
|
||||||
|
"tiny-skia-path",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "utf16_iter"
|
name = "utf16_iter"
|
||||||
version = "1.0.5"
|
version = "1.0.5"
|
||||||
@ -3525,6 +3829,12 @@ version = "0.8.26"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
|
checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "xmlwriter"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yoke"
|
name = "yoke"
|
||||||
version = "0.7.5"
|
version = "0.7.5"
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "inkr"
|
name = "inkr"
|
||||||
version = "0.1.0"
|
version = "1.0.0"
|
||||||
authors = []
|
authors = []
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
@ -13,6 +13,7 @@ pinenote = []
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
egui = "0.31"
|
egui = "0.31"
|
||||||
|
egui_extras = { version = "0.31", features = ["svg"] }
|
||||||
eframe = { version = "0.31", default-features = false, features = [
|
eframe = { version = "0.31", default-features = false, features = [
|
||||||
"glow", # alt: "wgpu".
|
"glow", # alt: "wgpu".
|
||||||
"persistence",
|
"persistence",
|
||||||
|
|||||||
27
PKGBUILD
Normal file
27
PKGBUILD
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
pkgname=inkr
|
||||||
|
pkgver=1.0.0
|
||||||
|
pkgrel=1
|
||||||
|
pkgdesc="A note-taking and handwriting tool"
|
||||||
|
arch=('x86_64' 'aarch64')
|
||||||
|
url="https://git.nubo.sh/hulthe/inkr"
|
||||||
|
#license=('GPL')
|
||||||
|
groups=('base-devel')
|
||||||
|
depends=('glibc')
|
||||||
|
makedepends=('cargo')
|
||||||
|
#optdepends=('ed: for "patch -e" functionality')
|
||||||
|
#source=(" ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
|
||||||
|
#sha256sums=('SKIP')
|
||||||
|
prepare() {
|
||||||
|
export RUSTUP_TOOLCHAIN=stable
|
||||||
|
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||||
|
}
|
||||||
|
build() {
|
||||||
|
export RUSTUP_TOOLCHAIN=stable
|
||||||
|
cargo build --frozen --release
|
||||||
|
}
|
||||||
|
package() {
|
||||||
|
cd ..
|
||||||
|
install -Dm0755 -t "$pkgdir/usr/bin/" "${CARGO_TARGET_DIR:-target}/release/$pkgname"
|
||||||
|
install -Dm0755 -t "$pkgdir/usr/share/applications/" "assets/$pkgname.desktop"
|
||||||
|
install -Dm0755 "assets/icon.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
|
||||||
|
}
|
||||||
73
assets/collapse-icon.svg
Normal file
73
assets/collapse-icon.svg
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="256"
|
||||||
|
height="256"
|
||||||
|
viewBox="0 0 67.733332 67.733332"
|
||||||
|
version="1.1"
|
||||||
|
id="svg1"
|
||||||
|
inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
|
||||||
|
sodipodi:docname="collapse-icon.svg"
|
||||||
|
inkscape:export-filename="collapse-icon.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg">
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="namedview1"
|
||||||
|
pagecolor="#505050"
|
||||||
|
bordercolor="#eeeeee"
|
||||||
|
borderopacity="1"
|
||||||
|
inkscape:showpageshadow="0"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pagecheckerboard="0"
|
||||||
|
inkscape:deskcolor="#505050"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:zoom="2.0010679"
|
||||||
|
inkscape:cx="97.198102"
|
||||||
|
inkscape:cy="140.42502"
|
||||||
|
inkscape:window-width="1472"
|
||||||
|
inkscape:window-height="815"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="38"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="layer1" />
|
||||||
|
<defs
|
||||||
|
id="defs1" />
|
||||||
|
<g
|
||||||
|
inkscape:label="Lager 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1">
|
||||||
|
<rect
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:4.92907;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
id="rect1"
|
||||||
|
width="62.804268"
|
||||||
|
height="52.220932"
|
||||||
|
x="2.4645352"
|
||||||
|
y="7.7562032"
|
||||||
|
ry="6.9627905" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:4.92628;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 28.921473,6.35 V 61.383333"
|
||||||
|
id="path1" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250504,15.411171 9.4994923,15.320325"
|
||||||
|
id="path1-7" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250506,21.743139 9.4994938,21.652293"
|
||||||
|
id="path1-7-4" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250506,28.075107 9.4994938,27.984261"
|
||||||
|
id="path1-7-5" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250508,34.407075 9.4994958,34.316229"
|
||||||
|
id="path1-7-4-4" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.8 KiB |
9
assets/inkr.desktop
Executable file
9
assets/inkr.desktop
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=inkr
|
||||||
|
Exec=inkr
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Icon=inkr
|
||||||
|
StartupWMClass=inkr
|
||||||
|
MimeType=x-scheme-handler/inkr;
|
||||||
|
Categories=Office;
|
||||||
242
src/app.rs
242
src/app.rs
@ -2,11 +2,14 @@ use std::{
|
|||||||
fs,
|
fs,
|
||||||
path::PathBuf,
|
path::PathBuf,
|
||||||
sync::{Arc, mpsc},
|
sync::{Arc, mpsc},
|
||||||
|
thread::JoinHandle,
|
||||||
|
time::{Duration, Instant},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{file_editor::FileEditor, preferences::Preferences, util::GuiSender};
|
use crate::{file_editor::FileEditor, folder::Folder, preferences::Preferences, util::GuiSender};
|
||||||
use egui::{
|
use egui::{
|
||||||
Align, Button, Color32, FontData, FontDefinitions, PointerButton, RichText, ScrollArea, Stroke,
|
Align, Button, Color32, Context, FontData, FontDefinitions, Image, Key, Modifiers,
|
||||||
|
PointerButton, RichText, ScrollArea, Stroke, Widget, include_image,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
@ -18,13 +21,46 @@ pub struct App {
|
|||||||
actions_tx: mpsc::Sender<Action>,
|
actions_tx: mpsc::Sender<Action>,
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
actions_rx: mpsc::Receiver<Action>,
|
actions_rx: mpsc::Receiver<Action>,
|
||||||
|
#[serde(skip)]
|
||||||
|
jobs: Jobs,
|
||||||
|
|
||||||
tabs: Vec<(TabId, Tab)>,
|
tabs: Vec<(TabId, Tab)>,
|
||||||
|
|
||||||
|
show_folders: bool,
|
||||||
|
folders: Vec<Folder>,
|
||||||
|
|
||||||
open_tab_index: Option<usize>,
|
open_tab_index: Option<usize>,
|
||||||
|
|
||||||
next_tab_id: TabId,
|
next_tab_id: TabId,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct Jobs {
|
||||||
|
handles: Vec<JoinHandle<()>>,
|
||||||
|
actions_tx: mpsc::Sender<Action>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Jobs {
|
||||||
|
fn start(&mut self, ctx: &Context, job: impl FnOnce() -> Option<Action> + Send + 'static) {
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
let actions_tx = self.actions_tx.clone();
|
||||||
|
self.handles.push(std::thread::spawn(move || {
|
||||||
|
// start rendering the spinner thingy
|
||||||
|
ctx.request_repaint();
|
||||||
|
|
||||||
|
let start = Instant::now();
|
||||||
|
|
||||||
|
if let Some(action) = job() {
|
||||||
|
let _ = actions_tx.send(action);
|
||||||
|
ctx.request_repaint();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Make sure that task takes at least 250ms to run, so that the spinner won't blink
|
||||||
|
let sleep_for = Duration::from_millis(250).saturating_sub(start.elapsed());
|
||||||
|
std::thread::sleep(sleep_for);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
enum Tab {
|
enum Tab {
|
||||||
File(FileEditor),
|
File(FileEditor),
|
||||||
@ -36,12 +72,19 @@ impl Tab {
|
|||||||
Tab::File(file_editor) => file_editor.title(),
|
Tab::File(file_editor) => file_editor.title(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn is_dirty(&self) -> bool {
|
||||||
|
match self {
|
||||||
|
Tab::File(file_editor) => file_editor.is_dirty,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type TabId = usize;
|
pub type TabId = usize;
|
||||||
|
|
||||||
pub enum Action {
|
pub enum Action {
|
||||||
OpenFile(FileEditor),
|
OpenFile(FileEditor),
|
||||||
|
OpenFolder(Folder),
|
||||||
MoveFile(TabId, PathBuf),
|
MoveFile(TabId, PathBuf),
|
||||||
CloseTab(TabId),
|
CloseTab(TabId),
|
||||||
// TODO
|
// TODO
|
||||||
@ -55,11 +98,17 @@ impl Default for App {
|
|||||||
let (actions_tx, actions_rx) = mpsc::channel();
|
let (actions_tx, actions_rx) = mpsc::channel();
|
||||||
Self {
|
Self {
|
||||||
preferences: Preferences::default(),
|
preferences: Preferences::default(),
|
||||||
actions_tx,
|
actions_tx: actions_tx.clone(/* this is silly, i know */),
|
||||||
actions_rx,
|
actions_rx,
|
||||||
|
jobs: Jobs {
|
||||||
|
handles: Default::default(),
|
||||||
|
actions_tx,
|
||||||
|
},
|
||||||
tabs: vec![(1, Tab::File(FileEditor::new("note.md")))],
|
tabs: vec![(1, Tab::File(FileEditor::new("note.md")))],
|
||||||
open_tab_index: None,
|
open_tab_index: None,
|
||||||
next_tab_id: 2,
|
next_tab_id: 2,
|
||||||
|
show_folders: false,
|
||||||
|
folders: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -139,6 +188,9 @@ impl App {
|
|||||||
Stroke::new(1.0, Color32::from_rgb(200, 200, 200));
|
Stroke::new(1.0, Color32::from_rgb(200, 200, 200));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// enable features on egui_extras to add more image types
|
||||||
|
egui_extras::install_image_loaders(&cc.egui_ctx);
|
||||||
|
|
||||||
if let Some(storage) = cc.storage {
|
if let Some(storage) = cc.storage {
|
||||||
return eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default();
|
return eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default();
|
||||||
}
|
}
|
||||||
@ -146,12 +198,24 @@ impl App {
|
|||||||
Default::default()
|
Default::default()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn actions_tx(&self, ctx: &egui::Context) -> GuiSender<Action> {
|
fn actions_tx(&self, ctx: &Context) -> GuiSender<Action> {
|
||||||
GuiSender::new(self.actions_tx.clone(), ctx)
|
GuiSender::new(self.actions_tx.clone(), ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_action(&mut self, action: Action) {
|
fn handle_action(&mut self, action: Action) {
|
||||||
match action {
|
match action {
|
||||||
|
Action::OpenFolder(new_folder) => {
|
||||||
|
if let Some(folder) = self
|
||||||
|
.folders
|
||||||
|
.iter_mut()
|
||||||
|
.find(|folder| folder.path() == new_folder.path())
|
||||||
|
{
|
||||||
|
*folder = new_folder;
|
||||||
|
} else {
|
||||||
|
self.folders.push(new_folder);
|
||||||
|
self.folders.sort_by(|a, b| a.name().cmp(b.name()));
|
||||||
|
}
|
||||||
|
}
|
||||||
Action::OpenFile(file_editor) => {
|
Action::OpenFile(file_editor) => {
|
||||||
self.open_tab(Tab::File(file_editor));
|
self.open_tab(Tab::File(file_editor));
|
||||||
}
|
}
|
||||||
@ -175,9 +239,11 @@ impl eframe::App for App {
|
|||||||
eframe::set_value(storage, eframe::APP_KEY, self);
|
eframe::set_value(storage, eframe::APP_KEY, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
|
||||||
self.preferences.apply(ctx);
|
self.preferences.apply(ctx);
|
||||||
|
|
||||||
|
self.jobs.handles.retain(|job| !job.is_finished());
|
||||||
|
|
||||||
while let Ok(action) = self.actions_rx.try_recv() {
|
while let Ok(action) = self.actions_rx.try_recv() {
|
||||||
self.handle_action(action);
|
self.handle_action(action);
|
||||||
}
|
}
|
||||||
@ -186,11 +252,11 @@ impl eframe::App for App {
|
|||||||
self.open_tab_index = Some(self.tabs.len().saturating_sub(1));
|
self.open_tab_index = Some(self.tabs.len().saturating_sub(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
//ctx.input_mut(|input| {
|
ctx.input_mut(|input| {
|
||||||
// if input.consume_key(Modifiers::CTRL, Key::H) {
|
if input.consume_key(Modifiers::CTRL, Key::S) {
|
||||||
// self.buffer.push(BufferItem::Painting(Default::default()));
|
self.save_active_tab(ctx);
|
||||||
// }
|
}
|
||||||
//});
|
});
|
||||||
|
|
||||||
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
|
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
|
||||||
egui::containers::menu::Bar::new().ui(ui, |ui| {
|
egui::containers::menu::Bar::new().ui(ui, |ui| {
|
||||||
@ -205,27 +271,25 @@ impl eframe::App for App {
|
|||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
if ui.button("Open File").clicked() {
|
if ui.button("Open File").clicked() {
|
||||||
let actions_tx = self.actions_tx(ui.ctx());
|
self.jobs.start(ui.ctx(), move || {
|
||||||
std::thread::spawn(move || {
|
let file_path = rfd::FileDialog::new().pick_file()?;
|
||||||
let file = rfd::FileDialog::new().pick_file();
|
|
||||||
|
|
||||||
let Some(file_path) = file else { return };
|
let text = fs::read_to_string(&file_path)
|
||||||
|
.inspect_err(|e| log::error!("Failed to read {file_path:?}: {e}"))
|
||||||
let text = match fs::read_to_string(&file_path) {
|
.ok()?;
|
||||||
Ok(text) => text,
|
|
||||||
Err(e) => {
|
|
||||||
log::error!("Failed to read {file_path:?}: {e}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let editor = FileEditor::from_file(file_path, &text);
|
let editor = FileEditor::from_file(file_path, &text);
|
||||||
let _ = actions_tx.send(Action::OpenFile(editor));
|
Some(Action::OpenFile(editor))
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if ui.button("Open Folder").clicked() {
|
if ui.button("Open Folder").clicked() {
|
||||||
log::error!("Open Folder not implemented");
|
self.jobs.start(ui.ctx(), move || {
|
||||||
|
let path = rfd::FileDialog::new().pick_folder()?;
|
||||||
|
let name = path.file_name()?.to_string_lossy().to_string();
|
||||||
|
let folder = Folder::NotLoaded { name, path };
|
||||||
|
Some(Action::OpenFolder(folder))
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if ui
|
if ui
|
||||||
@ -237,52 +301,41 @@ impl eframe::App for App {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let open_file =
|
let can_save_file = self
|
||||||
self.open_tab_index
|
.open_tab_index
|
||||||
.and_then(|i| self.tabs.get(i))
|
.and_then(|i| self.tabs.get(i))
|
||||||
.and_then(|(id, tab)| match tab {
|
.map(|(id, tab)| match tab {
|
||||||
Tab::File(file_editor) => Some((*id, file_editor)),
|
Tab::File(file_editor) => (*id, file_editor),
|
||||||
});
|
})
|
||||||
|
.and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor)))
|
||||||
|
.is_some();
|
||||||
|
|
||||||
let open_file_with_path = open_file
|
if ui.add_enabled(can_save_file, Button::new("Save")).clicked() {
|
||||||
.clone()
|
self.save_active_tab(ui.ctx());
|
||||||
.and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor)));
|
}
|
||||||
|
|
||||||
if ui
|
let open_file = self.open_tab_index.and_then(|i| self.tabs.get(i)).map(
|
||||||
.add_enabled(open_file_with_path.is_some(), Button::new("Save"))
|
|(id, tab)| match tab {
|
||||||
.clicked()
|
Tab::File(file_editor) => (*id, file_editor),
|
||||||
{
|
},
|
||||||
if let Some((file_path, file_editor)) = open_file_with_path {
|
);
|
||||||
let text = file_editor.to_string();
|
|
||||||
let file_path = file_path.to_owned();
|
|
||||||
std::thread::spawn(move || {
|
|
||||||
if let Err(e) = fs::write(file_path, text.as_bytes()) {
|
|
||||||
log::error!("{e}");
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
if ui
|
if ui
|
||||||
.add_enabled(open_file.is_some(), Button::new("Save As"))
|
.add_enabled(open_file.is_some(), Button::new("Save As"))
|
||||||
.clicked()
|
.clicked()
|
||||||
{
|
{
|
||||||
let actions_tx = self.actions_tx(ui.ctx());
|
|
||||||
let (tab_id, editor) =
|
let (tab_id, editor) =
|
||||||
open_file.expect("We checked that open_file is_some");
|
open_file.expect("We checked that open_file is_some");
|
||||||
let text = editor.to_string();
|
let text = editor.to_string();
|
||||||
std::thread::spawn(move || {
|
self.jobs.start(ui.ctx(), move || {
|
||||||
let Some(file_path) = rfd::FileDialog::new().save_file() else {
|
let file_path = rfd::FileDialog::new().save_file()?;
|
||||||
return;
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Err(e) = fs::write(&file_path, text.as_bytes()) {
|
fs::write(&file_path, text.as_bytes())
|
||||||
log::error!("{e}");
|
.inspect_err(|e| log::error!("{e}"))
|
||||||
return;
|
.ok()?;
|
||||||
};
|
|
||||||
|
|
||||||
let _ = actions_tx.send(Action::MoveFile(tab_id, file_path));
|
Some(Action::MoveFile(tab_id, file_path))
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -297,7 +350,18 @@ impl eframe::App for App {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ui.add_space(16.0);
|
ui.add_space(8.0);
|
||||||
|
|
||||||
|
let image = Image::new(include_image!("../assets/collapse-icon.svg"));
|
||||||
|
let image = image.tint(ui.style().visuals.text_color());
|
||||||
|
if Button::image(image).ui(ui).clicked() {
|
||||||
|
self.show_folders = !self.show_folders;
|
||||||
|
}
|
||||||
|
|
||||||
|
if !self.jobs.handles.is_empty() {
|
||||||
|
ui.add_space(8.0);
|
||||||
|
ui.spinner();
|
||||||
|
}
|
||||||
|
|
||||||
ui.add_space(16.0);
|
ui.add_space(16.0);
|
||||||
|
|
||||||
@ -306,8 +370,7 @@ impl eframe::App for App {
|
|||||||
let selected = self.open_tab_index == Some(i);
|
let selected = self.open_tab_index == Some(i);
|
||||||
let mut button = Button::new(tab.title()).selected(selected);
|
let mut button = Button::new(tab.title()).selected(selected);
|
||||||
|
|
||||||
let dirty = i == 0; // TODO: mark as dirty when contents hasn't been saved
|
if tab.is_dirty() {
|
||||||
if dirty {
|
|
||||||
button = button.right_text(RichText::new("*").strong())
|
button = button.right_text(RichText::new("*").strong())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -323,6 +386,39 @@ impl eframe::App for App {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
egui::SidePanel::left("file browser")
|
||||||
|
.resizable(true)
|
||||||
|
.show_animated(ctx, self.show_folders, |ui| {
|
||||||
|
if ui.button("refresh").clicked() {
|
||||||
|
for folder in &mut self.folders {
|
||||||
|
folder.unload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollArea::both().auto_shrink(false).show(ui, |ui| {
|
||||||
|
self.folders.retain_mut(|folder| {
|
||||||
|
let response = folder.show(ui);
|
||||||
|
|
||||||
|
if let Some(file_path) = response.open_file {
|
||||||
|
let file_path = file_path.to_owned();
|
||||||
|
self.jobs.start(ui.ctx(), move || {
|
||||||
|
let text = fs::read_to_string(&file_path)
|
||||||
|
.inspect_err(|e| {
|
||||||
|
log::error!("Failed to read {file_path:?}: {e}")
|
||||||
|
})
|
||||||
|
.ok()?;
|
||||||
|
|
||||||
|
let editor = FileEditor::from_file(file_path, &text);
|
||||||
|
Some(Action::OpenFile(editor))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// delete on right-click
|
||||||
|
!response.clicked_by(PointerButton::Secondary)
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
egui::CentralPanel::default().show(ctx, |ui| {
|
egui::CentralPanel::default().show(ctx, |ui| {
|
||||||
if let Some(Tab::File(file_editor)) = self
|
if let Some(Tab::File(file_editor)) = self
|
||||||
.open_tab_index
|
.open_tab_index
|
||||||
@ -354,5 +450,33 @@ impl App {
|
|||||||
let id = self.next_tab_id;
|
let id = self.next_tab_id;
|
||||||
self.next_tab_id += 1;
|
self.next_tab_id += 1;
|
||||||
self.tabs.insert(i, (id, tab));
|
self.tabs.insert(i, (id, tab));
|
||||||
|
self.open_tab_index = Some(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn save_active_tab(&mut self, ctx: &Context) {
|
||||||
|
let open_file = self
|
||||||
|
.open_tab_index
|
||||||
|
.and_then(|i| self.tabs.get_mut(i))
|
||||||
|
.map(|(id, tab)| match tab {
|
||||||
|
Tab::File(file_editor) => (*id, file_editor),
|
||||||
|
})
|
||||||
|
.and_then(|(_, file_editor)| {
|
||||||
|
file_editor
|
||||||
|
.path()
|
||||||
|
.map(ToOwned::to_owned)
|
||||||
|
.zip(Some(file_editor))
|
||||||
|
});
|
||||||
|
|
||||||
|
if let Some((file_path, file_editor)) = open_file {
|
||||||
|
file_editor.is_dirty = false;
|
||||||
|
let text = file_editor.to_string();
|
||||||
|
let file_path = file_path.to_owned();
|
||||||
|
self.jobs.start(ctx, move || {
|
||||||
|
if let Err(e) = fs::write(file_path, text.as_bytes()) {
|
||||||
|
log::error!("{e}");
|
||||||
|
};
|
||||||
|
None
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
243
src/easy_mark/easy_mark_highlighter.rs
Normal file
243
src/easy_mark/easy_mark_highlighter.rs
Normal file
@ -0,0 +1,243 @@
|
|||||||
|
use egui::text::{CCursorRange, LayoutJob};
|
||||||
|
|
||||||
|
use crate::easy_mark::easy_mark_parser;
|
||||||
|
|
||||||
|
/// Highlight easymark, memoizing previous output to save CPU.
|
||||||
|
///
|
||||||
|
/// In practice, the highlighter is fast enough not to need any caching.
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct MemoizedHighlighter {
|
||||||
|
style: egui::Style,
|
||||||
|
code: String,
|
||||||
|
output: LayoutJob,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MemoizedHighlighter {
|
||||||
|
pub fn highlight(
|
||||||
|
&mut self,
|
||||||
|
egui_style: &egui::Style,
|
||||||
|
code: &str,
|
||||||
|
cursor: Option<CCursorRange>,
|
||||||
|
) -> LayoutJob {
|
||||||
|
if (&self.style, self.code.as_str()) != (egui_style, code) {
|
||||||
|
self.style = egui_style.clone();
|
||||||
|
code.clone_into(&mut self.code);
|
||||||
|
self.output = highlight_easymark(egui_style, code, cursor);
|
||||||
|
}
|
||||||
|
self.output.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn highlight_easymark(
|
||||||
|
egui_style: &egui::Style,
|
||||||
|
mut text: &str,
|
||||||
|
|
||||||
|
// TODO: hide special characters where cursor isn't
|
||||||
|
_cursor: Option<CCursorRange>,
|
||||||
|
) -> LayoutJob {
|
||||||
|
let mut job = LayoutJob::default();
|
||||||
|
let mut style = easy_mark_parser::Style::default();
|
||||||
|
let mut start_of_line = true;
|
||||||
|
|
||||||
|
const CODE_INDENT: f32 = 10.0;
|
||||||
|
|
||||||
|
while !text.is_empty() {
|
||||||
|
if start_of_line && text.starts_with("```") {
|
||||||
|
let astyle = format_from_style(
|
||||||
|
egui_style,
|
||||||
|
&easy_mark_parser::Style {
|
||||||
|
code: true,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Render the initial backticks as spaces
|
||||||
|
text = &text[3..];
|
||||||
|
job.append(" ", CODE_INDENT, astyle.clone());
|
||||||
|
|
||||||
|
match text.find("\n```") {
|
||||||
|
Some(n) => {
|
||||||
|
for line in text[..n + 1].lines() {
|
||||||
|
job.append(line, CODE_INDENT, astyle.clone());
|
||||||
|
job.append("\n", 0.0, astyle.clone());
|
||||||
|
}
|
||||||
|
// Render the final backticks as spaces
|
||||||
|
job.append(" ", CODE_INDENT, astyle);
|
||||||
|
text = &text[n + 4..];
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
job.append(text, 0.0, astyle.clone());
|
||||||
|
text = "";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
style = Default::default();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if text.starts_with('`') {
|
||||||
|
style.code = true;
|
||||||
|
let end = text[1..]
|
||||||
|
.find(&['`', '\n'][..])
|
||||||
|
.map_or_else(|| text.len(), |i| i + 2);
|
||||||
|
job.append(&text[..end], 0.0, format_from_style(egui_style, &style));
|
||||||
|
text = &text[end..];
|
||||||
|
style.code = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let skip;
|
||||||
|
|
||||||
|
// zero-width space
|
||||||
|
let _zws = "\u{200b}";
|
||||||
|
|
||||||
|
let mut apply_basic_style =
|
||||||
|
|text: &mut &str,
|
||||||
|
style: &mut easy_mark_parser::Style,
|
||||||
|
access: fn(&mut easy_mark_parser::Style) -> &mut bool| {
|
||||||
|
let skip = if *access(style) {
|
||||||
|
// Include the character that is ending this style:
|
||||||
|
job.append(&text[..1], 0.0, format_from_style(egui_style, style));
|
||||||
|
*text = &text[1..];
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
1
|
||||||
|
};
|
||||||
|
*access(style) ^= true;
|
||||||
|
skip
|
||||||
|
};
|
||||||
|
|
||||||
|
if text.starts_with('*') {
|
||||||
|
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.strong);
|
||||||
|
} else if text.starts_with('/') {
|
||||||
|
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.italics);
|
||||||
|
} else if text.starts_with('_') {
|
||||||
|
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.underline);
|
||||||
|
} else if text.starts_with('$') {
|
||||||
|
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.small);
|
||||||
|
} else if text.starts_with('~') {
|
||||||
|
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.strikethrough);
|
||||||
|
} else if text.starts_with('^') {
|
||||||
|
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.raised);
|
||||||
|
} else if text.starts_with('\\') && text.len() >= 2 {
|
||||||
|
skip = 2;
|
||||||
|
} else if start_of_line && text.starts_with(' ') {
|
||||||
|
// we don't preview indentation, because it is confusing
|
||||||
|
skip = 1;
|
||||||
|
} else if start_of_line && text.starts_with("###### ") {
|
||||||
|
style.heading = true;
|
||||||
|
skip = 7;
|
||||||
|
} else if start_of_line && text.starts_with("##### ") {
|
||||||
|
style.heading = true;
|
||||||
|
skip = 6;
|
||||||
|
} else if start_of_line && text.starts_with("#### ") {
|
||||||
|
style.heading = true;
|
||||||
|
skip = 5;
|
||||||
|
} else if start_of_line && text.starts_with("### ") {
|
||||||
|
style.heading = true;
|
||||||
|
skip = 4;
|
||||||
|
} else if start_of_line && text.starts_with("## ") {
|
||||||
|
style.heading = true;
|
||||||
|
skip = 3;
|
||||||
|
} else if start_of_line && text.starts_with("# ") {
|
||||||
|
style.heading = true;
|
||||||
|
skip = 2;
|
||||||
|
} else if start_of_line && text.starts_with("> ") {
|
||||||
|
style.quoted = true;
|
||||||
|
skip = 2;
|
||||||
|
// we don't preview indentation, because it is confusing
|
||||||
|
} else if start_of_line && text.trim_start().starts_with("- ") {
|
||||||
|
job.append("• ", 0.0, format_from_style(egui_style, &style));
|
||||||
|
text = &text[2..];
|
||||||
|
skip = 0;
|
||||||
|
// we don't preview indentation, because it is confusing
|
||||||
|
} else {
|
||||||
|
skip = 0;
|
||||||
|
}
|
||||||
|
// Note: we don't preview underline, strikethrough and italics because it confuses things.
|
||||||
|
|
||||||
|
// Swallow everything up to the next special character:
|
||||||
|
let line_end = text[skip..]
|
||||||
|
.find('\n')
|
||||||
|
.map_or_else(|| text.len(), |i| (skip + i + 1));
|
||||||
|
let end = text[skip..]
|
||||||
|
.find(&['*', '`', '~', '_', '/', '$', '^', '\\', '<', '['][..])
|
||||||
|
.map_or_else(|| text.len(), |i| (skip + i).max(1));
|
||||||
|
|
||||||
|
if line_end <= end {
|
||||||
|
job.append(
|
||||||
|
&text[..line_end],
|
||||||
|
0.0,
|
||||||
|
format_from_style(egui_style, &style),
|
||||||
|
);
|
||||||
|
text = &text[line_end..];
|
||||||
|
start_of_line = true;
|
||||||
|
style = Default::default();
|
||||||
|
} else {
|
||||||
|
job.append(&text[..end], 0.0, format_from_style(egui_style, &style));
|
||||||
|
text = &text[end..];
|
||||||
|
start_of_line = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
job
|
||||||
|
}
|
||||||
|
|
||||||
|
fn format_from_style(
|
||||||
|
egui_style: &egui::Style,
|
||||||
|
emark_style: &easy_mark_parser::Style,
|
||||||
|
) -> egui::text::TextFormat {
|
||||||
|
use egui::{Align, Color32, Stroke, TextStyle};
|
||||||
|
|
||||||
|
let color = if emark_style.strong || emark_style.heading {
|
||||||
|
egui_style.visuals.strong_text_color()
|
||||||
|
} else if emark_style.quoted {
|
||||||
|
egui_style.visuals.weak_text_color()
|
||||||
|
} else {
|
||||||
|
egui_style.visuals.text_color()
|
||||||
|
};
|
||||||
|
|
||||||
|
let text_style = if emark_style.heading {
|
||||||
|
TextStyle::Heading
|
||||||
|
} else if emark_style.code {
|
||||||
|
TextStyle::Monospace
|
||||||
|
} else if emark_style.small | emark_style.raised {
|
||||||
|
TextStyle::Small
|
||||||
|
} else {
|
||||||
|
TextStyle::Body
|
||||||
|
};
|
||||||
|
|
||||||
|
let background = if emark_style.code {
|
||||||
|
egui_style.visuals.code_bg_color
|
||||||
|
} else {
|
||||||
|
Color32::TRANSPARENT
|
||||||
|
};
|
||||||
|
|
||||||
|
let underline = if emark_style.underline {
|
||||||
|
Stroke::new(1.0, color)
|
||||||
|
} else {
|
||||||
|
Stroke::NONE
|
||||||
|
};
|
||||||
|
|
||||||
|
let strikethrough = if emark_style.strikethrough {
|
||||||
|
Stroke::new(1.0, color)
|
||||||
|
} else {
|
||||||
|
Stroke::NONE
|
||||||
|
};
|
||||||
|
|
||||||
|
let valign = if emark_style.raised {
|
||||||
|
Align::TOP
|
||||||
|
} else {
|
||||||
|
Align::BOTTOM
|
||||||
|
};
|
||||||
|
|
||||||
|
egui::text::TextFormat {
|
||||||
|
font_id: text_style.resolve(egui_style),
|
||||||
|
color,
|
||||||
|
background,
|
||||||
|
italics: emark_style.italics,
|
||||||
|
underline,
|
||||||
|
strikethrough,
|
||||||
|
valign,
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
}
|
||||||
346
src/easy_mark/easy_mark_parser.rs
Normal file
346
src/easy_mark/easy_mark_parser.rs
Normal file
@ -0,0 +1,346 @@
|
|||||||
|
//! A parser for `EasyMark`: a very simple markup language.
|
||||||
|
//!
|
||||||
|
//! WARNING: `EasyMark` is subject to change.
|
||||||
|
//
|
||||||
|
//! # `EasyMark` design goals:
|
||||||
|
//! 1. easy to parse
|
||||||
|
//! 2. easy to learn
|
||||||
|
//! 3. similar to markdown
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
||||||
|
pub enum Item<'a> {
|
||||||
|
/// `\n`
|
||||||
|
// TODO(emilk): add Style here so empty heading still uses up the right amount of space.
|
||||||
|
Newline,
|
||||||
|
|
||||||
|
/// Text
|
||||||
|
Text(Style, &'a str),
|
||||||
|
|
||||||
|
/// title, url
|
||||||
|
Hyperlink(Style, &'a str, &'a str),
|
||||||
|
|
||||||
|
/// leading space before e.g. a [`Self::BulletPoint`].
|
||||||
|
Indentation(usize),
|
||||||
|
|
||||||
|
/// >
|
||||||
|
QuoteIndent,
|
||||||
|
|
||||||
|
/// - a point well made.
|
||||||
|
BulletPoint,
|
||||||
|
|
||||||
|
/// 1. numbered list. The string is the number(s).
|
||||||
|
NumberedPoint(&'a str),
|
||||||
|
|
||||||
|
/// ---
|
||||||
|
Separator,
|
||||||
|
|
||||||
|
/// language, code
|
||||||
|
CodeBlock(&'a str, &'a str),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
||||||
|
pub struct Style {
|
||||||
|
/// # heading (large text)
|
||||||
|
pub heading: bool,
|
||||||
|
|
||||||
|
/// > quoted (slightly dimmer color or other font style)
|
||||||
|
pub quoted: bool,
|
||||||
|
|
||||||
|
/// `code` (monospace, some other color)
|
||||||
|
pub code: bool,
|
||||||
|
|
||||||
|
/// self.strong* (emphasized, e.g. bold)
|
||||||
|
pub strong: bool,
|
||||||
|
|
||||||
|
/// _underline_
|
||||||
|
pub underline: bool,
|
||||||
|
|
||||||
|
/// ~strikethrough~
|
||||||
|
pub strikethrough: bool,
|
||||||
|
|
||||||
|
/// /italics/
|
||||||
|
pub italics: bool,
|
||||||
|
|
||||||
|
/// $small$
|
||||||
|
pub small: bool,
|
||||||
|
|
||||||
|
/// ^raised^
|
||||||
|
pub raised: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parser for the `EasyMark` markup language.
|
||||||
|
pub struct Parser<'a> {
|
||||||
|
/// The remainder of the input text
|
||||||
|
s: &'a str,
|
||||||
|
|
||||||
|
/// Are we at the start of a line?
|
||||||
|
start_of_line: bool,
|
||||||
|
|
||||||
|
/// Current self.style. Reset after a newline.
|
||||||
|
style: Style,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Parser<'a> {
|
||||||
|
pub fn new(s: &'a str) -> Self {
|
||||||
|
Self {
|
||||||
|
s,
|
||||||
|
start_of_line: true,
|
||||||
|
style: Style::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `1. `, `42. ` etc.
|
||||||
|
fn numbered_list(&mut self) -> Option<Item<'a>> {
|
||||||
|
let n_digits = self.s.chars().take_while(|c| c.is_ascii_digit()).count();
|
||||||
|
if n_digits > 0 && self.s.chars().skip(n_digits).take(2).eq(". ".chars()) {
|
||||||
|
let number = &self.s[..n_digits];
|
||||||
|
self.s = &self.s[(n_digits + 2)..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::NumberedPoint(number));
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
// ```{language}\n{code}```
|
||||||
|
fn code_block(&mut self) -> Option<Item<'a>> {
|
||||||
|
if let Some(language_start) = self.s.strip_prefix("```") {
|
||||||
|
if let Some(newline) = language_start.find('\n') {
|
||||||
|
let language = &language_start[..newline];
|
||||||
|
let code_start = &language_start[newline + 1..];
|
||||||
|
if let Some(end) = code_start.find("\n```") {
|
||||||
|
let code = &code_start[..end].trim();
|
||||||
|
self.s = &code_start[end + 4..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::CodeBlock(language, code));
|
||||||
|
} else {
|
||||||
|
self.s = "";
|
||||||
|
return Some(Item::CodeBlock(language, code_start));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
// `code`
|
||||||
|
fn inline_code(&mut self) -> Option<Item<'a>> {
|
||||||
|
if let Some(rest) = self.s.strip_prefix('`') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.code = true;
|
||||||
|
let rest_of_line = &self.s[..self.s.find('\n').unwrap_or(self.s.len())];
|
||||||
|
if let Some(end) = rest_of_line.find('`') {
|
||||||
|
let item = Item::Text(self.style, &self.s[..end]);
|
||||||
|
self.s = &self.s[end + 1..];
|
||||||
|
self.style.code = false;
|
||||||
|
return Some(item);
|
||||||
|
} else {
|
||||||
|
let end = rest_of_line.len();
|
||||||
|
let item = Item::Text(self.style, rest_of_line);
|
||||||
|
self.s = &self.s[end..];
|
||||||
|
self.style.code = false;
|
||||||
|
return Some(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `<url>` or `[link](url)`
|
||||||
|
fn url(&mut self) -> Option<Item<'a>> {
|
||||||
|
if self.s.starts_with('<') {
|
||||||
|
let this_line = &self.s[..self.s.find('\n').unwrap_or(self.s.len())];
|
||||||
|
if let Some(url_end) = this_line.find('>') {
|
||||||
|
let url = &self.s[1..url_end];
|
||||||
|
self.s = &self.s[url_end + 1..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::Hyperlink(self.style, url, url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// [text](url)
|
||||||
|
if self.s.starts_with('[') {
|
||||||
|
let this_line = &self.s[..self.s.find('\n').unwrap_or(self.s.len())];
|
||||||
|
if let Some(bracket_end) = this_line.find(']') {
|
||||||
|
let text = &this_line[1..bracket_end];
|
||||||
|
if this_line[bracket_end + 1..].starts_with('(') {
|
||||||
|
if let Some(parens_end) = this_line[bracket_end + 2..].find(')') {
|
||||||
|
let parens_end = bracket_end + 2 + parens_end;
|
||||||
|
let url = &self.s[bracket_end + 2..parens_end];
|
||||||
|
self.s = &self.s[parens_end + 1..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::Hyperlink(self.style, text, url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Iterator for Parser<'a> {
|
||||||
|
type Item = Item<'a>;
|
||||||
|
|
||||||
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
|
loop {
|
||||||
|
if self.s.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
// \n
|
||||||
|
if self.s.starts_with('\n') {
|
||||||
|
self.s = &self.s[1..];
|
||||||
|
self.start_of_line = true;
|
||||||
|
self.style = Style::default();
|
||||||
|
return Some(Item::Newline);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ignore line break (continue on the same line)
|
||||||
|
if self.s.starts_with("\\\n") && self.s.len() >= 2 {
|
||||||
|
self.s = &self.s[2..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// \ escape (to show e.g. a backtick)
|
||||||
|
if self.s.starts_with('\\') && self.s.len() >= 2 {
|
||||||
|
let text = &self.s[1..2];
|
||||||
|
self.s = &self.s[2..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::Text(self.style, text));
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.start_of_line {
|
||||||
|
// leading space (indentation)
|
||||||
|
if self.s.starts_with(' ') {
|
||||||
|
let length = self.s.find(|c| c != ' ').unwrap_or(self.s.len());
|
||||||
|
self.s = &self.s[length..];
|
||||||
|
self.start_of_line = true; // indentation doesn't count
|
||||||
|
return Some(Item::Indentation(length));
|
||||||
|
}
|
||||||
|
|
||||||
|
// # Heading
|
||||||
|
if let Some(after) = self.s.strip_prefix("# ") {
|
||||||
|
self.s = after;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.heading = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// > quote
|
||||||
|
if let Some(after) = self.s.strip_prefix("> ") {
|
||||||
|
self.s = after;
|
||||||
|
self.start_of_line = true; // quote indentation doesn't count
|
||||||
|
self.style.quoted = true;
|
||||||
|
return Some(Item::QuoteIndent);
|
||||||
|
}
|
||||||
|
|
||||||
|
// - bullet point
|
||||||
|
if self.s.starts_with("- ") {
|
||||||
|
self.s = &self.s[2..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::BulletPoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
// `1. `, `42. ` etc.
|
||||||
|
if let Some(item) = self.numbered_list() {
|
||||||
|
return Some(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- separator
|
||||||
|
if let Some(after) = self.s.strip_prefix("---") {
|
||||||
|
self.s = after.trim_start_matches('-'); // remove extra dashes
|
||||||
|
self.s = self.s.strip_prefix('\n').unwrap_or(self.s); // remove trailing newline
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(Item::Separator);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ```{language}\n{code}```
|
||||||
|
if let Some(item) = self.code_block() {
|
||||||
|
return Some(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// `code`
|
||||||
|
if let Some(item) = self.inline_code() {
|
||||||
|
return Some(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(rest) = self.s.strip_prefix('*') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.strong = !self.style.strong;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Some(rest) = self.s.strip_prefix('_') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.underline = !self.style.underline;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Some(rest) = self.s.strip_prefix('~') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.strikethrough = !self.style.strikethrough;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Some(rest) = self.s.strip_prefix('/') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.italics = !self.style.italics;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Some(rest) = self.s.strip_prefix('$') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.small = !self.style.small;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Some(rest) = self.s.strip_prefix('^') {
|
||||||
|
self.s = rest;
|
||||||
|
self.start_of_line = false;
|
||||||
|
self.style.raised = !self.style.raised;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// `<url>` or `[link](url)`
|
||||||
|
if let Some(item) = self.url() {
|
||||||
|
return Some(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Swallow everything up to the next special character:
|
||||||
|
let end = self
|
||||||
|
.s
|
||||||
|
.find(&['*', '`', '~', '_', '/', '$', '^', '\\', '<', '[', '\n'][..])
|
||||||
|
.map_or_else(|| self.s.len(), |special| special.max(1));
|
||||||
|
|
||||||
|
let item = Item::Text(self.style, &self.s[..end]);
|
||||||
|
self.s = &self.s[end..];
|
||||||
|
self.start_of_line = false;
|
||||||
|
return Some(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_easy_mark_parser() {
|
||||||
|
let items: Vec<_> = Parser::new("~strikethrough `code`~").collect();
|
||||||
|
assert_eq!(
|
||||||
|
items,
|
||||||
|
vec![
|
||||||
|
Item::Text(
|
||||||
|
Style {
|
||||||
|
strikethrough: true,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
"strikethrough "
|
||||||
|
),
|
||||||
|
Item::Text(
|
||||||
|
Style {
|
||||||
|
code: true,
|
||||||
|
strikethrough: true,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
"code"
|
||||||
|
),
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
7
src/easy_mark/mod.rs
Normal file
7
src/easy_mark/mod.rs
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
//! Experimental markup language
|
||||||
|
|
||||||
|
mod easy_mark_highlighter;
|
||||||
|
pub mod easy_mark_parser;
|
||||||
|
|
||||||
|
pub use easy_mark_highlighter::{MemoizedHighlighter, highlight_easymark};
|
||||||
|
pub use easy_mark_parser as parser;
|
||||||
@ -12,7 +12,7 @@ use egui::{
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
custom_code_block::{MdItem, iter_lines_and_code_blocks},
|
custom_code_block::{MdItem, iter_lines_and_code_blocks},
|
||||||
painting::{self, Handwriting, HandwritingStyle},
|
handwriting::{self, Handwriting, HandwritingStyle},
|
||||||
preferences::Preferences,
|
preferences::Preferences,
|
||||||
text_editor::MdTextEdit,
|
text_editor::MdTextEdit,
|
||||||
};
|
};
|
||||||
@ -22,12 +22,15 @@ pub struct FileEditor {
|
|||||||
title: String,
|
title: String,
|
||||||
pub path: Option<PathBuf>,
|
pub path: Option<PathBuf>,
|
||||||
pub buffer: Vec<BufferItem>,
|
pub buffer: Vec<BufferItem>,
|
||||||
|
|
||||||
|
/// Whether the file has been edited since it was laste saved to disk.
|
||||||
|
pub is_dirty: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
pub enum BufferItem {
|
pub enum BufferItem {
|
||||||
Text(MdTextEdit),
|
Text(MdTextEdit),
|
||||||
Handwriting(Handwriting),
|
Handwriting(Box<Handwriting>),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl FileEditor {
|
impl FileEditor {
|
||||||
@ -37,6 +40,7 @@ impl FileEditor {
|
|||||||
title: title.into(),
|
title: title.into(),
|
||||||
path: None,
|
path: None,
|
||||||
buffer,
|
buffer,
|
||||||
|
is_dirty: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -69,9 +73,11 @@ impl FileEditor {
|
|||||||
ui.horizontal(|ui| {
|
ui.horizontal(|ui| {
|
||||||
ui.label("new");
|
ui.label("new");
|
||||||
if ui.button("text").clicked() {
|
if ui.button("text").clicked() {
|
||||||
|
self.is_dirty = true;
|
||||||
self.buffer.push(BufferItem::Text(Default::default()));
|
self.buffer.push(BufferItem::Text(Default::default()));
|
||||||
}
|
}
|
||||||
if ui.button("writing").clicked() {
|
if ui.button("writing").clicked() {
|
||||||
|
self.is_dirty = true;
|
||||||
self.buffer
|
self.buffer
|
||||||
.push(BufferItem::Handwriting(Default::default()));
|
.push(BufferItem::Handwriting(Default::default()));
|
||||||
}
|
}
|
||||||
@ -138,14 +144,18 @@ impl FileEditor {
|
|||||||
|
|
||||||
let item_response = ui.allocate_ui(item_size, |ui| match item {
|
let item_response = ui.allocate_ui(item_size, |ui| match item {
|
||||||
BufferItem::Text(text_edit) => {
|
BufferItem::Text(text_edit) => {
|
||||||
text_edit.ui(ui);
|
if text_edit.ui(ui).changed {
|
||||||
|
self.is_dirty = true;
|
||||||
}
|
}
|
||||||
BufferItem::Handwriting(painting) => {
|
}
|
||||||
|
BufferItem::Handwriting(handwriting) => {
|
||||||
let style = HandwritingStyle {
|
let style = HandwritingStyle {
|
||||||
animate: preferences.animations,
|
animate: preferences.animations,
|
||||||
..HandwritingStyle::from_theme(ui.ctx().theme())
|
..HandwritingStyle::from_theme(ui.ctx().theme())
|
||||||
};
|
};
|
||||||
painting.ui(&style, ui);
|
if handwriting.ui(&style, ui).changed {
|
||||||
|
self.is_dirty = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -211,10 +221,12 @@ impl FileEditor {
|
|||||||
Ordering::Greater => {
|
Ordering::Greater => {
|
||||||
let item = self.buffer.remove(from);
|
let item = self.buffer.remove(from);
|
||||||
self.buffer.insert(to, item);
|
self.buffer.insert(to, item);
|
||||||
|
self.is_dirty = true;
|
||||||
}
|
}
|
||||||
Ordering::Less => {
|
Ordering::Less => {
|
||||||
let item = self.buffer.remove(from);
|
let item = self.buffer.remove(from);
|
||||||
self.buffer.insert(to - 1, item);
|
self.buffer.insert(to - 1, item);
|
||||||
|
self.is_dirty = true;
|
||||||
}
|
}
|
||||||
Ordering::Equal => {}
|
Ordering::Equal => {}
|
||||||
}
|
}
|
||||||
@ -275,7 +287,7 @@ impl From<&str> for FileEditor {
|
|||||||
match item {
|
match item {
|
||||||
MdItem::Line(line) => push_text(buffer, line),
|
MdItem::Line(line) => push_text(buffer, line),
|
||||||
MdItem::CodeBlock { key, content, span } => match key {
|
MdItem::CodeBlock { key, content, span } => match key {
|
||||||
painting::CODE_BLOCK_KEY => match Handwriting::from_str(span) {
|
handwriting::CODE_BLOCK_KEY => match Handwriting::from_str(span) {
|
||||||
Ok(handwriting) => {
|
Ok(handwriting) => {
|
||||||
if let Some(BufferItem::Text(text_edit)) = buffer.last_mut() {
|
if let Some(BufferItem::Text(text_edit)) = buffer.last_mut() {
|
||||||
if text_edit.text.ends_with('\n') {
|
if text_edit.text.ends_with('\n') {
|
||||||
@ -285,7 +297,7 @@ impl From<&str> for FileEditor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
buffer.push(BufferItem::Handwriting(handwriting))
|
buffer.push(BufferItem::Handwriting(Box::new(handwriting)))
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to decode handwriting {content:?}: {e}");
|
log::error!("Failed to decode handwriting {content:?}: {e}");
|
||||||
|
|||||||
218
src/folder.rs
Normal file
218
src/folder.rs
Normal file
@ -0,0 +1,218 @@
|
|||||||
|
use std::{
|
||||||
|
fs::read_dir,
|
||||||
|
mem,
|
||||||
|
ops::Deref,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
sync::mpsc,
|
||||||
|
thread,
|
||||||
|
};
|
||||||
|
|
||||||
|
use egui::{Response, Ui};
|
||||||
|
use eyre::{Context, OptionExt, eyre};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
pub enum Folder {
|
||||||
|
NotLoaded {
|
||||||
|
name: String,
|
||||||
|
path: PathBuf,
|
||||||
|
},
|
||||||
|
Loading {
|
||||||
|
name: String,
|
||||||
|
path: PathBuf,
|
||||||
|
recv: mpsc::Receiver<LoadedFolder>,
|
||||||
|
},
|
||||||
|
Loaded(LoadedFolder),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct LoadedFolder {
|
||||||
|
pub name: String,
|
||||||
|
pub path: PathBuf,
|
||||||
|
pub child_folders: Vec<Folder>,
|
||||||
|
pub child_files: Vec<File>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct File {
|
||||||
|
pub name: String,
|
||||||
|
pub path: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FolderResponse<'a> {
|
||||||
|
inner: Response,
|
||||||
|
pub open_file: Option<&'a Path>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deref for FolderResponse<'_> {
|
||||||
|
type Target = Response;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.inner
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LoadedFolder {
|
||||||
|
pub fn show<'a>(&'a mut self, ui: &mut Ui) -> FolderResponse<'a> {
|
||||||
|
let mut open_file = None;
|
||||||
|
let inner = ui
|
||||||
|
.collapsing(&self.name, |ui| {
|
||||||
|
for folder in &mut self.child_folders {
|
||||||
|
open_file = open_file.or(folder.show(ui).open_file);
|
||||||
|
}
|
||||||
|
|
||||||
|
for file in &mut self.child_files {
|
||||||
|
if ui.button(&file.name).clicked() {
|
||||||
|
open_file = Some(file.path.as_path())
|
||||||
|
};
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.header_response;
|
||||||
|
|
||||||
|
FolderResponse { inner, open_file }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load(path: PathBuf) -> eyre::Result<Self> {
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.ok_or_eyre("Path is missing a file-name")?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let mut child_folders = vec![];
|
||||||
|
let mut child_files = vec![];
|
||||||
|
|
||||||
|
for entry in read_dir(&path).with_context(|| eyre!("Couldn't read dir {path:?}"))? {
|
||||||
|
let entry = entry.with_context(|| eyre!("Couldn't read dir {path:?}"))?;
|
||||||
|
let path = entry.path();
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.ok_or_eyre("Path is missing a file-name")?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let file_type = entry.file_type()?;
|
||||||
|
|
||||||
|
if file_type.is_symlink() {
|
||||||
|
log::error!("Symlinks not yet supported, skipping {path:?}");
|
||||||
|
continue;
|
||||||
|
} else if file_type.is_file() {
|
||||||
|
child_files.push(File { name, path });
|
||||||
|
} else if file_type.is_dir() {
|
||||||
|
child_folders.push(Folder::NotLoaded { name, path });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let folder = LoadedFolder {
|
||||||
|
name,
|
||||||
|
path,
|
||||||
|
child_folders,
|
||||||
|
child_files,
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(folder)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Folder {
|
||||||
|
fn load(&mut self, ui: &mut Ui) -> Option<&mut LoadedFolder> {
|
||||||
|
if let Folder::NotLoaded { name, path } = self {
|
||||||
|
let (tx, rx) = mpsc::channel();
|
||||||
|
|
||||||
|
{
|
||||||
|
let path = path.clone();
|
||||||
|
let ctx = ui.ctx().clone();
|
||||||
|
thread::spawn(move || match LoadedFolder::load(path) {
|
||||||
|
Err(e) => log::error!("Failed to load folder: {e}"),
|
||||||
|
Ok(folder) => {
|
||||||
|
let _ = tx.send(folder);
|
||||||
|
ctx.request_repaint();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
*self = Folder::Loading {
|
||||||
|
name: mem::take(name),
|
||||||
|
path: mem::take(path),
|
||||||
|
recv: rx,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Folder::Loading { recv, .. } = self {
|
||||||
|
match recv.try_recv() {
|
||||||
|
Ok(folder) => *self = Folder::Loaded(folder),
|
||||||
|
Err(_) => return None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let Folder::Loaded(folder) = self else {
|
||||||
|
unreachable!()
|
||||||
|
};
|
||||||
|
|
||||||
|
Some(folder)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn show<'a>(&'a mut self, ui: &mut Ui) -> FolderResponse<'a> {
|
||||||
|
self.load(ui);
|
||||||
|
|
||||||
|
if let Folder::Loaded(folder) = self {
|
||||||
|
return folder.show(ui);
|
||||||
|
}
|
||||||
|
|
||||||
|
FolderResponse {
|
||||||
|
inner: ui.label(self.name()),
|
||||||
|
open_file: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn path(&self) -> &Path {
|
||||||
|
match self {
|
||||||
|
Folder::NotLoaded { path, .. } => path,
|
||||||
|
Folder::Loading { path, .. } => path,
|
||||||
|
Folder::Loaded(folder) => &folder.path,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn name(&self) -> &str {
|
||||||
|
match self {
|
||||||
|
Folder::NotLoaded { name, .. } => name,
|
||||||
|
Folder::Loading { name, .. } => name,
|
||||||
|
Folder::Loaded(folder) => &folder.name,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn unload(&mut self) {
|
||||||
|
let (name, path) = match self {
|
||||||
|
Folder::NotLoaded { .. } => return,
|
||||||
|
Folder::Loading { name, path, .. } => (name, path),
|
||||||
|
Folder::Loaded(folder) => (&mut folder.name, &mut folder.path),
|
||||||
|
};
|
||||||
|
|
||||||
|
*self = Folder::NotLoaded {
|
||||||
|
name: mem::take(name),
|
||||||
|
path: mem::take(path),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Serialize for Folder {
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: serde::Serializer,
|
||||||
|
{
|
||||||
|
self.path().serialize(serializer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'de> Deserialize<'de> for Folder {
|
||||||
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||||
|
where
|
||||||
|
D: serde::Deserializer<'de>,
|
||||||
|
{
|
||||||
|
use serde::de::Error;
|
||||||
|
let path = PathBuf::deserialize(deserializer)?;
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.ok_or(D::Error::custom("Path is missing a file-name"))?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
Ok(Folder::NotLoaded { name, path })
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
97
src/handwriting/disk_format.rs
Normal file
97
src/handwriting/disk_format.rs
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
//! see [Packet]
|
||||||
|
|
||||||
|
use std::fmt::Display;
|
||||||
|
|
||||||
|
use half::f16;
|
||||||
|
use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
|
||||||
|
|
||||||
|
/// A `u16` encoded in little-endian.
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
#[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, PartialEq, Eq)]
|
||||||
|
#[repr(C, packed)]
|
||||||
|
pub struct u16_le([u8; 2]);
|
||||||
|
|
||||||
|
/// An `f16` encoded in little-endian.
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
#[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable)]
|
||||||
|
#[repr(C, packed)]
|
||||||
|
pub struct f16_le(u16_le);
|
||||||
|
|
||||||
|
/// Top-level type describing the handwriting disk-format.
|
||||||
|
#[derive(FromBytes, KnownLayout, Immutable)]
|
||||||
|
#[repr(C, packed)]
|
||||||
|
pub struct DiskFormat {
|
||||||
|
pub header: Header,
|
||||||
|
|
||||||
|
/// A packed array of [Stroke]s.
|
||||||
|
pub strokes: [u8],
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const V1: u16_le = u16_le::new(1);
|
||||||
|
|
||||||
|
#[derive(FromBytes, IntoBytes, KnownLayout, Immutable)]
|
||||||
|
#[repr(C, packed)]
|
||||||
|
pub struct Header {
|
||||||
|
/// Version of the disk format
|
||||||
|
pub version: u16_le,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(FromBytes, IntoBytes, KnownLayout, Immutable)]
|
||||||
|
#[repr(C, packed)]
|
||||||
|
pub struct RawStrokeHeader {
|
||||||
|
/// Number of points in the stroke.
|
||||||
|
pub len: u16_le,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(FromBytes, KnownLayout, Immutable)]
|
||||||
|
#[repr(C, packed)]
|
||||||
|
pub struct RawStroke {
|
||||||
|
pub header: RawStrokeHeader,
|
||||||
|
pub positions: [f16_le],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RawStroke {
|
||||||
|
pub const MIN_LEN: usize = size_of::<RawStrokeHeader>();
|
||||||
|
}
|
||||||
|
|
||||||
|
impl u16_le {
|
||||||
|
pub const fn new(init: u16) -> Self {
|
||||||
|
u16_le(init.to_le_bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl f16_le {
|
||||||
|
pub const fn new(init: f16) -> Self {
|
||||||
|
f16_le(u16_le::new(init.to_bits()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Display for u16_le {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
u16::from(*self).fmt(f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<u16_le> for u16 {
|
||||||
|
fn from(value: u16_le) -> Self {
|
||||||
|
u16::from_le_bytes(value.0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<f16_le> for f16 {
|
||||||
|
fn from(value: f16_le) -> Self {
|
||||||
|
f16::from_bits(u16::from(value.0))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<u16> for u16_le {
|
||||||
|
fn from(value: u16) -> Self {
|
||||||
|
u16_le::new(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<f16> for f16_le {
|
||||||
|
fn from(value: f16) -> Self {
|
||||||
|
f16_le::new(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -6,6 +6,7 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use base64::{Engine, prelude::BASE64_STANDARD};
|
use base64::{Engine, prelude::BASE64_STANDARD};
|
||||||
|
use disk_format::{DiskFormat, RawStroke, RawStrokeHeader, f16_le};
|
||||||
use egui::{
|
use egui::{
|
||||||
Color32, ColorImage, CornerRadius, Event, Frame, Id, Mesh, PointerButton, Pos2, Rect, Sense,
|
Color32, ColorImage, CornerRadius, Event, Frame, Id, Mesh, PointerButton, Pos2, Rect, Sense,
|
||||||
Shape, Stroke, TextureHandle, Theme, Ui, Vec2,
|
Shape, Stroke, TextureHandle, Theme, Ui, Vec2,
|
||||||
@ -16,7 +17,7 @@ use egui::{
|
|||||||
use eyre::{Context, bail};
|
use eyre::{Context, bail};
|
||||||
use eyre::{OptionExt, eyre};
|
use eyre::{OptionExt, eyre};
|
||||||
use half::f16;
|
use half::f16;
|
||||||
use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
|
use zerocopy::{FromBytes, IntoBytes};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
custom_code_block::try_from_custom_code_block,
|
custom_code_block::try_from_custom_code_block,
|
||||||
@ -24,6 +25,8 @@ use crate::{
|
|||||||
};
|
};
|
||||||
use crate::{custom_code_block::write_custom_code_block, util::random_id};
|
use crate::{custom_code_block::write_custom_code_block, util::random_id};
|
||||||
|
|
||||||
|
mod disk_format;
|
||||||
|
|
||||||
const HANDWRITING_MIN_HEIGHT: f32 = 100.0;
|
const HANDWRITING_MIN_HEIGHT: f32 = 100.0;
|
||||||
const HANDWRITING_BOTTOM_PADDING: f32 = 80.0;
|
const HANDWRITING_BOTTOM_PADDING: f32 = 80.0;
|
||||||
const HANDWRITING_MARGIN: f32 = 0.05;
|
const HANDWRITING_MARGIN: f32 = 0.05;
|
||||||
@ -33,7 +36,7 @@ pub const CODE_BLOCK_KEY: &str = "handwriting";
|
|||||||
|
|
||||||
type StrokeBlendMode = rasterizer::blend::Normal;
|
type StrokeBlendMode = rasterizer::blend::Normal;
|
||||||
|
|
||||||
const TESSELATION_OPTIONS: TessellationOptions = TessellationOptions {
|
const TESSELLATION_OPTIONS: TessellationOptions = TessellationOptions {
|
||||||
feathering: true,
|
feathering: true,
|
||||||
feathering_size_in_pixels: 1.0,
|
feathering_size_in_pixels: 1.0,
|
||||||
coarse_tessellation_culling: true,
|
coarse_tessellation_culling: true,
|
||||||
@ -60,40 +63,44 @@ pub struct HandwritingStyle {
|
|||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub struct Handwriting {
|
pub struct Handwriting {
|
||||||
#[serde(skip, default = "random_id")]
|
|
||||||
id: Id,
|
|
||||||
|
|
||||||
strokes: Vec<Vec<Pos2>>,
|
strokes: Vec<Vec<Pos2>>,
|
||||||
|
|
||||||
/// The stroke that is currently being drawed.
|
|
||||||
#[serde(skip)]
|
|
||||||
current_stroke: Vec<Pos2>,
|
|
||||||
|
|
||||||
/// The lines that have not been blitted to `texture` yet.
|
|
||||||
#[serde(skip)]
|
|
||||||
unblitted_lines: Vec<[Pos2; 2]>,
|
|
||||||
|
|
||||||
height: f32,
|
height: f32,
|
||||||
desired_height: f32,
|
desired_height: f32,
|
||||||
|
|
||||||
/// Tesselated mesh of all strokes
|
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
|
e: Ephemeral,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handwriting data that isn't persisted across restarts.
|
||||||
|
struct Ephemeral {
|
||||||
|
id: Id,
|
||||||
|
|
||||||
|
/// The stroke that is currently being drawed.
|
||||||
|
current_stroke: Vec<Pos2>,
|
||||||
|
|
||||||
|
/// The lines that have not been blitted to `texture` yet.
|
||||||
|
unblitted_lines: Vec<[Pos2; 2]>,
|
||||||
|
|
||||||
|
tessellator: Option<Tessellator>,
|
||||||
|
|
||||||
|
/// Tessellated mesh of all strokes
|
||||||
mesh: Arc<Mesh>,
|
mesh: Arc<Mesh>,
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
texture: Option<TextureHandle>,
|
texture: Option<TextureHandle>,
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
image: ColorImage,
|
image: ColorImage,
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
refresh_texture: bool,
|
refresh_texture: bool,
|
||||||
|
|
||||||
/// Context of the last mesh render.
|
/// Context of the last mesh render.
|
||||||
#[serde(skip)]
|
|
||||||
last_mesh_ctx: Option<MeshContext>,
|
last_mesh_ctx: Option<MeshContext>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct HandwritingResponse {
|
||||||
|
pub changed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
/// Context of a mesh render.
|
/// Context of a mesh render.
|
||||||
#[derive(Clone, Copy, PartialEq)]
|
#[derive(Clone, Copy, PartialEq)]
|
||||||
struct MeshContext {
|
struct MeshContext {
|
||||||
@ -144,11 +151,20 @@ impl MeshContext {
|
|||||||
impl Default for Handwriting {
|
impl Default for Handwriting {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
id: random_id(),
|
|
||||||
strokes: Default::default(),
|
strokes: Default::default(),
|
||||||
current_stroke: Default::default(),
|
|
||||||
height: HANDWRITING_MIN_HEIGHT,
|
height: HANDWRITING_MIN_HEIGHT,
|
||||||
desired_height: HANDWRITING_MIN_HEIGHT,
|
desired_height: HANDWRITING_MIN_HEIGHT,
|
||||||
|
e: Default::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Ephemeral {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: random_id(),
|
||||||
|
current_stroke: Default::default(),
|
||||||
|
tessellator: None,
|
||||||
mesh: Default::default(),
|
mesh: Default::default(),
|
||||||
texture: None,
|
texture: None,
|
||||||
image: ColorImage::new([0, 0], Color32::WHITE),
|
image: ColorImage::new([0, 0], Color32::WHITE),
|
||||||
@ -164,6 +180,7 @@ impl Handwriting {
|
|||||||
&mut self,
|
&mut self,
|
||||||
style: Option<&mut HandwritingStyle>,
|
style: Option<&mut HandwritingStyle>,
|
||||||
ui: &mut egui::Ui,
|
ui: &mut egui::Ui,
|
||||||
|
response: &mut HandwritingResponse,
|
||||||
) -> egui::Response {
|
) -> egui::Response {
|
||||||
ui.horizontal(|ui| {
|
ui.horizontal(|ui| {
|
||||||
if let Some(style) = style {
|
if let Some(style) = style {
|
||||||
@ -172,33 +189,35 @@ impl Handwriting {
|
|||||||
ui.separator();
|
ui.separator();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ui.button("Clear Painting").clicked() {
|
if ui.button("clear").clicked() {
|
||||||
self.strokes.clear();
|
self.strokes.clear();
|
||||||
self.refresh_texture = true;
|
self.e.refresh_texture = true;
|
||||||
|
response.changed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.add_enabled_ui(!self.strokes.is_empty(), |ui| {
|
ui.add_enabled_ui(!self.strokes.is_empty(), |ui| {
|
||||||
if ui.button("Undo").clicked() {
|
if ui.button("undo").clicked() {
|
||||||
self.strokes.pop();
|
self.strokes.pop();
|
||||||
self.refresh_texture = true;
|
self.e.refresh_texture = true;
|
||||||
|
response.changed = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let vertex_count: usize = self.mesh.indices.len() / 3;
|
let vertex_count: usize = self.e.mesh.indices.len() / 3;
|
||||||
ui.label(format!("vertices: {vertex_count}"));
|
ui.label(format!("vertices: {vertex_count}"));
|
||||||
})
|
})
|
||||||
.response
|
.response
|
||||||
}
|
}
|
||||||
|
|
||||||
fn commit_current_line(&mut self) {
|
pub fn ui_content(
|
||||||
debug_assert!(!self.current_stroke.is_empty());
|
&mut self,
|
||||||
self.strokes.push(mem::take(&mut self.current_stroke));
|
style: &HandwritingStyle,
|
||||||
}
|
ui: &mut Ui,
|
||||||
|
hw_response: &mut HandwritingResponse,
|
||||||
pub fn ui_content(&mut self, style: &HandwritingStyle, ui: &mut Ui) -> egui::Response {
|
) -> egui::Response {
|
||||||
if style.animate {
|
if style.animate {
|
||||||
self.height = ui.ctx().animate_value_with_time(
|
self.height = ui.ctx().animate_value_with_time(
|
||||||
self.id.with("height animation"),
|
self.e.id.with("height animation"),
|
||||||
self.desired_height,
|
self.desired_height,
|
||||||
0.4,
|
0.4,
|
||||||
);
|
);
|
||||||
@ -206,8 +225,8 @@ impl Handwriting {
|
|||||||
self.height = self.desired_height;
|
self.height = self.desired_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
let size = Vec2::new(ui.available_width(), self.height);
|
let desired_size = Vec2::new(ui.available_width(), self.height);
|
||||||
let (response, painter) = ui.allocate_painter(size, Sense::drag());
|
let (response, painter) = ui.allocate_painter(desired_size, Sense::drag());
|
||||||
|
|
||||||
let mut response = response
|
let mut response = response
|
||||||
//.on_hover_cursor(CursorIcon::Crosshair)
|
//.on_hover_cursor(CursorIcon::Crosshair)
|
||||||
@ -216,20 +235,24 @@ impl Handwriting {
|
|||||||
|
|
||||||
let size = response.rect.size();
|
let size = response.rect.size();
|
||||||
|
|
||||||
let to_screen = emath::RectTransform::from_to(
|
// Calculate matrices that convert between screen-space and image-space.
|
||||||
//Rect::from_min_size(Pos2::ZERO, response.rect.square_proportions()),
|
// - image-space: 0,0 is the top-left of the texture.
|
||||||
Rect::from_min_size(Pos2::ZERO, size),
|
// - screen-space: 0,0 is the top-left of the window.
|
||||||
response.rect,
|
// Both spaces use the same logical points, not pixels.
|
||||||
);
|
let to_screen =
|
||||||
|
emath::RectTransform::from_to(Rect::from_min_size(Pos2::ZERO, size), response.rect);
|
||||||
let from_screen = to_screen.inverse();
|
let from_screen = to_screen.inverse();
|
||||||
|
|
||||||
|
// Was the user in the process of drawing a stroke last frame?
|
||||||
|
let was_drawing = !self.e.current_stroke.is_empty();
|
||||||
|
|
||||||
|
// Is the user in the process of drawing a stroke now?
|
||||||
let is_drawing = response.interact_pointer_pos().is_some();
|
let is_drawing = response.interact_pointer_pos().is_some();
|
||||||
let was_drawing = !self.current_stroke.is_empty();
|
|
||||||
|
|
||||||
if !is_drawing {
|
if !is_drawing {
|
||||||
// commit current line
|
|
||||||
if was_drawing {
|
if was_drawing {
|
||||||
self.commit_current_line();
|
// commit current line
|
||||||
|
self.commit_current_line(hw_response);
|
||||||
response.mark_changed();
|
response.mark_changed();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -241,6 +264,8 @@ impl Handwriting {
|
|||||||
.map(|p| p.y + HANDWRITING_BOTTOM_PADDING)
|
.map(|p| p.y + HANDWRITING_BOTTOM_PADDING)
|
||||||
.fold(HANDWRITING_MIN_HEIGHT, |max, y| max.max(y));
|
.fold(HANDWRITING_MIN_HEIGHT, |max, y| max.max(y));
|
||||||
|
|
||||||
|
// Change the height of the handwriting item.
|
||||||
|
// We don't do this mid-stroke, only when the user e.g. lifts the pen.
|
||||||
if self.desired_height != lines_max_y {
|
if self.desired_height != lines_max_y {
|
||||||
self.desired_height = lines_max_y;
|
self.desired_height = lines_max_y;
|
||||||
response.mark_changed();
|
response.mark_changed();
|
||||||
@ -267,16 +292,17 @@ impl Handwriting {
|
|||||||
_ => Some(next),
|
_ => Some(next),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.cloned()
|
|
||||||
.filter(|event| {
|
.filter(|event| {
|
||||||
// FIXME: pinenote: PointerMoved are duplicated after the MouseMoved events
|
// FIXME: pinenote: PointerMoved are duplicated after the MouseMoved events
|
||||||
cfg!(not(feature = "pinenote")) || !matches!(event, Event::PointerMoved(..))
|
cfg!(not(feature = "pinenote")) || !matches!(event, Event::PointerMoved(..))
|
||||||
})
|
})
|
||||||
|
.cloned()
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Process input events and turn them into strokes
|
||||||
for event in events {
|
for event in events {
|
||||||
let last_canvas_pos = self.current_stroke.last();
|
let last_canvas_pos = self.e.current_stroke.last();
|
||||||
|
|
||||||
match event {
|
match event {
|
||||||
Event::PointerMoved(new_position) => {
|
Event::PointerMoved(new_position) => {
|
||||||
@ -318,13 +344,13 @@ impl Handwriting {
|
|||||||
} => match (button, pressed) {
|
} => match (button, pressed) {
|
||||||
(PointerButton::Primary, true) => {
|
(PointerButton::Primary, true) => {
|
||||||
if last_canvas_pos.is_none() {
|
if last_canvas_pos.is_none() {
|
||||||
self.current_stroke.push(from_screen * pos);
|
self.e.current_stroke.push(from_screen * pos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(PointerButton::Primary, false) => {
|
(PointerButton::Primary, false) => {
|
||||||
if last_canvas_pos.is_some() {
|
if last_canvas_pos.is_some() {
|
||||||
self.push_to_stroke(from_screen * pos);
|
self.push_to_stroke(from_screen * pos);
|
||||||
self.commit_current_line();
|
self.commit_current_line(hw_response);
|
||||||
response.mark_changed();
|
response.mark_changed();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,8 +366,8 @@ impl Handwriting {
|
|||||||
// TODO: In theory, we can get multiple press->draw->release series
|
// TODO: In theory, we can get multiple press->draw->release series
|
||||||
// in the same frame. Should handle this.
|
// in the same frame. Should handle this.
|
||||||
Event::PointerGone | Event::WindowFocused(false) => {
|
Event::PointerGone | Event::WindowFocused(false) => {
|
||||||
if !self.current_stroke.is_empty() {
|
if !self.e.current_stroke.is_empty() {
|
||||||
self.commit_current_line();
|
self.commit_current_line(hw_response);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -361,6 +387,7 @@ impl Handwriting {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Draw the horizontal ruled lines
|
||||||
(1..)
|
(1..)
|
||||||
.map(|n| n as f32 * HANDWRITING_LINE_SPACING)
|
.map(|n| n as f32 * HANDWRITING_LINE_SPACING)
|
||||||
.take_while(|&y| y < size.y)
|
.take_while(|&y| y < size.y)
|
||||||
@ -373,9 +400,12 @@ impl Handwriting {
|
|||||||
painter.add(shape);
|
painter.add(shape);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Get the dimensions of the image
|
||||||
let mesh_rect = response
|
let mesh_rect = response
|
||||||
.rect
|
.rect
|
||||||
.with_max_y(response.rect.min.y + self.desired_height);
|
.with_max_y(response.rect.min.y + self.desired_height);
|
||||||
|
|
||||||
|
// These are the values that, if changed, would require the mesh to be re-rendered.
|
||||||
let new_context = MeshContext {
|
let new_context = MeshContext {
|
||||||
ui_theme: ui.ctx().theme(),
|
ui_theme: ui.ctx().theme(),
|
||||||
pixels_per_point: ui.pixels_per_point(),
|
pixels_per_point: ui.pixels_per_point(),
|
||||||
@ -383,25 +413,26 @@ impl Handwriting {
|
|||||||
stroke: style.stroke,
|
stroke: style.stroke,
|
||||||
};
|
};
|
||||||
|
|
||||||
if Some(&new_context) != self.last_mesh_ctx.as_ref() {
|
// Figure out if we need to re-rasterize the mesh.
|
||||||
self.refresh_texture = true;
|
if Some(&new_context) != self.e.last_mesh_ctx.as_ref() {
|
||||||
|
self.e.refresh_texture = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.refresh_texture {
|
if self.e.refresh_texture {
|
||||||
// rasterize the entire texture from scratch
|
// ...if we do, rasterize the entire texture from scratch
|
||||||
self.refresh_texture(style, new_context, ui);
|
self.refresh_texture(style, new_context, ui);
|
||||||
self.unblitted_lines.clear();
|
self.e.unblitted_lines.clear();
|
||||||
} else if !self.unblitted_lines.is_empty() {
|
} else if !self.e.unblitted_lines.is_empty() {
|
||||||
// only rasterize the new lines onto the existing texture
|
// ...if we don't, we can get away with only rasterizing the *new* lines onto the
|
||||||
for [from, to] in std::mem::take(&mut self.unblitted_lines) {
|
// existing texture.
|
||||||
|
for [from, to] in std::mem::take(&mut self.e.unblitted_lines) {
|
||||||
self.draw_line_to_texture(from, to, &new_context, ui);
|
self.draw_line_to_texture(from, to, &new_context, ui);
|
||||||
}
|
}
|
||||||
self.unblitted_lines.clear();
|
self.e.unblitted_lines.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
//painter.add(self.mesh.clone());
|
// Draw the texture
|
||||||
|
if let Some(texture) = &self.e.texture {
|
||||||
if let Some(texture) = &self.texture {
|
|
||||||
let texture = SizedTexture::new(texture.id(), texture.size_vec2());
|
let texture = SizedTexture::new(texture.id(), texture.size_vec2());
|
||||||
let shape = RectShape {
|
let shape = RectShape {
|
||||||
rect: mesh_rect,
|
rect: mesh_rect,
|
||||||
@ -425,59 +456,81 @@ impl Handwriting {
|
|||||||
response
|
response
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn commit_current_line(&mut self, response: &mut HandwritingResponse) {
|
||||||
|
debug_assert!(!self.e.current_stroke.is_empty());
|
||||||
|
self.strokes.push(mem::take(&mut self.e.current_stroke));
|
||||||
|
response.changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tessellate and rasterize the strokes into a new texture.
|
||||||
fn refresh_texture(
|
fn refresh_texture(
|
||||||
&mut self,
|
&mut self,
|
||||||
style: &HandwritingStyle,
|
style: &HandwritingStyle,
|
||||||
mesh_context: MeshContext,
|
mesh_context: MeshContext,
|
||||||
ui: &mut Ui,
|
ui: &mut Ui,
|
||||||
) {
|
) {
|
||||||
self.last_mesh_ctx = Some(mesh_context);
|
let Ephemeral {
|
||||||
|
current_stroke,
|
||||||
|
tessellator,
|
||||||
|
mesh,
|
||||||
|
refresh_texture,
|
||||||
|
last_mesh_ctx,
|
||||||
|
..
|
||||||
|
} = &mut self.e;
|
||||||
|
// TODO: don't tessellate and rasterize on the GUI thread
|
||||||
|
|
||||||
self.refresh_texture = false;
|
*last_mesh_ctx = Some(mesh_context);
|
||||||
|
|
||||||
|
*refresh_texture = false;
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
let start_time = std::time::Instant::now();
|
let start_time = std::time::Instant::now();
|
||||||
|
|
||||||
let mut tesselator = Tessellator::new(
|
let mesh = Arc::make_mut(mesh);
|
||||||
mesh_context.pixels_per_point,
|
|
||||||
TESSELATION_OPTIONS,
|
|
||||||
Default::default(), // we don't tesselate fonts
|
|
||||||
vec![],
|
|
||||||
);
|
|
||||||
|
|
||||||
let mesh = Arc::make_mut(&mut self.mesh);
|
|
||||||
mesh.clear();
|
mesh.clear();
|
||||||
|
|
||||||
|
// TODO: re-use tessellator if pixels_per_point hasn't changed
|
||||||
|
let tessellator = tessellator.insert(new_tessellator(mesh_context.pixels_per_point));
|
||||||
|
|
||||||
self.strokes
|
self.strokes
|
||||||
.iter()
|
.iter()
|
||||||
.chain([&self.current_stroke])
|
.chain([&*current_stroke])
|
||||||
.filter(|stroke| stroke.len() >= 2)
|
.filter(|stroke| stroke.len() >= 2)
|
||||||
.map(|stroke| {
|
.map(|stroke| {
|
||||||
//let points: Vec<Pos2> = stroke.iter().map(|&p| to_screen * p).collect();
|
//let points: Vec<Pos2> = stroke.iter().map(|&p| to_screen * p).collect();
|
||||||
egui::Shape::line(stroke.clone(), style.stroke)
|
egui::Shape::line(stroke.clone(), style.stroke)
|
||||||
})
|
})
|
||||||
.for_each(|shape| {
|
.for_each(|shape| {
|
||||||
tesselator.tessellate_shape(shape, mesh);
|
tessellator.tessellate_shape(shape, mesh);
|
||||||
});
|
});
|
||||||
|
|
||||||
let texture = texture!(self, ui, &mesh_context);
|
// sanity-check that tessellation did not produce any NaNs.
|
||||||
let triangles = mesh_triangles(&self.mesh);
|
// this can happen if the line contains duplicated consecutive positions
|
||||||
|
//for vertex in &mesh.vertices {
|
||||||
|
// debug_assert!(vertex.pos.x.is_finite(), "{} must be finite", vertex.pos.x);
|
||||||
|
// debug_assert!(vertex.pos.y.is_finite(), "{} must be finite", vertex.pos.y);
|
||||||
|
//}
|
||||||
|
|
||||||
|
let texture = texture!(self.e, ui, &mesh_context);
|
||||||
|
let triangles = mesh_triangles(&self.e.mesh);
|
||||||
|
|
||||||
let [px_x, px_y] = mesh_context.pixel_size();
|
let [px_x, px_y] = mesh_context.pixel_size();
|
||||||
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
||||||
self.image = rasterize::<StrokeBlendMode>(px_x, px_y, point_to_pixel, triangles);
|
self.e.image = rasterize::<StrokeBlendMode>(px_x, px_y, point_to_pixel, triangles);
|
||||||
texture.set(self.image.clone(), Default::default());
|
texture.set(self.e.image.clone(), Default::default());
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
{
|
{
|
||||||
let elapsed = start_time.elapsed();
|
let elapsed = start_time.elapsed();
|
||||||
println!("refreshed mesh in {:.3}s", elapsed.as_secs_f32());
|
log::debug!("refreshed mesh in {:.3}s", elapsed.as_secs_f32());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn ui(&mut self, style: &HandwritingStyle, ui: &mut Ui) {
|
pub fn ui(&mut self, style: &HandwritingStyle, ui: &mut Ui) -> HandwritingResponse {
|
||||||
|
let mut response = HandwritingResponse { changed: false };
|
||||||
|
|
||||||
ui.vertical_centered_justified(|ui| {
|
ui.vertical_centered_justified(|ui| {
|
||||||
self.ui_control(None, ui);
|
self.ui_control(None, ui, &mut response);
|
||||||
|
|
||||||
//ui.label("Paint with your mouse/touch!");
|
//ui.label("Paint with your mouse/touch!");
|
||||||
Frame::canvas(ui.style())
|
Frame::canvas(ui.style())
|
||||||
@ -485,21 +538,28 @@ impl Handwriting {
|
|||||||
.stroke(Stroke::new(5.0, Color32::from_black_alpha(40)))
|
.stroke(Stroke::new(5.0, Color32::from_black_alpha(40)))
|
||||||
.fill(style.bg_color)
|
.fill(style.bg_color)
|
||||||
.show(ui, |ui| {
|
.show(ui, |ui| {
|
||||||
self.ui_content(style, ui);
|
self.ui_content(style, ui, &mut response);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
response
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Append a new [Pos2] to [Self::current_stroke].
|
||||||
|
///
|
||||||
|
/// Queue a new line to be drawn onto [Self::texture].
|
||||||
fn push_to_stroke(&mut self, new_canvas_pos: Pos2) {
|
fn push_to_stroke(&mut self, new_canvas_pos: Pos2) {
|
||||||
if let Some(&last_canvas_pos) = self.current_stroke.last() {
|
if let Some(&last_canvas_pos) = self.e.current_stroke.last() {
|
||||||
if last_canvas_pos == new_canvas_pos {
|
if last_canvas_pos == new_canvas_pos {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.unblitted_lines.push([last_canvas_pos, new_canvas_pos]);
|
self.e
|
||||||
|
.unblitted_lines
|
||||||
|
.push([last_canvas_pos, new_canvas_pos]);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.current_stroke.push(new_canvas_pos);
|
self.e.current_stroke.push(new_canvas_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Draw a single line onto the existing texture.
|
/// Draw a single line onto the existing texture.
|
||||||
@ -510,16 +570,16 @@ impl Handwriting {
|
|||||||
mesh_context: &MeshContext,
|
mesh_context: &MeshContext,
|
||||||
ui: &mut Ui,
|
ui: &mut Ui,
|
||||||
) {
|
) {
|
||||||
let mut tesselator = Tessellator::new(
|
// INVARIANT: if this function was called, then pixels_per_point is the same as last frame,
|
||||||
mesh_context.pixels_per_point,
|
// so there's no need to create a new tessellator.
|
||||||
TESSELATION_OPTIONS,
|
let tessellator = self
|
||||||
Default::default(), // we don't tesselate fonts
|
.e
|
||||||
vec![],
|
.tessellator
|
||||||
);
|
.get_or_insert_with(|| new_tessellator(mesh_context.pixels_per_point));
|
||||||
|
|
||||||
let mut mesh = Mesh::default();
|
let mut mesh = Mesh::default();
|
||||||
let line = egui::Shape::line_segment([from, to], mesh_context.stroke);
|
let line = egui::Shape::line_segment([from, to], mesh_context.stroke);
|
||||||
tesselator.tessellate_shape(line, &mut mesh);
|
tessellator.tessellate_shape(line, &mut mesh);
|
||||||
|
|
||||||
self.draw_mesh_to_texture(&mesh, mesh_context, ui);
|
self.draw_mesh_to_texture(&mesh, mesh_context, ui);
|
||||||
}
|
}
|
||||||
@ -528,8 +588,8 @@ impl Handwriting {
|
|||||||
fn draw_mesh_to_texture(&mut self, mesh: &Mesh, mesh_context: &MeshContext, ui: &mut Ui) {
|
fn draw_mesh_to_texture(&mut self, mesh: &Mesh, mesh_context: &MeshContext, ui: &mut Ui) {
|
||||||
let triangles = mesh_triangles(mesh);
|
let triangles = mesh_triangles(mesh);
|
||||||
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
||||||
rasterize_onto::<StrokeBlendMode>(&mut self.image, point_to_pixel, triangles);
|
rasterize_onto::<StrokeBlendMode>(&mut self.e.image, point_to_pixel, triangles);
|
||||||
texture!(self, ui, mesh_context).set(self.image.clone(), Default::default());
|
texture!(self.e, ui, mesh_context).set(self.e.image.clone(), Default::default());
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn strokes(&self) -> &[Vec<Pos2>] {
|
pub fn strokes(&self) -> &[Vec<Pos2>] {
|
||||||
@ -557,24 +617,49 @@ impl Handwriting {
|
|||||||
..Default::default()
|
..Default::default()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn encode_as_disk_format(&self) -> Box<[u8]> {
|
||||||
|
let mut bytes = vec![];
|
||||||
|
let header = disk_format::Header {
|
||||||
|
version: disk_format::V1,
|
||||||
|
};
|
||||||
|
|
||||||
|
bytes.extend_from_slice(header.as_bytes());
|
||||||
|
|
||||||
|
for stroke in &self.strokes {
|
||||||
|
let Ok(len) = u16::try_from(stroke.len()) else {
|
||||||
|
log::error!("More than u16::MAX points in a stroke!");
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let header = RawStrokeHeader { len: len.into() };
|
||||||
|
bytes.extend_from_slice(header.as_bytes());
|
||||||
|
|
||||||
|
for position in stroke {
|
||||||
|
for v in [position.x, position.y] {
|
||||||
|
let v = f16::from_f32(v);
|
||||||
|
let v = f16_le::from(v);
|
||||||
|
bytes.extend_from_slice(v.as_bytes());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bytes.into_boxed_slice()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn new_tessellator(pixels_per_point: f32) -> Tessellator {
|
||||||
|
Tessellator::new(
|
||||||
|
pixels_per_point,
|
||||||
|
TESSELLATION_OPTIONS,
|
||||||
|
Default::default(), // we don't tessellate fonts
|
||||||
|
vec![],
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Display for Handwriting {
|
impl Display for Handwriting {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
let mut raw = vec![];
|
let raw = self.encode_as_disk_format();
|
||||||
|
|
||||||
for stroke in &self.strokes {
|
|
||||||
raw.push((stroke.len() as u16).to_le_bytes());
|
|
||||||
for position in stroke {
|
|
||||||
let x = half::f16::from_f32(position.x);
|
|
||||||
let y = half::f16::from_f32(position.y);
|
|
||||||
raw.push(x.to_bits().to_le_bytes());
|
|
||||||
raw.push(y.to_bits().to_le_bytes());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let raw = raw.as_slice().as_bytes();
|
|
||||||
|
|
||||||
write_custom_code_block(f, CODE_BLOCK_KEY, BASE64_STANDARD.encode(raw))
|
write_custom_code_block(f, CODE_BLOCK_KEY, BASE64_STANDARD.encode(raw))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -590,53 +675,72 @@ impl FromStr for Handwriting {
|
|||||||
.decode(s)
|
.decode(s)
|
||||||
.wrap_err("Failed to decode painting data from base64")?;
|
.wrap_err("Failed to decode painting data from base64")?;
|
||||||
|
|
||||||
#[allow(non_camel_case_types)]
|
// HACK: first iteration of disk format did not have version header
|
||||||
type u16_le = [u8; 2];
|
//let mut bytes = bytes;
|
||||||
|
//bytes.insert(0, 0);
|
||||||
|
//bytes.insert(0, 1);
|
||||||
|
|
||||||
#[allow(non_camel_case_types)]
|
let disk_format = DiskFormat::ref_from_bytes(&bytes[..]).map_err(|_| eyre!("Too short"))?;
|
||||||
type f16_le = [u8; 2];
|
|
||||||
|
|
||||||
#[derive(FromBytes, KnownLayout, Immutable)]
|
if disk_format.header.version != disk_format::V1 {
|
||||||
#[repr(C, packed)]
|
bail!(
|
||||||
struct Stroke {
|
"Unknown disk_format version: {}",
|
||||||
pub len: u16_le,
|
disk_format.header.version
|
||||||
pub positions: [f16_le],
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut bytes = &bytes[..];
|
let mut raw_strokes = &disk_format.strokes[..];
|
||||||
let mut strokes = vec![];
|
let mut strokes = vec![];
|
||||||
|
|
||||||
while !bytes.is_empty() {
|
while !raw_strokes.is_empty() {
|
||||||
let header_len = size_of::<u16_le>();
|
if raw_strokes.len() < RawStroke::MIN_LEN {
|
||||||
if bytes.len() < header_len {
|
bail!("Invalid remaining length: {}", raw_strokes.len());
|
||||||
bail!("Invalid remaining length: {}", bytes.len());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let stroke = Stroke::ref_from_bytes(&bytes[..header_len]).expect("length is correct");
|
let stroke = RawStroke::ref_from_bytes(&raw_strokes[..RawStroke::MIN_LEN])
|
||||||
let len = usize::from(u16::from_le_bytes(stroke.len));
|
.expect("length is correct");
|
||||||
let len = len * size_of::<f16_le>() * 2;
|
|
||||||
|
|
||||||
if bytes.len() < len {
|
// get length as number of points
|
||||||
bail!("Invalid remaining length: {}", bytes.len());
|
let len = usize::from(u16::from(stroke.header.len));
|
||||||
|
|
||||||
|
// convert to length in bytes
|
||||||
|
let byte_len = 2 * size_of::<f16_le>() * len;
|
||||||
|
|
||||||
|
if raw_strokes.len() < byte_len {
|
||||||
|
bail!("Invalid remaining length: {}", raw_strokes.len());
|
||||||
}
|
}
|
||||||
|
|
||||||
let (stroke, rest) = bytes.split_at(header_len + len);
|
let (stroke, rest) = raw_strokes.split_at(RawStroke::MIN_LEN + byte_len);
|
||||||
bytes = rest;
|
raw_strokes = rest;
|
||||||
let stroke = Stroke::ref_from_bytes(stroke)
|
|
||||||
.map_err(|e| eyre!("Failed to decode stroke bytes: {e}"))?;
|
|
||||||
|
|
||||||
let mut positions = stroke
|
let stroke = RawStroke::ref_from_bytes(stroke).expect("length is correct");
|
||||||
|
|
||||||
|
debug_assert_eq!(
|
||||||
|
stroke.positions.len().rem_euclid(2),
|
||||||
|
0,
|
||||||
|
"{} must be divisible by 2",
|
||||||
|
stroke.positions.len()
|
||||||
|
);
|
||||||
|
debug_assert_eq!(stroke.positions.len(), len * 2);
|
||||||
|
|
||||||
|
let mut last_pos = Pos2::new(f32::NEG_INFINITY, f32::INFINITY);
|
||||||
|
|
||||||
|
// positions are encoded as an array of f16s [x, y, x, y, x, y, ..]
|
||||||
|
let stroke: Vec<Pos2> = stroke
|
||||||
.positions
|
.positions
|
||||||
.iter()
|
.chunks_exact(2)
|
||||||
.map(|&position| f16::from_bits(u16::from_le_bytes(position)));
|
.map(|chunk| [chunk[0], chunk[1]])
|
||||||
|
.map(|pos| pos.map(f16::from)) // interpret bytes as f16
|
||||||
|
.map(|pos| pos.map(f32::from)) // widen to f32
|
||||||
|
.filter(|pos| pos.iter().all(|f| f.is_finite())) // filter out NaNs and Infs
|
||||||
|
.map(|[x, y]| Pos2::new(x, y))
|
||||||
|
.filter(|pos| {
|
||||||
|
let is_duplicate = pos == &last_pos;
|
||||||
|
last_pos = *pos;
|
||||||
|
!is_duplicate // skip duplicates
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
let mut stroke = vec![];
|
|
||||||
while let Some(x) = positions.next() {
|
|
||||||
let Some(y) = positions.next() else {
|
|
||||||
unreachable!("len is a multiple of two");
|
|
||||||
};
|
|
||||||
stroke.push(Pos2::new(x.into(), y.into()));
|
|
||||||
}
|
|
||||||
strokes.push(stroke);
|
strokes.push(stroke);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
---
|
||||||
|
source: src/handwriting/mod.rs
|
||||||
|
expression: handwriting.strokes
|
||||||
|
---
|
||||||
|
[
|
||||||
|
[
|
||||||
|
[-1.0 1.0],
|
||||||
|
[3.0 1.0],
|
||||||
|
[3.0 3.0],
|
||||||
|
[1.5 2.0],
|
||||||
|
[0.0 0.0],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[3.0 3.0],
|
||||||
|
[-1.0 1.0],
|
||||||
|
[0.0 0.0],
|
||||||
|
[3.0 1.0],
|
||||||
|
],
|
||||||
|
]
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
source: src/handwriting/mod.rs
|
||||||
|
expression: serialized
|
||||||
|
---
|
||||||
|
```handwriting
|
||||||
|
AQAFAAC8ADwAQgA8AEIAQgA+AEAAAAAABAAAQgBCALwAPAAAAAAAQgA8
|
||||||
|
```
|
||||||
@ -3,9 +3,10 @@
|
|||||||
pub mod app;
|
pub mod app;
|
||||||
pub mod constants;
|
pub mod constants;
|
||||||
pub mod custom_code_block;
|
pub mod custom_code_block;
|
||||||
|
pub mod easy_mark;
|
||||||
pub mod file_editor;
|
pub mod file_editor;
|
||||||
pub mod markdown;
|
pub mod folder;
|
||||||
pub mod painting;
|
pub mod handwriting;
|
||||||
pub mod preferences;
|
pub mod preferences;
|
||||||
pub mod rasterizer;
|
pub mod rasterizer;
|
||||||
pub mod text_editor;
|
pub mod text_editor;
|
||||||
|
|||||||
@ -1,54 +0,0 @@
|
|||||||
use super::span::Span;
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
|
||||||
pub enum Heading {
|
|
||||||
H1,
|
|
||||||
H2,
|
|
||||||
H3,
|
|
||||||
H4,
|
|
||||||
H5,
|
|
||||||
H6,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
|
||||||
pub struct Style {
|
|
||||||
/// # heading (large text)
|
|
||||||
pub heading: Option<Heading>,
|
|
||||||
|
|
||||||
/// > quoted (slightly dimmer color or other font style)
|
|
||||||
pub quoted: bool,
|
|
||||||
|
|
||||||
/// `code` (monospace, some other color)
|
|
||||||
pub code: bool,
|
|
||||||
|
|
||||||
/// self.strong* (emphasized, e.g. bold)
|
|
||||||
pub strong: bool,
|
|
||||||
|
|
||||||
/// _underline_
|
|
||||||
pub underline: bool,
|
|
||||||
|
|
||||||
/// ~strikethrough~
|
|
||||||
pub strikethrough: bool,
|
|
||||||
|
|
||||||
/// /italics/
|
|
||||||
pub italics: bool,
|
|
||||||
|
|
||||||
/// $small$
|
|
||||||
pub small: bool,
|
|
||||||
|
|
||||||
/// ^raised^
|
|
||||||
pub raised: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub enum MarkdownItem<'a> {
|
|
||||||
Text {
|
|
||||||
span: Span<'a>,
|
|
||||||
style: Style,
|
|
||||||
},
|
|
||||||
|
|
||||||
CodeBlock {
|
|
||||||
all: Span<'a>,
|
|
||||||
language: Span<'a>,
|
|
||||||
code: Span<'a>,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
grammar;
|
|
||||||
|
|
||||||
pub Term: i32 = {
|
|
||||||
<n:Num> => n,
|
|
||||||
"(" <t:Term> ")" => t,
|
|
||||||
};
|
|
||||||
|
|
||||||
Num: i32 = <s:r"[0-9]+"> => i32::from_str(s).unwrap();
|
|
||||||
@ -1,268 +0,0 @@
|
|||||||
use egui::text::{CCursorRange, LayoutJob};
|
|
||||||
|
|
||||||
use crate::markdown::{
|
|
||||||
span::Span,
|
|
||||||
tokenizer::{Heading, Token, TokenKind, tokenize},
|
|
||||||
};
|
|
||||||
|
|
||||||
/// Highlight markdown, caching previous output to save CPU.
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct MemoizedHighlighter {
|
|
||||||
style: egui::Style,
|
|
||||||
code: String,
|
|
||||||
output: LayoutJob,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
|
||||||
pub struct Style {
|
|
||||||
/// # heading (large text)
|
|
||||||
pub heading: Option<Heading>,
|
|
||||||
|
|
||||||
/// > quoted (slightly dimmer color or other font style)
|
|
||||||
pub quoted: bool,
|
|
||||||
|
|
||||||
/// `code` (monospace, some other color)
|
|
||||||
pub code: bool,
|
|
||||||
|
|
||||||
/// self.strong* (emphasized, e.g. bold)
|
|
||||||
pub strong: bool,
|
|
||||||
|
|
||||||
/// _underline_
|
|
||||||
pub underline: bool,
|
|
||||||
|
|
||||||
/// ~strikethrough~
|
|
||||||
pub strikethrough: bool,
|
|
||||||
|
|
||||||
/// /italics/
|
|
||||||
pub italics: bool,
|
|
||||||
|
|
||||||
/// $small$
|
|
||||||
pub small: bool,
|
|
||||||
|
|
||||||
/// ^raised^
|
|
||||||
pub raised: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MemoizedHighlighter {
|
|
||||||
pub fn highlight(
|
|
||||||
&mut self,
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
code: &str,
|
|
||||||
cursor: Option<CCursorRange>,
|
|
||||||
) -> LayoutJob {
|
|
||||||
if (&self.style, self.code.as_str()) != (egui_style, code) {
|
|
||||||
self.style = egui_style.clone();
|
|
||||||
code.clone_into(&mut self.code);
|
|
||||||
self.output = highlight_markdown(egui_style, code, cursor);
|
|
||||||
}
|
|
||||||
self.output.clone()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn highlight_markdown(
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
text: &str,
|
|
||||||
|
|
||||||
// TODO: hide special characters where cursor isn't
|
|
||||||
_cursor: Option<CCursorRange>,
|
|
||||||
) -> LayoutJob {
|
|
||||||
let mut job = LayoutJob::default();
|
|
||||||
let mut style = Style::default();
|
|
||||||
|
|
||||||
let mut prev = TokenKind::Newline;
|
|
||||||
|
|
||||||
let tokens: Vec<_> = tokenize(text).collect();
|
|
||||||
let mut tokens = &tokens[..];
|
|
||||||
|
|
||||||
const CODE_INDENT: f32 = 10.0;
|
|
||||||
|
|
||||||
while !tokens.is_empty() {
|
|
||||||
let token = tokens.first().unwrap();
|
|
||||||
tokens = &tokens[1..];
|
|
||||||
|
|
||||||
let start_of_line = prev == TokenKind::Newline;
|
|
||||||
prev = token.kind;
|
|
||||||
|
|
||||||
let mut basic_style: Option<fn(&mut Style) -> &mut bool> = None;
|
|
||||||
|
|
||||||
match token.kind {
|
|
||||||
TokenKind::CodeBlock if start_of_line => {
|
|
||||||
let span = collect_until(
|
|
||||||
token,
|
|
||||||
&mut tokens,
|
|
||||||
series([TokenKind::Newline, TokenKind::CodeBlock]),
|
|
||||||
);
|
|
||||||
|
|
||||||
let code_style = format_from_style(
|
|
||||||
egui_style,
|
|
||||||
&Style {
|
|
||||||
code: true,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
job.append(&*span, CODE_INDENT, code_style.clone());
|
|
||||||
style = Default::default();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TokenKind::Newline => style = Style::default(),
|
|
||||||
|
|
||||||
TokenKind::Strong => basic_style = Some(|s| &mut s.strong),
|
|
||||||
TokenKind::Italic => basic_style = Some(|s| &mut s.italics),
|
|
||||||
TokenKind::Strikethrough => basic_style = Some(|s| &mut s.strikethrough),
|
|
||||||
|
|
||||||
TokenKind::CodeBlock | TokenKind::Mono => {
|
|
||||||
style.code = true;
|
|
||||||
let span = collect_until(
|
|
||||||
token,
|
|
||||||
&mut tokens,
|
|
||||||
any_of([TokenKind::Mono, TokenKind::CodeBlock, TokenKind::Newline]),
|
|
||||||
);
|
|
||||||
job.append(&*span, 0.0, format_from_style(egui_style, &style));
|
|
||||||
style.code = false;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: different heading strengths
|
|
||||||
TokenKind::Heading(h) if start_of_line => style.heading = Some(h),
|
|
||||||
TokenKind::Quote if start_of_line => style.quoted = true,
|
|
||||||
|
|
||||||
// TODO: indented list entries
|
|
||||||
TokenKind::ListEntry if start_of_line => {
|
|
||||||
job.append("• ", 0.0, format_from_style(egui_style, &style));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TokenKind::Text
|
|
||||||
// the following tokens are only richly rendered if encountered e.g. at start_of_line.
|
|
||||||
| TokenKind::Indentation
|
|
||||||
| TokenKind::ListEntry
|
|
||||||
| TokenKind::Heading(..)
|
|
||||||
| TokenKind::Quote => {}
|
|
||||||
}
|
|
||||||
|
|
||||||
// if we encountered a marker for Bold, Italic, or Strikethrough, toggle that style and
|
|
||||||
// render the token with the style enabled.
|
|
||||||
if let Some(basic_style) = basic_style {
|
|
||||||
let mut tmp_style = style;
|
|
||||||
*basic_style(&mut tmp_style) = true;
|
|
||||||
*basic_style(&mut style) ^= true; // toggle
|
|
||||||
job.append(&token.span, 0.0, format_from_style(egui_style, &tmp_style));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
job.append(&token.span, 0.0, format_from_style(egui_style, &style));
|
|
||||||
}
|
|
||||||
|
|
||||||
job
|
|
||||||
}
|
|
||||||
|
|
||||||
fn series<'a, const N: usize>(of: [TokenKind; N]) -> impl FnMut(&[Token<'a>; N]) -> bool {
|
|
||||||
move |token| {
|
|
||||||
of.iter()
|
|
||||||
.zip(token)
|
|
||||||
.all(|(kind, token)| kind == &token.kind)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn any_of<'a, const N: usize>(these: [TokenKind; N]) -> impl FnMut(&[Token<'a>; 1]) -> bool {
|
|
||||||
move |[token]| these.contains(&token.kind)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Collect all tokens up to and including `pattern`, and merge them into a signle span.
|
|
||||||
///
|
|
||||||
/// `N` determines how many specific and consecutive tokens we are looking for.
|
|
||||||
/// i.e. if we were looking for a [TokenKind::Newline] followed by a [TokenKind::Quote], `N`
|
|
||||||
/// would equal `2`.
|
|
||||||
///
|
|
||||||
/// `pattern` is a function that accepts an array of `N` tokens and returns `true` if they match,
|
|
||||||
/// i.e. if we should stop collecting. [any_of] and [series] can help to construct this function.
|
|
||||||
///
|
|
||||||
/// The collected tokens will be split off the head of the slice referred to by `tokens`.
|
|
||||||
///
|
|
||||||
/// # Panic
|
|
||||||
/// Panics if `tokens` does not contain only consecutive adjacent spans.
|
|
||||||
fn collect_until<'a, const N: usize>(
|
|
||||||
token: &Token<'a>,
|
|
||||||
tokens: &mut &[Token<'a>],
|
|
||||||
pattern: impl FnMut(&[Token<'a>; N]) -> bool,
|
|
||||||
) -> Span<'a>
|
|
||||||
where
|
|
||||||
for<'b> &'b [Token<'a>; N]: TryFrom<&'b [Token<'a>]>,
|
|
||||||
{
|
|
||||||
let mut windows = tokens
|
|
||||||
.windows(N)
|
|
||||||
.map(|slice| <&[Token<'a>; N]>::try_from(slice).ok().unwrap());
|
|
||||||
|
|
||||||
let split_at = match windows.position(pattern) {
|
|
||||||
Some(i) => i + N,
|
|
||||||
None => tokens.len(), // consume everything
|
|
||||||
};
|
|
||||||
|
|
||||||
let (consume, keep) = tokens.split_at(split_at);
|
|
||||||
*tokens = keep;
|
|
||||||
|
|
||||||
consume
|
|
||||||
.iter()
|
|
||||||
.fold(token.span.clone(), |span: Span<'_>, token| {
|
|
||||||
span.try_merge(&token.span).unwrap()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_from_style(egui_style: &egui::Style, emark_style: &Style) -> egui::text::TextFormat {
|
|
||||||
use egui::{Align, Color32, Stroke, TextStyle};
|
|
||||||
|
|
||||||
let color = if emark_style.strong || emark_style.heading.is_some() {
|
|
||||||
egui_style.visuals.strong_text_color()
|
|
||||||
} else if emark_style.quoted {
|
|
||||||
egui_style.visuals.weak_text_color()
|
|
||||||
} else {
|
|
||||||
egui_style.visuals.text_color()
|
|
||||||
};
|
|
||||||
|
|
||||||
let text_style = if emark_style.heading.is_some() {
|
|
||||||
TextStyle::Heading
|
|
||||||
} else if emark_style.code {
|
|
||||||
TextStyle::Monospace
|
|
||||||
} else if emark_style.small | emark_style.raised {
|
|
||||||
TextStyle::Small
|
|
||||||
} else {
|
|
||||||
TextStyle::Body
|
|
||||||
};
|
|
||||||
|
|
||||||
let background = if emark_style.code {
|
|
||||||
egui_style.visuals.code_bg_color
|
|
||||||
} else {
|
|
||||||
Color32::TRANSPARENT
|
|
||||||
};
|
|
||||||
|
|
||||||
let underline = if emark_style.underline {
|
|
||||||
Stroke::new(1.0, color)
|
|
||||||
} else {
|
|
||||||
Stroke::NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
let strikethrough = if emark_style.strikethrough {
|
|
||||||
Stroke::new(1.0, color)
|
|
||||||
} else {
|
|
||||||
Stroke::NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
let valign = if emark_style.raised {
|
|
||||||
Align::TOP
|
|
||||||
} else {
|
|
||||||
Align::BOTTOM
|
|
||||||
};
|
|
||||||
|
|
||||||
egui::text::TextFormat {
|
|
||||||
font_id: text_style.resolve(egui_style),
|
|
||||||
color,
|
|
||||||
background,
|
|
||||||
italics: emark_style.italics,
|
|
||||||
underline,
|
|
||||||
strikethrough,
|
|
||||||
valign,
|
|
||||||
..Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
mod highlighter;
|
|
||||||
mod span;
|
|
||||||
mod tokenizer;
|
|
||||||
|
|
||||||
pub use highlighter::*;
|
|
||||||
pub use span::*;
|
|
||||||
pub use tokenizer::*;
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
---
|
|
||||||
source: src/markdown/tokenizer.rs
|
|
||||||
expression: examples
|
|
||||||
---
|
|
||||||
- string: "just some normal text :D"
|
|
||||||
tokens:
|
|
||||||
- "Token { span: Span(0..24, \"just some normal text :D\"), kind: Text }"
|
|
||||||
- string: normal *bold* normal
|
|
||||||
tokens:
|
|
||||||
- "Token { span: Span(0..7, \"normal \"), kind: Text }"
|
|
||||||
- "Token { span: Span(7..8, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(8..12, \"bold\"), kind: Text }"
|
|
||||||
- "Token { span: Span(12..13, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(13..20, \" normal\"), kind: Text }"
|
|
||||||
- string: normal * maybe bold? * normal
|
|
||||||
tokens:
|
|
||||||
- "Token { span: Span(0..7, \"normal \"), kind: Text }"
|
|
||||||
- "Token { span: Span(7..8, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(8..21, \" maybe bold? \"), kind: Text }"
|
|
||||||
- "Token { span: Span(21..22, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(22..29, \" normal\"), kind: Text }"
|
|
||||||
- string: "```lang\ncode code code\n```"
|
|
||||||
tokens:
|
|
||||||
- "Token { span: Span(0..3, \"```\"), kind: CodeBlock }"
|
|
||||||
- "Token { span: Span(3..7, \"lang\"), kind: Text }"
|
|
||||||
- "Token { span: Span(7..8, \"\\n\"), kind: Newline }"
|
|
||||||
- "Token { span: Span(8..22, \"code code code\"), kind: Text }"
|
|
||||||
- "Token { span: Span(22..23, \"\\n\"), kind: Newline }"
|
|
||||||
- "Token { span: Span(23..26, \"```\"), kind: CodeBlock }"
|
|
||||||
- string: "*/``/*"
|
|
||||||
tokens:
|
|
||||||
- "Token { span: Span(0..1, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(1..2, \"/\"), kind: Italic }"
|
|
||||||
- "Token { span: Span(2..3, \"`\"), kind: Mono }"
|
|
||||||
- "Token { span: Span(3..4, \"`\"), kind: Mono }"
|
|
||||||
- "Token { span: Span(4..5, \"/\"), kind: Italic }"
|
|
||||||
- "Token { span: Span(5..6, \"*\"), kind: Strong }"
|
|
||||||
- string: "*/`*/*/"
|
|
||||||
tokens:
|
|
||||||
- "Token { span: Span(0..1, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(1..2, \"/\"), kind: Italic }"
|
|
||||||
- "Token { span: Span(2..3, \"`\"), kind: Mono }"
|
|
||||||
- "Token { span: Span(3..4, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(4..5, \"/\"), kind: Italic }"
|
|
||||||
- "Token { span: Span(5..6, \"*\"), kind: Strong }"
|
|
||||||
- "Token { span: Span(6..7, \"/\"), kind: Italic }"
|
|
||||||
@ -1,83 +0,0 @@
|
|||||||
use std::{
|
|
||||||
fmt,
|
|
||||||
ops::{Deref, Range},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Clone, Eq, PartialEq)]
|
|
||||||
pub struct Span<'a> {
|
|
||||||
complete_str: &'a str,
|
|
||||||
range: Range<usize>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> Span<'a> {
|
|
||||||
pub fn new(complete_str: &'a str) -> Self {
|
|
||||||
Self {
|
|
||||||
complete_str,
|
|
||||||
range: 0..complete_str.len(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get(&self, slice: Range<usize>) -> Option<Self> {
|
|
||||||
let start = self.range.start.checked_add(slice.start)?;
|
|
||||||
let end = self.range.start.checked_add(slice.end)?;
|
|
||||||
|
|
||||||
if end > self.range.end || end < start {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
Some(Self {
|
|
||||||
complete_str: self.complete_str,
|
|
||||||
range: Range { start, end },
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn complete_str(&self) -> Self {
|
|
||||||
Self::new(self.complete_str)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn split_at(&self, i: usize) -> Option<(Self, Self)> {
|
|
||||||
let head = self.get(0..i)?;
|
|
||||||
let tail = self.get(i..self.range.len())?;
|
|
||||||
Some((head, tail))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Try to merge the spans.
|
|
||||||
///
|
|
||||||
/// This only works if spans are pointing into the same backing buffer, and are adjacent.
|
|
||||||
pub fn try_merge(&self, other: &Self) -> Option<Self> {
|
|
||||||
if self.complete_str.as_ptr() != other.complete_str.as_ptr() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.range.end == other.range.start {
|
|
||||||
Some(Self {
|
|
||||||
range: self.range.start..other.range.end,
|
|
||||||
..*self
|
|
||||||
})
|
|
||||||
} else if self.range.start == other.range.end {
|
|
||||||
Some(Self {
|
|
||||||
range: other.range.start..self.range.end,
|
|
||||||
..*self
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Deref for Span<'_> {
|
|
||||||
type Target = str;
|
|
||||||
|
|
||||||
fn deref(&self) -> &Self::Target {
|
|
||||||
&self.complete_str[self.range.clone()]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> fmt::Debug for Span<'a> {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
f.debug_tuple("Span")
|
|
||||||
.field(&self.range)
|
|
||||||
.field(&self.deref())
|
|
||||||
.finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,156 +0,0 @@
|
|||||||
use std::iter;
|
|
||||||
|
|
||||||
use super::span::Span;
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
||||||
pub enum Heading {
|
|
||||||
H6,
|
|
||||||
H5,
|
|
||||||
H4,
|
|
||||||
H3,
|
|
||||||
H2,
|
|
||||||
H1,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
||||||
pub enum TokenKind {
|
|
||||||
/// A newline that isn't a codeblock
|
|
||||||
Newline,
|
|
||||||
|
|
||||||
/// "#" to "######"
|
|
||||||
Heading(Heading),
|
|
||||||
|
|
||||||
/// A newline followed by three `
|
|
||||||
CodeBlock,
|
|
||||||
|
|
||||||
Mono,
|
|
||||||
Strong,
|
|
||||||
Italic,
|
|
||||||
Strikethrough,
|
|
||||||
|
|
||||||
/// ">"
|
|
||||||
Quote,
|
|
||||||
|
|
||||||
/// Two spaces
|
|
||||||
Indentation,
|
|
||||||
|
|
||||||
/// "- "
|
|
||||||
ListEntry,
|
|
||||||
|
|
||||||
/// Normal text
|
|
||||||
Text,
|
|
||||||
}
|
|
||||||
|
|
||||||
const TOKENS: &[(&'static str, TokenKind)] = &[
|
|
||||||
("\n", TokenKind::Newline),
|
|
||||||
("######", TokenKind::Heading(Heading::H6)),
|
|
||||||
("#####", TokenKind::Heading(Heading::H5)),
|
|
||||||
("####", TokenKind::Heading(Heading::H4)),
|
|
||||||
("###", TokenKind::Heading(Heading::H3)),
|
|
||||||
("##", TokenKind::Heading(Heading::H2)),
|
|
||||||
("#", TokenKind::Heading(Heading::H1)),
|
|
||||||
("```", TokenKind::CodeBlock),
|
|
||||||
("`", TokenKind::Mono),
|
|
||||||
("*", TokenKind::Strong),
|
|
||||||
("_", TokenKind::Italic),
|
|
||||||
("~", TokenKind::Strikethrough),
|
|
||||||
(">", TokenKind::Quote),
|
|
||||||
(" ", TokenKind::Indentation),
|
|
||||||
("- ", TokenKind::ListEntry),
|
|
||||||
];
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Token<'a> {
|
|
||||||
pub span: Span<'a>,
|
|
||||||
pub kind: TokenKind,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn tokenize<'a>(s: &'a str) -> impl Iterator<Item = Token<'a>> {
|
|
||||||
let mut s = Span::new(s);
|
|
||||||
let mut yield_n: usize = 0;
|
|
||||||
|
|
||||||
iter::from_fn(move || {
|
|
||||||
loop {
|
|
||||||
if s.is_empty() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
if yield_n == s.len() {
|
|
||||||
let (token, rest) = s.split_at(s.len()).unwrap();
|
|
||||||
let token = Token {
|
|
||||||
span: token,
|
|
||||||
kind: TokenKind::Text,
|
|
||||||
};
|
|
||||||
s = rest;
|
|
||||||
return Some(token);
|
|
||||||
}
|
|
||||||
|
|
||||||
let token = TOKENS.iter().find_map(|(token_str, token_kind)| {
|
|
||||||
s[yield_n..]
|
|
||||||
.starts_with(token_str)
|
|
||||||
.then(|| (*token_kind, token_str.len()))
|
|
||||||
});
|
|
||||||
|
|
||||||
let Some((kind, len)) = token else {
|
|
||||||
yield_n += s[yield_n..].chars().next().unwrap_or('\0').len_utf8();
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
|
|
||||||
if yield_n > 0 {
|
|
||||||
let (token, rest) = s.split_at(yield_n).unwrap();
|
|
||||||
let token = Token {
|
|
||||||
span: token,
|
|
||||||
kind: TokenKind::Text,
|
|
||||||
};
|
|
||||||
s = rest;
|
|
||||||
yield_n = 0;
|
|
||||||
return Some(token);
|
|
||||||
}
|
|
||||||
|
|
||||||
let (token, rest) = s.split_at(len).unwrap();
|
|
||||||
let token = Token { span: token, kind };
|
|
||||||
s = rest;
|
|
||||||
return Some(token);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use serde::Serialize;
|
|
||||||
|
|
||||||
use super::tokenize;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_tokenize() {
|
|
||||||
let examples = [
|
|
||||||
"just some normal text :D",
|
|
||||||
"normal *bold* normal",
|
|
||||||
"normal * maybe bold? * normal",
|
|
||||||
"```lang\ncode code code\n```",
|
|
||||||
"*/``/*",
|
|
||||||
"*/`*/*/",
|
|
||||||
];
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
struct Result {
|
|
||||||
pub string: &'static str,
|
|
||||||
|
|
||||||
/// Debug-printed tokens
|
|
||||||
pub tokens: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
let examples = examples
|
|
||||||
.into_iter()
|
|
||||||
.map(|string| {
|
|
||||||
let tokens = tokenize(string)
|
|
||||||
.map(|tokens| format!("{tokens:?}"))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
Result { string, tokens }
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
insta::assert_yaml_snapshot!(examples);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -72,15 +72,11 @@ pub fn rasterize_onto<'a, Blend: BlendFn>(
|
|||||||
|
|
||||||
// If the pixel is within the triangle, fill it in.
|
// If the pixel is within the triangle, fill it in.
|
||||||
if point_in_triangle.inside {
|
if point_in_triangle.inside {
|
||||||
let c0 = triangle[0]
|
let [c0, c1, c2] = [0, 1, 2].map(|i| {
|
||||||
|
triangle[i]
|
||||||
.color
|
.color
|
||||||
.linear_multiply(point_in_triangle.weights[0]);
|
.linear_multiply(point_in_triangle.weights[i])
|
||||||
let c1 = triangle[1]
|
});
|
||||||
.color
|
|
||||||
.linear_multiply(point_in_triangle.weights[1]);
|
|
||||||
let c2 = triangle[2]
|
|
||||||
.color
|
|
||||||
.linear_multiply(point_in_triangle.weights[2]);
|
|
||||||
|
|
||||||
let color = c0 + c1 + c2;
|
let color = c0 + c1 + c2;
|
||||||
|
|
||||||
@ -169,6 +165,10 @@ fn point_in_triangle(point: Pos2, triangle: [&Vertex; 3]) -> PointInTriangle {
|
|||||||
// Normalize the weights.
|
// Normalize the weights.
|
||||||
let weights = areas.map(|area| area / triangle_area);
|
let weights = areas.map(|area| area / triangle_area);
|
||||||
|
|
||||||
|
if cfg!(debug_assertions) && weights.into_iter().any(f32::is_nan) {
|
||||||
|
panic!("weights must not be NaN! {weights:?} {triangle_area:?} {areas:?} {sides:?}");
|
||||||
|
}
|
||||||
|
|
||||||
PointInTriangle { inside, weights }
|
PointInTriangle { inside, weights }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
---
|
---
|
||||||
source: src/custom_code_block.rs
|
source: src/custom_code_block.rs
|
||||||
assertion_line: 133
|
|
||||||
expression: list
|
expression: list
|
||||||
---
|
---
|
||||||
[
|
[
|
||||||
@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
source: src/painting.rs
|
|
||||||
assertion_line: 695
|
|
||||||
expression: serialized
|
|
||||||
---
|
|
||||||
```handwriting
|
|
||||||
BQAAvAA8AEIAPABCAEIAPgBAAAAAAAQAAEIAQgC8ADwAAAAAAEIAPA==
|
|
||||||
```
|
|
||||||
@ -8,7 +8,7 @@ use egui::{
|
|||||||
Color32, InputState, Key, Modifiers, TextBuffer, TextEdit, Ui, Vec2, text::CCursorRange,
|
Color32, InputState, Key, Modifiers, TextBuffer, TextEdit, Ui, Vec2, text::CCursorRange,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::markdown::MemoizedHighlighter;
|
use crate::easy_mark::MemoizedHighlighter;
|
||||||
|
|
||||||
#[derive(Default, serde::Deserialize, serde::Serialize)]
|
#[derive(Default, serde::Deserialize, serde::Serialize)]
|
||||||
pub struct MdTextEdit {
|
pub struct MdTextEdit {
|
||||||
@ -24,6 +24,10 @@ pub struct MdTextEdit {
|
|||||||
cursor: Option<CCursorRange>,
|
cursor: Option<CCursorRange>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct MdTextEditOutput {
|
||||||
|
pub changed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
impl MdTextEdit {
|
impl MdTextEdit {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
MdTextEdit::default()
|
MdTextEdit::default()
|
||||||
@ -36,7 +40,7 @@ impl MdTextEdit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn ui(&mut self, ui: &mut Ui) {
|
pub fn ui(&mut self, ui: &mut Ui) -> MdTextEditOutput {
|
||||||
let Self {
|
let Self {
|
||||||
text,
|
text,
|
||||||
highlighter,
|
highlighter,
|
||||||
@ -46,8 +50,8 @@ impl MdTextEdit {
|
|||||||
|
|
||||||
let w = ui.available_width();
|
let w = ui.available_width();
|
||||||
|
|
||||||
let mut layouter = |ui: &egui::Ui, markdown: &dyn TextBuffer, _wrap_width: f32| {
|
let mut layouter = |ui: &egui::Ui, easymark: &dyn TextBuffer, _wrap_width: f32| {
|
||||||
let mut layout_job = highlighter.highlight(ui.style(), markdown.as_str(), *cursor);
|
let mut layout_job = highlighter.highlight(ui.style(), easymark.as_str(), *cursor);
|
||||||
layout_job.wrap.max_width = w - 10.0;
|
layout_job.wrap.max_width = w - 10.0;
|
||||||
ui.fonts(|f| f.layout_job(layout_job))
|
ui.fonts(|f| f.layout_job(layout_job))
|
||||||
};
|
};
|
||||||
@ -72,6 +76,10 @@ impl MdTextEdit {
|
|||||||
*cursor = text_edit.cursor_range;
|
*cursor = text_edit.cursor_range;
|
||||||
//ui.ctx().request_repaint();
|
//ui.ctx().request_repaint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MdTextEditOutput {
|
||||||
|
changed: text_edit.response.changed(),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user