Compare commits
41 Commits
a91cafa74a
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c63babb599 | |||
| fac896161e | |||
| 945bb4d9fe | |||
| 47b7feeab8 | |||
| b1eb5f91be | |||
| 3669f54936 | |||
| 2fb9908329 | |||
| 0acab0413c | |||
| 8f16741705 | |||
| a663de3ca0 | |||
| 61575fbf65 | |||
579aace306
|
|||
| fe0b9d049e | |||
| c59febd924 | |||
|
276508713f
|
|||
| 3a2f058456 | |||
|
38d26f0028
|
|||
|
462c27e111
|
|||
|
e0fd726f02
|
|||
|
7f93084e64
|
|||
| 6e59cb86dc | |||
| 98a4f50031 | |||
|
0a19462b0f
|
|||
|
cfed4fd5ed
|
|||
|
eaf0c3cb55
|
|||
|
61669e15bd
|
|||
|
f2556f7125
|
|||
| 7494dc6b75 | |||
| 43afb9dfd3 | |||
| 6b5bbfbc54 | |||
|
b39419888b
|
|||
|
4e9eacc7b0
|
|||
|
8251937be9
|
|||
|
5ca9dfabb8
|
|||
|
1df81509df
|
|||
|
7d234641cb
|
|||
| 1ed278cc55 | |||
|
2a830f0539
|
|||
|
83ad2068e0
|
|||
|
3908e6d913
|
|||
|
27728fc431
|
2
.cargo/config.toml
Normal file
2
.cargo/config.toml
Normal file
@ -0,0 +1,2 @@
|
||||
[target.wasm32-unknown-unknown]
|
||||
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
|
||||
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
dist
|
||||
target
|
||||
4017
Cargo.lock
generated
Normal file
4017
Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
58
Cargo.toml
Normal file
58
Cargo.toml
Normal file
@ -0,0 +1,58 @@
|
||||
[package]
|
||||
name = "inkr"
|
||||
version = "1.0.0"
|
||||
authors = []
|
||||
edition = "2024"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
|
||||
|
||||
[features]
|
||||
pinenote = []
|
||||
|
||||
[dependencies]
|
||||
egui = "0.32"
|
||||
egui_extras = { version = "0.32", features = ["svg"] }
|
||||
egui_glow = "0.32"
|
||||
eframe = { version = "0.32", default-features = false, features = [
|
||||
"glow", # alt: "wgpu".
|
||||
"persistence",
|
||||
"wayland",
|
||||
] }
|
||||
log = "0.4.27"
|
||||
serde = { version = "1.0.219", features = ["derive"] }
|
||||
rfd = { version = "0.15.3", default-features = false, features = ["gtk3"] }
|
||||
rand = "0.9.1"
|
||||
eyre = "0.6.12"
|
||||
half = "2.6.0"
|
||||
zerocopy = { version = "0.8.25", features = ["derive", "std"] }
|
||||
base64 = "0.22.1"
|
||||
chrono = { version = "0.4.41", features = ["serde"] }
|
||||
notify = "8.1.0"
|
||||
arboard = "3.6.0"
|
||||
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
env_logger = "0.11.8"
|
||||
rand = "0.9.1"
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
getrandom = { version = "0.3", features = ["wasm_js"] }
|
||||
wasm-bindgen-futures = "0.4.50"
|
||||
web-sys = "0.3.77"
|
||||
|
||||
[patch.crates-io]
|
||||
# egui = { path = "../egui/crates/egui" }
|
||||
# eframe = { path = "../egui/crates/eframe" }
|
||||
|
||||
[dev-dependencies]
|
||||
insta = { version = "1.43.1", features = ["yaml"] }
|
||||
|
||||
[lints.clippy]
|
||||
unnecessary_lazy_evaluations = "allow"
|
||||
|
||||
[profile.release]
|
||||
opt-level = 2 # fast and small wasm
|
||||
|
||||
[profile.dev.package."*"]
|
||||
opt-level = 2 # optimize dependencies in debug-builds
|
||||
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"
|
||||
}
|
||||
2
Trunk.toml
Normal file
2
Trunk.toml
Normal file
@ -0,0 +1,2 @@
|
||||
[build]
|
||||
filehash = false
|
||||
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 |
BIN
assets/icon-1024.png
Normal file
BIN
assets/icon-1024.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 85 KiB |
BIN
assets/icon-256.png
Normal file
BIN
assets/icon-256.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
62
assets/icon.svg
Normal file
62
assets/icon.svg
Normal file
@ -0,0 +1,62 @@
|
||||
<?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.733333"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
xml:space="preserve"
|
||||
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
|
||||
sodipodi:docname="icon.svg"
|
||||
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"
|
||||
showguides="false"
|
||||
inkscape:zoom="1.6249158"
|
||||
inkscape:cx="147.69996"
|
||||
inkscape:cy="131.69913"
|
||||
inkscape:window-width="1664"
|
||||
inkscape:window-height="1123"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="layer1" /><defs
|
||||
id="defs1"><rect
|
||||
x="-8.0004144"
|
||||
y="1.8462495"
|
||||
width="264.01368"
|
||||
height="253.5516"
|
||||
id="rect3" /><rect
|
||||
x="-1.8462495"
|
||||
y="-3.0770825"
|
||||
width="256.01326"
|
||||
height="257.85951"
|
||||
id="rect2" /></defs><g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"><circle
|
||||
style="fill:#110320;stroke-width:1.5875;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path1"
|
||||
cx="-33.866669"
|
||||
cy="33.866669"
|
||||
transform="scale(-1,1)"
|
||||
r="29.633333" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.726546;stroke-dasharray:none"
|
||||
d="m 24.357358,51.75417 c 1.677138,0.1954 3.012712,-1.943399 0.697783,-2.233805 -0.43693,-0.05481 -1.094737,-0.196393 -1.469913,0.112888 -0.725035,0.597691 -0.05602,2.024431 0.77213,2.120918 M 44.55508,47.458562 c -2.036319,-1.300371 -6.036944,-3.772356 -2.853754,-6.546895 2.728243,-2.377997 6.477766,1.248147 8.186012,3.109607 0.979637,1.0675 2.466472,1.861233 3.67434,0.654289 0.51717,-0.516775 0.968121,-1.312455 1.189759,-2.005947 1.591482,-4.979623 -4.179579,-4.744659 -7.417698,-4.633956 -0.951483,0.03253 -2.61236,0.303404 -3.212234,-0.656953 -0.427092,-0.683746 -0.135095,-1.484022 0.474312,-1.93208 1.360421,-1.000262 3.587682,-0.457196 4.652612,-1.849352 0.828528,-1.083114 0.951,-4.818847 -1.22072,-3.350234 -1.443858,0.976401 -2.006307,1.916665 -3.873526,2.324531 0.222633,-0.929454 1.778989,-2.100224 1.499021,-3.032882 -0.386705,-1.28822 -2.097275,-0.0512 -2.89635,-0.174431 -1.301969,-0.200779 -1.776328,-2.582496 -1.679169,-3.637966 0.211543,-2.29809 1.939272,-4.771313 3.673637,-6.185849 1.3339,-1.087912 3.458366,-2.233404 3.97281,-3.99081 0.963508,-3.291457 -2.687111,-5.514838 -5.437351,-4.032242 -3.193287,1.721432 -2.389588,8.096059 -3.623982,11.147297 -0.364454,0.900877 -0.970432,2.880491 -2.042274,3.173114 -0.649242,0.177246 -0.922121,-0.598875 -0.994604,-1.093721 -0.156259,-1.066832 0.596766,-3.104217 -0.406279,-3.871285 -1.925963,-1.472853 -2.118198,3.230061 -3.387645,2.716025 -0.51512,-0.208588 -0.592573,-0.957611 -0.557124,-1.427206 0.09125,-1.208752 1.39216,-7.538591 -2.172458,-5.21215 -2.924945,1.90896 1.702668,6.085542 -0.527528,7.633266 -1.553108,1.077833 -2.569377,-0.643592 -3.218833,-1.834516 -0.888912,-1.630017 -1.577648,-3.577817 -1.50393,-5.458634 0.05507,-1.40513 0.84855,-3.098296 0.08945,-4.419774 -1.28002,-2.228324 -5.084134,-1.932106 -6.097163,0.32796 -1.494817,3.334892 1.146497,4.662242 3.098072,6.621665 1.013668,1.01774 1.832017,2.31355 2.489201,3.583834 0.365325,0.706145 1.458044,2.439306 1.13037,3.248518 -0.272203,0.672224 -1.201216,-0.06939 -1.483304,-0.328274 -0.923006,-0.847094 -2.934861,-3.048331 -3.902644,-0.972527 -1.582374,3.394047 7.74979,3.046066 4.025122,6.811266 -1.165609,1.178293 -2.619518,0.377498 -3.890096,-0.119487 -1.802787,-0.705155 -3.350441,-0.965609 -4.797851,0.545082 -0.403375,0.42101 -0.774148,0.921607 -0.840012,1.518039 -0.175061,1.585323 2.03783,3.007543 3.477426,2.714219 1.11212,-0.2266 2.010389,-1.009378 3.175375,-1.139827 1.241591,-0.139028 2.045938,0.790409 1.832938,2.042238 -0.224989,1.322281 -2.006141,1.492584 -3.065696,1.516282 -2.728138,0.06102 -8.365686,0.740019 -7.421897,5.0174 0.427713,1.938463 3.289772,2.755106 4.919438,1.986954 2.399018,-1.130846 2.82494,-4.428861 5.323211,-5.680952 0.728974,-0.365349 2.079221,-1.095803 2.829431,-0.432104 2.412658,2.134442 -2.819355,5.586848 0.0509,8.076797 0.940133,0.815568 1.796677,-0.187134 2.072547,-1.076718 0.424858,-1.370002 -0.241091,-5.437488 2.687209,-4.531871 0.942342,0.29143 1.676656,1.468989 2.20772,2.230322 1.180467,1.692317 1.943623,3.555791 2.23459,5.603278 0.241802,1.701573 0.05628,3.87755 1.015729,5.366084 1.767129,2.741609 5.0248,0.99903 5.770174,-1.581327 0.278479,-0.964043 0.244035,-1.97941 -0.06571,-2.93006 -0.203472,-0.624482 -0.837385,-1.594523 -0.485287,-2.259042 0.560913,-1.058617 2.500975,-0.205104 3.323697,-1.568951 M 11.282216,39.999731 c -1.089731,-0.383555 -3.0034339,-0.530935 -3.8017272,0.534465 -0.5463955,0.729209 0.1590305,1.777793 1.0382558,1.536416 0.8474681,-0.232658 1.9728694,-1.554161 2.7634714,-2.070881 m 5.328926,-2.404732 c -0.753761,-0.138097 -1.837599,-0.08651 -2.477713,-0.539231 -0.767733,-0.542982 -0.921334,-1.592688 -1.957202,-1.817154 -1.363887,-0.295546 -2.8379814,1.425438 -2.086435,2.701244 1.0566,1.793659 5.358164,0.731178 6.52135,-0.344859 m 28.117712,10.970905 -0.144296,0.356349 c 0.64822,0.812599 4.681381,4.096531 5.227817,1.72372 0.359489,-1.561022 -4.071741,-2.094883 -5.083523,-2.080066 M 18.806334,25.003554 c 0.15582,-1.480274 -1.948974,-3.996407 -3.550889,-3.979179 -1.724018,0.01854 -0.620047,1.668489 0.138592,2.162822 0.434608,0.283193 0.887821,0.53677 1.33694,0.795641 0.67922,0.391499 1.348677,0.725904 2.075355,1.020716 m 33.510001,10.458337 c 1.688214,0.682313 4.022777,1.141407 5.653158,-4.78e-4 1.057186,-0.740431 1.253424,-3.177239 -0.284082,-3.519836 -1.561492,-0.347939 -1.996578,1.718043 -2.991458,2.390466 -0.75837,0.512568 -1.672781,0.516416 -2.377622,1.129849 m -0.653258,-3.515868 c 1.605596,0.313842 2.298441,-2.135314 0.575747,-2.430759 -1.593158,-0.273232 -2.264698,2.100623 -0.575747,2.430759 m -5.829793,-4.023772 c 2.878313,1.130708 7.741256,-4.494597 4.037077,-5.882019 -2.692662,-1.008547 -2.519327,1.463896 -3.454303,2.94427 -0.457826,0.724892 -2.297067,2.264312 -0.582774,2.937749 M 32.659319,15.259489 c 1.43128,-0.213437 1.900284,-3.437075 0.09929,-3.084237 -1.390128,0.272344 -1.94476,3.359442 -0.09929,3.084237 z"
|
||||
id="path2" /><text
|
||||
xml:space="preserve"
|
||||
transform="scale(0.26458333)"
|
||||
id="text2"
|
||||
style="fill:#1e0026;text-orientation:auto;text-align:start;writing-mode:lr-tb;direction:ltr;fill-opacity:1;stroke:#200029;stroke-opacity:1;stroke-width:2.746;stroke-dasharray:none;white-space:pre;shape-inside:url(#rect2)" /></g></svg>
|
||||
|
After Width: | Height: | Size: 6.9 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;
|
||||
22
assets/manifest.json
Normal file
22
assets/manifest.json
Normal file
@ -0,0 +1,22 @@
|
||||
{
|
||||
"name": "Inkr",
|
||||
"short_name": "inkr",
|
||||
"icons": [
|
||||
{
|
||||
"src": "./assets/icon-256.png",
|
||||
"sizes": "256x256",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "./assets/icon-1024.png",
|
||||
"sizes": "1024x1024",
|
||||
"type": "image/png"
|
||||
}
|
||||
],
|
||||
"lang": "en-US",
|
||||
"id": "/index.html",
|
||||
"start_url": "./index.html",
|
||||
"display": "standalone",
|
||||
"background_color": "black",
|
||||
"theme_color": "black"
|
||||
}
|
||||
25
assets/sw.js
Normal file
25
assets/sw.js
Normal file
@ -0,0 +1,25 @@
|
||||
var cacheName = 'inkr';
|
||||
var filesToCache = [
|
||||
'./',
|
||||
'./index.html',
|
||||
'./inkr.js',
|
||||
'./inkr.wasm',
|
||||
];
|
||||
|
||||
/* Start the service worker and cache all of the app's content */
|
||||
self.addEventListener('install', function(e) {
|
||||
e.waitUntil(
|
||||
caches.open(cacheName).then(function(cache) {
|
||||
return cache.addAll(filesToCache);
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
/* Serve cached content when offline */
|
||||
self.addEventListener('fetch', function(e) {
|
||||
e.respondWith(
|
||||
caches.match(e.request).then(function(response) {
|
||||
return response || fetch(e.request);
|
||||
})
|
||||
);
|
||||
});
|
||||
BIN
fonts/Iosevka-Thin.ttc
Normal file
BIN
fonts/Iosevka-Thin.ttc
Normal file
Binary file not shown.
BIN
fonts/IosevkaAile-Regular.ttc
Normal file
BIN
fonts/IosevkaAile-Regular.ttc
Normal file
Binary file not shown.
135
index.html
Normal file
135
index.html
Normal file
@ -0,0 +1,135 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
|
||||
<!-- Disable zooming: -->
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
|
||||
|
||||
<head>
|
||||
<title>Inkr</title>
|
||||
|
||||
<link data-trunk rel="rust" data-wasm-opt="2" />
|
||||
<base data-trunk-public-url />
|
||||
|
||||
<link data-trunk rel="icon" href="assets/icon.svg">
|
||||
|
||||
|
||||
<link data-trunk rel="copy-file" href="assets/sw.js"/>
|
||||
<link data-trunk rel="copy-file" href="assets/manifest.json"/>
|
||||
<link data-trunk rel="copy-file" href="assets/icon-256.png" data-target-path="assets"/>
|
||||
<link data-trunk rel="copy-file" href="assets/icon-1024.png" data-target-path="assets"/>
|
||||
|
||||
|
||||
<link rel="manifest" href="manifest.json">
|
||||
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#404040">
|
||||
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
|
||||
|
||||
<style>
|
||||
html {
|
||||
touch-action: manipulation; /* Remove touch delay: */
|
||||
}
|
||||
|
||||
body {
|
||||
background: #909090;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
body {
|
||||
background: #404040;
|
||||
}
|
||||
}
|
||||
|
||||
/* Allow canvas to fill entire web page: */
|
||||
html,
|
||||
body {
|
||||
overflow: hidden;
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* Make canvas fill entire document: */
|
||||
canvas {
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.centered {
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
color: #f0f0f0;
|
||||
font-size: 24px;
|
||||
font-family: Ubuntu-Light, Helvetica, sans-serif;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* ---------------------------------------------- */
|
||||
/* Loading animation from https://loading.io/css/ */
|
||||
.lds-dual-ring {
|
||||
display: inline-block;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
.lds-dual-ring:after {
|
||||
content: " ";
|
||||
display: block;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
margin: 0px;
|
||||
border-radius: 50%;
|
||||
border: 3px solid #fff;
|
||||
border-color: #fff transparent #fff transparent;
|
||||
animation: lds-dual-ring 1.2s linear infinite;
|
||||
}
|
||||
|
||||
@keyframes lds-dual-ring {
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!-- The WASM code will resize the canvas dynamically -->
|
||||
<!-- the id is hardcoded in main.rs . so, make sure both match. -->
|
||||
<canvas id="the_canvas_id"></canvas>
|
||||
|
||||
<!-- the loading spinner will be removed in main.rs -->
|
||||
<div class="centered" id="loading_text">
|
||||
<p style="font-size:16px">
|
||||
Loading…
|
||||
</p>
|
||||
<div class="lds-dual-ring"></div>
|
||||
</div>
|
||||
|
||||
<!--Register Service Worker. this will cache the wasm / js scripts for offline use (for PWA functionality). -->
|
||||
<!-- Force refresh (Ctrl + F5) to load the latest files instead of cached files -->
|
||||
<script>
|
||||
// We disable caching during development so that we always view the latest version.
|
||||
if ('serviceWorker' in navigator && window.location.hash !== "#dev") {
|
||||
window.addEventListener('load', function () {
|
||||
navigator.serviceWorker.register('sw.js');
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
523
src/app.rs
Normal file
523
src/app.rs
Normal file
@ -0,0 +1,523 @@
|
||||
use std::{
|
||||
fs,
|
||||
io::Read,
|
||||
path::PathBuf,
|
||||
sync::{Arc, mpsc},
|
||||
thread::JoinHandle,
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
use crate::{
|
||||
file_editor::{FileEditor, SaveStatus},
|
||||
folder::Folder,
|
||||
preferences::Preferences,
|
||||
text_styles::{H1, H1_MONO, H2, H2_MONO, H3, H3_MONO, H4, H4_MONO, H5, H5_MONO, H6, H6_MONO},
|
||||
util::{GuiSender, file_mtime, log_error},
|
||||
};
|
||||
use egui::{
|
||||
Align, Button, Context, FontData, FontDefinitions, FontFamily, FontId, Frame, Image, Key,
|
||||
Modifiers, PointerButton, RichText, ScrollArea, Theme, Widget, include_image,
|
||||
};
|
||||
use eyre::eyre;
|
||||
|
||||
#[derive(serde::Deserialize, serde::Serialize)]
|
||||
#[serde(default)]
|
||||
pub struct App {
|
||||
preferences: Preferences,
|
||||
|
||||
#[serde(skip)]
|
||||
actions_tx: mpsc::Sender<Action>,
|
||||
#[serde(skip)]
|
||||
actions_rx: mpsc::Receiver<Action>,
|
||||
#[serde(skip)]
|
||||
jobs: Jobs,
|
||||
|
||||
tabs: Vec<(TabId, Tab)>,
|
||||
|
||||
show_folders: bool,
|
||||
folders: Vec<Folder>,
|
||||
|
||||
open_tab_index: Option<usize>,
|
||||
|
||||
next_tab_id: TabId,
|
||||
}
|
||||
|
||||
pub struct Jobs {
|
||||
handles: Vec<JoinHandle<()>>,
|
||||
actions_tx: mpsc::Sender<Action>,
|
||||
}
|
||||
|
||||
impl Jobs {
|
||||
pub 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)]
|
||||
enum Tab {
|
||||
File(FileEditor),
|
||||
}
|
||||
|
||||
impl Tab {
|
||||
pub fn title(&self) -> &str {
|
||||
match self {
|
||||
Tab::File(file_editor) => file_editor.title(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn notice_symbol(&self) -> Option<&'static str> {
|
||||
match self {
|
||||
Tab::File(file_editor) => match file_editor.save_status() {
|
||||
SaveStatus::Synced => None,
|
||||
SaveStatus::NoFile => Some("?"),
|
||||
SaveStatus::FileOutdated => Some("*"),
|
||||
SaveStatus::BufferOutdated => Some("!"),
|
||||
SaveStatus::Desynced => Some("!!"),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn save(&mut self, ctx: &Context, jobs: &mut Jobs) {
|
||||
match self {
|
||||
Tab::File(file_editor) => file_editor.save(ctx, jobs),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type TabId = usize;
|
||||
|
||||
pub enum Action {
|
||||
OpenFile(FileEditor),
|
||||
OpenFolder(Folder),
|
||||
MoveFile(TabId, PathBuf),
|
||||
CloseTab(TabId),
|
||||
// TODO
|
||||
//ShowError {
|
||||
// error: RichText
|
||||
//},
|
||||
}
|
||||
|
||||
impl Default for App {
|
||||
fn default() -> Self {
|
||||
let (actions_tx, actions_rx) = mpsc::channel();
|
||||
Self {
|
||||
preferences: Preferences::default(),
|
||||
actions_tx: actions_tx.clone(/* this is silly, i know */),
|
||||
actions_rx,
|
||||
jobs: Jobs {
|
||||
handles: Default::default(),
|
||||
actions_tx,
|
||||
},
|
||||
tabs: vec![(1, Tab::File(FileEditor::new("note.md")))],
|
||||
open_tab_index: None,
|
||||
next_tab_id: 2,
|
||||
show_folders: false,
|
||||
folders: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl App {
|
||||
/// Called once before the first frame.
|
||||
pub fn new(cc: &eframe::CreationContext<'_>) -> Self {
|
||||
let mut fonts = FontDefinitions::empty();
|
||||
fonts.font_data = [
|
||||
//(
|
||||
// "IosevkaAile-Thin",
|
||||
// include_bytes!("../fonts/IosevkaAile-Thin.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "IosevkaAile-ExtraLight",
|
||||
// include_bytes!("../fonts/IosevkaAile-ExtraLight.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "IosevkaAile-Light",
|
||||
// include_bytes!("../fonts/IosevkaAile-Light.ttc").as_slice(),
|
||||
//),
|
||||
(
|
||||
"IosevkaAile-Regular",
|
||||
include_bytes!("../fonts/IosevkaAile-Regular.ttc").as_slice(),
|
||||
),
|
||||
//(
|
||||
// "IosevkaAile-Medium",
|
||||
// include_bytes!("../fonts/IosevkaAile-Medium.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "IosevkaAile-Bold",
|
||||
// include_bytes!("../fonts/IosevkaAile-Bold.ttc").as_slice(),
|
||||
//),
|
||||
(
|
||||
"Iosevka-Thin",
|
||||
include_bytes!("../fonts/Iosevka-Thin.ttc").as_slice(),
|
||||
),
|
||||
//(
|
||||
// "Iosevka-ExtraLight",
|
||||
// include_bytes!("../fonts/Iosevka-ExtraLight.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "Iosevka-Light",
|
||||
// include_bytes!("../fonts/Iosevka-Light.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "Iosevka-Medium",
|
||||
// include_bytes!("../fonts/Iosevka-Medium.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "Iosevka-Regular",
|
||||
// include_bytes!("../fonts/Iosevka-Regular.ttc").as_slice(),
|
||||
//),
|
||||
//(
|
||||
// "Iosevka-Heavy",
|
||||
// include_bytes!("../fonts/Iosevka-Heavy.ttc").as_slice(),
|
||||
//),
|
||||
]
|
||||
.into_iter()
|
||||
.map(|(name, data)| (name.to_string(), Arc::new(FontData::from_static(data))))
|
||||
.collect();
|
||||
|
||||
fonts
|
||||
.families
|
||||
.insert(FontFamily::Proportional, vec!["IosevkaAile-Regular".into()]);
|
||||
|
||||
fonts
|
||||
.families
|
||||
.insert(FontFamily::Monospace, vec!["Iosevka-Thin".into()]);
|
||||
|
||||
cc.egui_ctx.set_fonts(fonts);
|
||||
|
||||
// markdown font styles
|
||||
for theme in [Theme::Dark, Theme::Light] {
|
||||
cc.egui_ctx.style_mut_of(theme, |style| {
|
||||
for (name, size, family) in [
|
||||
(H1, 28.0, FontFamily::Proportional),
|
||||
(H2, 26.0, FontFamily::Proportional),
|
||||
(H3, 24.0, FontFamily::Proportional),
|
||||
(H4, 22.0, FontFamily::Proportional),
|
||||
(H5, 20.0, FontFamily::Proportional),
|
||||
(H6, 18.0, FontFamily::Proportional),
|
||||
(H1_MONO, 28.0, FontFamily::Monospace),
|
||||
(H2_MONO, 26.0, FontFamily::Monospace),
|
||||
(H3_MONO, 24.0, FontFamily::Monospace),
|
||||
(H4_MONO, 22.0, FontFamily::Monospace),
|
||||
(H5_MONO, 20.0, FontFamily::Monospace),
|
||||
(H6_MONO, 18.0, FontFamily::Monospace),
|
||||
] {
|
||||
let name = egui::TextStyle::Name(name.into());
|
||||
style.text_styles.insert(name, FontId { size, family });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// enable features on egui_extras to add more image types
|
||||
egui_extras::install_image_loaders(&cc.egui_ctx);
|
||||
|
||||
if let Some(storage) = cc.storage {
|
||||
return eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default();
|
||||
}
|
||||
|
||||
Default::default()
|
||||
}
|
||||
|
||||
fn actions_tx(&self, ctx: &Context) -> GuiSender<Action> {
|
||||
GuiSender::new(self.actions_tx.clone(), ctx)
|
||||
}
|
||||
|
||||
fn handle_action(&mut self, action: 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) => {
|
||||
self.open_tab(Tab::File(file_editor));
|
||||
}
|
||||
Action::MoveFile(tab_id, new_path) => {
|
||||
let tab = self.tabs.iter_mut().find(|(id, _)| &tab_id == id);
|
||||
let Some((_, tab)) = tab else { return };
|
||||
let Tab::File(editor) = tab; // else { return };
|
||||
|
||||
editor.set_path(new_path);
|
||||
}
|
||||
Action::CloseTab(id) => {
|
||||
// TODO: check if the file is dirty and ask to save it first?
|
||||
self.tabs.retain(|(tab_id, _)| &id != tab_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl eframe::App for App {
|
||||
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
||||
eframe::set_value(storage, eframe::APP_KEY, self);
|
||||
}
|
||||
|
||||
fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
|
||||
self.preferences.apply(ctx);
|
||||
|
||||
self.jobs.handles.retain(|job| !job.is_finished());
|
||||
|
||||
while let Ok(action) = self.actions_rx.try_recv() {
|
||||
self.handle_action(action);
|
||||
}
|
||||
|
||||
if self.open_tab_index >= Some(self.tabs.len()) {
|
||||
self.open_tab_index = Some(self.tabs.len().saturating_sub(1));
|
||||
}
|
||||
|
||||
ctx.input_mut(|input| {
|
||||
if input.consume_key(Modifiers::CTRL, Key::S) {
|
||||
self.save_active_tab(ctx);
|
||||
}
|
||||
});
|
||||
|
||||
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
|
||||
egui::MenuBar::new().ui(ui, |ui| {
|
||||
// NOTE: no File->Quit on web pages!
|
||||
ui.menu_button("Menu ⚙", |ui| {
|
||||
ui.label(RichText::new("Action").weak());
|
||||
|
||||
if ui.button("New File").clicked() {
|
||||
let file = FileEditor::new("note.md");
|
||||
self.open_tab(Tab::File(file));
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
if ui.button("Open File").clicked() {
|
||||
self.jobs.start(ui.ctx(), move || {
|
||||
let file_path = rfd::FileDialog::new().pick_file()?;
|
||||
|
||||
let mut file = fs::File::open(&file_path)
|
||||
.inspect_err(|e| log::error!("Failed to open {file_path:?}: {e}"))
|
||||
.ok()?;
|
||||
|
||||
let mtime = log_error(eyre!("file_path:?"), || file_mtime(&file))?;
|
||||
|
||||
let mut text = String::new();
|
||||
file.read_to_string(&mut text)
|
||||
.inspect_err(|e| log::error!("Failed to read {file_path:?}: {e}"))
|
||||
.ok()?;
|
||||
|
||||
let editor = FileEditor::from_file(file_path, &text, mtime);
|
||||
Some(Action::OpenFile(editor))
|
||||
});
|
||||
}
|
||||
|
||||
if ui.button("Open Folder").clicked() {
|
||||
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
|
||||
.add_enabled(self.open_tab_index.is_some(), Button::new("Close File"))
|
||||
.clicked()
|
||||
{
|
||||
if let Some(i) = self.open_tab_index.take() {
|
||||
self.tabs.remove(i);
|
||||
}
|
||||
}
|
||||
|
||||
let can_save_file = self
|
||||
.open_tab_index
|
||||
.and_then(|i| self.tabs.get(i))
|
||||
.map(|(id, tab)| match tab {
|
||||
Tab::File(file_editor) => (*id, file_editor),
|
||||
})
|
||||
.and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor)))
|
||||
.is_some();
|
||||
|
||||
if ui.add_enabled(can_save_file, Button::new("Save")).clicked() {
|
||||
self.save_active_tab(ui.ctx());
|
||||
}
|
||||
|
||||
let open_file = self.open_tab_index.and_then(|i| self.tabs.get(i)).map(
|
||||
|(id, tab)| match tab {
|
||||
Tab::File(file_editor) => (*id, file_editor),
|
||||
},
|
||||
);
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
if ui
|
||||
.add_enabled(open_file.is_some(), Button::new("Save As"))
|
||||
.clicked()
|
||||
{
|
||||
let (tab_id, editor) =
|
||||
open_file.expect("We checked that open_file is_some");
|
||||
let text = editor.to_string();
|
||||
self.jobs.start(ui.ctx(), move || {
|
||||
let file_path = rfd::FileDialog::new().save_file()?;
|
||||
|
||||
fs::write(&file_path, text.as_bytes())
|
||||
.inspect_err(|e| log::error!("{e}"))
|
||||
.ok()?;
|
||||
|
||||
Some(Action::MoveFile(tab_id, file_path))
|
||||
});
|
||||
}
|
||||
|
||||
ui.add_space(8.0);
|
||||
|
||||
self.preferences.show(ui);
|
||||
|
||||
ui.add_space(8.0);
|
||||
|
||||
if cfg!(not(target_arch = "wasm32")) && ui.button("Quit").clicked() {
|
||||
ctx.send_viewport_cmd(egui::ViewportCommand::Close);
|
||||
}
|
||||
});
|
||||
|
||||
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);
|
||||
|
||||
ScrollArea::horizontal().show(ui, |ui| {
|
||||
for (i, (tab_id, tab)) in self.tabs.iter().enumerate() {
|
||||
let selected = self.open_tab_index == Some(i);
|
||||
let mut button = Button::new(tab.title()).selected(selected);
|
||||
|
||||
if let Some(symbol) = tab.notice_symbol() {
|
||||
button = button.right_text(RichText::new(symbol).strong())
|
||||
}
|
||||
|
||||
let response = ui.add(button);
|
||||
|
||||
if response.clicked() {
|
||||
self.open_tab_index = Some(i);
|
||||
} else if response.clicked_by(PointerButton::Secondary) {
|
||||
let _ = self.actions_tx(ui.ctx()).send(Action::CloseTab(*tab_id));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
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 mut file = fs::File::open(&file_path)
|
||||
.inspect_err(|e| {
|
||||
log::error!("Failed to open {file_path:?}: {e}")
|
||||
})
|
||||
.ok()?;
|
||||
|
||||
let mtime = log_error(eyre!("file_path:?"), || file_mtime(&file))?;
|
||||
|
||||
let mut text = String::new();
|
||||
file.read_to_string(&mut text)
|
||||
.inspect_err(|e| {
|
||||
log::error!("Failed to read {file_path:?}: {e}")
|
||||
})
|
||||
.ok()?;
|
||||
|
||||
let editor = FileEditor::from_file(file_path, &text, mtime);
|
||||
Some(Action::OpenFile(editor))
|
||||
});
|
||||
}
|
||||
|
||||
// delete on right-click
|
||||
!response.clicked_by(PointerButton::Secondary)
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
egui::CentralPanel::default()
|
||||
.frame(Frame {
|
||||
fill: ctx.style().visuals.window_fill(),
|
||||
..Frame::central_panel(&ctx.style())
|
||||
})
|
||||
.show(ctx, |ui| {
|
||||
if let Some(Tab::File(file_editor)) = self
|
||||
.open_tab_index
|
||||
.and_then(|i| self.tabs.get_mut(i))
|
||||
.map(|(_tab_id, tab)| tab)
|
||||
{
|
||||
file_editor.show(ui, &self.preferences);
|
||||
}
|
||||
|
||||
ui.with_layout(egui::Layout::bottom_up(Align::LEFT), |ui| {
|
||||
egui::warn_if_debug_build(ui);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl App {
|
||||
/// Figure out where we should insert the next tab.
|
||||
fn insert_tab_at(&self) -> usize {
|
||||
match self.open_tab_index {
|
||||
None => 0,
|
||||
Some(i) => (i + 1).min(self.tabs.len()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Open a [Tab].
|
||||
fn open_tab(&mut self, tab: Tab) {
|
||||
let i = self.insert_tab_at();
|
||||
let id = self.next_tab_id;
|
||||
self.next_tab_id += 1;
|
||||
self.tabs.insert(i, (id, tab));
|
||||
self.open_tab_index = Some(i);
|
||||
}
|
||||
|
||||
fn save_active_tab(&mut self, ctx: &Context) {
|
||||
let open_tab = self
|
||||
.open_tab_index
|
||||
.and_then(|i| self.tabs.get_mut(i))
|
||||
.map(|(_id, tab)| tab);
|
||||
|
||||
if let Some(open_tab) = open_tab {
|
||||
open_tab.save(ctx, &mut self.jobs);
|
||||
}
|
||||
}
|
||||
}
|
||||
1
src/constants.rs
Normal file
1
src/constants.rs
Normal file
@ -0,0 +1 @@
|
||||
pub const MAX_NOTE_WIDTH: f32 = 600.0;
|
||||
135
src/custom_code_block.rs
Normal file
135
src/custom_code_block.rs
Normal file
@ -0,0 +1,135 @@
|
||||
use std::{
|
||||
fmt::{self, Display, Write},
|
||||
iter,
|
||||
};
|
||||
|
||||
const TICKS: &str = "```";
|
||||
const NL_TICKS: &str = "\n```";
|
||||
|
||||
/// Wrap a [Display] in markdown code-block ticks ([TICKS])
|
||||
pub fn to_custom_code_block(key: &str, content: impl Display) -> String {
|
||||
let mut out = String::new();
|
||||
write_custom_code_block(&mut out, key, content).unwrap();
|
||||
out
|
||||
}
|
||||
|
||||
/// Wrap a [Display] in markdown code-block ticks ([TICKS])
|
||||
pub fn write_custom_code_block(mut w: impl Write, key: &str, content: impl Display) -> fmt::Result {
|
||||
write!(w, "{TICKS}{key}\n{content}\n{TICKS}")
|
||||
}
|
||||
|
||||
/// Try to unwrap a string from within markdown code-block ticks ([TICKS])
|
||||
pub fn try_from_custom_code_block<'a>(key: &str, code_block: &'a str) -> Option<&'a str> {
|
||||
code_block
|
||||
.trim()
|
||||
.strip_prefix(TICKS)?
|
||||
.strip_prefix(key)?
|
||||
.strip_prefix("\n")?
|
||||
.strip_suffix(TICKS)?
|
||||
.strip_suffix("\n")
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum MdItem<'a> {
|
||||
/// A line of regular markdown, but not a code block.
|
||||
Line(&'a str),
|
||||
|
||||
/// A markdown code block
|
||||
CodeBlock {
|
||||
/// The key or language of the code block.
|
||||
key: &'a str,
|
||||
|
||||
/// Everything in-between the ticks.
|
||||
content: &'a str,
|
||||
|
||||
/// The entire code-block, including ticks.
|
||||
span: &'a str,
|
||||
},
|
||||
}
|
||||
|
||||
/// Iterate over code-blocks in a markdown string
|
||||
pub fn iter_lines_and_code_blocks(mut md: &str) -> impl Iterator<Item = MdItem<'_>> {
|
||||
iter::from_fn(move || {
|
||||
if md.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
if !md.starts_with(TICKS) {
|
||||
// line does not start with ticks, return a normal line.
|
||||
let line;
|
||||
if let Some(i) = md.find('\n') {
|
||||
let i = i + 1;
|
||||
line = &md[..i];
|
||||
md = &md[i..];
|
||||
} else {
|
||||
line = md;
|
||||
md = "";
|
||||
}
|
||||
return Some(MdItem::Line(line));
|
||||
}
|
||||
|
||||
let mut i = TICKS.len();
|
||||
let from_key = &md[i..];
|
||||
|
||||
let Some((key, from_content)) = from_key.split_once('\n') else {
|
||||
// no more newlines, return the remaining string as the final line.
|
||||
let rest = md;
|
||||
md = "";
|
||||
return Some(MdItem::Line(rest));
|
||||
};
|
||||
i += key.len() + "\n".len();
|
||||
|
||||
let Some(end) = from_content.find(NL_TICKS) else {
|
||||
// no closing ticks, return a line instead.
|
||||
let line;
|
||||
if let Some(i) = md.find('\n') {
|
||||
let i = i + 1;
|
||||
line = &md[..i];
|
||||
md = &md[i..];
|
||||
} else {
|
||||
line = md;
|
||||
md = "";
|
||||
}
|
||||
return Some(MdItem::Line(line));
|
||||
};
|
||||
let content = &from_content[..end];
|
||||
i += end + NL_TICKS.len();
|
||||
|
||||
if md[i..].starts_with("\n") {
|
||||
i += 1;
|
||||
};
|
||||
let span = &md[..i];
|
||||
md = &md[i..];
|
||||
|
||||
Some(MdItem::CodeBlock { key, content, span })
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::iter_lines_and_code_blocks;
|
||||
|
||||
#[test]
|
||||
fn iter_markdown() {
|
||||
let markdown = r#"
|
||||
# Hello world
|
||||
## Subheader
|
||||
- 1
|
||||
```foo
|
||||
whatever
|
||||
some code
|
||||
Hi mom!
|
||||
```
|
||||
|
||||
```` # wrong number of ticks, but that's ok
|
||||
``` # indented ticks
|
||||
```
|
||||
|
||||
``` # no closing ticks
|
||||
"#;
|
||||
|
||||
let list: Vec<_> = iter_lines_and_code_blocks(markdown).collect();
|
||||
insta::assert_snapshot!(markdown);
|
||||
insta::assert_debug_snapshot!(list);
|
||||
}
|
||||
}
|
||||
546
src/file_editor.rs
Normal file
546
src/file_editor.rs
Normal file
@ -0,0 +1,546 @@
|
||||
use std::{
|
||||
cmp::Ordering,
|
||||
fmt::{self, Display},
|
||||
fs::{self, File},
|
||||
io::Write,
|
||||
ops::{Div as _, Sub as _},
|
||||
path::{Path, PathBuf},
|
||||
str::FromStr,
|
||||
sync::mpsc,
|
||||
};
|
||||
|
||||
use chrono::{DateTime, Local};
|
||||
use egui::{
|
||||
Align, Button, Context, DragAndDrop, Frame, Layout, ScrollArea, Ui, UiBuilder, Vec2, vec2,
|
||||
};
|
||||
use eyre::eyre;
|
||||
use notify::{EventKind, Watcher};
|
||||
|
||||
use crate::{
|
||||
app::Jobs,
|
||||
custom_code_block::{MdItem, iter_lines_and_code_blocks},
|
||||
handwriting::{self, Handwriting, HandwritingStyle},
|
||||
preferences::Preferences,
|
||||
text_editor::MdTextEdit,
|
||||
util::{file_mtime, log_error},
|
||||
};
|
||||
|
||||
#[derive(serde::Deserialize, serde::Serialize)]
|
||||
pub struct FileEditor {
|
||||
title: String,
|
||||
|
||||
path: Option<PathBuf>,
|
||||
pub buffer: Vec<BufferItem>,
|
||||
|
||||
pub file_mtime: Option<DateTime<Local>>,
|
||||
pub buffer_mtime: DateTime<Local>,
|
||||
|
||||
// TODO: instantiate these on load
|
||||
#[serde(skip)]
|
||||
inner: Option<Inner>,
|
||||
|
||||
/// The distance to scroll when paging up or down.
|
||||
///
|
||||
/// This is calculated when the view is rendered.
|
||||
#[serde(skip)]
|
||||
scroll_delta: f32,
|
||||
|
||||
/// Whether the file has been edited since it was last saved to disk.
|
||||
is_dirty: bool,
|
||||
}
|
||||
|
||||
struct Inner {
|
||||
file_events: mpsc::Receiver<FileEvent>,
|
||||
file_events_tx: mpsc::Sender<FileEvent>,
|
||||
_file_watcher: notify::RecommendedWatcher,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum SaveStatus {
|
||||
/// The contents of the buffer is the same as on disk.
|
||||
Synced,
|
||||
|
||||
/// The contents exits only in memory and has never been saved to disk.
|
||||
NoFile,
|
||||
|
||||
/// The buffer has been edited but not saved to disk.
|
||||
FileOutdated,
|
||||
|
||||
/// The contents on disk has changes that are newer than the buffer.
|
||||
BufferOutdated,
|
||||
|
||||
/// The contents on disk and in the buffer has diverged.
|
||||
Desynced,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum FileEvent {
|
||||
NewFileMTime(DateTime<Local>),
|
||||
NewBufferMTime(DateTime<Local>),
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize, serde::Serialize)]
|
||||
pub enum BufferItem {
|
||||
Text(Box<MdTextEdit>),
|
||||
Handwriting(Box<Handwriting>),
|
||||
}
|
||||
|
||||
impl FileEditor {
|
||||
pub fn new(title: impl Into<String>) -> Self {
|
||||
let buffer = vec![BufferItem::Text(Box::new(MdTextEdit::new()))];
|
||||
Self {
|
||||
title: title.into(),
|
||||
path: None,
|
||||
buffer,
|
||||
file_mtime: None,
|
||||
buffer_mtime: Local::now(),
|
||||
scroll_delta: 0.0,
|
||||
is_dirty: false,
|
||||
inner: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_file(file_path: PathBuf, contents: &str, mtime: DateTime<Local>) -> Self {
|
||||
let file_title = file_path
|
||||
.file_name()
|
||||
.map(|name| name.to_string_lossy().to_string())
|
||||
.unwrap_or_else(|| String::from("untitled.md"));
|
||||
|
||||
Self {
|
||||
title: file_title,
|
||||
path: Some(file_path),
|
||||
file_mtime: Some(mtime),
|
||||
buffer_mtime: mtime,
|
||||
..FileEditor::from(contents)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn title(&self) -> &str {
|
||||
&self.title
|
||||
}
|
||||
|
||||
pub fn path(&self) -> Option<&Path> {
|
||||
self.path.as_deref()
|
||||
}
|
||||
|
||||
pub fn save_status(&self) -> SaveStatus {
|
||||
let Some(file_mtime) = self.file_mtime else {
|
||||
return SaveStatus::NoFile;
|
||||
};
|
||||
|
||||
let buffer_is_newer = self.buffer_mtime > file_mtime;
|
||||
let file_is_newer = self.buffer_mtime < file_mtime;
|
||||
|
||||
if buffer_is_newer || (file_is_newer && self.is_dirty) {
|
||||
SaveStatus::Desynced
|
||||
} else if file_is_newer {
|
||||
SaveStatus::BufferOutdated
|
||||
} else if self.is_dirty {
|
||||
SaveStatus::FileOutdated
|
||||
} else {
|
||||
SaveStatus::Synced
|
||||
}
|
||||
}
|
||||
|
||||
pub fn show(&mut self, ui: &mut Ui, preferences: &Preferences) {
|
||||
if let Some(path) = &self.path
|
||||
&& self.inner.is_none()
|
||||
{
|
||||
self.inner = Some(spawn_file_watcher(path));
|
||||
}
|
||||
|
||||
if let Some(inner) = &mut self.inner {
|
||||
while let Ok(event) = inner.file_events.try_recv() {
|
||||
match event {
|
||||
FileEvent::NewFileMTime(mtime) => {
|
||||
self.file_mtime = Some(mtime);
|
||||
}
|
||||
FileEvent::NewBufferMTime(mtime) => {
|
||||
self.buffer_mtime = mtime;
|
||||
self.file_mtime = Some(mtime);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ui.vertical_centered_justified(|ui| {
|
||||
ui.heading(&self.title);
|
||||
|
||||
const MAX_NOTE_WIDTH: f32 = 600.0;
|
||||
|
||||
// distance to scroll when paging up or down.
|
||||
let mut scroll_delta = 0.0;
|
||||
|
||||
ui.input_mut(|input| {
|
||||
if input.consume_key(egui::Modifiers::NONE, egui::Key::PageUp) {
|
||||
scroll_delta += self.scroll_delta;
|
||||
}
|
||||
if input.consume_key(egui::Modifiers::NONE, egui::Key::PageDown) {
|
||||
scroll_delta -= self.scroll_delta;
|
||||
}
|
||||
});
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
ui.label("new");
|
||||
if ui.button(" text ").clicked() {
|
||||
self.is_dirty = true;
|
||||
self.buffer.push(BufferItem::Text(Default::default()));
|
||||
}
|
||||
if ui.button("writing").clicked() {
|
||||
self.is_dirty = true;
|
||||
self.buffer
|
||||
.push(BufferItem::Handwriting(Default::default()));
|
||||
}
|
||||
|
||||
ui.add_space(16.0);
|
||||
|
||||
ui.label("scroll");
|
||||
if ui.button(" up ").clicked() {
|
||||
scroll_delta += self.scroll_delta;
|
||||
}
|
||||
if ui.button("down").clicked() {
|
||||
scroll_delta -= self.scroll_delta;
|
||||
}
|
||||
});
|
||||
|
||||
let scroll_area = ScrollArea::vertical().show(ui, |ui| {
|
||||
if scroll_delta != 0.0 {
|
||||
ui.scroll_with_delta(Vec2::new(0.0, scroll_delta));
|
||||
}
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
let side_padding = ui.available_width().sub(MAX_NOTE_WIDTH).max(0.0).div(2.0);
|
||||
ui.add_space(side_padding);
|
||||
ui.vertical(|ui| {
|
||||
ui.set_max_width(MAX_NOTE_WIDTH);
|
||||
self.show_contents(ui, preferences);
|
||||
});
|
||||
ui.add_space(side_padding);
|
||||
});
|
||||
});
|
||||
|
||||
self.scroll_delta = scroll_area.inner_rect.height() * 0.5;
|
||||
});
|
||||
}
|
||||
|
||||
fn show_contents(&mut self, ui: &mut Ui, preferences: &Preferences) {
|
||||
if self.buffer.is_empty() {
|
||||
self.buffer.push(BufferItem::Text(Default::default()));
|
||||
}
|
||||
|
||||
struct DraggingItem {
|
||||
index: usize,
|
||||
}
|
||||
|
||||
let mut drop_from_to: Option<(usize, usize)> = None;
|
||||
let is_dragging = DragAndDrop::has_payload_of_type::<DraggingItem>(ui.ctx());
|
||||
let drag_zone_height = 10.0;
|
||||
|
||||
// Iterate over buffer items using `retain` so that we can handle deletions
|
||||
let mut i = 0usize..;
|
||||
let len = self.buffer.len();
|
||||
self.buffer.retain_mut(|item| {
|
||||
let i = i.next().unwrap();
|
||||
let is_first = i == 0;
|
||||
let is_last = i == len - 1;
|
||||
|
||||
let mut retain = true;
|
||||
|
||||
// Createa horizontal area to draw the buffer item. The three things drawn here are:
|
||||
// - The controls that exist at the left-size of the buffer item, i.e. "up"/"down".
|
||||
// - The buffer item.
|
||||
// - The controls that exist at the right-size of the buffer item, i.e. "delete".
|
||||
ui.horizontal(|ui| {
|
||||
// At this point, we don't know how tall the buffer item will be, so we'll reserve
|
||||
// some horizontal space here and come back to drawing the controls later.
|
||||
let (_id, mut left_controls_rect) = ui.allocate_space(Vec2::new(20.0, 1.0));
|
||||
|
||||
// Leave some space at the end for the delete button.
|
||||
let w = ui.available_width();
|
||||
let item_size = Vec2::new(w - 20.0, 0.0);
|
||||
|
||||
let item_response = ui.allocate_ui(item_size, |ui| match item {
|
||||
BufferItem::Text(text_edit) => {
|
||||
if text_edit.ui(ui).changed {
|
||||
self.is_dirty = true;
|
||||
}
|
||||
}
|
||||
BufferItem::Handwriting(handwriting) => {
|
||||
let style = HandwritingStyle {
|
||||
animate: preferences.animations,
|
||||
hide_cursor: preferences.hide_handwriting_cursor,
|
||||
..HandwritingStyle::from_theme(ui.ctx().theme())
|
||||
};
|
||||
if handwriting.ui(&style, ui).changed {
|
||||
self.is_dirty = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Delete-button
|
||||
if ui.button("⌫").clicked() {
|
||||
retain = false;
|
||||
ui.ctx().request_repaint();
|
||||
}
|
||||
|
||||
left_controls_rect.set_height(item_response.response.rect.height());
|
||||
|
||||
// Controls for moving the buffer item
|
||||
ui.scope_builder(
|
||||
UiBuilder::new()
|
||||
.max_rect(left_controls_rect)
|
||||
.layout(Layout::top_down(Align::Center)),
|
||||
|ui| {
|
||||
let up_button_response = ui.add_enabled(!is_first, Button::new("⇡"));
|
||||
if up_button_response.clicked() {
|
||||
drop_from_to = Some((i, i - 1));
|
||||
}
|
||||
|
||||
// Add some space so that the next button is drawn
|
||||
// at the bottom of the buffer item.
|
||||
ui.add_space(
|
||||
left_controls_rect.height()
|
||||
- (up_button_response.rect.height() * 2.0 + 4.0),
|
||||
);
|
||||
|
||||
if ui.add_enabled(!is_last, Button::new("⇣")).clicked() {
|
||||
drop_from_to = Some((i, i + 2));
|
||||
}
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
retain
|
||||
});
|
||||
|
||||
if is_dragging {
|
||||
let (_, drop) = ui.dnd_drop_zone::<DraggingItem, _>(Frame::NONE, |ui| {
|
||||
ui.set_min_size(vec2(ui.available_width(), drag_zone_height));
|
||||
});
|
||||
if let Some(drop) = drop {
|
||||
drop_from_to = Some((drop.index, self.buffer.len()));
|
||||
}
|
||||
} else {
|
||||
// the dnd_drop_zone adds 3.0pts work of extra space
|
||||
ui.add_space(drag_zone_height + 3.0);
|
||||
}
|
||||
|
||||
// Handle drag-and-dropping buffer items
|
||||
// TODO: make sure nothing was removed from self.buffer this frame
|
||||
if let Some((from, to)) = drop_from_to {
|
||||
if from < self.buffer.len() {
|
||||
match from.cmp(&to) {
|
||||
Ordering::Greater => {
|
||||
let item = self.buffer.remove(from);
|
||||
self.buffer.insert(to, item);
|
||||
self.is_dirty = true;
|
||||
}
|
||||
Ordering::Less => {
|
||||
let item = self.buffer.remove(from);
|
||||
self.buffer.insert(to - 1, item);
|
||||
self.is_dirty = true;
|
||||
}
|
||||
Ordering::Equal => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_path(&mut self, new_path: PathBuf) {
|
||||
let Some(title) = new_path.file_name() else {
|
||||
log::error!("No filename in path {new_path:?}");
|
||||
return;
|
||||
};
|
||||
self.title = title.to_string_lossy().to_string();
|
||||
self.path = Some(new_path);
|
||||
}
|
||||
|
||||
pub fn set_dirty(&mut self, value: bool) {
|
||||
self.is_dirty = value;
|
||||
}
|
||||
|
||||
pub fn save(&mut self, ctx: &Context, jobs: &mut Jobs) {
|
||||
let Some(file_path) = self.path.clone() else {
|
||||
log::info!("Can't save {}, no path set.", self.title);
|
||||
return;
|
||||
};
|
||||
|
||||
self.is_dirty = false;
|
||||
let text = self.to_string();
|
||||
let inner = self
|
||||
.inner
|
||||
.get_or_insert_with(|| spawn_file_watcher(&file_path));
|
||||
let file_event_tx = inner.file_events_tx.clone();
|
||||
|
||||
jobs.start(ctx, move || {
|
||||
log_error(eyre!("Failed to save file {file_path:?}"), || {
|
||||
let mut file = fs::File::create(file_path)?;
|
||||
file.write_all(text.as_bytes())?;
|
||||
let mtime = file_mtime(&file)?;
|
||||
|
||||
let _ = file_event_tx.send(FileEvent::NewBufferMTime(mtime));
|
||||
|
||||
Ok(())
|
||||
});
|
||||
|
||||
None
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for BufferItem {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
match self {
|
||||
BufferItem::Text(md_text_edit) => Display::fmt(md_text_edit, f),
|
||||
BufferItem::Handwriting(handwriting) => Display::fmt(handwriting, f),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for FileEditor {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
let mut first = true;
|
||||
for item in &self.buffer {
|
||||
if !first {
|
||||
writeln!(f)?;
|
||||
}
|
||||
|
||||
first = false;
|
||||
|
||||
write!(f, "{item}")?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&str> for FileEditor {
|
||||
fn from(s: &str) -> Self {
|
||||
let mut editor = FileEditor::new("note.md");
|
||||
let buffer = &mut editor.buffer;
|
||||
|
||||
let push_text = |buffer: &mut Vec<BufferItem>, text| match buffer.last_mut() {
|
||||
Some(BufferItem::Text(text_edit)) => text_edit.text.push_str(text),
|
||||
_ => {
|
||||
let mut text_edit = MdTextEdit::new();
|
||||
text_edit.text.push_str(text);
|
||||
buffer.push(BufferItem::Text(Box::new(text_edit)));
|
||||
}
|
||||
};
|
||||
|
||||
for item in iter_lines_and_code_blocks(s) {
|
||||
match item {
|
||||
MdItem::Line(line) => push_text(buffer, line),
|
||||
MdItem::CodeBlock { key, content, span } => match key {
|
||||
handwriting::CODE_BLOCK_KEY => match Handwriting::from_str(span) {
|
||||
Ok(handwriting) => {
|
||||
if let Some(BufferItem::Text(text_edit)) = buffer.last_mut() {
|
||||
if text_edit.text.ends_with('\n') {
|
||||
text_edit.text.pop();
|
||||
if text_edit.text.is_empty() {
|
||||
buffer.pop();
|
||||
}
|
||||
}
|
||||
};
|
||||
buffer.push(BufferItem::Handwriting(Box::new(handwriting)))
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Failed to decode handwriting {content:?}: {e}");
|
||||
push_text(buffer, span);
|
||||
}
|
||||
},
|
||||
_ => push_text(buffer, span),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
editor
|
||||
}
|
||||
}
|
||||
|
||||
fn spawn_file_watcher(p: &Path) -> Inner {
|
||||
let (tx, rx) = mpsc::channel();
|
||||
|
||||
let path = p.to_owned();
|
||||
let events_tx = tx.clone();
|
||||
let mut watcher = notify::recommended_watcher(move |event: notify::Result<notify::Event>| {
|
||||
log_error(eyre!("watch {path:?} error"), || {
|
||||
match event?.kind {
|
||||
EventKind::Create(..) | EventKind::Modify(..) | EventKind::Remove(..) => {}
|
||||
|
||||
EventKind::Access(..) | EventKind::Any | EventKind::Other => return Ok(()),
|
||||
}
|
||||
|
||||
let file = File::open(&path)?;
|
||||
let mtime = file_mtime(&file)?;
|
||||
|
||||
let _ = events_tx.send(FileEvent::NewFileMTime(mtime));
|
||||
|
||||
Ok(())
|
||||
});
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
if let Err(e) = watcher.watch(p, notify::RecursiveMode::NonRecursive) {
|
||||
log::error!("Failed to watch {p:?}: {e}");
|
||||
};
|
||||
|
||||
Inner {
|
||||
file_events: rx,
|
||||
file_events_tx: tx,
|
||||
_file_watcher: watcher,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
|
||||
use crate::file_editor::BufferItem;
|
||||
|
||||
use super::FileEditor;
|
||||
|
||||
#[test]
|
||||
fn from_str_and_back_1() {
|
||||
let markdown = r#"
|
||||
# Hello world!
|
||||
|
||||
This is some text.
|
||||
Here's some handwriting:
|
||||
```handwriting
|
||||
DgB0UUlNeFFJTX9RUE2pUYZNDlIATotSjk4AUwxPaFODT89T608UVBtQL1QqUDtULlBDVDFQSVQuUA==
|
||||
```
|
||||
|
||||
And here's some more text :D
|
||||
```
|
||||
with a regular code-block!
|
||||
```"#;
|
||||
|
||||
println!("{markdown}");
|
||||
println!();
|
||||
println!();
|
||||
println!("{markdown:?}");
|
||||
println!();
|
||||
println!();
|
||||
|
||||
let file_editor = FileEditor::from(markdown);
|
||||
|
||||
for item in &file_editor.buffer {
|
||||
match item {
|
||||
BufferItem::Text(md_text_edit) => {
|
||||
println!("{:?}", md_text_edit.text);
|
||||
}
|
||||
BufferItem::Handwriting(_) => {
|
||||
println!("<handwriting>");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
println!();
|
||||
println!();
|
||||
|
||||
let serialized = file_editor.to_string();
|
||||
assert_eq!(
|
||||
markdown, serialized,
|
||||
"FileEditor should preserve formatting"
|
||||
);
|
||||
}
|
||||
}
|
||||
272
src/folder.rs
Normal file
272
src/folder.rs
Normal file
@ -0,0 +1,272 @@
|
||||
use std::{
|
||||
fs::read_dir,
|
||||
mem,
|
||||
ops::Deref,
|
||||
path::{Path, PathBuf},
|
||||
sync::mpsc,
|
||||
thread,
|
||||
};
|
||||
|
||||
use egui::{Button, Color32, Response, Stroke, TextWrapMode, Ui, Vec2, Widget};
|
||||
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 draw_highlight = |ui: &mut Ui, rect| {
|
||||
ui.painter().rect(
|
||||
rect,
|
||||
2.0,
|
||||
if ui.visuals().dark_mode {
|
||||
Color32::from_white_alpha(16)
|
||||
} else {
|
||||
Color32::from_black_alpha(16)
|
||||
},
|
||||
Stroke::NONE,
|
||||
egui::StrokeKind::Outside,
|
||||
);
|
||||
};
|
||||
|
||||
let inner = ui
|
||||
.collapsing(&self.name, |ui| {
|
||||
for folder in &mut self.child_folders {
|
||||
open_file = open_file.or(folder.show(ui).open_file);
|
||||
}
|
||||
|
||||
let w = ui.available_width();
|
||||
|
||||
let mut first = true;
|
||||
|
||||
for file in &mut self.child_files {
|
||||
if !first {
|
||||
ui.add_space(2.0);
|
||||
}
|
||||
first = false;
|
||||
|
||||
let button = Button::new(&file.name)
|
||||
.min_size(Vec2::new(w, 0.0))
|
||||
.wrap_mode(TextWrapMode::Truncate)
|
||||
.frame(false)
|
||||
.corner_radius(0.0)
|
||||
.ui(ui);
|
||||
|
||||
if button.hovered() {
|
||||
draw_highlight(ui, button.rect);
|
||||
}
|
||||
|
||||
if button.clicked() {
|
||||
open_file = Some(file.path.as_path())
|
||||
};
|
||||
}
|
||||
})
|
||||
.header_response;
|
||||
|
||||
if inner.hovered() {
|
||||
draw_highlight(ui, inner.rect);
|
||||
}
|
||||
|
||||
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() {
|
||||
if filter_file(&name) {
|
||||
child_files.push(File { name, path });
|
||||
}
|
||||
} else if file_type.is_dir() {
|
||||
if filter_folder(&name) {
|
||||
child_folders.push(Folder::NotLoaded { name, path });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
child_folders.sort_by_key(|folder| folder.name().to_owned());
|
||||
child_files.sort_by_key(|file| (!file.name.ends_with(".md"), file.name.clone()));
|
||||
|
||||
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 })
|
||||
}
|
||||
}
|
||||
|
||||
fn filter_folder(_folder_name: &str) -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn filter_file(file_name: &str) -> bool {
|
||||
file_name != ".DS_Store"
|
||||
}
|
||||
3
src/handwriting/advanced-example.md
Normal file
3
src/handwriting/advanced-example.md
Normal file
File diff suppressed because one or more lines are too long
176
src/handwriting/canvas_rasterizer.rs
Normal file
176
src/handwriting/canvas_rasterizer.rs
Normal file
@ -0,0 +1,176 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use egui::{
|
||||
Color32, ColorImage, CornerRadius, Painter, Pos2, Rect, Stroke, StrokeKind, TextureHandle,
|
||||
Vec2,
|
||||
ahash::HashMap,
|
||||
emath::TSTransform,
|
||||
epaint::{Brush, RectShape, Vertex},
|
||||
load::SizedTexture,
|
||||
};
|
||||
|
||||
use crate::rasterizer::{PxBoundingBox, rasterize_triangle_onto, triangle_bounding_box};
|
||||
|
||||
use super::StrokeBlendMode;
|
||||
|
||||
const CHUNK_SIZE: usize = 64;
|
||||
|
||||
/// Rasterize onto a resizeable canvas.
|
||||
#[derive(Default)]
|
||||
pub struct CanvasRasterizer {
|
||||
image_size: [usize; 2],
|
||||
tiles: HashMap<[usize; 2], Tile>,
|
||||
}
|
||||
|
||||
struct Tile {
|
||||
bounding_box: PxBoundingBox,
|
||||
image: ColorImage,
|
||||
texture: Option<TextureHandle>,
|
||||
texture_is_dirty: bool,
|
||||
}
|
||||
|
||||
impl Tile {
|
||||
fn new(xi: usize, yi: usize) -> Self {
|
||||
let x_from = xi * CHUNK_SIZE;
|
||||
let y_from = yi * CHUNK_SIZE;
|
||||
let bounding_box = PxBoundingBox {
|
||||
x_from,
|
||||
y_from,
|
||||
x_to: x_from + CHUNK_SIZE,
|
||||
y_to: y_from + CHUNK_SIZE,
|
||||
};
|
||||
|
||||
Self {
|
||||
bounding_box,
|
||||
image: ColorImage::filled([CHUNK_SIZE, CHUNK_SIZE], Color32::TRANSPARENT),
|
||||
texture: None,
|
||||
texture_is_dirty: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CanvasRasterizer {
|
||||
pub fn set_size(&mut self, width: usize, height: usize) {
|
||||
self.image_size = [width, height];
|
||||
self.populate_tiles();
|
||||
}
|
||||
|
||||
pub fn clear(&mut self) {
|
||||
log::debug!("clearing all tiles");
|
||||
self.tiles.clear();
|
||||
self.populate_tiles();
|
||||
}
|
||||
|
||||
fn populate_tiles(&mut self) {
|
||||
let [width, height] = self.image_size;
|
||||
|
||||
// discard tiles that are out of bounds
|
||||
self.tiles.retain(|_, tile| {
|
||||
tile.bounding_box.x_from <= width && tile.bounding_box.y_from <= height
|
||||
});
|
||||
|
||||
let chunk = |max: usize| {
|
||||
(0..)
|
||||
.step_by(CHUNK_SIZE)
|
||||
.take_while(move |n| n <= &max)
|
||||
.enumerate()
|
||||
};
|
||||
|
||||
// create new tiles where we need them
|
||||
for (xi, _x) in chunk(width) {
|
||||
for (yi, _y) in chunk(height) {
|
||||
self.tiles
|
||||
.entry([xi, yi])
|
||||
.or_insert_with(|| Tile::new(xi, yi));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn rasterize<'a>(
|
||||
&mut self,
|
||||
point_to_pixel: TSTransform,
|
||||
triangles: impl Iterator<Item = [&'a Vertex; 3]> + Clone,
|
||||
) {
|
||||
for triangle in triangles {
|
||||
let triangle_bounding_box = triangle_bounding_box(&triangle, point_to_pixel);
|
||||
for chunk in chunks_from_bounding_box(triangle_bounding_box) {
|
||||
let Some(tile) = self.tiles.get_mut(&chunk) else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let mut point_to_tile_pixel = point_to_pixel;
|
||||
point_to_tile_pixel.translation -= Vec2::new(
|
||||
tile.bounding_box.x_from as f32,
|
||||
tile.bounding_box.y_from as f32,
|
||||
);
|
||||
|
||||
tile.texture_is_dirty = true;
|
||||
rasterize_triangle_onto::<StrokeBlendMode>(
|
||||
&mut tile.image,
|
||||
point_to_tile_pixel,
|
||||
triangle,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `at` defines the location in screen-coordinates where the canvas should be drawn.
|
||||
pub fn show(&mut self, ctx: &egui::Context, painter: &Painter, at: Rect) {
|
||||
let pixels_per_point = ctx.pixels_per_point();
|
||||
let chunk_vec = Vec2::splat(CHUNK_SIZE as f32) / pixels_per_point;
|
||||
|
||||
for ([xi, yi], tile) in &mut self.tiles {
|
||||
if tile.texture_is_dirty {
|
||||
tile.texture_is_dirty = false;
|
||||
if let Some(texture) = &mut tile.texture {
|
||||
texture.set(tile.image.clone(), Default::default());
|
||||
} else {
|
||||
tile.texture = Some(ctx.load_texture(
|
||||
"handwriting",
|
||||
tile.image.clone(),
|
||||
Default::default(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(texture) = &mut tile.texture {
|
||||
let texture = SizedTexture::new(texture.id(), texture.size_vec2());
|
||||
let shape = RectShape {
|
||||
rect: Rect::from_min_size(
|
||||
at.min + Vec2::new(*xi as f32, *yi as f32) * chunk_vec,
|
||||
chunk_vec,
|
||||
),
|
||||
corner_radius: CornerRadius::ZERO,
|
||||
fill: Color32::WHITE,
|
||||
stroke: Stroke::NONE,
|
||||
stroke_kind: StrokeKind::Inside,
|
||||
round_to_pixels: None,
|
||||
blur_width: 0.0,
|
||||
brush: Some(Arc::new(Brush {
|
||||
fill_texture_id: texture.id,
|
||||
uv: Rect {
|
||||
min: Pos2::ZERO,
|
||||
max: Pos2::new(1.0, 1.0),
|
||||
},
|
||||
})),
|
||||
};
|
||||
painter.add(shape);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Get all chunk indices that overlaps with a PxBoundingBox.
|
||||
fn chunks_from_bounding_box(
|
||||
triangle_bounding_box: PxBoundingBox,
|
||||
) -> impl Iterator<Item = [usize; 2]> {
|
||||
let x_from_chunk = triangle_bounding_box.x_from / CHUNK_SIZE;
|
||||
let y_from_chunk = triangle_bounding_box.y_from / CHUNK_SIZE;
|
||||
let x_to_chunk = triangle_bounding_box.x_to.saturating_sub(1) / CHUNK_SIZE;
|
||||
let y_to_chunk = triangle_bounding_box.y_to.saturating_sub(1) / CHUNK_SIZE;
|
||||
|
||||
let xs = x_from_chunk..=x_to_chunk;
|
||||
let ys = y_from_chunk..=y_to_chunk;
|
||||
|
||||
ys.flat_map(move |yi| xs.clone().map(move |xi| [xi, yi]))
|
||||
}
|
||||
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)
|
||||
}
|
||||
}
|
||||
987
src/handwriting/mod.rs
Normal file
987
src/handwriting/mod.rs
Normal file
@ -0,0 +1,987 @@
|
||||
mod canvas_rasterizer;
|
||||
mod disk_format;
|
||||
mod tool;
|
||||
|
||||
use std::{
|
||||
fmt::{self, Display},
|
||||
iter, mem,
|
||||
str::FromStr,
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use arboard::Clipboard;
|
||||
use base64::{Engine, prelude::BASE64_STANDARD};
|
||||
use canvas_rasterizer::CanvasRasterizer;
|
||||
use disk_format::{DiskFormat, RawStroke, RawStrokeHeader, f16_le};
|
||||
use egui::{
|
||||
Color32, Event, Frame, Id, Mesh, PointerButton, Pos2, Rect, Sense, Shape, Stroke, Theme, Ui,
|
||||
Vec2,
|
||||
emath::{self, RectTransform, TSTransform},
|
||||
epaint::{TessellationOptions, Tessellator, Vertex},
|
||||
};
|
||||
use eyre::{Context, bail};
|
||||
use eyre::{OptionExt, eyre};
|
||||
use half::f16;
|
||||
use zerocopy::{FromBytes, IntoBytes};
|
||||
|
||||
use crate::{custom_code_block::try_from_custom_code_block, rasterizer};
|
||||
use crate::{custom_code_block::write_custom_code_block, util::random_id};
|
||||
|
||||
use self::tool::{Tool, ToolEvent};
|
||||
|
||||
const HANDWRITING_MIN_HEIGHT: f32 = 100.0;
|
||||
const HANDWRITING_BOTTOM_PADDING: f32 = 80.0;
|
||||
const HANDWRITING_MARGIN: f32 = 0.05;
|
||||
const HANDWRITING_LINE_SPACING: f32 = 36.0;
|
||||
|
||||
pub const CODE_BLOCK_KEY: &str = "handwriting";
|
||||
|
||||
type StrokeBlendMode = rasterizer::blend::Normal;
|
||||
|
||||
const TESSELLATION_OPTIONS: TessellationOptions = TessellationOptions {
|
||||
feathering: true,
|
||||
feathering_size_in_pixels: 1.0,
|
||||
coarse_tessellation_culling: true,
|
||||
prerasterized_discs: true,
|
||||
round_text_to_pixels: true,
|
||||
round_line_segments_to_pixels: true,
|
||||
round_rects_to_pixels: true,
|
||||
debug_paint_text_rects: false,
|
||||
debug_paint_clip_rects: false,
|
||||
debug_ignore_clip_rects: false,
|
||||
bezier_tolerance: 0.1,
|
||||
epsilon: 1.0e-5,
|
||||
parallel_tessellation: true,
|
||||
validate_meshes: false,
|
||||
};
|
||||
|
||||
pub struct HandwritingStyle {
|
||||
pub stroke: Stroke,
|
||||
pub bg_line_stroke: Stroke,
|
||||
pub bg_color: Color32,
|
||||
pub animate: bool,
|
||||
pub hide_cursor: bool,
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize, serde::Serialize)]
|
||||
#[serde(default)]
|
||||
pub struct Handwriting {
|
||||
strokes: Vec<Vec<Pos2>>,
|
||||
|
||||
height: f32,
|
||||
desired_height: f32,
|
||||
|
||||
#[serde(skip)]
|
||||
e: Ephemeral,
|
||||
}
|
||||
|
||||
/// Handwriting data that isn't persisted across restarts.
|
||||
struct Ephemeral {
|
||||
id: Id,
|
||||
|
||||
canvas_rasterizer: CanvasRasterizer,
|
||||
|
||||
tool: Tool,
|
||||
|
||||
/// Tool position in canvas space.
|
||||
tool_position: Option<Pos2>,
|
||||
|
||||
/// Tool position last frame, in canvas space.
|
||||
last_tool_position: Option<Pos2>,
|
||||
|
||||
/// The stroke that is currently being drawed.
|
||||
current_stroke: Vec<Pos2>,
|
||||
|
||||
/// The lines that have not been blitted to `texture` yet.
|
||||
///
|
||||
/// Each pair of [Pos2]s is the start and end of one line.
|
||||
unblitted_lines: Vec<[Pos2; 2]>,
|
||||
|
||||
tessellator: Option<Tessellator>,
|
||||
|
||||
/// Tessellated mesh of all strokes
|
||||
mesh: Arc<Mesh>,
|
||||
|
||||
refresh_texture: bool,
|
||||
|
||||
/// Context of the last mesh render.
|
||||
last_mesh_ctx: Option<MeshContext>,
|
||||
}
|
||||
|
||||
pub struct HandwritingResponse {
|
||||
pub changed: bool,
|
||||
}
|
||||
|
||||
/// Context of a mesh render.
|
||||
#[derive(Clone, Copy, PartialEq)]
|
||||
struct MeshContext {
|
||||
/// Need to update the mesh when the stroke color changes.
|
||||
pub ui_theme: Theme,
|
||||
|
||||
pub pixels_per_point: f32,
|
||||
|
||||
pub stroke: Stroke,
|
||||
}
|
||||
|
||||
impl Default for Handwriting {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
strokes: Default::default(),
|
||||
height: HANDWRITING_MIN_HEIGHT,
|
||||
desired_height: HANDWRITING_MIN_HEIGHT,
|
||||
e: Default::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Ephemeral {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
id: random_id(),
|
||||
canvas_rasterizer: Default::default(),
|
||||
tool: Tool::Pencil,
|
||||
tool_position: None,
|
||||
last_tool_position: None,
|
||||
current_stroke: Default::default(),
|
||||
tessellator: None,
|
||||
mesh: Default::default(),
|
||||
refresh_texture: true,
|
||||
last_mesh_ctx: None,
|
||||
unblitted_lines: Default::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Handwriting {
|
||||
pub fn ui_control(
|
||||
&mut self,
|
||||
style: Option<&mut HandwritingStyle>,
|
||||
ui: &mut egui::Ui,
|
||||
response: &mut HandwritingResponse,
|
||||
) -> egui::Response {
|
||||
ui.horizontal(|ui| {
|
||||
if let Some(style) = style {
|
||||
ui.label("Stroke:");
|
||||
ui.add(&mut style.stroke);
|
||||
ui.separator();
|
||||
}
|
||||
|
||||
if ui.button("clear").clicked() {
|
||||
self.strokes.clear();
|
||||
self.e.refresh_texture = true;
|
||||
response.changed = true;
|
||||
}
|
||||
|
||||
ui.add_enabled_ui(!self.strokes.is_empty(), |ui| {
|
||||
if ui.button("undo").clicked() {
|
||||
self.strokes.pop();
|
||||
self.e.refresh_texture = true;
|
||||
response.changed = true;
|
||||
}
|
||||
});
|
||||
|
||||
if ui.button("copy").clicked() {
|
||||
let text = self.to_string();
|
||||
// TODO: move to a job
|
||||
let _ = Clipboard::new().unwrap().set_text(text);
|
||||
}
|
||||
|
||||
let (label, switch_to_tool) = match self.e.tool {
|
||||
Tool::Pencil => ("eraser", Tool::Eraser),
|
||||
Tool::Eraser => ("pencil", Tool::Pencil),
|
||||
};
|
||||
if ui.button(label).clicked() {
|
||||
self.e.tool = switch_to_tool;
|
||||
}
|
||||
|
||||
let vertex_count: usize = self.e.mesh.indices.len() / 3;
|
||||
ui.label(format!("vertices: {vertex_count}"));
|
||||
})
|
||||
.response
|
||||
}
|
||||
|
||||
pub fn ui_content(
|
||||
&mut self,
|
||||
style: &HandwritingStyle,
|
||||
ui: &mut Ui,
|
||||
hw_response: &mut HandwritingResponse,
|
||||
) -> egui::Response {
|
||||
if style.animate {
|
||||
self.height = ui.ctx().animate_value_with_time(
|
||||
self.e.id.with("height animation"),
|
||||
self.desired_height,
|
||||
0.4,
|
||||
);
|
||||
} else {
|
||||
self.height = self.desired_height;
|
||||
}
|
||||
|
||||
let desired_size = Vec2::new(ui.available_width(), self.height);
|
||||
let (mut response, painter) = ui.allocate_painter(desired_size, Sense::drag());
|
||||
|
||||
if style.hide_cursor {
|
||||
response = response.on_hover_and_drag_cursor(egui::CursorIcon::None);
|
||||
}
|
||||
|
||||
let size = response.rect.size();
|
||||
|
||||
// Calculate matrices that convert between screen-space and image-space.
|
||||
// - image-space: 0,0 is the top-left of the texture.
|
||||
// - screen-space: 0,0 is the top-left of the window.
|
||||
// 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();
|
||||
|
||||
self.e.last_tool_position = self.e.tool_position;
|
||||
|
||||
// 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();
|
||||
|
||||
if !is_drawing {
|
||||
if was_drawing {
|
||||
// commit current line
|
||||
self.commit_current_line(hw_response);
|
||||
response.mark_changed();
|
||||
}
|
||||
|
||||
// recalculate how tall the widget should be
|
||||
let lines_max_y = self
|
||||
.strokes
|
||||
.iter()
|
||||
.flatten()
|
||||
.map(|p| p.y + HANDWRITING_BOTTOM_PADDING)
|
||||
.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 {
|
||||
self.desired_height = lines_max_y;
|
||||
response.mark_changed();
|
||||
}
|
||||
} else {
|
||||
let events = ui.ctx().input(|input| {
|
||||
// If we are getting both MouseMoved and PointerMoved events, ignore the first.
|
||||
let mut events = input.raw.events.iter().peekable();
|
||||
iter::from_fn(move || {
|
||||
let next = events.next()?;
|
||||
let Some(peek) = events.peek() else {
|
||||
return Some(next);
|
||||
};
|
||||
|
||||
match next {
|
||||
Event::PointerMoved(..) if matches!(peek, Event::MouseMoved(..)) => {
|
||||
let _ = events.next(); // drop the MouseMoved event
|
||||
Some(next)
|
||||
}
|
||||
Event::MouseMoved(..) if matches!(peek, Event::PointerMoved(..)) => {
|
||||
// return the peeked PointerMoved instead
|
||||
Some(events.next().expect("next is some"))
|
||||
}
|
||||
_ => Some(next),
|
||||
}
|
||||
})
|
||||
.filter(|event| {
|
||||
// FIXME: pinenote: PointerMoved are duplicated after the MouseMoved events
|
||||
cfg!(not(feature = "pinenote")) || !matches!(event, Event::PointerMoved(..))
|
||||
})
|
||||
.cloned()
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
|
||||
// Process input events and turn them into strokes
|
||||
for event in events {
|
||||
let mut last_tool_position = self.e.last_tool_position;
|
||||
process_event(&mut last_tool_position, from_screen, &event, |tool_event| {
|
||||
self.e.tool_position = tool_event.position();
|
||||
match self.e.tool {
|
||||
Tool::Pencil => {
|
||||
hw_response.changed |= tool::pencil::on_tool_event(self, tool_event);
|
||||
}
|
||||
Tool::Eraser => {
|
||||
if tool::eraser::on_tool_event(self, tool_event) {
|
||||
self.e.refresh_texture = true;
|
||||
hw_response.changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Draw the horizontal ruled lines
|
||||
(1..)
|
||||
.map(|n| n as f32 * HANDWRITING_LINE_SPACING)
|
||||
.take_while(|&y| y < size.y)
|
||||
.map(|y| {
|
||||
let l = to_screen * Pos2::new(HANDWRITING_MARGIN * size.x, y);
|
||||
let r = to_screen * Pos2::new((1.0 - HANDWRITING_MARGIN) * size.x, y);
|
||||
Shape::hline(l.x..=r.x, l.y, style.bg_line_stroke)
|
||||
})
|
||||
.for_each(|shape| {
|
||||
painter.add(shape);
|
||||
});
|
||||
|
||||
// Get the position and dimensions of the image
|
||||
let mesh_rect = response
|
||||
.rect
|
||||
.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 {
|
||||
ui_theme: ui.ctx().theme(),
|
||||
pixels_per_point: ui.pixels_per_point(),
|
||||
stroke: style.stroke,
|
||||
};
|
||||
|
||||
// Figure out if we need to re-rasterize the mesh.
|
||||
if Some(&new_context) != self.e.last_mesh_ctx.as_ref() {
|
||||
self.e.refresh_texture = true;
|
||||
}
|
||||
|
||||
let [px_width, px_height] = {
|
||||
let Vec2 { x, y } = mesh_rect.size() * new_context.pixels_per_point;
|
||||
[x, y].map(|f| f.ceil() as usize)
|
||||
};
|
||||
|
||||
self.e.canvas_rasterizer.set_size(px_width, px_height);
|
||||
|
||||
if self.e.refresh_texture {
|
||||
// ...if we do, rasterize the entire texture from scratch
|
||||
self.refresh_texture(style, new_context);
|
||||
self.e.unblitted_lines.clear();
|
||||
} else if !self.e.unblitted_lines.is_empty() {
|
||||
// ...if we don't, we can get away with only rasterizing the *new* lines onto the
|
||||
// existing texture.
|
||||
for [from, to] in std::mem::take(&mut self.e.unblitted_lines) {
|
||||
self.draw_line_to_texture(from, to, &new_context);
|
||||
}
|
||||
self.e.unblitted_lines.clear();
|
||||
}
|
||||
|
||||
// Draw the texture
|
||||
self.e.canvas_rasterizer.show(ui.ctx(), &painter, mesh_rect);
|
||||
|
||||
if let Some(tool_position) = self.e.tool_position
|
||||
&& let Tool::Eraser = self.e.tool
|
||||
{
|
||||
let pos = to_screen * tool_position;
|
||||
let shape = Shape::circle_stroke(pos, tool::eraser::RADIUS, style.stroke);
|
||||
painter.add(shape);
|
||||
}
|
||||
|
||||
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(&mut self, style: &HandwritingStyle, mesh_context: MeshContext) {
|
||||
let Ephemeral {
|
||||
current_stroke,
|
||||
tessellator,
|
||||
mesh,
|
||||
refresh_texture,
|
||||
last_mesh_ctx,
|
||||
..
|
||||
} = &mut self.e;
|
||||
// TODO: avoid tessellating and rasterizing on the GUI thread
|
||||
|
||||
*last_mesh_ctx = Some(mesh_context);
|
||||
|
||||
*refresh_texture = false;
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
let start_time = std::time::Instant::now();
|
||||
|
||||
let mesh = Arc::make_mut(mesh);
|
||||
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
|
||||
.iter()
|
||||
.chain([&*current_stroke])
|
||||
.filter(|stroke| stroke.len() >= 2)
|
||||
.map(|stroke| egui::Shape::line(stroke.clone(), style.stroke))
|
||||
.for_each(|shape| {
|
||||
tessellator.tessellate_shape(shape, mesh);
|
||||
});
|
||||
|
||||
// sanity-check that tessellation did not produce any NaNs.
|
||||
// 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 point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
||||
let triangles = mesh_triangles(&self.e.mesh);
|
||||
|
||||
self.e.canvas_rasterizer.clear();
|
||||
self.e
|
||||
.canvas_rasterizer
|
||||
.rasterize(point_to_pixel, triangles);
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
{
|
||||
let elapsed = start_time.elapsed();
|
||||
log::debug!("refreshed mesh in {:.3}s", elapsed.as_secs_f32());
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ui(&mut self, style: &HandwritingStyle, ui: &mut Ui) -> HandwritingResponse {
|
||||
let mut response = HandwritingResponse { changed: false };
|
||||
|
||||
ui.vertical_centered_justified(|ui| {
|
||||
self.ui_control(None, ui, &mut response);
|
||||
|
||||
Frame::canvas(ui.style())
|
||||
.corner_radius(20.0)
|
||||
.stroke(Stroke::new(5.0, Color32::from_black_alpha(40)))
|
||||
.fill(style.bg_color)
|
||||
.show(ui, |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) {
|
||||
if let Some(&last_canvas_pos) = self.e.current_stroke.last() {
|
||||
if last_canvas_pos == new_canvas_pos {
|
||||
return;
|
||||
}
|
||||
|
||||
self.e
|
||||
.unblitted_lines
|
||||
.push([last_canvas_pos, new_canvas_pos]);
|
||||
}
|
||||
|
||||
self.e.current_stroke.push(new_canvas_pos);
|
||||
}
|
||||
|
||||
/// Draw a single line onto the existing texture.
|
||||
fn draw_line_to_texture(&mut self, from: Pos2, to: Pos2, mesh_context: &MeshContext) {
|
||||
// INVARIANT: if this function was called, then pixels_per_point is the same as last frame,
|
||||
// so there's no need to create a new tessellator.
|
||||
let tessellator = self
|
||||
.e
|
||||
.tessellator
|
||||
.get_or_insert_with(|| new_tessellator(mesh_context.pixels_per_point));
|
||||
|
||||
let mut mesh = Mesh::default();
|
||||
let line = egui::Shape::line_segment([from, to], mesh_context.stroke);
|
||||
tessellator.tessellate_shape(line, &mut mesh);
|
||||
|
||||
self.draw_mesh_to_texture(&mesh, mesh_context);
|
||||
}
|
||||
|
||||
/// Draw a single mesh onto the existing texture.
|
||||
fn draw_mesh_to_texture(&mut self, mesh: &Mesh, mesh_context: &MeshContext) {
|
||||
let triangles = mesh_triangles(mesh);
|
||||
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
||||
self.e
|
||||
.canvas_rasterizer
|
||||
.rasterize(point_to_pixel, triangles);
|
||||
}
|
||||
|
||||
pub fn strokes(&self) -> &[Vec<Pos2>] {
|
||||
&self.strokes
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub fn example() -> Self {
|
||||
Handwriting {
|
||||
strokes: vec![
|
||||
vec![
|
||||
Pos2::new(-1.0, 1.0),
|
||||
Pos2::new(3.0, 1.0),
|
||||
Pos2::new(3.0, 3.0),
|
||||
Pos2::new(1.5, 2.0),
|
||||
Pos2::new(0.0, 0.0),
|
||||
],
|
||||
vec![
|
||||
Pos2::new(3.0, 3.0),
|
||||
Pos2::new(-1.0, 1.0),
|
||||
Pos2::new(0.0, 0.0),
|
||||
Pos2::new(3.0, 1.0),
|
||||
],
|
||||
],
|
||||
..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()
|
||||
}
|
||||
}
|
||||
|
||||
/// Convert [egui::Event]s to [ToolEvent]s.
|
||||
fn process_event(
|
||||
last_canvas_pos: &mut Option<Pos2>,
|
||||
from_screen: RectTransform,
|
||||
event: &Event,
|
||||
mut on_tool_event: impl FnMut(ToolEvent),
|
||||
) {
|
||||
match event {
|
||||
&Event::PointerMoved(new_position) => {
|
||||
let new_canvas_pos = from_screen * new_position;
|
||||
if last_canvas_pos.is_some() && *last_canvas_pos != Some(new_canvas_pos) {
|
||||
*last_canvas_pos = Some(new_canvas_pos);
|
||||
on_tool_event(ToolEvent::Move { to: new_canvas_pos });
|
||||
}
|
||||
}
|
||||
|
||||
&Event::MouseMoved(mut delta) => {
|
||||
if delta.length() == 0.0 {
|
||||
return;
|
||||
}
|
||||
|
||||
// FIXME: pinenote: MouseMovement delta does *not* take into account screen
|
||||
// scaling and rotation, so unless you've scaling=1 and no rotation, the
|
||||
// MouseMoved values will be all wrong.
|
||||
if cfg!(feature = "pinenote") {
|
||||
delta /= 1.8;
|
||||
delta = -delta.rot90();
|
||||
}
|
||||
|
||||
if let Some(pos) = last_canvas_pos {
|
||||
*pos += delta;
|
||||
on_tool_event(ToolEvent::Move { to: *pos });
|
||||
} else {
|
||||
println!("Got `MouseMoved`, but have no previous pos");
|
||||
}
|
||||
}
|
||||
|
||||
&Event::PointerButton {
|
||||
pos,
|
||||
button,
|
||||
pressed,
|
||||
modifiers: _,
|
||||
} => match (button, pressed) {
|
||||
(PointerButton::Primary, true) => {
|
||||
if last_canvas_pos.is_none() {
|
||||
let pos = from_screen * pos;
|
||||
*last_canvas_pos = Some(pos);
|
||||
on_tool_event(ToolEvent::Press { at: pos });
|
||||
}
|
||||
}
|
||||
(PointerButton::Primary, false) => {
|
||||
if last_canvas_pos.take().is_some() {
|
||||
let pos = from_screen * pos;
|
||||
on_tool_event(ToolEvent::Move { to: pos });
|
||||
on_tool_event(ToolEvent::Release {});
|
||||
}
|
||||
}
|
||||
(_, _) => {}
|
||||
},
|
||||
|
||||
// Stop drawing after pointer disappears or the window is unfocused
|
||||
Event::PointerGone | Event::WindowFocused(false) => {
|
||||
if last_canvas_pos.take().is_some() {
|
||||
on_tool_event(ToolEvent::Release {});
|
||||
}
|
||||
}
|
||||
|
||||
Event::WindowFocused(true)
|
||||
| Event::Copy
|
||||
| Event::Cut
|
||||
| Event::Paste(..)
|
||||
| Event::Text(..)
|
||||
| Event::Key { .. }
|
||||
| Event::Zoom(..)
|
||||
| Event::Ime(..)
|
||||
| Event::Touch { .. }
|
||||
| Event::MouseWheel { .. }
|
||||
| Event::Screenshot { .. } => {}
|
||||
}
|
||||
}
|
||||
|
||||
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 {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
let raw = self.encode_as_disk_format();
|
||||
write_custom_code_block(f, CODE_BLOCK_KEY, BASE64_STANDARD.encode(raw))
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for Handwriting {
|
||||
type Err = eyre::Report;
|
||||
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
let s = try_from_custom_code_block(CODE_BLOCK_KEY, s)
|
||||
.ok_or_eyre("Not a valid ```handwriting-block")?;
|
||||
|
||||
let bytes = BASE64_STANDARD
|
||||
.decode(s)
|
||||
.wrap_err("Failed to decode painting data from base64")?;
|
||||
|
||||
// HACK: first iteration of disk format did not have version header
|
||||
//let mut bytes = bytes;
|
||||
//bytes.insert(0, 0);
|
||||
//bytes.insert(0, 1);
|
||||
|
||||
let disk_format = DiskFormat::ref_from_bytes(&bytes[..]).map_err(|_| eyre!("Too short"))?;
|
||||
|
||||
if disk_format.header.version != disk_format::V1 {
|
||||
bail!(
|
||||
"Unknown disk_format version: {}",
|
||||
disk_format.header.version
|
||||
);
|
||||
}
|
||||
|
||||
let mut raw_strokes = &disk_format.strokes[..];
|
||||
let mut strokes = vec![];
|
||||
|
||||
while !raw_strokes.is_empty() {
|
||||
if raw_strokes.len() < RawStroke::MIN_LEN {
|
||||
bail!("Invalid remaining length: {}", raw_strokes.len());
|
||||
}
|
||||
|
||||
let stroke = RawStroke::ref_from_bytes(&raw_strokes[..RawStroke::MIN_LEN])
|
||||
.expect("length is correct");
|
||||
|
||||
// get length as number of points
|
||||
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) = raw_strokes.split_at(RawStroke::MIN_LEN + byte_len);
|
||||
raw_strokes = rest;
|
||||
|
||||
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
|
||||
.chunks_exact(2)
|
||||
.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();
|
||||
|
||||
strokes.push(stroke);
|
||||
}
|
||||
|
||||
Ok(Handwriting {
|
||||
strokes,
|
||||
..Default::default()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl HandwritingStyle {
|
||||
pub fn from_theme(theme: Theme) -> Self {
|
||||
let stroke_color;
|
||||
let bg_color;
|
||||
let line_color;
|
||||
|
||||
match theme {
|
||||
Theme::Dark => {
|
||||
stroke_color = Color32::WHITE;
|
||||
bg_color = Color32::from_gray(30);
|
||||
line_color = Color32::from_rgb(100, 100, 100);
|
||||
}
|
||||
Theme::Light => {
|
||||
stroke_color = Color32::BLACK;
|
||||
bg_color = Color32::WHITE;
|
||||
line_color = Color32::from_rgb(130, 130, 130); // TODO
|
||||
}
|
||||
}
|
||||
|
||||
HandwritingStyle {
|
||||
stroke: Stroke::new(1.0, stroke_color),
|
||||
bg_color,
|
||||
bg_line_stroke: Stroke::new(0.5, line_color),
|
||||
animate: true,
|
||||
hide_cursor: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn mesh_triangles(mesh: &Mesh) -> impl Iterator<Item = [&Vertex; 3]> + Clone {
|
||||
mesh.indices
|
||||
.chunks_exact(3)
|
||||
.map(|chunk| [chunk[0], chunk[1], chunk[2]])
|
||||
.map(|indices| indices.map(|i| &mesh.vertices[i as usize]))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use std::str::FromStr;
|
||||
|
||||
use egui::{Event, Modifiers, PointerButton, Pos2, Rect, emath::RectTransform};
|
||||
|
||||
use super::{Handwriting, process_event};
|
||||
|
||||
#[test]
|
||||
fn serialize_handwriting() {
|
||||
let handwriting = Handwriting::example();
|
||||
insta::assert_debug_snapshot!("handwriting example", handwriting.strokes);
|
||||
|
||||
let serialized = handwriting.to_string();
|
||||
insta::assert_snapshot!("serialized handwriting", serialized);
|
||||
|
||||
let deserialized =
|
||||
Handwriting::from_str(&serialized).expect("Handwriting must de/serialize correctly");
|
||||
insta::assert_debug_snapshot!("deserialized handwriting", deserialized.strokes);
|
||||
}
|
||||
|
||||
const TEST_EVENTS: &[Event] = &[
|
||||
Event::PointerMoved(Pos2::new(749.9, 225.6)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(749.9, 225.6),
|
||||
button: PointerButton::Primary,
|
||||
pressed: true,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
Event::PointerMoved(Pos2::new(749.9, 225.7)),
|
||||
Event::PointerMoved(Pos2::new(749.9, 226.4)),
|
||||
Event::PointerMoved(Pos2::new(750.2, 228.4)),
|
||||
Event::PointerMoved(Pos2::new(751.0, 231.3)),
|
||||
Event::PointerMoved(Pos2::new(752.6, 234.4)),
|
||||
Event::PointerMoved(Pos2::new(754.1, 237.7)),
|
||||
Event::PointerMoved(Pos2::new(755.8, 241.1)),
|
||||
Event::PointerMoved(Pos2::new(757.7, 244.4)),
|
||||
Event::PointerMoved(Pos2::new(759.3, 247.4)),
|
||||
Event::PointerMoved(Pos2::new(760.8, 250.2)),
|
||||
Event::PointerMoved(Pos2::new(762.8, 253.4)),
|
||||
Event::PointerMoved(Pos2::new(765.1, 256.8)),
|
||||
Event::PointerMoved(Pos2::new(767.7, 260.2)),
|
||||
Event::PointerMoved(Pos2::new(771.2, 264.3)),
|
||||
Event::PointerMoved(Pos2::new(774.6, 267.9)),
|
||||
Event::PointerMoved(Pos2::new(778.2, 271.2)),
|
||||
Event::PointerMoved(Pos2::new(782.7, 275.2)),
|
||||
Event::PointerMoved(Pos2::new(786.7, 278.5)),
|
||||
Event::PointerMoved(Pos2::new(790.4, 280.8)),
|
||||
Event::PointerMoved(Pos2::new(794.1, 282.6)),
|
||||
Event::PointerMoved(Pos2::new(797.9, 283.9)),
|
||||
Event::PointerMoved(Pos2::new(801.9, 284.8)),
|
||||
Event::PointerMoved(Pos2::new(805.9, 285.5)),
|
||||
Event::PointerMoved(Pos2::new(810.2, 285.8)),
|
||||
Event::PointerMoved(Pos2::new(814.5, 285.8)),
|
||||
Event::PointerMoved(Pos2::new(818.2, 285.6)),
|
||||
Event::PointerMoved(Pos2::new(821.6, 284.5)),
|
||||
Event::PointerMoved(Pos2::new(824.7, 283.0)),
|
||||
Event::PointerMoved(Pos2::new(827.5, 281.4)),
|
||||
Event::PointerMoved(Pos2::new(830.4, 279.6)),
|
||||
Event::PointerMoved(Pos2::new(833.4, 277.7)),
|
||||
Event::PointerMoved(Pos2::new(836.1, 275.7)),
|
||||
Event::PointerMoved(Pos2::new(838.6, 273.6)),
|
||||
Event::PointerMoved(Pos2::new(840.9, 271.7)),
|
||||
Event::PointerMoved(Pos2::new(843.0, 269.6)),
|
||||
Event::PointerMoved(Pos2::new(845.4, 267.2)),
|
||||
Event::PointerMoved(Pos2::new(847.7, 265.1)),
|
||||
Event::PointerMoved(Pos2::new(849.8, 262.7)),
|
||||
Event::PointerMoved(Pos2::new(852.0, 260.0)),
|
||||
Event::PointerMoved(Pos2::new(854.3, 256.8)),
|
||||
Event::PointerMoved(Pos2::new(856.3, 253.4)),
|
||||
Event::PointerMoved(Pos2::new(858.2, 250.1)),
|
||||
Event::PointerMoved(Pos2::new(860.0, 247.1)),
|
||||
Event::PointerMoved(Pos2::new(861.5, 244.3)),
|
||||
Event::PointerMoved(Pos2::new(862.8, 242.0)),
|
||||
Event::PointerMoved(Pos2::new(864.1, 240.1)),
|
||||
Event::PointerMoved(Pos2::new(865.0, 238.2)),
|
||||
Event::PointerMoved(Pos2::new(865.8, 236.6)),
|
||||
Event::PointerMoved(Pos2::new(866.5, 234.9)),
|
||||
Event::PointerMoved(Pos2::new(867.1, 233.1)),
|
||||
Event::PointerMoved(Pos2::new(867.8, 231.4)),
|
||||
Event::PointerMoved(Pos2::new(868.4, 229.8)),
|
||||
Event::PointerMoved(Pos2::new(868.7, 228.4)),
|
||||
Event::PointerMoved(Pos2::new(868.9, 227.2)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 226.2)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 225.1)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 224.1)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 223.4)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 222.8)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 222.4)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 222.4)),
|
||||
// Event::PointerButton {
|
||||
// pos: Pos2::new(869.1, 222.4),
|
||||
// button: PointerButton::Primary,
|
||||
// pressed: false,
|
||||
// modifiers: Modifiers::NONE,
|
||||
// },
|
||||
Event::PointerGone,
|
||||
Event::PointerMoved(Pos2::new(779.3, 158.6)),
|
||||
// --
|
||||
// FIXME: This line looks weird. Probably because of a bug in the rasterizer when the X-coord is all the same.
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(779.3, 158.6),
|
||||
button: PointerButton::Primary,
|
||||
pressed: true,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
Event::PointerMoved(Pos2::new(779.3, 159.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 160.9)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 164.6)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 169.6)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 175.2)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 180.3)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 185.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 189.4)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 192.8)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 194.9)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 196.1)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 197.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 197.6)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 198.1)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 198.5)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 198.8)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 199.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 199.2)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 199.2)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(779.3, 199.2),
|
||||
button: PointerButton::Primary,
|
||||
pressed: false,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
// --
|
||||
Event::PointerMoved(Pos2::new(841.5, 159.2)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(841.5, 159.2),
|
||||
button: PointerButton::Primary,
|
||||
pressed: true,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
Event::PointerMoved(Pos2::new(841.5, 159.3)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 159.7)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 160.5)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 162.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 165.1)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 168.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 171.6)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 174.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 177.1)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 179.3)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 180.9)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 182.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 183.5)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 184.5)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 185.6)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 187.0)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 188.6)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 190.3)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 191.8)),
|
||||
Event::PointerMoved(Pos2::new(841.3, 192.7)),
|
||||
Event::PointerMoved(Pos2::new(841.0, 193.3)),
|
||||
Event::PointerMoved(Pos2::new(841.0, 193.7)),
|
||||
Event::PointerMoved(Pos2::new(841.1, 193.9)),
|
||||
Event::PointerMoved(Pos2::new(841.3, 193.9)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.0)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.2)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.6)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.9)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 195.1)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 195.1)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(841.4, 195.1),
|
||||
button: PointerButton::Primary,
|
||||
pressed: false,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
];
|
||||
|
||||
fn from_screen() -> RectTransform {
|
||||
RectTransform::from_to(
|
||||
Rect::from_two_pos(Pos2::new(570.0, 145.1), Pos2::new(1116.4, 245.1)),
|
||||
Rect::from_two_pos(Pos2::new(0.0, 0.0), Pos2::new(546.4, 100.0)),
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn handle_input() {
|
||||
let mut tool_events = vec![];
|
||||
let mut last_pos = None;
|
||||
let from_screen = from_screen();
|
||||
for event in TEST_EVENTS {
|
||||
process_event(&mut last_pos, from_screen, event, |tool_event| {
|
||||
tool_events.push(tool_event)
|
||||
});
|
||||
}
|
||||
insta::assert_yaml_snapshot!(tool_events);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn input_to_handwriting() {
|
||||
let mut handwriting = Handwriting::default();
|
||||
let mut last_pos = None;
|
||||
let from_screen = from_screen();
|
||||
for event in TEST_EVENTS {
|
||||
process_event(&mut last_pos, from_screen, event, |tool_event| {
|
||||
handwriting.on_tool_event(tool_event);
|
||||
});
|
||||
}
|
||||
let serialized = handwriting.to_string();
|
||||
insta::assert_snapshot!("input events to handwriting", serialized);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
---
|
||||
source: src/handwriting/mod.rs
|
||||
expression: deserialized.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,455 @@
|
||||
---
|
||||
source: src/handwriting/mod.rs
|
||||
expression: tool_events
|
||||
---
|
||||
- Press:
|
||||
at:
|
||||
x: 179.90002
|
||||
y: 80.5
|
||||
- Move:
|
||||
to:
|
||||
x: 179.90002
|
||||
y: 80.59999
|
||||
- Move:
|
||||
to:
|
||||
x: 179.90002
|
||||
y: 81.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 180.20001
|
||||
y: 83.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 181
|
||||
y: 86.2
|
||||
- Move:
|
||||
to:
|
||||
x: 182.59998
|
||||
y: 89.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 184.09998
|
||||
y: 92.59999
|
||||
- Move:
|
||||
to:
|
||||
x: 185.79999
|
||||
y: 96
|
||||
- Move:
|
||||
to:
|
||||
x: 187.70001
|
||||
y: 99.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 189.3
|
||||
y: 102.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 190.8
|
||||
y: 105.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 192.79999
|
||||
y: 108.29998
|
||||
- Move:
|
||||
to:
|
||||
x: 195.09998
|
||||
y: 111.69999
|
||||
- Move:
|
||||
to:
|
||||
x: 197.70001
|
||||
y: 115.100006
|
||||
- Move:
|
||||
to:
|
||||
x: 201.20001
|
||||
y: 119.19998
|
||||
- Move:
|
||||
to:
|
||||
x: 204.59998
|
||||
y: 122.799995
|
||||
- Move:
|
||||
to:
|
||||
x: 208.20001
|
||||
y: 126.100006
|
||||
- Move:
|
||||
to:
|
||||
x: 212.70001
|
||||
y: 130.1
|
||||
- Move:
|
||||
to:
|
||||
x: 216.70001
|
||||
y: 133.4
|
||||
- Move:
|
||||
to:
|
||||
x: 220.40002
|
||||
y: 135.69998
|
||||
- Move:
|
||||
to:
|
||||
x: 224.09998
|
||||
y: 137.5
|
||||
- Move:
|
||||
to:
|
||||
x: 227.90002
|
||||
y: 138.79999
|
||||
- Move:
|
||||
to:
|
||||
x: 231.90002
|
||||
y: 139.69998
|
||||
- Move:
|
||||
to:
|
||||
x: 235.90002
|
||||
y: 140.4
|
||||
- Move:
|
||||
to:
|
||||
x: 240.20001
|
||||
y: 140.69998
|
||||
- Move:
|
||||
to:
|
||||
x: 244.5
|
||||
y: 140.69998
|
||||
- Move:
|
||||
to:
|
||||
x: 248.20001
|
||||
y: 140.5
|
||||
- Move:
|
||||
to:
|
||||
x: 251.59996
|
||||
y: 139.4
|
||||
- Move:
|
||||
to:
|
||||
x: 254.70001
|
||||
y: 137.9
|
||||
- Move:
|
||||
to:
|
||||
x: 257.5
|
||||
y: 136.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 260.40002
|
||||
y: 134.5
|
||||
- Move:
|
||||
to:
|
||||
x: 263.40002
|
||||
y: 132.6
|
||||
- Move:
|
||||
to:
|
||||
x: 266.09998
|
||||
y: 130.6
|
||||
- Move:
|
||||
to:
|
||||
x: 268.59998
|
||||
y: 128.5
|
||||
- Move:
|
||||
to:
|
||||
x: 270.90002
|
||||
y: 126.600006
|
||||
- Move:
|
||||
to:
|
||||
x: 273
|
||||
y: 124.5
|
||||
- Move:
|
||||
to:
|
||||
x: 275.40002
|
||||
y: 122.100006
|
||||
- Move:
|
||||
to:
|
||||
x: 277.70004
|
||||
y: 120.00001
|
||||
- Move:
|
||||
to:
|
||||
x: 279.8
|
||||
y: 117.60001
|
||||
- Move:
|
||||
to:
|
||||
x: 282
|
||||
y: 114.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 284.3
|
||||
y: 111.69999
|
||||
- Move:
|
||||
to:
|
||||
x: 286.3
|
||||
y: 108.29998
|
||||
- Move:
|
||||
to:
|
||||
x: 288.2
|
||||
y: 104.99999
|
||||
- Move:
|
||||
to:
|
||||
x: 290
|
||||
y: 102
|
||||
- Move:
|
||||
to:
|
||||
x: 291.5
|
||||
y: 99.2
|
||||
- Move:
|
||||
to:
|
||||
x: 292.8
|
||||
y: 96.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 294.09995
|
||||
y: 95
|
||||
- Move:
|
||||
to:
|
||||
x: 295
|
||||
y: 93.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 295.8
|
||||
y: 91.5
|
||||
- Move:
|
||||
to:
|
||||
x: 296.5
|
||||
y: 89.79999
|
||||
- Move:
|
||||
to:
|
||||
x: 297.1
|
||||
y: 88
|
||||
- Move:
|
||||
to:
|
||||
x: 297.8
|
||||
y: 86.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 298.40005
|
||||
y: 84.7
|
||||
- Move:
|
||||
to:
|
||||
x: 298.7
|
||||
y: 83.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 298.90002
|
||||
y: 82.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 299.1
|
||||
y: 81.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 299.1
|
||||
y: 80
|
||||
- Move:
|
||||
to:
|
||||
x: 299.1
|
||||
y: 79
|
||||
- Move:
|
||||
to:
|
||||
x: 299.1
|
||||
y: 78.29999
|
||||
- Move:
|
||||
to:
|
||||
x: 299.1
|
||||
y: 77.7
|
||||
- Move:
|
||||
to:
|
||||
x: 299.1
|
||||
y: 77.29999
|
||||
- Release
|
||||
- Press:
|
||||
at:
|
||||
x: 209.29999
|
||||
y: 13.500001
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 13.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 15.799988
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 19.5
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 24.5
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 30.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 35.199997
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 39.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 44.299988
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 47.699997
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 49.799988
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 51
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 51.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 52.499996
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 52.999996
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 53.399994
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 53.699993
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 53.89999
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 54.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 209.29999
|
||||
y: 54.09999
|
||||
- Release
|
||||
- Press:
|
||||
at:
|
||||
x: 271.5
|
||||
y: 14.099991
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 14.199998
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 14.599991
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 15.399994
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 17.299988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 20
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 23.299988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 26.499998
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 29.299986
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 32
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 34.199997
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 35.799988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 37.299988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 38.399994
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 39.399994
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 40.5
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 41.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 43.5
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 45.199997
|
||||
- Move:
|
||||
to:
|
||||
x: 271.5
|
||||
y: 46.699997
|
||||
- Move:
|
||||
to:
|
||||
x: 271.3
|
||||
y: 47.59999
|
||||
- Move:
|
||||
to:
|
||||
x: 271
|
||||
y: 48.199997
|
||||
- Move:
|
||||
to:
|
||||
x: 271
|
||||
y: 48.59999
|
||||
- Move:
|
||||
to:
|
||||
x: 271.09998
|
||||
y: 48.799988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.3
|
||||
y: 48.799988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.40002
|
||||
y: 48.899994
|
||||
- Move:
|
||||
to:
|
||||
x: 271.40002
|
||||
y: 49.09999
|
||||
- Move:
|
||||
to:
|
||||
x: 271.40002
|
||||
y: 49.5
|
||||
- Move:
|
||||
to:
|
||||
x: 271.40002
|
||||
y: 49.799988
|
||||
- Move:
|
||||
to:
|
||||
x: 271.40002
|
||||
y: 50
|
||||
- Move:
|
||||
to:
|
||||
x: 271.40002
|
||||
y: 50
|
||||
- Release
|
||||
@ -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
|
||||
AQA9AJ9ZCFWfWQpVn1kVVaJZNVWoWWNVtVmVVcFZylXOWQBW3lk1VupZZVb2WZJWBlrFVhla+1YuWjJXSlpzV2VarVeCWuJXploRWMZaK1jjWj5YAVtMWB9bVlg/W15YX1tjWIJbZlikW2ZYwltkWN1bW1j2W09YBlxCWBJcNFgeXCVYKFwVWDJcBFg8XOpXRFzIV05coldXXIBXX1xaV2hcLldxXPtWeVzFVoFckFaIXGBWjlwzVpNcDlaYXPBVnFzSVZ9cuFWiXJ1VpFyAVadcZVWqXEtVq1w1VaxcIlWsXBJVrFwAVaxc8FSsXOVUrFzbVKxc1VQTAIpawEqKWvNKilrmS4pa4EyKWiBOilqGT4paZlCKWv1QilqKUYpa9lGKWjpSilpgUopafVKKWpBSilqgUoparVKKWrZSilq9Uopaw1IeAD5cDUs+XBpLPlxNSz5cs0s+XFNMPlwATT5c000+XKBOPlxTTz5cAFA+XEZQPlx6UD5cqlA+XM1QPlztUD5cEFE+XD1RPlxwUT5cplE+XNZRPVzzUTxcBlI8XBNSPFwaUj1cGlI+XB1SPlwjUj5cMFI+XDpSPlxAUg==
|
||||
```
|
||||
@ -0,0 +1,7 @@
|
||||
---
|
||||
source: src/handwriting/mod.rs
|
||||
expression: serialized
|
||||
---
|
||||
```handwriting
|
||||
AQAFAAC8ADwAQgA8AEIAQgA+AEAAAAAABAAAQgBCALwAPAAAAAAAQgA8
|
||||
```
|
||||
32
src/handwriting/tool/eraser.rs
Normal file
32
src/handwriting/tool/eraser.rs
Normal file
@ -0,0 +1,32 @@
|
||||
use crate::handwriting::{Handwriting, ToolEvent};
|
||||
use egui::Pos2;
|
||||
|
||||
pub const RADIUS: f32 = 12.0;
|
||||
|
||||
/// Handle a [ToolEvent]. Returns true if a stroke was completed.
|
||||
pub fn on_tool_event(handwriting: &mut Handwriting, tool_event: ToolEvent) -> bool {
|
||||
match tool_event {
|
||||
ToolEvent::Press { at } => {
|
||||
erase(handwriting, at, RADIUS)
|
||||
}
|
||||
ToolEvent::Move { to } => {
|
||||
erase(handwriting, to, RADIUS)
|
||||
}
|
||||
ToolEvent::Release => {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fn erase(handwriting: &mut Handwriting, at: Pos2, radius: f32) -> bool {
|
||||
let strokes = handwriting.strokes.len();
|
||||
|
||||
handwriting.strokes.retain(|stroke| {
|
||||
stroke.iter().all(|&point| {
|
||||
(point - at).length() > radius
|
||||
})
|
||||
});
|
||||
|
||||
handwriting.strokes.len() < strokes
|
||||
}
|
||||
28
src/handwriting/tool/mod.rs
Normal file
28
src/handwriting/tool/mod.rs
Normal file
@ -0,0 +1,28 @@
|
||||
pub mod pencil;
|
||||
pub mod eraser;
|
||||
|
||||
use egui::Pos2;
|
||||
use serde::Serialize;
|
||||
|
||||
pub enum Tool {
|
||||
Pencil,
|
||||
Eraser,
|
||||
}
|
||||
|
||||
/// A simple event that can defines how a tool (e.g. the pen) is used on a [Handwriting].
|
||||
#[derive(Debug, Serialize, Copy, Clone)]
|
||||
pub enum ToolEvent {
|
||||
Press { at: Pos2 },
|
||||
Move { to: Pos2 },
|
||||
Release,
|
||||
}
|
||||
|
||||
impl ToolEvent {
|
||||
pub const fn position(&self) -> Option<Pos2> {
|
||||
match self {
|
||||
&ToolEvent::Press { at } => Some(at),
|
||||
&ToolEvent::Move { to } => Some(to),
|
||||
ToolEvent::Release => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
22
src/handwriting/tool/pencil.rs
Normal file
22
src/handwriting/tool/pencil.rs
Normal file
@ -0,0 +1,22 @@
|
||||
use crate::handwriting::{Handwriting, ToolEvent};
|
||||
use std::mem;
|
||||
|
||||
/// Handle a [ToolEvent]. Returns true if a stroke was completed.
|
||||
pub fn on_tool_event(handwriting: &mut Handwriting, tool_event: ToolEvent) -> bool {
|
||||
match tool_event {
|
||||
ToolEvent::Press { at } => {
|
||||
debug_assert!(handwriting.e.current_stroke.is_empty());
|
||||
handwriting.push_to_stroke(at);
|
||||
false
|
||||
}
|
||||
ToolEvent::Move { to } => {
|
||||
handwriting.push_to_stroke(to);
|
||||
false
|
||||
}
|
||||
ToolEvent::Release => {
|
||||
debug_assert!(!handwriting.e.current_stroke.is_empty());
|
||||
handwriting.strokes.push(mem::take(&mut handwriting.e.current_stroke));
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
14
src/lib.rs
Normal file
14
src/lib.rs
Normal file
@ -0,0 +1,14 @@
|
||||
pub mod app;
|
||||
pub mod constants;
|
||||
pub mod custom_code_block;
|
||||
pub mod file_editor;
|
||||
pub mod folder;
|
||||
pub mod handwriting;
|
||||
pub mod markdown;
|
||||
pub mod preferences;
|
||||
pub mod rasterizer;
|
||||
pub mod text_editor;
|
||||
pub mod text_styles;
|
||||
pub mod util;
|
||||
|
||||
pub use app::App;
|
||||
71
src/main.rs
Normal file
71
src/main.rs
Normal file
@ -0,0 +1,71 @@
|
||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
|
||||
|
||||
// When compiling natively:
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
fn main() -> eframe::Result {
|
||||
env_logger::init();
|
||||
|
||||
let native_options = eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
.with_inner_size([400.0, 300.0])
|
||||
.with_min_inner_size([300.0, 220.0])
|
||||
.with_icon(
|
||||
// NOTE: Adding an icon is optional
|
||||
eframe::icon_data::from_png_bytes(&include_bytes!("../assets/icon-256.png")[..])
|
||||
.expect("Failed to load icon"),
|
||||
),
|
||||
..Default::default()
|
||||
};
|
||||
eframe::run_native(
|
||||
"Inkr",
|
||||
native_options,
|
||||
Box::new(|cc| Ok(Box::new(inkr::App::new(cc)))),
|
||||
)
|
||||
}
|
||||
|
||||
// When compiling to web using trunk:
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
fn main() {
|
||||
use eframe::wasm_bindgen::JsCast as _;
|
||||
|
||||
// Redirect `log` message to `console.log` and friends:
|
||||
eframe::WebLogger::init(log::LevelFilter::Debug).ok();
|
||||
|
||||
let web_options = eframe::WebOptions::default();
|
||||
|
||||
wasm_bindgen_futures::spawn_local(async {
|
||||
let document = web_sys::window()
|
||||
.expect("No window")
|
||||
.document()
|
||||
.expect("No document");
|
||||
|
||||
let canvas = document
|
||||
.get_element_by_id("the_canvas_id")
|
||||
.expect("Failed to find the_canvas_id")
|
||||
.dyn_into::<web_sys::HtmlCanvasElement>()
|
||||
.expect("the_canvas_id was not a HtmlCanvasElement");
|
||||
|
||||
let start_result = eframe::WebRunner::new()
|
||||
.start(
|
||||
canvas,
|
||||
web_options,
|
||||
Box::new(|cc| Ok(Box::new(inkr::App::new(cc)))),
|
||||
)
|
||||
.await;
|
||||
|
||||
// Remove the loading text and spinner:
|
||||
if let Some(loading_text) = document.get_element_by_id("loading_text") {
|
||||
match start_result {
|
||||
Ok(_) => {
|
||||
loading_text.remove();
|
||||
}
|
||||
Err(e) => {
|
||||
loading_text.set_inner_html(
|
||||
"<p> The app has crashed. See the developer console for details. </p>",
|
||||
);
|
||||
panic!("Failed to start eframe: {e:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
54
src/markdown/ast.rs
Normal file
54
src/markdown/ast.rs
Normal file
@ -0,0 +1,54 @@
|
||||
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 Item<'a> {
|
||||
Text {
|
||||
span: Span<'a>,
|
||||
style: Style,
|
||||
},
|
||||
|
||||
CodeBlock {
|
||||
all: Span<'a>,
|
||||
language: Span<'a>,
|
||||
code: Span<'a>,
|
||||
},
|
||||
}
|
||||
10
src/markdown/grammar.lalrpop
Normal file
10
src/markdown/grammar.lalrpop
Normal file
@ -0,0 +1,10 @@
|
||||
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();
|
||||
138
src/markdown/highlighter.rs
Normal file
138
src/markdown/highlighter.rs
Normal file
@ -0,0 +1,138 @@
|
||||
use egui::text::{CCursorRange, LayoutJob};
|
||||
|
||||
use crate::{
|
||||
markdown::Heading,
|
||||
text_styles::{H1, H1_MONO, H2, H2_MONO, H3, H3_MONO, H4, H4_MONO, H5, H5_MONO, H6, H6_MONO},
|
||||
};
|
||||
|
||||
use super::{Item, Style, parse};
|
||||
|
||||
/// Highlight markdown, caching previous output to save CPU.
|
||||
#[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_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 code_style = Style {
|
||||
code: true,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
for item in parse(text) {
|
||||
match item {
|
||||
Item::Text { span, style } => {
|
||||
job.append(&span, 0.0, format_from_style(egui_style, &style));
|
||||
}
|
||||
Item::CodeBlock {
|
||||
all,
|
||||
language: _, // TODO
|
||||
code: _, // TODO
|
||||
} => {
|
||||
job.append(&all, 100.0, format_from_style(egui_style, &code_style));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
job
|
||||
}
|
||||
|
||||
fn format_from_style(egui_style: &egui::Style, style: &Style) -> egui::text::TextFormat {
|
||||
use egui::{Align, Color32, Stroke, TextStyle};
|
||||
|
||||
let color = if style.code {
|
||||
egui_style.visuals.strong_text_color() * Color32::GREEN
|
||||
} else if style.strong || style.heading.is_some() {
|
||||
egui_style.visuals.strong_text_color()
|
||||
} else if style.quoted {
|
||||
egui_style.visuals.weak_text_color()
|
||||
} else {
|
||||
egui_style.visuals.text_color()
|
||||
};
|
||||
|
||||
let text_style = if let Some(heading) = style.heading {
|
||||
let text_style = match (heading, style.code) {
|
||||
(Heading::H1, false) => H1,
|
||||
(Heading::H2, false) => H2,
|
||||
(Heading::H3, false) => H3,
|
||||
(Heading::H4, false) => H4,
|
||||
(Heading::H5, false) => H5,
|
||||
(Heading::H6, false) => H6,
|
||||
|
||||
(Heading::H1, true) => H1_MONO,
|
||||
(Heading::H2, true) => H2_MONO,
|
||||
(Heading::H3, true) => H3_MONO,
|
||||
(Heading::H4, true) => H4_MONO,
|
||||
(Heading::H5, true) => H5_MONO,
|
||||
(Heading::H6, true) => H6_MONO,
|
||||
};
|
||||
|
||||
TextStyle::Name(text_style.into())
|
||||
} else if style.code {
|
||||
TextStyle::Monospace
|
||||
} else if style.small | style.raised {
|
||||
TextStyle::Small
|
||||
} else {
|
||||
TextStyle::Body
|
||||
};
|
||||
|
||||
let background = if style.code {
|
||||
egui_style.visuals.code_bg_color
|
||||
} else {
|
||||
Color32::TRANSPARENT
|
||||
};
|
||||
|
||||
let underline = if style.underline {
|
||||
Stroke::new(1.0, color)
|
||||
} else {
|
||||
Stroke::NONE
|
||||
};
|
||||
|
||||
let strikethrough = if style.strikethrough {
|
||||
Stroke::new(1.0, color)
|
||||
} else {
|
||||
Stroke::NONE
|
||||
};
|
||||
|
||||
let valign = if style.raised {
|
||||
Align::TOP
|
||||
} else {
|
||||
Align::BOTTOM
|
||||
};
|
||||
|
||||
egui::text::TextFormat {
|
||||
font_id: text_style.resolve(egui_style),
|
||||
color,
|
||||
background,
|
||||
italics: style.italics,
|
||||
underline,
|
||||
strikethrough,
|
||||
valign,
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
11
src/markdown/mod.rs
Normal file
11
src/markdown/mod.rs
Normal file
@ -0,0 +1,11 @@
|
||||
mod ast;
|
||||
mod highlighter;
|
||||
mod parser;
|
||||
mod span;
|
||||
mod tokenizer;
|
||||
|
||||
pub use ast::*;
|
||||
pub use highlighter::*;
|
||||
pub use parser::*;
|
||||
pub use span::*;
|
||||
pub use tokenizer::*;
|
||||
170
src/markdown/parser.rs
Normal file
170
src/markdown/parser.rs
Normal file
@ -0,0 +1,170 @@
|
||||
use std::iter::{self, once};
|
||||
|
||||
use crate::markdown::Style;
|
||||
|
||||
use super::{Item, Span, Token, TokenKind, tokenize};
|
||||
|
||||
pub fn parse(text: &str) -> Vec<Item<'_>> {
|
||||
let tokens: Vec<_> = tokenize(text).collect();
|
||||
parse_tokens(&tokens)
|
||||
}
|
||||
|
||||
pub fn parse_tokens<'a>(mut tokens: &[Token<'a>]) -> Vec<Item<'a>> {
|
||||
// pretend that the first token was preceeded by a newline.
|
||||
// means we don't have to handle the first token as a special case.
|
||||
let mut prev = TokenKind::Newline;
|
||||
|
||||
let mut style = Style::default();
|
||||
|
||||
iter::from_fn(move || {
|
||||
if tokens.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
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 language = collect_until(
|
||||
None,
|
||||
&mut tokens,
|
||||
any_of([TokenKind::Newline]),
|
||||
);
|
||||
|
||||
let code = collect_until(
|
||||
None,
|
||||
&mut tokens,
|
||||
series([TokenKind::Newline, TokenKind::CodeBlock]),
|
||||
);
|
||||
|
||||
let all = [
|
||||
&token.span,
|
||||
&language,
|
||||
&code,
|
||||
].into_iter().fold(Span::empty(), |a, b| a.try_merge(b).unwrap());
|
||||
|
||||
let language = language.trim_end_matches("\n");
|
||||
let code = code.trim_end_matches("\n```");
|
||||
|
||||
return Some(Item::CodeBlock { all, language, code });
|
||||
}
|
||||
|
||||
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 => {
|
||||
let span = collect_until(
|
||||
Some(token),
|
||||
&mut tokens,
|
||||
any_of([TokenKind::Mono, TokenKind::CodeBlock, TokenKind::Newline]),
|
||||
);
|
||||
|
||||
let mut style = style;
|
||||
style.code = true;
|
||||
|
||||
return Some(Item::Text { span, style });
|
||||
}
|
||||
|
||||
// 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: replace dashes with dots
|
||||
//// 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
|
||||
return Some(Item::Text {
|
||||
span: token.span.clone(),
|
||||
style: tmp_style,
|
||||
});
|
||||
}
|
||||
|
||||
Some(Item::Text {
|
||||
span: token.span.clone(),
|
||||
style,
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
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>(
|
||||
first_token: Option<&Token<'a>>,
|
||||
tokens: &mut &[Token<'a>],
|
||||
pattern: impl FnMut(&[Token<'a>; N]) -> bool,
|
||||
) -> Span<'a>
|
||||
where
|
||||
// &[T; N]: TryFrom<&[T]>
|
||||
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()
|
||||
.expect("`windows` promises to return slices of length N")
|
||||
});
|
||||
|
||||
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;
|
||||
|
||||
once(first_token)
|
||||
.flatten()
|
||||
.chain(consume)
|
||||
.fold(Span::empty(), |span: Span<'_>, token| {
|
||||
span.try_merge(&token.span).unwrap()
|
||||
})
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
---
|
||||
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 }"
|
||||
115
src/markdown/span.rs
Normal file
115
src/markdown/span.rs
Normal file
@ -0,0 +1,115 @@
|
||||
use std::{
|
||||
fmt,
|
||||
ops::{Deref, Range},
|
||||
};
|
||||
|
||||
use eyre::{bail, eyre};
|
||||
|
||||
#[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 const fn empty() -> Self {
|
||||
Span {
|
||||
complete_str: "",
|
||||
range: 0..0,
|
||||
}
|
||||
}
|
||||
|
||||
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))
|
||||
}
|
||||
|
||||
pub fn trim_end_matches(&self, p: &str) -> Self {
|
||||
if !self.ends_with(p) {
|
||||
return self.clone();
|
||||
}
|
||||
|
||||
Self {
|
||||
range: self.range.start..self.range.end - p.len(),
|
||||
complete_str: self.complete_str,
|
||||
}
|
||||
}
|
||||
|
||||
/// Try to merge the spans.
|
||||
///
|
||||
/// If either spans is empty, this just returns the other one.
|
||||
/// This only works if spans are pointing into the same backing buffer, and are adjacent.
|
||||
pub fn try_merge(&self, other: &Self) -> eyre::Result<Self> {
|
||||
if self.is_empty() {
|
||||
return Ok(other.clone());
|
||||
}
|
||||
|
||||
if other.is_empty() {
|
||||
return Ok(self.clone());
|
||||
}
|
||||
|
||||
if self.complete_str.as_ptr() != other.complete_str.as_ptr() {
|
||||
bail!("Can't merge different strings");
|
||||
}
|
||||
|
||||
if self.range.end == other.range.start {
|
||||
Ok(Self {
|
||||
range: self.range.start..other.range.end,
|
||||
..*self
|
||||
})
|
||||
} else if self.range.start == other.range.end {
|
||||
Ok(Self {
|
||||
range: other.range.start..self.range.end,
|
||||
..*self
|
||||
})
|
||||
} else {
|
||||
Err(eyre!("String: {:?}", self.complete_str)
|
||||
.wrap_err(eyre!("Span 2: {:?}", other.deref()))
|
||||
.wrap_err(eyre!("Span 1: {:?}", self.deref()))
|
||||
.wrap_err("Can't merge disjoint string spans"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
}
|
||||
146
src/markdown/tokenizer.rs
Normal file
146
src/markdown/tokenizer.rs
Normal file
@ -0,0 +1,146 @@
|
||||
use std::iter;
|
||||
|
||||
use super::{Heading, span::Span};
|
||||
|
||||
#[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: &[(&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);
|
||||
}
|
||||
}
|
||||
107
src/preferences.rs
Normal file
107
src/preferences.rs
Normal file
@ -0,0 +1,107 @@
|
||||
use egui::{Color32, Context, RichText, Theme, Ui, Visuals, style::ScrollAnimation};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct Preferences {
|
||||
/// Enable animations
|
||||
pub animations: bool,
|
||||
|
||||
/// Enable high-contrast theme
|
||||
pub high_contrast: bool,
|
||||
|
||||
/// Hide the cursor when handwriting
|
||||
pub hide_handwriting_cursor: bool,
|
||||
|
||||
#[serde(skip)]
|
||||
has_applied_prefs: bool,
|
||||
}
|
||||
|
||||
impl Default for Preferences {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
animations: true,
|
||||
high_contrast: false,
|
||||
has_applied_prefs: false,
|
||||
hide_handwriting_cursor: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Preferences {
|
||||
/// Apply preferences, if they haven't already been applied.
|
||||
pub fn apply(&mut self, ctx: &Context) {
|
||||
if !self.has_applied_prefs {
|
||||
self.has_applied_prefs = true;
|
||||
|
||||
let scroll_animation = if self.animations {
|
||||
ScrollAnimation::default()
|
||||
} else {
|
||||
ScrollAnimation::none()
|
||||
};
|
||||
|
||||
for theme in [Theme::Dark, Theme::Light] {
|
||||
ctx.style_mut_of(theme, |style| {
|
||||
style.scroll_animation = scroll_animation;
|
||||
});
|
||||
}
|
||||
|
||||
let mut dark_visuals = Visuals::dark();
|
||||
let mut light_visuals = Visuals::light();
|
||||
|
||||
dark_visuals.window_fill = Color32::from_rgb(0x1e, 0x1e, 0x1e);
|
||||
dark_visuals.panel_fill = Color32::from_rgb(0x26, 0x26, 0x26);
|
||||
|
||||
light_visuals.window_fill = Color32::WHITE;
|
||||
light_visuals.panel_fill = Color32::from_rgb(0xf6, 0xf6, 0xf6);
|
||||
|
||||
dark_visuals.code_bg_color = Color32::BLACK;
|
||||
light_visuals.code_bg_color = Color32::WHITE;
|
||||
|
||||
if self.high_contrast {
|
||||
// widgets.active: color of headers in textedit
|
||||
// widgets.inactive: color of button labels
|
||||
// widgets.hovered: color of hovered button labels
|
||||
// widgets.noninteractive: color of labels and normal textedit text
|
||||
|
||||
dark_visuals.widgets.noninteractive.fg_stroke.color = Color32::WHITE;
|
||||
dark_visuals.widgets.inactive.fg_stroke.color = Color32::WHITE;
|
||||
dark_visuals.widgets.hovered.fg_stroke.color = Color32::WHITE;
|
||||
|
||||
light_visuals.widgets.noninteractive.fg_stroke.color = Color32::BLACK;
|
||||
light_visuals.widgets.inactive.fg_stroke.color = Color32::BLACK;
|
||||
light_visuals.widgets.hovered.fg_stroke.color = Color32::BLACK;
|
||||
} else {
|
||||
dark_visuals.widgets.noninteractive.fg_stroke.color =
|
||||
Color32::from_rgb(0xaa, 0xaa, 0xaa);
|
||||
|
||||
light_visuals.widgets.noninteractive.fg_stroke.color =
|
||||
Color32::from_rgb(0x11, 0x11, 0x11);
|
||||
}
|
||||
|
||||
ctx.set_visuals_of(Theme::Dark, dark_visuals);
|
||||
ctx.set_visuals_of(Theme::Light, light_visuals);
|
||||
}
|
||||
}
|
||||
|
||||
/// Show preference switches
|
||||
pub fn show(&mut self, ui: &mut Ui) {
|
||||
ui.label(RichText::new("Prefs").weak());
|
||||
|
||||
let animations_toggle = ui.toggle_value(&mut self.animations, "Animations");
|
||||
if animations_toggle.clicked() {
|
||||
self.has_applied_prefs = false;
|
||||
self.apply(ui.ctx());
|
||||
}
|
||||
|
||||
let high_contrast_toggle = ui.toggle_value(&mut self.high_contrast, "High Contrast");
|
||||
if high_contrast_toggle.clicked() {
|
||||
self.has_applied_prefs = false;
|
||||
self.apply(ui.ctx());
|
||||
}
|
||||
|
||||
ui.toggle_value(&mut self.hide_handwriting_cursor, "Hide Handwriting Cursor");
|
||||
|
||||
egui::widgets::global_theme_preference_buttons(ui);
|
||||
}
|
||||
}
|
||||
321
src/rasterizer.rs
Normal file
321
src/rasterizer.rs
Normal file
@ -0,0 +1,321 @@
|
||||
use core::f32;
|
||||
use egui::{Color32, ColorImage, Pos2, Rect, Vec2, emath::TSTransform, epaint::Vertex};
|
||||
use std::ops::Range;
|
||||
|
||||
pub trait BlendFn {
|
||||
fn blend(a: Color32, b: Color32) -> Color32;
|
||||
}
|
||||
|
||||
pub mod blend {
|
||||
pub struct Normal;
|
||||
pub struct Add;
|
||||
pub struct Multiply;
|
||||
}
|
||||
|
||||
/// Rasterize some triangles onto a new image,
|
||||
///
|
||||
/// Triangle positions must be in image-local point-coords.
|
||||
/// `width` and `height` are in pixel coords.
|
||||
pub fn rasterize<'a, Blend: BlendFn>(
|
||||
width: usize,
|
||||
height: usize,
|
||||
point_to_pixel: TSTransform,
|
||||
triangles: impl Iterator<Item = [&'a Vertex; 3]>,
|
||||
) -> ColorImage {
|
||||
let mut image = ColorImage::filled([width, height], Color32::TRANSPARENT);
|
||||
rasterize_onto::<Blend>(&mut image, point_to_pixel, triangles);
|
||||
image
|
||||
}
|
||||
|
||||
/// Rasterize some triangles onto an image,
|
||||
///
|
||||
/// Triangle positions must be in image-local point-coords.
|
||||
pub fn rasterize_onto<'a, Blend: BlendFn>(
|
||||
image: &mut ColorImage,
|
||||
point_to_pixel: TSTransform,
|
||||
triangles: impl Iterator<Item = [&'a Vertex; 3]>,
|
||||
) {
|
||||
let width = image.width();
|
||||
let height = image.height();
|
||||
|
||||
let mut set_pixel = |x: usize, y: usize, color| {
|
||||
let pixel = &mut image.pixels[y * width + x];
|
||||
*pixel = Blend::blend(*pixel, color);
|
||||
};
|
||||
|
||||
let image_box = PxBoundingBox {
|
||||
x_from: 0,
|
||||
y_from: 0,
|
||||
x_to: width,
|
||||
y_to: height,
|
||||
};
|
||||
|
||||
let pixel_to_point = point_to_pixel.inverse();
|
||||
|
||||
for triangle in triangles {
|
||||
let [a, b, c] = triangle;
|
||||
if triangle_area(a.pos, b.pos, c.pos) == 0.0 {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check all pixels within the triangle's bounding box.
|
||||
let bounding_box =
|
||||
triangle_bounding_box(&triangle, point_to_pixel).intersection(&image_box);
|
||||
|
||||
// TODO: consider subdividing the triangle if it's very large.
|
||||
let pixels = pixels_in_box(bounding_box);
|
||||
|
||||
for [x, y] in pixels {
|
||||
// Calculate point-coordinate of the pixel
|
||||
let pt_pos = pixel_to_point * Pos2::new(x as f32, y as f32);
|
||||
|
||||
let point_in_triangle = point_in_triangle(pt_pos, triangle);
|
||||
|
||||
// If the pixel is within the triangle, fill it in.
|
||||
if point_in_triangle.inside {
|
||||
let [c0, c1, c2] = [0, 1, 2].map(|i| {
|
||||
triangle[i]
|
||||
.color
|
||||
.linear_multiply(point_in_triangle.weights[i])
|
||||
});
|
||||
|
||||
let color = c0 + c1 + c2;
|
||||
|
||||
set_pixel(x, y, color);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Rasterize a single triangles onto an image,
|
||||
///
|
||||
/// Triangle positions must be in image-local point-coords.
|
||||
pub fn rasterize_triangle_onto<Blend: BlendFn>(
|
||||
image: &mut ColorImage,
|
||||
point_to_pixel: TSTransform,
|
||||
triangle: [&Vertex; 3],
|
||||
) {
|
||||
rasterize_onto::<Blend>(image, point_to_pixel, [triangle].into_iter());
|
||||
}
|
||||
|
||||
/// A bounding box, measured in pixels.
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub struct PxBoundingBox {
|
||||
pub x_from: usize,
|
||||
pub y_from: usize,
|
||||
pub x_to: usize,
|
||||
pub y_to: usize,
|
||||
}
|
||||
|
||||
impl PxBoundingBox {
|
||||
pub fn intersection(&self, other: &PxBoundingBox) -> PxBoundingBox {
|
||||
PxBoundingBox {
|
||||
x_from: self.x_from.max(other.x_from),
|
||||
y_from: self.y_from.max(other.y_from),
|
||||
x_to: self.x_to.min(other.x_to),
|
||||
y_to: self.y_to.min(other.y_to),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn union(&self, other: &PxBoundingBox) -> PxBoundingBox {
|
||||
PxBoundingBox {
|
||||
x_from: self.x_from.min(other.x_from),
|
||||
y_from: self.y_from.min(other.y_from),
|
||||
x_to: self.x_to.max(other.x_to),
|
||||
y_to: self.y_to.max(other.y_to),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn x_range(&self) -> Range<usize> {
|
||||
self.x_from..self.x_to
|
||||
}
|
||||
|
||||
pub fn y_range(&self) -> Range<usize> {
|
||||
self.y_from..self.y_to
|
||||
}
|
||||
|
||||
/// Test whether two boxes do NOT overlap
|
||||
pub fn overlaps_with(&self, other: &PxBoundingBox) -> bool {
|
||||
!self.is_disjoint_from(other)
|
||||
}
|
||||
|
||||
pub fn is_disjoint_from(&self, other: &PxBoundingBox) -> bool {
|
||||
self.x_from > other.x_to
|
||||
|| self.y_from > other.y_to
|
||||
|| other.x_from > self.x_to
|
||||
|| other.y_from > self.y_to
|
||||
}
|
||||
}
|
||||
|
||||
pub fn triangle_bounding_box(
|
||||
triangle: &[&Vertex; 3],
|
||||
point_to_pixel: TSTransform,
|
||||
) -> PxBoundingBox {
|
||||
// calculate bounding box in point coords
|
||||
let mut rect = Rect::NOTHING;
|
||||
for vertex in triangle {
|
||||
rect.min = rect.min.min(vertex.pos);
|
||||
rect.max = rect.max.max(vertex.pos);
|
||||
}
|
||||
|
||||
// convert bounding box to pixel coords
|
||||
let rect = point_to_pixel.mul_rect(rect);
|
||||
PxBoundingBox {
|
||||
x_from: rect.min.x.floor() as usize,
|
||||
y_from: rect.min.y.floor() as usize,
|
||||
x_to: rect.max.x.ceil() as usize,
|
||||
y_to: rect.max.y.ceil() as usize,
|
||||
}
|
||||
}
|
||||
|
||||
/// Calculate the perpendicular vector (90 degrees from the given vector)
|
||||
fn perpendicular(v: Vec2) -> Vec2 {
|
||||
Vec2::new(v.y, -v.x)
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct PointInTriangle {
|
||||
/// Is the point inside the triangle?
|
||||
inside: bool,
|
||||
|
||||
/// Normalized weights describing the vicinity between the point and the three verticies of
|
||||
/// thre triangle.
|
||||
weights: [f32; 3],
|
||||
}
|
||||
|
||||
/// Calculate whether a point is within a triangle, and the relative vicinities between the point
|
||||
/// and each triangle vertex. The triangle must have a non-zero area.
|
||||
fn point_in_triangle(point: Pos2, triangle: [&Vertex; 3]) -> PointInTriangle {
|
||||
let [a, b, c] = triangle;
|
||||
|
||||
let sides = [[b, c], [c, a], [a, b]];
|
||||
|
||||
// For each side of the triangle, imagine a new triangle consisting of the side and `point`.
|
||||
// Calculate the areas of those triangles.
|
||||
let areas = sides.map(|[start, end]| signed_triangle_area(start.pos, end.pos, point));
|
||||
|
||||
// Use the areas to determine the side of the line at which the point exists.
|
||||
// If the area is positive, the point is on the right side of the triangle line.
|
||||
let [side_ab, side_bc, side_ca] = areas.map(|area| area >= 0.0);
|
||||
|
||||
// Total area of the traingle.
|
||||
let triangle_area: f32 = areas.iter().sum();
|
||||
|
||||
// egui does not wind the triangles in a consistent order, otherwise we might check if the
|
||||
// point is on a *specific* side of each line. As it is, we just check if the point is on the
|
||||
// same side of each line.
|
||||
let inside = side_ab == side_bc && side_bc == side_ca;
|
||||
|
||||
// Normalize the weights.
|
||||
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 }
|
||||
}
|
||||
|
||||
/// Calculate the area of a triangle.
|
||||
fn triangle_area(a: Pos2, b: Pos2, c: Pos2) -> f32 {
|
||||
signed_triangle_area(a, b, c).abs()
|
||||
}
|
||||
|
||||
/// Calculate the area of a triangle.
|
||||
///
|
||||
/// The area will be positive if the triangle is wound clockwise, and negative otherwise.
|
||||
fn signed_triangle_area(a: Pos2, b: Pos2, c: Pos2) -> f32 {
|
||||
// Vector of an arbitrary "base" side of the triangle.
|
||||
let base = c - a;
|
||||
let base_perp = perpendicular(base);
|
||||
let diagonal = c - b;
|
||||
base_perp.dot(diagonal) / 2.0
|
||||
}
|
||||
|
||||
/// Iterate over every pixel coordinate in a box.
|
||||
#[inline(always)]
|
||||
fn pixels_in_box(
|
||||
PxBoundingBox {
|
||||
x_from,
|
||||
y_from,
|
||||
x_to,
|
||||
y_to,
|
||||
}: PxBoundingBox,
|
||||
) -> impl ExactSizeIterator<Item = [usize; 2]> {
|
||||
struct IterWithLen<I>(I, usize);
|
||||
impl<I: Iterator> ExactSizeIterator for IterWithLen<I> {}
|
||||
impl<I: Iterator> Iterator for IterWithLen<I> {
|
||||
type Item = I::Item;
|
||||
|
||||
fn size_hint(&self) -> (usize, Option<usize>) {
|
||||
(self.1, Some(self.1))
|
||||
}
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
self.0.next()
|
||||
}
|
||||
}
|
||||
|
||||
let len = (x_from..x_to).len() * (y_from..y_to).len();
|
||||
let iter = (x_from..x_to).flat_map(move |x| (y_from..y_to).map(move |y| [x, y]));
|
||||
|
||||
debug_assert_eq!(len, iter.clone().count());
|
||||
|
||||
IterWithLen(iter, len)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use egui::{Color32, Pos2, Vec2, emath::TSTransform, epaint::Vertex};
|
||||
|
||||
use super::triangle_bounding_box;
|
||||
|
||||
#[test]
|
||||
fn px_bounding_box() {
|
||||
let triangle = [
|
||||
Vertex {
|
||||
pos: Pos2::new(56.3, 18.9),
|
||||
uv: Default::default(),
|
||||
color: Color32::WHITE,
|
||||
},
|
||||
Vertex {
|
||||
pos: Pos2::new(56.4, 19.6),
|
||||
uv: Default::default(),
|
||||
color: Color32::WHITE,
|
||||
},
|
||||
Vertex {
|
||||
pos: Pos2::new(55.8, 20.5),
|
||||
uv: Default::default(),
|
||||
color: Color32::WHITE,
|
||||
},
|
||||
];
|
||||
|
||||
let pixels_per_point = 2.0;
|
||||
let point_to_pixel = TSTransform {
|
||||
scaling: pixels_per_point,
|
||||
translation: Vec2::new(-55.8, -18.9) * pixels_per_point,
|
||||
};
|
||||
|
||||
let bounding_box = triangle_bounding_box(&triangle.each_ref(), point_to_pixel);
|
||||
|
||||
insta::assert_debug_snapshot!((triangle, point_to_pixel, bounding_box));
|
||||
}
|
||||
}
|
||||
|
||||
impl BlendFn for blend::Normal {
|
||||
fn blend(a: Color32, b: Color32) -> Color32 {
|
||||
a.blend(b)
|
||||
}
|
||||
}
|
||||
|
||||
impl BlendFn for blend::Add {
|
||||
fn blend(a: Color32, b: Color32) -> Color32 {
|
||||
a + b
|
||||
}
|
||||
}
|
||||
|
||||
impl BlendFn for blend::Multiply {
|
||||
fn blend(a: Color32, b: Color32) -> Color32 {
|
||||
a * b
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
---
|
||||
source: src/custom_code_block.rs
|
||||
expression: list
|
||||
---
|
||||
[
|
||||
Line(
|
||||
"\n",
|
||||
),
|
||||
Line(
|
||||
"# Hello world\n",
|
||||
),
|
||||
Line(
|
||||
"## Subheader\n",
|
||||
),
|
||||
Line(
|
||||
"- 1\n",
|
||||
),
|
||||
CodeBlock {
|
||||
key: "foo",
|
||||
content: " whatever\n some code\n Hi mom!",
|
||||
span: "```foo\n whatever\n some code\n Hi mom!\n```",
|
||||
},
|
||||
Line(
|
||||
" \n",
|
||||
),
|
||||
Line(
|
||||
"\n",
|
||||
),
|
||||
CodeBlock {
|
||||
key: "` # wrong number of ticks, but that's ok",
|
||||
content: " ``` # indented ticks",
|
||||
span: "```` # wrong number of ticks, but that's ok\n ``` # indented ticks\n```\n",
|
||||
},
|
||||
Line(
|
||||
"\n",
|
||||
),
|
||||
Line(
|
||||
"``` # no closing ticks\n",
|
||||
),
|
||||
Line(
|
||||
" ",
|
||||
),
|
||||
]
|
||||
@ -0,0 +1,18 @@
|
||||
---
|
||||
source: src/custom_code_block.rs
|
||||
expression: markdown
|
||||
---
|
||||
# Hello world
|
||||
## Subheader
|
||||
- 1
|
||||
```foo
|
||||
whatever
|
||||
some code
|
||||
Hi mom!
|
||||
```
|
||||
|
||||
```` # wrong number of ticks, but that's ok
|
||||
``` # indented ticks
|
||||
```
|
||||
|
||||
``` # no closing ticks
|
||||
19
src/snapshots/inkr__painting__test__handwriting example.snap
Normal file
19
src/snapshots/inkr__painting__test__handwriting example.snap
Normal file
@ -0,0 +1,19 @@
|
||||
---
|
||||
source: src/painting.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/painting.rs
|
||||
expression: serialized
|
||||
---
|
||||
```handwriting
|
||||
BQAAvAA8AEIAPABCAEIAPgBAAAAAAAQAAEIAQgC8ADwAAAAAAEIAPA==
|
||||
```
|
||||
33
src/snapshots/inkr__rasterizer__test__px_bounding_box.snap
Normal file
33
src/snapshots/inkr__rasterizer__test__px_bounding_box.snap
Normal file
@ -0,0 +1,33 @@
|
||||
---
|
||||
source: src/rasterizer.rs
|
||||
expression: "(triangle, point_to_pixel, bounding_box)"
|
||||
---
|
||||
(
|
||||
[
|
||||
Vertex {
|
||||
pos: [56.3 18.9],
|
||||
uv: [0.0 0.0],
|
||||
color: #FF_FF_FF_FF,
|
||||
},
|
||||
Vertex {
|
||||
pos: [56.4 19.6],
|
||||
uv: [0.0 0.0],
|
||||
color: #FF_FF_FF_FF,
|
||||
},
|
||||
Vertex {
|
||||
pos: [55.8 20.5],
|
||||
uv: [0.0 0.0],
|
||||
color: #FF_FF_FF_FF,
|
||||
},
|
||||
],
|
||||
TSTransform {
|
||||
scaling: 2.0,
|
||||
translation: [-111.6 -37.8],
|
||||
},
|
||||
PxBoundingBox {
|
||||
x_from: 0,
|
||||
y_from: 0,
|
||||
x_to: 2,
|
||||
y_to: 4,
|
||||
},
|
||||
)
|
||||
133
src/text_editor.rs
Normal file
133
src/text_editor.rs
Normal file
@ -0,0 +1,133 @@
|
||||
use std::{
|
||||
convert::Infallible,
|
||||
fmt::{self, Display},
|
||||
iter::repeat_n,
|
||||
};
|
||||
|
||||
use egui::{
|
||||
Color32, InputState, Key, Modifiers, TextBuffer, TextEdit, Ui, Vec2, text::CCursorRange,
|
||||
};
|
||||
|
||||
use crate::markdown::MemoizedHighlighter;
|
||||
|
||||
#[derive(Default, serde::Deserialize, serde::Serialize)]
|
||||
pub struct MdTextEdit {
|
||||
pub text: String,
|
||||
|
||||
#[serde(skip)]
|
||||
highlighter: MemoizedHighlighter,
|
||||
|
||||
#[serde(skip)]
|
||||
focused: bool,
|
||||
|
||||
#[serde(skip)]
|
||||
cursor: Option<CCursorRange>,
|
||||
}
|
||||
|
||||
pub struct MdTextEditOutput {
|
||||
pub changed: bool,
|
||||
}
|
||||
|
||||
impl MdTextEdit {
|
||||
pub fn new() -> Self {
|
||||
MdTextEdit::default()
|
||||
}
|
||||
|
||||
pub fn from_text(text: String) -> Self {
|
||||
MdTextEdit {
|
||||
text,
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ui(&mut self, ui: &mut Ui) -> MdTextEditOutput {
|
||||
let Self {
|
||||
text,
|
||||
highlighter,
|
||||
focused,
|
||||
cursor,
|
||||
} = self;
|
||||
|
||||
let w = ui.available_width();
|
||||
|
||||
let mut layouter = |ui: &egui::Ui, markdown: &dyn TextBuffer, _wrap_width: f32| {
|
||||
let mut layout_job = highlighter.highlight(ui.style(), markdown.as_str(), *cursor);
|
||||
layout_job.wrap.max_width = w - 10.0;
|
||||
ui.fonts(|f| f.layout_job(layout_job))
|
||||
};
|
||||
|
||||
if *focused {
|
||||
ui.input_mut(|input| {
|
||||
handle_tab_input(text, input, *cursor);
|
||||
});
|
||||
}
|
||||
|
||||
let text_edit = TextEdit::multiline(text)
|
||||
.layouter(&mut layouter)
|
||||
.background_color(Color32::TRANSPARENT)
|
||||
.desired_rows(1)
|
||||
.min_size(Vec2::new(w, 0.0))
|
||||
.lock_focus(true)
|
||||
.show(ui);
|
||||
|
||||
*focused = text_edit.response.has_focus();
|
||||
|
||||
if *cursor != text_edit.cursor_range {
|
||||
*cursor = text_edit.cursor_range;
|
||||
//ui.ctx().request_repaint();
|
||||
}
|
||||
|
||||
MdTextEditOutput {
|
||||
changed: text_edit.response.changed(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_tab_input(
|
||||
text: &mut String,
|
||||
input: &mut InputState,
|
||||
cursor: Option<CCursorRange>,
|
||||
) -> Option<Infallible> {
|
||||
let break_if_not = || ();
|
||||
let cursor = cursor.and_then(|c| c.single())?;
|
||||
|
||||
let do_unindent = input.consume_key(Modifiers::SHIFT, Key::Tab);
|
||||
let do_indent = input.consume_key(Modifiers::NONE, Key::Tab);
|
||||
|
||||
(do_unindent || do_indent).then(break_if_not)?;
|
||||
|
||||
let row_n = text
|
||||
.chars()
|
||||
.take(cursor.index)
|
||||
.filter(|&c| c == '\n')
|
||||
.count();
|
||||
|
||||
let row = text.lines().nth(row_n)?;
|
||||
let (indent, content) = row.split_once("- ")?;
|
||||
indent.trim().is_empty().then(break_if_not)?;
|
||||
|
||||
let indents = indent.chars().count() / 2;
|
||||
let indents = if do_indent {
|
||||
indents + 1
|
||||
} else if indents == 0 {
|
||||
return None;
|
||||
} else {
|
||||
indents.saturating_sub(1)
|
||||
};
|
||||
*text = text
|
||||
.lines()
|
||||
.take(row_n)
|
||||
.flat_map(|line| [line, "\n"])
|
||||
.chain(repeat_n(" ", indents))
|
||||
.chain([format!("- {content}\n").as_str()])
|
||||
.chain(text.lines().skip(row_n + 1).flat_map(|line| [line, "\n"]))
|
||||
.collect();
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
impl Display for MdTextEdit {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{}", self.text)
|
||||
}
|
||||
}
|
||||
14
src/text_styles.rs
Normal file
14
src/text_styles.rs
Normal file
@ -0,0 +1,14 @@
|
||||
//! Name of custom [egui::TextStyle]s
|
||||
|
||||
pub const H1: &str = "H1";
|
||||
pub const H2: &str = "H2";
|
||||
pub const H3: &str = "H3";
|
||||
pub const H4: &str = "H4";
|
||||
pub const H5: &str = "H5";
|
||||
pub const H6: &str = "H6";
|
||||
pub const H1_MONO: &str = "H1-mono";
|
||||
pub const H2_MONO: &str = "H2-mono";
|
||||
pub const H3_MONO: &str = "H3-mono";
|
||||
pub const H4_MONO: &str = "H4-mono";
|
||||
pub const H5_MONO: &str = "H5-mono";
|
||||
pub const H6_MONO: &str = "H6-mono";
|
||||
56
src/util.rs
Normal file
56
src/util.rs
Normal file
@ -0,0 +1,56 @@
|
||||
use std::{fs::File, os::unix::fs::MetadataExt as _, sync::mpsc};
|
||||
|
||||
use chrono::{DateTime, Local};
|
||||
use egui::Id;
|
||||
use eyre::{Context, ContextCompat};
|
||||
use rand::{Rng, rng};
|
||||
|
||||
pub fn random_id() -> Id {
|
||||
Id::new(rng().random::<u64>())
|
||||
}
|
||||
|
||||
/// An [mpsc::Sender] where the receiver is the GUI.
|
||||
#[derive(Clone)]
|
||||
pub struct GuiSender<T> {
|
||||
tx: mpsc::Sender<T>,
|
||||
ctx: egui::Context,
|
||||
}
|
||||
|
||||
impl<T> GuiSender<T> {
|
||||
pub fn new(tx: mpsc::Sender<T>, ctx: &egui::Context) -> Self {
|
||||
Self {
|
||||
tx,
|
||||
ctx: ctx.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn send(&self, t: T) -> Result<(), mpsc::SendError<T>> {
|
||||
self.tx.send(t)?;
|
||||
self.ctx.request_repaint();
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[track_caller]
|
||||
pub fn log_error<T>(chain: eyre::Report, f: impl FnOnce() -> eyre::Result<T>) -> Option<T> {
|
||||
f().map_err(|e| e.wrap_err(chain))
|
||||
.inspect_err(|e| log::error!("{e}"))
|
||||
.ok()
|
||||
}
|
||||
|
||||
pub fn file_mtime(file: &File) -> eyre::Result<DateTime<Local>> {
|
||||
(move || {
|
||||
let meta = file.metadata().wrap_err("Failed to stat file")?;
|
||||
|
||||
let sec = meta.mtime();
|
||||
let nsec = meta
|
||||
.mtime_nsec()
|
||||
.try_into()
|
||||
.wrap_err("Nanoseconds overflowed")?;
|
||||
|
||||
DateTime::from_timestamp(sec, nsec)
|
||||
.wrap_err("Bad timestamp")
|
||||
.map(Into::into)
|
||||
})()
|
||||
.wrap_err("Failed to get file mtime")
|
||||
}
|
||||
Reference in New Issue
Block a user