Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-05-28 13:41:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge 7d41c2a2a9 into 4805720545

Browse Source
This commit is contained in:
Joseph Carter 2022-04-20 09:22:44 +00:00 committed by GitHub
commit 6a95803bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -17,7 +17,7 @@ gsport
*.gsp
# Storage for many disk images for testing the emulator.
# Storage for many disk images for testing the emulator.
# Games, demos, apps, etc. Not part of the project.
images/
@ -25,4 +25,5 @@ images/
screens/
# build tools that are often kept/tested locally as well as on the ci machines
build/
yoursway-create-dmg/

4
src/scc_socket_driver.c
View File

@ -332,7 +332,9 @@ void scc_socket_close(int port, int full_close, double dcycs) {
return;
}
scc_socket_modem_hangup(port, dcycs);
if(g_serial_modem[port]) {
scc_socket_modem_hangup(port, dcycs);
}
/* and go back to modem mode */
scc_ptr->socket_state = 0;

18
src/sdl2_driver.c
View File

@ -183,15 +183,15 @@ int a2_key_to_sdlkeycode[][3] = {
{ kVK_Control, SDLK_LCTRL, 0 },
{ kVK_RightControl, SDLK_RCTRL, 0 },
#if defined(__APPLE__)
{ kVK_Option, SDLK_LALT, 0 }, /* Option */
{ kVK_RightOption, SDLK_RALT, 0 }, /* Option */
{ kVK_Command, SDLK_LGUI, 0 }, /* Command */
{ kVK_RightCommand, SDLK_RGUI, 0 }, /* Command */
{ kVK_Option, SDLK_LALT, 0 }, /* Command */
{ kVK_RightOption, SDLK_RALT, 0 }, /* Command */
{ kVK_Command, SDLK_LGUI, 0 }, /* Option */
{ kVK_RightCommand, SDLK_RGUI, 0 }, /* Option */
#else
{ kVK_Option, SDLK_LGUI, 0 }, /* Command */
{ kVK_RightOption, SDLK_RGUI, 0 }, /* Command */
{ kVK_Command, SDLK_LALT, 0 }, /* Option */
{ kVK_RightCommand, SDLK_RALT, 0 }, /* Option */
{ kVK_Option, SDLK_LGUI, 0 }, /* Option */
{ kVK_RightOption, SDLK_RGUI, 0 }, /* Option */
{ kVK_Command, SDLK_LALT, 0 }, /* Command */
{ kVK_RightCommand, SDLK_RALT, 0 }, /* Command */
#endif
{ kVK_Space, SDLK_SPACE, 0 },
{ kVK_LeftArrow, SDLK_LEFT, 0 },
@ -654,7 +654,7 @@ void handle_sdl_mouse_event(SDL_Event event) {
x = event.motion.x - BASE_MARGIN_LEFT;
y = event.motion.y - BASE_MARGIN_TOP;
}
switch (event.type) {
case SDL_MOUSEMOTION:
update_mouse_w_delta(x, y, 0, 0, event.motion.xrel, event.motion.yrel);