exit gui app when pressing Esc key

Godones · Aug 6, 2024 · 5fd6ef4 · 5fd6ef4
1 parent f5c6f57
commit 5fd6ef4
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -28,8 +28,7 @@ TALLOC ?=y
 BUDDY ?=n
 FS ?=fat
 INITRD ?=y
-
-
+QEMU := qemu-system-riscv64
 comma:= ,
 empty:=
 space:= $(empty) $(empty)
@@ -83,7 +82,7 @@ endif
 FEATURES := $(subst $(space),$(comma),$(FEATURES))
 
 define boot_qemu
-	qemu-system-riscv64 \
+	$(QEMU) \
         -M virt $(1)\
         -bios $(BOOTLOADER) \
         -drive file=$(IMG),if=none,format=raw,id=x0 \

diff --git a/user/apps/Makefile b/user/apps/Makefile
@@ -31,8 +31,7 @@ BUILD_CRATES := \
 	print \
 
 ifeq ($(GUI),y)
-	BUILD_CRATES += egui \
-					sysinfo \
+	BUILD_CRATES += sysinfo \
 					todo \
 					slint \
 					memory-game \

diff --git a/user/apps/memory-game/src/main.rs b/user/apps/memory-game/src/main.rs
@@ -17,6 +17,8 @@ use slint_helper::{MyPlatform, SwapBuffer};
 use virt2slint::Converter;
 use Mstd::{
     io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES},
+    println,
+    process::exit,
     time::get_time_ms,
 };
 
@@ -108,10 +110,39 @@ fn checkout_event(converter: &mut Converter, x: &mut isize, y: &mut isize) -> Ve
     for i in 0..event_num as usize {
         let event = events[i];
         // let window_event = input2event(event, x, y);
+        let e = InputEvent::from(event);
+        if e.event_type == 1 && (e.code == 1 || e.code == 273) && e.value == 0 {
+            println!("ESC or right-click pressed, exit");
+            exit(0);
+        }
         let window_event = converter.convert(event, x, y);
         window_event.map(|e| {
             res.push(e);
         });
     }
     res
 }
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default)]
+pub struct InputEvent {
+    /// Event type.
+    pub event_type: u16,
+    /// Event code.
+    pub code: u16,
+    /// Event value.
+    pub value: u32,
+}
+
+impl From<u64> for InputEvent {
+    fn from(event: u64) -> Self {
+        let event_type = (event >> 48) as u16;
+        let code = ((event >> 32) & 0xFFFF) as u16;
+        let value = (event & 0xFFFFFFFF) as u32;
+        Self {
+            event_type,
+            code,
+            value,
+        }
+    }
+}
diff --git a/user/apps/printdemo/src/main.rs b/user/apps/printdemo/src/main.rs
@@ -11,7 +11,11 @@ use alloc::{rc::Rc, vec::Vec};
 use slint::{platform::WindowEvent, Model};
 use slint_helper::{MyPlatform, SwapBuffer};
 use virt2slint::Converter;
-use Mstd::io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES};
+use Mstd::{
+    io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES},
+    println,
+    process::exit,
+};
 
 #[no_mangle]
 fn fmod(x: f64, y: f64) -> f64 {
@@ -161,10 +165,39 @@ fn checkout_event(converter: &mut Converter, x: &mut isize, y: &mut isize) -> Ve
     for i in 0..event_num as usize {
         let event = events[i];
         // let window_event = input2event(event, x, y);
+        let e = InputEvent::from(event);
+        if e.event_type == 1 && (e.code == 1 || e.code == 273) && e.value == 0 {
+            println!("ESC or right-click pressed, exit");
+            exit(0);
+        }
         let window_event = converter.convert(event, x, y);
         window_event.map(|e| {
             res.push(e);
         });
     }
     res
 }
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default)]
+pub struct InputEvent {
+    /// Event type.
+    pub event_type: u16,
+    /// Event code.
+    pub code: u16,
+    /// Event value.
+    pub value: u32,
+}
+
+impl From<u64> for InputEvent {
+    fn from(event: u64) -> Self {
+        let event_type = (event >> 48) as u16;
+        let code = ((event >> 32) & 0xFFFF) as u16;
+        let value = (event & 0xFFFFFFFF) as u32;
+        Self {
+            event_type,
+            code,
+            value,
+        }
+    }
+}
diff --git a/user/apps/slint/src/main.rs b/user/apps/slint/src/main.rs
@@ -9,7 +9,11 @@ use alloc::vec::Vec;
 use slint::platform::WindowEvent;
 use slint_helper::{MyPlatform, SwapBuffer};
 use virt2slint::Converter;
-use Mstd::io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES};
+use Mstd::{
+    io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES},
+    println,
+    process::exit,
+};
 
 slint::include_modules!();
 
@@ -61,10 +65,39 @@ fn checkout_event(converter: &mut Converter, x: &mut isize, y: &mut isize) -> Ve
     for i in 0..event_num as usize {
         let event = events[i];
         // let window_event = input2event(event, x, y);
+        let e = InputEvent::from(event);
+        if e.event_type == 1 && (e.code == 1 || e.code == 273) && e.value == 0 {
+            println!("ESC or right-click pressed, exit");
+            exit(0);
+        }
         let window_event = converter.convert(event, x, y);
         window_event.map(|e| {
             res.push(e);
         });
     }
     res
 }
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default)]
+pub struct InputEvent {
+    /// Event type.
+    pub event_type: u16,
+    /// Event code.
+    pub code: u16,
+    /// Event value.
+    pub value: u32,
+}
+
+impl From<u64> for InputEvent {
+    fn from(event: u64) -> Self {
+        let event_type = (event >> 48) as u16;
+        let code = ((event >> 32) & 0xFFFF) as u16;
+        let value = (event & 0xFFFFFFFF) as u32;
+        Self {
+            event_type,
+            code,
+            value,
+        }
+    }
+}
diff --git a/user/apps/sysinfo/src/main.rs b/user/apps/sysinfo/src/main.rs
@@ -9,7 +9,11 @@ use alloc::{boxed::Box, rc::Rc, vec, vec::Vec};
 use slint::{platform::WindowEvent, SharedString};
 use slint_helper::{MyPlatform, SwapBuffer};
 use virt2slint::Converter;
-use Mstd::io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES};
+use Mstd::{
+    io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES},
+    println,
+    process::exit,
+};
 
 slint::include_modules!();
 #[no_mangle]
@@ -79,10 +83,39 @@ fn checkout_event(converter: &mut Converter, x: &mut isize, y: &mut isize) -> Ve
     for i in 0..event_num as usize {
         let event = events[i];
         // let window_event = input2event(event, x, y);
+        let e = InputEvent::from(event);
+        if e.event_type == 1 && (e.code == 1 || e.code == 273) && e.value == 0 {
+            println!("ESC or right-click pressed, exit");
+            exit(0);
+        }
         let window_event = converter.convert(event, x, y);
         window_event.map(|e| {
             res.push(e);
         });
     }
     res
 }
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default)]
+pub struct InputEvent {
+    /// Event type.
+    pub event_type: u16,
+    /// Event code.
+    pub code: u16,
+    /// Event value.
+    pub value: u32,
+}
+
+impl From<u64> for InputEvent {
+    fn from(event: u64) -> Self {
+        let event_type = (event >> 48) as u16;
+        let code = ((event >> 32) & 0xFFFF) as u16;
+        let value = (event & 0xFFFFFFFF) as u32;
+        Self {
+            event_type,
+            code,
+            value,
+        }
+    }
+}
diff --git a/user/apps/todo/src/main.rs b/user/apps/todo/src/main.rs
@@ -8,7 +8,11 @@ use core::{clone::Clone, convert::Into, default::Default, iter::Iterator};
 use slint::{platform::WindowEvent, FilterModel, Model, SortModel};
 use slint_helper::{MyPlatform, SwapBuffer};
 use virt2slint::Converter;
-use Mstd::io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES};
+use Mstd::{
+    io::{keyboard_or_mouse_event, VIRTGPU_XRES, VIRTGPU_YRES},
+    println,
+    process::exit,
+};
 
 slint::include_modules!();
 
@@ -162,10 +166,39 @@ fn checkout_event(converter: &mut Converter, x: &mut isize, y: &mut isize) -> Ve
     for i in 0..event_num as usize {
         let event = events[i];
         // let window_event = input2event(event, x, y);
+        let e = InputEvent::from(event);
+        if e.event_type == 1 && (e.code == 1 || e.code == 273) && e.value == 0 {
+            println!("ESC or right-click pressed, exit");
+            exit(0);
+        }
         let window_event = converter.convert(event, x, y);
         window_event.map(|e| {
             res.push(e);
         });
     }
     res
 }
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default)]
+pub struct InputEvent {
+    /// Event type.
+    pub event_type: u16,
+    /// Event code.
+    pub code: u16,
+    /// Event value.
+    pub value: u32,
+}
+
+impl From<u64> for InputEvent {
+    fn from(event: u64) -> Self {
+        let event_type = (event >> 48) as u16;
+        let code = ((event >> 32) & 0xFFFF) as u16;
+        let value = (event & 0xFFFFFFFF) as u32;
+        Self {
+            event_type,
+            code,
+            value,
+        }
+    }
+}