fix: fix local dependencies

Cargo.lock

@@ -245,10 +245,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
-[[package]]
-name = "common"
-version = "0.1.0"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -908,7 +904,6 @@ dependencies = [
  "bitflags 1.3.2",
  "chrono",
  "clap",
- "common",
  "crossbeam",
  "defer-drop",
  "derive_builder",
@@ -922,14 +917,33 @@ dependencies = [
  "regex",
  "shell-quote",
  "shlex",
+ "skim-common",
+ "skim-tuikit",
  "time",
  "timer",
- "tuikit",
  "unicode-width",
  "vte",
  "which",
 ]
 
+[[package]]
+name = "skim-common"
+version = "0.1.0"
+
+[[package]]
+name = "skim-tuikit"
+version = "0.6.0"
+dependencies = [
+ "bitflags 1.3.2",
+ "env_logger",
+ "lazy_static",
+ "log",
+ "nix",
+ "skim-common",
+ "term",
+ "unicode-width",
+]
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1029,20 +1043,6 @@ dependencies = [
  "chrono",
 ]
 
-[[package]]
-name = "tuikit"
-version = "0.6.0"
-dependencies = [
- "bitflags 1.3.2",
- "common",
- "env_logger",
- "lazy_static",
- "log",
- "nix",
- "term",
- "unicode-width",
-]
-
 [[package]]
 name = "unicase"
 version = "2.8.1"

skim-tuikit/README.md

@@ -34,7 +34,7 @@ tuikit = { git = "https://github.com/lotabout/tuikit.git" }
 Here is an example (could also be run by `cargo run --example hello-world`):
 
 ```rust
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 use std::cmp::{min, max};
 
 fn main() {
@@ -78,7 +78,7 @@ fn main() {
 For example:
 
 ```rust
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 
 struct Model(String);
 

skim-tuikit/examples/256color.rs

@@ -1,5 +1,5 @@
+use skim_tuikit::attr::Color;
 use std::io;
-use tuikit::attr::Color;
 use tuikit::output::Output;
 
 fn main() {

skim-tuikit/examples/256color_on_screen.rs

@@ -1,8 +1,8 @@
+use skim_tuikit::attr::{Attr, Color};
+use skim_tuikit::canvas::Canvas;
+use skim_tuikit::screen::Screen;
 use std::io;
-use tuikit::attr::{Attr, Color};
-use tuikit::canvas::Canvas;
 use tuikit::output::Output;
-use tuikit::screen::Screen;
 
 fn main() {
     let mut output = Output::new(Box::new(io::stdout())).unwrap();

skim-tuikit/examples/custom-event.rs

@@ -1,6 +1,6 @@
 use bitflags::_core::result::Result::Ok;
 
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 
 fn main() {
     let term: Term<String> = Term::with_height(TermHeight::Percent(30)).expect("term creation error");

skim-tuikit/examples/get_keys.rs

@@ -1,8 +1,8 @@
+use skim_tuikit::input::KeyBoard;
+use skim_tuikit::output::Output;
+use skim_tuikit::raw::IntoRawMode;
 use std::time::Duration;
-use tuikit::input::KeyBoard;
 use tuikit::key::Key;
-use tuikit::output::Output;
-use tuikit::raw::IntoRawMode;
 
 fn main() {
     let _stdout = std::io::stdout().into_raw_mode().unwrap();

skim-tuikit/examples/hello-world.rs

@@ -1,5 +1,5 @@
+use skim_tuikit::prelude::*;
 use std::cmp::{max, min};
-use tuikit::prelude::*;
 
 fn main() {
     let term: Term<()> = Term::with_height(TermHeight::Percent(30)).unwrap();

skim-tuikit/examples/split.rs

@@ -1,4 +1,4 @@
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 
 struct Fit(String);
 

skim-tuikit/examples/stack.rs

@@ -1,4 +1,4 @@
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 
 struct Model {
     win: String,

skim-tuikit/examples/term_size.rs

@@ -1,5 +1,5 @@
+use skim_tuikit::output::Output;
 use std::io;
-use tuikit::output::Output;
 
 fn main() {
     let output = Output::new(Box::new(io::stdout())).unwrap();

skim-tuikit/examples/termbox.rs

@@ -1,7 +1,7 @@
+use skim_tuikit::prelude::*;
 use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
-use tuikit::prelude::*;
 
 extern crate env_logger;
 

skim-tuikit/examples/true_color.rs

@@ -1,5 +1,5 @@
+use skim_tuikit::attr::Color;
 use std::io;
-use tuikit::attr::Color;
 use tuikit::output::Output;
 
 // ported from: https://github.com/gnachman/iTerm2/blob/master/tests/24-bit-color.sh

skim-tuikit/examples/win.rs

@@ -1,4 +1,4 @@
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 
 struct Model(String);
 

skim-tuikit/src/lib.rs

@@ -69,7 +69,7 @@ pub mod output;
 pub mod prelude;
 pub mod raw;
 pub mod screen;
-use common::spinlock;
+use skim_common::spinlock;
 mod sys;
 pub mod term;
 pub mod widget;

skim/src/ansi.rs

@@ -2,8 +2,8 @@
 use std::default::Default;
 
 use beef::lean::Cow;
+use skim_tuikit::prelude::*;
 use std::cmp::max;
-use tuikit::prelude::*;
 use vte::{Params, Perform};
 
 /// An ANSI Parser, will parse one line at a time.

skim/src/event.rs

@@ -1,7 +1,7 @@
 // All the events that will be used
 
+use skim_tuikit::key::Key;
 use std::sync::mpsc::{Receiver, Sender};
-use tuikit::key::Key;
 
 pub type EventReceiver = Receiver<(Key, Event)>;
 pub type EventSender = Sender<(Key, Event)>;

skim/src/header.rs

@@ -8,9 +8,9 @@ use crate::theme::DEFAULT_THEME;
 use crate::util::{clear_canvas, print_item, str_lines, LinePrinter};
 use crate::{DisplayContext, Matches, SkimOptions};
 use defer_drop::DeferDrop;
+use skim_tuikit::prelude::*;
 use std::cmp::max;
 use std::sync::Arc;
-use tuikit::prelude::*;
 
 pub struct Header {
     header: Vec<AnsiString<'static>>,

skim/src/helper/item.rs

@@ -2,8 +2,8 @@ use crate::ansi::ANSIParser;
 use crate::field::{parse_matching_fields, parse_transform_fields, FieldRange};
 use crate::{AnsiString, DisplayContext, Matches, SkimItem};
 use regex::Regex;
+use skim_tuikit::prelude::Attr;
 use std::borrow::Cow;
-use tuikit::prelude::Attr;
 
 //------------------------------------------------------------------------------
 /// An item will store everything that one line input will need to be operated and displayed.

skim/src/input.rs

@@ -2,10 +2,10 @@
 //! keystrokes(such as Enter, Ctrl-p, Ctrl-n, etc) to the controller.
 use crate::event::{parse_event, Event};
 use regex::Regex;
+use skim_tuikit::event::Event as TermEvent;
+use skim_tuikit::key::{from_keyname, Key};
 use std::collections::HashMap;
 use std::sync::LazyLock;
-use tuikit::event::Event as TermEvent;
-use tuikit::key::{from_keyname, Key};
 
 pub type ActionChain = Vec<Event>;
 

skim/src/lib.rs

@@ -10,7 +10,7 @@ use std::thread;
 
 use clap::ValueEnum;
 use crossbeam::channel::{Receiver, Sender};
-use tuikit::prelude::{Event as TermEvent, *};
+use skim_tuikit::prelude::{Event as TermEvent, *};
 
 pub use crate::ansi::AnsiString;
 pub use crate::engine::fuzzy::FuzzyAlgorithm;
@@ -20,8 +20,8 @@ use crate::model::Model;
 pub use crate::options::SkimOptions;
 pub use crate::output::SkimOutput;
 use crate::reader::Reader;
-pub use common::spinlock;
-pub use tuikit;
+pub use skim_common::spinlock;
+pub use skim_tuikit;
 
 mod ansi;
 mod engine;

skim/src/model/mod.rs

@@ -16,7 +16,7 @@ use chrono::Duration as TimerDuration;
 use defer_drop::DeferDrop;
 use regex::Regex;
 use timer::{Guard as TimerGuard, Timer};
-use tuikit::prelude::{Event as TermEvent, *};
+use skim_tuikit::prelude::{Event as TermEvent, *};
 
 use crate::engine::factory::{AndOrEngineFactory, ExactOrFuzzyEngineFactory, RegexEngineFactory};
 use crate::event::{Event, EventHandler, EventReceiver, EventSender};

skim/src/model/status.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use tuikit::attr::{Attr, Effect};
-use tuikit::canvas::Canvas;
-use tuikit::draw::{Draw, DrawResult};
-use tuikit::widget::Widget;
+use skim_tuikit::attr::{Attr, Effect};
+use skim_tuikit::canvas::Canvas;
+use skim_tuikit::draw::{Draw, DrawResult};
+use skim_tuikit::widget::Widget;
 
 use crate::event::Event;
 use crate::theme::ColorTheme;

skim/src/output.rs

@@ -1,7 +1,7 @@
 use crate::event::Event;
 use crate::SkimItem;
+use skim_tuikit::key::Key;
 use std::sync::Arc;
-use tuikit::key::Key;
 
 pub struct SkimOutput {
     /// The final event that makes skim accept/quit.

skim/src/prelude.rs

@@ -8,9 +8,9 @@ pub use crate::output::SkimOutput;
 pub use crate::previewer::PreviewCallback;
 pub use crate::*;
 pub use crossbeam::channel::{bounded, unbounded, Receiver, Sender};
+pub use skim_tuikit::event::Key;
 pub use std::borrow::Cow;
 pub use std::cell::RefCell;
 pub use std::rc::Rc;
 pub use std::sync::atomic::{AtomicUsize, Ordering};
 pub use std::sync::Arc;
-pub use tuikit::event::Key;

skim/src/previewer.rs

@@ -11,7 +11,7 @@ use std::thread::JoinHandle;
 use derive_builder::Builder;
 use nix::libc;
 use regex::Regex;
-use tuikit::prelude::{Event as TermEvent, *};
+use skim_tuikit::prelude::{Event as TermEvent, *};
 
 use crate::ansi::{ANSIParser, AnsiString};
 use crate::event::{Event, EventHandler, UpdateScreen};

skim/src/query.rs

@@ -1,7 +1,7 @@
 use std::mem;
 use std::sync::Arc;
 
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 use unicode_width::UnicodeWidthStr;
 
 use crate::event::{Event, EventHandler, UpdateScreen};

skim/src/selection.rs

@@ -4,7 +4,7 @@ use std::cmp::min;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
-use tuikit::prelude::{Event as TermEvent, *};
+use skim_tuikit::prelude::{Event as TermEvent, *};
 
 use crate::event::{Event, EventHandler, UpdateScreen};
 use crate::global::current_run_num;

skim/src/theme.rs

@@ -2,7 +2,7 @@
 use std::sync::LazyLock;
 
 use crate::options::SkimOptions;
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 
 pub static DEFAULT_THEME: LazyLock<ColorTheme> = LazyLock::new(ColorTheme::dark256);
 

skim/src/tmux.rs

@@ -10,7 +10,7 @@ use std::{
 
 use nix::{sys::stat, unistd::mkfifo};
 use rand::{distr::Alphanumeric, Rng};
-use tuikit::key::Key;
+use skim_tuikit::key::Key;
 use which::which;
 
 use crate::{event::Event, SkimItem, SkimOptions, SkimOutput};

skim/src/util.rs

@@ -7,7 +7,7 @@ use std::str::FromStr;
 use std::sync::LazyLock;
 
 use regex::{Captures, Regex};
-use tuikit::prelude::*;
+use skim_tuikit::prelude::*;
 use unicode_width::UnicodeWidthChar;
 
 use crate::field::get_string_by_range;