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/disks/actions.cpp
+8 -8
View File
@@ -14,7 +14,7 @@ void disktool_refresh() {
auto& dt = g_state;
dt.disk_count = 0;
for (int port = 0; port < MAX_DISKS; port++) {
Montauk::DiskInfo info;
montauk::abi::DiskInfo info;
montauk::memset(&info, 0, sizeof(info));
int r = montauk::diskinfo(&info, port);
if (r == 0 && info.type != 0) {
@@ -45,7 +45,7 @@ void open_newpart_dialog() {
dlg.hover_confirm = false;
dlg.hover_cancel = false;
Montauk::DiskInfo& disk = dt.disks[dt.selected_disk];
montauk::abi::DiskInfo& disk = dt.disks[dt.selected_disk];
int blockDev = selected_block_dev();
char sz[24];
format_disk_size(sz, sizeof(sz), disk.sectorCount, disk.sectorSizeLog);
@@ -64,7 +64,7 @@ void open_newpart_dialog() {
"free region on this disk.");
}
Montauk::WinCreateResult wres;
montauk::abi::WinCreateResult wres;
const char* title = dlg.will_init_gpt ? "Initialize Disk" : "New Partition";
if (montauk::win_create(title, NP_DLG_W, NP_DLG_H, &wres) < 0 || wres.id < 0) {
set_status("Failed to open dialog");
@@ -100,7 +100,7 @@ void newpart_dialog_confirm() {
set_status("Initialized GPT");
}
Montauk::GptAddParams params;
montauk::abi::GptAddParams params;
montauk::memset(&params, 0, sizeof(params));
params.blockDev = selected_block_dev();
params.startLba = 0;
@@ -187,15 +187,15 @@ void open_format_dialog() {
dlg.hover_cancel = false;
// Build partition description
Montauk::PartInfo& p = dt.parts[global_idx];
Montauk::DiskInfo& disk = dt.disks[dt.selected_disk];
montauk::abi::PartInfo& p = dt.parts[global_idx];
montauk::abi::DiskInfo& disk = dt.disks[dt.selected_disk];
char sz[24];
format_disk_size(sz, sizeof(sz), p.sectorCount, disk.sectorSizeLog);
const char* pname = p.name[0] ? p.name : "Partition";
snprintf(dlg.part_desc, sizeof(dlg.part_desc), "%s (%s)", pname, sz);
// Create dialog window
Montauk::WinCreateResult wres;
montauk::abi::WinCreateResult wres;
if (montauk::win_create("Format Partition", FMT_DLG_W, FMT_DLG_H, &wres) < 0 || wres.id < 0) {
set_status("Failed to open format dialog");
return;
@@ -219,7 +219,7 @@ void format_dialog_do_format() {
auto& dt = g_state;
auto& dlg = dt.fmt_dlg;
Montauk::FsFormatParams params;
montauk::abi::FsFormatParams params;
montauk::memset(&params, 0, sizeof(params));
params.partIndex = dlg.global_part_index;
params.fsType = g_fsTypes[dlg.selected_fs].id;
programs/src/disks/disks.h
+3 -3
View File
@@ -49,7 +49,7 @@ struct FsTypeEntry {
};
static const FsTypeEntry g_fsTypes[] = {
{ "FAT32", Montauk::FS_TYPE_FAT32 },
{ "FAT32", montauk::abi::FS_TYPE_FAT32 },
};
static constexpr int NUM_FS_TYPES = 1;
@@ -86,9 +86,9 @@ struct NewPartDialog {
};
struct DiskToolState {
Montauk::DiskInfo disks[MAX_DISKS];
montauk::abi::DiskInfo disks[MAX_DISKS];
int disk_count;
Montauk::PartInfo parts[MAX_PARTS];
montauk::abi::PartInfo parts[MAX_PARTS];
int part_count;
int selected_disk;
int selected_part;
programs/src/disks/main.cpp
+5 -5
View File
@@ -146,13 +146,13 @@ static bool handle_content_click(int mx, int my) {
int map_x = MAP_PAD;
int map_w = g_win_w - MAP_PAD * 2;
if (my >= y && my < y + MAP_H) {
Montauk::DiskInfo& disk = dt.disks[dt.selected_disk];
montauk::abi::DiskInfo& disk = dt.disks[dt.selected_disk];
int part_indices[MAX_PARTS];
int nparts = get_disk_parts(part_indices, MAX_PARTS);
uint64_t total = disk.sectorCount;
if (total > 0) {
for (int pi = 0; pi < nparts; pi++) {
Montauk::PartInfo& p = dt.parts[part_indices[pi]];
montauk::abi::PartInfo& p = dt.parts[part_indices[pi]];
int px = map_x + (int)((p.startLba * (uint64_t)map_w) / total);
int pw = (int)((p.sectorCount * (uint64_t)map_w) / total);
if (pw < 2) pw = 2;
@@ -278,7 +278,7 @@ static void clamp_scroll() {
g_state.scroll_y = gui_clamp(g_state.scroll_y, 0, max_scroll_y());
}
static bool handle_mouse(const Montauk::WinEvent& ev) {
static bool handle_mouse(const montauk::abi::WinEvent& ev) {
int prev_x = g_state.mouse_x;
int prev_y = g_state.mouse_y;
int prev_disk_hover = hovered_disk_button(prev_x, prev_y);
@@ -320,7 +320,7 @@ static bool handle_mouse(const Montauk::WinEvent& ev) {
// Key handling
// ============================================================================
static bool handle_key(const Montauk::KeyEvent& key) {
static bool handle_key(const montauk::abi::KeyEvent& key) {
if (!key.pressed) return false;
auto& dt = g_state;
@@ -403,7 +403,7 @@ extern "C" void _start() {
win.present();
while (true) {
Montauk::WinEvent ev;
montauk::abi::WinEvent ev;
bool redraw_main = false;
bool redraw_dlg = false;
programs/src/disks/render.cpp
+3 -3
View File
@@ -112,7 +112,7 @@ static void render_content(Canvas& c, const mtk::Theme& theme) {
if (dt.disk_count == 0 || dt.selected_disk < 0 || dt.selected_disk >= dt.disk_count)
return;
Montauk::DiskInfo& disk = dt.disks[dt.selected_disk];
montauk::abi::DiskInfo& disk = dt.disks[dt.selected_disk];
int y = content_title_y();
char info_str[64];
@@ -138,7 +138,7 @@ static void render_content(Canvas& c, const mtk::Theme& theme) {
if (total_sectors > 0 && nparts > 0) {
for (int pi = 0; pi < nparts; pi++) {
Montauk::PartInfo& p = dt.parts[part_indices[pi]];
montauk::abi::PartInfo& p = dt.parts[part_indices[pi]];
int part_x = map_rect.x + (int)((p.startLba * (uint64_t)map_rect.w) / total_sectors);
int part_w = (int)((p.sectorCount * (uint64_t)map_rect.w) / total_sectors);
if (part_w < 2) part_w = 2;
@@ -214,7 +214,7 @@ static void render_content(Canvas& c, const mtk::Theme& theme) {
table_style.row_hover_bg);
}
Montauk::PartInfo& p = dt.parts[part_indices[pi]];
montauk::abi::PartInfo& p = dt.parts[part_indices[pi]];
c.fill_rounded_rect(col_idx, row_y + (ITEM_H - 10) / 2, 10, 10, 5,
part_colors[pi % NUM_PART_COLORS]);