blasthavers/minicrossterm
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added terminal size, screen clearing functionality, refactored winkernel and done with mouse position

Browse Source
This commit is contained in:
T 2018-01-06 21:31:14 +01:00
parent 638517981a
commit 3b4b6fb11a
42 changed files with 1018 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
examples/bin.rs
View File

@ -1,26 +1,41 @@
extern crate crossterm; extern crate crossterm;
use self::crossterm::terminal_style::{paint,Color}; use self::crossterm::terminal_style::*;
use self::crossterm::terminal_cursor::cursor; use self::crossterm::terminal_cursor::*;
use std::io::Write; use self::crossterm::terminal::*;
use std::io::{stdin, stdout, Write};
fn main() {
terminal::get().clear(ClearType::All);
fn main() for y in 0..21 {
{ for x in 0..21 {
cursor::get().move_down(1); if (x == 0 || y == 0) || (x == 20 || y == 20) {
print!("2"); print!("{}", paint("■").with(Color::Red));
std::io::stdout().flush().expect("asdf"); } else {
print!("{}", paint(" ").with(Color::Blue).on(Color::Blue));
}
}
println!();
}
cursor::get().move_down(1); let mut curs = cursor::get();
print!("3"); {
std::io::stdout().flush().expect("asdf"); curs.goto(10, 10);
curs.print("@");
curs.move_up(1);
curs.print("1");
cursor::get().move_down(1); curs.move_right(1);
print!("4"); curs.print("2");
std::io::stdout().flush().expect("asdf");
cursor::get().move_down(1); curs.move_down(1);
print!("5"); curs.print("3");
std::io::stdout().flush().expect("asdf");
curs.move_left(2);
curs.print("4");
curs.goto(0, 30);
println!("{:?}", curs.pos());
}
} }

12
examples/cursor_example.rs
View File

@ -1,8 +1,8 @@
extern crate crossterm; // extern crate crossterm;
use self::crossterm::cursor; // use self::crossterm::cursor;
pub fn goto(x: i16, y: i16) // pub fn goto(x: i16, y: i16)
{ // {
cursor::get().goto(x,y); // cursor::get().goto(x,y);
} // }

1
src/kernel/linux_kernel/mod.rs Normal file
View File

@ -0,0 +1 @@
pub mod terminal;

28
src/kernel/linux_kernel/terminal.rs Normal file
View File

@ -0,0 +1,28 @@
use std::{io, mem};
use super::cvt;
use super::libc;
#[repr(C)]
struct TermSize {
row: libc::c_ushort,
col: libc::c_ushort,
_x: libc::c_ushort,
_y: libc::c_ushort,
}
pub fn terminal_size() -> Option<(u16, u16)> {
unsafe {
if libc::isatty(libc::STDOUT_FILENO) != 1 {
return None;
}
let mut winsize: libc::winsize = mem::zeroed();
libc::ioctl(libc::STDOUT_FILENO, libc::TIOCGWINSZ, &mut winsize);
if winsize.ws_row > 0 && winsize.ws_col > 0 {
Some((winsize.ws_row as u16, winsize.ws_col as u16))
} else {
None
}
}
}

2
src/kernel/mod.rs
View File

@ -1,4 +1,4 @@
#[cfg(windows)] #[cfg(windows)]
pub mod windows_kernel; pub mod windows_kernel;
#[cfg(linux)] #[cfg(unix)]
pub mod linux_kernel; pub mod linux_kernel;

30
src/kernel/windows_kernel/ansi_support.rs
View File

@ -1,29 +1,17 @@
extern crate kernel32; use winapi;
extern crate winapi; use kernel32;
use self::winapi::HANDLE;
use super::handle; use super::handle;
/// Enables ansi for windows terminals. /// Enables ansi for windows terminals.
pub fn enable_ansi_support() -> Result<(), u64> pub fn enable_ansi_support() {
{ let enable_ansi_code: u32 = 7;
const ENABLE_ANSI_CODES: u32 = 7; let output_handle = handle::get_output_handle();
set_console_mode(output_handle, enable_ansi_code)
let std_out_handle = handle::get_output_handle();
match std_out_handle
{
Some(handle) => { set_console_mode(handle, ENABLE_ANSI_CODES); Ok(()) },
None => return Err(0)
}
} }
/// Set the console mode of the windows terminal. /// Set the console mode of the windows terminal.
fn set_console_mode(handle: HANDLE, enable_ansi_code: u32) fn set_console_mode(handle: winapi::HANDLE, console_mode: u32) {
{ unsafe {
unsafe kernel32::SetConsoleMode(handle, console_mode);
{
kernel32::SetConsoleMode(handle, enable_ansi_code);
} }
} }

193
src/kernel/windows_kernel/color.rs
View File

@ -1,138 +1,117 @@
extern crate winapi; use winapi;
extern crate kernel32; use kernel32;
use super::{handle, kernel};
use super::handle;
use super::kernel;
use terminal_style as style; use terminal_style as style;
/// This will set the forground color by the given winapi color value parsed to u16. /// This will set the forground color by the given winapi color value parsed to u16.
pub fn set_fg_color(fg_color: u16) pub fn set_fg_color(fg_color: u16) {
{ let csbi = kernel::get_console_screen_buffer_info();
if let Some(buffer_info) = kernel::get_console_screen_buffer_info()
{
// Notice that the color values are stored in wAttribute.
// So wee need to use bitwise operators to check if the values exists or to get current console colors.
let mut color: u16;
let attrs = buffer_info.wAttributes;
let bg_color = attrs & 0x0070;
color = fg_color | bg_color;
// background intensity is a seperate value in attrs, // Notice that the color values are stored in wAttribute.
// wee need to check if this was applied to the current bg color. // So wee need to use bitwise operators to check if the values exists or to get current console colors.
if (attrs & winapi::BACKGROUND_INTENSITY as u16) != 0 let mut color: u16;
{ let attrs = csbi.wAttributes;
color = color | winapi::BACKGROUND_INTENSITY as u16; let bg_color = attrs & 0x0070;
} color = fg_color | bg_color;
set_console_text_attribute(color); // background intensity is a seperate value in attrs,
// wee need to check if this was applied to the current bg color.
if (attrs & winapi::BACKGROUND_INTENSITY as u16) != 0 {
color = color | winapi::BACKGROUND_INTENSITY as u16;
} }
set_console_text_attribute(color);
} }
/// This will set the forground color by the given winapi color value parsed to u16. /// This will set the forground color by the given winapi color value parsed to u16.
pub fn set_bg_color(bg_color: u16) pub fn set_bg_color(bg_color: u16) {
{ let csbi = kernel::get_console_screen_buffer_info();
if let Some(buffer_info) = kernel::get_console_screen_buffer_info() // Notice that the color values are stored in wAttribute.
{ // So wee need to use bitwise operators to check if the values exists or to get current console colors.
// Notice that the color values are stored in wAttribute. let mut color: u16;
// So wee need to use bitwise operators to check if the values exists or to get current console colors. let attrs = csbi.wAttributes;
let mut color: u16; let fg_color = attrs & 0x0007;
let attrs = buffer_info.wAttributes; color = fg_color | bg_color;
let fg_color = attrs & 0x0007;
color = fg_color | bg_color;
// foreground intensity is a seperate value in attrs, // foreground intensity is a seperate value in attrs,
// wee need to check if this was applied to the current fg color. // wee need to check if this was applied to the current fg color.
if (attrs & winapi::FOREGROUND_INTENSITY as u16) != 0 if (attrs & winapi::FOREGROUND_INTENSITY as u16) != 0 {
{ color = color | winapi::FOREGROUND_INTENSITY as u16;
color = color | winapi::FOREGROUND_INTENSITY as u16;
}
set_console_text_attribute(color);
} }
set_console_text_attribute(color);
} }
/// This will reset the colors to the value given in u16. /// This will reset the colors to the value given in u16.
pub fn reset(original_color: u16) pub fn reset(original_color: u16) {
{
set_console_text_attribute(original_color); set_console_text_attribute(original_color);
} }
/// This will get the winapi color value from the Color struct /// This will get the winapi color value from the Color struct
pub fn winapi_color_val(color: style::Color, color_type: style::ColorType) -> u16 pub fn winapi_color_val(color: style::Color, color_type: style::ColorType) -> u16 {
{ use terminal_style::{Color, ColorType};
use terminal_style::{ColorType, Color};
let winapi_color: u32; let winapi_color: u32;
let fg_green = winapi::FOREGROUND_GREEN; let fg_green = winapi::FOREGROUND_GREEN;
let fg_red = winapi::FOREGROUND_RED; let fg_red = winapi::FOREGROUND_RED;
let fg_blue = winapi::FOREGROUND_BLUE; let fg_blue = winapi::FOREGROUND_BLUE;
let fg_intensity = winapi::FOREGROUND_INTENSITY; let fg_intensity = winapi::FOREGROUND_INTENSITY;
let bg_green = winapi::BACKGROUND_GREEN; let bg_green = winapi::BACKGROUND_GREEN;
let bg_red = winapi::BACKGROUND_RED; let bg_red = winapi::BACKGROUND_RED;
let bg_blue = winapi::BACKGROUND_BLUE; let bg_blue = winapi::BACKGROUND_BLUE;
let bg_intensity = winapi::BACKGROUND_INTENSITY; let bg_intensity = winapi::BACKGROUND_INTENSITY;
match color_type match color_type {
{ ColorType::Foreground => {
ColorType::Foreground => winapi_color = match color {
{ Color::Black => 0,
winapi_color = match color Color::Red => fg_intensity | fg_red,
{ Color::DarkRed => fg_red,
Color::Black => 0, Color::Green => fg_intensity | fg_green,
Color::Red => fg_intensity | fg_red, Color::DarkGreen => fg_green,
Color::DarkRed => fg_red, Color::Yellow => fg_intensity | fg_green | fg_red,
Color::Green => fg_intensity | fg_green, Color::DarkYellow => fg_green | fg_red,
Color::DarkGreen => fg_green, Color::Blue => fg_intensity | fg_blue,
Color::Yellow => fg_intensity | fg_green | fg_red, Color::DarkBlue => fg_blue,
Color::DarkYellow => fg_green | fg_red, Color::Magenta => fg_intensity | fg_red | fg_blue,
Color::Blue => fg_intensity | fg_blue, Color::DarkMagenta => fg_red | fg_blue,
Color::DarkBlue => fg_blue, Color::Cyan => fg_intensity | fg_green | fg_blue,
Color::Magenta => fg_intensity | fg_red | fg_blue, Color::DarkCyan => fg_green | fg_blue,
Color::DarkMagenta => fg_red | fg_blue, Color::Grey => fg_intensity,
Color::Cyan => fg_intensity | fg_green | fg_blue, Color::White => fg_intensity | fg_red | fg_green | fg_blue,
Color::DarkCyan => fg_green | fg_blue, };
Color::Grey => fg_intensity, }
Color::White => fg_intensity | fg_red | fg_green | fg_blue, ColorType::Background => {
}; winapi_color = match color {
}, Color::Black => 0,
ColorType::Background => Color::Red => bg_intensity | bg_red,
{ Color::DarkRed => bg_red,
winapi_color = match color Color::Green => bg_intensity | bg_green,
{ Color::DarkGreen => bg_green,
Color::Black => 0, Color::Yellow => bg_intensity | bg_green | bg_red,
Color::Red => bg_intensity | bg_red, Color::DarkYellow => bg_green | bg_red,
Color::DarkRed => bg_red, Color::Blue => bg_intensity | bg_blue,
Color::Green => bg_intensity | bg_green, Color::DarkBlue => bg_blue,
Color::DarkGreen => bg_green, Color::Magenta => bg_intensity | bg_red | bg_blue,
Color::Yellow => bg_intensity | bg_green | bg_red, Color::DarkMagenta => bg_red | bg_blue,
Color::DarkYellow => bg_green | bg_red, Color::Cyan => bg_intensity | bg_green | bg_blue,
Color::Blue => bg_intensity | bg_blue, Color::DarkCyan => bg_green | bg_blue,
Color::DarkBlue => bg_blue, Color::Grey => bg_intensity,
Color::Magenta => bg_intensity | bg_red | bg_blue, Color::White => bg_intensity | bg_red | bg_green | bg_blue,
Color::DarkMagenta => bg_red | bg_blue, };
Color::Cyan => bg_intensity | bg_green | bg_blue, }
Color::DarkCyan => bg_green | bg_blue, };
Color::Grey => bg_intensity,
Color::White => bg_intensity | bg_red | bg_green | bg_blue,
};
}
};
winapi_color as u16 winapi_color as u16
} }
/// This will set the console attributes by the given value /// This will set the console attributes by the given value
fn set_console_text_attribute(value: u16) fn set_console_text_attribute(value: u16) {
{
let output_handle = handle::get_output_handle(); let output_handle = handle::get_output_handle();
if let Some(handle) = output_handle unsafe {
{ kernel32::SetConsoleTextAttribute(output_handle, value);
unsafe
{
kernel32::SetConsoleTextAttribute(handle, value);
}
} }
} }

103
src/kernel/windows_kernel/cursor.rs
View File

@ -1,13 +1,11 @@
extern crate winapi; use winapi;
extern crate kernel32; use kernel32;
use super::{handle, kernel};
use self::winapi::{COORD}; use shared::functions;
use super::{handle,kernel};
/// These are the movement directions of an cursor /// These are the movement directions of an cursor
#[derive(Debug)] #[derive(Debug)]
pub enum CursorDirection pub enum CursorDirection {
{
Top, Top,
Right, Right,
Down, Down,
@ -15,79 +13,48 @@ pub enum CursorDirection
} }
/// Set the cursor position to an coordinate (x,y). /// Set the cursor position to an coordinate (x,y).
pub fn set(x: u16, y:u16) pub fn set(x: u16, y: u16) {
{ set_cursor_pos(x as i16, y as i16);
set_cursor_pos(x as i16,y as i16);
} }
/// Get the current cursor x position. /// Get the current cursor x position.
pub fn xpos() -> u16 pub fn xpos() -> u16 {
{ let csbi = kernel::get_console_screen_buffer_info();
if let Some(csbi) = kernel::get_console_screen_buffer_info() csbi.dwCursorPosition.X as u16
{
csbi.dwCursorPosition.Y as u16
}else{
println!("xpos verkeerd");
0
}
} }
/// Get the current cursor y position. /// Get the current cursor y position.
pub fn ypos() -> u16 pub fn ypos() -> u16 {
{ let csbi = kernel::get_console_screen_buffer_info();
if let Some(csbi) = kernel::get_console_screen_buffer_info() csbi.dwCursorPosition.Y as u16
{
csbi.dwCursorPosition.Y as u16
}else{
println!("ypos verkeerd");
0
}
} }
pub fn move_down(count: u16) pub fn move_down(count: u16) {
{ let csbi = kernel::get_console_screen_buffer_info();
if let Some(buffer) = kernel::get_console_screen_buffer_info() unsafe {
{ let output_handle = handle::get_output_handle();
unsafe kernel32::SetConsoleCursorPosition(
{ output_handle,
let handle = kernel32::GetStdHandle(winapi::STD_OUTPUT_HANDLE); winapi::COORD {
kernel32::SetConsoleCursorPosition(handle, COORD { X: csbi.dwCursorPosition.X,
X: buffer.dwCursorPosition.X, Y: csbi.dwCursorPosition.Y + count as i16,
Y: buffer.dwCursorPosition.Y + count as i16, },
}); );
}
} }
} }
// pub fn move_direction(count: i16, cursor_direction: CursorDirection)
// {
//
// println!("{}, {}, {:?}",x,y, cursor_direction);
// match cursor_direction
// {
// CursorDirection::Top => set_cursor_pos(x,y - count) ,
// CursorDirection::Right => set_cursor_pos(x + count, y) ,
// CursorDirection::Down => set_cursor_pos(x, y + count),
// CursorDirection::Left => set_cursor_pos(x - count,y),
// };
// }else{
// println!("{}", "Not found");
// }
// }
/// Set the cursor position to an coordinate (x,y). /// Set the cursor position to an coordinate (x,y).
fn set_cursor_pos(x: i16, y: i16) fn set_cursor_pos(x: i16, y: i16) {
{ functions::is_cursor_out_of_range(x, y);
if let Some(handle) = handle::get_output_handle()
{ let output_handle = handle::get_output_handle();
unsafe let position = winapi::COORD { X: x, Y: y };
{
let position = COORD{X: x, Y:y}; unsafe {
kernel32::SetConsoleCursorPosition(handle, position); let success = kernel32::SetConsoleCursorPosition(output_handle, position);
if success == 0 {
panic!("Cannot set console cursor position");
} }
} }
} }

103
src/kernel/windows_kernel/handle.rs
View File

@ -1,98 +1,27 @@
extern crate winapi; use winapi;
extern crate kernel32; use kernel32;
use std::os::windows::io::{AsRawHandle, RawHandle};
use self::winapi::{HANDLE, STD_OUTPUT_HANDLE, STD_INPUT_HANDLE};
use std::mem;
static mut CONSOLE_INPUT_HANDLE:Option<HANDLE> = None; // static mut CONSOLE_INPUT_HANDLE:Option<winapi::HANDLE> = None;
static mut CONSOLE_OUTPUT_HANDLE: Option<winapi::HANDLE> = None;
static mut CONSOLE_OUTPUT_HANDLE:Option<HANDLE> = None;
/// Get the std_output_handle of the console /// Get the std_output_handle of the console
pub fn get_output_handle() -> Option<HANDLE> pub fn get_output_handle() -> winapi::HANDLE {
{ unsafe {
unsafe if let Some(handle) = CONSOLE_OUTPUT_HANDLE {
{ handle
// if let Some(handle) = CONSOLE_OUTPUT_HANDLE } else {
// { let handle = kernel32::GetStdHandle(winapi::STD_OUTPUT_HANDLE);
// match handle_check(&handle) CONSOLE_OUTPUT_HANDLE = Some(handle);
// { handle
// true => {
// CONSOLE_OUTPUT_HANDLE = Some(handle);
// CONSOLE_OUTPUT_HANDLE
// },
// false => None
// }
// } else {
let handle = kernel32::GetStdHandle(STD_OUTPUT_HANDLE);
match handle_check(&handle)
{
true => {
// CONSOLE_OUTPUT_HANDLE = Some(handle);
Some(handle)
},
false => None
}
}
// }
}
/// Get the std_input_handle of the console
pub fn get_input_handle() -> Option<HANDLE>
{
unsafe
{
if let Some(handle) = CONSOLE_INPUT_HANDLE
{
match handle_check(&handle)
{
true => {
CONSOLE_INPUT_HANDLE = Some(handle);
CONSOLE_INPUT_HANDLE
},
false => None
}
}
else
{
let handle = kernel32::GetStdHandle(STD_INPUT_HANDLE);
match handle_check(&handle)
{
true => {
CONSOLE_INPUT_HANDLE = Some(handle);
CONSOLE_INPUT_HANDLE
},
false => None
}
}
}
}
pub fn as_raw_handle() -> Option<(HANDLE, winapi::CONSOLE_SCREEN_BUFFER_INFO)>
{
unsafe
{
let hand = kernel32::GetStdHandle(STD_OUTPUT_HANDLE) as RawHandle;
let mut csbi: winapi::CONSOLE_SCREEN_BUFFER_INFO = mem::zeroed() ;
match kernel32::GetConsoleScreenBufferInfo(hand, &mut csbi)
{
0 => None,
_ => Some((hand, csbi)),
} }
} }
} }
/// Checks if the console handle is an invalid handle value. /// Checks if the console handle is an invalid handle value.
fn handle_check(handle: &HANDLE) -> bool pub fn is_valid_handle(handle: &winapi::HANDLE) -> bool {
{ if *handle == winapi::INVALID_HANDLE_VALUE {
if *handle == winapi::INVALID_HANDLE_VALUE
{
false
}else{
true true
} else {
false
} }
} }

53
src/kernel/windows_kernel/kernel.rs
View File

@ -1,43 +1,28 @@
extern crate winapi; use winapi;
extern crate kernel32; use kernel32;
use super::{handle, Empty};
use super::handle;
use self::winapi::CONSOLE_SCREEN_BUFFER_INFO;
use std::mem;
/// Get console screen buffer info. /// Get console screen buffer info.
pub fn get_console_screen_buffer_info() -> Option<CONSOLE_SCREEN_BUFFER_INFO> pub fn get_console_screen_buffer_info() -> winapi::CONSOLE_SCREEN_BUFFER_INFO {
{ let output_handle = handle::get_output_handle();
let handle = handle::get_output_handle(); let mut csbi = winapi::CONSOLE_SCREEN_BUFFER_INFO::empty();
let mut csbi: CONSOLE_SCREEN_BUFFER_INFO = unsafe { mem::zeroed() }; let success;
unsafe if handle::is_valid_handle(&output_handle) {
{ return winapi::CONSOLE_SCREEN_BUFFER_INFO::empty();
if let Some(x) = handle
{
match kernel32::GetConsoleScreenBufferInfo(x, &mut csbi)
{
0 => None,
_ => Some(csbi),
}
}
else {
None
}
} }
unsafe { success = kernel32::GetConsoleScreenBufferInfo(output_handle, &mut csbi) }
if success == 0 {
panic!("Cannot get console screen buffer info");
}
csbi
} }
/// Get the current console colors. /// Get the current console colors.
pub fn get_original_console_color() -> u16 pub fn get_original_console_color() -> u16 {
{
let console_buffer_info = get_console_screen_buffer_info(); let console_buffer_info = get_console_screen_buffer_info();
console_buffer_info.wAttributes as u16
if let Some(buffer_info) = console_buffer_info
{
buffer_info.wAttributes as u16
}
else{
300
}
} }

4
src/kernel/windows_kernel/mod.rs
View File

@ -3,3 +3,7 @@ pub mod color;
pub mod ansi_support; pub mod ansi_support;
pub mod handle; pub mod handle;
pub mod kernel; pub mod kernel;
pub mod terminal;
mod winapi_extentions;
use shared::traits::Empty;

129
src/kernel/windows_kernel/terminal.rs Normal file
View File

@ -0,0 +1,129 @@
use winapi;
use kernel32;
use super::{cursor, handle, kernel, Empty};
/// Get the terminal size (y,x)
pub fn terminal_size() -> Option<(u16, u16)> {
let csbi = kernel::get_console_screen_buffer_info();
Some((
(csbi.srWindow.Bottom - csbi.srWindow.Top) as u16,
(csbi.srWindow.Right - csbi.srWindow.Left) as u16,
))
}
/// Scroll down `n` rows
pub fn scroll_down(rows: i16) {
let output_handle = handle::get_output_handle();
let csbi = kernel::get_console_screen_buffer_info();
let mut srct_window;
// Set srctWindow to the current window size and location.
srct_window = csbi.srWindow;
// Check whether the window is too close to the screen buffer top
if srct_window.Bottom < csbi.dwSize.Y - rows {
srct_window.Top += rows; // move top down
srct_window.Bottom += rows; // move bottom down
unsafe {
if kernel32::SetConsoleWindowInfo(output_handle, winapi::TRUE, &mut srct_window) != 1 {
panic!("Something whent wrong when scrolling down");
}
}
}
}
pub fn clear_after_cursor() {
let output_handle = handle::get_output_handle();
let csbi = kernel::get_console_screen_buffer_info();
// one cell after cursor position
let mut x = cursor::xpos() as i16 + 1;
// one at row of cursor position
let mut y = cursor::ypos() as i16;
// if cursor position is at the outer right position
if x > csbi.srWindow.Right
{
y += 1;
x = 0;
}
// location where to start clearing
let start_loaction = winapi::COORD { X: x, Y: y };
clear(output_handle, csbi, start_loaction);
}
// pub fn before_after_cursor() {
// let output_handle = handle::get_output_handle();
// let csbi = kernel::get_console_screen_buffer_info();
// // one cell after cursor position
// let x = cursor::xpos() as i16 - 1;
// // one at row of cursor position
// let y = cursor::ypos() as i16;
// // location where to start clearing
// let start_loaction = winapi::COORD { X: x, Y: y };
// clear(output_handle, csbi, start_loaction);
// }
pub fn clear_entire_screen() {
let output_handle = handle::get_output_handle();
let csbi = kernel::get_console_screen_buffer_info();
// position x at start
let x = 0;
// position y at start
let y = 0;
// location where to start clearing
let start_loaction = winapi::COORD { X: x, Y: y };
clear(output_handle, csbi, start_loaction);
// put the cursor back at (0, 0)
cursor::set(0, 0);
}
fn clear(
handle: winapi::HANDLE,
csbi: winapi::CONSOLE_SCREEN_BUFFER_INFO,
start_loaction: winapi::COORD,
) {
let console_size = (csbi.dwSize.X as u32 * csbi.dwSize.Y as u32) as u32;
let mut cells_written = 0;
let mut success;
unsafe {
// fill the entire screen with blanks
success = kernel32::FillConsoleOutputCharacterA(
handle,
' ' as i8,
console_size,
start_loaction,
&mut cells_written,
);
}
if success == 0 {
panic!("Couldnot clear screen after cursor");
}
cells_written = 0;
unsafe {
success = kernel32::FillConsoleOutputAttribute(
handle,
csbi.wAttributes,
console_size,
start_loaction,
&mut cells_written,
);
}
if success == 0 {
panic!("Couldnot reset attributes after cursor");
}
}

31
src/kernel/windows_kernel/winapi_extentions.rs Normal file
View File

@ -0,0 +1,31 @@
use winapi;
use super::Empty;
impl Empty for winapi::COORD {
fn empty() -> winapi::COORD {
winapi::COORD { X: 0, Y: 0 }
}
}
impl Empty for winapi::SMALL_RECT {
fn empty() -> winapi::SMALL_RECT {
winapi::SMALL_RECT {
Top: 0,
Right: 0,
Bottom: 0,
Left: 0,
}
}
}
impl Empty for winapi::CONSOLE_SCREEN_BUFFER_INFO {
fn empty() -> winapi::CONSOLE_SCREEN_BUFFER_INFO {
winapi::CONSOLE_SCREEN_BUFFER_INFO {
dwSize: winapi::COORD::empty(),
dwCursorPosition: winapi::COORD::empty(),
wAttributes: 0,
srWindow: winapi::SMALL_RECT::empty(),
dwMaximumWindowSize: winapi::COORD::empty(),
}
}
}

10
src/lib.rs
View File

@ -1,13 +1,15 @@
#[macro_use] #[macro_use]
pub mod shared; pub mod shared;
pub mod terminal_cursor; pub mod terminal_cursor;
pub mod terminal_style; pub mod terminal_style;
pub mod terminal;
mod kernel; mod kernel;
pub use shared::traits::Construct; use shared::traits::{Construct, Empty};
pub use terminal_cursor::cursor; pub use terminal_cursor::cursor;
pub use terminal_style::paint; pub use terminal_style::paint;
#[cfg(windows)]
extern crate kernel32;
#[cfg(windows)]
extern crate winapi;

8
src/shared/enums.rs Normal file
View File

@ -0,0 +1,8 @@
/// Contains directions that can be used for diffrent reasons.
#[derive(Debug)]
pub enum Direction {
Up,
Down,
Left,
Right,
}

9
src/shared/functions.rs Normal file
View File

@ -0,0 +1,9 @@
pub fn is_cursor_out_of_range(x: i16, y: i16) {
if x < 0 || x >= <i16>::max_value() {
panic!("Argument Out of Range Exception");
}
if y < 0 || y >= <i16>::max_value() {
panic!("Argument Out of Range Exception");
}
}

51
src/shared/macros.rs
View File

@ -1,56 +1,5 @@
use std;
use std::fmt;
use std::io::Write;
use terminal_style as style;
/// This is used to make StyledObject able to be displayed.
/// This macro will set the styled stored in Styled Object
#[macro_export]
macro_rules! impl_fmt
{
($name:ident) => {
impl<D: fmt::$name> fmt::$name for style::StyledObject<D> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result
{
let mut colored_terminal = style::colored_terminal();
let mut reset = true;
if let Some(bg) = self.object_style.bg_color
{
colored_terminal.set_bg(bg);
reset = true;
}
if let Some(fg) = self.object_style.fg_color
{
colored_terminal.set_fg(fg);
reset = true;
}
write!(f, "{}", &self.content);
std::io::stdout().flush().expect("Flush stdout failed");
if reset
{
colored_terminal.reset();
}
Ok(())
}
}
}
}
/// This macro will take an ANSI input and combines it with some default ANSI characters and returns the result /// This macro will take an ANSI input and combines it with some default ANSI characters and returns the result
#[macro_export] #[macro_export]
macro_rules! csi { macro_rules! csi {
($( $l:expr ),*) => { concat!("\x1B[", $( $l ),*) }; ($( $l:expr ),*) => { concat!("\x1B[", $( $l ),*) };
} }
/// This inplements Display for StyledObject
/// Notice that more implementations can be maked.
/// # Example
/// ```rust
/// example impl_fmt!(Debug);
/// ```
impl_fmt!(Display);

2
src/shared/mod.rs
View File

@ -1,3 +1,5 @@
#[macro_use] #[macro_use]
pub mod macros; pub mod macros;
pub mod traits; pub mod traits;
pub mod enums;
pub mod functions;

12
src/shared/traits.rs
View File

@ -1,6 +1,12 @@
/// This trait is used for creating an instance of an concrete implementation from an base trait. /// This trait is used for creating an instance of an concrete implementation from an base trait.
/// This trait allows the output to be different in size. /// This trait allows the output to be different in size.
pub trait Construct pub trait Construct {
{ fn new() -> Box<Self>
fn new() -> Box<Self> where Self: Sized; where
Self: Sized;
}
/// This trait is used to create an empty instance of an struct.
pub trait Empty {
fn empty() -> Self;
} }

0
src/terminal/ansi_terminal.rs
View File

14
src/terminal/base_terminal.rs
View File

@ -0,0 +1,14 @@
pub enum ClearType {
All,
AfterCursor,
BeforeCursor,
CurrentLine,
UntilNewLine,
}
pub trait ITerminal {
fn clear(&self, clear_type: ClearType);
fn terminal_size(&self) -> Option<(u16, u16)>;
fn scroll_up(&self, count: i16);
fn scroll_down(&self, count: u16);
}

12
src/terminal/mod.rs Normal file
View File

@ -0,0 +1,12 @@
mod base_terminal;
mod no_terminal;
mod unix_terminal;
mod winapi_terminal;
pub mod terminal;
pub use self::terminal::{get, Terminal};
pub use self::base_terminal::ClearType;
use self::unix_terminal::UnixTerminal;
use self::winapi_terminal::WinApiTerminal;
use self::no_terminal::NoTerminal;

22
src/terminal/no_terminal.rs Normal file
View File

@ -0,0 +1,22 @@
use Construct;
use super::base_terminal::{ClearType, ITerminal};
/// This struct will be used for ansi terminals and unix systems.
pub struct NoTerminal;
impl Construct for NoTerminal {
fn new() -> Box<NoTerminal> {
Box::from(NoTerminal {})
}
}
impl ITerminal for NoTerminal {
fn clear(&self, clear_type: ClearType) {}
fn terminal_size(&self) -> Option<(u16, u16)> {
None
}
fn scroll_up(&self, count: i16) {}
fn scroll_down(&self, count: u16) {}
}

65
src/terminal/terminal.rs Normal file
View File

@ -0,0 +1,65 @@
use Construct;
use super::base_terminal::{ClearType, ITerminal};
use super::{NoTerminal, UnixTerminal, WinApiTerminal};
/// Struct with the terminal on wits terminal realated actions can be performed.
pub struct Terminal {
terminal: Option<Box<ITerminal>>,
}
impl Terminal {
/// Instantiate an color implementation whereon color related actions can be performed.
pub fn init(&mut self) {
if let None = self.terminal {
self.terminal = get_terminal();
}
}
pub fn clear(&mut self, clear_type: ClearType) {
&self.init();
if let Some(ref terminal) = self.terminal {
terminal.clear(clear_type);
}
}
pub fn terminal_size(&mut self) -> Option<(u16, u16)> {
&self.init();
if let Some(ref terminal) = self.terminal {
let a = terminal.terminal_size();
a
} else {
None
}
}
pub fn scroll_up(&mut self, count: i16) {
for i in 0..100 {
println!("Ik ben timon en dit is een test {}", i)
}
&self.init();
if let Some(ref terminal) = self.terminal {
terminal.scroll_up(count);
}
}
pub fn scroll_down(&self) {}
}
/// Get the concrete ITerminal implementation based on the current operating system.
fn get_terminal() -> Option<Box<ITerminal>> {
if cfg!(target_os = "linux") {
Some(UnixTerminal::new())
} else if cfg!(target_os = "windows") {
Some(WinApiTerminal::new())
} else {
Some(NoTerminal::new())
}
}
/// Get terminal whereon terminal related actions can be performed.
pub fn get() -> Box<Terminal> {
Box::from(Terminal {
terminal: get_terminal(),
})
}

40
src/terminal/unix_terminal.rs Normal file
View File

@ -0,0 +1,40 @@
use Construct;
use super::base_terminal::{ClearType, ITerminal};
#[cfg(unix)]
use kernel::linux_kernel::terminal::*;
#[cfg(windows)]
use kernel::windows_kernel::terminal::*;
/// This struct will be used for ansi terminals and unix systems.
pub struct UnixTerminal;
impl Construct for UnixTerminal {
fn new() -> Box<UnixTerminal> {
Box::from(UnixTerminal {})
}
}
impl ITerminal for UnixTerminal {
fn clear(&self, clear_type: ClearType) {
match clear_type {
ClearType::All => format!(csi!("2J")),
ClearType::AfterCursor => format!(csi!("J")),
ClearType::BeforeCursor => format!(csi!("1J")),
ClearType::CurrentLine => format!(csi!("2K")),
ClearType::UntilNewLine => format!(csi!("K")),
};
}
fn terminal_size(&self) -> Option<(u16, u16)> {
terminal_size()
}
fn scroll_up(&self, count: i16) {
format!(csi!("{}S"), count);
}
fn scroll_down(&self, count: u16) {
format!(csi!("{}T"), count);
}
}

39
src/terminal/winapi_terminal.rs
View File

@ -0,0 +1,39 @@
use Construct;
use super::base_terminal::{ClearType, ITerminal};
#[cfg(windows)]
use kernel::windows_kernel::terminal;
/// This struct will be used for ansi terminals and unix systems.
pub struct WinApiTerminal;
impl Construct for WinApiTerminal {
fn new() -> Box<WinApiTerminal> {
Box::from(WinApiTerminal {})
}
}
impl ITerminal for WinApiTerminal {
fn clear(&self, clear_type: ClearType) {
match clear_type
{
ClearType::All => terminal::clear_entire_screen(),
ClearType::AfterCursor => terminal::clear_after_cursor(),
_ => print!("")
// ClearType::BeforeCursor => format!(csi!("1J")),
// ClearType::CurrentLine => format!(csi!("2K")),
// ClearType::UntilNewLine => format!(csi!("K")),
};
}
fn terminal_size(&self) -> Option<(u16, u16)> {
terminal::terminal_size()
}
fn scroll_up(&self, count: i16) {
// yet to be inplemented
}
fn scroll_down(&self, count: u16) {
terminal::scroll_down(count as i16);
}
}

34
src/terminal_cursor/ansi_cursor.rs
View File

@ -4,38 +4,34 @@ use super::base_cursor::ITerminalCursor;
/// This struct will be used for ansi terminals and unix systems. /// This struct will be used for ansi terminals and unix systems.
pub struct AnsiCursor; pub struct AnsiCursor;
impl Construct for AnsiCursor impl Construct for AnsiCursor {
{ fn new() -> Box<AnsiCursor> {
fn new() -> Box<AnsiCursor> Box::from(AnsiCursor {})
{
Box::from(AnsiCursor {})
} }
} }
impl ITerminalCursor for AnsiCursor impl ITerminalCursor for AnsiCursor {
{ fn goto(&self, x: u16, y: u16) {
fn goto(&self, x: i16 , y: i16) format!(csi!("{};{}H"), x, y);
{
format!(csi!("{};{}H"), x,y);
} }
fn move_up(&self,count: u16) fn pos(&self) -> (u16, u16) {
{ (0, 0)
}
fn move_up(&self, count: u16) {
format!(csi!("{}A"), count); format!(csi!("{}A"), count);
} }
fn move_right(&self, count: u16) fn move_right(&self, count: u16) {
{
format!(csi!("{}C"), count); format!(csi!("{}C"), count);
} }
fn move_down(&self, count: u16) fn move_down(&self, count: u16) {
{ format!(csi!("{}B"), count);
format!(csi!("{}B"), count);
} }
fn move_left(&self, count: u16) fn move_left(&self, count: u16) {
{
format!(csi!("{}D"), count); format!(csi!("{}D"), count);
} }
} }

8
src/terminal_cursor/base_cursor.rs
View File

@ -6,14 +6,12 @@
/// ///
/// This trait is inplemented for winapi (Windows specific) and ansi (Unix specific), /// This trait is inplemented for winapi (Windows specific) and ansi (Unix specific),
/// so that the cursor related actions can be preformed on both unix and windows systems. /// so that the cursor related actions can be preformed on both unix and windows systems.
pub trait ITerminalCursor pub trait ITerminalCursor {
{
/// Goto some location (x,y) in the terminal. /// Goto some location (x,y) in the terminal.
fn goto(&self, x: i16, y: i16); fn goto(&self, x: u16, y: u16);
fn pos(&self) -> (u16, u16);
fn move_up(&self, count: u16); fn move_up(&self, count: u16);
fn move_right(&self, count: u16); fn move_right(&self, count: u16);
fn move_down(&self, count: u16); fn move_down(&self, count: u16);
fn move_left(&self, count: u16); fn move_left(&self, count: u16);
} }

91
src/terminal_cursor/cursor.rs
View File

@ -1,24 +1,21 @@
use std::fmt::Display; use std::fmt::Display;
use std;
use std::io::Write;
use Construct; use Construct;
use super::base_cursor::ITerminalCursor; use super::base_cursor::ITerminalCursor;
use super::{AnsiCursor, WinApiCursor, NoCursor}; use super::{AnsiCursor, NoCursor, WinApiCursor};
/// Struct with the cursor on wits cursor realated actions can be performed. /// Struct with the cursor on wits cursor realated actions can be performed.
pub struct TerminalCursor pub struct TerminalCursor {
{
terminal_cursor: Option<Box<ITerminalCursor>>, terminal_cursor: Option<Box<ITerminalCursor>>,
} }
impl TerminalCursor // impl Clone for TerminalCursor {
{ // fn clone(&self) -> TerminalCursor { *self }
// }
impl TerminalCursor {
/// Instantiate an cursor implementation whereon cursor related actions can be performed. /// Instantiate an cursor implementation whereon cursor related actions can be performed.
pub fn init(&mut self) pub fn init(&mut self) {
{ if let None = self.terminal_cursor {
if let None = self.terminal_cursor
{
self.terminal_cursor = get_cursor_options(); self.terminal_cursor = get_cursor_options();
} }
} }
@ -37,16 +34,23 @@ impl TerminalCursor
/// cursor::get().goto(10,10); /// cursor::get().goto(10,10);
/// } /// }
/// ``` /// ```
pub fn goto(mut self, x: i16 , y: i16) -> TerminalCursor pub fn goto(&mut self, x: u16, y: u16) -> &mut TerminalCursor {
{
&self.init(); &self.init();
if let Some(ref terminal_cursor) = self.terminal_cursor if let Some(ref terminal_cursor) = self.terminal_cursor {
{ terminal_cursor.goto(x, y);
terminal_cursor.goto(x,y);
} }
self self
} }
pub fn pos(mut self) -> (u16, u16) {
&self.init();
if let Some(ref terminal_cursor) = self.terminal_cursor {
terminal_cursor.pos()
} else {
(0, 0)
}
}
/// Print an value at the current cursor location. /// Print an value at the current cursor location.
/// ///
/// #Example /// #Example
@ -66,68 +70,61 @@ impl TerminalCursor
/// .print("@"); /// .print("@");
/// } /// }
/// ``` /// ```
pub fn move_up(mut self, count: u16) -> TerminalCursor pub fn move_up(&mut self, count: u16) -> &mut TerminalCursor {
{
&self.init(); &self.init();
if let Some(ref terminal_cursor) = self.terminal_cursor if let Some(ref terminal_cursor) = self.terminal_cursor {
{ terminal_cursor.move_up(count);
terminal_cursor.move_up(count);
} }
self self
} }
pub fn move_right(mut self, count: u16) -> TerminalCursor pub fn move_right(&mut self, count: u16) -> &mut TerminalCursor {
{
&self.init(); &self.init();
if let Some(ref terminal_cursor) = self.terminal_cursor if let Some(ref terminal_cursor) = self.terminal_cursor {
{ terminal_cursor.move_right(count);
terminal_cursor.move_right(count);
} }
self self
} }
pub fn move_down(mut self, count: u16) -> TerminalCursor pub fn move_down(&mut self, count: u16) -> &mut TerminalCursor {
{
&self.init(); &self.init();
if let Some(ref terminal_cursor) = self.terminal_cursor if let Some(ref terminal_cursor) = self.terminal_cursor {
{ terminal_cursor.move_down(count);
terminal_cursor.move_down(count);
} }
self self
} }
pub fn move_left(mut self, count: u16) -> TerminalCursor pub fn move_left(&mut self, count: u16) -> &mut TerminalCursor {
{
&self.init(); &self.init();
if let Some(ref terminal_cursor) = self.terminal_cursor if let Some(ref terminal_cursor) = self.terminal_cursor {
{ terminal_cursor.move_left(count);
terminal_cursor.move_left(count);
} }
self self
} }
pub fn print<D: Display>(self, value:D) -> TerminalCursor pub fn print<D: Display>(&mut self, value: D) -> &mut TerminalCursor {
{
print!("{}", value); print!("{}", value);
use std;
use std::io::Write;
std::io::stdout().flush();
self self
} }
} }
/// Get the concrete ITerminalCursor implementation based on the current operating system. /// Get the concrete ITerminalCursor implementation based on the current operating system.
fn get_cursor_options() -> Option<Box<ITerminalCursor>> fn get_cursor_options() -> Option<Box<ITerminalCursor>> {
{
if cfg!(target_os = "linux") { if cfg!(target_os = "linux") {
Some(AnsiCursor::new()) Some(AnsiCursor::new())
} } else if cfg!(target_os = "windows") {
else if cfg!(target_os = "windows") {
Some(WinApiCursor::new()) Some(WinApiCursor::new())
}else{ } else {
Some(NoCursor::new()) Some(NoCursor::new())
} }
} }
/// Get terminal cursor options whereon cursor related actions can be performed. /// Get terminal cursor options whereon cursor related actions can be performed.
pub fn get() -> Box<TerminalCursor> pub fn get() -> Box<TerminalCursor> {
{ Box::from(TerminalCursor {
Box::from(TerminalCursor { terminal_cursor: get_cursor_options() }) terminal_cursor: get_cursor_options(),
})
} }

25
src/terminal_cursor/no_cursor.rs
View File

@ -5,27 +5,24 @@ use super::base_cursor::ITerminalCursor;
/// the current concrete cursor inplementations. /// the current concrete cursor inplementations.
pub struct NoCursor; pub struct NoCursor;
impl Construct for NoCursor impl Construct for NoCursor {
{
fn new() -> Box<NoCursor> { fn new() -> Box<NoCursor> {
Box::new(NoCursor {}) Box::new(NoCursor {})
} }
} }
impl ITerminalCursor for NoCursor impl ITerminalCursor for NoCursor {
{ fn goto(&self, x: u16, y: u16) {}
fn goto(&self, x: i16 , y: i16)
{ }
fn move_up(&self, count: u16) fn pos(&self) -> (u16, u16) {
{ } (0, 0)
}
fn move_right(&self, count: u16) fn move_up(&self, count: u16) {}
{ }
fn move_down(&self, count: u16) fn move_right(&self, count: u16) {}
{ }
fn move_left(&self, count: u16) fn move_down(&self, count: u16) {}
{ }
fn move_left(&self, count: u16) {}
} }

39
src/terminal_cursor/winapi_cursor.rs
View File

@ -3,55 +3,50 @@ use kernel::windows_kernel::cursor;
use super::base_cursor::ITerminalCursor; use super::base_cursor::ITerminalCursor;
/// This struct will be used for cursor actions in windows terminals performed by winapi. /// This struct will be used for cursor actions in windows terminals performed by winapi.
pub struct WinApiCursor pub struct WinApiCursor {
{
has_moved: bool, has_moved: bool,
} }
impl Construct for WinApiCursor impl Construct for WinApiCursor {
{ fn new() -> Box<WinApiCursor> {
fn new() -> Box<WinApiCursor> Box::from(WinApiCursor { has_moved: false })
{
Box::from(WinApiCursor {has_moved: false})
} }
} }
impl ITerminalCursor for WinApiCursor impl ITerminalCursor for WinApiCursor {
{ fn goto(&self, x: u16, y: u16) {
fn goto(&self, x: i16 , y: i16) cursor::set(x, y);
{
// cursor::set(x,y);
} }
fn move_up(&self, count: u16) fn pos(&self) -> (u16, u16) {
{ (cursor::xpos(), cursor::ypos())
}
fn move_up(&self, count: u16) {
let xpos = cursor::xpos(); let xpos = cursor::xpos();
let ypos = cursor::ypos(); let ypos = cursor::ypos();
cursor::set(xpos, ypos -1); cursor::set(xpos, ypos - 1);
} }
fn move_right(&self, count: u16) fn move_right(&self, count: u16) {
{
let xpos = cursor::xpos(); let xpos = cursor::xpos();
let ypos = cursor::ypos(); let ypos = cursor::ypos();
cursor::set(xpos + 1, ypos); cursor::set(xpos + 1, ypos);
} }
fn move_down(&self, count: u16) fn move_down(&self, count: u16) {
{
let xpos = cursor::xpos(); let xpos = cursor::xpos();
let ypos = cursor::ypos(); let ypos = cursor::ypos();
cursor::set(xpos, ypos + count); cursor::set(xpos, ypos + count);
} }
fn move_left(&self, count: u16) fn move_left(&self, count: u16) {
{
let xpos = cursor::xpos(); let xpos = cursor::xpos();
let ypos = cursor::ypos(); let ypos = cursor::ypos();
cursor::set(xpos -1, ypos); cursor::set(xpos - 1, ypos);
} }
} }

130
src/terminal_style/color/ansi_color.rs
View File

@ -1,87 +1,85 @@
use std::string::String; use std::string::String;
use Construct; use Construct;
use super::color::{Color,ColorType}; use super::color::{Color, ColorType};
use super::base_color::{ ITerminalColor, sum_u16_to_string }; use super::base_color::{ITerminalColor, sum_u16_to_string};
/// This struct will be used for coloring ansi terminals with ansi escape codes. /// This struct will be used for coloring ansi terminals with ansi escape codes.
#[derive(Debug)] #[derive(Debug)]
pub struct ANSIColor; pub struct ANSIColor;
impl Construct for ANSIColor impl Construct for ANSIColor {
{ fn new() -> Box<ANSIColor> {
fn new() -> Box<ANSIColor> Box::from(ANSIColor {})
{
Box::from(ANSIColor {})
} }
} }
impl ITerminalColor for ANSIColor impl ITerminalColor for ANSIColor {
{ fn set_fg(&self, fg_color: Color) {
fn set_fg(&self, fg_color: Color) format!(
{ csi!("38;2;{}m"),
format!(csi!("38;2;{}m"), self.color_value(fg_color,ColorType::Foreground)); self.color_value(fg_color, ColorType::Foreground)
} );
}
fn set_bg(&self, bg_color: Color) fn set_bg(&self, bg_color: Color) {
{ format!(
format!(csi!("38;2;{}m"), self.color_value(bg_color,ColorType::Background)); csi!("38;2;{}m"),
} self.color_value(bg_color, ColorType::Background)
);
}
fn reset(&self) fn reset(&self) {
{ format!(csi!("0m"));
format!(csi!("0m")); }
}
fn color_value(&self, color: Color, color_type: ColorType) -> String fn color_value(&self, color: Color, color_type: ColorType) -> String {
{ let mut ansi_color_code = String::new();
let mut ansi_color_code = String::new();
// The ansi code for forground = 30 and background = 40; // The ansi code for forground = 30 and background = 40;
match color_type match color_type {
{ ColorType::Foreground => ansi_color_code.push_str("30"),
ColorType::Foreground => ansi_color_code.push_str("30"), ColorType::Background => ansi_color_code.push_str("40"),
ColorType::Background => ansi_color_code.push_str("40"), }
}
// Construct ANSI escape color code string. ;1 is for the brightness // Construct ANSI escape color code string. ;1 is for the brightness
match color match color {
{ Color::Black => {
Color::Black => { sum_u16_to_string(0, &mut ansi_color_code); }, sum_u16_to_string(0, &mut ansi_color_code);
Color::Red => sum_u16_to_string(1, &mut ansi_color_code), }
Color::DarkRed => { Color::Red => sum_u16_to_string(1, &mut ansi_color_code),
sum_u16_to_string(1, &mut ansi_color_code); Color::DarkRed => {
&ansi_color_code.push_str(";1"); sum_u16_to_string(1, &mut ansi_color_code);
}, &ansi_color_code.push_str(";1");
Color::Green => sum_u16_to_string(2, &mut ansi_color_code), }
Color::DarkGreen => { Color::Green => sum_u16_to_string(2, &mut ansi_color_code),
sum_u16_to_string(2, &mut ansi_color_code); Color::DarkGreen => {
&ansi_color_code.push_str(";1"); sum_u16_to_string(2, &mut ansi_color_code);
}, &ansi_color_code.push_str(";1");
Color::Yellow => sum_u16_to_string(3, &mut ansi_color_code), }
Color::DarkYellow => { Color::Yellow => sum_u16_to_string(3, &mut ansi_color_code),
sum_u16_to_string(3, &mut ansi_color_code); Color::DarkYellow => {
&ansi_color_code.push_str(";1"); sum_u16_to_string(3, &mut ansi_color_code);
}, &ansi_color_code.push_str(";1");
Color::Blue => sum_u16_to_string(4, &mut ansi_color_code), }
Color::DarkBlue => { Color::Blue => sum_u16_to_string(4, &mut ansi_color_code),
sum_u16_to_string(4, &mut ansi_color_code); Color::DarkBlue => {
&ansi_color_code.push_str(";1"); sum_u16_to_string(4, &mut ansi_color_code);
}, &ansi_color_code.push_str(";1");
Color::Magenta => sum_u16_to_string(5, &mut ansi_color_code), }
Color::DarkMagenta => { Color::Magenta => sum_u16_to_string(5, &mut ansi_color_code),
sum_u16_to_string(5, &mut ansi_color_code); Color::DarkMagenta => {
&ansi_color_code.push_str(";1"); sum_u16_to_string(5, &mut ansi_color_code);
}, &ansi_color_code.push_str(";1");
Color::Cyan => sum_u16_to_string(6, &mut ansi_color_code), }
Color::DarkCyan => Color::Cyan => sum_u16_to_string(6, &mut ansi_color_code),
{ Color::DarkCyan => {
sum_u16_to_string(6, &mut ansi_color_code); sum_u16_to_string(6, &mut ansi_color_code);
&ansi_color_code.push_str(";1"); &ansi_color_code.push_str(";1");
}, }
Color::Grey => sum_u16_to_string(7, &mut ansi_color_code), Color::Grey => sum_u16_to_string(7, &mut ansi_color_code),
Color::White => sum_u16_to_string(7, &mut ansi_color_code), Color::White => sum_u16_to_string(7, &mut ansi_color_code),
} }
ansi_color_code ansi_color_code
} }
} }

10
src/terminal_style/color/base_color.rs
View File

@ -7,10 +7,9 @@
/// This trait is inplemented for winapi (Windows specific) and ansi (Unix specific), /// This trait is inplemented for winapi (Windows specific) and ansi (Unix specific),
/// so that the color related actions can be preformed on both unix and windows systems. /// so that the color related actions can be preformed on both unix and windows systems.
use super::color::{Color,ColorType}; use super::color::{Color, ColorType};
pub trait ITerminalColor pub trait ITerminalColor {
{
/// Set the forground color to the given color. /// Set the forground color to the given color.
fn set_fg(&self, fg_color: Color); fn set_fg(&self, fg_color: Color);
/// Set the background color to the given color. /// Set the background color to the given color.
@ -19,15 +18,12 @@ pub trait ITerminalColor
fn reset(&self); fn reset(&self);
/// Gets an value that represents an color from the given `Color` and `ColorType`. /// Gets an value that represents an color from the given `Color` and `ColorType`.
fn color_value(&self, color: Color, color_type: ColorType) -> String; fn color_value(&self, color: Color, color_type: ColorType) -> String;
} }
/// Sum an u16 value with an string (also a numeric value). /// Sum an u16 value with an string (also a numeric value).
pub fn sum_u16_to_string(value: u16, string: &mut String) pub fn sum_u16_to_string(value: u16, string: &mut String) {
{
let parsed_string: u16 = string.parse().unwrap(); let parsed_string: u16 = string.parse().unwrap();
let new_value: u16 = parsed_string + value; let new_value: u16 = parsed_string + value;
*string = new_value.to_string(); *string = new_value.to_string();
} }

72
src/terminal_style/color/color.rs
View File

@ -3,16 +3,13 @@ use std::convert::From;
use std::str::FromStr; use std::str::FromStr;
use Construct; use Construct;
use super::{WinApiColor, ANSIColor,NoTerminalColor}; use super::{ANSIColor, NoTerminalColor, WinApiColor};
use super::base_color::ITerminalColor; use super::base_color::ITerminalColor;
use terminal_style::{ObjectStyle,StyledObject}; use terminal_style::{ObjectStyle, StyledObject};
/// Colors that are available for coloring the termainal font. /// Colors that are available for coloring the termainal font.
#[derive(Debug)] #[derive(Debug, Copy, Clone)]
#[derive(Copy, Clone)] pub enum Color {
pub enum Color
{
Black, Black,
Red, Red,
@ -38,10 +35,8 @@ pub enum Color
} }
/// Color types /// Color types
#[derive(Debug)] #[derive(Debug, Copy, Clone)]
#[derive(Copy, Clone)] pub enum ColorType {
pub enum ColorType
{
Background, Background,
Foreground, Foreground,
} }
@ -108,18 +103,14 @@ impl FromStr for Color {
} }
/// Struct on wits the color realated actions can be performed. /// Struct on wits the color realated actions can be performed.
pub struct TerminalColor pub struct TerminalColor {
{
terminal_color: Option<Box<ITerminalColor>>, terminal_color: Option<Box<ITerminalColor>>,
} }
impl TerminalColor impl TerminalColor {
{
/// Instantiate an color implementation whereon color related actions can be performed. /// Instantiate an color implementation whereon color related actions can be performed.
pub fn init(&mut self) pub fn init(&mut self) {
{ if let None = self.terminal_color {
if let None = self.terminal_color
{
self.terminal_color = get_color_options(); self.terminal_color = get_color_options();
} }
} }
@ -134,11 +125,9 @@ impl TerminalColor
/// colored_terminal.set_fg(Color::Red); /// colored_terminal.set_fg(Color::Red);
/// ///
/// ``` /// ```
pub fn set_fg(&mut self, color: Color) pub fn set_fg(&mut self, color: Color) {
{
&self.init(); &self.init();
if let Some(ref terminal_color) = self.terminal_color if let Some(ref terminal_color) = self.terminal_color {
{
terminal_color.set_fg(color); terminal_color.set_fg(color);
} }
} }
@ -153,11 +142,9 @@ impl TerminalColor
/// colored_terminal.set_bg(Color::Red); /// colored_terminal.set_bg(Color::Red);
/// ///
/// ``` /// ```
pub fn set_bg(&mut self, color: Color) pub fn set_bg(&mut self, color: Color) {
{ &self.init();
&self.init(); if let Some(ref terminal_color) = self.terminal_color {
if let Some(ref terminal_color) = self.terminal_color
{
terminal_color.set_bg(color); terminal_color.set_bg(color);
} }
} }
@ -171,33 +158,30 @@ impl TerminalColor
/// colored_terminal.reset(); /// colored_terminal.reset();
/// ///
/// ``` /// ```
pub fn reset(&mut self) pub fn reset(&mut self) {
{ &self.init();
&self.init(); if let Some(ref terminal_color) = self.terminal_color {
if let Some(ref terminal_color) = self.terminal_color
{
terminal_color.reset(); terminal_color.reset();
} }
} }
} }
/// Get the concrete ITerminalColor implementation based on the current operating system. /// Get the concrete ITerminalColor implementation based on the current operating system.
fn get_color_options() -> Option<Box<ITerminalColor>> fn get_color_options() -> Option<Box<ITerminalColor>> {
{
if cfg!(target_os = "linux") { if cfg!(target_os = "linux") {
Some(ANSIColor::new()) Some(ANSIColor::new())
} } else if cfg!(target_os = "windows") {
else if cfg!(target_os = "windows") {
Some(WinApiColor::new()) Some(WinApiColor::new())
}else{ } else {
Some(NoTerminalColor::new()) Some(NoTerminalColor::new())
} }
} }
/// Get the terminal options for colors, whereon color related actions can be performed. /// Get the terminal options for colors, whereon color related actions can be performed.
pub fn colored_terminal() -> Box<TerminalColor> pub fn colored_terminal() -> Box<TerminalColor> {
{ Box::from(TerminalColor {
Box::from(TerminalColor { terminal_color: get_color_options() }) terminal_color: get_color_options(),
})
} }
/// Wraps an displayable object so it can be formatted with colors and attributes. /// Wraps an displayable object so it can be formatted with colors and attributes.
@ -219,9 +203,9 @@ pub fn colored_terminal() -> Box<TerminalColor>
/// println!("{}", styledobject); /// println!("{}", styledobject);
/// } /// }
/// ``` /// ```
pub fn paint<D>(val: D) -> StyledObject<D> where D: fmt::Display pub fn paint<D>(val: D) -> StyledObject<D>
where
D: fmt::Display,
{ {
ObjectStyle::new().apply_to(val) ObjectStyle::new().apply_to(val)
} }

2
src/terminal_style/color/mod.rs
View File

@ -8,5 +8,3 @@ pub mod base_color;
use self::no_color::NoTerminalColor; use self::no_color::NoTerminalColor;
use self::ansi_color::ANSIColor; use self::ansi_color::ANSIColor;
use self::winapi_color::WinApiColor; use self::winapi_color::WinApiColor;

29
src/terminal_style/color/no_color.rs
View File

@ -1,5 +1,5 @@
use Construct; use Construct;
use super::color::{Color,ColorType}; use super::color::{Color, ColorType};
use super::base_color::ITerminalColor; use super::base_color::ITerminalColor;
/// Struct that will be instantiated when something went wrong or when an platform does not suport /// Struct that will be instantiated when something went wrong or when an platform does not suport
@ -7,27 +7,20 @@ use super::base_color::ITerminalColor;
#[derive(Debug)] #[derive(Debug)]
pub struct NoTerminalColor; pub struct NoTerminalColor;
impl Construct for NoTerminalColor impl Construct for NoTerminalColor {
{ fn new() -> Box<NoTerminalColor> {
fn new() -> Box<NoTerminalColor> Box::from(NoTerminalColor {})
{
Box::from(NoTerminalColor {})
} }
} }
impl ITerminalColor for NoTerminalColor impl ITerminalColor for NoTerminalColor {
{ fn set_fg(&self, fg_color: Color) {}
fn set_fg(&self, fg_color: Color)
{ }
fn set_bg(&self, bg_color: Color) fn set_bg(&self, bg_color: Color) {}
{ }
fn reset(&self) fn reset(&self) {}
{ }
fn color_value(&self, color: Color, color_type: ColorType) -> String fn color_value(&self, color: Color, color_type: ColorType) -> String {
{ String::from("0")
String::from("0") }
}
} }

48
src/terminal_style/color/winapi_color.rs
View File

@ -1,45 +1,39 @@
extern crate winapi; extern crate winapi;
use Construct; use Construct;
use super::color::{Color,ColorType}; use super::color::{Color, ColorType};
use super::base_color::ITerminalColor; use super::base_color::ITerminalColor;
use kernel::windows_kernel::{kernel,color}; use kernel::windows_kernel::{color, kernel};
/// This struct will be used for coloring windows terminals with winapi. /// This struct will be used for coloring windows terminals with winapi.
#[derive(Debug)] #[derive(Debug)]
pub struct WinApiColor pub struct WinApiColor {
{
original_console_color: u16, original_console_color: u16,
} }
impl Construct for WinApiColor impl Construct for WinApiColor {
{ fn new() -> Box<WinApiColor> {
fn new() -> Box<WinApiColor> Box::from(WinApiColor {
{ original_console_color: kernel::get_original_console_color(),
Box::from(WinApiColor { original_console_color: kernel::get_original_console_color()}) })
} }
} }
impl ITerminalColor for WinApiColor impl ITerminalColor for WinApiColor {
{ fn set_fg(&self, fg_color: Color) {
fn set_fg(&self, fg_color: Color) let color_value = &self.color_value(fg_color, ColorType::Foreground);
{ color::set_fg_color(color_value.parse().unwrap());
let color_value = &self.color_value(fg_color, ColorType::Foreground); }
color::set_fg_color(color_value.parse().unwrap());
}
fn set_bg(&self, bg_color: Color) fn set_bg(&self, bg_color: Color) {
{
let color_value = &self.color_value(bg_color, ColorType::Background); let color_value = &self.color_value(bg_color, ColorType::Background);
color::set_bg_color(color_value.parse().unwrap()); color::set_bg_color(color_value.parse().unwrap());
} }
fn reset(&self) fn reset(&self) {
{ color::reset(self.original_console_color);
color::reset(self.original_console_color); }
}
fn color_value(&self, color: Color, color_type: ColorType) -> String fn color_value(&self, color: Color, color_type: ColorType) -> String {
{ color::winapi_color_val(color, color_type).to_string()
color::winapi_color_val(color,color_type).to_string() }
}
} }

2
src/terminal_style/mod.rs
View File

@ -1,7 +1,7 @@
mod color; mod color;
mod styles; mod styles;
pub use self::color::base_color::{ITerminalColor}; pub use self::color::base_color::ITerminalColor;
pub use self::color::color::*; pub use self::color::color::*;
pub use self::styles::objectstyle::ObjectStyle; pub use self::styles::objectstyle::ObjectStyle;

40
src/terminal_style/styles/objectstyle.rs
View File

@ -1,48 +1,50 @@
use terminal_style::{ Color, StyledObject }; use terminal_style::{Color, StyledObject};
use std::fmt::Display; use std::fmt::Display;
/// This struct contains the style properties that can be applied to an displayable object. /// This struct contains the style properties that can be applied to an displayable object.
#[derive(Clone)] #[derive(Clone)]
pub struct ObjectStyle pub struct ObjectStyle {
{
pub fg_color: Option<Color>, pub fg_color: Option<Color>,
pub bg_color: Option<Color>, pub bg_color: Option<Color>,
} }
impl Default for ObjectStyle impl Default for ObjectStyle {
{ fn default() -> ObjectStyle {
fn default() -> ObjectStyle ObjectStyle {
{ fg_color: Some(Color::White),
ObjectStyle { fg_color: Some(Color::White), bg_color: Some(Color::Black) } bg_color: Some(Color::Black),
}
} }
} }
impl ObjectStyle impl ObjectStyle {
{
/// Get an `StyledObject` from the passed displayable object. /// Get an `StyledObject` from the passed displayable object.
pub fn apply_to<D>(&self, val: D) -> StyledObject<D> where D: Display { pub fn apply_to<D>(&self, val: D) -> StyledObject<D>
where
D: Display,
{
StyledObject { StyledObject {
object_style: self.clone(), object_style: self.clone(),
content: val content: val,
} }
} }
/// Get an instance of `ObjectStyle` /// Get an instance of `ObjectStyle`
pub fn new() -> ObjectStyle pub fn new() -> ObjectStyle {
{ return ObjectStyle {
return ObjectStyle {fg_color: None, bg_color: None } fg_color: None,
bg_color: None,
};
} }
/// Set the background color of `ObjectStyle` to the passed color. /// Set the background color of `ObjectStyle` to the passed color.
pub fn bg(mut self, color: Color) -> ObjectStyle pub fn bg(mut self, color: Color) -> ObjectStyle {
{
self.bg_color = Some(color); self.bg_color = Some(color);
self self
} }
/// Set the foreground color of `ObjectStyle` to the passed color. /// Set the foreground color of `ObjectStyle` to the passed color.
pub fn fg(mut self, color: Color) -> ObjectStyle pub fn fg(mut self, color: Color) -> ObjectStyle {
{
self.fg_color = Some(color); self.fg_color = Some(color);
self self
} }

64
src/terminal_style/styles/styledobject.rs
View File

@ -1,14 +1,16 @@
use terminal_style::{ObjectStyle, Color}; use std;
use std::fmt;
use std::io::Write;
use terminal_style::{Color, ObjectStyle};
/// Struct that contains both the style and the content wits is styled. /// Struct that contains both the style and the content wits is styled.
pub struct StyledObject<V> pub struct StyledObject<D> {
{
pub object_style: ObjectStyle, pub object_style: ObjectStyle,
pub content: V, pub content: D,
} }
impl<D> StyledObject<D> impl<D> StyledObject<D> {
{
/// Paints the foreground color with the passed `Color` /// Paints the foreground color with the passed `Color`
/// ///
/// #Example /// #Example
@ -32,13 +34,11 @@ impl<D> StyledObject<D>
/// println!("{}", paint("I am colored green").with(Color::Green)) /// println!("{}", paint("I am colored green").with(Color::Green))
/// } /// }
/// ``` /// ```
pub fn with(mut self, foreground_color: Color) -> StyledObject<D> pub fn with(mut self, foreground_color: Color) -> StyledObject<D> {
{
self.object_style = self.object_style.fg(foreground_color); self.object_style = self.object_style.fg(foreground_color);
self self
} }
/// Paints the background color with the passed `Color` /// Paints the background color with the passed `Color`
/// ///
/// #Example /// #Example
@ -62,11 +62,53 @@ impl<D> StyledObject<D>
/// println!("{}", paint("I am colored green").on(Color::Green)) /// println!("{}", paint("I am colored green").on(Color::Green))
/// } /// }
/// ``` /// ```
pub fn on(mut self, background_color: Color) -> StyledObject<D> pub fn on(mut self, background_color: Color) -> StyledObject<D> {
{
self.object_style = self.object_style.bg(background_color); self.object_style = self.object_style.bg(background_color);
self self
} }
} }
/// This is used to make StyledObject able to be displayed.
/// This macro will set the styled stored in Styled Object
macro_rules! impl_fmt
{
($name:ident) => {
impl<D: fmt::$name> fmt::$name for StyledObject<D> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result
{
let mut colored_terminal = super::super::colored_terminal();
let mut reset = true;
if let Some(bg) = self.object_style.bg_color
{
colored_terminal.set_bg(bg);
reset = true;
}
if let Some(fg) = self.object_style.fg_color
{
colored_terminal.set_fg(fg);
reset = true;
}
fmt::$name::fmt(&self.content, f)?;
std::io::stdout().flush().expect("Flush stdout failed");
if reset
{
colored_terminal.reset();
}
Ok(())
}
}
}
}
/// This inplements Display for StyledObject
/// Notice that more implementations can be maked.
/// # Example
/// ```rust
/// example impl_fmt!(Debug);
/// ```
impl_fmt!(Debug);
impl_fmt!(Display);