Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-21 06:29:55 +00:00
Code Issues Projects Releases Wiki Activity

- added some documentation

Browse Source 
- VidLocal.sp -> VidLocal.slot_param
- X11 color map is loaded with ramp upon startup to avoid the annoying black
  screen during initialization
This commit is contained in:
cebix 2001-07-01 00:46:38 +00:00
parent 50520dcf2f
commit a4b36fd674
3 changed files with 82 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
BasiliskII/src/Unix/video_x.cpp
View File

@ -384,8 +384,10 @@ void driver_base::update_palette(void)
{
if (cmap[0] && cmap[1]) {
int num = 256;
if (vis->c_class == DirectColor && VideoMonitor.mode.depth == VDEPTH_16BIT)
num = vis->map_entries;
if (IsDirectMode(VideoMonitor.mode))
num = vis->map_entries; // Palette is gamma table
else if (vis->c_class == DirectColor)
return; // Indexed mode on true color screen, don't set CLUT
XStoreColors(x_display, cmap[0], palette, num);
XStoreColors(x_display, cmap[1], palette, num);
}
@ -1185,9 +1187,11 @@ bool VideoInit(bool classic)
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
// Preset pixel members for gamma table
int num = 256;
if (color_class == DirectColor) {
int num = vis->map_entries;
num = vis->map_entries;
// Preset pixel values for gamma table
uint32 rmask = vis->red_mask, gmask = vis->green_mask, bmask = vis->blue_mask;
uint32 mask;
int rloss = 8, rshift = 0;
@ -1210,6 +1214,18 @@ bool VideoInit(bool classic)
palette[i].pixel = ((c >> rloss) << rshift) | ((c >> gloss) << gshift) | ((c >> bloss) << bshift);
}
}
// Load gray ramp
for (int i=0; i<num; i++) {
int c = (i * 256) / num;
palette[i].red = c * 0x0101;
palette[i].green = c * 0x0101;
palette[i].blue = c * 0x0101;
if (color_class == PseudoColor)
palette[i].pixel = i;
palette[i].flags = DoRed | DoGreen | DoBlue;
}
XStoreColors(x_display, cmap[0], palette, num);
}
// Get screen mode from preferences
@ -1392,11 +1408,11 @@ void video_set_palette(uint8 *pal)
// Convert colors to XColor array
int num_in = 256, num_out = 256;
if (VideoMonitor.mode.depth == VDEPTH_16BIT) {
if (VideoMonitor.mode.depth == VDEPTH_16BIT)
num_in = 32;
if (IsDirectMode(VideoMonitor.mode)) {
// If X is in 565 mode we have to stretch the palette from 32 to 64 entries
if (vis->c_class == DirectColor)
num_out = vis->map_entries;
num_out = vis->map_entries;
}
XColor *p = palette;
for (int i=0; i<num_out; i++) {

58
BasiliskII/src/include/video.h
View File

@ -23,6 +23,24 @@
#include <vector>
/*
Some of the terminology here is completely frelled. In Basilisk II, a
"video mode" refers to a combination of resolution and color depth, and
this information is stored in a video_mode structure. In Apple
documentation, a "mode" historically refers to the color depth only
(because old Macs had fixed-frequency monitors and could not change the
resolution). These "modes" are assigned a number (0x80, 0x81, etc.),
which we here call "Apple mode". When Macs learned how to deal with
multiscan monitors, Apple introduced another type of "mode", also having
numbers starting from 0x80 but refrerring to the resolution and/or video
timing of the display (it's possible to have two modes with the same
dimension but different refresh rates). We call this a "resolution ID".
The combination of "Apple mode" and "ID" corresponds to a Basilisk II
"video mode". To make the confusion worse, the video driver control call
that sets the color depth is called "SetMode" while the one that sets
both depth and resolution is "SwitchMode"...
*/
// Color depth codes
enum video_depth {
VDEPTH_1BIT, // 2 colors
@ -53,6 +71,7 @@ inline bool IsDirectMode(uint16 mode)
return IsDirectMode(AppleModeToDepth(mode));
}
// Return the depth code that corresponds to the specified bits-per-pixel value
inline video_depth DepthModeForPixelDepth(int depth)
{
switch (depth) {
@ -66,7 +85,7 @@ inline video_depth DepthModeForPixelDepth(int depth)
}
}
// Return a bytes-per-row value that assumes no padding for specified depth and pixel width
// Return a bytes-per-row value (assuming no padding) for the specified depth and pixel width
inline uint32 TrivialBytesPerRow(uint32 width, video_depth depth)
{
switch (depth) {
@ -79,7 +98,35 @@ inline uint32 TrivialBytesPerRow(uint32 width, video_depth depth)
}
}
// Description of one video mode
/*
You are not completely free in your selection of depth/resolution
combinations:
1) the lowest supported color depth must be available in all
resolutions
2) if one resolution provides a certain color depth, it must also
provide all lower supported depths
For example, it is possible to have this set of modes:
640x480 @ 8 bit
640x480 @ 32 bit
800x600 @ 8 bit
800x600 @ 32 bit
1024x768 @ 8 bit
But this is not possible (violates rule 1):
640x480 @ 8 bit
800x600 @ 8 bit
1024x768 @ 1 bit
And neither is this (violates rule 2, 640x480 @ 16 bit is missing):
640x480 @ 8 bit
640x480 @ 32 bit
800x600 @ 8 bit
800x600 @ 16 bit
1024x768 @ 8 bit
*/
// Description of a video mode
struct video_mode {
uint32 x; // X size of screen (pixels)
uint32 y; // Y size of screen (pixels)
@ -102,7 +149,8 @@ struct monitor_desc {
video_mode mode; // Currently selected video mode description
};
extern monitor_desc VideoMonitor; // Description of the main monitor, set by VideoInit()
// Description of the main (and currently the only) monitor, set by VideoInit()
extern monitor_desc VideoMonitor;
extern int16 VideoDriverOpen(uint32 pb, uint32 dce);
extern int16 VideoDriverControl(uint32 pb, uint32 dce);
@ -117,7 +165,11 @@ extern void VideoQuitFullScreen(void);
extern void VideoInterrupt(void);
extern void VideoRefresh(void);
// Called by the video driver to switch the video mode
extern void video_switch_to_mode(const video_mode &mode);
// Called by the video driver to set the color palette (in indexed modes)
// or gamma table (in direct modes)
extern void video_set_palette(uint8 *pal);
#endif

8
BasiliskII/src/video.cpp
View File

@ -57,7 +57,7 @@ struct {
uint32 current_id;
uint16 preferred_mode; // Preferred depth/resolution
uint32 preferred_id;
uint32 sp; // Mac address of Slot Manager parameter block
uint32 slot_param; // Mac address of Slot Manager parameter block
} VidLocal;
@ -299,8 +299,8 @@ int16 VideoDriverOpen(uint32 pb, uint32 dce)
Execute68kTrap(0xa71e, &r); // NewPtrSysClear()
if (r.a[0] == 0)
return memFullErr;
VidLocal.sp = r.a[0];
D(bug("SPBlock at %08x\n", VidLocal.sp));
VidLocal.slot_param = r.a[0];
D(bug("SPBlock at %08x\n", VidLocal.slot_param));
// Find and set default gamma table
VidLocal.gamma_table = 0;
@ -505,7 +505,7 @@ int16 VideoDriverControl(uint32 pb, uint32 dce)
WriteMacInt32(param + csBaseAddr, frame_base);
M68kRegisters r;
uint32 sp = VidLocal.sp;
uint32 sp = VidLocal.slot_param;
r.a[0] = sp;
// Find functional sResource for this display