From 68eb3777b09440b62088cf51bc9eca9f204ae7d1 Mon Sep 17 00:00:00 2001 From: Ry Date: Tue, 21 Jun 2022 19:40:09 -0700 Subject: [PATCH] vulpine: Remove for now --- .gitignore | 1 - base_image/startup.cfg | 1 - build.sh | 3 -- vulpine/main.asm | 83 ------------------------------------------ 4 files changed, 88 deletions(-) delete mode 100644 base_image/startup.cfg delete mode 100644 vulpine/main.asm diff --git a/.gitignore b/.gitignore index d28fd96..ad5c890 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ **/system.bin **/*.fxf **/fox32os.img -**/wallpapr.raw diff --git a/base_image/startup.cfg b/base_image/startup.cfg deleted file mode 100644 index c1c4916..0000000 --- a/base_image/startup.cfg +++ /dev/null @@ -1 +0,0 @@ -vulpine fxf diff --git a/build.sh b/build.sh index 2304f9d..9b991b0 100755 --- a/build.sh +++ b/build.sh @@ -13,9 +13,6 @@ fi echo "assembling kernel" ../fox32asm/target/release/fox32asm kernel/main.asm base_image/system.bin -echo "assembling vulpine" -../fox32asm/target/release/fox32asm vulpine/main.asm base_image/vulpine.fxf - echo "adding files to fox32os.img" cd base_image for file in ./*; do diff --git a/vulpine/main.asm b/vulpine/main.asm deleted file mode 100644 index 28b3590..0000000 --- a/vulpine/main.asm +++ /dev/null @@ -1,83 +0,0 @@ -; vulpine window manager - -const VULPINE_VERSION_MAJOR: 0 -const VULPINE_VERSION_MINOR: 1 -const VULPINE_VERSION_PATCH: 0 - -entry: - call enable_menu_bar - call clear_menu_bar - mov r0, menu_items_root - mov r1, 0xFFFFFFFF - call draw_menu_bar_root_items - -draw_wallpaper: - ; open the wallpaper file and draw it - mov r0, wallpaper_file_name - mov r1, 0 - mov r2, wallpaper_file_struct - call ryfs_open - cmp r0, 0 - ifz jmp event_loop - - ; read the wallpaper file directly into the background framebuffer - mov r0, wallpaper_file_struct - mov r1, 0x02000000 - call ryfs_read_whole_file - -event_loop: - call get_next_event - - ; did the user click the menu bar? - cmp r0, EVENT_TYPE_MENU_BAR_CLICK - ifz mov r0, menu_items_root - ifz call menu_bar_click_event - - ; is the user in a menu? - cmp r0, EVENT_TYPE_MENU_UPDATE - ifz call menu_update_event - - ; did the user click a menu item? - cmp r0, EVENT_TYPE_MENU_CLICK - ifz call menu_click_event - - call yield_task - jmp event_loop - -menu_click_event: - ; r2 contains the clicked root menu - ; r3 contains the clicked menu item - - ; system - cmp r2, 0 - ifz call system_menu_click_event - - ret - -system_menu_click_event: - ; r2 contains the clicked root menu - ; r3 contains the clicked menu item - - ; shut down - cmp r3, 0 - ifz icl - ifz halt - - ret - -wallpaper_file_name: data.str "wallpaprraw" -wallpaper_file_struct: data.32 0 data.32 0 - -menu_items_root: - data.8 1 ; number of menus - data.32 menu_items_system_list data.32 menu_items_system_name ; pointer to menu list, pointer to menu name -menu_items_system_name: - data.8 6 data.str "System" data.8 0x00 ; text length, text, null-terminator -menu_items_system_list: - data.8 1 ; number of items - data.8 11 ; menu width (usually longest item + 2) - data.8 9 data.str "Shut Down" data.8 0x00 ; text length, text, null-terminator - - ; include system defs - #include "../../fox32rom/fox32rom.def" - #include "../fox32os.def"