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

header generator: fix bitsets in odin

This commit is contained in:
nakst 2022-02-13 20:43:35 +00:00
parent 1e1237187e
commit ed3745d293
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
desktop/os.header
View File

@ -660,18 +660,6 @@ define ES_COMMAND_REDO (0xF0000007)
define ES_COMMAND_SAVE (0xF0000008)
define ES_COMMAND_SHOW_IN_FILE_MANAGER (0xF0000009)
// Some common layouts...
define ES_CELL_FILL (ES_CELL_H_FILL | ES_CELL_V_FILL)
define ES_CELL_H_FILL (ES_CELL_H_PUSH | ES_CELL_H_EXPAND | ES_CELL_H_SHRINK)
define ES_CELL_V_FILL (ES_CELL_V_PUSH | ES_CELL_V_EXPAND | ES_CELL_V_SHRINK)
define ES_CELL_CENTER (ES_CELL_H_CENTER | ES_CELL_V_CENTER)
define ES_CELL_PUSH (ES_CELL_H_PUSH | ES_CELL_V_PUSH)
define ES_CELL_EXPAND (ES_CELL_H_EXPAND | ES_CELL_V_EXPAND)
define ES_CELL_CORNER (ES_CELL_H_LEFT | ES_CELL_V_TOP)
define ES_CELL_SHRINK (ES_CELL_H_SHRINK | ES_CELL_V_SHRINK)
define ES_CELL_H_CENTER (ES_CELL_H_LEFT | ES_CELL_H_RIGHT)
define ES_CELL_V_CENTER (ES_CELL_V_TOP | ES_CELL_V_BOTTOM)
// Mask bits for EsThemeMetrics:
bitset EsThemeMetricsMask ES_THEME_METRICS_ uint64_t none {
INSETS
@ -701,8 +689,6 @@ bitset EsThemeMetricsMask ES_THEME_METRICS_ uint64_t none {
TEXT_FIGURES
};
define ES_THEME_METRICS_GAP_ALL (ES_THEME_METRICS_GAP_MAJOR | ES_THEME_METRICS_GAP_MINOR | ES_THEME_METRICS_GAP_WRAP)
define ES_WINDOW_MOVE_MAXIMIZED (1 << 0)
define ES_WINDOW_MOVE_ADJUST_TO_FIT_SCREEN (1 << 1)
define ES_WINDOW_MOVE_HIDDEN (1 << 2)
@ -842,7 +828,6 @@ bitset EsClipboardDataFlags ES_CLIPBOARD_ADD_ uint32_t none {
LAZY_CUT
};
define ES_SCROLL_WHEEL_NOTCH (0x100)
define ES_SCROLL_WHEEL_NOTCH (0x100)
// Scroll view modes.

16
desktop/prefix.h
View File

@ -145,9 +145,21 @@ ES_EXTERN_C __attribute__((noreturn)) void _EsCRTlongjmp(EsCRTjmp_buf *env, int
#define EsCommandSetEnabled(command, enabled) EsCommandSetDisabled(command, !(enabled))
#define EsClipboardHasText(clipboard) EsClipboardHasFormat(clipboard, ES_CLIPBOARD_FORMAT_TEXT)
#define EsLiteral(x) (char *) x, EsCStringLength((char *) x)
#define ES_THEME_METRICS_GAP_ALL (ES_THEME_METRICS_GAP_MAJOR | ES_THEME_METRICS_GAP_MINOR | ES_THEME_METRICS_GAP_WRAP)
#define ES_STYLE_CAST(x) ((EsStyle *) (uintptr_t) (x))
// Some common layouts...
#define ES_CELL_FILL (ES_CELL_H_FILL | ES_CELL_V_FILL)
#define ES_CELL_H_FILL (ES_CELL_H_PUSH | ES_CELL_H_EXPAND | ES_CELL_H_SHRINK)
#define ES_CELL_V_FILL (ES_CELL_V_PUSH | ES_CELL_V_EXPAND | ES_CELL_V_SHRINK)
#define ES_CELL_CENTER (ES_CELL_H_CENTER | ES_CELL_V_CENTER)
#define ES_CELL_PUSH (ES_CELL_H_PUSH | ES_CELL_V_PUSH)
#define ES_CELL_EXPAND (ES_CELL_H_EXPAND | ES_CELL_V_EXPAND)
#define ES_CELL_CORNER (ES_CELL_H_LEFT | ES_CELL_V_TOP)
#define ES_CELL_SHRINK (ES_CELL_H_SHRINK | ES_CELL_V_SHRINK)
#define ES_CELL_H_CENTER (ES_CELL_H_LEFT | ES_CELL_H_RIGHT)
#define ES_CELL_V_CENTER (ES_CELL_V_TOP | ES_CELL_V_BOTTOM)
#define EsLiteral(x) (char *) x, EsCStringLength((char *) x)
#ifndef ES_INSTANCE_TYPE
#define ES_INSTANCE_TYPE struct EsInstance

18
util/header_generator.c
View File

@ -925,10 +925,10 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
if (0 == strcmp(initialValue, "NULL")) {
initialValue = "nil";
} else if (0 == strcmp(initialValue, "DEFAULT_PROPERTIES")) {
initialValue = "{}";
} else if (0 == strcmp(initialValue, "BLANK_STRING")) {
initialValue = "\"\"";
} else if (0 == strcmp(initialValue, "FLAGS_DEFAULT")) {
initialValue = "{}";
}
bool needLeadingDot = false;
@ -941,6 +941,20 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
break;
}
}
for (int i = 0; i < arrlen(root->children); i++) {
Entry *entry = root->children + i;
if (entry->type == ENTRY_BITSET && 0 == strcmp(variable->variable.type, entry->name)) {
needLeadingDot = true;
if (0 == memcmp(initialValue, entry->bitset.definePrefix + 3, strlen(entry->bitset.definePrefix) - 3)) {
initialValue += strlen(entry->bitset.definePrefix) - 3;
}
break;
}
}
FilePrintFormat(output, " = %c%s", needLeadingDot ? '.' : ' ', initialValue);
}