Do not force INDISPLAYCHAIN if monitor id is non-zero. Set default res to 640x480.

diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp
index aa2e4e54cc9bd05f10d11e6de331fb2ca5e2f8ad..439fe2370cc210493f7c2472d0cc41b7eb90a266 100644 (file)
--- a/od-win32/picasso96_win.cpp
+++ b/od-win32/picasso96_win.cpp
@@ -1673,8 +1673,13 @@ static uae_u32 REGPARAM2 picasso_SetSpritePosition (TrapContext *ctx)
        struct picasso_vidbuf_description *vidinfo = &picasso_vidinfo[monid];
        uaecptr bi = trap_get_areg(ctx, 0);
        boardinfo = bi;
+#if 1
+       int x = (uae_s16)trap_get_word(ctx, bi + PSSO_BoardInfo_MouseX) - state->XOffset;
+       int y = (uae_s16)trap_get_word(ctx, bi + PSSO_BoardInfo_MouseY) - state->YOffset;
+#else
        int x = (uae_s16)trap_get_dreg(ctx, 0) - state->XOffset;
        int y = (uae_s16)trap_get_dreg(ctx, 1) - state->YOffset;
+#endif
        if (vidinfo->splitypos >= 0) {
                y += vidinfo->splitypos;
        }
@@ -2620,9 +2625,12 @@ static void inituaegfx(TrapContext *ctx, uaecptr ABI)
        }
        if (currprefs.rtg_hardwareinterrupt && !uaegfx_old)
                flags |= BIF_VBLANKINTERRUPT;
+       // force INDISPLAYCHAIN if no multiple monitors emulated
        if (!(flags & BIF_INDISPLAYCHAIN)) {
-               write_log (_T("P96: BIF_INDISPLAYCHAIN force-enabled!\n"));
-               flags |= BIF_INDISPLAYCHAIN;
+               if (currprefs.rtgboards[0].monitor_id == 0) {
+                       write_log(_T("P96: BIF_INDISPLAYCHAIN force-enabled!\n"));
+                       flags |= BIF_INDISPLAYCHAIN;
+               }
        }
 #if OVERLAY
        flags |= BIF_VIDEOWINDOW;
@@ -5524,6 +5532,8 @@ void InitPicasso96(int monid)
        oldscr = 0;
        //fastscreen
        memset (state, 0, sizeof (struct picasso96_state_struct));
+       state->Width = 640;
+       state->Height = 480;
 
        for (i = 0; i < 256; i++) {
                p2ctab[i][0] = (((i & 128) ? 0x01000000 : 0)