1 |
|
/* |
2 |
|
* video_x.cpp - Video/graphics emulation, X11 specific stuff |
3 |
|
* |
4 |
< |
* Basilisk II (C) 1997-2001 Christian Bauer |
4 |
> |
* Basilisk II (C) 1997-2002 Christian Bauer |
5 |
|
* |
6 |
|
* This program is free software; you can redistribute it and/or modify |
7 |
|
* it under the terms of the GNU General Public License as published by |
37 |
|
#include <sys/shm.h> |
38 |
|
#include <errno.h> |
39 |
|
|
40 |
+ |
#include <algorithm> |
41 |
+ |
|
42 |
+ |
#ifndef NO_STD_NAMESPACE |
43 |
+ |
using std::sort; |
44 |
+ |
#endif |
45 |
+ |
|
46 |
|
#ifdef HAVE_PTHREADS |
47 |
|
# include <pthread.h> |
48 |
|
#endif |
80 |
|
// Constants |
81 |
|
const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes"; |
82 |
|
|
83 |
< |
static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ExposureMask | StructureNotifyMask; |
83 |
> |
static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask; |
84 |
|
static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask; |
85 |
|
|
86 |
|
|
93 |
|
static bool local_X11; // Flag: X server running on local machine? |
94 |
|
static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into) |
95 |
|
static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes) |
96 |
+ |
static uint32 the_buffer_size; // Size of allocated the_buffer |
97 |
|
|
98 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
99 |
|
#ifdef HAVE_PTHREADS |
123 |
|
|
124 |
|
// X11 variables |
125 |
|
static int screen; // Screen number |
119 |
– |
static int xdepth; // Depth of X screen |
126 |
|
static Window rootwin; // Root window and our window |
127 |
< |
static XVisualInfo visualInfo; |
128 |
< |
static Visual *vis; |
123 |
< |
static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them) |
127 |
> |
static int num_depths = 0; // Number of available X depths |
128 |
> |
static int *avail_depths = NULL; // List of available X depths |
129 |
|
static XColor black, white; |
130 |
|
static unsigned long black_pixel, white_pixel; |
131 |
|
static int eventmask; |
132 |
|
|
133 |
+ |
static int xdepth; // Depth of X screen |
134 |
+ |
static XVisualInfo visualInfo; |
135 |
+ |
static Visual *vis; |
136 |
+ |
static int color_class; |
137 |
+ |
|
138 |
|
static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes |
139 |
|
|
140 |
+ |
static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them) |
141 |
+ |
|
142 |
|
static XColor palette[256]; // Color palette to be used as CLUT and gamma table |
143 |
|
static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
144 |
|
|
184 |
|
|
185 |
|
// Prototypes |
186 |
|
static void *redraw_func(void *arg); |
175 |
– |
static int event2keycode(XKeyEvent &ev); |
187 |
|
|
188 |
|
// From main_unix.cpp |
189 |
|
extern char *x_display_name; |
203 |
|
return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift); |
204 |
|
} |
205 |
|
|
206 |
+ |
// Do we have a visual for handling the specified Mac depth? If so, set the |
207 |
+ |
// global variables "xdepth", "visualInfo", "vis" and "color_class". |
208 |
+ |
static bool find_visual_for_depth(video_depth depth) |
209 |
+ |
{ |
210 |
+ |
D(bug("have_visual_for_depth(%d)\n", 1 << depth)); |
211 |
+ |
|
212 |
+ |
// 1-bit works always and uses default visual |
213 |
+ |
if (depth == VDEPTH_1BIT) { |
214 |
+ |
vis = DefaultVisual(x_display, screen); |
215 |
+ |
visualInfo.visualid = XVisualIDFromVisual(vis); |
216 |
+ |
int num = 0; |
217 |
+ |
XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num); |
218 |
+ |
visualInfo = vi[0]; |
219 |
+ |
XFree(vi); |
220 |
+ |
xdepth = visualInfo.depth; |
221 |
+ |
color_class = visualInfo.c_class; |
222 |
+ |
D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth)); |
223 |
+ |
return true; |
224 |
+ |
} |
225 |
+ |
|
226 |
+ |
// Calculate minimum and maximum supported X depth |
227 |
+ |
int min_depth = 1, max_depth = 32; |
228 |
+ |
switch (depth) { |
229 |
+ |
#ifdef ENABLE_VOSF |
230 |
+ |
case VDEPTH_2BIT: |
231 |
+ |
case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit |
232 |
+ |
case VDEPTH_8BIT: |
233 |
+ |
min_depth = 8; |
234 |
+ |
max_depth = 32; |
235 |
+ |
break; |
236 |
+ |
#else |
237 |
+ |
case VDEPTH_2BIT: |
238 |
+ |
case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters |
239 |
+ |
return false; |
240 |
+ |
case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual |
241 |
+ |
min_depth = 8; |
242 |
+ |
max_depth = 8; |
243 |
+ |
break; |
244 |
+ |
#endif |
245 |
+ |
case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual |
246 |
+ |
min_depth = 15; |
247 |
+ |
max_depth = 16; |
248 |
+ |
break; |
249 |
+ |
case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual |
250 |
+ |
min_depth = 24; |
251 |
+ |
max_depth = 32; |
252 |
+ |
break; |
253 |
+ |
} |
254 |
+ |
D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth)); |
255 |
+ |
|
256 |
+ |
// Try to find a visual for one of the color depths |
257 |
+ |
bool visual_found = false; |
258 |
+ |
for (int i=0; i<num_depths && !visual_found; i++) { |
259 |
+ |
|
260 |
+ |
xdepth = avail_depths[i]; |
261 |
+ |
D(bug(" trying to find visual for depth %d\n", xdepth)); |
262 |
+ |
if (xdepth < min_depth || xdepth > max_depth) |
263 |
+ |
continue; |
264 |
+ |
|
265 |
+ |
// Determine best color class for this depth |
266 |
+ |
switch (xdepth) { |
267 |
+ |
case 1: // Try StaticGray or StaticColor |
268 |
+ |
if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo) |
269 |
+ |
|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo)) |
270 |
+ |
visual_found = true; |
271 |
+ |
break; |
272 |
+ |
case 8: // Need PseudoColor |
273 |
+ |
if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo)) |
274 |
+ |
visual_found = true; |
275 |
+ |
break; |
276 |
+ |
case 15: |
277 |
+ |
case 16: |
278 |
+ |
case 24: |
279 |
+ |
case 32: // Try DirectColor first, as this will allow gamma correction |
280 |
+ |
if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo) |
281 |
+ |
|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo)) |
282 |
+ |
visual_found = true; |
283 |
+ |
break; |
284 |
+ |
default: |
285 |
+ |
D(bug(" not a supported depth\n")); |
286 |
+ |
break; |
287 |
+ |
} |
288 |
+ |
} |
289 |
+ |
if (!visual_found) |
290 |
+ |
return false; |
291 |
+ |
|
292 |
+ |
// Visual was found |
293 |
+ |
vis = visualInfo.visual; |
294 |
+ |
color_class = visualInfo.c_class; |
295 |
+ |
D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth)); |
296 |
+ |
#if DEBUG |
297 |
+ |
switch (color_class) { |
298 |
+ |
case StaticGray: D(bug("StaticGray\n")); break; |
299 |
+ |
case GrayScale: D(bug("GrayScale\n")); break; |
300 |
+ |
case StaticColor: D(bug("StaticColor\n")); break; |
301 |
+ |
case PseudoColor: D(bug("PseudoColor\n")); break; |
302 |
+ |
case TrueColor: D(bug("TrueColor\n")); break; |
303 |
+ |
case DirectColor: D(bug("DirectColor\n")); break; |
304 |
+ |
} |
305 |
+ |
#endif |
306 |
+ |
return true; |
307 |
+ |
} |
308 |
+ |
|
309 |
|
// Add mode to list of supported modes |
310 |
|
static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth) |
311 |
|
{ |
351 |
|
InitFrameBufferMapping(); |
352 |
|
#else |
353 |
|
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
240 |
– |
D(bug("Host frame buffer = %p, ", the_buffer)); |
354 |
|
#endif |
355 |
|
D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base)); |
356 |
|
} |
439 |
|
virtual void toggle_mouse_grab(void) {} |
440 |
|
virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); } |
441 |
|
|
442 |
+ |
void disable_mouse_accel(void); |
443 |
+ |
void restore_mouse_accel(void); |
444 |
+ |
|
445 |
|
virtual void grab_mouse(void) {} |
446 |
|
virtual void ungrab_mouse(void) {} |
447 |
|
|
448 |
|
public: |
449 |
|
bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer) |
450 |
|
Window w; // The window we draw into |
451 |
+ |
|
452 |
+ |
int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration |
453 |
|
}; |
454 |
|
|
455 |
|
class driver_window; |
493 |
|
{ |
494 |
|
the_buffer = NULL; |
495 |
|
the_buffer_copy = NULL; |
496 |
+ |
XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold); |
497 |
|
} |
498 |
|
|
499 |
|
driver_base::~driver_base() |
500 |
|
{ |
501 |
|
ungrab_mouse(); |
502 |
+ |
restore_mouse_accel(); |
503 |
|
|
504 |
|
if (w) { |
505 |
|
XUnmapWindow(x_display, w); |
523 |
|
} |
524 |
|
#ifdef ENABLE_VOSF |
525 |
|
else { |
526 |
< |
if (the_buffer != (uint8 *)VM_MAP_FAILED) { |
526 |
> |
// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will |
527 |
> |
if (the_buffer != VM_MAP_FAILED) { |
528 |
> |
D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size)); |
529 |
|
vm_release(the_buffer, the_buffer_size); |
530 |
|
the_buffer = NULL; |
531 |
|
} |
532 |
< |
if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) { |
533 |
< |
vm_release(the_buffer_copy, the_buffer_size); |
532 |
> |
if (the_host_buffer) { |
533 |
> |
D(bug(" freeing the_host_buffer at %p\n", the_host_buffer)); |
534 |
> |
free(the_host_buffer); |
535 |
> |
the_host_buffer = NULL; |
536 |
> |
} |
537 |
> |
if (the_buffer_copy) { |
538 |
> |
D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy)); |
539 |
> |
free(the_buffer_copy); |
540 |
|
the_buffer_copy = NULL; |
541 |
|
} |
542 |
|
} |
546 |
|
// Palette has changed |
547 |
|
void driver_base::update_palette(void) |
548 |
|
{ |
549 |
< |
if (cmap[0] && cmap[1]) { |
550 |
< |
int num = 256; |
551 |
< |
if (IsDirectMode(VideoMonitor.mode)) |
424 |
< |
num = vis->map_entries; // Palette is gamma table |
425 |
< |
else if (vis->c_class == DirectColor) |
549 |
> |
if (color_class == PseudoColor || color_class == DirectColor) { |
550 |
> |
int num = vis->map_entries; |
551 |
> |
if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor) |
552 |
|
return; // Indexed mode on true color screen, don't set CLUT |
553 |
|
XStoreColors(x_display, cmap[0], palette, num); |
554 |
|
XStoreColors(x_display, cmap[1], palette, num); |
556 |
|
XSync(x_display, false); |
557 |
|
} |
558 |
|
|
559 |
+ |
// Disable mouse acceleration |
560 |
+ |
void driver_base::disable_mouse_accel(void) |
561 |
+ |
{ |
562 |
+ |
XChangePointerControl(x_display, True, False, 1, 1, 0); |
563 |
+ |
} |
564 |
+ |
|
565 |
+ |
// Restore mouse acceleration to original value |
566 |
+ |
void driver_base::restore_mouse_accel(void) |
567 |
+ |
{ |
568 |
+ |
XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold); |
569 |
+ |
} |
570 |
+ |
|
571 |
|
|
572 |
|
/* |
573 |
|
* Windowed display driver |
575 |
|
|
576 |
|
// Open display |
577 |
|
driver_window::driver_window(const video_mode &mode) |
578 |
< |
: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0) |
578 |
> |
: gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false) |
579 |
|
{ |
580 |
|
int width = mode.x, height = mode.y; |
581 |
|
int aligned_width = (width + 15) & ~15; |
584 |
|
// Set absolute mouse mode |
585 |
|
ADBSetRelMouseMode(mouse_grabbed); |
586 |
|
|
587 |
< |
// Create window |
587 |
> |
// Create window (setting background_pixel, border_pixel and colormap is |
588 |
> |
// mandatory when using a non-default visual; in 1-bit mode we use the |
589 |
> |
// default visual, so we can also use the default colormap) |
590 |
|
XSetWindowAttributes wattr; |
591 |
|
wattr.event_mask = eventmask = win_eventmask; |
592 |
< |
wattr.background_pixel = black_pixel; |
593 |
< |
wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]); |
592 |
> |
wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0); |
593 |
> |
wattr.border_pixel = 0; |
594 |
> |
wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]); |
595 |
|
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
596 |
< |
InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr); |
596 |
> |
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr); |
597 |
> |
D(bug(" window created\n")); |
598 |
|
|
599 |
|
// Set window name/class |
600 |
|
set_window_name(w, STR_WINDOW_TITLE); |
618 |
|
XFree(hints); |
619 |
|
} |
620 |
|
} |
621 |
+ |
D(bug(" window attributes set\n")); |
622 |
|
|
623 |
|
// Show window |
624 |
|
XMapWindow(x_display, w); |
625 |
|
wait_mapped(w); |
626 |
+ |
D(bug(" window mapped\n")); |
627 |
|
|
628 |
|
// 1-bit mode is big-endian; if the X server is little-endian, we can't |
629 |
|
// use SHM because that doesn't allow changing the image byte order |
634 |
|
|
635 |
|
// Create SHM image ("height + 2" for safety) |
636 |
|
img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height); |
637 |
+ |
D(bug(" shm image created\n")); |
638 |
|
shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777); |
639 |
|
the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0); |
640 |
|
shminfo.shmaddr = img->data = (char *)the_buffer_copy; |
649 |
|
if (shm_error) { |
650 |
|
shmdt(shminfo.shmaddr); |
651 |
|
XDestroyImage(img); |
652 |
+ |
img = NULL; |
653 |
|
shminfo.shmid = -1; |
654 |
|
} else { |
655 |
|
have_shm = true; |
656 |
|
shmctl(shminfo.shmid, IPC_RMID, 0); |
657 |
|
} |
658 |
+ |
D(bug(" shm image attached\n")); |
659 |
|
} |
660 |
|
|
661 |
|
// Create normal X image if SHM doesn't work ("height + 2" for safety) |
663 |
|
int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth))); |
664 |
|
the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row); |
665 |
|
img = XCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row); |
666 |
+ |
D(bug(" X image created\n")); |
667 |
|
} |
668 |
|
|
669 |
|
if (need_msb_image) { |
672 |
|
} |
673 |
|
|
674 |
|
#ifdef ENABLE_VOSF |
675 |
+ |
use_vosf = true; |
676 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
677 |
|
the_host_buffer = the_buffer_copy; |
678 |
|
the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line); |
530 |
– |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
679 |
|
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
680 |
+ |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
681 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
682 |
|
#else |
683 |
|
// Allocate memory for frame buffer |
684 |
|
the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line); |
685 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
686 |
|
#endif |
687 |
|
|
688 |
|
// Create GC |
718 |
|
// Close display |
719 |
|
driver_window::~driver_window() |
720 |
|
{ |
570 |
– |
if (img) |
571 |
– |
XDestroyImage(img); |
721 |
|
if (have_shm) { |
722 |
|
XShmDetach(x_display, &shminfo); |
723 |
+ |
#ifdef ENABLE_VOSF |
724 |
+ |
the_host_buffer = NULL; // don't free() in driver_base dtor |
725 |
+ |
#else |
726 |
|
the_buffer_copy = NULL; // don't free() in driver_base dtor |
727 |
+ |
#endif |
728 |
+ |
} |
729 |
+ |
if (img) { |
730 |
+ |
if (!have_shm) |
731 |
+ |
img->data = NULL; |
732 |
+ |
XDestroyImage(img); |
733 |
+ |
} |
734 |
+ |
if (have_shm) { |
735 |
+ |
shmdt(shminfo.shmaddr); |
736 |
+ |
shmctl(shminfo.shmid, IPC_RMID, 0); |
737 |
|
} |
738 |
|
if (gc) |
739 |
|
XFreeGC(x_display, gc); |
760 |
|
Delay_usec(100000); |
761 |
|
} |
762 |
|
if (result == GrabSuccess) { |
601 |
– |
ADBSetRelMouseMode(mouse_grabbed = true); |
763 |
|
XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED)); |
764 |
< |
XSync(x_display, false); |
764 |
> |
ADBSetRelMouseMode(mouse_grabbed = true); |
765 |
> |
disable_mouse_accel(); |
766 |
|
} |
767 |
|
} |
768 |
|
|
773 |
|
XUngrabPointer(x_display, CurrentTime); |
774 |
|
XStoreName(x_display, w, GetString(STR_WINDOW_TITLE)); |
775 |
|
ADBSetRelMouseMode(mouse_grabbed = false); |
776 |
+ |
restore_mouse_accel(); |
777 |
|
} |
778 |
|
} |
779 |
|
|
869 |
|
#endif |
870 |
|
XUngrabPointer(x_display, CurrentTime); |
871 |
|
XUngrabKeyboard(x_display, CurrentTime); |
872 |
+ |
restore_mouse_accel(); |
873 |
|
XUnmapWindow(x_display, w); |
874 |
|
wait_unmapped(w); |
875 |
|
|
899 |
|
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
900 |
|
XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); |
901 |
|
XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
902 |
+ |
disable_mouse_accel(); |
903 |
|
#ifdef ENABLE_XF86_DGA |
904 |
|
XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); |
905 |
|
XF86DGASetViewPort(x_display, screen, 0, 0); |
1046 |
|
XGrabPointer(x_display, w, True, |
1047 |
|
PointerMotionMask | ButtonPressMask | ButtonReleaseMask, |
1048 |
|
GrabModeAsync, GrabModeAsync, w, None, CurrentTime); |
1049 |
+ |
disable_mouse_accel(); |
1050 |
|
|
1051 |
|
// Calculate bytes per row |
1052 |
|
int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth); |
1053 |
|
|
1054 |
|
// Map frame buffer |
1055 |
< |
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1056 |
< |
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1055 |
> |
the_buffer_size = height * bytes_per_row; |
1056 |
> |
if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1057 |
> |
if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1058 |
|
char str[256]; |
1059 |
|
sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno)); |
1060 |
|
ErrorAlert(str); |
1072 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
1073 |
|
the_host_buffer = the_buffer; |
1074 |
|
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
1075 |
< |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
1075 |
> |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
1076 |
|
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
1077 |
|
} |
1078 |
|
#else |
1093 |
|
// Close display |
1094 |
|
driver_fbdev::~driver_fbdev() |
1095 |
|
{ |
1096 |
+ |
if (!use_vosf) { |
1097 |
+ |
if (the_buffer != MAP_FAILED) { |
1098 |
+ |
// don't free() the screen buffer in driver_base dtor |
1099 |
+ |
munmap(the_buffer, the_buffer_size); |
1100 |
+ |
the_buffer = NULL; |
1101 |
+ |
} |
1102 |
+ |
} |
1103 |
+ |
#ifdef ENABLE_VOSF |
1104 |
+ |
else { |
1105 |
+ |
if (the_host_buffer != MAP_FAILED) { |
1106 |
+ |
// don't free() the screen buffer in driver_base dtor |
1107 |
+ |
munmap(the_host_buffer, the_buffer_size); |
1108 |
+ |
the_host_buffer = NULL; |
1109 |
+ |
} |
1110 |
+ |
} |
1111 |
+ |
#endif |
1112 |
|
} |
1113 |
|
#endif |
1114 |
|
|
1178 |
|
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
1179 |
|
XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); |
1180 |
|
XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
1181 |
+ |
disable_mouse_accel(); |
1182 |
|
|
1183 |
|
int v_width, v_bank, v_size; |
1184 |
|
XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size); |
1195 |
|
|
1196 |
|
// Init blitting routines |
1197 |
|
int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth); |
1198 |
< |
#ifdef VIDEO_VOSF |
1198 |
> |
#if VIDEO_VOSF |
1199 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
1200 |
|
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
1201 |
|
// i.e. the framebuffer update function is not Blit_Copy_Raw |
1205 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
1206 |
|
the_host_buffer = the_buffer; |
1207 |
|
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
1208 |
< |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
1208 |
> |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
1209 |
|
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
1210 |
|
} |
1211 |
|
#else |
1226 |
|
driver_xf86dga::~driver_xf86dga() |
1227 |
|
{ |
1228 |
|
XF86DGADirectVideo(x_display, screen, 0); |
1229 |
+ |
if (!use_vosf) { |
1230 |
+ |
// don't free() the screen buffer in driver_base dtor |
1231 |
+ |
the_buffer = NULL; |
1232 |
+ |
} |
1233 |
+ |
#ifdef ENABLE_VOSF |
1234 |
+ |
else { |
1235 |
+ |
// don't free() the screen buffer in driver_base dtor |
1236 |
+ |
the_host_buffer = NULL; |
1237 |
+ |
} |
1238 |
+ |
#endif |
1239 |
|
#ifdef ENABLE_XF86_VIDMODE |
1240 |
|
if (has_vidmode) |
1241 |
|
XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]); |
1333 |
|
// Open display for specified mode |
1334 |
|
static bool video_open(const video_mode &mode) |
1335 |
|
{ |
1336 |
+ |
D(bug("video_open()\n")); |
1337 |
+ |
|
1338 |
+ |
// Find best available X visual |
1339 |
+ |
if (!find_visual_for_depth(mode.depth)) { |
1340 |
+ |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1341 |
+ |
return false; |
1342 |
+ |
} |
1343 |
+ |
|
1344 |
+ |
// Create color maps |
1345 |
+ |
if (color_class == PseudoColor || color_class == DirectColor) { |
1346 |
+ |
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1347 |
+ |
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1348 |
+ |
} else { |
1349 |
+ |
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone); |
1350 |
+ |
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone); |
1351 |
+ |
} |
1352 |
+ |
|
1353 |
+ |
// Find pixel format of direct modes |
1354 |
+ |
if (color_class == DirectColor || color_class == TrueColor) { |
1355 |
+ |
rshift = gshift = bshift = 0; |
1356 |
+ |
rloss = gloss = bloss = 8; |
1357 |
+ |
uint32 mask; |
1358 |
+ |
for (mask=vis->red_mask; !(mask&1); mask>>=1) |
1359 |
+ |
++rshift; |
1360 |
+ |
for (; mask&1; mask>>=1) |
1361 |
+ |
--rloss; |
1362 |
+ |
for (mask=vis->green_mask; !(mask&1); mask>>=1) |
1363 |
+ |
++gshift; |
1364 |
+ |
for (; mask&1; mask>>=1) |
1365 |
+ |
--gloss; |
1366 |
+ |
for (mask=vis->blue_mask; !(mask&1); mask>>=1) |
1367 |
+ |
++bshift; |
1368 |
+ |
for (; mask&1; mask>>=1) |
1369 |
+ |
--bloss; |
1370 |
+ |
} |
1371 |
+ |
|
1372 |
+ |
// Preset palette pixel values for CLUT or gamma table |
1373 |
+ |
if (color_class == DirectColor) { |
1374 |
+ |
int num = vis->map_entries; |
1375 |
+ |
for (int i=0; i<num; i++) { |
1376 |
+ |
int c = (i * 256) / num; |
1377 |
+ |
palette[i].pixel = map_rgb(c, c, c); |
1378 |
+ |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1379 |
+ |
} |
1380 |
+ |
} else if (color_class == PseudoColor) { |
1381 |
+ |
for (int i=0; i<256; i++) { |
1382 |
+ |
palette[i].pixel = i; |
1383 |
+ |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1384 |
+ |
} |
1385 |
+ |
} |
1386 |
+ |
|
1387 |
|
// Load gray ramp to color map |
1388 |
< |
int num = (vis->c_class == DirectColor ? vis->map_entries : 256); |
1388 |
> |
int num = (color_class == DirectColor ? vis->map_entries : 256); |
1389 |
|
for (int i=0; i<num; i++) { |
1390 |
|
int c = (i * 256) / num; |
1391 |
|
palette[i].red = c * 0x0101; |
1392 |
|
palette[i].green = c * 0x0101; |
1393 |
|
palette[i].blue = c * 0x0101; |
1149 |
– |
if (vis->c_class == PseudoColor) |
1150 |
– |
palette[i].pixel = i; |
1151 |
– |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1394 |
|
} |
1395 |
< |
if (cmap[0] && cmap[1]) { |
1395 |
> |
if (color_class == PseudoColor || color_class == DirectColor) { |
1396 |
|
XStoreColors(x_display, cmap[0], palette, num); |
1397 |
|
XStoreColors(x_display, cmap[1], palette, num); |
1398 |
|
} |
1399 |
|
|
1400 |
|
#ifdef ENABLE_VOSF |
1401 |
|
// Load gray ramp to 8->16/32 expand map |
1402 |
< |
if (!IsDirectMode(mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) |
1402 |
> |
if (!IsDirectMode(mode) && xdepth > 8) |
1403 |
|
for (int i=0; i<256; i++) |
1404 |
|
ExpandMap[i] = map_rgb(i, i, i); |
1405 |
|
#endif |
1430 |
|
|
1431 |
|
#ifdef ENABLE_VOSF |
1432 |
|
if (use_vosf) { |
1433 |
< |
// Initialize the mainBuffer structure |
1434 |
< |
if (!video_init_buffer()) { |
1433 |
> |
// Initialize the VOSF system |
1434 |
> |
if (!video_vosf_init()) { |
1435 |
|
ErrorAlert(STR_VOSF_INIT_ERR); |
1436 |
|
return false; |
1437 |
|
} |
1196 |
– |
|
1197 |
– |
// Initialize the handler for SIGSEGV |
1198 |
– |
if (!sigsegv_install_handler(screen_fault_handler)) { |
1199 |
– |
ErrorAlert("Could not initialize Video on SEGV signals"); |
1200 |
– |
return false; |
1201 |
– |
} |
1438 |
|
} |
1439 |
|
#endif |
1440 |
|
|
1485 |
|
// Find screen and root window |
1486 |
|
screen = XDefaultScreen(x_display); |
1487 |
|
rootwin = XRootWindow(x_display, screen); |
1488 |
< |
|
1489 |
< |
// Get screen depth |
1490 |
< |
xdepth = DefaultDepth(x_display, screen); |
1488 |
> |
|
1489 |
> |
// Get sorted list of available depths |
1490 |
> |
avail_depths = XListDepths(x_display, screen, &num_depths); |
1491 |
> |
if (avail_depths == NULL) { |
1492 |
> |
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1493 |
> |
return false; |
1494 |
> |
} |
1495 |
> |
sort(avail_depths, avail_depths + num_depths); |
1496 |
|
|
1497 |
|
#ifdef ENABLE_FBDEV_DGA |
1498 |
|
// Frame buffer name |
1532 |
|
black_pixel = BlackPixel(x_display, screen); |
1533 |
|
white_pixel = WhitePixel(x_display, screen); |
1534 |
|
|
1294 |
– |
// Get appropriate visual |
1295 |
– |
int color_class; |
1296 |
– |
switch (xdepth) { |
1297 |
– |
case 1: |
1298 |
– |
color_class = StaticGray; |
1299 |
– |
break; |
1300 |
– |
case 8: |
1301 |
– |
color_class = PseudoColor; |
1302 |
– |
break; |
1303 |
– |
case 15: |
1304 |
– |
case 16: |
1305 |
– |
case 24: |
1306 |
– |
case 32: // Try DirectColor first, as this will allow gamma correction |
1307 |
– |
color_class = DirectColor; |
1308 |
– |
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) |
1309 |
– |
color_class = TrueColor; |
1310 |
– |
break; |
1311 |
– |
default: |
1312 |
– |
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1313 |
– |
return false; |
1314 |
– |
} |
1315 |
– |
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) { |
1316 |
– |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1317 |
– |
return false; |
1318 |
– |
} |
1319 |
– |
if (visualInfo.depth != xdepth) { |
1320 |
– |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1321 |
– |
return false; |
1322 |
– |
} |
1323 |
– |
vis = visualInfo.visual; |
1324 |
– |
|
1325 |
– |
// Create color maps |
1326 |
– |
if (color_class == PseudoColor || color_class == DirectColor) { |
1327 |
– |
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1328 |
– |
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1329 |
– |
} |
1330 |
– |
|
1331 |
– |
// Find pixel format of direct modes |
1332 |
– |
if (color_class == DirectColor || color_class == TrueColor) { |
1333 |
– |
rshift = gshift = bshift = 0; |
1334 |
– |
rloss = gloss = bloss = 8; |
1335 |
– |
uint32 mask; |
1336 |
– |
for (mask=vis->red_mask; !(mask&1); mask>>=1) |
1337 |
– |
++rshift; |
1338 |
– |
for (; mask&1; mask>>=1) |
1339 |
– |
--rloss; |
1340 |
– |
for (mask=vis->green_mask; !(mask&1); mask>>=1) |
1341 |
– |
++gshift; |
1342 |
– |
for (; mask&1; mask>>=1) |
1343 |
– |
--gloss; |
1344 |
– |
for (mask=vis->blue_mask; !(mask&1); mask>>=1) |
1345 |
– |
++bshift; |
1346 |
– |
for (; mask&1; mask>>=1) |
1347 |
– |
--bloss; |
1348 |
– |
} |
1349 |
– |
|
1350 |
– |
// Preset palette pixel values for gamma table |
1351 |
– |
if (color_class == DirectColor) { |
1352 |
– |
int num = vis->map_entries; |
1353 |
– |
for (int i=0; i<num; i++) { |
1354 |
– |
int c = (i * 256) / num; |
1355 |
– |
palette[i].pixel = map_rgb(c, c, c); |
1356 |
– |
} |
1357 |
– |
} |
1358 |
– |
|
1535 |
|
// Get screen mode from preferences |
1536 |
|
const char *mode_str; |
1537 |
|
if (classic_mode) |
1566 |
|
default_height = DisplayHeight(x_display, screen); |
1567 |
|
|
1568 |
|
// Mac screen depth follows X depth |
1569 |
< |
video_depth default_depth = DepthModeForPixelDepth(xdepth); |
1569 |
> |
video_depth default_depth = VDEPTH_1BIT; |
1570 |
> |
switch (DefaultDepth(x_display, screen)) { |
1571 |
> |
case 8: |
1572 |
> |
default_depth = VDEPTH_8BIT; |
1573 |
> |
break; |
1574 |
> |
case 15: case 16: |
1575 |
> |
default_depth = VDEPTH_16BIT; |
1576 |
> |
break; |
1577 |
> |
case 24: case 32: |
1578 |
> |
default_depth = VDEPTH_32BIT; |
1579 |
> |
break; |
1580 |
> |
} |
1581 |
|
|
1582 |
|
// Construct list of supported modes |
1583 |
|
if (display_type == DISPLAY_WINDOW) { |
1584 |
|
if (classic) |
1585 |
|
add_mode(512, 342, 0x80, 64, VDEPTH_1BIT); |
1586 |
|
else { |
1587 |
< |
if (default_depth != VDEPTH_1BIT) |
1588 |
< |
add_window_modes(VDEPTH_1BIT); // 1-bit modes are always available |
1589 |
< |
#ifdef ENABLE_VOSF |
1403 |
< |
if (default_depth > VDEPTH_8BIT) { |
1404 |
< |
add_window_modes(VDEPTH_2BIT); // 2, 4 and 8-bit modes are also possible on 16/32-bit screens with VOSF blitters |
1405 |
< |
add_window_modes(VDEPTH_4BIT); |
1406 |
< |
add_window_modes(VDEPTH_8BIT); |
1587 |
> |
for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) { |
1588 |
> |
if (find_visual_for_depth(video_depth(d))) |
1589 |
> |
add_window_modes(video_depth(d)); |
1590 |
|
} |
1408 |
– |
#endif |
1409 |
– |
add_window_modes(default_depth); |
1591 |
|
} |
1592 |
|
} else |
1593 |
|
add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth); |
1594 |
+ |
if (VideoModes.empty()) { |
1595 |
+ |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1596 |
+ |
return false; |
1597 |
+ |
} |
1598 |
+ |
video_init_depth_list(); |
1599 |
+ |
|
1600 |
+ |
#if DEBUG |
1601 |
+ |
D(bug("Available video modes:\n")); |
1602 |
+ |
vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end(); |
1603 |
+ |
while (i != end) { |
1604 |
+ |
int bits = 1 << i->depth; |
1605 |
+ |
if (bits == 16) |
1606 |
+ |
bits = 15; |
1607 |
+ |
else if (bits == 32) |
1608 |
+ |
bits = 24; |
1609 |
+ |
D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits)); |
1610 |
+ |
++i; |
1611 |
+ |
} |
1612 |
+ |
#endif |
1613 |
|
|
1614 |
|
// Find requested default mode and open display |
1615 |
|
if (VideoModes.size() == 1) |
1633 |
|
// Close display |
1634 |
|
static void video_close(void) |
1635 |
|
{ |
1636 |
+ |
D(bug("video_close()\n")); |
1637 |
+ |
|
1638 |
|
// Stop redraw thread |
1639 |
|
#ifdef HAVE_PTHREADS |
1640 |
|
if (redraw_thread_active) { |
1650 |
|
// Unlock frame buffer |
1651 |
|
UNLOCK_FRAME_BUFFER; |
1652 |
|
XSync(x_display, false); |
1653 |
+ |
D(bug(" frame buffer unlocked\n")); |
1654 |
|
|
1655 |
|
#ifdef ENABLE_VOSF |
1453 |
– |
// Deinitialize VOSF |
1656 |
|
if (use_vosf) { |
1657 |
< |
if (mainBuffer.pageInfo) { |
1658 |
< |
free(mainBuffer.pageInfo); |
1457 |
< |
mainBuffer.pageInfo = NULL; |
1458 |
< |
} |
1459 |
< |
if (mainBuffer.dirtyPages) { |
1460 |
< |
free(mainBuffer.dirtyPages); |
1461 |
< |
mainBuffer.dirtyPages = NULL; |
1462 |
< |
} |
1657 |
> |
// Deinitialize VOSF |
1658 |
> |
video_vosf_exit(); |
1659 |
|
} |
1660 |
|
#endif |
1661 |
|
|
1662 |
|
// Close display |
1663 |
|
delete drv; |
1664 |
|
drv = NULL; |
1469 |
– |
} |
1470 |
– |
|
1471 |
– |
void VideoExit(void) |
1472 |
– |
{ |
1473 |
– |
// Close display |
1474 |
– |
video_close(); |
1665 |
|
|
1666 |
|
// Free colormaps |
1667 |
|
if (cmap[0]) { |
1672 |
|
XFreeColormap(x_display, cmap[1]); |
1673 |
|
cmap[1] = 0; |
1674 |
|
} |
1675 |
+ |
} |
1676 |
+ |
|
1677 |
+ |
void VideoExit(void) |
1678 |
+ |
{ |
1679 |
+ |
// Close display |
1680 |
+ |
video_close(); |
1681 |
|
|
1682 |
|
#ifdef ENABLE_XF86_VIDMODE |
1683 |
|
// Free video mode list |
1694 |
|
fbdev_fd = -1; |
1695 |
|
} |
1696 |
|
#endif |
1697 |
+ |
|
1698 |
+ |
// Free depth list |
1699 |
+ |
if (avail_depths) { |
1700 |
+ |
XFree(avail_depths); |
1701 |
+ |
avail_depths = NULL; |
1702 |
+ |
} |
1703 |
|
} |
1704 |
|
|
1705 |
|
|
1741 |
|
|
1742 |
|
// Convert colors to XColor array |
1743 |
|
int num_out = 256; |
1744 |
+ |
bool stretch = false; |
1745 |
|
if (IsDirectMode(VideoMonitor.mode)) { |
1746 |
|
// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries |
1747 |
|
num_out = vis->map_entries; |
1748 |
+ |
stretch = true; |
1749 |
|
} |
1750 |
|
XColor *p = palette; |
1751 |
|
for (int i=0; i<num_out; i++) { |
1752 |
< |
int c = (i * num_in) / num_out; |
1752 |
> |
int c = (stretch ? (i * num_in) / num_out : i); |
1753 |
|
p->red = pal[c*3 + 0] * 0x0101; |
1754 |
|
p->green = pal[c*3 + 1] * 0x0101; |
1755 |
|
p->blue = pal[c*3 + 2] * 0x0101; |
1552 |
– |
if (vis->c_class == PseudoColor) |
1553 |
– |
p->pixel = i; |
1554 |
– |
p->flags = DoRed | DoGreen | DoBlue; |
1756 |
|
p++; |
1757 |
|
} |
1758 |
|
|
1759 |
|
#ifdef ENABLE_VOSF |
1760 |
|
// Recalculate pixel color expansion map |
1761 |
< |
if (!IsDirectMode(VideoMonitor.mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) { |
1761 |
> |
if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) { |
1762 |
|
for (int i=0; i<256; i++) { |
1763 |
|
int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier) |
1764 |
|
ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]); |
1971 |
|
XNextEvent(x_display, &event); |
1972 |
|
|
1973 |
|
switch (event.type) { |
1974 |
+ |
|
1975 |
|
// Mouse button |
1976 |
|
case ButtonPress: { |
1977 |
|
unsigned int button = event.xbutton.button; |
2004 |
|
drv->mouse_moved(event.xmotion.x, event.xmotion.y); |
2005 |
|
break; |
2006 |
|
|
2007 |
+ |
// Mouse entered window |
2008 |
+ |
case EnterNotify: |
2009 |
+ |
if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab) |
2010 |
+ |
drv->mouse_moved(event.xmotion.x, event.xmotion.y); |
2011 |
+ |
break; |
2012 |
+ |
|
2013 |
|
// Keyboard |
2014 |
|
case KeyPress: { |
2015 |
|
int code = -1; |
2187 |
|
static void update_display_static(driver_window *drv) |
2188 |
|
{ |
2189 |
|
// Incremental update code |
2190 |
< |
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
2190 |
> |
unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j; |
2191 |
|
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
2192 |
|
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
2193 |
|
uint8 *p, *p2; |
2346 |
|
{ |
2347 |
|
// Quit DGA mode if requested |
2348 |
|
possibly_quit_dga_mode(); |
2141 |
– |
|
2142 |
– |
// Handle X events |
2143 |
– |
handle_events(); |
2144 |
– |
|
2145 |
– |
// Handle palette changes |
2146 |
– |
handle_palette_changes(); |
2349 |
|
} |
2350 |
|
|
2351 |
|
#ifdef ENABLE_VOSF |
2355 |
|
// Quit DGA mode if requested |
2356 |
|
possibly_quit_dga_mode(); |
2357 |
|
|
2156 |
– |
// Handle X events |
2157 |
– |
handle_events(); |
2158 |
– |
|
2159 |
– |
// Handle palette changes |
2160 |
– |
handle_palette_changes(); |
2161 |
– |
|
2358 |
|
// Update display (VOSF variant) |
2359 |
|
static int tick_counter = 0; |
2360 |
|
if (++tick_counter >= frame_skip) { |
2373 |
|
// Ungrab mouse if requested |
2374 |
|
possibly_ungrab_mouse(); |
2375 |
|
|
2180 |
– |
// Handle X events |
2181 |
– |
handle_events(); |
2182 |
– |
|
2183 |
– |
// Handle palette changes |
2184 |
– |
handle_palette_changes(); |
2185 |
– |
|
2376 |
|
// Update display (VOSF variant) |
2377 |
|
static int tick_counter = 0; |
2378 |
|
if (++tick_counter >= frame_skip) { |
2392 |
|
// Ungrab mouse if requested |
2393 |
|
possibly_ungrab_mouse(); |
2394 |
|
|
2205 |
– |
// Handle X events |
2206 |
– |
handle_events(); |
2207 |
– |
|
2208 |
– |
// Handle_palette changes |
2209 |
– |
handle_palette_changes(); |
2210 |
– |
|
2395 |
|
// Update display (static variant) |
2396 |
|
static int tick_counter = 0; |
2397 |
|
if (++tick_counter >= frame_skip) { |
2405 |
|
// Ungrab mouse if requested |
2406 |
|
possibly_ungrab_mouse(); |
2407 |
|
|
2224 |
– |
// Handle X events |
2225 |
– |
handle_events(); |
2226 |
– |
|
2227 |
– |
// Handle_palette changes |
2228 |
– |
handle_palette_changes(); |
2229 |
– |
|
2408 |
|
// Update display (dynamic variant) |
2409 |
|
static int tick_counter = 0; |
2410 |
|
tick_counter++; |
2440 |
|
} |
2441 |
|
} |
2442 |
|
|
2443 |
+ |
// This function is called on non-threaded platforms from a timer interrupt |
2444 |
|
void VideoRefresh(void) |
2445 |
|
{ |
2446 |
|
// We need to check redraw_thread_active to inhibit refreshed during |
2447 |
|
// mode changes on non-threaded platforms |
2448 |
< |
if (redraw_thread_active) |
2449 |
< |
video_refresh(); |
2448 |
> |
if (!redraw_thread_active) |
2449 |
> |
return; |
2450 |
> |
|
2451 |
> |
// Handle X events |
2452 |
> |
handle_events(); |
2453 |
> |
|
2454 |
> |
// Handle palette changes |
2455 |
> |
handle_palette_changes(); |
2456 |
> |
|
2457 |
> |
// Update display |
2458 |
> |
video_refresh(); |
2459 |
|
} |
2460 |
|
|
2461 |
+ |
const int VIDEO_REFRESH_HZ = 60; |
2462 |
+ |
const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ; |
2463 |
+ |
|
2464 |
|
#ifdef HAVE_PTHREADS |
2465 |
|
static void *redraw_func(void *arg) |
2466 |
|
{ |
2467 |
+ |
int fd = ConnectionNumber(x_display); |
2468 |
+ |
|
2469 |
|
uint64 start = GetTicks_usec(); |
2470 |
|
int64 ticks = 0; |
2471 |
< |
uint64 next = GetTicks_usec(); |
2471 |
> |
uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY; |
2472 |
> |
|
2473 |
|
while (!redraw_thread_cancel) { |
2474 |
< |
video_refresh(); |
2281 |
< |
next += 16667; |
2474 |
> |
|
2475 |
|
int64 delay = next - GetTicks_usec(); |
2476 |
< |
if (delay > 0) |
2477 |
< |
Delay_usec(delay); |
2478 |
< |
else if (delay < -16667) |
2476 |
> |
if (delay < -VIDEO_REFRESH_DELAY) { |
2477 |
> |
|
2478 |
> |
// We are lagging far behind, so we reset the delay mechanism |
2479 |
|
next = GetTicks_usec(); |
2480 |
< |
ticks++; |
2480 |
> |
|
2481 |
> |
} else if (delay <= 0) { |
2482 |
> |
|
2483 |
> |
// Delay expired, refresh display |
2484 |
> |
handle_events(); |
2485 |
> |
handle_palette_changes(); |
2486 |
> |
video_refresh(); |
2487 |
> |
next += VIDEO_REFRESH_DELAY; |
2488 |
> |
ticks++; |
2489 |
> |
|
2490 |
> |
} else { |
2491 |
> |
|
2492 |
> |
// No display refresh pending, check for X events |
2493 |
> |
fd_set readfds; |
2494 |
> |
FD_ZERO(&readfds); |
2495 |
> |
FD_SET(fd, &readfds); |
2496 |
> |
struct timeval timeout; |
2497 |
> |
timeout.tv_sec = 0; |
2498 |
> |
timeout.tv_usec = delay; |
2499 |
> |
if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0) |
2500 |
> |
handle_events(); |
2501 |
> |
} |
2502 |
|
} |
2503 |
+ |
|
2504 |
|
uint64 end = GetTicks_usec(); |
2505 |
< |
// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start)); |
2505 |
> |
D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
2506 |
|
return NULL; |
2507 |
|
} |
2508 |
|
#endif |