chore: update to shadow-terminal v0.2.0

Required updating to some breaking changes.

Author: tombh

Cargo.lock

@@ -23,14 +23,8 @@ tracing = "0.1.40"
 tracing-subscriber = {version = "0.3.18", features = ["env-filter"]}
 
 [workspace.dependencies.shadow-terminal]
-version = "0.1.1"
-# path = "../../shadow-terminal"
-
-[workspace.dependencies.termwiz]
-package = "tattoy-termwiz"
-features = ["use_serde"]
-version = "0.24.0-fork"
-# path = "../wezterm/termwiz"
+version = "0.2.0"
+# path = "../shadow-terminal/shadow-terminal/"
 
 # Canonical lints for whole crate
 #

Cargo.toml

@@ -27,7 +27,6 @@ serde.workspace = true
 serde_json.workspace = true
 tattoy-protocol = { path = "../tattoy-protocol", version = "0.1.0" }
 tempfile.workspace = true
-termwiz.workspace = true
 tokio.workspace = true
 toml = "0.8.20"
 tracing.workspace = true

crates/tattoy/Cargo.toml

@@ -5,7 +5,7 @@ use palette::{
     color_difference::Wcag21RelativeContrast as _, DarkenAssign as _, IntoColor as _,
     LightenAssign as _,
 };
-use termwiz::cell::Cell;
+use shadow_terminal::termwiz;
 
 /// This is the default colour for when an opaque cell is over a "blank" cell.
 ///
@@ -27,7 +27,7 @@ enum Kind {
 /// having a dedicated module hopefully makes things a bit simpler.
 pub(crate) struct Blender<'cell> {
     /// The normal underlying cell
-    cell: &'cell mut Cell,
+    cell: &'cell mut termwiz::cell::Cell,
     /// The true colour value to use when the cell doesn't have a colour.
     default_colour: termwiz::color::SrgbaTuple,
     /// The opacity of the cell above.
@@ -37,7 +37,7 @@ pub(crate) struct Blender<'cell> {
 impl<'cell> Blender<'cell> {
     /// Instantiate
     pub const fn new(
-        cell: &'cell mut Cell,
+        cell: &'cell mut termwiz::cell::Cell,
         maybe_default_bg_colour: Option<termwiz::color::SrgbaTuple>,
         cell_above_opacity: f32,
     ) -> Self {
@@ -104,7 +104,7 @@ impl<'cell> Blender<'cell> {
     }
 
     /// Blend the cell's colours with the cell above.
-    pub fn blend_all(&mut self, cell_above: &Cell) {
+    pub fn blend_all(&mut self, cell_above: &termwiz::cell::Cell) {
         let character_above = cell_above.str();
         let character_above_is_empty = character_above.is_empty() || character_above == " ";
         if character_above_is_empty {
@@ -269,7 +269,7 @@ mod test {
     async fn blend_pixels(
         maybe_first: Option<(usize, usize, crate::surface::Colour)>,
         maybe_second: Option<(usize, usize, crate::surface::Colour)>,
-    ) -> Cell {
+    ) -> termwiz::cell::Cell {
         let mut renderer = make_renderer().await;
         let mut tattoy_below = crate::surface::Surface::new("below".into(), 1, 1, 1, 1.0);
         if let Some(first) = maybe_first {

crates/tattoy/src/blender.rs

@@ -1,5 +1,6 @@
 //! Composite individual cells into the final renderablsee frame.
 use color_eyre::eyre::{ContextCompat as _, Result};
+use shadow_terminal::termwiz;
 
 /// Composite cells together, honouring alpha blending, text and pixels.
 #[derive(Default)]

crates/tattoy/src/compositor.rs

@@ -1,5 +1,7 @@
 //! Supporting user-defined keybindings.
 
+use shadow_terminal::termwiz;
+
 /// The user config for defining keybindings.
 #[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq, Debug, Clone)]
 pub(crate) struct KeybindingConfigRaw {

crates/tattoy/src/config/input.rs

@@ -3,6 +3,8 @@
 use color_eyre::eyre::ContextCompat as _;
 use color_eyre::eyre::Result;
 
+use shadow_terminal::termwiz;
+
 /// A copy of the default config file. It gets copied to the user's config folder the first time
 /// they start Tattoy.
 static DEFAULT_CONFIG: &str = include_str!("../../default_config.toml");

crates/tattoy/src/config/main.rs

@@ -1,6 +1,7 @@
 //! Convert palette indexes to true colour values.
 
 use color_eyre::{eyre::ContextCompat as _, Result};
+use shadow_terminal::termwiz;
 
 /// This might be a big assumption, but I think the convention is that text uses this colour from
 /// the palette when no other index or true colour is specified.
@@ -112,12 +113,17 @@ impl Palette {
     }
 
     /// Convert TTY cell palette indexes into their true colour values.
-    pub fn convert_cells_to_true_colour(&self, output: &mut shadow_terminal::output::Output) {
+    pub fn convert_cells_to_true_colour(
+        &self,
+        output: &mut shadow_terminal::output::native::Output,
+    ) {
         match output {
-            shadow_terminal::output::Output::Diff(surface_diff) => {
+            shadow_terminal::output::native::Output::Diff(surface_diff) => {
                 let changes = match surface_diff {
-                    shadow_terminal::output::SurfaceDiff::Scrollback(diff) => &mut diff.changes,
-                    shadow_terminal::output::SurfaceDiff::Screen(diff) => &mut diff.changes,
+                    shadow_terminal::output::native::SurfaceDiff::Scrollback(diff) => {
+                        &mut diff.changes
+                    }
+                    shadow_terminal::output::native::SurfaceDiff::Screen(diff) => &mut diff.changes,
                     _ => {
                         tracing::error!(
                             "Unrecognised surface diff when converting cells to true colour"
@@ -132,12 +138,12 @@ impl Palette {
                     }
                 }
             }
-            shadow_terminal::output::Output::Complete(complete_surface) => {
+            shadow_terminal::output::native::Output::Complete(complete_surface) => {
                 let cells = match complete_surface {
-                    shadow_terminal::output::CompleteSurface::Scrollback(scrollback) => {
+                    shadow_terminal::output::native::CompleteSurface::Scrollback(scrollback) => {
                         scrollback.surface.screen_cells()
                     }
-                    shadow_terminal::output::CompleteSurface::Screen(screen) => {
+                    shadow_terminal::output::native::CompleteSurface::Screen(screen) => {
                         screen.surface.screen_cells()
                     }
                     _ => {

crates/tattoy/src/palette/converter.rs

@@ -2,6 +2,7 @@
 //! index.
 
 use color_eyre::eyre::{ContextCompat as _, Result};
+use shadow_terminal::termwiz;
 use termwiz::terminal::Terminal as _;
 use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
 

crates/tattoy/src/palette/osc.rs

@@ -3,6 +3,7 @@
 use std::io::Read as _;
 
 use color_eyre::eyre::Result;
+use shadow_terminal::termwiz;
 
 /// Bytes from STDIN
 pub type BytesFromSTDIN = [u8; 128];