80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Cleanups in src/unix

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-08-30 12:43:53 -04:00
parent 98a5e6e873
commit 1c01f1e2e2
2 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/unix/unix.c
View File

@@ -191,6 +191,7 @@ dynld_module(const char *name, dllimp_t *table)
{
dllimp_t *imp;
void *modhandle = dlopen(name, RTLD_LAZY | RTLD_GLOBAL);
if (modhandle) {
for (imp = table; imp->name != NULL; imp++) {
if ((*(void **) imp->func = dlsym(modhandle, imp->name)) == NULL) {
@@ -199,6 +200,7 @@ dynld_module(const char *name, dllimp_t *table)
}
}
}
return modhandle;
}
@@ -405,7 +407,7 @@ plat_mmap(size_t size, uint8_t executable)
#if defined __APPLE__ && defined MAP_JIT
void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE | (executable ? MAP_JIT : 0), -1, 0);
#else
void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE, -1, 0);
void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE, -1, 0);
#endif
return (ret < 0) ? NULL : ret;
}
@@ -427,6 +429,7 @@ plat_get_ticks_common(void)
{
uint64_t EndingTime;
uint64_t ElapsedMicroseconds;
if (first_use) {
Frequency = SDL_GetPerformanceFrequency();
StartingTime = SDL_GetPerformanceCounter();
@@ -434,6 +437,7 @@ plat_get_ticks_common(void)
}
EndingTime = SDL_GetPerformanceCounter();
ElapsedMicroseconds = ((EndingTime - StartingTime) * 1000000) / Frequency;
return ElapsedMicroseconds;
}
@@ -458,11 +462,13 @@ plat_remove(char *path)
void
ui_sb_update_icon_state(int tag, int state)
{
/* No-op. */
}
void
ui_sb_update_icon(int tag, int active)
{
/* No-op. */
}
void
@@ -474,25 +480,26 @@ plat_delay_ms(uint32_t count)
void
ui_sb_update_tip(int arg)
{
/* No-op. */
}
void
ui_sb_update_panes(void)
{
/* No-op. */
}
void
ui_sb_update_text(void)
{
/* No-op. */
}
void
path_get_dirname(char *dest, const char *path)
{
int c = (int) strlen(path);
char *ptr;
ptr = (char *) path;
char *ptr = (char *) path;
while (c > 0) {
if (path[c] == '/' || path[c] == '\\') {
@@ -511,6 +518,7 @@ volatile int cpu_thread_run = 1;
void
ui_sb_set_text_w(wchar_t *wstr)
{
/* No-op. */
}
int
@@ -634,6 +642,7 @@ ui_msgbox_header(int flags, void *header, void *message)
{
SDL_MessageBoxData msgdata;
SDL_MessageBoxButtonData msgbtn;
if (!header)
header = (void *) (flags & MBX_ANSI) ? "86Box" : L"86Box";
if (header <= (void *) 7168)
@@ -679,6 +688,7 @@ void
plat_get_exe_name(char *s, int size)
{
char *basepath = SDL_GetBasePath();
snprintf(s, size, "%s%s", basepath, basepath[strlen(basepath) - 1] == '/' ? "86box" : "/86box");
}
@@ -699,6 +709,7 @@ plat_power_off(void)
void
ui_sb_bugui(char *str)
{
/* No-op. */
}
extern void sdl_blit(int x, int y, int w, int h);
@@ -709,13 +720,17 @@ typedef struct mouseinputdata {
int deltaz;
int mousebuttons;
} mouseinputdata;
SDL_mutex *mousemutex;
int real_sdl_w;
int real_sdl_h;
SDL_mutex *mousemutex;
int real_sdl_w;
int real_sdl_h;
void
ui_sb_set_ready(int ready)
{
/* No-op. */
}
char *xargv[512];
// From musl.
@@ -724,6 +739,7 @@ local_strsep(char **str, const char *sep)
{
char *s = *str;
char *end;
if (!s)
return NULL;
end = s + strcspn(s, sep);
@@ -732,6 +748,7 @@ local_strsep(char **str, const char *sep)
else
end = 0;
*str = end;
return s;
}
@@ -761,6 +778,7 @@ plat_init_rom_paths(void)
#ifndef __APPLE__
if (getenv("XDG_DATA_HOME")) {
char xdg_rom_path[1024] = { 0 };
strncpy(xdg_rom_path, getenv("XDG_DATA_HOME"), 1024);
path_slash(xdg_rom_path);
strncat(xdg_rom_path, "86Box/", 1024);
@@ -774,6 +792,7 @@ plat_init_rom_paths(void)
rom_add_path(xdg_rom_path);
} else {
char home_rom_path[1024] = { 0 };
snprintf(home_rom_path, 1024, "%s/.local/share/86Box/", getenv("HOME") ? getenv("HOME") : getpwuid(getuid())->pw_dir);
if (!plat_dir_check(home_rom_path))
@@ -788,6 +807,7 @@ plat_init_rom_paths(void)
char *xdg_rom_paths = strdup(getenv("XDG_DATA_DIRS"));
char *xdg_rom_paths_orig = xdg_rom_paths;
char *cur_xdg_rom_path = NULL;
if (xdg_rom_paths) {
while (xdg_rom_paths[strlen(xdg_rom_paths) - 1] == ':') {
xdg_rom_paths[strlen(xdg_rom_paths) - 1] = '\0';
@@ -828,7 +848,9 @@ bool
process_media_commands_3(uint8_t *id, char *fn, uint8_t *wp, int cmdargc)
{
bool err = false;
*id = atoi(xargv[1]);
if (xargv[2][0] == '\'' || xargv[2][0] == '"') {
for (int curarg = 2; curarg < cmdargc; curarg++) {
if (strlen(fn) + strlen(xargv[curarg]) >= PATH_MAX) {
@@ -868,6 +890,7 @@ void (*f_rl_callback_handler_remove)(void) = NULL;
#else
# define LIBEDIT_LIBRARY "libedit.so"
#endif
uint32_t
timer_onesec(uint32_t interval, void *param)
{
@@ -882,6 +905,7 @@ monitor_thread(void *param)
if (isatty(fileno(stdin)) && isatty(fileno(stdout))) {
char *line = NULL;
size_t n;
printf("86Box monitor console.\n");
while (!exit_event) {
if (feof(stdin))
@@ -895,6 +919,7 @@ monitor_thread(void *param)
if (line) {
int cmdargc = 0;
char *linecpy;
line[strcspn(line, "\r\n")] = '\0';
linecpy = strdup(line);
if (!linecpy) {
@@ -989,6 +1014,7 @@ monitor_thread(void *param)
memset(fn, 0, sizeof(fn));
if (xargv[2][0] == '\'' || xargv[2][0] == '"') {
int curarg = 2;
for (curarg = 2; curarg < cmdargc; curarg++) {
if (strlen(fn) + strlen(xargv[curarg]) >= PATH_MAX) {
err = true;
@@ -1031,7 +1057,9 @@ monitor_thread(void *param)
uint8_t wp;
bool err = false;
char fn[PATH_MAX];
memset(fn, 0, sizeof(fn));
if (!xargv[2] || !xargv[1]) {
free(line);
free(linecpy);
@@ -1051,7 +1079,9 @@ monitor_thread(void *param)
uint8_t wp;
bool err = false;
char fn[PATH_MAX];
memset(fn, 0, sizeof(fn));
if (!xargv[2] || !xargv[1]) {
free(line);
free(linecpy);
@@ -1071,7 +1101,9 @@ monitor_thread(void *param)
uint8_t wp;
bool err = false;
char fn[PATH_MAX];
memset(fn, 0, sizeof(fn));
if (!xargv[2] || !xargv[1]) {
free(line);
free(linecpy);
@@ -1091,7 +1123,9 @@ monitor_thread(void *param)
uint8_t wp;
bool err = false;
char fn[PATH_MAX];
memset(fn, 0, sizeof(fn));
if (!xargv[2] || !xargv[1]) {
free(line);
free(linecpy);
@@ -1170,6 +1204,7 @@ main(int argc, char **argv)
SDL_AddTimer(1000, timer_onesec, NULL);
while (!is_quit) {
static int mouse_inside = 0;
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_QUIT:
@@ -1244,6 +1279,7 @@ main(int argc, char **argv)
case SDL_RENDER_TARGETS_RESET:
{
extern void sdl_reinit_texture(void);
sdl_reinit_texture();
break;
}
@@ -1251,6 +1287,7 @@ main(int argc, char **argv)
case SDL_KEYUP:
{
uint16_t xtkey = 0;
switch (event.key.keysym.scancode) {
default:
xtkey = sdl_to_xt[event.key.keysym.scancode];
@@ -1326,6 +1363,7 @@ plat_language_code(char *langcode)
void
plat_get_cpu_string(char *outbuf, uint8_t len) {
char cpu_string[] = "Unknown";
strncpy(outbuf, cpu_string, len);
}
@@ -1340,15 +1378,21 @@ plat_language_code_r(uint32_t lcid, char *outbuf, int len)
void
joystick_init(void)
{
/* No-op. */
}
void
joystick_close(void)
{
/* No-op. */
}
void
joystick_process(void)
{
/* No-op. */
}
void
startblit(void)
{
@@ -1365,9 +1409,11 @@ endblit(void)
void
ui_sb_mt32lcd(char *str)
{
/* No-op. */
}
void
ui_hard_reset_completed(void)
{
/* No-op. */
}

4
src/unix/unix_sdl.c
View File

@@ -167,6 +167,7 @@ sdl_real_blit(SDL_Rect *r_src)
int ret;
int winx;
int winy;
SDL_GL_GetDrawableSize(sdl_win, &winx, &winy);
SDL_RenderClear(sdl_render);
@@ -526,10 +527,13 @@ ui_window_title(wchar_t *str)
void
ui_init_monitor(int monitor_index)
{
/* No-op. */
}
void
ui_deinit_monitor(int monitor_index)
{
/* No-op. */
}
void