Clean up the plat and ui API
Remove functions no longer defined or used on any plat/UI Remove the old non-multi-monitor-aware plat_resize() and rename plat_resize_monitor() to plat_resize()
This commit is contained in:
@@ -113,7 +113,6 @@ extern int hide_status_bar;
|
|||||||
extern int hide_tool_bar;
|
extern int hide_tool_bar;
|
||||||
|
|
||||||
/* System-related functions. */
|
/* System-related functions. */
|
||||||
extern char *fix_exe_path(char *str);
|
|
||||||
extern FILE *plat_fopen(const char *path, const char *mode);
|
extern FILE *plat_fopen(const char *path, const char *mode);
|
||||||
extern FILE *plat_fopen64(const char *path, const char *mode);
|
extern FILE *plat_fopen64(const char *path, const char *mode);
|
||||||
extern void plat_remove(char *path);
|
extern void plat_remove(char *path);
|
||||||
@@ -129,29 +128,19 @@ extern void *plat_mmap(size_t size, uint8_t executable);
|
|||||||
extern void plat_munmap(void *ptr, size_t size);
|
extern void plat_munmap(void *ptr, size_t size);
|
||||||
extern uint64_t plat_timer_read(void);
|
extern uint64_t plat_timer_read(void);
|
||||||
extern uint32_t plat_get_ticks(void);
|
extern uint32_t plat_get_ticks(void);
|
||||||
extern uint32_t plat_get_micro_ticks(void);
|
|
||||||
extern void plat_delay_ms(uint32_t count);
|
extern void plat_delay_ms(uint32_t count);
|
||||||
extern void plat_pause(int p);
|
extern void plat_pause(int p);
|
||||||
extern void plat_mouse_capture(int on);
|
extern void plat_mouse_capture(int on);
|
||||||
extern int plat_vidapi(char *name);
|
extern int plat_vidapi(char *name);
|
||||||
extern char *plat_vidapi_name(int api);
|
extern char *plat_vidapi_name(int api);
|
||||||
extern int plat_setvid(int api);
|
extern void plat_resize(int x, int y, int monitor_index);
|
||||||
extern void plat_vidsize(int x, int y);
|
|
||||||
extern void plat_setfullscreen(int on);
|
|
||||||
extern void plat_resize_monitor(int x, int y, int monitor_index);
|
|
||||||
extern void plat_resize_request(int x, int y, int monitor_index);
|
extern void plat_resize_request(int x, int y, int monitor_index);
|
||||||
extern void plat_resize(int x, int y);
|
|
||||||
extern void plat_vidapi_enable(int enabled);
|
|
||||||
extern void plat_vidapi_reload(void);
|
|
||||||
extern void plat_vid_reload_options(void);
|
|
||||||
extern uint32_t plat_language_code(char *langcode);
|
extern uint32_t plat_language_code(char *langcode);
|
||||||
extern void plat_language_code_r(uint32_t lcid, char *outbuf, int len);
|
extern void plat_language_code_r(uint32_t lcid, char *outbuf, int len);
|
||||||
extern void plat_get_cpu_string(char *outbuf, uint8_t len);
|
extern void plat_get_cpu_string(char *outbuf, uint8_t len);
|
||||||
extern double plat_get_dpi(void);
|
|
||||||
extern void plat_set_thread_name(void *thread, const char *name);
|
extern void plat_set_thread_name(void *thread, const char *name);
|
||||||
|
|
||||||
/* Resource management. */
|
/* Resource management. */
|
||||||
extern void set_language(uint32_t id);
|
|
||||||
extern wchar_t *plat_get_string(int id);
|
extern wchar_t *plat_get_string(int id);
|
||||||
|
|
||||||
/* Emulator start/stop support functions. */
|
/* Emulator start/stop support functions. */
|
||||||
@@ -183,17 +172,11 @@ extern void ioctl_close(uint8_t id);
|
|||||||
/* Other stuff. */
|
/* Other stuff. */
|
||||||
extern void startblit(void);
|
extern void startblit(void);
|
||||||
extern void endblit(void);
|
extern void endblit(void);
|
||||||
extern void take_screenshot(void);
|
|
||||||
|
|
||||||
/* Conversion between UTF-8 and UTF-16. */
|
/* Conversion between UTF-8 and UTF-16. */
|
||||||
extern size_t mbstoc16s(uint16_t dst[], const char src[], int len);
|
extern size_t mbstoc16s(uint16_t dst[], const char src[], int len);
|
||||||
extern size_t c16stombs(char dst[], const uint16_t src[], int len);
|
extern size_t c16stombs(char dst[], const uint16_t src[], int len);
|
||||||
|
|
||||||
#ifdef MTR_ENABLED
|
|
||||||
extern void init_trace(void);
|
|
||||||
extern void shutdown_trace(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -42,9 +42,6 @@ extern "C" {
|
|||||||
|
|
||||||
extern int ui_msgbox(int flags, void *message);
|
extern int ui_msgbox(int flags, void *message);
|
||||||
extern int ui_msgbox_header(int flags, void *header, void *message);
|
extern int ui_msgbox_header(int flags, void *header, void *message);
|
||||||
extern int ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, void *btn3);
|
|
||||||
|
|
||||||
extern void ui_check_menu_item(int id, int checked);
|
|
||||||
|
|
||||||
/* Status Bar functions. */
|
/* Status Bar functions. */
|
||||||
#define SB_ICON_WIDTH 24
|
#define SB_ICON_WIDTH 24
|
||||||
@@ -60,16 +57,13 @@ extern void ui_check_menu_item(int id, int checked);
|
|||||||
#define SB_TEXT 0x90
|
#define SB_TEXT 0x90
|
||||||
|
|
||||||
extern wchar_t *ui_window_title(wchar_t *s);
|
extern wchar_t *ui_window_title(wchar_t *s);
|
||||||
extern void ui_status_update(void);
|
|
||||||
extern void ui_hard_reset_completed(void);
|
extern void ui_hard_reset_completed(void);
|
||||||
extern void ui_init_monitor(int monitor_index);
|
extern void ui_init_monitor(int monitor_index);
|
||||||
extern void ui_deinit_monitor(int monitor_index);
|
extern void ui_deinit_monitor(int monitor_index);
|
||||||
extern int ui_sb_find_part(int tag);
|
|
||||||
extern void ui_sb_set_ready(int ready);
|
extern void ui_sb_set_ready(int ready);
|
||||||
extern void ui_sb_update_panes(void);
|
extern void ui_sb_update_panes(void);
|
||||||
extern void ui_sb_update_text(void);
|
extern void ui_sb_update_text(void);
|
||||||
extern void ui_sb_update_tip(int meaning);
|
extern void ui_sb_update_tip(int meaning);
|
||||||
extern void ui_sb_timer_callback(int pane);
|
|
||||||
extern void ui_sb_update_icon(int tag, int active);
|
extern void ui_sb_update_icon(int tag, int active);
|
||||||
extern void ui_sb_update_icon_state(int tag, int state);
|
extern void ui_sb_update_icon_state(int tag, int state);
|
||||||
extern void ui_sb_set_text_w(wchar_t *wstr);
|
extern void ui_sb_set_text_w(wchar_t *wstr);
|
||||||
|
@@ -149,6 +149,11 @@ strnicmp(const char *s1, const char *s2, size_t n)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
do_start(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
do_stop(void)
|
do_stop(void)
|
||||||
{
|
{
|
||||||
@@ -425,12 +430,6 @@ plat_power_off(void)
|
|||||||
QTimer::singleShot(0, (const QWidget *) main_window, &QMainWindow::close);
|
QTimer::singleShot(0, (const QWidget *) main_window, &QMainWindow::close);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
set_language(uint32_t id)
|
|
||||||
{
|
|
||||||
lang_id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern "C++" {
|
extern "C++" {
|
||||||
QMap<uint32_t, QPair<QString, QString>> ProgSettings::lcid_langcode = {
|
QMap<uint32_t, QPair<QString, QString>> ProgSettings::lcid_langcode = {
|
||||||
{ 0x0403, { "ca-ES", "Catalan (Spain)" } },
|
{ 0x0403, { "ca-ES", "Catalan (Spain)" } },
|
||||||
@@ -741,12 +740,6 @@ plat_get_cpu_string(char *outbuf, uint8_t len) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
double
|
|
||||||
plat_get_dpi(void)
|
|
||||||
{
|
|
||||||
return util::screenOfWidget(main_window)->devicePixelRatio();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
plat_set_thread_name(void *thread, const char *name)
|
plat_set_thread_name(void *thread, const char *name)
|
||||||
{
|
{
|
||||||
|
@@ -95,14 +95,14 @@ plat_resize_request(int w, int h, int monitor_index)
|
|||||||
if (video_fullscreen || is_quit)
|
if (video_fullscreen || is_quit)
|
||||||
return;
|
return;
|
||||||
if (vid_resize & 2) {
|
if (vid_resize & 2) {
|
||||||
plat_resize_monitor(fixed_size_x, fixed_size_y, monitor_index);
|
plat_resize(fixed_size_x, fixed_size_y, monitor_index);
|
||||||
} else {
|
} else {
|
||||||
plat_resize_monitor(w, h, monitor_index);
|
plat_resize(w, h, monitor_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
plat_resize_monitor(int w, int h, int monitor_index)
|
plat_resize(int w, int h, int monitor_index)
|
||||||
{
|
{
|
||||||
if (monitor_index >= 1)
|
if (monitor_index >= 1)
|
||||||
main_window->resizeContentsMonitor(w, h, monitor_index);
|
main_window->resizeContentsMonitor(w, h, monitor_index);
|
||||||
@@ -110,12 +110,6 @@ plat_resize_monitor(int w, int h, int monitor_index)
|
|||||||
main_window->resizeContents(w, h);
|
main_window->resizeContents(w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
plat_setfullscreen(int on)
|
|
||||||
{
|
|
||||||
main_window->setFullscreen(on > 0 ? true : false);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
plat_mouse_capture(int on)
|
plat_mouse_capture(int on)
|
||||||
{
|
{
|
||||||
|
@@ -448,12 +448,6 @@ plat_get_ticks(void)
|
|||||||
return (uint32_t) (plat_get_ticks_common() / 1000);
|
return (uint32_t) (plat_get_ticks_common() / 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t
|
|
||||||
plat_get_micro_ticks(void)
|
|
||||||
{
|
|
||||||
return (uint32_t) plat_get_ticks_common();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
plat_remove(char *path)
|
plat_remove(char *path)
|
||||||
{
|
{
|
||||||
@@ -578,9 +572,9 @@ main_thread(void *param)
|
|||||||
/* If needed, handle a screen resize. */
|
/* If needed, handle a screen resize. */
|
||||||
if (atomic_load(&doresize_monitors[0]) && !video_fullscreen && !is_quit) {
|
if (atomic_load(&doresize_monitors[0]) && !video_fullscreen && !is_quit) {
|
||||||
if (vid_resize & 2)
|
if (vid_resize & 2)
|
||||||
plat_resize(fixed_size_x, fixed_size_y);
|
plat_resize(fixed_size_x, fixed_size_y, 0);
|
||||||
else
|
else
|
||||||
plat_resize(scrnsz_x, scrnsz_y);
|
plat_resize(scrnsz_x, scrnsz_y, 0);
|
||||||
atomic_store(&doresize_monitors[0], 1);
|
atomic_store(&doresize_monitors[0], 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1358,12 +1352,6 @@ plat_vidapi_name(int i)
|
|||||||
return "default";
|
return "default";
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
set_language(uint32_t id)
|
|
||||||
{
|
|
||||||
lang_id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Sets up the program language before initialization. */
|
/* Sets up the program language before initialization. */
|
||||||
uint32_t
|
uint32_t
|
||||||
plat_language_code(char *langcode)
|
plat_language_code(char *langcode)
|
||||||
|
@@ -424,9 +424,9 @@ sdl_init_common(int flags)
|
|||||||
sdl_set_fs(video_fullscreen);
|
sdl_set_fs(video_fullscreen);
|
||||||
if (!(video_fullscreen & 1)) {
|
if (!(video_fullscreen & 1)) {
|
||||||
if (vid_resize & 2)
|
if (vid_resize & 2)
|
||||||
plat_resize(fixed_size_x, fixed_size_y);
|
plat_resize(fixed_size_x, fixed_size_y, 0);
|
||||||
else
|
else
|
||||||
plat_resize(scrnsz_x, scrnsz_y);
|
plat_resize(scrnsz_x, scrnsz_y, 0);
|
||||||
}
|
}
|
||||||
if ((vid_resize < 2) && window_remember) {
|
if ((vid_resize < 2) && window_remember) {
|
||||||
SDL_SetWindowSize(sdl_win, window_w, window_h);
|
SDL_SetWindowSize(sdl_win, window_w, window_h);
|
||||||
@@ -479,7 +479,7 @@ plat_mouse_capture(int on)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
plat_resize(int w, int h)
|
plat_resize(int w, int h, UNUSED(int monitor_index))
|
||||||
{
|
{
|
||||||
SDL_LockMutex(sdl_mutex);
|
SDL_LockMutex(sdl_mutex);
|
||||||
resize_w = w;
|
resize_w = w;
|
||||||
|
Reference in New Issue
Block a user