Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-04-28 08:37:12 +00:00
Code Issues Projects Releases Wiki Activity

float mag_rate

Browse Source
This commit is contained in:
kanjitalk755 2024-10-07 12:04:02 +09:00
parent 1928f2ecef
commit 62b88fa0ae
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BasiliskII/src/SDL/video_sdl2.cpp
View File

@ -712,9 +712,11 @@ static void shutdown_sdl_video()
delete_sdl_video_window();
}
static int get_mag_rate()
static float get_mag_rate()
{
int m = PrefsFindInt32("mag_rate");
float m;
const char *s = PrefsFindString("mag_rate");
if (s == NULL || sscanf(s, "%f", &m) != 1) return 1;
return m < 1 ? 1 : m > 4 ? 4 : m;
}
@ -759,7 +761,7 @@ static SDL_Surface *init_sdl_video(int width, int height, int depth, Uint32 flag
#endif
if (!sdl_window) {
int m = get_mag_rate();
float m = get_mag_rate();
sdl_window = SDL_CreateWindow(
"",
SDL_WINDOWPOS_UNDEFINED,
@ -1701,7 +1703,7 @@ static void do_toggle_fullscreen(void)
display_type = DISPLAY_WINDOW;
SDL_SetWindowFullscreen(sdl_window, 0);
const VIDEO_MODE &mode = drv->mode;
int m = get_mag_rate();
float m = get_mag_rate();
SDL_SetWindowSize(sdl_window, m * VIDEO_MODE_X, m * VIDEO_MODE_Y);
SDL_SetWindowGrab(sdl_window, SDL_FALSE);
#ifndef __MACOSX__
@ -1997,7 +1999,7 @@ static bool is_cursor_in_mac_screen()
deltaY = cursorY - windowY;
D(bug("cursor relative {%d,%d}\n", deltaX, deltaY));
const VIDEO_MODE &mode = drv->mode;
const int m = get_mag_rate();
float m = get_mag_rate();
out = deltaX >= 0 && deltaX < VIDEO_MODE_X * m &&
deltaY >= 0 && deltaY < VIDEO_MODE_Y * m;
D(bug("cursor in window? %s\n", out? "yes" : "no"));

2
BasiliskII/src/prefs_items.cpp
View File

@ -77,7 +77,7 @@ prefs_desc common_prefs_items[] = {
{"scale_integer",TYPE_BOOLEAN,false,"integer scaling"},
{"yearofs", TYPE_INT32, 0, "year offset"},
{"dayofs", TYPE_INT32, 0, "day offset"},
{"mag_rate", TYPE_INT32, 0, "rate of magnification"},
{"mag_rate", TYPE_STRING, 0, "rate of magnification"},
{"gammaramp", TYPE_STRING, false, "gamma ramp (on, off or fullscreen)"},
{"swap_opt_cmd", TYPE_BOOLEAN, false, "swap option and command key"},
{"ignoresegv", TYPE_BOOLEAN, false, "ignore illegal memory accesses"},

2
SheepShaver/src/prefs_items.cpp
View File

@ -65,7 +65,7 @@ prefs_desc common_prefs_items[] = {
{"cpuclock", TYPE_INT32, 0, "CPU clock [MHz] of system info"},
{"yearofs", TYPE_INT32, 0, "year offset"},
{"dayofs", TYPE_INT32, 0, "day offset"},
{"mag_rate", TYPE_INT32, 0, "rate of magnification"},
{"mag_rate", TYPE_STRING, 0, "rate of magnification"},
{"gammaramp", TYPE_STRING, false, "gamma ramp (on, off or fullscreen)"},
{"swap_opt_cmd", TYPE_BOOLEAN, false, "swap option and command key"},
{"host_domain", TYPE_STRING, true, "handle DNS requests for this domain on the host (slirp only)"},