Skip to content

Fix serial socket, minor cleanups #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knghtbrd wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix serial socket, minor cleanups #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92ff3fa
Socket driver isn't modem
knghtbrd Apr 19, 2022
d0eaf0a
Add build/ to .gitignore
knghtbrd Apr 19, 2022
2c2835b
Fix reversed key comments
knghtbrd Apr 19, 2022
7d41c2a
Try to match other branch
knghtbrd Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ 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/

# Screenshot dir
screens/

# build tools that are often kept/tested locally as well as on the ci machines
build/
yoursway-create-dmg/
4 changes: 3 additions & 1 deletion src/scc_socket_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions src/sdl2_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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);
Expand Down