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

misc

This commit is contained in:
nakst 2021-12-23 13:16:44 +00:00
parent acee390166
commit ee115fabd8
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/api.cpp
View File

@ -22,8 +22,6 @@
#include <shared/stb_image.h> #include <shared/stb_image.h>
#endif #endif
#include <emmintrin.h>
#define SHARED_COMMON_WANT_ALL #define SHARED_COMMON_WANT_ALL
#define SHARED_MATH_WANT_ALL #define SHARED_MATH_WANT_ALL
#include <shared/ini.h> #include <shared/ini.h>
@ -178,8 +176,6 @@ 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); void ApplicationProcessTerminated(EsObjectID pid);
#include "syscall.cpp"
struct ProcessMessageTiming { struct ProcessMessageTiming {
double startLogic, endLogic; double startLogic, endLogic;
double startLayout, endLayout; double startLayout, endLayout;
@ -252,6 +248,7 @@ struct APIInstance {
#define CHARACTER_IMAGE (3) // 32 bits per pixel, ARGB. #define CHARACTER_IMAGE (3) // 32 bits per pixel, ARGB.
#define CHARACTER_RECOLOR (4) // 32 bits per pixel, AXXX. #define CHARACTER_RECOLOR (4) // 32 bits per pixel, AXXX.
#include "syscall.cpp"
#include "renderer.cpp" #include "renderer.cpp"
#include "theme.cpp" #include "theme.cpp"
#define TEXT_RENDERER #define TEXT_RENDERER

1
desktop/text.cpp
View File

@ -3376,7 +3376,6 @@ void TextboxEnsureCaretVisibleActionCallback(EsElement *element, EsGeneric conte
} }
if (textbox->scroll.position[1] != scrollY) { if (textbox->scroll.position[1] != scrollY) {
EsPrint(" new scroll %d\n", scrollY);
textbox->scroll.SetY(scrollY); textbox->scroll.SetY(scrollY);
} else { } else {
break; break;

3
util/build.c
View File

@ -534,6 +534,9 @@ void Run(int emulator, int log, int debug) {
cpuCores, audioFlags2, logFlags, usbFlags, usbFlags2, secondaryDriveFlags, biosFlags, serialFlags)) { cpuCores, audioFlags2, logFlags, usbFlags, usbFlags2, secondaryDriveFlags, biosFlags, serialFlags)) {
printf("Unable to start Qemu. To manually run the system, use the drive image located at \"bin/drive\".\n"); printf("Unable to start Qemu. To manually run the system, use the drive image located at \"bin/drive\".\n");
} }
// Watch serial file as it is being written to:
// tail -f bin/Logs/qemu_serial1.txt
} break; } break;
case EMULATOR_BOCHS: { case EMULATOR_BOCHS: {

4
util/luigi.h
View File

@ -2480,8 +2480,6 @@ void UICodeFocusLine(UICode *code, int index) {
} }
void UICodeInsertContent(UICode *code, const char *content, ptrdiff_t byteCount, bool replace) { void UICodeInsertContent(UICode *code, const char *content, ptrdiff_t byteCount, bool replace) {
UIFont *previousFont = UIFontActivate(code->font);
if (byteCount == -1) { if (byteCount == -1) {
byteCount = _UIStringLength(content); byteCount = _UIStringLength(content);
} }
@ -2505,6 +2503,8 @@ void UICodeInsertContent(UICode *code, const char *content, ptrdiff_t byteCount,
return; return;
} }
UIFont *previousFont = UIFontActivate(code->font);
int lineCount = content[byteCount - 1] != '\n'; int lineCount = content[byteCount - 1] != '\n';
for (int i = 0; i < byteCount; i++) { for (int i = 0; i < byteCount; i++) {