From c3b9ecf4028f957068bf5bae1c35e7bb3709d9f2 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sat, 12 Jul 2025 13:33:58 +0200
Subject: [PATCH] update to released version

---
 Cargo.lock              | 14 ++------------
 Cargo.toml              |  1 -
 flake.nix               |  1 +
 src/command_executor.rs | 12 +++++-------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3ab7490..86521f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -760,17 +760,6 @@ dependencies = [
  "hashbrown",
 ]
 
-[[package]]
-name = "inherent"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c38228f24186d9cc68c729accb4d413be9eaed6ad07ff79e0270d9e56f3de13"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1522,11 +1511,12 @@ dependencies = [
 [[package]]
 name = "servicepoint"
 version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b04582e916474f1bc1605cad3773262c425d9062b487e49a0df59662f2cca8d"
 dependencies = [
  "bitvec",
  "bzip2",
  "flate2",
- "inherent",
  "log",
  "once_cell",
  "rust-lzma",
diff --git a/Cargo.toml b/Cargo.toml
index bb37e66..7f923f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,6 @@ softbuffer = "0.4.6"
 [dependencies.servicepoint]
 version = "0.16.0"
 features = ["all_compressions"]
-path = "../servicepoint-uniffi3"
 
 [profile.release]
 lto = true          # Enable link-time optimization
diff --git a/flake.nix b/flake.nix
index b5f5964..ffe1341 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,7 @@
             NIX_LD_LIBRARY_PATH = LD_LIBRARY_PATH;
             NIX_LD = pkgs.stdenv.cc.bintools.dynamicLinker;
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+            RUST_BACKTRACE = "1";
           };
         }
       );
diff --git a/src/command_executor.rs b/src/command_executor.rs
index 69ae30c..4ea676e 100644
--- a/src/command_executor.rs
+++ b/src/command_executor.rs
@@ -7,7 +7,7 @@ use log::{debug, error, info, trace, warn};
 use servicepoint::{
     BinaryOperation, BitVecCommand, Bitmap, BitmapCommand, BrightnessGrid,
     BrightnessGridCommand, CharGridCommand, ClearCommand, CompressionCode,
-    Cp437GridCommand, FadeOutCommand, GlobalBrightnessCommand,
+    Cp437GridCommand, FadeOutCommand, GlobalBrightnessCommand, Grid, GridMut,
     HardResetCommand, Origin, TypedCommand, PIXEL_COUNT, PIXEL_WIDTH,
     TILE_SIZE,
 };
@@ -195,17 +195,15 @@ impl CommandExecute for CharGridCommand {
                 let char = grid.get(char_x, char_y);
                 trace!("drawing {char}");
 
-                let tile_x = char_x + x;
-                let tile_y = char_y + y;
+                let pixel_x = (char_x + x) * TILE_SIZE;
+                let pixel_y = (char_y + y) * TILE_SIZE;
 
                 if let Err(e) = context.font_renderer.render(
                     char,
                     &mut display
                         .window_mut(
-                            tile_x * TILE_SIZE,
-                            tile_y * TILE_SIZE,
-                            TILE_SIZE,
-                            TILE_SIZE,
+                            pixel_x..pixel_x + TILE_SIZE,
+                            pixel_y..pixel_y + TILE_SIZE,
                         )
                         .unwrap(),
                 ) {