Add cli flag to disable the software arrow buttons

Author: LinusCDE

Cargo.lock

@@ -13,3 +13,4 @@ tetris_core = "0.2"
 downcast-rs = "1.2"
 fxhash = "0.2"
 clap = "3.0.0-beta.1"
+lazy_static = "1.4.0"

Cargo.toml

@@ -1,5 +1,3 @@
-/// Test ABC
-
 #[macro_use]
 extern crate downcast_rs;
 
@@ -10,24 +8,29 @@ mod swipe;
 use clap::{Clap, crate_version, crate_authors};
 use crate::canvas::Canvas;
 use crate::scene::*;
+use lazy_static::lazy_static;
 use libremarkable::input::{InputDevice, InputEvent, ev::EvDevContext};
 use std::process::Command;
 use std::time::{SystemTime, Duration};
 use std::thread::sleep;
 use tetris_core::Size;
 
-
 #[derive(Clap)]
 #[clap(version = crate_version!(), author = crate_authors!())]
-struct Opts {
-    #[clap(long, short)]
-    spare_xochitl: bool
+pub struct Opts {
+    #[clap(long, short, about = "Don't stop xochitl service when a xochitl process is found.")]
+    spare_xochitl: bool,
+
+    #[clap(long, short = "A", about = "Don't display the left and right software arrow buttons.")]
+    no_arrow_buttons: bool,
 }
 
-fn main() {
-    let opts: Opts = Opts::parse();
+lazy_static! {
+    pub static ref CLI_OPTS: Opts = Opts::parse();
+}
 
-    let only_exit_to_xochitl = if opts.spare_xochitl {
+fn main() {
+    let only_exit_to_xochitl = if CLI_OPTS.spare_xochitl {
         false
     }else if let Ok(status) = Command::new("pidof").arg("xochitl").status() {
         if status.code().unwrap() == 0 {

src/main.rs

@@ -383,11 +383,13 @@ impl Scene for GameScene {
             let lr_vgap = 50;
             let lr_hgap = 50;
             let lr_font_size = 100.0;
-            self.left_button_hitbox = Some(canvas.draw_button(Point2 { x: Some(lr_x_margin), y: Some(lr_y_pos) }, "«", lr_font_size, lr_vgap, lr_hgap));
-            self.right_button_hitbox = Some(canvas.draw_button(Point2 {
-                x: Some(DISPLAYWIDTH as i32 + lr_hgap as i32 - (self.left_button_hitbox.unwrap().left as i32 + self.left_button_hitbox.unwrap().width as i32)),
-                y: Some(lr_y_pos)
-            }, "»", lr_font_size, lr_vgap, lr_hgap));
+            if ! crate::CLI_OPTS.no_arrow_buttons {
+                self.left_button_hitbox = Some(canvas.draw_button(Point2 { x: Some(lr_x_margin), y: Some(lr_y_pos) }, "«", lr_font_size, lr_vgap, lr_hgap));
+                self.right_button_hitbox = Some(canvas.draw_button(Point2 {
+                    x: Some(DISPLAYWIDTH as i32 + lr_hgap as i32 - (self.left_button_hitbox.unwrap().left as i32 + self.left_button_hitbox.unwrap().width as i32)),
+                    y: Some(lr_y_pos)
+                }, "»", lr_font_size, lr_vgap, lr_hgap));
+            }
 
             canvas.update_full();
             self.draw_score(canvas);