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

cleanup: namespace Montauk (capital M) => montauk::abi

Browse Source
This commit is contained in:
Daniel Hammer
2026-06-16 09:09:16 +02:00
parent b091af7653
commit e3dc1e881d
165 changed files with 758 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/src/desktop/apps/apps_common.hpp
+1 -1
View File
@@ -233,7 +233,7 @@ void open_sleep_dialog(DesktopState* ds);
// Hand a graceful power-off request to login.elf and exit the desktop so the
// user returns to the login screen, where the shutdown stages run (Bluetooth
// teardown, filesystem flush) before the final ACPI power-off / reset. Pass
// Montauk::POWER_REQ_SHUTDOWN or Montauk::POWER_REQ_REBOOT.
// montauk::abi::POWER_REQ_SHUTDOWN or montauk::abi::POWER_REQ_REBOOT.
[[noreturn]] inline void desktop_request_power(int action) {
montauk::power_request(action);
montauk::exit(0);
programs/src/desktop/apps/filemanager/events.cpp
+1 -1
View File
@@ -319,7 +319,7 @@ void filemanager_on_mouse(Window* win, MouseEvent& ev) {
}
}
void filemanager_on_key(Window* win, const Montauk::KeyEvent& key) {
void filemanager_on_key(Window* win, const montauk::abi::KeyEvent& key) {
FileManagerState* fm = (FileManagerState*)win->app_data;
if (!fm || !key.pressed) return;
programs/src/desktop/apps/filemanager/filemanager_internal.hpp
+1 -1
View File
@@ -297,7 +297,7 @@ int filemanager_collect_selection(const FileManagerState* fm, int* out, int max
void filemanager_draw_header(Canvas& c, FileManagerState* fm, Color toolbar_color, Color btn_bg);
void filemanager_on_draw(Window* win, Framebuffer& fb);
void filemanager_on_mouse(Window* win, MouseEvent& ev);
void filemanager_on_key(Window* win, const Montauk::KeyEvent& key);
void filemanager_on_key(Window* win, const montauk::abi::KeyEvent& key);
void filemanager_on_close(Window* win);
} // namespace filemanager
programs/src/desktop/apps/filemanager/fileop.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ static void fileop_dialog_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void fileop_dialog_on_key(Window* win, const Montauk::KeyEvent& key) {
static void fileop_dialog_on_key(Window* win, const montauk::abi::KeyEvent& key) {
FileOpJob* job = (FileOpJob*)win->app_data;
if (!job || !key.pressed) return;
if (key.scancode == 0x01) job->cancel = 1; // Escape requests cancel
programs/src/desktop/apps/filemanager/properties.cpp
+3 -3
View File
@@ -392,7 +392,7 @@ static void props_on_mouse(Window* win, MouseEvent& ev) {
props_close_self(st->desktop, st);
}
static void props_on_key(Window* win, const Montauk::KeyEvent& key) {
static void props_on_key(Window* win, const montauk::abi::KeyEvent& key) {
FilePropertiesDialogState* st = (FilePropertiesDialogState*)win->app_data;
if (!st || !key.pressed) return;
if (key.scancode == 0x01 || key.ascii == '\n' || key.ascii == '\r')
@@ -576,7 +576,7 @@ static void delete_confirm_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void delete_confirm_on_key(Window* win, const Montauk::KeyEvent& key) {
static void delete_confirm_on_key(Window* win, const montauk::abi::KeyEvent& key) {
FileDeleteConfirmDialogState* st = (FileDeleteConfirmDialogState*)win->app_data;
if (!st || !key.pressed) return;
@@ -820,7 +820,7 @@ static void multi_props_on_mouse(Window* win, MouseEvent& ev) {
props_close_self(st->desktop, st);
}
static void multi_props_on_key(Window* win, const Montauk::KeyEvent& key) {
static void multi_props_on_key(Window* win, const montauk::abi::KeyEvent& key) {
MultiPropertiesDialogState* st = (MultiPropertiesDialogState*)win->app_data;
if (!st || !key.pressed) return;
if (key.scancode == 0x01 || key.ascii == '\n' || key.ascii == '\r')
programs/src/desktop/apps/settings/app.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ static void settings_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void settings_on_key(Window* win, const Montauk::KeyEvent& key) {
static void settings_on_key(Window* win, const montauk::abi::KeyEvent& key) {
// Settings main window no longer needs keyboard handling.
(void)win;
(void)key;
programs/src/desktop/apps/settings/settings_internal.hpp
+1 -1
View File
@@ -18,7 +18,7 @@ namespace settings_app {
struct SettingsState {
DesktopState* desktop;
int active_tab; // 0=Appearance, 1=Display, 2=About
Montauk::SysInfo sys_info;
montauk::abi::SysInfo sys_info;
uint64_t uptime_ms;
WallpaperFileList wp_files;
bool wp_scanned;
programs/src/desktop/apps/usermanager/app.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ static void usermanager_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void usermanager_on_key(Window* win, const Montauk::KeyEvent& key) {
static void usermanager_on_key(Window* win, const montauk::abi::KeyEvent& key) {
(void)win;
(void)key;
}
programs/src/desktop/apps/usermanager/dialogs.cpp
+3 -3
View File
@@ -257,7 +257,7 @@ static void adduser_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void adduser_on_key(Window* win, const Montauk::KeyEvent& key) {
static void adduser_on_key(Window* win, const montauk::abi::KeyEvent& key) {
AddUserDialogState* st = (AddUserDialogState*)win->app_data;
if (!st || !key.pressed) return;
@@ -495,7 +495,7 @@ static void chpwd_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void chpwd_on_key(Window* win, const Montauk::KeyEvent& key) {
static void chpwd_on_key(Window* win, const montauk::abi::KeyEvent& key) {
ChPwdDialogState* st = (ChPwdDialogState*)win->app_data;
if (!st || !key.pressed) return;
@@ -647,7 +647,7 @@ static void deluser_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void deluser_on_key(Window* win, const Montauk::KeyEvent& key) {
static void deluser_on_key(Window* win, const montauk::abi::KeyEvent& key) {
DeleteUserDialogState* st = (DeleteUserDialogState*)win->app_data;
if (!st || !key.pressed) return;
programs/src/desktop/compose.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ void desktop_draw_lock_screen(DesktopState* ds) {
fb.fill_rect_alpha(0, 0, sw, sh, Color::from_rgba(0, 0, 0, 0x80));
// Clock display above card
Montauk::DateTime dt;
montauk::abi::DateTime dt;
montauk::gettime(&dt);
char time_str[12];
snprintf(time_str, sizeof(time_str), "%02d:%02d", (int)dt.Hour, (int)dt.Minute);
programs/src/desktop/desktop_internal.hpp
+2 -2
View File
@@ -124,7 +124,7 @@ inline int menu_add_external(const char* label, const char* binary, SvgIcon* ico
// ============================================================================
inline bool desktop_window_fullscreen(const gui::Window* win) {
return win && win->external && (win->ext_flags & Montauk::WIN_FLAG_FULLSCREEN);
return win && win->external && (win->ext_flags & montauk::abi::WIN_FLAG_FULLSCREEN);
}
inline gui::Rect desktop_content_rect(const gui::Window* win) {
@@ -160,7 +160,7 @@ inline const char* month_names[] = {
// launcher.cpp
void desktop_init_launcher(gui::DesktopState* ds);
bool desktop_handle_launcher_keyboard(gui::DesktopState* ds, const Montauk::KeyEvent& key);
bool desktop_handle_launcher_keyboard(gui::DesktopState* ds, const montauk::abi::KeyEvent& key);
void desktop_handle_launcher_mouse(gui::DesktopState* ds);
void desktop_draw_launcher(gui::DesktopState* ds);
uint64_t desktop_launcher_blink_token(const gui::DesktopState* ds, uint64_t now);
programs/src/desktop/dialogs.cpp
+7 -7
View File
@@ -69,7 +69,7 @@ static void reboot_dialog_on_mouse(Window* win, MouseEvent& ev) {
rs->hover_cancel = cb.contains(lx, ly);
if (ev.left_pressed()) {
if (rs->hover_reboot) desktop_request_power(Montauk::POWER_REQ_REBOOT);
if (rs->hover_reboot) desktop_request_power(montauk::abi::POWER_REQ_REBOOT);
if (rs->hover_cancel) {
for (int i = 0; i < rs->ds->window_count; i++) {
if (rs->ds->windows[i].app_data == rs) {
@@ -81,12 +81,12 @@ static void reboot_dialog_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void reboot_dialog_on_key(Window* win, const Montauk::KeyEvent& key) {
static void reboot_dialog_on_key(Window* win, const montauk::abi::KeyEvent& key) {
RebootDialogState* rs = (RebootDialogState*)win->app_data;
if (!rs || !key.pressed) return;
if (key.ascii == '\n' || key.ascii == '\r') {
desktop_request_power(Montauk::POWER_REQ_REBOOT);
desktop_request_power(montauk::abi::POWER_REQ_REBOOT);
}
if (key.scancode == 0x01) { // Escape
for (int i = 0; i < rs->ds->window_count; i++) {
@@ -181,7 +181,7 @@ static void shutdown_dialog_on_mouse(Window* win, MouseEvent& ev) {
ss->hover_cancel = cb.contains(lx, ly);
if (ev.left_pressed()) {
if (ss->hover_shutdown) desktop_request_power(Montauk::POWER_REQ_SHUTDOWN);
if (ss->hover_shutdown) desktop_request_power(montauk::abi::POWER_REQ_SHUTDOWN);
if (ss->hover_cancel) {
for (int i = 0; i < ss->ds->window_count; i++) {
if (ss->ds->windows[i].app_data == ss) {
@@ -193,12 +193,12 @@ static void shutdown_dialog_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void shutdown_dialog_on_key(Window* win, const Montauk::KeyEvent& key) {
static void shutdown_dialog_on_key(Window* win, const montauk::abi::KeyEvent& key) {
ShutdownDialogState* ss = (ShutdownDialogState*)win->app_data;
if (!ss || !key.pressed) return;
if (key.ascii == '\n' || key.ascii == '\r') {
desktop_request_power(Montauk::POWER_REQ_SHUTDOWN);
desktop_request_power(montauk::abi::POWER_REQ_SHUTDOWN);
}
if (key.scancode == 0x01) { // Escape
for (int i = 0; i < ss->ds->window_count; i++) {
@@ -314,7 +314,7 @@ static void sleep_dialog_on_mouse(Window* win, MouseEvent& ev) {
}
}
static void sleep_dialog_on_key(Window* win, const Montauk::KeyEvent& key) {
static void sleep_dialog_on_key(Window* win, const montauk::abi::KeyEvent& key) {
SleepDialogState* ss = (SleepDialogState*)win->app_data;
if (!ss || !key.pressed) return;
programs/src/desktop/input.cpp
+12 -12
View File
@@ -66,7 +66,7 @@ static void handle_lock_mouse(DesktopState* ds) {
}
}
static void handle_lock_keyboard(DesktopState* ds, const Montauk::KeyEvent& key) {
static void handle_lock_keyboard(DesktopState* ds, const montauk::abi::KeyEvent& key) {
if (!key.pressed) return;
// Enter submits
@@ -101,7 +101,7 @@ static void forward_external_mouse(gui::Window* win,
uint8_t buttons,
uint8_t prev) {
gui::Rect cr = desktop_content_rect(win);
Montauk::WinEvent wev;
montauk::abi::WinEvent wev;
montauk::memset(&wev, 0, sizeof(wev));
wev.type = 1; // mouse
wev.mouse.x = mx - cr.x;
@@ -242,7 +242,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
}
} else {
Rect cr = desktop_content_rect(win);
Montauk::WinEvent rev;
montauk::abi::WinEvent rev;
montauk::memset(&rev, 0, sizeof(rev));
rev.type = 2;
rev.resize.w = cr.w;
@@ -264,7 +264,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
}
} else {
Rect cr = desktop_content_rect(win);
Montauk::WinEvent rev;
montauk::abi::WinEvent rev;
montauk::memset(&rev, 0, sizeof(rev));
rev.type = 2;
rev.resize.w = cr.w;
@@ -331,7 +331,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
win->dirty = true;
} else {
Rect cr = desktop_content_rect(win);
Montauk::WinEvent rev;
montauk::abi::WinEvent rev;
montauk::memset(&rev, 0, sizeof(rev));
rev.type = 2;
rev.resize.w = cr.w;
@@ -615,7 +615,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
}
} else {
Rect cr = desktop_content_rect(win);
Montauk::WinEvent rev;
montauk::abi::WinEvent rev;
montauk::memset(&rev, 0, sizeof(rev));
rev.type = 2;
rev.resize.w = cr.w;
@@ -661,7 +661,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
Window* raised = &ds->windows[new_idx];
if (raised->external) {
// Forward mouse event to external window
Montauk::WinEvent wev;
montauk::abi::WinEvent wev;
montauk::memset(&wev, 0, sizeof(wev));
wev.type = 1; // mouse
wev.mouse.x = mx - cr.x;
@@ -700,7 +700,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
// Forward if mouse is over content (hover/move) or button is held/released (drag continuity)
if (cr.contains(mx, my) || left_held || left_released) {
if (win->external) {
Montauk::WinEvent wev;
montauk::abi::WinEvent wev;
montauk::memset(&wev, 0, sizeof(wev));
wev.type = 1; // mouse
wev.mouse.x = mx - cr.x;
@@ -726,7 +726,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
Rect cr = desktop_content_rect(win);
if (cr.contains(mx, my)) {
if (win->external) {
Montauk::WinEvent wev;
montauk::abi::WinEvent wev;
montauk::memset(&wev, 0, sizeof(wev));
wev.type = 1; // mouse
wev.mouse.x = mx - cr.x;
@@ -763,7 +763,7 @@ void gui::desktop_handle_mouse(DesktopState* ds) {
}
}
void gui::desktop_handle_keyboard(DesktopState* ds, const Montauk::KeyEvent& key) {
void gui::desktop_handle_keyboard(DesktopState* ds, const montauk::abi::KeyEvent& key) {
if (ds->screen_locked) {
handle_lock_keyboard(ds, key);
return;
@@ -776,7 +776,7 @@ void gui::desktop_handle_keyboard(DesktopState* ds, const Montauk::KeyEvent& key
if (!desktop_window_fullscreen(win))
break;
Montauk::WinEvent ev;
montauk::abi::WinEvent ev;
montauk::memset(&ev, 0, sizeof(ev));
ev.type = 0; // key
ev.key = key;
@@ -828,7 +828,7 @@ void gui::desktop_handle_keyboard(DesktopState* ds, const Montauk::KeyEvent& key
Window* win = &ds->windows[ds->focused_window];
if (win->external) {
// Forward key event to external window via syscall
Montauk::WinEvent ev;
montauk::abi::WinEvent ev;
montauk::memset(&ev, 0, sizeof(ev));
ev.type = 0; // key
ev.key = key;
programs/src/desktop/launcher.cpp
+4 -4
View File
@@ -339,11 +339,11 @@ static void launcher_activate_selected(DesktopState* ds) {
break;
case LAUNCHER_ITEM_COMMAND_REBOOT:
desktop_close_launcher(ds);
desktop_request_power(Montauk::POWER_REQ_REBOOT);
desktop_request_power(montauk::abi::POWER_REQ_REBOOT);
return;
case LAUNCHER_ITEM_COMMAND_SHUTDOWN:
desktop_close_launcher(ds);
desktop_request_power(Montauk::POWER_REQ_SHUTDOWN);
desktop_request_power(montauk::abi::POWER_REQ_SHUTDOWN);
return;
case LAUNCHER_ITEM_SPECIAL_FOLDER:
if (item->path[0] != '\0') {
@@ -355,7 +355,7 @@ static void launcher_activate_selected(DesktopState* ds) {
desktop_close_launcher(ds);
}
static void launcher_update_super_state(DesktopState* ds, const Montauk::KeyEvent& key) {
static void launcher_update_super_state(DesktopState* ds, const montauk::abi::KeyEvent& key) {
uint8_t sc = key.scancode & 0x7F;
if (sc == 0x5B) {
ds->super_left_down = key.pressed;
@@ -411,7 +411,7 @@ void desktop_close_launcher(DesktopState* ds) {
ds->launcher_scroll = 0;
}
bool desktop_handle_launcher_keyboard(DesktopState* ds, const Montauk::KeyEvent& key) {
bool desktop_handle_launcher_keyboard(DesktopState* ds, const montauk::abi::KeyEvent& key) {
launcher_update_super_state(ds, key);
uint8_t sc = key.scancode & 0x7F;
programs/src/desktop/main.cpp
+8 -8
View File
@@ -180,7 +180,7 @@ void gui::desktop_init(DesktopState* ds) {
ds->app_menu_open = false;
desktop_init_launcher(ds);
montauk::memset(&ds->mouse, 0, sizeof(Montauk::MouseState));
montauk::memset(&ds->mouse, 0, sizeof(montauk::abi::MouseState));
montauk::set_mouse_bounds(ds->screen_w - 1, ds->screen_h - 1);
gui::clipboard_clear();
@@ -333,7 +333,7 @@ void gui::desktop_init(DesktopState* ds) {
// ============================================================================
static uint64_t desktop_clock_token() {
Montauk::DateTime dt;
montauk::abi::DateTime dt;
montauk::gettime(&dt);
return ((uint64_t)dt.Year << 32)
| ((uint64_t)dt.Month << 24)
@@ -369,7 +369,7 @@ static void desktop_clear_window_dirty(DesktopState* ds) {
}
}
static bool desktop_netcfg_equal(const Montauk::NetCfg& a, const Montauk::NetCfg& b) {
static bool desktop_netcfg_equal(const montauk::abi::NetCfg& a, const montauk::abi::NetCfg& b) {
if (a.ipAddress != b.ipAddress || a.subnetMask != b.subnetMask ||
a.gateway != b.gateway || a.dnsServer != b.dnsServer) {
return false;
@@ -385,7 +385,7 @@ static bool desktop_refresh_panel_state(DesktopState* ds, uint64_t now) {
bool changed = false;
if (now - ds->net_cfg_last_poll > 5000) {
Montauk::NetCfg next;
montauk::abi::NetCfg next;
montauk::get_netcfg(&next);
if (!desktop_netcfg_equal(next, ds->cached_net_cfg)) {
ds->cached_net_cfg = next;
@@ -425,7 +425,7 @@ static bool desktop_refresh_panel_state(DesktopState* ds, uint64_t now) {
bool desktop_poll_external_windows(DesktopState* ds) {
bool changed = false;
Montauk::WinInfo extWins[8];
montauk::abi::WinInfo extWins[8];
int extCount = montauk::win_enumerate(extWins, 8);
// Check for new external windows and map them
@@ -649,7 +649,7 @@ void gui::desktop_run(DesktopState* ds) {
// Poll keyboard events
while (montauk::is_key_available()) {
Montauk::KeyEvent key;
montauk::abi::KeyEvent key;
montauk::getkey(&key);
desktop_handle_keyboard(ds, key);
keyboardChanged = true;
@@ -730,7 +730,7 @@ static DesktopState* g_desktop;
static constexpr const char kDesktopBinaryName[] = "desktop.elf";
static constexpr int DESKTOP_PROC_SCAN_MAX = 256;
static bool desktop_proc_alive(const Montauk::ProcInfo& proc) {
static bool desktop_proc_alive(const montauk::abi::ProcInfo& proc) {
return proc.state == 1 || proc.state == 2 || proc.state == 3;
}
@@ -745,7 +745,7 @@ static bool proc_name_is_desktop(const char* name) {
}
static bool existing_desktop_running() {
static Montauk::ProcInfo procs[DESKTOP_PROC_SCAN_MAX];
static montauk::abi::ProcInfo procs[DESKTOP_PROC_SCAN_MAX];
int count = montauk::proclist(procs, DESKTOP_PROC_SCAN_MAX);
if (count <= 0) return false;
programs/src/desktop/panel.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ void gui::desktop_draw_panel(DesktopState* ds) {
}
// Date + Clock (right side)
Montauk::DateTime dt;
montauk::abi::DateTime dt;
montauk::gettime(&dt);
char clock_str[12];
@@ -256,7 +256,7 @@ void desktop_draw_app_menu(DesktopState* ds) {
void desktop_draw_net_popup(DesktopState* ds) {
Framebuffer& fb = ds->fb;
Montauk::NetCfg& nc = ds->cached_net_cfg;
montauk::abi::NetCfg& nc = ds->cached_net_cfg;
bool connected = nc.ipAddress != 0;
int popup_w = 220;
programs/src/desktop/window.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void gui::desktop_close_window(DesktopState* ds, int idx) {
if (ds->closing_ext_count < DesktopState::MAX_CLOSING) {
ds->closing_ext_ids[ds->closing_ext_count++] = win->ext_win_id;
}
Montauk::WinEvent ev;
montauk::abi::WinEvent ev;
montauk::memset(&ev, 0, sizeof(ev));
ev.type = 3; // close
montauk::win_sendevent(win->ext_win_id, &ev);