Initializes Slint gui

.github/workflows/ci-mac.yml

@@ -15,7 +15,7 @@ on:
         type: string
         required: true
 env:
-  CMAKE_BUILD_PARALLEL_LEVEL: '3'
+  CMAKE_BUILD_PARALLEL_LEVEL: "3"
 jobs:
   build:
     name: ${{ inputs.name }}
@@ -25,6 +25,10 @@ jobs:
       QT_URL_BASE: https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt6_672/qt.qt6.672.clang_64/6.7.2-0-202406110330qtbase-MacOS-MacOS_13-Clang-MacOS-MacOS_13-X86_64-ARM64.7z
       QT_URL_SVG: https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt6_672/qt.qt6.672.clang_64/6.7.2-0-202406110330qtsvg-MacOS-MacOS_13-Clang-MacOS-MacOS_13-X86_64-ARM64.7z
     steps:
+    - name: Set up Python 3.12 (the latest version that is able to build skia-bindings)
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.12"
     - name: Checkout source
       uses: actions/checkout@v4
     - name: Generate cache keys

.vscode/launch.json

@@ -1,7 +1,7 @@
 {
   "configurations": [
     {
-      "name": "GUI",
+      "name": "GUI (Qt)",
       "type": "lldb",
       "request": "launch",
       "args": [
@@ -22,6 +22,24 @@
         "program": "${workspaceFolder}/build/gui/obliteration.app/Contents/MacOS/obliteration"
       }
     },
+    {
+      "name": "GUI (Slint)",
+      "type": "lldb",
+      "request": "launch",
+      "cargo": {
+	"args": [
+	  "build",
+	  "--manifest-path",
+	  "${workspaceFolder}/gui/Cargo.toml",
+	  "--features",
+	  "slint"
+	],
+	"filter": {
+	  "kind": "bin"
+	}
+      },
+      "cwd": "${workspaceFolder}"
+    },
     {
       "name": "Kernel",
       "type": "lldb",
@@ -31,10 +49,10 @@
         "target create ${workspaceFolder}/build/obkrnl",
         "target modules load --file ${workspaceFolder}/build/obkrnl -s 0xffffffff82200000"
       ],
-      "processCreateCommands": [
-        "gdb-remote 1234"
-      ]
+      "processCreateCommands": ["gdb-remote 1234"]
     }
   ],
   "version": "2.0.0"
 }
+
+

CMakeLists.txt

@@ -41,7 +41,7 @@ else()
 endif()
 
 add_cargo(MANIFEST Cargo.toml)
-add_crate(gui)
+add_crate(gui LIBRARY ARGS --features "qt")
 add_crate(obkrnl
     TOOLCHAIN ${kernel_toolchain}
     VENDOR "unknown"

cmake/cargo.cmake

@@ -178,6 +178,9 @@ function(add_crate crate)
 
         if(${kind} STREQUAL "staticlib")
             add_library(${crate} STATIC IMPORTED)
+
+            list(APPEND build_args "--lib")
+
             if(WIN32)
                 set(debug_artifact "${debug_outputs}/${crate}.lib")
                 set(release_artifact "${release_outputs}/${crate}.lib")

gui/CMakeLists.txt

@@ -66,6 +66,10 @@ target_link_libraries(obliteration PRIVATE Qt6::Svg Qt6::Widgets)
 target_link_libraries(obliteration PRIVATE Threads::Threads)
 target_link_libraries(obliteration PRIVATE gui)
 
+if(WIN32 OR (UNIX AND NOT APPLE))
+    target_link_libraries(obliteration PRIVATE Vulkan::Vulkan)
+endif()
+
 if(WIN32)
     target_link_libraries(obliteration PRIVATE bcrypt imm32 ntdll setupapi userenv version winhvplatform winmm ws2_32)
 elseif(APPLE)

gui/Cargo.toml

@@ -5,6 +5,20 @@ edition = "2021"
 
 [lib]
 crate-type = ["staticlib"]
+required-features = ["qt"]
+
+[[bin]]
+name = "obliteration"
+path = "src/main.rs"
+required-features = ["slint"]
+
+[features]
+slint = [
+    "dep:slint",
+    "dep:clap",
+    "dep:raw-window-handle",
+]
+qt = []
 
 [dependencies]
 bitfield-struct = "0.8.0"
@@ -26,9 +40,18 @@ aarch64 = { path = "../arch/aarch64" }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86-64 = { path = "../arch/x86-64" }
+raw-window-handle = { version = "0.6", optional = true }
+clap = { version = "4.5.20", features = ["derive"], optional = true }
+
+[dependencies.slint]
+git = "https://github.com/slint-ui/slint"
+rev = "875ca075fb5b2dfe4c3ab0a499d5759412fc1395"
+features = ["compat-1-2", "std", "accessibility", "raw-window-handle-06", "backend-winit", "renderer-skia"]
+default-features = false
+optional = true
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
-ash = "0.38.0"
+ash = { version = "0.38.0", features = ["linked", "std"], default-features = false }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.52.0"
@@ -49,3 +72,4 @@ objc = "0.2.7"
 
 [build-dependencies]
 cbindgen = "0.26.0"
+slint-build = { git = "https://github.com/slint-ui/slint", rev = "875ca075fb5b2dfe4c3ab0a499d5759412fc1395" }

gui/build.rs

@@ -1,4 +1,5 @@
 use cbindgen::{Builder, Config, Language, Style};
+use slint_build::CompilerConfiguration;
 use std::path::PathBuf;
 
 const LINUX_INCLUDE: &str = r#"
@@ -8,6 +9,25 @@ const LINUX_INCLUDE: &str = r#"
 "#;
 
 fn main() {
+    if std::env::var("CARGO_FEATURE_SLINT").is_ok_and(|var| var == "1") {
+        build_bin();
+    }
+
+    if std::env::var("CARGO_FEATURE_QT").is_ok_and(|var| var == "1") {
+        build_lib();
+    }
+}
+
+fn build_bin() {
+    // Compile main
+    slint_build::compile_with_config(
+        "slint/main.slint",
+        CompilerConfiguration::new().with_style(String::from("fluent-dark")),
+    )
+    .unwrap();
+}
+
+fn build_lib() {
     let root = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
     let mut conf = Config::default();
     let mut buf = String::new();

gui/main.cpp

@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
         QMessageBox::critical(
             nullptr,
             "Error",
-            "No any Vulkan device supports Vulkan 1.3.");
+            "No Vulkan device supports Vulkan 1.3.");
         return 1;
     }
 

gui/slint/main.slint

@@ -0,0 +1,63 @@
+import { Game } from "structs.slint";
+import { Tabs } from "main/tabs.slint";
+import { Menu } from "main/menu.slint";
+import { Actions } from "main/actions.slint";
+
+export component MainWindow inherits Window {
+    preferred-width: 1920px;
+    preferred-height: 1080px;
+    icon: @image-url("../resources/obliteration-icon.png");
+    title: "Obliteration";
+
+    in property <[Game]> games: [];
+    in property <[string]> profiles: [];
+    in property <[string]> devices: [];
+
+    pure callback start_game(int);
+
+    pure callback clear_log();
+    pure callback get_log_text() -> string;
+
+    pure callback open_new_issue_link();
+
+    pure callback install_pkg();
+    pure callback open_system_folder();
+    pure callback quit();
+
+    VerticalLayout {
+        Menu {
+            background: root.background;
+            popup_width: root.width / 2;
+            popup_height: root.height / 2;
+            popup_x: root.width / 4;
+            popup_y: root.height / 4;
+
+            quit => { quit(); }
+            open_new_issue_link => { open_new_issue_link(); }
+            install_pkg => { install_pkg(); }
+            open_system_folder => { open_system_folder(); }
+        }
+        Tabs {
+            devices: devices;
+            games: games;
+            select_game(index) => {  }
+        }
+        Actions {
+            profiles: profiles;
+            start_game => {
+                start_game(0)
+            }
+        }
+    }
+}
+
+export component Screen inherits Window {}
+
+export component ErrorDialog inherits Window {
+    in property <string> message;
+
+    Text {
+        padding: 10px;
+        text: message;
+    }
+}

gui/slint/main/actions.slint

@@ -0,0 +1,29 @@
+import { ComboBox, Button } from "std-widgets.slint";
+
+export component Actions {
+    in property <[string]> profiles: [];
+
+    pure callback start_game();
+
+    HorizontalLayout {
+
+        alignment: stretch;
+        spacing: 5px;
+
+        ComboBox {
+            model: profiles;
+            horizontal-stretch: 1;
+        }
+        Button {
+            text: "Start";
+            horizontal-stretch: 0;
+            icon: @image-url("../../resources/play.svg");
+            clicked => { start_game(); }
+        }
+        Button {
+            text: "Save";
+            horizontal-stretch: 0;
+            icon: @image-url("../../resources/content-save.svg");
+        }
+    }
+}