claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6146 from 86Box/tc1995

Browse Source 
Overriding changes (September 9th, 2025)
This commit is contained in:
Miran Grča
2025-09-09 23:24:06 +02:00
committed by GitHub
parent e630a8fa25 3a67c54687
commit 0a248eeb3b
2 changed files with 236 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/vid_8514a.c
View File

@@ -3674,6 +3674,9 @@ ibm8514_poll(void *priv)
ibm8514_log("IBM 8514/A poll=%x offtime=%" PRIu64 ", ontime=%" PRIu64 ".\n", dev->on, dev->dispofftime, dev->dispontime); ibm8514_log("IBM 8514/A poll=%x offtime=%" PRIu64 ", ontime=%" PRIu64 ".\n", dev->on, dev->dispofftime, dev->dispontime);
if (dev->on) { if (dev->on) {
ibm8514_log("ON!\n"); ibm8514_log("ON!\n");
if (svga->override)
svga_set_poll(svga);
else {
if (!dev->linepos) { if (!dev->linepos) {
if ((dev->displine == ((dev->hwcursor_latch.y < 0) ? 0 : dev->hwcursor_latch.y)) && dev->hwcursor_latch.ena) { if ((dev->displine == ((dev->hwcursor_latch.y < 0) ? 0 : dev->hwcursor_latch.y)) && dev->hwcursor_latch.ena) {
dev->hwcursor_on = dev->hwcursor_latch.cur_ysize - dev->hwcursor_latch.yoff; dev->hwcursor_on = dev->hwcursor_latch.cur_ysize - dev->hwcursor_latch.yoff;
@@ -3814,6 +3817,7 @@ ibm8514_poll(void *priv)
} }
} }
} }
}
} }
void void

4
src/video/vid_xga.c
View File

@@ -3303,6 +3303,9 @@ xga_poll(void *priv)
xga_log("XGA Poll=%d.\n", xga->on); xga_log("XGA Poll=%d.\n", xga->on);
if (xga->on) { if (xga->on) {
if (svga->override)
svga_set_poll(svga);
else {
if (!xga->linepos) { if (!xga->linepos) {
if (xga->displine == xga->hwcursor_latch.y && xga->hwcursor_latch.ena) { if (xga->displine == xga->hwcursor_latch.y && xga->hwcursor_latch.ena) {
xga->hwcursor_on = xga->hwcursor_latch.cur_ysize - ((xga->hwcursor_latch.yoff & 0x20) ? 32 : 0); xga->hwcursor_on = xga->hwcursor_latch.cur_ysize - ((xga->hwcursor_latch.yoff & 0x20) ? 32 : 0);
@@ -3451,6 +3454,7 @@ xga_poll(void *priv)
xga->hwcursor_latch = xga->hwcursor; xga->hwcursor_latch = xga->hwcursor;
} }
} }
}
} else } else
svga_recalctimings(svga); svga_recalctimings(svga);
} }