Merge branch 'VICE-Team:main' into main

Author: LouDnl

vice/data/hotkeys/hotkeys-cartridge.vhk

@@ -6,13 +6,13 @@
 !if !MACOS
     cart-attach     <Alt>c
     cart-detach     <Alt><Shift>c
-    !if C64 || C64SC || SCPU64 || C128 || VIC20
+    !if C64 || C64SC || SCPU64 || C128 || VIC20 || PLUS4
         cart-freeze     <Alt>z
     !endif
 !else
     cart-attach     <Command>c
     cart-detach     <Command><Shift>c
-    !if C64 || C64SC || SCPU64 || C128 || VIC20
+    !if C64 || C64SC || SCPU64 || C128 || VIC20 || PLUS4
         cart-freeze     <Command>z
     !endif
 !endif

vice/doc/vice.texi

@@ -15769,6 +15769,8 @@ The following cartridge types are valid:
      2: Plus4 multi cart
 @item
      3: 1MB Cartridge
+@item
+     4: "Speedy" freezer cartridge
 @end itemize
 
 @vindex CartridgeFile
@@ -15824,6 +15826,10 @@ Attach a 128kiB/256kiB/512kiB/1MiB/2MiB "c264 magic cart" image
 Attach a 1MiB/2MiB "Plus4 multi cart" image. The binary should contain all c1lo
 banks first, then all c1hi banks.
 
+@findex -cartspeedy
+@item -cartspeedy <name>
+Attach a 8kiB "Speedy" image
+
 @end table
 
 @c @node FIXME
@@ -23917,6 +23923,8 @@ Generic 4KiB/8KiB/16KiB C2HI cartridge
 c264 magic cart
 @item multi
 Plus4 multi cart
+@item speedy
+"Speedy" freezer cart
 @end table
 
 @b{CBM2 cartridges:}
@@ -35600,6 +35608,8 @@ from starting.
 @tab Plus4 multi cart
 @item 3
 @tab 1MB Cartridge
+@item 4
+@tab "Speedy" freezer cartridge
 @end multitable
 
 For all Plus4 binary formats (non .crt) the convention is to store all banks of
@@ -35713,6 +35723,31 @@ This cartridge has one banking register at $fda0.
 
 This cartridge has one banking register at $fe00.
 
+@c @node FIXME
+@subsubsection 4 - Speedy
+
+@multitable @columnfractions .3 .7
+@item Size
+@tab 8KiB
+@item Load address
+@tab $8000-$BFFF (mirrored twice) (C1LO)
+@end multitable
+
+@example
+        00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F       ASCII
+        -----------------------------------------------  ----------------
+  0000: 50 4c 55 53 34 20 43 41 52 54 52 49 44 47 45 20  PLUS4 CARTRIDGE
+  0010: 00 00 00 40 02 00 00 04 00 00 00 00 00 00 00 00  ...@............
+  0020: 53 70 65 65 64 79 00 00 00 00 00 00 00 00 00 00  Speedy..........
+  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0040: 43 48 49 50 00 00 20 10 00 00 00 00 80 00 20 00  CHIP.. ....... .
+  0050: 4c 0a 80 42 4f 50 02 43 42 4d a2 00 bd 26 80 9d  L..BOP.CBM...&..
+@dots{}
+  2030: 20 20 20 20 20 20 20 20 00 84 00 a4 00 06 00 ef  ................
+  2040: 12 ff fd ff fd ff ff ff ff ff df ff ff ff ff ff  ................
+@end example
+
+
 @c @node FIXME
 @subsection CBM2 Cartridge Specifics
 

vice/src/arch/gtk3/uimachinemenu.c

@@ -387,7 +387,7 @@ static const ui_menu_item_t file_menu_tape_xpet[] = {
 /* {{{ file_menu_cart_freeze */
 /** \brief  'File' menu - cartridge section for C64/C128
  *
- * VIC20, C64, SCPU64 and C128, containing "Cartridge freeze".
+ * C64, SCPU64, C128, VIC20 and Plus4 containing "Cartridge freeze".
  */
 static const ui_menu_item_t file_menu_cart_freeze[] = {
     {   .label    = "Attach cartridge image...",
@@ -411,7 +411,7 @@ static const ui_menu_item_t file_menu_cart_freeze[] = {
 /* {{{ file_menu_cart_no_freeze */
 /** \brief  'File' menu - cartridge section for Plus/4, VIC-20 and CBM-II
  *
- * Plus/4, VIC-20, CBM-II, not containing "Cartridge freeze".
+ * CBM-II, not containing "Cartridge freeze".
  */
 static const ui_menu_item_t file_menu_cart_no_freeze[] = {
     {   .label    = "Attach cartridge image...",
@@ -1074,11 +1074,14 @@ GtkWidget *ui_machine_menu_bar_create(gint window_id)
             break;
 
         case VICE_MACHINE_C64DTV:
+            /* no cart section */
+            /* no tape section */
             file_menu_printer_section = file_menu_printer_no_userport;
             settings_menu_joy_section = settings_menu_joy_swap;
             break;
 
         case VICE_MACHINE_SCPU64:
+            /* no tape section */
             file_menu_cart_section    = file_menu_cart_freeze;
             file_menu_printer_section = file_menu_printer;
             settings_menu_joy_section = settings_menu_joy_swap;
@@ -1099,7 +1102,7 @@ GtkWidget *ui_machine_menu_bar_create(gint window_id)
 
         case VICE_MACHINE_PLUS4:
             file_menu_tape_section    = file_menu_tape;
-            file_menu_cart_section    = file_menu_cart_no_freeze;
+            file_menu_cart_section    = file_menu_cart_freeze;
             file_menu_printer_section = file_menu_printer_no_userport;
             settings_menu_joy_section = settings_menu_joy_swap;
             break;
@@ -1119,6 +1122,7 @@ GtkWidget *ui_machine_menu_bar_create(gint window_id)
 
         case VICE_MACHINE_PET:
             file_menu_tape_section    = file_menu_tape_xpet;
+            /* no cart section */
             file_menu_printer_section = file_menu_printer;
             break;
 

vice/src/arch/gtk3/uimachinewindow.c

@@ -50,6 +50,7 @@
 
 #ifdef WINDOWS_COMPILE
 #include "directx_renderer.h"
+#include "directx_renderer_impl.h"
 #else
 #include "opengl_renderer.h"
 #endif
@@ -294,6 +295,7 @@ static gboolean event_box_motion_cb(GtkWidget *widget,
 
 #elif defined(WINDOWS_COMPILE)
 
+        /* scale is a uniform scaling applied to eg high dpi widgets by gtk */
         int scale = gtk_widget_get_scale_factor(widget);
         POINT pt;
         /* mouse_host_moved(motion->x_root * scale, motion->y_root * scale); */
@@ -308,6 +310,7 @@ static gboolean event_box_motion_cb(GtkWidget *widget,
 
 #else /* Xlib, warp is relative to window */
 
+        /* scale is a uniform scaling applied to eg high dpi widgets by gtk */
         int scale = gtk_widget_get_scale_factor(widget);
         mouse_host_moved(
             (widget_x + motion->x) * scale,
@@ -322,8 +325,35 @@ static gboolean event_box_motion_cb(GtkWidget *widget,
     /*
      * Mouse isn't captured, so we update the pen position.
      */
-
+#if 0
+    /* FIXME: this value is wrong in (at least) xvic, it is always the full
+              width of produced video, not just the width of the shown window */
     double render_w = canvas->geometry->screen_size.width;
+#else
+    /* get width from render context instead */
+#ifdef WINDOWS_COMPILE
+    vice_directx_renderer_context_t *context = (vice_directx_renderer_context_t *)canvas->renderer_context;
+    double render_w = context->bitmap_width;
+    if (canvas->videoconfig->double_size_enabled) {
+        render_w /= 2.0f;
+    }
+#else
+    vice_opengl_renderer_context_t *context = (vice_opengl_renderer_context_t *)canvas->renderer_context;
+    double render_w = context->current_frame_width;
+    if (canvas->videoconfig->double_size_enabled) {
+        render_w /= 2.0f;
+    }
+#endif
+    /* sanity check */
+    if (render_w != canvas->geometry->screen_size.width) {
+        static int once = 0;
+        if (!once) {
+            log_warning(LOG_DEFAULT, "geometry->screen_size.width (%u) does not match actual rendered width (%f)",
+                        canvas->geometry->screen_size.width, render_w);
+            once++;
+        }
+    }
+#endif
     double render_h = canvas->geometry->last_displayed_line - canvas->geometry->first_displayed_line + 1;
 
     /* There might be some sweet off-by-0.5 bugs here */
@@ -370,10 +400,10 @@ static gboolean event_box_mouse_button_cb(GtkWidget *widget, GdkEvent *event, gp
         pthread_mutex_lock(&canvas->lock);
         if (button == 1) {
             /* Left mouse button */
-            canvas->pen_buttons |= LP_HOST_BUTTON_1;
+            canvas->pen_buttons |= LP_HOST_BUTTON_LEFT;
         } else if (button == 3) {
             /* Right mouse button */
-            canvas->pen_buttons |= LP_HOST_BUTTON_2;
+            canvas->pen_buttons |= LP_HOST_BUTTON_RIGHT;
         }
         pthread_mutex_unlock(&canvas->lock);
 
@@ -387,10 +417,10 @@ static gboolean event_box_mouse_button_cb(GtkWidget *widget, GdkEvent *event, gp
         pthread_mutex_lock(&canvas->lock);
         if (button == 1) {
             /* Left mouse button */
-            canvas->pen_buttons &= ~LP_HOST_BUTTON_1;
+            canvas->pen_buttons &= ~LP_HOST_BUTTON_LEFT;
         } else if (button == 3) {
             /* Right mouse button */
-            canvas->pen_buttons &= ~LP_HOST_BUTTON_2;
+            canvas->pen_buttons &= ~LP_HOST_BUTTON_RIGHT;
         }
         pthread_mutex_unlock(&canvas->lock);
 

vice/src/arch/sdl/actions-cartridge.c

@@ -164,6 +164,10 @@ static const ui_action_map_t cartridge_actions_plus4[] = {
         .handler = sdl_ui_activate_item_action,
         .dialog  = true
     },
+    {   .action  = ACTION_CART_ATTACH_RAW_SPEEDY,
+        .handler = sdl_ui_activate_item_action,
+        .dialog  = true
+    },
     {   .action  = ACTION_CART_ATTACH_RAW_C1_FULL,
         .handler = sdl_ui_activate_item_action,
         .dialog  = true
@@ -191,6 +195,9 @@ static const ui_action_map_t cartridge_actions_plus4[] = {
     {   .action  = ACTION_CART_DETACH,
         .handler = cart_detach_action
     },
+    {   .action  = ACTION_CART_FREEZE,
+        .handler = cart_freeze_action
+    },
     UI_ACTION_MAP_TERMINATOR
 };
 

vice/src/arch/sdl/lightpendrv.c

@@ -32,8 +32,17 @@
 #include "machine.h"
 #include "lightpen.h"
 #include "lightpendrv.h"
+#include "log.h"
 #include "videoarch.h"
 
+/* #define DEBUG_LIGHTPEN */
+
+#ifdef DEBUG_LIGHTPEN
+#define DBG(x) log_printf x
+#else
+#define DBG(x)
+#endif
+
 /* ------------------------------------------------------------------ */
 /* External interface */
 
@@ -51,9 +60,7 @@ void sdl_lightpen_update(void)
         buttons = 0;
     }
 
-#ifdef SDL_DEBUG
-    fprintf(stderr, "%s : x = %i, y = %i, buttons = %02x\n", __func__, x, y, buttons);
-#endif
+    DBG(("%s : x = %i, y = %i, buttons = %02x", __func__, x, y, buttons));
 
     screen_num = sdl_active_canvas_num;
 

vice/src/arch/sdl/menu_plus4cart.c

@@ -73,6 +73,9 @@ static UI_MENU_CALLBACK(attach_cart_callback)
             case CARTRIDGE_PLUS4_JACINT1MB:
                 action = ACTION_CART_ATTACH_RAW_JACINT1MB;
                 break;
+            case CARTRIDGE_PLUS4_SPEEDY:
+                action = ACTION_CART_ATTACH_RAW_SPEEDY;
+                break;
             case CARTRIDGE_PLUS4_GENERIC_C1:
                 action = ACTION_CART_ATTACH_RAW_C1_FULL;
                 break;
@@ -170,6 +173,12 @@ const ui_menu_entry_t plus4cart_menu[] = {
         .callback = attach_cart_callback,
         .data     = (ui_callback_data_t)CARTRIDGE_PLUS4_JACINT1MB
     },
+    {   .action   = ACTION_CART_ATTACH_RAW_SPEEDY,
+        .string   = "Attach raw " CARTRIDGE_PLUS4_NAME_SPEEDY " image",
+        .type     = MENU_ENTRY_DIALOG,
+        .callback = attach_cart_callback,
+        .data     = (ui_callback_data_t)CARTRIDGE_PLUS4_SPEEDY
+    },
     SDL_MENU_ITEM_SEPARATOR,
 
     {   .action   = ACTION_CART_ATTACH_RAW_C1_FULL,

vice/src/arch/shared/uiactions.c

@@ -212,7 +212,7 @@ static const ui_action_info_private_t action_info_list[] = {
     { ACTION_CART_ATTACH_RAW_C2_HIGH,   "cart-attach-raw-c2-high",  "Attach high C2 cartridge image",       VICE_MACHINE_PLUS4 },
     { ACTION_CART_DETACH,               "cart-detach",              "Detach cartridge",                     (VICE_MACHINE_C64|VICE_MACHINE_C64SC|VICE_MACHINE_SCPU64|VICE_MACHINE_C128|
                                                                                                              VICE_MACHINE_VIC20|VICE_MACHINE_PLUS4|VICE_MACHINE_CBM6x0) },
-    { ACTION_CART_FREEZE,               "cart-freeze",              "Press cartridge freeze button",        (VICE_MACHINE_C64|VICE_MACHINE_C64SC|VICE_MACHINE_SCPU64|VICE_MACHINE_C128|VICE_MACHINE_VIC20) },
+    { ACTION_CART_FREEZE,               "cart-freeze",              "Press cartridge freeze button",        (VICE_MACHINE_C64|VICE_MACHINE_C64SC|VICE_MACHINE_SCPU64|VICE_MACHINE_C128|VICE_MACHINE_VIC20|VICE_MACHINE_PLUS4) },
     { ACTION_CART_DETACH_1000,          "cart-detach-1000",         "Detach cartridge image at $1000",      VICE_MACHINE_CBM6x0 },
     { ACTION_CART_DETACH_2000,          "cart-detach-2000",         "Detach cartridge image at $2000",      VICE_MACHINE_CBM6x0 },
     { ACTION_CART_DETACH_4000,          "cart-detach-4000",         "Detach cartridge image at $4000",      VICE_MACHINE_CBM6x0 },

vice/src/arch/shared/uiactions.h

@@ -127,6 +127,7 @@ enum {
     ACTION_CART_ATTACH_RAW_JACINT1MB,   /* Plus/4 */
     ACTION_CART_ATTACH_RAW_MAGIC,       /* Plus/4 */
     ACTION_CART_ATTACH_RAW_MULTI,       /* Plus/4 */
+    ACTION_CART_ATTACH_RAW_SPEEDY,      /* Plus/4 */
     ACTION_CART_ATTACH_RAW_C1_FULL,     /* Plus/4 */
     ACTION_CART_ATTACH_RAW_C1_LOW,      /* Plus/4 */
     ACTION_CART_ATTACH_RAW_C1_HIGH,     /* Plus/4 */

vice/src/c64/c64mem.h

@@ -82,6 +82,7 @@ int c64_mem_ui_init(void);
 void c64_mem_ui_shutdown(void);
 
 uint8_t vsid_io_read(uint16_t addr);
+uint8_t vsid_io_peek(uint16_t addr);
 void vsid_io_store(uint16_t addr, uint8_t val);
 
 #endif