Merge pull request #30 from domq/feature/disable-right-click-emulation

laanwj · Nov 20, 2023 · 968f486 · 968f486
2 parents 37d60d3 + c138696
commit 968f486
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -130,6 +130,10 @@ found there, the game will fail to start.
 Other options can be provided:
 
 - `--fullscreen`: Make window initially fullscreen.
+- `--right-click-emulation`: Dedicate the top right corner of the screen
+   to right-click emulation (e.g. for tablets)
+- `--no-right-click-emulation`: Disable right-click emulation in the top right
+  corner
 - `--renderer <renderer>`: Set renderer to use:
   - `basic` is the default, which applies straightforward nearest pixel filtering
     to scale the image.
@@ -178,6 +182,8 @@ Status
 - Sound effects.
 - Touch screen support: a small area in the top-right of the screen has been
   designated as "cancel area" and will emulate a right-mouse click when touched.
+  This can be disabled by passing `--no-right-click-emulation` on the command
+  line.
 
 Is it fully playable? Yes, I played it for quite a bit. All the critical things
 have been implemented, Though I cannot guarantee that there aren't any bugs

diff --git a/src/sundog.c b/src/sundog.c
@@ -475,7 +475,7 @@ static void update_mouse_state(struct game_state *gs)
     /* Emulate right click action when clicking (or touching) in top right,
        to accomodate single mouse button devices.
       */
-    if ((buttons == 1) && x >= (320 - CANCEL_AREA_W) && y < CANCEL_AREA_H) {
+    if ((gs->has_right_click_emulation) && (buttons == 1) && x >= (320 - CANCEL_AREA_W) && y < CANCEL_AREA_H) {
         buttons = 2;
     }
     game_sdlscreen_update_mouse(gs->screen, x, y, buttons);
@@ -710,6 +710,19 @@ int main(int argc, char **argv)
     bool print_usage                          = false;
     bool fullscreen                           = false;
 
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_IPHONE) && (!defined(TARGET_OS_MACCATALYST)) && (!defined(TARGET_OS_SIMULATOR))
+    gs->has_right_click_emulation = true;
+#else
+    gs->has_right_click_emulation = false;
+#endif
+#elif __ANDROID__
+    gs->has_right_click_emulation = true;
+#else
+    gs->has_right_click_emulation = false;
+#endif
+
     /** Command-line argument parsing. */
     for (int argidx = 1; argidx < argc; ++argidx) {
         const char *arg = argv[argidx];
@@ -738,6 +751,10 @@ int main(int argc, char **argv)
                     print_usage = true;
                     break;
                 }
+            } else if (strcmp(arg, "--right-click-emulation") == 0) {
+                gs->has_right_click_emulation = true;
+            } else if (strcmp(arg, "--no-right-click-emulation") == 0) {
+                gs->has_right_click_emulation = false;
             } else {
                 fprintf(stderr, "Unknown argument: %s\n", arg);
                 print_usage = true;
@@ -765,14 +782,17 @@ int main(int argc, char **argv)
         }
     }
 #else
-    image_name = "game/sundog.st";
+    image_name                    = "game/sundog.st";
 #endif
     if (print_usage) {
         fprintf(stderr, "Usage: %s [--renderer (basic|hq4x|hqish)] [<image.st>]\n", argv[0]);
         fprintf(stderr, "\n");
-        fprintf(stderr, "      --fullscreen Make window initially fullscreen.\n");
-        fprintf(stderr, "      --renderer   Set renderer to use (\"basic\" or \"hq4x\" or \"hqish\"), default is \"basic\". Renderers other than \"basic\" require OpenGL ES 3.\n");
-        fprintf(stderr, "      --help       Display this help and exit.\n");
+        fprintf(stderr, "      --fullscreen                 Make window initially fullscreen.\n");
+        fprintf(stderr, "      --renderer                   Set renderer to use (\"basic\" or \"hq4x\" or \"hqish\"), default is \"basic\". Renderers other than \"basic\" require OpenGL ES 3.\n");
+        fprintf(stderr, "      --right-click-emulation      Dedicate the top right corner of the screen to right-click emulation (e.g. for tablets)\n");
+        fprintf(stderr, "      --no-right-click-emulation   Disable right-click emulation in the top right corner\n");
+
+        fprintf(stderr, "      --help                       Display this help and exit.\n");
         fprintf(stderr, "\n");
         fprintf(stderr, "For copyright reasons this game does not come with the resources nor game code.\n");
         fprintf(stderr, "It requires the user to provide the 360K `.st` raw disk image of the game to run.\n");
@@ -795,8 +815,7 @@ int main(int argc, char **argv)
 
     gs->window = SDL_CreateWindow("SunDog: Frozen Legacy",
         SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 320 * 4, 200 * 4,
-        SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI |
-                                  (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0));
+        SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0));
     if (!gs->window) {
         psys_panic("Unable to create window: %s\n", SDL_GetError());
     }

diff --git a/src/sundog.h b/src/sundog.h
@@ -37,6 +37,10 @@ struct game_state {
     unsigned time_offset;
     uint32_t saved_time;
 
+    /** Whether clicking in the top right corner acts as right mouse button
+     * (e.g. for tablets). */
+    bool has_right_click_emulation;
+
     /** Current renderer object. */
     struct game_renderer *renderer;
     /** Viewport bounds {xbase, ybase, width, height} for mouse purposes. */