Properly iterate over SDL displays and modes

Author: FrodeSolheim

.gitignore

@@ -33,7 +33,7 @@ core
 /data/
 *.dbg
 /*.deb
-/demos
+/demos/
 /depcomp
 .deps
 /desktop/
@@ -58,6 +58,7 @@ fs-uae-device-helper
 /FS-UAE.geany
 fs-uae.rc
 fs-uae-with-dat
+/games/
 *.gcda
 /gen
 genblitter

debian/changelog

@@ -2,4 +2,4 @@ fs-uae (0.0.0-0) unstable; urgency=low
 
   * Dummy changelog entry.
 
- -- Frode Solheim <[email protected]>  Sun, 10 Oct 2021 09:03:58 +00:00
+ -- Frode Solheim <[email protected]>  Sun, 10 Oct 2021 09:03:58 +0000

docs/mouse.md

@@ -9,6 +9,9 @@
 FS-UAE supports multiple mice on many platforms through the ManyMouse library
 by Ryan C. Gordon.
 
+**Note: FS-UAE 4 does not support multiple mice yet.** The rest of the this
+section applies to FS-UAE 3 only, for now.
+
 The old `Mouse` host device is still present and works like before - this
 is basically the system cursor, and most likely, all connected mice will
 affect this host device in FS-UAE.
@@ -35,9 +38,15 @@ there is less input lag with the new mouse devices.
 ## Windows
 
 Support for multiple mice seems to work just fine on Windows out of the box.
+Note that with FS-UAE on modern Windows version, all devices seem to be named
+"HID-compliant mouse" instead of the actual device name, which makes a bit
+awkward to select the desired mouse device.
 
 ## macOS
 
+**Note: Multiple mice are currently disabled on macOS**. This is due to
+annoying security warnings that I need to find a workaround for.
+
 Support for multiple mice seems to work just fine on macOS out of the box
 on older macOS versions.
 
@@ -86,13 +95,13 @@ reconnect them for the changes to work.
 To verify that it works, reconnect your mouse/mice if you haven't already
 and type:
 
-    ls -l /dev/input/mouse*
+    ls -l /dev/input/event*
 
 All files listed should now have read permissions for all users, something
 like this:
 
-    crw-r--r-- 1 root root 13, 32 aug.  20 17:30 /dev/input/mouse0
-    crw-r--r-- 1 root root 13, 33 aug.  20 17:30 /dev/input/mouse1
+    crw-rw-r-- 1 root input 13, 64 aug.  20 17:30 /dev/input/event0
+    crw-rw-r-- 1 root input 13, 65 aug.  20 17:30 /dev/input/event1
 
 If it did not work, you have to do additional steps to activate the rules.
 Perhaps a command to reinitialize udev, such as as `sudo udevstart`,

fsbuild/version.py

@@ -152,7 +152,7 @@ def update_debian_changelog(version):
                 # Only update date if version was changed
                 author, date = line.split("  ")
                 date = datetime.datetime.utcnow().strftime(
-                    "%a, %e %b %Y %H:%M:%S +00:00"
+                    "%a, %d %b %Y %H:%M:%S +0000"
                 )
                 lines.append("{}  {}\n".format(author, date))
             else:

fsemu/src/fsemu-monitor.c

@@ -158,22 +158,22 @@ void fsemu_monitor_init(void)
 
     // FIXME: Move SDL-specific code to sdlwindow module (later)
 
-    int display_index = 0;
-    while (true) {
+    int num_displays = SDL_GetNumVideoDisplays();
+    for (int i = 0; i < num_displays; i++) {
         SDL_DisplayMode mode;
-        int error = SDL_GetDesktopDisplayMode(display_index, &mode);
+        int error = SDL_GetDesktopDisplayMode(i, &mode);
         if (error) {
             break;
         }
 
         fsemu_monitor_t monitor;
-        monitor.index = display_index;
+        monitor.index = i;
         SDL_Rect rect;
-        error = SDL_GetDisplayBounds(display_index, &rect);
+        error = SDL_GetDisplayBounds(i, &rect);
         if (error) {
             fsemu_monitor_log(
                 "Error retrieving display bounds for display %d: %s\n",
-                display_index,
+                i,
                 SDL_GetError());
             monitor.rect.x = 0;
             monitor.rect.y = 0;
@@ -214,17 +214,16 @@ void fsemu_monitor_init(void)
 #endif
 
         fsemu_monitor_log("%d: %dx%d+%d+%d %d Hz Scale %0.2f\n",
-                          display_index,
+                          i,
                           monitor.rect.w,
                           monitor.rect.h,
                           monitor.rect.x,
                           monitor.rect.y,
                           monitor.refresh_rate,
                           monitor.scale);
         g_array_append_val(fsemu_monitor.list, monitor);
-        display_index += 1;
     }
-    fsemu_monitor.count = display_index;
+    fsemu_monitor.count = num_displays;
 
     g_array_sort(fsemu_monitor.list, fsemu_monitor_compare);
     for (int i = 0; i < fsemu_monitor.count; i++) {

fsemu/src/fsemu-sdlwindow.c

@@ -330,26 +330,29 @@ static SDL_HitTestResult fsemu_sdlwindow_hit_test(SDL_Window *window,
 static void fsemu_sdlwindow_find_mode(int display_index, SDL_DisplayMode *mode)
 {
     fsemu_window_log("Finding suitable mode for display %d:\n", display_index);
-    // int display_count = 0;
-    // int display_index = 0;
-    int mode_index = 0;
     SDL_DisplayMode m = {SDL_PIXELFORMAT_UNKNOWN, 0, 0, 0, 0};
-    while (true) {
-        int error = SDL_GetDisplayMode(display_index, mode_index, &m);
+    int num_display_modes = SDL_GetNumDisplayModes(display_index);
+    // Hack - Try to find an 1080p@50 and use that
+    for (int i = 0; i < num_display_modes; i++) {
+        int error = SDL_GetDisplayMode(display_index, i, &m);
         if (error) {
             break;
         }
-        // fsemu_window_log("Mode %d: %d %d %d\n",
-        //                  mode_index,
-        //                  m.w,
-        //                  m.h,
-        //                  m.refresh_rate);
-        // FIXME: FSEMU needs to now the desired refresh rate...
-        // FIXME: float vs int (refresh rate)?
         if (m.w == 1920 && m.h == 1080 && m.refresh_rate == 50) {
             *mode = m;
+            return;
+        }
+    }
+    // Hack (2) - fallback to 720p@50 if found
+    for (int i = 0; i < num_display_modes; i++) {
+        int error = SDL_GetDisplayMode(display_index, i, &m);
+        if (error) {
+            break;
+        }
+        if (m.w == 1280 && m.h == 720 && m.refresh_rate == 50) {
+            *mode = m;
+            return;
         }
-        mode_index += 1;
     }
 }