add Alt+E shotcut to exit from editor #2

Author: abdfnx

assets/logo.png

@@ -130,6 +130,7 @@
     keys: {
         // Keybinding: [Oxa commands]
         Ctrl(Char('q')): ["quit"], // Quit current document
+        Alt(Char('e')):  ["exit"], // Exit from current document
         Ctrl(Char('s')): ["save"], // Save current document
         Alt(Char('s')):  ["save ?"], // Save current document as
         Ctrl(Char('w')): ["save *"], // Save all open documents

assets/logo.svg

@@ -112,6 +112,7 @@ pub struct Editor {
     pub status: Status,                      // Holding the status of the config
     config_path: String,                     // Holds the file path of the config file
     quit: bool,                              // Toggle for cleanly quitting the editor
+    exit: bool,                              // Toggle for cleanly quitting the editor
     term: Terminal,                          // For the handling of the terminal
     doc: Vec<Document>,                      // For holding our document
     tab: usize,                              // Holds the number of the current tab
@@ -212,6 +213,7 @@ impl Editor {
         // Create the new editor instance
         Ok(Self {
             quit: false,
+            exit: false,
             // Display information about the config file into text for the status line
             term,
             tab: 0,
@@ -507,7 +509,7 @@ impl Editor {
     fn quit_document(&mut self, force: bool) {
         // For handling a quit event
         if let KeyBinding::Ctrl(_) | KeyBinding::Alt(_) = self.keypress {
-            if force || self.dirty_prompt(self.keypress, "quit") {
+            if force || self.dirty_prompt(self.keypress, "quit") || self.dirty_prompt(self.keypress, "exit") {
                 if self.doc.len() <= 1 {
                     // Quit Ox
                     self.quit = true;
@@ -527,7 +529,7 @@ impl Editor {
     fn quit_all(&mut self, force: bool) {
         // Quit all the documents in the editor
         self.tab = 0;
-        while !self.quit {
+        while !self.quit || !self.exit {
             self.execute(Event::Quit(force), false);
         }
     }
@@ -561,6 +563,7 @@ impl Editor {
             Event::Save(file, prompt) => self.save_document(file, prompt),
             Event::SaveAll => self.save_every_document(),
             Event::Quit(force) => self.quit_document(force),
+            Event::Exit(force) => self.quit_document(force),
             Event::QuitAll(force) => self.quit_all(force),
             Event::NextTab => self.next_tab(),
             Event::PrevTab => self.prev_tab(),

config/ox.ron

@@ -40,6 +40,7 @@ pub fn interpret_line(
             "commit" => events.push(Event::Commit),
             "redo" => events.push(Event::Redo),
             "quit" => events.push(quit_command(&args)),
+            "exit" => events.push(quit_command(&args)),
             "prev" => events.push(Event::PrevTab),
             "next" => events.push(Event::NextTab),
             "set" => events.push(set_command(&args, &cursor, &rows)),
@@ -139,7 +140,8 @@ fn quit_command(args: &[&str]) -> Event {
     if args.contains(&"*") {
         Event::QuitAll(args.contains(&"!"))
     } else {
-        Event::Quit(args.contains(&"!"))
+        Event::Quit(args.contains(&"!"));
+        Event::Exit(args.contains(&"!"))
     }
 }
 

src/config.rs

@@ -46,6 +46,7 @@ pub enum Event {
     Redo,                                           // Redo event
     Commit,                                         // Commit undo event
     Quit(bool),                                     // Quit document
+    Exit(bool),                                     // Exit document
     QuitAll(bool),                                  // Quit all
     NextTab,                                        // Next tab
     PrevTab,                                        // Previous tab