berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

api.cpp cleanup

This commit is contained in:
nakst 2021-12-25 20:42:27 +00:00
parent 1f92f55e46
commit 890943da7a
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
desktop/api.cpp
View File

@ -161,10 +161,7 @@ ptrdiff_t tlsStorageOffset;
extern "C" void EsUnimplemented(); extern "C" void EsUnimplemented();
extern "C" uintptr_t ProcessorTLSRead(uintptr_t offset); extern "C" uintptr_t ProcessorTLSRead(uintptr_t offset);
extern "C" uint64_t ProcessorReadTimeStamp(); extern "C" uint64_t ProcessorReadTimeStamp();
void MaybeDestroyElement(EsElement *element);
const char *GetConstantString(const char *key);
void UndoManagerDestroy(EsUndoManager *manager); void UndoManagerDestroy(EsUndoManager *manager);
int TextGetStringWidth(EsElement *element, const EsTextStyle *style, const char *string, size_t stringBytes);
struct APIInstance *InstanceSetup(EsInstance *instance); struct APIInstance *InstanceSetup(EsInstance *instance);
EsTextStyle TextPlanGetPrimaryStyle(EsTextPlan *plan); EsTextStyle TextPlanGetPrimaryStyle(EsTextPlan *plan);
EsFileStore *FileStoreCreateFromEmbeddedFile(const EsBundle *bundle, const char *path, size_t pathBytes); EsFileStore *FileStoreCreateFromEmbeddedFile(const EsBundle *bundle, const char *path, size_t pathBytes);
@ -172,7 +169,15 @@ EsFileStore *FileStoreCreateFromPath(const char *path, size_t pathBytes);
EsFileStore *FileStoreCreateFromHandle(EsHandle handle); EsFileStore *FileStoreCreateFromHandle(EsHandle handle);
void FileStoreCloseHandle(EsFileStore *fileStore); void FileStoreCloseHandle(EsFileStore *fileStore);
EsError NodeOpen(const char *path, size_t pathBytes, uint32_t flags, _EsNodeInformation *node); EsError NodeOpen(const char *path, size_t pathBytes, uint32_t flags, _EsNodeInformation *node);
void ApplicationProcessTerminated(EsObjectID pid); const char *EnumLookupNameFromValue(const EnumString *array, int value);
EsSystemConfigurationItem *SystemConfigurationGetItem(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, bool createIfNeeded = false);
EsSystemConfigurationGroup *SystemConfigurationGetGroup(const char *section, ptrdiff_t sectionBytes, bool createIfNeeded = false);
uint8_t *ApplicationStartupInformationToBuffer(const _EsApplicationStartupInformation *information, size_t *dataBytes = nullptr);
char *SystemConfigurationGroupReadString(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, size_t *valueBytes = nullptr);
int64_t SystemConfigurationGroupReadInteger(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, int64_t defaultValue = 0);
MountPoint *NodeFindMountPoint(const char *prefix, size_t prefixBytes);
EsWindow *WindowFromWindowID(EsObjectID id);
extern "C" void _init();
struct ProcessMessageTiming { struct ProcessMessageTiming {
double startLogic, endLogic; double startLogic, endLogic;
@ -248,15 +253,12 @@ struct APIInstance {
#include "text.cpp" #include "text.cpp"
#include "gui.cpp" #include "gui.cpp"
#include "inspector.cpp" #include "inspector.cpp"
#include "desktop.cpp"
#include "settings.cpp"
#ifndef NO_API_TABLE
const void *const apiTable[] = { const void *const apiTable[] = {
#include <bin/generated_code/api_array.h> #include <bin/generated_code/api_array.h>
}; };
#endif
extern "C" void _init();
typedef void (*StartFunction)();
MountPoint *NodeAddMountPoint(const char *prefix, size_t prefixBytes, EsHandle base, bool queryInformation) { MountPoint *NodeAddMountPoint(const char *prefix, size_t prefixBytes, EsHandle base, bool queryInformation) {
MountPoint mountPoint = {}; MountPoint mountPoint = {};
@ -325,7 +327,7 @@ EsError NodeOpen(const char *path, size_t pathBytes, uint32_t flags, _EsNodeInfo
return EsSyscall(ES_SYSCALL_NODE_OPEN, (uintptr_t) path, pathBytes, flags, (uintptr_t) node); return EsSyscall(ES_SYSCALL_NODE_OPEN, (uintptr_t) path, pathBytes, flags, (uintptr_t) node);
} }
EsSystemConfigurationItem *SystemConfigurationGetItem(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, bool createIfNeeded = false) { EsSystemConfigurationItem *SystemConfigurationGetItem(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, bool createIfNeeded) {
if (keyBytes == -1) keyBytes = EsCStringLength(key); if (keyBytes == -1) keyBytes = EsCStringLength(key);
for (uintptr_t i = 0; i < group->itemCount; i++) { for (uintptr_t i = 0; i < group->itemCount; i++) {
@ -356,7 +358,7 @@ EsSystemConfigurationItem *SystemConfigurationGetItem(EsSystemConfigurationGroup
return nullptr; return nullptr;
} }
EsSystemConfigurationGroup *SystemConfigurationGetGroup(const char *section, ptrdiff_t sectionBytes, bool createIfNeeded = false) { EsSystemConfigurationGroup *SystemConfigurationGetGroup(const char *section, ptrdiff_t sectionBytes, bool createIfNeeded) {
if (sectionBytes == -1) sectionBytes = EsCStringLength(section); if (sectionBytes == -1) sectionBytes = EsCStringLength(section);
for (uintptr_t i = 0; i < api.systemConfigurationGroups.Length(); i++) { for (uintptr_t i = 0; i < api.systemConfigurationGroups.Length(); i++) {
@ -384,7 +386,7 @@ EsSystemConfigurationGroup *SystemConfigurationGetGroup(const char *section, ptr
return nullptr; return nullptr;
} }
char *EsSystemConfigurationGroupReadString(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, size_t *valueBytes = nullptr) { char *SystemConfigurationGroupReadString(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, size_t *valueBytes) {
EsSystemConfigurationItem *item = SystemConfigurationGetItem(group, key, keyBytes); EsSystemConfigurationItem *item = SystemConfigurationGetItem(group, key, keyBytes);
if (!item) { if (valueBytes) *valueBytes = 0; return nullptr; } if (!item) { if (valueBytes) *valueBytes = 0; return nullptr; }
if (valueBytes) *valueBytes = item->valueBytes; if (valueBytes) *valueBytes = item->valueBytes;
@ -395,7 +397,7 @@ char *EsSystemConfigurationGroupReadString(EsSystemConfigurationGroup *group, co
return copy; return copy;
} }
int64_t EsSystemConfigurationGroupReadInteger(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, int64_t defaultValue = 0) { int64_t SystemConfigurationGroupReadInteger(EsSystemConfigurationGroup *group, const char *key, ptrdiff_t keyBytes, int64_t defaultValue) {
EsSystemConfigurationItem *item = SystemConfigurationGetItem(group, key, keyBytes); EsSystemConfigurationItem *item = SystemConfigurationGetItem(group, key, keyBytes);
if (!item) return defaultValue; if (!item) return defaultValue;
return EsIntegerParse(item->value, item->valueBytes); return EsIntegerParse(item->value, item->valueBytes);
@ -406,7 +408,7 @@ char *EsSystemConfigurationReadString(const char *section, ptrdiff_t sectionByte
EsDefer(EsMutexRelease(&api.systemConfigurationMutex)); EsDefer(EsMutexRelease(&api.systemConfigurationMutex));
EsSystemConfigurationGroup *group = SystemConfigurationGetGroup(section, sectionBytes); EsSystemConfigurationGroup *group = SystemConfigurationGetGroup(section, sectionBytes);
if (!group) { if (valueBytes) *valueBytes = 0; return nullptr; } if (!group) { if (valueBytes) *valueBytes = 0; return nullptr; }
return EsSystemConfigurationGroupReadString(group, key, keyBytes, valueBytes); return SystemConfigurationGroupReadString(group, key, keyBytes, valueBytes);
} }
int64_t EsSystemConfigurationReadInteger(const char *section, ptrdiff_t sectionBytes, const char *key, ptrdiff_t keyBytes, int64_t defaultValue) { int64_t EsSystemConfigurationReadInteger(const char *section, ptrdiff_t sectionBytes, const char *key, ptrdiff_t keyBytes, int64_t defaultValue) {
@ -414,7 +416,7 @@ int64_t EsSystemConfigurationReadInteger(const char *section, ptrdiff_t sectionB
EsDefer(EsMutexRelease(&api.systemConfigurationMutex)); EsDefer(EsMutexRelease(&api.systemConfigurationMutex));
EsSystemConfigurationGroup *group = SystemConfigurationGetGroup(section, sectionBytes); EsSystemConfigurationGroup *group = SystemConfigurationGetGroup(section, sectionBytes);
if (!group) return defaultValue; if (!group) return defaultValue;
return EsSystemConfigurationGroupReadInteger(group, key, keyBytes, defaultValue); return SystemConfigurationGroupReadInteger(group, key, keyBytes, defaultValue);
} }
void SystemConfigurationUnload() { void SystemConfigurationUnload() {
@ -467,7 +469,7 @@ void SystemConfigurationLoad(const char *file, size_t fileBytes) {
} }
} }
uint8_t *ApplicationStartupInformationToBuffer(const _EsApplicationStartupInformation *information, size_t *dataBytes = nullptr) { uint8_t *ApplicationStartupInformationToBuffer(const _EsApplicationStartupInformation *information, size_t *dataBytes) {
_EsApplicationStartupInformation copy = *information; _EsApplicationStartupInformation copy = *information;
if (copy.filePathBytes == -1) copy.filePathBytes = EsCStringLength(copy.filePath); if (copy.filePathBytes == -1) copy.filePathBytes = EsCStringLength(copy.filePath);
@ -1461,22 +1463,18 @@ void ThreadInitialise(ThreadLocalStorage *local) {
EsSyscall(ES_SYSCALL_THREAD_SET_TIMER_ADJUST_ADDRESS, (uintptr_t) &local->timerAdjustTicks, 0, 0, 0); EsSyscall(ES_SYSCALL_THREAD_SET_TIMER_ADJUST_ADDRESS, (uintptr_t) &local->timerAdjustTicks, 0, 0, 0);
} }
#include "desktop.cpp"
extern "C" void _start(EsProcessStartupInformation *_startupInformation) { extern "C" void _start(EsProcessStartupInformation *_startupInformation) {
ThreadLocalStorage threadLocalStorage; ThreadLocalStorage threadLocalStorage;
api.startupInformation = _startupInformation; api.startupInformation = _startupInformation;
bool isDesktop = api.startupInformation->isDesktop; bool isDesktop = api.startupInformation->isDesktop;
#ifndef NO_API_TABLE
if (isDesktop) { if (isDesktop) {
// Initialise the API table. // Initialise the API table.
EsAssert(sizeof(apiTable) <= 0xF000); // API table is too large. EsAssert(sizeof(apiTable) <= 0xF000); // API table is too large.
EsMemoryCopy(ES_API_BASE, apiTable, sizeof(apiTable)); EsMemoryCopy(ES_API_BASE, apiTable, sizeof(apiTable));
} }
#endif
{ {
// Initialise the API. // Initialise the API.
@ -1557,7 +1555,7 @@ extern "C" void _start(EsProcessStartupInformation *_startupInformation) {
SystemConfigurationLoad((char *) responseBuffer.out, responseBuffer.bytes); SystemConfigurationLoad((char *) responseBuffer.out, responseBuffer.bytes);
EsHeapFree(responseBuffer.out); EsHeapFree(responseBuffer.out);
((StartFunction) api.startupInformation->applicationStartAddress)(); ((void (*)()) api.startupInformation->applicationStartAddress)();
} }
EsThreadTerminate(ES_CURRENT_THREAD); EsThreadTerminate(ES_CURRENT_THREAD);

25
desktop/desktop.cpp
View File

@ -248,8 +248,7 @@ WindowTab *WindowTabCreate(ContainerWindow *container);
ContainerWindow *ContainerWindowCreate(); ContainerWindow *ContainerWindowCreate();
void ContainerWindowShow(ContainerWindow *, int32_t width, int32_t height); void ContainerWindowShow(ContainerWindow *, int32_t width, int32_t height);
void ShutdownModalCreate(); void ShutdownModalCreate();
void InstanceSettingsCreate(EsMessage *message);
#include "settings.cpp"
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// Reorder lists: // Reorder lists:
@ -2373,18 +2372,18 @@ void ConfigurationLoadApplications() {
InstalledApplication *application = (InstalledApplication *) EsHeapAllocate(sizeof(InstalledApplication), true); InstalledApplication *application = (InstalledApplication *) EsHeapAllocate(sizeof(InstalledApplication), true);
application->cName = EsSystemConfigurationGroupReadString(group, EsLiteral("name")); application->cName = SystemConfigurationGroupReadString(group, EsLiteral("name"));
application->cExecutable = EsSystemConfigurationGroupReadString(group, EsLiteral("executable")); application->cExecutable = SystemConfigurationGroupReadString(group, EsLiteral("executable"));
application->settingsPath = EsSystemConfigurationGroupReadString(group, EsLiteral("settings_path"), &application->settingsPathBytes); application->settingsPath = SystemConfigurationGroupReadString(group, EsLiteral("settings_path"), &application->settingsPathBytes);
char *icon = EsSystemConfigurationGroupReadString(group, EsLiteral("icon")); char *icon = SystemConfigurationGroupReadString(group, EsLiteral("icon"));
application->iconID = EsIconIDFromString(icon); application->iconID = EsIconIDFromString(icon);
EsHeapFree(icon); EsHeapFree(icon);
application->useSingleProcess = EsSystemConfigurationGroupReadInteger(group, EsLiteral("use_single_process"), false); application->useSingleProcess = SystemConfigurationGroupReadInteger(group, EsLiteral("use_single_process"), false);
application->useSingleInstance = EsSystemConfigurationGroupReadInteger(group, EsLiteral("use_single_instance"), false); application->useSingleInstance = SystemConfigurationGroupReadInteger(group, EsLiteral("use_single_instance"), false);
application->hidden = EsSystemConfigurationGroupReadInteger(group, EsLiteral("hidden"), false); application->hidden = SystemConfigurationGroupReadInteger(group, EsLiteral("hidden"), false);
application->id = EsIntegerParse(group->section, group->sectionBytes); application->id = EsIntegerParse(group->section, group->sectionBytes);
#define READ_PERMISSION(x, y) if (EsSystemConfigurationGroupReadInteger(group, EsLiteral(x), 0)) application->permissions |= y #define READ_PERMISSION(x, y) if (SystemConfigurationGroupReadInteger(group, EsLiteral(x), 0)) application->permissions |= y
READ_PERMISSION("permission_all_files", APPLICATION_PERMISSION_ALL_FILES); READ_PERMISSION("permission_all_files", APPLICATION_PERMISSION_ALL_FILES);
READ_PERMISSION("permission_all_devices", APPLICATION_PERMISSION_ALL_DEVICES); READ_PERMISSION("permission_all_devices", APPLICATION_PERMISSION_ALL_DEVICES);
READ_PERMISSION("permission_manage_processes", APPLICATION_PERMISSION_MANAGE_PROCESSES); READ_PERMISSION("permission_manage_processes", APPLICATION_PERMISSION_MANAGE_PROCESSES);
@ -2396,13 +2395,13 @@ void ConfigurationLoadApplications() {
desktop.installedApplications.Add(application); desktop.installedApplications.Add(application);
if (EsSystemConfigurationGroupReadInteger(group, EsLiteral("is_file_manager"))) { if (SystemConfigurationGroupReadInteger(group, EsLiteral("is_file_manager"))) {
desktop.fileManager = application; desktop.fileManager = application;
} else if (EsSystemConfigurationGroupReadInteger(group, EsLiteral("is_installer"))) { } else if (SystemConfigurationGroupReadInteger(group, EsLiteral("is_installer"))) {
desktop.installer = application; desktop.installer = application;
} }
if (EsSystemConfigurationGroupReadInteger(group, EsLiteral("background_service"))) { if (SystemConfigurationGroupReadInteger(group, EsLiteral("background_service"))) {
_EsApplicationStartupInformation startupInformation = {}; _EsApplicationStartupInformation startupInformation = {};
startupInformation.flags = ES_APPLICATION_STARTUP_BACKGROUND_SERVICE; startupInformation.flags = ES_APPLICATION_STARTUP_BACKGROUND_SERVICE;
ApplicationInstanceCreate(application->id, &startupInformation, nullptr, true /* hidden */); ApplicationInstanceCreate(application->id, &startupInformation, nullptr, true /* hidden */);