Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-26 16:31:11 +00:00
Code Issues Projects Releases Wiki Activity

- Let fullscreen DGA mode work again, even with a DirectColor visual. In

Browse Source 
that case, we do need add it when creating the window otherwise we
  result int a nice BadMatch for X_CreateWindow request. FIXME?
- Fix typo and do enable VOSF in DGA mode, if necessary.
This commit is contained in:
gbeauche 2002-09-28 12:42:39 +00:00
parent 8748b48b7a
commit 98d1246815
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1178,9 +1178,11 @@ driver_xf86dga::driver_xf86dga(X11_monitor_desc &m)
XSetWindowAttributes wattr; XSetWindowAttributes wattr;
wattr.event_mask = eventmask = dga_eventmask; wattr.event_mask = eventmask = dga_eventmask;
wattr.override_redirect = True; wattr.override_redirect = True;
wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr); InputOutput, vis, CWEventMask | CWOverrideRedirect |
(color_class == DirectColor ? CWColormap : 0), &wattr);
// Set window name/class // Set window name/class
set_window_name(w, STR_WINDOW_TITLE); set_window_name(w, STR_WINDOW_TITLE);
@ -1214,11 +1216,17 @@ driver_xf86dga::driver_xf86dga(X11_monitor_desc &m)
// Init blitting routines // Init blitting routines
int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth); int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
#if VIDEO_VOSF #if ENABLE_VOSF
bool native_byte_order;
#ifdef WORDS_BIGENDIAN
native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#else
native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
#endif
#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, true, mode.depth); use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, mode.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)