Merge pull request #5 from Nodraak/master

Fix compilation and add TGV

Author: skade

Cargo.lock

@@ -11,12 +11,10 @@ name = "sl"
 [lib]
 
 name = "sl"
+path = "src/sl.rs"
 
 [dependencies]
 
-getopts = "0.2.14"
+getopts = "0.2"
 libc = "0.2"
-
-[dependencies.ncurses]
-
-git = "https://github.com/jeaye/ncurses-rs.git"
+ncurses = "5.99"

Cargo.toml

@@ -10,11 +10,17 @@ use sl::Train;
 use sl::d51::SL;
 use sl::c51::C51;
 use sl::logo::Logo;
+use sl::tgv::TGV;
 
-trait Render: Train + Copy {
+fn speed2delay(speed: u32) -> u32 {
+    // if 4_000_000: 100 km/h -> 40 ms
+    4_000_000/speed
+}
+
+trait Render: Train {
     fn render(&self, x: i32) {
         let mut len = 0 as i32;
-        let y = unsafe { ncurses::LINES } / 2;
+        let y = ncurses::LINES() / 2;
         let body_iter = self.body().iter();
         let wheelset_iter = self.wheelset(x as usize).iter();
         let iter = body_iter.chain(wheelset_iter);
@@ -55,7 +61,7 @@ trait Render: Train + Copy {
     }
 
     fn render_line(&self, y: i32, x: i32, line: &str) {
-        let paint_len = ( unsafe { ncurses::COLS } - x) as usize;
+        let paint_len = ( ncurses::COLS() - x) as usize;
         if paint_len < line.len() {
             ncurses::mvaddstr(y, x, &line[0..paint_len]);
         } else if x < 0 {
@@ -68,9 +74,11 @@ trait Render: Train + Copy {
     }
 }
 
+impl Render for dyn Train {}
 impl Render for SL {}
 impl Render for C51 {}
 impl Render for Logo {}
+impl Render for TGV {}
 
 fn main() {
     use libc::signal;
@@ -83,6 +91,7 @@ fn main() {
     let mut opts = Options::new();
     opts.optflag("l", "", "logo");
     opts.optflag("c", "", "C51");
+    opts.optflag("G", "", "TGV");
     opts.optflag("a", "", "reserved for future use");
     opts.optflag("f", "", "reserved for future use");
 
@@ -98,23 +107,37 @@ fn main() {
 
     ncurses::noecho();
     ncurses::curs_set(ncurses::CURSOR_VISIBILITY::CURSOR_INVISIBLE);
-    ncurses::nodelay( unsafe { ncurses::stdscr }, true);
-    ncurses::leaveok( unsafe { ncurses::stdscr }, true);
-    ncurses::scrollok( unsafe { ncurses::stdscr }, false);
+    ncurses::nodelay(ncurses::stdscr(), true);
+    ncurses::leaveok(ncurses::stdscr(), true);
+    ncurses::scrollok(ncurses::stdscr(), false);
 
-    for x in (-85.. unsafe { ncurses::COLS } ).rev() {
-        ncurses::clear();
+    let train: Box<dyn Train> = {
         if matches.opt_present("l") {
-            Logo.render(x)
+            Box::new(Logo)
         } else if matches.opt_present("c") {
-            C51.render(x)
+            Box::new(C51)
+        } else if matches.opt_present("G") {
+            // First Non prototype TGV was orange.
+            // Note: must be called after initscr().
+            if ncurses::has_colors() {
+                ncurses::start_color();
+                ncurses::init_pair(1, ncurses::COLOR_YELLOW, ncurses::COLOR_BLACK);
+                ncurses::attron(ncurses::COLOR_PAIR(1));
+            }
+
+            Box::new(TGV)
         } else {
-            SL.render(x)
-        };
+            Box::new(SL)
+        }
+    };
+
+    for x in (-85..ncurses::COLS()).rev() {
+        ncurses::clear();
+        train.render(x);
         ncurses::getch();
         ncurses::refresh();
         unsafe {
-            usleep(40000);
+            usleep(speed2delay(train.speed()));
         }
     }
     ncurses::endwin();

src/bin/sl.rs

@@ -5,6 +5,10 @@ use super::data::{C51WHL, C51BODY, COAL};
 pub struct C51;
 
 impl Train for C51 {
+    fn speed(&self) -> u32 {
+        100
+    }
+
     fn body(&self) -> &'static [&'static str] {
         &C51BODY
     }

src/c51.rs

@@ -5,6 +5,10 @@ use super::data::{D51BODY, D51WHL, COAL};
 pub struct SL;
 
 impl Train for SL {
+    fn speed(&self) -> u32 {
+        85
+    }
+
     fn body(&self) -> &'static [&'static str] {
         &D51BODY
     }

src/d51.rs

@@ -97,3 +97,29 @@ pub static LCAR: [&'static str; 6] = ["____________________ ",
                                       "|__________________| ",
                                       "|__________________| ",
                                       "   (O)        (O)    "];
+
+pub static TGVBODY: [&'static str; 7] = [
+    r"                             ______________   /          ",
+    r"                ____________/______________|__\_______   ",
+    r"          _____/  |IIIIIIIIIII|_______________________|  ",
+    r"       __/__/_|_|       ______________________________|  ",
+    r"    __/       | |      /         ||||||||||||  TGV || |  ",
+    r"   />  []     | |    /___________||||||||||||______|| |  ",
+    r"  \_==================================================|  ",
+];
+
+pub static TGVWHL: [[&'static str; 1]; 2] = [
+    [r"    |___/==0==0==|_________________________/===0==0==\|  "],
+    [r"    |___/0==0==0=|_________________________/=0==0==0=\|  "],
+];
+
+pub static TGVCAR: [&'static str; 8] = [
+    r"  ___________                                            ",
+    r"  |_====____|\________________________________________   ",
+    r"o|  ||||         ___                                  |  ",
+    r"H|______________|___|_________________________________|  ",
+    r"H|  |||| |[]|   |[]1|    []   [  ] [  ] [  ] [  ]     |  ",
+    r"H|__||||_|__|___|___|_________________________________|  ",
+    r"D|==============|===|=================================|  ",
+    r" _/ 0==0  |____________________________________/    0=|  ",
+];

src/data.rs

@@ -1,9 +1,14 @@
 pub mod d51;
 pub mod c51;
 pub mod logo;
+pub mod tgv;
 mod data;
 
 pub trait Train {
+    /// Approximate speed in km/h
+    fn speed(&self) -> u32 {
+        100
+    }
     fn body(&self) -> &'static [&'static str];
     fn wheelset(&self, x: usize) -> &'static [&'static str];
     fn tender(&self) -> Option<&'static [&'static str]> {

src/sl.rs

@@ -0,0 +1,28 @@
+use super::Train;
+use super::data::{TGVWHL, TGVBODY, TGVCAR};
+
+#[derive(Copy, Clone)]
+pub struct TGV;
+
+impl Train for TGV {
+    fn speed(&self) -> u32 {
+        // in reality, TGV is even faster, but we want to be able to see it!
+        300
+    }
+
+    fn body(&self) -> &'static [&'static str] {
+        &TGVBODY
+    }
+
+    fn wheelset(&self, x: usize) -> &'static [&'static str] {
+        &TGVWHL[(x % 2)]
+    }
+
+    fn wagons(&self) -> u32 {
+        2
+    }
+
+    fn wagon(&self) -> Option<&'static [&'static str]> {
+        Some(&TGVCAR)
+    }
+}