cleanup: namespace Montauk (capital M) => montauk::abi
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user