Separate helix-input and helix-graphics from helix-view.

Cargo.toml

@@ -2,6 +2,8 @@
 resolver = "2"
 members = [
   "helix-core",
+  "helix-graphics",
+  "helix-input",
   "helix-view",
   "helix-term",
   "helix-tui",

helix-graphics/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "helix-graphics"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
+license.workspace = true
+rust-version.workspace = true
+
+[features]
+default = []
+term = ["termina", "crossterm"]
+
+[dependencies]
+helix-core = { path = "../helix-core" }
+helix-loader = { path = "../helix-loader" }
+bitflags.workspace = true
+anyhow = "1"
+
+termina = { workspace = true, optional = true }
+
+# Conversion traits
+once_cell = "1.21"
+
+serde = { version = "1.0", features = ["derive"] }
+toml.workspace = true
+log = "~0.4"
+
+[target.'cfg(windows)'.dependencies]
+crossterm = { version = "0.28", optional = true }

helix-graphics/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod graphics;
+pub mod theme;

helix-input/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "helix-input"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
+license.workspace = true
+rust-version.workspace = true
+
+[features]
+default = []
+term = ["termina", "crossterm"]
+
+[dependencies]
+helix-stdx = { path = "../helix-stdx" }
+helix-core = { path = "../helix-core" }
+
+bitflags.workspace = true
+anyhow = "1"
+termina = { workspace = true, optional = true }
+
+serde = { version = "1.0", features = ["derive"] }
+log = "~0.4"
+
+thiserror.workspace = true
+
+[target.'cfg(windows)'.dependencies]
+clipboard-win = { version = "5.4", features = ["std"] }
+crossterm = { version = "0.28", optional = true }
+
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
+rustix = { version = "1.1", features = ["fs"] }

helix-input/src/lib.rs

@@ -0,0 +1,3 @@
+pub mod clipboard;
+pub mod input;
+pub mod keyboard;

helix-view/Cargo.toml

@@ -12,7 +12,7 @@ homepage.workspace = true
 
 [features]
 default = []
-term = ["termina", "crossterm"]
+term = ["termina", "crossterm", "helix-graphics/term", "helix-input/term"]
 unicode-lines = []
 
 [dependencies]
@@ -23,6 +23,8 @@ helix-loader = { path = "../helix-loader" }
 helix-lsp = { path = "../helix-lsp" }
 helix-dap = { path = "../helix-dap" }
 helix-vcs = { path = "../helix-vcs" }
+helix-graphics = { path = "../helix-graphics" }
+helix-input = { path = "../helix-input" }
 
 bitflags.workspace = true
 anyhow = "1"

helix-view/src/lib.rs

@@ -2,22 +2,24 @@
 pub mod macros;
 
 pub mod annotations;
-pub mod clipboard;
 pub mod document;
 pub mod editor;
 pub mod events;
 pub mod expansion;
-pub mod graphics;
 pub mod gutter;
 pub mod handlers;
 pub mod info;
-pub mod input;
-pub mod keyboard;
 pub mod register;
-pub mod theme;
 pub mod tree;
 pub mod view;
 
+pub use helix_input::clipboard;
+pub use helix_input::input;
+pub use helix_input::keyboard;
+
+pub use helix_graphics::graphics;
+pub use helix_graphics::theme;
+
 use std::num::NonZeroUsize;
 
 // uses NonZeroUsize so Option<DocumentId> use a byte rather than two