Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-28 23:49:23 +00:00
Code Issues Projects Releases Wiki Activity
3,237 Commits 5 Branches 17 Tags 21 MiB
ba89fc7a72
Commit Graph

2017 Commits

Author SHA1 Message Date
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
Ricky Zhang
1bfb0e94a3
Back out the hack from kanjitalk755 
Remove the unused header.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-27 12:13:51 -04:00
Ricky Zhang
dc8bb7e2a3
Back out the hack from kanjitalk755 
- In 8 bit color game, the hack crashed the app.
- After backing out the hack, I can play 256 color game with displaycolordepth 8.
- By default, the displaycolordepth is 0.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-25 16:56:40 -04:00
Ricky Zhang
d28599f49d
Backport MacOSX support. 
- video_sdl2 for Mac OS X requires MacOSX update.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-25 15:50:40 -04:00
Ricky Zhang
a46759990d
Backport SDL2 features from https://github.com/kanjitalk755/macemu 
By default, without providing `with-sdl2` in configure it uses SDL1.
Users need to explicitly request SDL2.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2020-06-25 15:28:41 -04:00
Ricky Zhang
b0bdceac34 Revert "Merge pull request #190 from fragglet/patch-1" 
This reverts commit a4a2c88ed7, reversing
changes made to 1918557e78.
 2020-06-25 09:43:20 -04:00
Seth Polsley
23da9e72eb Fix handling of nocdrom 2020-05-25 18:55:56 -05:00
Seth Polsley
bebeacc895 adding adb back for build, fixing automerge problem 2020-05-25 16:52:45 -05:00
Seth Polsley
8e110b063c Merge branch 'master' into cdaudio_test 2020-05-25 16:31:02 -05:00
Seth Polsley
7eb7a477d0 clang debug flag adjustment 2020-05-25 15:58:15 -05:00
kanjitalk755
a01387b1af prefs item "sdlrender" 2020-05-18 17:39:05 +09:00
kanjitalk755
a528b0a40f BII: fixed writing xpram file 2020-05-16 21:18:16 +09:00
Roland Illig
8a4b84b9d7
src/Unix/Darwin/testlmem.sh: make code shorter 
The old code used the `[[` shell keyword, which is only available in bash.
The interpreter in line 1 is `/bin/sh` though.
This confused my shell portability check in pkgsrc, since that check neither guesses the target platform from the filename, nor assumes that `/bin/sh` is actually bash, even though this may be true on macOS.

The change makes the code shorter with the well-known `${var:-default}` pattern.
Since `$1` is now only accessed when it is defined, this allows the program to have a `set -eu` at the top.
This in turn would make all the `&&` redundant since it applies automatic error checking.

The `{ ... } 1>&2` could also be replaced with a single `exec 1>&2` at the top.
 2020-05-05 19:48:35 +02:00
bolt
c6e1af7ff4 Fix compile time warning on enum compare 2020-04-09 15:07:29 +02:00
bolt
767b97311b Add the strings from commit 00f02d9d0c to user_strings.h 2020-04-09 14:50:07 +02:00
kanjitalk755
617a723a16
Merge pull request #40 from emendelson/master 
New icons; removed unused icon code
 2020-03-27 23:27:43 +09:00
emendelson
0e01e5c91e New icons; removed unused icon code 
Replace (again) the Windows and MacOS icons and remove the c-file icons and the reference to them in the source.
 2020-03-26 20:27:24 -04:00