From 92ff3fa2917ab692efd0e623160d5999be8e3d73 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 19 Apr 2022 10:00:32 -0700 Subject: [PATCH 1/4] Socket driver isn't modem The socket driver erroneously acts like a modem on disconnect unconditionally, even when told not to. Correct that (fixes digarok/gsplus#118) --- src/scc_socket_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scc_socket_driver.c b/src/scc_socket_driver.c index db92142..a7d47b7 100644 --- a/src/scc_socket_driver.c +++ b/src/scc_socket_driver.c @@ -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; From d0eaf0aa86c80bcc1d74186cea1bc6ab7fbd0d0e Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 19 Apr 2022 14:16:54 -0700 Subject: [PATCH 2/4] Add build/ to .gitignore The move to CMake should probably greatly change the contents of .gitignore, but for the time being let's add build to the mix. --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d52c73c..7c8127f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ ROM ROM1 ROM3 +# CMake build directory +build + + # THESE ARE GENERATED BY PERL DURING MAKE src/16inst_c.h src/8inst_c.h @@ -17,7 +21,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/ From 2c2835b57dc6e85912f7acecc717d7ad6ac575e1 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 19 Apr 2022 15:34:17 -0700 Subject: [PATCH 3/4] Fix reversed key comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The comments for Command/Option were reversed for PC and Mac standards. Fixed that. Ideally one ought to be able to configure modifier keys more flexibly and these would be merely the platform defaults, but … that's a job for another time. --- src/sdl2_driver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/sdl2_driver.c b/src/sdl2_driver.c index e56f6f0..4ef43c4 100644 --- a/src/sdl2_driver.c +++ b/src/sdl2_driver.c @@ -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); From 7d41c2a2a99d559e221771f40e53236202a971f6 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Wed, 20 Apr 2022 02:19:44 -0700 Subject: [PATCH 4/4] Try to match other branch Looks like digarok has most recently worked on another branch which has the .gitignore change in a different spot in the tree. Match that here. --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7c8127f..6054d53 100644 --- a/.gitignore +++ b/.gitignore @@ -5,10 +5,6 @@ ROM ROM1 ROM3 -# CMake build directory -build - - # THESE ARE GENERATED BY PERL DURING MAKE src/16inst_c.h src/8inst_c.h @@ -29,4 +25,5 @@ images/ screens/ # build tools that are often kept/tested locally as well as on the ci machines +build/ yoursway-create-dmg/