80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Reduce CGA vertical res from 400 to 200.

Browse Source 
Squashed commit of the following:

commit ee61aacb0aeeda069709dbea0a9bbd36732b2a9b
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Mon May 15 11:02:21 2023 -0700

    Fix vertical border size.

commit d16a01fbd45589abd6c31e030af1d3e7b26732f8
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Thu May 11 17:06:32 2023 -0700

    Adjust to get horizontal scaling correct (CGA)

commit 44e7df8e37cb13754b1705c7519b40c41b8eedca
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Thu May 11 14:36:02 2023 -0700

    Revert "Fix rendering of med-res and high-res CGA."

    This reverts commit 219fbdbc138174620e93bcb394ed455291a0565a.

commit 9c2371654d0b8f0b2abf066e25c81fd5cf79ebe8
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Thu May 11 12:24:02 2023 -0700

    Reduce CGA card output from 400 lines to 200

commit fd494cc0896e5b601ee782d9263dfa91c07a617b
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Wed May 10 15:25:57 2023 -0700

    Fix header and add copyright.

commit 7cf0220acb15e6155c3d46fb1357c165130ec940
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Mon May 8 23:54:18 2023 -0700

    Fix rendering of med-res and high-res CGA.

commit 901519b6ff801972c310ba5cd9bfa54578dd289a
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Mon May 8 20:01:50 2023 -0700

    Adjust CGA driver to output true video resolution.

commit 6d2e3d5e1545a4970f794a391870ddb1088fd45c
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Wed May 10 15:17:32 2023 -0700

    Revert "Add *.cfg is base dir for .gitignore"

    This reverts commit 01d7b507e9045af3ae88e2c18ca534c0025ee3de.

commit 661342884931dcae70df286e888012d4b3262d9a
Author: W. M. Martinez <anikom15@gmail.com>
Date:   Wed May 10 14:25:12 2023 -0700

    Add *.cfg is base dir for .gitignore
This commit is contained in:
W. M. Martinez
2023-05-15 11:11:21 -07:00
parent 08605a1531
commit 84ef817f5f
1 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/video/vid_cga.c
View File

@@ -12,9 +12,11 @@
* *
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/> * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* W. M. Martinez, <anikom15@outlook.com>
* *
* Copyright 2008-2019 Sarah Walker. * Copyright 2008-2019 Sarah Walker.
* Copyright 2016-2019 Miran Grca. * Copyright 2016-2019 Miran Grca.
* Copyright 2023 W. M. Martinez
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@@ -219,21 +221,21 @@ cga_poll(void *p)
video_wait_for_buffer(); video_wait_for_buffer();
} }
cga->lastline = cga->displine; cga->lastline = cga->displine;
for (c = 0; c < 8; c++) { if ((cga->cgamode & 0x12) == 0x12) {
if ((cga->cgamode & 0x12) == 0x12) { for (c = 0; c < 8; ++c) {
buffer32->line[(cga->displine << 1)][c] = buffer32->line[(cga->displine << 1) + 1][c] = 0; buffer32->line[cga->displine][c] = 0;
if (cga->cgamode & 1) { if (cga->cgamode & 1)
buffer32->line[(cga->displine << 1)][c + (cga->crtc[1] << 3) + 8] = buffer32->line[(cga->displine << 1) + 1][c + (cga->crtc[1] << 3) + 8] = 0; buffer32->line[cga->displine][c + (cga->crtc[1] << 3) + 8] = 0;
} else { else
buffer32->line[(cga->displine << 1)][c + (cga->crtc[1] << 4) + 8] = buffer32->line[(cga->displine << 1) + 1][c + (cga->crtc[1] << 4) + 8] = 0; buffer32->line[cga->displine][c + (cga->crtc[1] << 4) + 8] = 0;
} }
} else { } else {
buffer32->line[(cga->displine << 1)][c] = buffer32->line[(cga->displine << 1) + 1][c] = (cga->cgacol & 15) + 16; for (c = 0; c < 8; ++c) {
if (cga->cgamode & 1) { buffer32->line[cga->displine][c] = (cga->cgacol & 15) + 16;
buffer32->line[(cga->displine << 1)][c + (cga->crtc[1] << 3) + 8] = buffer32->line[(cga->displine << 1) + 1][c + (cga->crtc[1] << 3) + 8] = (cga->cgacol & 15) + 16; if (cga->cgamode & 1)
} else { buffer32->line[cga->displine][c + (cga->crtc[1] << 3) + 8] = (cga->cgacol & 15) + 16;
buffer32->line[(cga->displine << 1)][c + (cga->crtc[1] << 4) + 8] = buffer32->line[(cga->displine << 1) + 1][c + (cga->crtc[1] << 4) + 8] = (cga->cgacol & 15) + 16; else
} buffer32->line[cga->displine][c + (cga->crtc[1] << 4) + 8] = (cga->cgacol & 15) + 16;
} }
} }
if (cga->cgamode & 1) { if (cga->cgamode & 1) {
@@ -253,11 +255,11 @@ cga_poll(void *p)
cols[0] = (attr >> 4) + 16; cols[0] = (attr >> 4) + 16;
if (drawcursor) { if (drawcursor) {
for (c = 0; c < 8; c++) { for (c = 0; c < 8; c++) {
buffer32->line[(cga->displine << 1)][(x << 3) + c + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15; buffer32->line[cga->displine][(x << 3) + c + 8] = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
} }
} else { } else {
for (c = 0; c < 8; c++) { for (c = 0; c < 8; c++) {
buffer32->line[(cga->displine << 1)][(x << 3) + c + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0]; buffer32->line[cga->displine][(x << 3) + c + 8] = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
} }
} }
cga->ma++; cga->ma++;
@@ -280,11 +282,15 @@ cga_poll(void *p)
cga->ma++; cga->ma++;
if (drawcursor) { if (drawcursor) {
for (c = 0; c < 8; c++) { for (c = 0; c < 8; c++) {
buffer32->line[(cga->displine << 1)][(x << 4) + (c << 1) + 8] = buffer32->line[(cga->displine << 1)][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15; buffer32->line[cga->displine][(x << 4) + (c << 1) + 8]
= buffer32->line[cga->displine][(x << 4) + (c << 1) + 9]
= cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
} }
} else { } else {
for (c = 0; c < 8; c++) { for (c = 0; c < 8; c++) {
buffer32->line[(cga->displine << 1)][(x << 4) + (c << 1) + 8] = buffer32->line[(cga->displine << 1)][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0]; buffer32->line[cga->displine][(x << 4) + (c << 1) + 8]
= buffer32->line[cga->displine][(x << 4) + (c << 1) + 9]
= cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
} }
} }
} }
@@ -311,7 +317,9 @@ cga_poll(void *p)
dat = 0; dat = 0;
cga->ma++; cga->ma++;
for (c = 0; c < 8; c++) { for (c = 0; c < 8; c++) {
buffer32->line[(cga->displine << 1)][(x << 4) + (c << 1) + 8] = buffer32->line[(cga->displine << 1)][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14]; buffer32->line[cga->displine][(x << 4) + (c << 1) + 8]
= buffer32->line[cga->displine][(x << 4) + (c << 1) + 9]
= cols[dat >> 14];
dat <<= 2; dat <<= 2;
} }
} }
@@ -325,7 +333,7 @@ cga_poll(void *p)
dat = 0; dat = 0;
cga->ma++; cga->ma++;
for (c = 0; c < 16; c++) { for (c = 0; c < 16; c++) {
buffer32->line[(cga->displine << 1)][(x << 4) + c + 8] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + c + 8] = cols[dat >> 15]; buffer32->line[cga->displine][(x << 4) + c + 8] = cols[dat >> 15];
dat <<= 1; dat <<= 1;
} }
} }
@@ -333,11 +341,9 @@ cga_poll(void *p)
} else { } else {
cols[0] = ((cga->cgamode & 0x12) == 0x12) ? 0 : (cga->cgacol & 15) + 16; cols[0] = ((cga->cgamode & 0x12) == 0x12) ? 0 : (cga->cgacol & 15) + 16;
if (cga->cgamode & 1) { if (cga->cgamode & 1) {
hline(buffer32, 0, (cga->displine << 1), ((cga->crtc[1] << 3) + 16) << 2, cols[0]); hline(buffer32, 0, cga->displine, (cga->crtc[1] << 3) + 16, cols[0]);
hline(buffer32, 0, (cga->displine << 1) + 1, ((cga->crtc[1] << 3) + 16) << 2, cols[0]);
} else { } else {
hline(buffer32, 0, (cga->displine << 1), ((cga->crtc[1] << 4) + 16) << 2, cols[0]); hline(buffer32, 0, cga->displine, (cga->crtc[1] << 4) + 16, cols[0]);
hline(buffer32, 0, (cga->displine << 1) + 1, ((cga->crtc[1] << 4) + 16) << 2, cols[0]);
} }
} }
@@ -352,11 +358,9 @@ cga_poll(void *p)
else else
border = cga->cgacol & 0x0f; border = cga->cgacol & 0x0f;
Composite_Process(cga->cgamode, border, x >> 2, buffer32->line[(cga->displine << 1)]); Composite_Process(cga->cgamode, border, x >> 2, buffer32->line[cga->displine]);
Composite_Process(cga->cgamode, border, x >> 2, buffer32->line[(cga->displine << 1) + 1]);
} else { } else {
video_process_8(x, cga->displine << 1); video_process_8(x, cga->displine);
video_process_8(x, (cga->displine << 1) + 1);
} }
cga->sc = oldsc; cga->sc = oldsc;
@@ -431,31 +435,31 @@ cga_poll(void *p)
cga->lastline++; cga->lastline++;
xs_temp = x; xs_temp = x;
ys_temp = (cga->lastline - cga->firstline) << 1; ys_temp = cga->lastline - cga->firstline;
if ((xs_temp > 0) && (ys_temp > 0)) { if ((xs_temp > 0) && (ys_temp > 0)) {
if (xs_temp < 64) if (xs_temp < 64)
xs_temp = 656; xs_temp = 656;
if (ys_temp < 32) if (ys_temp < 32)
ys_temp = 400; ys_temp = 200;
if (!enable_overscan) if (!enable_overscan)
xs_temp -= 16; xs_temp -= 16;
if ((cga->cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) { if ((cga->cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
xsize = xs_temp; xsize = xs_temp;
ysize = ys_temp; ysize = ys_temp;
set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0)); set_screen_size(xsize, ysize + (enable_overscan ? 8 : 0));
if (video_force_resize_get()) if (video_force_resize_get())
video_force_resize_set(0); video_force_resize_set(0);
} }
if (enable_overscan) { if (enable_overscan) {
video_blit_memtoscreen(0, (cga->firstline - 4) << 1, video_blit_memtoscreen(0, cga->firstline - 4,
xsize, ((cga->lastline - cga->firstline) + 8) << 1); xsize, (cga->lastline - cga->firstline) + 8);
} else { } else {
video_blit_memtoscreen(8, cga->firstline << 1, video_blit_memtoscreen(8, cga->firstline,
xsize, (cga->lastline - cga->firstline) << 1); xsize, cga->lastline - cga->firstline);
} }
} }