daniel/MontaukOS
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: expanded ACPI support, initial support for S3 sleep

Browse Source
This commit is contained in:
Daniel Hammer
2026-03-15 00:55:19 +01:00
parent 261b536041
commit 64c26f4288
39 changed files with 4403 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/src/desktop/apps/apps_common.hpp
+1
View File
@@ -172,4 +172,5 @@ void open_settings(DesktopState* ds);
void open_reboot_dialog(DesktopState* ds);
void open_wordprocessor(DesktopState* ds);
void open_shutdown_dialog(DesktopState* ds);
void open_sleep_dialog(DesktopState* ds);
void desktop_poll_external_windows(DesktopState* ds);
programs/src/desktop/compose.cpp
+2 -1
View File
@@ -224,7 +224,7 @@ void gui::desktop_compose(DesktopState* ds) {
if (ds->ctx_menu_open) {
static constexpr int CTX_MENU_W = 180;
static constexpr int CTX_ITEM_H = 36;
static constexpr int CTX_ITEM_COUNT = 5;
static constexpr int CTX_ITEM_COUNT = 6;
int cmx = ds->ctx_menu_x;
int cmy = ds->ctx_menu_y;
int cmh = CTX_ITEM_H * CTX_ITEM_COUNT + 8;
@@ -242,6 +242,7 @@ void gui::desktop_compose(DesktopState* ds) {
{ "Terminal", &ds->icon_terminal },
{ "Files", &ds->icon_filemanager },
{ "About", &ds->icon_settings },
{ "Sleep", &ds->icon_sleep },
{ "Reboot", &ds->icon_reboot },
{ "Shutdown", &ds->icon_shutdown },
};
programs/src/desktop/dialogs.cpp
+129 -1
View File
@@ -1,6 +1,6 @@
/*
* dialogs.cpp
* Reboot and shutdown confirmation dialogs
* Reboot, shutdown, and sleep confirmation dialogs
* Copyright (c) 2026 Daniel Hammer
*/
@@ -234,3 +234,131 @@ void open_shutdown_dialog(DesktopState* ds) {
win->on_key = shutdown_dialog_on_key;
win->on_close = shutdown_dialog_on_close;
}
// ============================================================================
// Sleep (S3 Suspend) Dialog
// ============================================================================
struct SleepDialogState {
DesktopState* ds;
int btn_w, btn_h, btn_y, sleep_x, cancel_x;
bool hover_sleep, hover_cancel;
};
static void sleep_dialog_on_draw(Window* win, Framebuffer& fb) {
SleepDialogState* ss = (SleepDialogState*)win->app_data;
if (!ss) return;
Canvas c(win);
c.fill(colors::WINDOW_BG);
const char* msg = "Suspend the system?";
int tw = text_width(msg);
c.text((c.w - tw) / 2, 30, msg, colors::TEXT_COLOR);
int btn_w = 100;
int btn_h = 32;
int btn_y = c.h - btn_h - 20;
int gap = 20;
int total_w = btn_w * 2 + gap;
int bx = (c.w - total_w) / 2;
ss->btn_w = btn_w;
ss->btn_h = btn_h;
ss->btn_y = btn_y;
ss->sleep_x = bx;
ss->cancel_x = bx + btn_w + gap;
Color sleep_bg = ss->hover_sleep
? Color::from_rgb(0x44, 0x77, 0xDD)
: Color::from_rgb(0x33, 0x66, 0xCC);
c.button(ss->sleep_x, btn_y, btn_w, btn_h, "Sleep", sleep_bg, colors::WHITE, 4);
Color cancel_bg = ss->hover_cancel
? Color::from_rgb(0x99, 0x99, 0x99)
: Color::from_rgb(0x88, 0x88, 0x88);
c.button(ss->cancel_x, btn_y, btn_w, btn_h, "Cancel", cancel_bg, colors::WHITE, 4);
}
static void sleep_dialog_on_mouse(Window* win, MouseEvent& ev) {
SleepDialogState* ss = (SleepDialogState*)win->app_data;
if (!ss) return;
Rect cr = win->content_rect();
int lx = ev.x - cr.x;
int ly = ev.y - cr.y;
Rect sb = {ss->sleep_x, ss->btn_y, ss->btn_w, ss->btn_h};
Rect cb = {ss->cancel_x, ss->btn_y, ss->btn_w, ss->btn_h};
ss->hover_sleep = sb.contains(lx, ly);
ss->hover_cancel = cb.contains(lx, ly);
if (ev.left_pressed()) {
if (ss->hover_sleep) {
montauk::suspend();
// If suspend returns (resume from S3), close the dialog
for (int i = 0; i < ss->ds->window_count; i++) {
if (ss->ds->windows[i].app_data == ss) {
desktop_close_window(ss->ds, i);
return;
}
}
}
if (ss->hover_cancel) {
for (int i = 0; i < ss->ds->window_count; i++) {
if (ss->ds->windows[i].app_data == ss) {
desktop_close_window(ss->ds, i);
return;
}
}
}
}
}
static void sleep_dialog_on_key(Window* win, const Montauk::KeyEvent& key) {
SleepDialogState* ss = (SleepDialogState*)win->app_data;
if (!ss || !key.pressed) return;
if (key.ascii == '\n' || key.ascii == '\r') {
montauk::suspend();
// If suspend returns, close the dialog
for (int i = 0; i < ss->ds->window_count; i++) {
if (ss->ds->windows[i].app_data == ss) {
desktop_close_window(ss->ds, i);
return;
}
}
}
if (key.scancode == 0x01) { // Escape
for (int i = 0; i < ss->ds->window_count; i++) {
if (ss->ds->windows[i].app_data == ss) {
desktop_close_window(ss->ds, i);
return;
}
}
}
}
static void sleep_dialog_on_close(Window* win) {
if (win->app_data) {
montauk::mfree(win->app_data);
win->app_data = nullptr;
}
}
void open_sleep_dialog(DesktopState* ds) {
int wx = (ds->screen_w - 300) / 2;
int wy = (ds->screen_h - 150) / 2;
int idx = desktop_create_window(ds, "Sleep", wx, wy, 300, 150);
if (idx < 0) return;
Window* win = &ds->windows[idx];
SleepDialogState* ss = (SleepDialogState*)montauk::malloc(sizeof(SleepDialogState));
montauk::memset(ss, 0, sizeof(SleepDialogState));
ss->ds = ds;
win->app_data = ss;
win->on_draw = sleep_dialog_on_draw;
win->on_mouse = sleep_dialog_on_mouse;
win->on_key = sleep_dialog_on_key;
win->on_close = sleep_dialog_on_close;
}
programs/src/desktop/input.cpp
+5 -3
View File
@@ -153,7 +153,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
if (left_pressed) {
static constexpr int CTX_MENU_W = 180;
static constexpr int CTX_ITEM_H = 36;
static constexpr int CTX_ITEM_COUNT = 5;
static constexpr int CTX_ITEM_COUNT = 6;
int cmx = ds->ctx_menu_x;
int cmy = ds->ctx_menu_y;
int cmh = CTX_ITEM_H * CTX_ITEM_COUNT + 8;
@@ -170,8 +170,9 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
case 0: open_terminal(ds); break;
case 1: open_filemanager(ds); break;
case 2: open_settings(ds); break;
case 3: open_reboot_dialog(ds); break;
case 4: open_shutdown_dialog(ds); break;
case 3: open_sleep_dialog(ds); break;
case 4: open_reboot_dialog(ds); break;
case 5: open_shutdown_dialog(ds); break;
}
return;
}
@@ -357,6 +358,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
case 15: open_wordprocessor(ds); break;
case 16: montauk::exit(0); break; // Log Out
case 17: lock_screen(ds); break; // Lock Screen
case 18: open_sleep_dialog(ds); break; // Sleep
}
}
ds->app_menu_open = false;
programs/src/desktop/main.cpp
+4 -2
View File
@@ -173,6 +173,7 @@ void desktop_build_menu(DesktopState* ds) {
menu_add_embedded("Settings", 11, &ds->icon_settings);
menu_add_embedded("Lock Screen", 17, &ds->icon_lock);
menu_add_embedded("Log Out", 16, &ds->icon_logout);
menu_add_embedded("Sleep", 18, &ds->icon_sleep);
menu_add_embedded("Reboot", 12, &ds->icon_reboot);
menu_add_embedded("Shutdown", 14, &ds->icon_shutdown);
}
@@ -228,6 +229,7 @@ void gui::desktop_init(DesktopState* ds) {
ds->icon_settings = svg_load("0:/icons/help-about.svg", 20, 20, defColor);
ds->icon_reboot = svg_load("0:/icons/system-reboot.svg", 20, 20, defColor);
ds->icon_shutdown = svg_load("0:/icons/system-shutdown.svg", 20, 20, defColor);
ds->icon_sleep = svg_load("0:/icons/sleep.svg", 20, 20, defColor);
ds->icon_logout = svg_load("0:/icons/gnome-logout.svg", 20, 20, defColor);
ds->icon_procmgr = svg_load("0:/icons/system-monitor.svg", 20, 20, defColor);
@@ -508,8 +510,8 @@ void gui::desktop_run(DesktopState* ds) {
desktop_compose(ds);
ds->fb.flip();
// Target ~60fps
montauk::sleep_ms(16);
// Yield to scheduler without artificial frame cap
montauk::sleep_ms(1);
}
}