2710b4

diff --git a/custom.cpp b/custom.cpp
index 652985f450c7b60823afbd850fd39c97dd59fbf2..1790b39585bed4056ff9dd43f3d553fccbcf600a 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -257,8 +257,7 @@ int sprite_buffer_res;
 uae_u8 cycle_line[256];
 #endif
 
-static uae_u16 bplxdat[8];
-static bool bpl1dat_written, bpl1dat_early, bpl1dat_written_at_least_once;
+static bool bpl1dat_written, bpl1dat_written_at_least_once;
 static bool bpldmawasactive;
 static uae_s16 bpl1mod, bpl2mod, dbpl1mod, dbpl2mod;
 static int dbpl1mod_on, dbpl2mod_on;
@@ -266,6 +265,7 @@ static uaecptr prevbpl[2][MAXVPOS][8];
 static uaecptr bplpt[8], bplptx[8];
 static uaecptr dbplptl[8], dbplpth[8];
 static int dbplptl_on[8], dbplpth_on[8], dbplptl_on2, dbplpth_on2;
+static int bitplane_line_crossing;
 
 /*static int blitcount[256];  blitter debug */
 
@@ -909,7 +909,7 @@ static void estimate_last_fetch_cycle (int hpos)
 static uae_u32 outword[MAX_PLANES];
 static int out_nbits, out_offs;
 static uae_u16 todisplay[MAX_PLANES], todisplay2[MAX_PLANES];
-static uae_u32 fetched[MAX_PLANES];
+static uae_u16 fetched[MAX_PLANES];
 static bool todisplay_fetched[2];
 #ifdef AGA
 static uae_u64 todisplay_aga[MAX_PLANES], todisplay2_aga[MAX_PLANES];
@@ -920,7 +920,7 @@ static uae_u64 fetched_aga[MAX_PLANES];
 static int toscr_res, toscr_res2p;
 static int toscr_nr_planes, toscr_nr_planes2, toscr_nr_planes_agnus, fetchwidth;
 static int toscr_delay[2], toscr_delay_adjusted[2];
-static int delay_cycles;
+static int delay_cycles, delay_lastcycle;
 static bool bplcon1_written;
 
 /* The number of bits left from the last fetched words.
@@ -1069,6 +1069,7 @@ static void setup_fmodes (int hpos)
        fetchmode_size = 16 << fetchmode;
        fetchmode_bytes = 2 << fetchmode;
        fetchmode_mask = fetchmode_size - 1;
+       delay_lastcycle = (maxhpos * 2) << bplcon0_res;
        compute_toscr_delay (bplcon1);
 
        if (thisline_decision.plfleft < 0) {
@@ -1186,38 +1187,42 @@ STATIC_INLINE void maybe_first_bpl1dat (int hpos)
                thisline_decision.plfleft = hpos;
 }
 
-// emulate weird shifting glitch on right border if
-// bitplane is lores max overscan and bitplane delay >= 8
-// not fully understood yet.
-static void do_right_ddf_hack (int nr, int hpos)
+static void fetch_warn (int nr, int hpos)
 {
-       int shift;
-       
-       if (GET_RES_AGNUS (bplcon0) != RES_LORES)
-               return;
-       if (hpos < 0xd8)
-               return;
-       shift = toscr_delay[nr & 1];
-       if (shift < 8)
-               return;
-       fetched[nr] >>= 6;
+       static int warned = 30;
+       if (hpos == maxhpos - 1) {
+               if (warned >= 0)
+                       write_log (_T("WARNING: BPL fetch conflicts with strobe refresh slot!\n"));
+       } else {
+               if (warned >= 0)
+                       write_log (_T("WARNING: BPL fetch at hpos 0x%02X!\n"), hpos);
+       }
+       bitplane_line_crossing = hpos;
+       warned--;
+#if 0
+       ddf_change = vpos;
+       corrupt_offset = (vpos ^ (timeframes << 12)) & 0xff00;
+       for (int i = 0; i < bplcon0_planes_limit; i++) {
+               uae_u16 v;
+               v = bplpt[i] & 0xffff;
+               v += corrupt_offset;
+               bplpt[i] = (bplpt[i] & 0xffff0000) | v;
+       }
+#endif
 }
 
 STATIC_INLINE void fetch (int nr, int fm, int hpos)
 {
        if (nr < bplcon0_planes_limit) {
-               uaecptr p = bplpt[nr];
+               uaecptr p;
+
+               if (hpos > maxhpos - HPOS_SHIFT && !(beamcon0 & 0x80))
+                       fetch_warn (nr, hpos);
+
+               p = bplpt[nr];
                bplpt[nr] += fetchmode_bytes;
                bplptx[nr] += fetchmode_bytes;
 
-               if (hpos >= 0xe1 && !(beamcon0 & 0x80)) {
-                       static int warned = 30;
-                       if (warned > 0) {
-                               write_log (_T("WARNING: BPL fetch at hpos 0x%02X!\n"), hpos);
-                               warned--;
-                       }
-               }
-
                if (dbplpth_on2)
                        reset_dbplh (nr, hpos);
 
@@ -1232,34 +1237,22 @@ STATIC_INLINE void fetch (int nr, int fm, int hpos)
                {
                case 0:
                        fetched[nr] = chipmem_wget_indirect (p);
-                       bplxdat[nr] = fetched[nr];
-                       last_custom_value1 = bplxdat[nr];
+                       last_custom_value1 = fetched[nr];
                        break;
 #ifdef AGA
                case 1:
                        fetched_aga[nr] = chipmem_lget_indirect (p);
-                       bplxdat[nr] = (uae_u16)fetched_aga[nr];
-                       last_custom_value1 = (uae_u16)fetched_aga[nr];
+                       last_custom_value1 = fetched[nr] = (uae_u16)fetched_aga[nr];
                        break;
                case 2:
                        fetched_aga[nr] = ((uae_u64)chipmem_lget_indirect (p)) << 32;
                        fetched_aga[nr] |= chipmem_lget_indirect (p + 4);
-                       bplxdat[nr] = (uae_u16)fetched_aga[nr];
-                       last_custom_value1 = (uae_u16)fetched_aga[nr];
+                       last_custom_value1 = fetched[nr] = (uae_u16)fetched_aga[nr];
                        break;
 #endif
                }
-               if (plf_state == plf_passed_stop2 && fetch_cycle >= (fetch_cycle & ~fetchunit_mask) + fetch_modulo_cycle) {
+               if (plf_state == plf_passed_stop2 && fetch_cycle >= (fetch_cycle & ~fetchunit_mask) + fetch_modulo_cycle)
                        add_modulo (hpos, nr);
-
-                       if ((currprefs.cs_hacks & 2) || 0)
-                               do_right_ddf_hack (nr, hpos);
-               }
-       } else {
-               // use whatever left in BPLxDAT if no DMA
-               // normally useless but "7-planes" feature won't work without this
-               fetched_aga[nr] = bplxdat[nr];
-               fetched[nr] = bplxdat[nr];
        }
 }
 
@@ -1342,8 +1335,14 @@ STATIC_INLINE void do_delays_3_ecs (int nbits)
                int delay = toscr_delay[oddeven];
 #if 0
                for (int j = 0; j < nbits; j++) {
+                       int dp = (delay_cycles + j);
+                       if (dp >= (maxhpos * 2) << toscr_res)
+                               dp -= (maxhpos * 2) << toscr_res;
+                       dp &= fetchmode_mask;
                        do_tosrc (oddeven, 2, 1, 0);
-                       if (todisplay_fetched[oddeven] && ((delaypos + j) & delay_mask) == delay) {
+                       
+
+                       if (todisplay_fetched[oddeven] && dp == delay) {
                                for (int i = oddeven; i < MAX_PLANES; i += 2) {
                                        todisplay2[i] = todisplay[i];
                                }
@@ -1448,7 +1447,7 @@ static void do_delays_fast_2_2 (int nbits) { do_delays_fast_3_aga (nbits, 2); }
 #endif
 
 
-// slower version, odd and even delays are different
+// slower version, odd and even delays are different or crosses maxhpos
 STATIC_INLINE void do_delays (int nbits, int fm)
 {
        switch (fm) {
@@ -1486,10 +1485,24 @@ STATIC_INLINE void do_delays_fast (int nbits, int fm)
 
 STATIC_INLINE void toscr_1 (int nbits, int fm)
 {
-       if (toscr_delay[0] == toscr_delay[1])
+       if (delay_cycles + nbits >= delay_lastcycle) {
+               // Emulate hpos counter (delay_cycles) reseting at the end of scanline.
+               // It can cause glitch in far right overscan.
+               int diff = delay_lastcycle - delay_cycles;
+               int nbits2 = nbits;
+               if (nbits2 >= diff) {
+                       do_delays (diff, fm);
+                       nbits2 -= diff;
+                       delay_cycles = 0;
+               }
+               if (nbits2)
+                       do_delays (nbits2, fm);
+       } else if (toscr_delay[0] == toscr_delay[1]) {
+               // Most common case.
                do_delays_fast (nbits, fm);
-       else
+       } else {
                do_delays (nbits, fm);
+       }
 
        out_nbits += nbits;
        delay_cycles += nbits;
@@ -1574,13 +1587,6 @@ static int flush_plane_data (int fm)
                toscr_1 (16, fm);
        }
 
-       if (bpl1dat_early) {
-               // clear possible crap in right border if
-               // bpl1dat was written "out of sync"
-               toscr_1 (16, fm);
-               toscr_1 (16, fm);
-       }
-
        memset (todisplay2, 0, sizeof todisplay2);
        if (fm)
                memset (todisplay2_aga, 0, sizeof todisplay2_aga);
@@ -1706,7 +1712,7 @@ STATIC_INLINE void long_fetch_16 (int plane, int nwords, int weird_number_of_bit
                        real_pt++;
                }
        }
-       bplxdat[plane] = fetched[plane] = fetchval;
+       fetched[plane] = fetchval;
        todisplay2[plane] = shiftbuffer >> delay;
        outword[plane] = outval;
 }
@@ -1775,7 +1781,6 @@ STATIC_INLINE void long_fetch_32 (int plane, int nwords, int weird_number_of_bit
 
        }
        fetched_aga[plane] = fetchval;
-       bplxdat[plane] = fetchval;
        todisplay2_aga[plane] = (shiftbuffer >> delay) & 0xffffffff;
        outword[plane] = outval;
 }
@@ -1956,12 +1961,12 @@ static void finish_last_fetch (int pos, int fm)
                return;
        plf_state = plf_end;
 
-       pos += flush_plane_data (fm);
+       flush_display (fm);
+       // This may not be the last fetch, store current endpos for future use.
+       // There is at least one demo that has two DDFSTRT-DDFSTOP horizontal sections.
        thisline_decision.plfright = pos;
-       thisline_decision.plflinelen = out_offs;
 
        if (currprefs.chipset_mask & CSMASK_ECS_AGNUS) {
-               bpl1dat_early = true;
                ddfstate = DIW_waiting_start;
                fetch_state = fetch_not_started;
        }
@@ -1975,7 +1980,7 @@ static void maybe_finish_last_fetch (int pos, int fm)
        static int warned = 20;
        bool done = false;
 
-       if (plf_state != plf_passed_stop2 || fetch_state != fetch_started || fetch_state != fetch_started_first || !dmaen (DMA_BITPLANE)) {
+       if (plf_state != plf_passed_stop2 || (fetch_state != fetch_started && fetch_state != fetch_started_first) || !dmaen (DMA_BITPLANE)) {
                finish_last_fetch (pos, fm);
                return;
        }
@@ -2023,6 +2028,7 @@ static void maybe_finish_last_fetch (int pos, int fm)
                if (toscr_nbits == 16)
                        flush_display (fm);
                done = true;
+               bitplane_line_crossing = pos;
        } while ((fetch_cycle & fetchunit_mask) != 0);
 
        if (done && warned > 0) {
@@ -2044,6 +2050,10 @@ static void finish_final_fetch (void)
                        return;
        }
        plf_state = plf_finished;
+       // This is really the end of scanline, we can finally flush all remaining data.
+       thisline_decision.plfright += flush_plane_data (fetchmode);
+       thisline_decision.plflinelen = out_offs;
+
        finish_playfield_line ();
 }
 
@@ -2388,13 +2398,21 @@ static void start_bpl_dma (int hpos, int hstart)
 
        } else {
                
+               flush_display (fetchmode);
+               // Calculate difference between last end to new start
+               int diff = (hstart - thisline_decision.plfright) << (1 + toscr_res);
+               // Render all missing pixels, use toscr because previous data may
+               // still be in buffers.
+               while (diff >= 16) {
+                       toscr_1 (16, fetchmode);
+                       diff -= 16;
+               }
+               if (diff)
+                       toscr_1 (diff, fetchmode);
+
+               cycle_diagram_shift = hstart;
                update_denise (last_fetch_hpos);
                update_fetch_x (hstart, fetchmode);
-               cycle_diagram_shift = hstart;
-               // this is a hack, something weird happens without this
-               // (Subtle Shades)
-               thisline_decision.plfright++;
-               thisline_decision.plflinelen = ++out_offs;
        }
 
        last_fetch_hpos = hstart;
@@ -2485,7 +2503,7 @@ STATIC_INLINE void decide_line (int hpos)
                                        ok = 0;
                        }
                        if (ok && diwstate == DIW_waiting_stop) {
-                               if (dmaen (DMA_BITPLANE) && bitplane_dma_turned_on + hpos) {
+                               if (dmaen (DMA_BITPLANE) && bitplane_dma_turned_on + 4 < hpos) {
                                        start_bpl_dma (hpos, plfstrt);
                                        estimate_last_fetch_cycle (plfstrt);
                                }
@@ -3244,7 +3262,6 @@ static void reset_decisions (void)
        thisline_decision.nr_planes = 0;
        bpl1dat_written = false;
        bpl1dat_written_at_least_once = false;
-       bpl1dat_early = false;
 
        thisline_decision.plfleft = -1;
        thisline_decision.plflinelen = -1;
@@ -3297,14 +3314,22 @@ static void reset_decisions (void)
                        plfstrt = HARD_DDF_START;
        }
 
-       memset (fetched, 0, sizeof fetched);
-#ifdef AGA
-       if (currprefs.chipset_mask & CSMASK_AGA)
-               memset (fetched_aga, 0, sizeof fetched_aga);
-#endif
        memset (outword, 0, sizeof outword);
        todisplay_fetched[0] = todisplay_fetched[1] = false;
 
+       if (bitplane_line_crossing) {
+               // BPL1DAT would have been written after end of last scanline.
+               // Set BPL1DAT "written at least once" state for new scanline.
+               bitplane_line_crossing -= maxhpos - HPOS_SHIFT;
+               if (bitplane_line_crossing > 0) {
+                       bpl1dat_written = true;
+                       bpl1dat_written_at_least_once = true;
+                       reset_bpl_vars ();
+                       beginning_of_plane_block (bitplane_line_crossing, fetchmode);
+               }
+               bitplane_line_crossing = 0;
+       }
+
        last_decide_line_hpos = -1;
        last_ddf_pix_hpos = -1;
        last_sprite_hpos = -1;
@@ -3729,6 +3754,7 @@ void init_hz (bool fullinit)
        if (vblank_hz > 300)
                vblank_hz = 300;
        maxhpos_short = maxhpos;
+       delay_lastcycle = (maxhpos * 2) << bplcon0_res;
        if (beamcon0 & 0x80) {
                if (hbstrt > maxhpos)
                        hsyncstartpos = hbstrt + 1;
@@ -3942,8 +3968,9 @@ static bool hsyncdelay (void)
 }
 
 // DFF006 = 0.W must be valid result but better do this only in 68000 modes (whdload black screen!)
-
-#define HPOS_OFFSET ((currprefs.cpu_model < 68020 || (currprefs.cpu_model == 68020 && currprefs.cpu_cycle_exact)) ? 3 : 0)
+// HPOS is shifted by 3 cycles and VPOS increases when shifted HPOS==1
+#define HPOS_OFFSET ((currprefs.cpu_model < 68020 || (currprefs.cpu_model == 68020 && currprefs.cpu_cycle_exact)) ? HPOS_SHIFT : 0)
+#define VPOS_INC_DELAY (HPOS_OFFSET ? 1 : 0)
 
 static uae_u16 VPOSR (void)
 {
@@ -3951,7 +3978,7 @@ static uae_u16 VPOSR (void)
        uae_u16 vp = GETVPOS ();
        uae_u16 hp = GETHPOS ();
 
-       if (hp + HPOS_OFFSET >= maxhpos) {
+       if (hp + HPOS_OFFSET >= maxhpos + VPOS_INC_DELAY) {
                vp++;
                if (vp >= maxvpos + lof_store)
                        vp = 0;
@@ -4039,9 +4066,12 @@ static uae_u16 VHPOSR (void)
        hp += HPOS_OFFSET;
        if (hp >= maxhpos) {
                hp -= maxhpos;
-               vp++;
-               if (vp >= maxvpos + lof_store)
-                       vp = 0;
+               // vpos increases when hp==1, not when hp==0
+               if (hp >= VPOS_INC_DELAY) {
+                       vp++;
+                       if (vp >= maxvpos + lof_store)
+                               vp = 0;
+               }
        }
        if (HPOS_OFFSET) {
                hp += 1;
@@ -4504,7 +4534,7 @@ static void BPLxPTL (int hpos, uae_u16 v, int num)
        decide_line (hpos);
        decide_fetch_safe (hpos);
        reset_dbplh (hpos, num);
-       //reset_dbpl (hpos, num);
+       //v += corrupt_offset;
        /* chipset feature: BPLxPTL write and next cycle doing DMA fetch using same pointer register ->
         * this write goes nowhere (same happens with all DMA channels, not just BPL)
         * (intro MoreNewStuffy by PlasmaForce)
@@ -4712,7 +4742,6 @@ static void BPLxDAT (int hpos, int num, uae_u16 v)
                decide_fetch_safe (hpos);
        }
        flush_display (fetchmode);
-       bplxdat[num] = v;
        fetched[num] = v;
        fetched_aga[num] = v;
        if (num == 0 && hpos >= 7) {
@@ -4722,7 +4751,6 @@ static void BPLxDAT (int hpos, int num, uae_u16 v)
                        thisline_decision.plfleft = hpos;
                        reset_bpl_vars ();
                        update_denise (hpos);
-                       bpl1dat_early = true;
                }
                beginning_of_plane_block (hpos, fetchmode);
        }
@@ -5566,13 +5594,15 @@ static void update_copper (int until_hpos)
 
 
                case COP_start_delay:
+                       // cycle after vblank strobe fetches word from old pointer first
                        if (copper_cant_read (old_hpos, 1))
                                continue;
                        cop_state.state = COP_read1;
+                       cop_state.i1 = last_custom_value1 = chipmem_wget_indirect (cop_state.ip);
                        alloc_cycle (old_hpos, CYCLE_COPPER);
 #ifdef DEBUGGER
                        if (debug_dma)
-                               record_dma (0x1fe, 0, 0xffffffff, old_hpos, vpos, DMARECORD_COPPER);
+                               record_dma (0x1fe, cop_state.i1, cop_state.ip, old_hpos, vpos, DMARECORD_COPPER);
 #endif
                        cop_state.ip = cop1lc;
                        break;
@@ -8380,7 +8410,7 @@ uae_u8 *restore_custom (uae_u8 *src)
        bplcon4 = RW;                   /* 10C BPLCON4 */
        clxcon2 = RW;                   /* 10E CLXCON2* */
        for(i = 0; i < 8; i++)
-               bplxdat[i] = RW;        /*     BPLXDAT */
+               fetched[i] = RW;        /*     BPLXDAT */
        for(i = 0; i < 32; i++)
                current_colors.color_regs_ecs[i] = RW; /* 180 COLORxx */
        htotal = RW;                    /* 1C0 HTOTAL */
@@ -8538,7 +8568,7 @@ uae_u8 *save_custom (int *len, uae_u8 *dstptr, int full)
        SW (bplcon4);                   /* 10C BPLCON4 */
        SW (clxcon2);                   /* 10E CLXCON2 */
        for (i = 0;i < 8; i++)
-               SW (bplxdat[i]);        /* 110 BPLxDAT */
+               SW (fetched[i]);        /* 110 BPLxDAT */
        if (full) {
                for (i = 0; i < 8; i++) {
                        SL (spr[i].pt); /* 120-13E SPRxPT */

diff --git a/include/custom.h b/include/custom.h
index b6ee501c6af2ea5db50b8d3b89a995f1665ab58e..9dedd0a4fea5c9124433564664b31772fc53ec8f 100644 (file)
--- a/include/custom.h
+++ b/include/custom.h
@@ -21,6 +21,7 @@
 #define MAXHPOS_ROWS 256
 #define MAXVPOS_LINES_ECS 2048
 #define MAXVPOS_LINES_OCS 512
+#define HPOS_SHIFT 3
 
 uae_u32 get_copper_address (int copno);
 

diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index a742e84bbd362e8fafaf2ff7854bc0a478edfaca..874c0696be2f97d3b40495cb261c3eaa0ed406d1 100644 (file)
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -138,7 +138,7 @@ static int num_mouse, num_keyboard, num_joystick;
 static int dd_inited, mouse_inited, keyboard_inited, joystick_inited;
 static int stopoutput;
 static HANDLE kbhandle = INVALID_HANDLE_VALUE;
-static int oldleds, oldusedleds, newleds, disabledleds;
+static int originalleds, oldleds, newleds, disabledleds, ledstate;
 static int normalmouse, supermouse, rawmouse, winmouse, winmousenumber, winmousemode, winmousewheelbuttonstart;
 static int normalkb, superkb, rawkb;
 static int rawhid;
@@ -249,6 +249,7 @@ static void kbevt (uae_u8 vk, uae_u8 sc)
 
 static void set_leds (uae_u32 led)
 {
+       //write_log (_T("setleds %08x\n"), led);
        if (currprefs.win32_kbledmode) {
                if ((oldleds & KBLED_NUMLOCKM) != (led & KBLED_NUMLOCKM) && !(disabledleds & KBLED_NUMLOCKM)) {
                        kbevt (VK_NUMLOCK, 0x45);
@@ -268,12 +269,19 @@ static void set_leds (uae_u32 led)
                ULONG ReturnedLength;
 
                memset (&InputBuffer, 0, sizeof (InputBuffer));
-               if (led & KBLED_NUMLOCKM)
+               oldleds = 0;
+               if (led & KBLED_NUMLOCKM) {
                        InputBuffer.LedFlags |= KEYBOARD_NUM_LOCK_ON;
-               if (led & KBLED_CAPSLOCKM)
+                       oldleds |= KBLED_NUMLOCKM;
+               }
+               if (led & KBLED_CAPSLOCKM) {
                        InputBuffer.LedFlags |= KEYBOARD_CAPS_LOCK_ON;
-               if (led & KBLED_SCROLLLOCKM)
+                       oldleds |= KBLED_CAPSLOCKM;
+               }
+               if (led & KBLED_SCROLLLOCKM) {
                        InputBuffer.LedFlags |= KEYBOARD_SCROLL_LOCK_ON;
+                       oldleds |= KBLED_SCROLLLOCKM;
+               }
                if (!DeviceIoControl (kbhandle, IOCTL_KEYBOARD_SET_INDICATORS,
                        &InputBuffer, DataLength, NULL, 0, &ReturnedLength, NULL))
                        write_log (_T("kbleds: DeviceIoControl() failed %d\n"), GetLastError());
@@ -284,27 +292,27 @@ static void update_leds (void)
 {
        if (!currprefs.keyboard_leds_in_use)
                return;
-       if (newleds != oldusedleds) {
-               oldusedleds = newleds;
+       if (newleds != oldleds)
                set_leds (newleds);
-       }
 }
 
 void indicator_leds (int num, int state)
 {
-       int i;
+       if (state == 0)
+               ledstate &= ~(1 << num);
+       else if (state > 0)
+               ledstate |= 1 << num;
 
-       if (!currprefs.keyboard_leds_in_use)
-               return;
        disabledleds = 0;
-       for (i = 0; i < 3; i++) {
+       for (int i = 0; i < 3; i++) {
                if (state >= 0) {
-                       if (currprefs.keyboard_leds[i] == num + 1) {
+                       int l = currprefs.keyboard_leds[i];
+                       if (l <= 0) {
+                               disabledleds |= 1 << i;
+                       } else {
                                newleds &= ~(1 << i);
-                               if (state)
+                               if ((1 << (l - 1)) & ledstate)
                                        newleds |= 1 << i;
-                       } else if (currprefs.keyboard_leds[i] <= 0) {
-                               disabledleds |= 1 << i;
                        }
                }
        }
@@ -3080,7 +3088,7 @@ static int init_kb (void)
        if (keyboard_inited)
                return 1;
        di_init ();
-       oldusedleds = -1;
+       originalleds = -1;
        keyboard_inited = 1;
        for (i = 0; i < num_keyboard; i++) {
                struct didata *did = &di_keyboard[i];
@@ -3163,30 +3171,32 @@ static int acquire_kb (int num, int flags)
 
        if (num < 0) {
                doregister_rawinput ();
-               return 1;
-       }
-
-       lpdi = di_keyboard[num].lpdi;
-       unacquire (lpdi, _T("keyboard"));
-       if (currprefs.keyboard_leds_in_use) {
-               if (!currprefs.win32_kbledmode) {
-                       if (DefineDosDevice (DDD_RAW_TARGET_PATH, _T("Kbd"), _T("\\Device\\KeyboardClass0"))) {
-                               kbhandle = CreateFile (_T("\\\\.\\Kbd"), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
-                               if (kbhandle == INVALID_HANDLE_VALUE) {
-                                       write_log (_T("kbled: CreateFile failed, error %d\n"), GetLastError());
+               if (currprefs.keyboard_leds_in_use) {
+                       if (!currprefs.win32_kbledmode) {
+                               if (DefineDosDevice (DDD_RAW_TARGET_PATH, _T("Kbd"), _T("\\Device\\KeyboardClass0"))) {
+                                       kbhandle = CreateFile (_T("\\\\.\\Kbd"), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+                                       if (kbhandle == INVALID_HANDLE_VALUE) {
+                                               write_log (_T("kbled: CreateFile failed, error %d\n"), GetLastError());
+                                               currprefs.win32_kbledmode = 1;
+                                       }
+                               } else {
                                        currprefs.win32_kbledmode = 1;
+                                       write_log (_T("kbled: DefineDosDevice failed, error %d\n"), GetLastError());
                                }
-                       } else {
-                               currprefs.win32_kbledmode = 1;
-                               write_log (_T("kbled: DefineDosDevice failed, error %d\n"), GetLastError());
                        }
+                       oldleds = get_leds ();
+                       if (originalleds == -1) {
+                               originalleds = oldleds;
+                               //write_log (_T("stored %08x -> %08x\n"), originalleds, newleds);
+                       }
+                       update_leds ();
                }
-               oldleds = get_leds ();
-               if (oldusedleds < 0)
-                       oldusedleds = newleds = oldleds;
-               set_leds (oldusedleds);
+               return 1;
        }
 
+       lpdi = di_keyboard[num].lpdi;
+       unacquire (lpdi, _T("keyboard"));
+
        //lock_kb ();
        setcoop (&di_keyboard[num], DISCL_NOWINKEY | DISCL_FOREGROUND | DISCL_EXCLUSIVE, _T("keyboard"));
        kb_do_refresh = ~0;
@@ -3208,6 +3218,18 @@ static void unacquire_kb (int num)
        LPDIRECTINPUTDEVICE8 lpdi;
        if (num < 0) {
                doregister_rawinput ();
+               if (currprefs.keyboard_leds_in_use) {
+                       if (originalleds != -1) {
+                               //write_log (_T("restored %08x -> %08x\n"), oldleds, originalleds);
+                               set_leds (originalleds);
+                               originalleds = -1;
+                       }
+                       if (kbhandle != INVALID_HANDLE_VALUE) {
+                               CloseHandle (kbhandle);
+                               DefineDosDevice (DDD_REMOVE_DEFINITION, _T("Kbd"), NULL);
+                               kbhandle = INVALID_HANDLE_VALUE;
+                       }
+               }
                return;
        }
        lpdi = di_keyboard[num].lpdi;
@@ -3221,18 +3243,6 @@ static void unacquire_kb (int num)
                        normalkb--;
                di_keyboard[num].acquired = 0;
        }
-
-       if (currprefs.keyboard_leds_in_use) {
-               if (oldusedleds >= 0) {
-                       set_leds (oldleds);
-                       oldusedleds = oldleds;
-               }
-               if (kbhandle != INVALID_HANDLE_VALUE) {
-                       CloseHandle (kbhandle);
-                       DefineDosDevice (DDD_REMOVE_DEFINITION, _T("Kbd"), NULL);
-                       kbhandle = INVALID_HANDLE_VALUE;
-               }
-       }
        //unlock_kb ();
 }
 
@@ -3278,7 +3288,8 @@ static void read_kb (void)
        if (IGNOREEVERYTHING)
                return;
 
-       update_leds ();
+       if (originalleds != -1)
+               update_leds ();
        for (i = 0; i < MAX_INPUT_DEVICES; i++) {
                struct didata *did = &di_keyboard[i];
                if (!did->acquired)

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 88e43323c2d69f4b9d8a81f2aef6579467fec988..bcd8f033ea8197a998ad881cd2fc77c482b5db35 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -19,11 +19,11 @@
 #define LANG_DLL 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("3")
+#define WINUAEBETA _T("4")
 #else
 #define WINUAEBETA _T("")
 #endif
-#define WINUAEDATE MAKEBD(2014, 1, 16)
+#define WINUAEDATE MAKEBD(2014, 1, 18)
 #define WINUAEEXTRA _T("")
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 40eed475610ca830a1c9257c9ca06603f2e71920..819c83e8712aecad1f477e33136e9a5f6583faa2 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -2044,7 +2044,7 @@ int check_prefs_changed_gfx (void)
                currprefs.win32_iconified_pause = changed_prefs.win32_iconified_pause;
                currprefs.win32_ctrl_F11_is_quit = changed_prefs.win32_ctrl_F11_is_quit;
                inputdevice_unacquire ();
-               currprefs.keyboard_leds_in_use = (currprefs.keyboard_leds[0] | currprefs.keyboard_leds[1] | currprefs.keyboard_leds[2]) != 0;
+               currprefs.keyboard_leds_in_use = changed_prefs.keyboard_leds_in_use = (currprefs.keyboard_leds[0] | currprefs.keyboard_leds[1] | currprefs.keyboard_leds[2]) != 0;
                pause_sound ();
                resume_sound ();
                inputdevice_acquire (TRUE);

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 2f72d1fca329bebb001c88029470f89ded7e95a8..4da4e78f652e06b593afc7d8a7e110d107a06662 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -16126,6 +16126,7 @@ static INT_PTR CALLBACK DialogProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
                return TRUE;
        case WM_CLOSE:
                addnotifications (hDlg, TRUE, TRUE);
+               updatePanel (-1);
                DestroyWindow(hDlg);
                if (dialogreturn < 0) {
                        dialogreturn = 0;