Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-09 00:29:33 +00:00
Code Issues Projects Releases Wiki Activity
3,410 Commits 5 Branches 17 Tags 20 MiB
master
Commit Graph

2056 Commits

Author SHA1 Message Date
Doug Brown
f1502fb6bd Add optional ability to intercept Windows key 
This allows you to use the Windows key as your option key, bypassing
Windows' various uses of the key for the start menu and keyboard
shortcuts. This is enabled with the "reservewindowskey" setting in
the prefs file, and a checkbox has been added to the settings GUI.
 2022-01-09 11:43:33 -08:00
kanjitalk755
f385c22ed2 fix for mounting CDROM after reboot 2021-08-30 22:20:26 +09:00
kanjitalk755
b2df4fed1f fix for SDL 2.0.14 2021-08-01 09:55:43 +09:00
kanjitalk755
ab586a5a09 SS, x86_64: fix thousands colors mode 2021-06-30 22:00:59 +09:00
kanjitalk755
90edd35246 swap_opt_cmd assumes false if keycodes file used 2021-06-30 11:25:05 +09:00
kanjitalk755
0538eb0cc0 BII,linux,x86_64: fixed JIT 2021-06-24 14:19:13 +09:00
kanjitalk755
56343905e3 adjust warning 2021-06-21 10:54:59 +09:00
kanjitalk755
15f56749ba changed to use GMP/MPFR static libraries 2021-06-13 23:50:16 +09:00
aarojun
d346521b92 Fixed file read of sdlrender pref 2021-05-28 01:36:28 +03:00
aarojun
9621850735 Add Render Driver setting to GUI 2021-05-27 23:40:24 +03:00
aarojun
42e70e85c6 Add sdl_vsync setting to GUI 2021-05-27 17:16:35 +03:00
aarojun
bdcc9d2da4 Keep refresh rate settings when dtype = fullscreen 2021-05-27 15:15:52 +03:00
aarojun
ac68d68920 Add sdl_vsync to pref items 2021-05-27 13:28:33 +03:00
aarojun
5d1bfd1059 Merge branch 'master' of https://github.com/aarojun/macemu 2021-05-27 06:40:56 +03:00
aarojun
c28a00f58a Add sdl_vsync option (vertical sync with SDL_Renderer) 2021-05-27 06:30:31 +03:00
kanjitalk755
420dc1d504 fixed startup sound 2021-05-16 14:46:58 +09:00
kanjitalk755
bc9c7675f9 removed unnecessary files from the uae_cpu libraries 2021-05-07 14:29:27 +09:00
kanjitalk755
caf10f1223 BII(x86_64): re-enabled JIT compiler 2021-05-06 14:24:31 +09:00
kanjitalk755
5862662bc9 fix for Linux and Windows 2021-05-06 12:16:03 +09:00
kanjitalk755
e42b8f6076 rename new uae_cpu 2021-05-06 11:38:37 +09:00
kanjitalk755
1d710a0cad BII: disable JIT compiler 2021-05-05 22:15:43 +09:00
kanjitalk755
1aaeaf05c4 fixed merge error and deleted unnecessary files 2021-05-04 18:33:50 +09:00
kanjitalk755
65028aec4a Merge remote-tracking branch 'uyjulian/core_cleanup/BasiliskII/src/uae_cpu' into update_uae 2021-05-04 13:51:40 +09:00
kanjitalk755
8a28ad6e39 A workaround for Xcode 12.5 2021-04-30 10:07:28 +09:00
kanjitalk755
49eee29597 Xcode: modified for building both x86_64 and arm64 2021-04-23 20:47:17 +09:00
kanjitalk755
20d2de95ce marged Jagmn's patch 
https://emaculation.com/forum/viewtopic.php?p=70121#p70121
 2021-04-23 10:19:48 +09:00
kanjitalk755
a39eff553c changed implementation of "name_encoding" 2021-04-21 21:29:05 +09:00
kanjitalk755
e750aecafe macOS: prefs item "name_encoding" 2021-04-16 10:54:04 +09:00
Matthias Weiß
176da65363 applyed patches from https://github.com/oaguy1/macemu 2021-03-30 15:14:14 +02:00
kanjitalk755
8064215081 prefs item "sound_buffer" 2021-03-17 11:42:37 +09:00
kanjitalk755
7471c357c3 linux,Windows: fixed fullscreen 2021-03-04 14:29:02 +09:00
kanjitalk755
ce3e2f3693 prefs item "mousewheellines" accepts negative value 2021-03-03 14:59:37 +09:00
kanjitalk755
6d3fbba4cd Merge remote-tracking branch 'seghaxx/master' 
# Conflicts:
#	BasiliskII/src/MacOSX/extfs_macosx.cpp
#	BasiliskII/src/SDL/video_sdl2.cpp
#	BasiliskII/src/Unix/configure.ac
 2021-03-03 12:13:12 +09:00
kanjitalk755
65772919a1 specify OpenGL if non-Metal Mac 2021-02-28 18:56:58 +09:00
kanjitalk755
623abaa243 prefs item "title" 2021-02-27 18:29:57 +09:00
kanjitalk755
2f1f196251 Merge branch 'test_fullscreen3' 2021-02-25 14:50:54 +09:00
kanjitalk755
39cbc73a9f added SDL version check 2021-02-25 14:49:54 +09:00
kanjitalk755
e75d2ca5d6 fix for g++ 2021-02-16 15:11:49 +09:00
kanjitalk755
09046e0a2f check Metal device 2021-02-14 16:25:02 +09:00
kanjitalk755
4cf65a3faf fixed initial window title 2021-02-10 22:12:38 +09:00
kanjitalk755
fbddf063cb fixed swapping opt and cmd key if keycode file is used 2021-02-07 09:34:22 +09:00
kanjitalk755
89e8a05815 startup sound 2021-02-06 13:06:13 +09:00
kanjitalk755
556ec0cf80 added port forwarding for Windows 2021-02-05 22:13:46 +09:00
Glenn Anderson
5620ef8c43 Improved fix for resource forks not being created on APFS volumes 2021-02-03 09:16:11 -08:00
kanjitalk755
3f4eed670f fix for SDL 2.0.14 2021-02-02 18:35:57 +09:00
kanjitalk755
0fd17a98ff BII: fixed thousands colors mode 2021-01-31 21:20:47 +09:00
Seg
144b117886 Fix JIT enable logic 2020-12-30 07:54:21 -08:00
Seg
6d92f13bcd Don't use linker script on x86_64, there is no need for it and it 
breaks flatpak builds
 2020-12-30 07:33:52 -08:00
Seg
cad8df587d Update config.guess and config.sub 2020-12-30 07:33:52 -08:00
Seg
eb9142ac14 Fix crash on linux aarch64 2020-12-30 07:33:52 -08:00
Seg
0c8529eca1 Merge remote-tracking branch 'cebix/master' into kanjitalk755/master 2020-12-30 07:22:50 -08:00
kanjitalk755
436c5df15f fix CapsLock for linux 2020-12-17 22:25:48 +09:00
kanjitalk755
cadd3350ea
Merge pull request #72 from rakslice/x64_32_instruction_skip 
X64 32-bit address instruction skip
 2020-12-02 18:12:19 +09:00
rakslice
f198632834 corresponding change for BII sigsegv.cpp 2020-12-01 23:33:38 -08:00
kanjitalk755
b6725730f5 for avoid errors in Xcode12.2, the target arm64 was excluded 2020-11-23 22:47:18 +09:00
asvitkine
d684527b27
Merge pull request #220 from atsampson/fixsdl 
Update SheepShaver for SDL2 support
 2020-11-22 22:53:25 -05:00
kanjitalk755
0d213f9d00 avoid compile error in macOS 2020-11-20 18:46:45 +09:00
kanjitalk755
c151e24bb8
Merge pull request #71 from rakslice/host_dns_resolution_domains 
slirp: Resolve DNS requests for a configurable set of domains using the host's name resolution
 2020-11-20 18:33:10 +09:00
kanjitalk755
6a88d08551
Merge pull request #70 from rakslice/hardcursor_warp_fix 
Fixes for cursor warping in "hardcursor" mode on Windows
 2020-11-20 18:31:44 +09:00
rakslice
62081d50d1 fix typo 2020-11-19 21:28:05 -08:00
rakslice
faeb5fa2e1 make sure response size assert applies in the empty response case; cleanup; add more comments 2020-11-19 18:29:06 -08:00
rakslice
ff0a825356 note about the source of the commented structs 2020-11-19 16:38:05 -08:00
rakslice
6d74ff5600 fix calculated size 2020-11-19 15:54:10 -08:00
rakslice
5163e17f14 ignore upper case in pref 2020-11-19 15:43:10 -08:00
rakslice
a1ef6be18a make locally resolved DNS domains configurable through host_domain pref (multi allowed); also match exact domain 2020-11-19 15:31:16 -08:00
rakslice
a453ae105a slirp: resolve .local suffix DNS requests using the host's name resolution 
(cherry picked from commit e2a6a4c1177e252bc38221c87bb99a599e8761a1)
 2020-11-19 14:10:38 -08:00
rakslice
0df082d4e1 add sdlrender pref for BII/Windows 
(cherry picked from commit 6d9018f5f401b13f1dea02a9368f201f49e66dbd)
 2020-11-19 04:58:15 -08:00
rakslice
991496a4f4 Make the video_sdl2 warpmouse output a debug message 
(cherry picked from commit 69574d53a9511b64092304f0969a31da4789051a)
 2020-11-18 13:30:12 -08:00
rakslice
c0ceb74931 fix mouse warp destination coordinates; don't warp mouse cursor when it is not on the mac screen 
(cherry picked from commit aa92a09475b2a18f51d21f10f2acd4242205db6c)
 2020-11-18 13:29:56 -08:00
kanjitalk755
d547db0648
Merge pull request #68 from rakslice/misaligned_rows_fix 
Misaligned rows fix
 2020-11-18 12:05:52 +09:00
kanjitalk755
271b7322d3 Merge branch 'test_issue64' 2020-11-18 12:01:40 +09:00
rakslice
6b4cc38de6 Corresponding header change for BII; cleanup 
(cherry picked from commit 36ccf8a46a72b6c970df04bd6ecc60efd0363476)
 2020-11-17 05:23:16 -08:00
rakslice
c8c1a76381 prevent truncating unaligned rows in non-vosf mode with 16 colors or less 
(cherry picked from commit 9d6124871be79f5c3028ebe3f5d1068dbcea0c84)
 2020-11-17 05:23:04 -08:00
rakslice
a897561c11 remove duplicated function and fix BII 2020-11-15 12:53:54 -08:00
rakslice
85da18e38f fix for misaligned rows in screen buffer in VOSF full screen mode when screen buffer has slack and source doesn't 
(cherry picked from commit cbca0b629f7b4fab0038a0d45c15a302c3216763)
 2020-11-15 12:19:49 -08:00
rakslice
c044312b3c In vosf full screen update use chunk size based on pixel size 
(cherry picked from commit 108071e1a1ed9f43229fc81ca882fbb6c2de7eec)
 2020-11-15 12:19:39 -08:00
kanjitalk755
87d4660aa6 test for issue64 2020-10-28 12:57:28 +09:00
rakslice
a14362b183 Windows: add a critical section for slirp calls to avoid unsafe use from multiple threads 2020-10-25 16:28:19 -07:00
rakslice
1892cf0a7e remove errant return in audio component close handler 2020-10-22 15:47:33 -07:00
kanjitalk755
73f194f422 remove .travis.yml 
reduce warnings
 2020-10-16 19:17:58 +09:00
kanjitalk755
232efdaa8c change pref default (jit and ignoresegv) 2020-10-10 15:07:12 +09:00
kanjitalk755
43cb7718e6 ignore key repeat 2020-10-08 17:10:49 +09:00
kanjitalk755
d20ba5d179 test a pref item swap_opt_cmd 2020-10-06 15:38:35 +09:00
kanjitalk755
dd9cfec0e7 BII: JIT enabled 2020-10-06 15:10:21 +09:00
rakslice
561f1dfcde For NewWorld ROM, implement the bootdriver setting by reordering the drive queue once CD-ROM drives are added 2020-09-24 19:09:54 -07:00
rakslice
37b36ef332 actually use dynamically detected cdroms; if read via cdenable doesn't work use the logical drive handle instead 2020-09-21 20:33:26 -07:00
kanjitalk755
be17ba9044 save initial gamma tables 
change default gammaramp to off
 2020-09-18 10:29:16 +09:00
kanjitalk755
7313b0284c BII: fix gamma ramp 2020-09-17 11:10:15 +09:00
kanjitalk755
d851a65548 fix gamma ramp when 16-bit color 2020-09-13 23:03:51 +09:00
Seth Polsley
6de9a5032d Splitting mac_pal and mac_gamma to always allow SDL gamma changes 2020-09-13 03:41:23 -05:00
kanjitalk755
21c16f991e switchable gamma ramp 2020-09-13 13:49:48 +09:00
Seth Polsley
25e2d4af6f Removing vm_memcpy dependency for BII 2020-09-11 14:44:58 -05:00
Seth Polsley
833f21c225 Merge branch 'master' of https://github.com/kanjitalk755/macemu 2020-09-10 13:59:51 -05:00
Seth Polsley
2a904af8e7 Cleaner soundin driver implementation 2020-09-10 01:36:49 -05:00
Seth Polsley
177555e0d1 Loading soundin patch with resources writing to ROM 2020-09-10 00:51:24 -05:00
kanjitalk755
95437fbf89 fix BII build 2020-09-06 22:25:55 +09:00
kanjitalk755
98e12fbc2e BII: JIT 2020-09-01 22:25:04 +09:00
kanjitalk755
d58aa827a4 revert BII JIT 2020-08-30 22:25:47 +09:00
kanjitalk755
3861177919 add pref item "mag_rate" 
BII: JIT
 2020-08-30 15:09:09 +09:00
rakslice
92a1ee2128 Windows configure.ac: fix broken SDL check with macro intended for configure script contents context being used in shell variable contents context 2020-08-28 03:09:37 -07:00
rakslice
4b93738773 Windows configure.ac: fix AC_CACHE_CHECK miss case with value with setting in side effecting AC_SUBST which won't get cached 2020-08-28 03:01:38 -07:00
kanjitalk755
64b38dbec8 SS: fix double pref item (ignoresegv) 
BII: fix for JIT
 2020-08-24 11:51:31 +09:00
Adam Sampson
413190d12f Use openpty if possible. 
The code this affects in sshpty.c originally came from OpenSSH, which
now uses openpty by preference when it's available. openpty is a
BSD-ism, but it's been provided by glibc on Linux with the BSD
semantics since 1998.
 2020-08-23 17:26:15 +01:00
Adam Sampson
4da2082c07 The mono palette hack isn't needed for SheepShaver. 2020-08-23 16:47:48 +01:00
uyjulian
bb5caf093a
Merge latest ARAnyM changes 2020-08-23 08:34:42 -05:00
rakslice
e5c4699923 put error message on stderr 2020-08-18 21:09:28 -07:00
rakslice
639f05da7e don't call SetWindowGammaRamp without sdl_window 2020-08-18 20:53:39 -07:00
rakslice
ba111a5cb7 Merge branch 'kanjitalk755_master' into gamma 2020-08-18 04:48:28 -07:00
rakslice
bb080a262e repeat gamma entries to handle B2 thousands (16-bit) color mode; ignore its solid grey palettes such as those that happen during mode changes 2020-08-18 04:21:23 -07:00
rakslice
b4b652d696 fix sdl error message output 2020-08-18 04:13:50 -07:00
rakslice
d1fcff0a08 corresponding gamma change for sdl1 2020-08-18 03:28:43 -07:00
rakslice
792ad5ccff cleanup 2020-08-18 03:28:23 -07:00
rakslice
ffee1ebad2 Add gamma support for direct color modes 2020-08-17 21:05:08 -07:00
kanjitalk755
6985ad67fe BII: prepare JIT 2020-08-13 21:00:42 +09:00
kanjitalk755
630f4ffafb fixed leak 2020-08-12 20:49:14 +09:00
kanjitalk755
1f2b35fef2 reserve framebuffer 2020-08-12 11:39:58 +09:00
kanjitalk755
d906fb23b0 CD fix 
default palette
 2020-08-10 13:01:22 +09:00
kanjitalk755
7c6b9a67f6 the first steps for Apple Silicon 2020-08-08 11:50:55 +09:00
Ricky Zhang
13017f711f
Fix a weird whitespace. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:56:00 -04:00
Ricky Zhang
82524ba034
Unwrap the formula. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:54:06 -04:00
Ricky Zhang
2e96512f26
Fix if/else format. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:42:59 -04:00
Ricky Zhang
5f1b41eb42
Improve the comment readability. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 21:14:20 -04:00
Ricky Zhang
03ebc5375b
Fix comment. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 20:55:34 -04:00
Ricky Zhang
342fbbce34
Port mini vMac guest OS screen ROM patch. 
- Added Mac SE 24 bit ROM screen patch from mini vMac.
  The guest OS resolution in System 6 can be defined
  at an arbitrary combination.
- Mac frame buffer base mapping is moved out from guest RAM.
  This creates more leg room for the host frame buffer.
- Enable System 6 vscreen support in SDL2. Passed build and test.
- Enable System 6 vscreen support in SDL1. Passed build and test.
- Eanble System 6 vscreen support in XWidnow. Passed build and test.

See my [screen cast demo here](https://youtu.be/aXzM8t_u3zI)

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-15 19:14:36 -04:00
Seth Polsley
478fc39650 Setting optimization level 2020-07-14 23:07:46 -05:00
Seth Polsley
d7fb0ac298 Audio CD format as default and update based on data mode 2020-07-14 19:13:33 -05:00
Seth Polsley
8124b61d2b Enable optimization by fixing inits and access bounds 2020-07-14 16:48:06 -05:00
Seth Polsley
4191a86895 Removing recovered references to coreaudio, not needed for sdl2 builds 2020-07-13 01:25:37 -05:00
Seth Polsley
c7a7e034ed Cleaning associated xcode project files 2020-07-13 01:16:25 -05:00
Seth Polsley
2c8678417c Remove coreaudio embed from BII builds since using SDL2 audio 2020-07-12 23:34:19 -05:00
Seth Polsley
7441d04a28 Minor cleanup of bincue vars 2020-07-12 16:54:40 -05:00
Seth Polsley
3e32a6da32 Enforce only one player at a time, pause any other 2020-07-10 17:02:04 -05:00
Seth Polsley
47fca465ba Remove the one dependency on unicode for reading rom file 2020-07-07 01:05:41 -05:00
Seth Polsley
084a8fbd74 Does Win BII need Unicode? removing... no others have it and prefer to add it to both sheep and BII together 2020-07-07 00:18:18 -05:00
Seth Polsley
1775fb3776 Adding bincue flag in configure 2020-07-06 22:02:19 -05:00
Seth Polsley
80399941b2 Cleaning up build scripts with Bincue for Windows and *nix 2020-07-06 18:47:26 -05:00
Seth Polsley
30cf26e1f6 Windows bincue support 2020-07-06 00:04:08 -05:00
Seth Polsley
66a69dc79b Refactoring to handle crossplatform bincue support 2020-07-05 23:54:53 -05:00
Ricky Zhang
2595059146
Fix a minor bug for B/W palette. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-04 16:47:58 -04:00
Ricky Zhang
bae7a4d16b
Explained why the magic number used in 24bit ROM frame mapping. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-04 14:45:21 -04:00
Ricky Zhang
e63c6b91dc
Patch SDL2 palette for 24bit ROM. 
24bit ROM doesn't invoke video driver control. Therefore, a manual step
is required to add a black & white palette for guest_surface in SDL2.

Please check out [the screen cast here](https://youtu.be/br5Hjt9F6X4).

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-04 14:22:33 -04:00
Ricky Zhang
40f6c77775
Move the RAM debug message to the proper place. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-03 19:42:55 -04:00
Ricky Zhang
7e83b9c49e Fix Indentations. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-03 19:42:10 -04:00
Ricky Zhang
98f3cab953 Fix indentation. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-03 10:00:15 -04:00
Ricky Zhang
6f4da45eeb Enhanced scale up and scale down in SDL2. 
- Enable window mode to be resizable.
- When restore the window, restore the scale ratio to 1.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-07-02 18:35:18 -04:00
asvitkine
864b4a1652
Merge pull request #206 from rickyzhang82/pr-fix-framebuffer-bug 
Abort when frame buffer memory allocation fails.
 2020-07-01 21:36:25 -04:00
Ricky Zhang
bdf5a276d3
Abort when frame buffer memory allocation fails. 
- Remove unused code in vm_acquire_framebuffer function.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-30 18:25:50 -04:00
Ricky Zhang
56665d30a3
For Darwin, the default addressing mode is memory banks. 
When the host OS is Mac OS X, direct addressing in BII doesn't guarantee
that the allocated memory for frame buffer base address in the host
(FrameBaseHost) satisfies the following conditions:

- FrameBaseHost > RamBaseHost
- (FrameBaseHost - RamBaseHost) + Frame_Size < 4GiB
where RamBaseHost refers to the emulated RAM base address in the host.

This may cause the random hang problem where the allocated frame address
failed to meet the conditions above.

Because the direct addressing mapping is a simple math:

RamAddrMac = RamAddrHost - RamBaseHost.

See details: https://github.com/cebix/macemu/issues/203

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-30 18:07:25 -04:00
Ricky Zhang
18701c97df
Fix year in project 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-29 22:10:27 -04:00
Ricky Zhang
8e88e462ee
Fix code review issues. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-28 18:42:14 -04:00