Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-13 08:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix for new SDL code in Basilisk II.

Browse Source
This commit is contained in:
gbeauche 2004-06-23 14:41:49 +00:00
parent 19494038b3
commit 358def87a4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SheepShaver/src/Unix/video_x.cpp
View File

@ -46,6 +46,7 @@
#include "about_window.h" #include "about_window.h"
#include "video.h" #include "video.h"
#include "video_defs.h" #include "video_defs.h"
#include "video_blit.h"
#define DEBUG 0 #define DEBUG 0
#include "debug.h" #include "debug.h"
@ -101,6 +102,7 @@ static int depth; // Depth of Mac frame buffer
static Window rootwin, the_win; // Root window and our window static Window rootwin, the_win; // Root window and our window
static int num_depths = 0; // Number of available X depths static int num_depths = 0; // Number of available X depths
static int *avail_depths = NULL; // List of available X depths static int *avail_depths = NULL; // List of available X depths
static VisualFormat visualFormat;
static XVisualInfo visualInfo; static XVisualInfo visualInfo;
static Visual *vis; static Visual *vis;
static int color_class; static int color_class;
@ -540,7 +542,7 @@ static bool open_window(int width, int height)
native_byte_order = (XImageByteOrder(x_display) == LSBFirst); native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
#endif #endif
#ifdef ENABLE_VOSF #ifdef ENABLE_VOSF
Screen_blitter_init(&visualInfo, native_byte_order, depth); Screen_blitter_init(visualFormat, native_byte_order, depth);
#endif #endif
// Set bytes per row // Set bytes per row
@ -614,7 +616,7 @@ static bool open_dga(int width, int height)
#if REAL_ADDRESSING || DIRECT_ADDRESSING #if REAL_ADDRESSING || DIRECT_ADDRESSING
// Screen_blitter_init() returns TRUE if VOSF is mandatory // Screen_blitter_init() returns TRUE if VOSF is mandatory
// i.e. the framebuffer update function is not Blit_Copy_Raw // i.e. the framebuffer update function is not Blit_Copy_Raw
use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, depth); use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
if (use_vosf) { if (use_vosf) {
// Allocate memory for frame buffer (SIZE is extended to page-boundary) // Allocate memory for frame buffer (SIZE is extended to page-boundary)
@ -651,6 +653,12 @@ static bool open_display(void)
return false; return false;
} }
// Build up visualFormat structure
visualFormat.depth = visualInfo.depth;
visualFormat.Rmask = visualInfo.red_mask;
visualFormat.Gmask = visualInfo.green_mask;
visualFormat.Bmask = visualInfo.blue_mask;
// Create color maps // Create color maps
if (color_class == PseudoColor || color_class == DirectColor) { if (color_class == PseudoColor || color_class == DirectColor) {
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);