arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix clippy warnings

Browse Source
This commit is contained in:
Alexandre Bury 2016-10-11 11:04:01 -07:00
parent 01f4689822
commit 04f528e2de
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/backend/curses/n.rs
View File

@ -3,7 +3,8 @@ extern crate ncurses;
use backend; use backend;
use event::{Event, Key}; use event::{Event, Key};
use theme::{BaseColor, Color, ColorStyle, Effect}; use self::super::find_closest;
use theme::{Color, ColorStyle, Effect};
use utf8; use utf8;
pub struct Concrete; pub struct Concrete;
@ -13,12 +14,12 @@ impl backend::Backend for Concrete {
::std::env::set_var("ESCDELAY", "25"); ::std::env::set_var("ESCDELAY", "25");
ncurses::setlocale(ncurses::LcCategory::all, ""); ncurses::setlocale(ncurses::LcCategory::all, "");
ncurses::initscr(); ncurses::initscr();
ncurses::keypad(unsafe { ncurses::stdscr() }, true); ncurses::keypad(ncurses::stdscr(), true);
ncurses::noecho(); ncurses::noecho();
ncurses::cbreak(); ncurses::cbreak();
ncurses::start_color(); ncurses::start_color();
ncurses::curs_set(ncurses::CURSOR_VISIBILITY::CURSOR_INVISIBLE); ncurses::curs_set(ncurses::CURSOR_VISIBILITY::CURSOR_INVISIBLE);
ncurses::wbkgd(unsafe { ncurses::stdscr() }, ncurses::wbkgd(ncurses::stdscr(),
ncurses::COLOR_PAIR(ColorStyle::Background.id())); ncurses::COLOR_PAIR(ColorStyle::Background.id()));
Concrete Concrete
@ -27,7 +28,7 @@ impl backend::Backend for Concrete {
fn screen_size(&self) -> (usize, usize) { fn screen_size(&self) -> (usize, usize) {
let mut x: i32 = 0; let mut x: i32 = 0;
let mut y: i32 = 0; let mut y: i32 = 0;
ncurses::getmaxyx(unsafe { ncurses::stdscr() }, &mut y, &mut x); ncurses::getmaxyx(ncurses::stdscr(), &mut y, &mut x);
(x as usize, y as usize) (x as usize, y as usize)
} }
@ -224,31 +225,3 @@ fn parse_ncurses_char(ch: i32) -> Event {
_ => Event::Unknown(ch), _ => Event::Unknown(ch),
} }
} }
fn find_closest(color: &Color) -> u8 {
match *color {
Color::Dark(BaseColor::Black) => 0,
Color::Dark(BaseColor::Red) => 1,
Color::Dark(BaseColor::Green) => 2,
Color::Dark(BaseColor::Yellow) => 3,
Color::Dark(BaseColor::Blue) => 4,
Color::Dark(BaseColor::Magenta) => 5,
Color::Dark(BaseColor::Cyan) => 6,
Color::Dark(BaseColor::White) => 7,
Color::Light(BaseColor::Black) => 8,
Color::Light(BaseColor::Red) => 9,
Color::Light(BaseColor::Green) => 10,
Color::Light(BaseColor::Yellow) => 11,
Color::Light(BaseColor::Blue) => 12,
Color::Light(BaseColor::Magenta) => 13,
Color::Light(BaseColor::Cyan) => 14,
Color::Light(BaseColor::White) => 15,
Color::Rgb(r, g, b) => {
let r = 6 * r as u16 / 256;
let g = 6 * g as u16 / 256;
let b = 6 * b as u16 / 256;
(16 + 36 * r + 6 * g + b) as u8
}
Color::RgbLowRes(r, g, b) => (16 + 36 * r + 6 * g + b) as u8,
}
}