24 |
|
* Ctrl-Tab = suspend DGA mode |
25 |
|
* Ctrl-Esc = emergency quit |
26 |
|
* Ctrl-F1 = mount floppy |
27 |
+ |
* Ctrl-F5 = grab mouse (in windowed mode) |
28 |
|
*/ |
29 |
|
|
30 |
|
#include "sysdeps.h" |
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 |
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 |
118 |
– |
static int xdepth; // Depth of X screen |
126 |
|
static Window rootwin; // Root window and our window |
127 |
< |
static XVisualInfo visualInfo; |
128 |
< |
static Visual *vis; |
122 |
< |
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 |
|
|
204 |
|
return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift); |
205 |
|
} |
206 |
|
|
207 |
+ |
// Do we have a visual for handling the specified Mac depth? If so, set the |
208 |
+ |
// global variables "xdepth", "visualInfo", "vis" and "color_class". |
209 |
+ |
static bool find_visual_for_depth(video_depth depth) |
210 |
+ |
{ |
211 |
+ |
D(bug("have_visual_for_depth(%d)\n", 1 << depth)); |
212 |
+ |
|
213 |
+ |
// Calculate minimum and maximum supported X depth |
214 |
+ |
int min_depth = 1, max_depth = 32; |
215 |
+ |
switch (depth) { |
216 |
+ |
case VDEPTH_1BIT: // 1-bit works always and uses default visual |
217 |
+ |
min_depth = max_depth = DefaultDepth(x_display, screen); |
218 |
+ |
break; |
219 |
+ |
#ifdef ENABLE_VOSF |
220 |
+ |
case VDEPTH_2BIT: |
221 |
+ |
case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit |
222 |
+ |
case VDEPTH_8BIT: |
223 |
+ |
min_depth = 8; |
224 |
+ |
max_depth = 32; |
225 |
+ |
break; |
226 |
+ |
#else |
227 |
+ |
case VDEPTH_2BIT: |
228 |
+ |
case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters |
229 |
+ |
return false; |
230 |
+ |
case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual |
231 |
+ |
min_depth = 8; |
232 |
+ |
max_depth = 8; |
233 |
+ |
break; |
234 |
+ |
#endif |
235 |
+ |
case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual |
236 |
+ |
min_depth = 15; |
237 |
+ |
max_depth = 16; |
238 |
+ |
break; |
239 |
+ |
case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual |
240 |
+ |
min_depth = 24; |
241 |
+ |
max_depth = 32; |
242 |
+ |
break; |
243 |
+ |
} |
244 |
+ |
D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth)); |
245 |
+ |
|
246 |
+ |
// Try to find a visual for one of the color depths |
247 |
+ |
bool visual_found = false; |
248 |
+ |
for (int i=0; i<num_depths && !visual_found; i++) { |
249 |
+ |
|
250 |
+ |
xdepth = avail_depths[i]; |
251 |
+ |
D(bug(" trying to find visual for depth %d\n", xdepth)); |
252 |
+ |
if (xdepth < min_depth || xdepth > max_depth) |
253 |
+ |
continue; |
254 |
+ |
|
255 |
+ |
// Determine best color class for this depth |
256 |
+ |
switch (xdepth) { |
257 |
+ |
case 1: // Try StaticGray or StaticColor |
258 |
+ |
if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo) |
259 |
+ |
|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo)) |
260 |
+ |
visual_found = true; |
261 |
+ |
break; |
262 |
+ |
case 8: // Need PseudoColor |
263 |
+ |
if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo)) |
264 |
+ |
visual_found = true; |
265 |
+ |
break; |
266 |
+ |
case 15: |
267 |
+ |
case 16: |
268 |
+ |
case 24: |
269 |
+ |
case 32: // Try DirectColor first, as this will allow gamma correction |
270 |
+ |
if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo) |
271 |
+ |
|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo)) |
272 |
+ |
visual_found = true; |
273 |
+ |
break; |
274 |
+ |
default: |
275 |
+ |
D(bug(" not a supported depth\n")); |
276 |
+ |
break; |
277 |
+ |
} |
278 |
+ |
} |
279 |
+ |
if (!visual_found) |
280 |
+ |
return false; |
281 |
+ |
|
282 |
+ |
// Visual was found |
283 |
+ |
vis = visualInfo.visual; |
284 |
+ |
color_class = visualInfo.c_class; |
285 |
+ |
D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth)); |
286 |
+ |
#if DEBUG |
287 |
+ |
switch (color_class) { |
288 |
+ |
case StaticGray: D(bug("StaticGray\n")); break; |
289 |
+ |
case GrayScale: D(bug("GrayScale\n")); break; |
290 |
+ |
case StaticColor: D(bug("StaticColor\n")); break; |
291 |
+ |
case PseudoColor: D(bug("PseudoColor\n")); break; |
292 |
+ |
case TrueColor: D(bug("TrueColor\n")); break; |
293 |
+ |
case DirectColor: D(bug("DirectColor\n")); break; |
294 |
+ |
} |
295 |
+ |
#endif |
296 |
+ |
return true; |
297 |
+ |
} |
298 |
+ |
|
299 |
|
// Add mode to list of supported modes |
300 |
|
static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth) |
301 |
|
{ |
341 |
|
InitFrameBufferMapping(); |
342 |
|
#else |
343 |
|
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
239 |
– |
D(bug("Host frame buffer = %p, ", the_buffer)); |
344 |
|
#endif |
345 |
|
D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base)); |
346 |
|
} |
426 |
|
virtual void update_palette(void); |
427 |
|
virtual void suspend(void) {} |
428 |
|
virtual void resume(void) {} |
429 |
+ |
virtual void toggle_mouse_grab(void) {} |
430 |
+ |
virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); } |
431 |
+ |
|
432 |
+ |
void disable_mouse_accel(void); |
433 |
+ |
void restore_mouse_accel(void); |
434 |
+ |
|
435 |
+ |
virtual void grab_mouse(void) {} |
436 |
+ |
virtual void ungrab_mouse(void) {} |
437 |
|
|
438 |
|
public: |
439 |
|
bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer) |
440 |
|
Window w; // The window we draw into |
441 |
+ |
|
442 |
+ |
int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration |
443 |
|
}; |
444 |
|
|
445 |
|
class driver_window; |
456 |
|
driver_window(const video_mode &mode); |
457 |
|
~driver_window(); |
458 |
|
|
459 |
+ |
void toggle_mouse_grab(void); |
460 |
+ |
void mouse_moved(int x, int y); |
461 |
+ |
|
462 |
+ |
void grab_mouse(void); |
463 |
+ |
void ungrab_mouse(void); |
464 |
+ |
|
465 |
|
private: |
466 |
|
GC gc; |
467 |
|
XImage *img; |
468 |
< |
bool have_shm; // Flag: SHM extensions available |
468 |
> |
bool have_shm; // Flag: SHM extensions available |
469 |
|
XShmSegmentInfo shminfo; |
470 |
|
Cursor mac_cursor; |
471 |
+ |
bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode |
472 |
+ |
int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode) |
473 |
|
}; |
474 |
|
|
475 |
|
static driver_base *drv = NULL; // Pointer to currently used driver object |
483 |
|
{ |
484 |
|
the_buffer = NULL; |
485 |
|
the_buffer_copy = NULL; |
486 |
+ |
XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold); |
487 |
|
} |
488 |
|
|
489 |
|
driver_base::~driver_base() |
490 |
|
{ |
491 |
+ |
ungrab_mouse(); |
492 |
+ |
restore_mouse_accel(); |
493 |
+ |
|
494 |
|
if (w) { |
495 |
|
XUnmapWindow(x_display, w); |
496 |
|
wait_unmapped(w); |
513 |
|
} |
514 |
|
#ifdef ENABLE_VOSF |
515 |
|
else { |
516 |
< |
if (the_buffer != (uint8 *)VM_MAP_FAILED) { |
517 |
< |
vm_release(the_buffer, the_buffer_size); |
516 |
> |
if (the_host_buffer) { |
517 |
> |
free(the_host_buffer); |
518 |
> |
the_host_buffer = NULL; |
519 |
> |
} |
520 |
> |
if (the_buffer) { |
521 |
> |
free(the_buffer); |
522 |
|
the_buffer = NULL; |
523 |
|
} |
524 |
< |
if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) { |
525 |
< |
vm_release(the_buffer_copy, the_buffer_size); |
524 |
> |
if (the_buffer_copy) { |
525 |
> |
free(the_buffer_copy); |
526 |
|
the_buffer_copy = NULL; |
527 |
|
} |
528 |
|
} |
532 |
|
// Palette has changed |
533 |
|
void driver_base::update_palette(void) |
534 |
|
{ |
535 |
< |
if (cmap[0] && cmap[1]) { |
536 |
< |
int num = 256; |
537 |
< |
if (IsDirectMode(VideoMonitor.mode)) |
408 |
< |
num = vis->map_entries; // Palette is gamma table |
409 |
< |
else if (vis->c_class == DirectColor) |
535 |
> |
if (color_class == PseudoColor || color_class == DirectColor) { |
536 |
> |
int num = vis->map_entries; |
537 |
> |
if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor) |
538 |
|
return; // Indexed mode on true color screen, don't set CLUT |
539 |
|
XStoreColors(x_display, cmap[0], palette, num); |
540 |
|
XStoreColors(x_display, cmap[1], palette, num); |
542 |
|
XSync(x_display, false); |
543 |
|
} |
544 |
|
|
545 |
+ |
// Disable mouse acceleration |
546 |
+ |
void driver_base::disable_mouse_accel(void) |
547 |
+ |
{ |
548 |
+ |
XChangePointerControl(x_display, True, False, 1, 1, 0); |
549 |
+ |
} |
550 |
+ |
|
551 |
+ |
// Restore mouse acceleration to original value |
552 |
+ |
void driver_base::restore_mouse_accel(void) |
553 |
+ |
{ |
554 |
+ |
XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold); |
555 |
+ |
} |
556 |
+ |
|
557 |
|
|
558 |
|
/* |
559 |
|
* Windowed display driver |
561 |
|
|
562 |
|
// Open display |
563 |
|
driver_window::driver_window(const video_mode &mode) |
564 |
< |
: gc(0), img(NULL), have_shm(false), mac_cursor(0) |
564 |
> |
: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0) |
565 |
|
{ |
566 |
|
int width = mode.x, height = mode.y; |
567 |
|
int aligned_width = (width + 15) & ~15; |
568 |
|
int aligned_height = (height + 15) & ~15; |
569 |
|
|
570 |
|
// Set absolute mouse mode |
571 |
< |
ADBSetRelMouseMode(false); |
571 |
> |
ADBSetRelMouseMode(mouse_grabbed); |
572 |
|
|
573 |
< |
// Create window |
573 |
> |
// Create window (setting backround_pixel, border_pixel and colormap is |
574 |
> |
// mandatory when using a non-default visual; in 1-bit mode we use the |
575 |
> |
// default visual, so we can also use the default colormap) |
576 |
|
XSetWindowAttributes wattr; |
577 |
|
wattr.event_mask = eventmask = win_eventmask; |
578 |
< |
wattr.background_pixel = black_pixel; |
579 |
< |
wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]); |
578 |
> |
wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0); |
579 |
> |
wattr.border_pixel = 0; |
580 |
> |
wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]); |
581 |
|
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
582 |
< |
InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr); |
582 |
> |
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr); |
583 |
|
|
584 |
|
// Set window name/class |
585 |
|
set_window_name(w, STR_WINDOW_TITLE); |
631 |
|
if (shm_error) { |
632 |
|
shmdt(shminfo.shmaddr); |
633 |
|
XDestroyImage(img); |
634 |
+ |
img = NULL; |
635 |
|
shminfo.shmid = -1; |
636 |
|
} else { |
637 |
|
have_shm = true; |
652 |
|
} |
653 |
|
|
654 |
|
#ifdef ENABLE_VOSF |
655 |
+ |
use_vosf = true; |
656 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
657 |
|
the_host_buffer = the_buffer_copy; |
658 |
|
the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line); |
659 |
|
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
660 |
|
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
661 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
662 |
|
#else |
663 |
|
// Allocate memory for frame buffer |
664 |
|
the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line); |
665 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
666 |
|
#endif |
667 |
|
|
668 |
|
// Create GC |
698 |
|
// Close display |
699 |
|
driver_window::~driver_window() |
700 |
|
{ |
554 |
– |
if (img) |
555 |
– |
XDestroyImage(img); |
701 |
|
if (have_shm) { |
702 |
|
XShmDetach(x_display, &shminfo); |
703 |
+ |
#ifdef ENABLE_VOSF |
704 |
+ |
the_host_buffer = NULL; // don't free() in driver_base dtor |
705 |
+ |
#else |
706 |
|
the_buffer_copy = NULL; // don't free() in driver_base dtor |
707 |
+ |
#endif |
708 |
+ |
} |
709 |
+ |
#ifdef ENABLE_VOSF |
710 |
+ |
if (use_vosf) { |
711 |
+ |
// don't free() memory mapped buffers in driver_base dtor |
712 |
+ |
if (the_buffer != VM_MAP_FAILED) { |
713 |
+ |
vm_release(the_buffer, the_buffer_size); |
714 |
+ |
the_buffer = NULL; |
715 |
+ |
} |
716 |
+ |
if (the_buffer_copy != VM_MAP_FAILED) { |
717 |
+ |
vm_release(the_buffer_copy, the_buffer_size); |
718 |
+ |
the_buffer_copy = NULL; |
719 |
+ |
} |
720 |
+ |
} |
721 |
+ |
#endif |
722 |
+ |
if (img) |
723 |
+ |
XDestroyImage(img); |
724 |
+ |
if (have_shm) { |
725 |
+ |
shmdt(shminfo.shmaddr); |
726 |
+ |
shmctl(shminfo.shmid, IPC_RMID, 0); |
727 |
|
} |
728 |
|
if (gc) |
729 |
|
XFreeGC(x_display, gc); |
730 |
|
} |
731 |
|
|
732 |
+ |
// Toggle mouse grab |
733 |
+ |
void driver_window::toggle_mouse_grab(void) |
734 |
+ |
{ |
735 |
+ |
if (mouse_grabbed) |
736 |
+ |
ungrab_mouse(); |
737 |
+ |
else |
738 |
+ |
grab_mouse(); |
739 |
+ |
} |
740 |
+ |
|
741 |
+ |
// Grab mouse, switch to relative mouse mode |
742 |
+ |
void driver_window::grab_mouse(void) |
743 |
+ |
{ |
744 |
+ |
int result; |
745 |
+ |
for (int i=0; i<10; i++) { |
746 |
+ |
result = XGrabPointer(x_display, w, True, 0, |
747 |
+ |
GrabModeAsync, GrabModeAsync, w, None, CurrentTime); |
748 |
+ |
if (result != AlreadyGrabbed) |
749 |
+ |
break; |
750 |
+ |
Delay_usec(100000); |
751 |
+ |
} |
752 |
+ |
if (result == GrabSuccess) { |
753 |
+ |
XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED)); |
754 |
+ |
ADBSetRelMouseMode(mouse_grabbed = true); |
755 |
+ |
disable_mouse_accel(); |
756 |
+ |
} |
757 |
+ |
} |
758 |
+ |
|
759 |
+ |
// Ungrab mouse, switch to absolute mouse mode |
760 |
+ |
void driver_window::ungrab_mouse(void) |
761 |
+ |
{ |
762 |
+ |
if (mouse_grabbed) { |
763 |
+ |
XUngrabPointer(x_display, CurrentTime); |
764 |
+ |
XStoreName(x_display, w, GetString(STR_WINDOW_TITLE)); |
765 |
+ |
ADBSetRelMouseMode(mouse_grabbed = false); |
766 |
+ |
restore_mouse_accel(); |
767 |
+ |
} |
768 |
+ |
} |
769 |
+ |
|
770 |
+ |
// Mouse moved |
771 |
+ |
void driver_window::mouse_moved(int x, int y) |
772 |
+ |
{ |
773 |
+ |
if (!mouse_grabbed) { |
774 |
+ |
mouse_last_x = x; mouse_last_y = y; |
775 |
+ |
ADBMouseMoved(x, y); |
776 |
+ |
return; |
777 |
+ |
} |
778 |
+ |
|
779 |
+ |
// Warped mouse motion (this code is taken from SDL) |
780 |
+ |
|
781 |
+ |
// Post first mouse event |
782 |
+ |
int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y; |
783 |
+ |
int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y; |
784 |
+ |
mouse_last_x = x; mouse_last_y = y; |
785 |
+ |
ADBMouseMoved(delta_x, delta_y); |
786 |
+ |
|
787 |
+ |
// Only warp the pointer when it has reached the edge |
788 |
+ |
const int MOUSE_FUDGE_FACTOR = 8; |
789 |
+ |
if (x < MOUSE_FUDGE_FACTOR || x > (width - MOUSE_FUDGE_FACTOR) |
790 |
+ |
|| y < MOUSE_FUDGE_FACTOR || y > (height - MOUSE_FUDGE_FACTOR)) { |
791 |
+ |
XEvent event; |
792 |
+ |
while (XCheckTypedEvent(x_display, MotionNotify, &event)) { |
793 |
+ |
delta_x = x - mouse_last_x; delta_y = y - mouse_last_y; |
794 |
+ |
mouse_last_x = x; mouse_last_y = y; |
795 |
+ |
ADBMouseMoved(delta_x, delta_y); |
796 |
+ |
} |
797 |
+ |
mouse_last_x = width/2; |
798 |
+ |
mouse_last_y = height/2; |
799 |
+ |
XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y); |
800 |
+ |
for (int i=0; i<10; i++) { |
801 |
+ |
XMaskEvent(x_display, PointerMotionMask, &event); |
802 |
+ |
if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR) |
803 |
+ |
&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR) |
804 |
+ |
&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR) |
805 |
+ |
&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR)) |
806 |
+ |
break; |
807 |
+ |
} |
808 |
+ |
} |
809 |
+ |
} |
810 |
+ |
|
811 |
|
|
812 |
|
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
813 |
|
/* |
859 |
|
#endif |
860 |
|
XUngrabPointer(x_display, CurrentTime); |
861 |
|
XUngrabKeyboard(x_display, CurrentTime); |
862 |
+ |
restore_mouse_accel(); |
863 |
|
XUnmapWindow(x_display, w); |
864 |
|
wait_unmapped(w); |
865 |
|
|
887 |
|
XMapRaised(x_display, w); |
888 |
|
wait_mapped(w); |
889 |
|
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
890 |
< |
XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime); |
891 |
< |
XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
890 |
> |
XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); |
891 |
> |
XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
892 |
> |
disable_mouse_accel(); |
893 |
|
#ifdef ENABLE_XF86_DGA |
894 |
|
XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); |
895 |
|
XF86DGASetViewPort(x_display, screen, 0, 0); |
1036 |
|
XGrabPointer(x_display, w, True, |
1037 |
|
PointerMotionMask | ButtonPressMask | ButtonReleaseMask, |
1038 |
|
GrabModeAsync, GrabModeAsync, w, None, CurrentTime); |
1039 |
+ |
disable_mouse_accel(); |
1040 |
|
|
1041 |
|
// Calculate bytes per row |
1042 |
|
int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth); |
1043 |
|
|
1044 |
|
// Map frame buffer |
1045 |
< |
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1046 |
< |
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1045 |
> |
the_buffer_size = height * bytes_per_row; |
1046 |
> |
if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1047 |
> |
if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { |
1048 |
|
char str[256]; |
1049 |
|
sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno)); |
1050 |
|
ErrorAlert(str); |
1083 |
|
// Close display |
1084 |
|
driver_fbdev::~driver_fbdev() |
1085 |
|
{ |
1086 |
+ |
if (!use_vosf) { |
1087 |
+ |
if (the_buffer != MAP_FAILED) { |
1088 |
+ |
// don't free() the screen buffer in driver_base dtor |
1089 |
+ |
munmap(the_buffer, the_buffer_size); |
1090 |
+ |
the_buffer = NULL; |
1091 |
+ |
} |
1092 |
+ |
} |
1093 |
+ |
#ifdef ENABLE_VOSF |
1094 |
+ |
else { |
1095 |
+ |
if (the_host_buffer != MAP_FAILED) { |
1096 |
+ |
// don't free() the screen buffer in driver_base dtor |
1097 |
+ |
munmap(the_host_buffer, the_buffer_size); |
1098 |
+ |
the_host_buffer = NULL; |
1099 |
+ |
} |
1100 |
+ |
if (the_buffer_copy != VM_MAP_FAILED) { |
1101 |
+ |
vm_release(the_buffer_copy, the_buffer_size); |
1102 |
+ |
the_buffer_copy = NULL; |
1103 |
+ |
} |
1104 |
+ |
if (the_buffer != VM_MAP_FAILED) { |
1105 |
+ |
vm_release(the_buffer, the_buffer_size); |
1106 |
+ |
the_buffer = NULL; |
1107 |
+ |
} |
1108 |
+ |
} |
1109 |
+ |
#endif |
1110 |
|
} |
1111 |
|
#endif |
1112 |
|
|
1176 |
|
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
1177 |
|
XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); |
1178 |
|
XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
1179 |
+ |
disable_mouse_accel(); |
1180 |
|
|
1181 |
|
int v_width, v_bank, v_size; |
1182 |
|
XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size); |
1193 |
|
|
1194 |
|
// Init blitting routines |
1195 |
|
int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth); |
1196 |
< |
#ifdef VIDEO_VOSF |
1196 |
> |
#if VIDEO_VOSF |
1197 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
1198 |
|
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
1199 |
|
// i.e. the framebuffer update function is not Blit_Copy_Raw |
1224 |
|
driver_xf86dga::~driver_xf86dga() |
1225 |
|
{ |
1226 |
|
XF86DGADirectVideo(x_display, screen, 0); |
1227 |
+ |
if (!use_vosf) { |
1228 |
+ |
// don't free() the screen buffer in driver_base dtor |
1229 |
+ |
the_buffer = NULL; |
1230 |
+ |
} |
1231 |
+ |
#ifdef ENABLE_VOSF |
1232 |
+ |
else { |
1233 |
+ |
// don't free() the screen buffer in driver_base dtor |
1234 |
+ |
the_host_buffer = NULL; |
1235 |
+ |
|
1236 |
+ |
if (the_buffer_copy != VM_MAP_FAILED) { |
1237 |
+ |
vm_release(the_buffer_copy, the_buffer_size); |
1238 |
+ |
the_buffer_copy = NULL; |
1239 |
+ |
} |
1240 |
+ |
if (the_buffer != VM_MAP_FAILED) { |
1241 |
+ |
vm_release(the_buffer, the_buffer_size); |
1242 |
+ |
the_buffer = NULL; |
1243 |
+ |
} |
1244 |
+ |
} |
1245 |
+ |
#endif |
1246 |
|
#ifdef ENABLE_XF86_VIDMODE |
1247 |
|
if (has_vidmode) |
1248 |
|
XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]); |
1340 |
|
// Open display for specified mode |
1341 |
|
static bool video_open(const video_mode &mode) |
1342 |
|
{ |
1343 |
+ |
// Find best available X visual |
1344 |
+ |
if (!find_visual_for_depth(mode.depth)) { |
1345 |
+ |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1346 |
+ |
return false; |
1347 |
+ |
} |
1348 |
+ |
|
1349 |
+ |
// Create color maps |
1350 |
+ |
if (color_class == PseudoColor || color_class == DirectColor) { |
1351 |
+ |
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1352 |
+ |
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1353 |
+ |
} else { |
1354 |
+ |
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone); |
1355 |
+ |
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone); |
1356 |
+ |
} |
1357 |
+ |
|
1358 |
+ |
// Find pixel format of direct modes |
1359 |
+ |
if (color_class == DirectColor || color_class == TrueColor) { |
1360 |
+ |
rshift = gshift = bshift = 0; |
1361 |
+ |
rloss = gloss = bloss = 8; |
1362 |
+ |
uint32 mask; |
1363 |
+ |
for (mask=vis->red_mask; !(mask&1); mask>>=1) |
1364 |
+ |
++rshift; |
1365 |
+ |
for (; mask&1; mask>>=1) |
1366 |
+ |
--rloss; |
1367 |
+ |
for (mask=vis->green_mask; !(mask&1); mask>>=1) |
1368 |
+ |
++gshift; |
1369 |
+ |
for (; mask&1; mask>>=1) |
1370 |
+ |
--gloss; |
1371 |
+ |
for (mask=vis->blue_mask; !(mask&1); mask>>=1) |
1372 |
+ |
++bshift; |
1373 |
+ |
for (; mask&1; mask>>=1) |
1374 |
+ |
--bloss; |
1375 |
+ |
} |
1376 |
+ |
|
1377 |
+ |
// Preset palette pixel values for CLUT or gamma table |
1378 |
+ |
if (color_class == DirectColor) { |
1379 |
+ |
int num = vis->map_entries; |
1380 |
+ |
for (int i=0; i<num; i++) { |
1381 |
+ |
int c = (i * 256) / num; |
1382 |
+ |
palette[i].pixel = map_rgb(c, c, c); |
1383 |
+ |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1384 |
+ |
} |
1385 |
+ |
} else if (color_class == PseudoColor) { |
1386 |
+ |
for (int i=0; i<256; i++) { |
1387 |
+ |
palette[i].pixel = i; |
1388 |
+ |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1389 |
+ |
} |
1390 |
+ |
} |
1391 |
+ |
|
1392 |
|
// Load gray ramp to color map |
1393 |
< |
int num = (vis->c_class == DirectColor ? vis->map_entries : 256); |
1393 |
> |
int num = (color_class == DirectColor ? vis->map_entries : 256); |
1394 |
|
for (int i=0; i<num; i++) { |
1395 |
|
int c = (i * 256) / num; |
1396 |
|
palette[i].red = c * 0x0101; |
1397 |
|
palette[i].green = c * 0x0101; |
1398 |
|
palette[i].blue = c * 0x0101; |
1055 |
– |
if (vis->c_class == PseudoColor) |
1056 |
– |
palette[i].pixel = i; |
1057 |
– |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1399 |
|
} |
1400 |
< |
if (cmap[0] && cmap[1]) { |
1400 |
> |
if (color_class == PseudoColor || color_class == DirectColor) { |
1401 |
|
XStoreColors(x_display, cmap[0], palette, num); |
1402 |
|
XStoreColors(x_display, cmap[1], palette, num); |
1403 |
|
} |
1404 |
|
|
1405 |
|
#ifdef ENABLE_VOSF |
1406 |
|
// Load gray ramp to 8->16/32 expand map |
1407 |
< |
if (!IsDirectMode(mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) |
1407 |
> |
if (!IsDirectMode(mode) && xdepth > 8) |
1408 |
|
for (int i=0; i<256; i++) |
1409 |
|
ExpandMap[i] = map_rgb(i, i, i); |
1410 |
|
#endif |
1435 |
|
|
1436 |
|
#ifdef ENABLE_VOSF |
1437 |
|
if (use_vosf) { |
1438 |
< |
// Initialize the mainBuffer structure |
1439 |
< |
if (!video_init_buffer()) { |
1438 |
> |
// Initialize the VOSF system |
1439 |
> |
if (!video_vosf_init()) { |
1440 |
|
ErrorAlert(STR_VOSF_INIT_ERR); |
1441 |
|
return false; |
1442 |
|
} |
1102 |
– |
|
1103 |
– |
// Initialize the handler for SIGSEGV |
1104 |
– |
if (!sigsegv_install_handler(screen_fault_handler)) { |
1105 |
– |
ErrorAlert("Could not initialize Video on SEGV signals"); |
1106 |
– |
return false; |
1107 |
– |
} |
1443 |
|
} |
1444 |
|
#endif |
1445 |
|
|
1490 |
|
// Find screen and root window |
1491 |
|
screen = XDefaultScreen(x_display); |
1492 |
|
rootwin = XRootWindow(x_display, screen); |
1493 |
< |
|
1494 |
< |
// Get screen depth |
1495 |
< |
xdepth = DefaultDepth(x_display, screen); |
1493 |
> |
|
1494 |
> |
// Get sorted list of available depths |
1495 |
> |
avail_depths = XListDepths(x_display, screen, &num_depths); |
1496 |
> |
if (avail_depths == NULL) { |
1497 |
> |
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1498 |
> |
return false; |
1499 |
> |
} |
1500 |
> |
sort(avail_depths, avail_depths + num_depths); |
1501 |
|
|
1502 |
|
#ifdef ENABLE_FBDEV_DGA |
1503 |
|
// Frame buffer name |
1537 |
|
black_pixel = BlackPixel(x_display, screen); |
1538 |
|
white_pixel = WhitePixel(x_display, screen); |
1539 |
|
|
1200 |
– |
// Get appropriate visual |
1201 |
– |
int color_class; |
1202 |
– |
switch (xdepth) { |
1203 |
– |
case 1: |
1204 |
– |
color_class = StaticGray; |
1205 |
– |
break; |
1206 |
– |
case 8: |
1207 |
– |
color_class = PseudoColor; |
1208 |
– |
break; |
1209 |
– |
case 15: |
1210 |
– |
case 16: |
1211 |
– |
case 24: |
1212 |
– |
case 32: // Try DirectColor first, as this will allow gamma correction |
1213 |
– |
color_class = DirectColor; |
1214 |
– |
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) |
1215 |
– |
color_class = TrueColor; |
1216 |
– |
break; |
1217 |
– |
default: |
1218 |
– |
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1219 |
– |
return false; |
1220 |
– |
} |
1221 |
– |
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) { |
1222 |
– |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1223 |
– |
return false; |
1224 |
– |
} |
1225 |
– |
if (visualInfo.depth != xdepth) { |
1226 |
– |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1227 |
– |
return false; |
1228 |
– |
} |
1229 |
– |
vis = visualInfo.visual; |
1230 |
– |
|
1231 |
– |
// Create color maps |
1232 |
– |
if (color_class == PseudoColor || color_class == DirectColor) { |
1233 |
– |
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1234 |
– |
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1235 |
– |
} |
1236 |
– |
|
1237 |
– |
// Find pixel format of direct modes |
1238 |
– |
if (color_class == DirectColor || color_class == TrueColor) { |
1239 |
– |
rshift = gshift = bshift = 0; |
1240 |
– |
rloss = gloss = bloss = 8; |
1241 |
– |
uint32 mask; |
1242 |
– |
for (mask=vis->red_mask; !(mask&1); mask>>=1) |
1243 |
– |
++rshift; |
1244 |
– |
for (; mask&1; mask>>=1) |
1245 |
– |
--rloss; |
1246 |
– |
for (mask=vis->green_mask; !(mask&1); mask>>=1) |
1247 |
– |
++gshift; |
1248 |
– |
for (; mask&1; mask>>=1) |
1249 |
– |
--gloss; |
1250 |
– |
for (mask=vis->blue_mask; !(mask&1); mask>>=1) |
1251 |
– |
++bshift; |
1252 |
– |
for (; mask&1; mask>>=1) |
1253 |
– |
--bloss; |
1254 |
– |
} |
1255 |
– |
|
1256 |
– |
// Preset palette pixel values for gamma table |
1257 |
– |
if (color_class == DirectColor) { |
1258 |
– |
int num = vis->map_entries; |
1259 |
– |
for (int i=0; i<num; i++) { |
1260 |
– |
int c = (i * 256) / num; |
1261 |
– |
palette[i].pixel = map_rgb(c, c, c); |
1262 |
– |
} |
1263 |
– |
} |
1264 |
– |
|
1540 |
|
// Get screen mode from preferences |
1541 |
|
const char *mode_str; |
1542 |
|
if (classic_mode) |
1571 |
|
default_height = DisplayHeight(x_display, screen); |
1572 |
|
|
1573 |
|
// Mac screen depth follows X depth |
1574 |
< |
video_depth default_depth = DepthModeForPixelDepth(xdepth); |
1574 |
> |
video_depth default_depth = VDEPTH_1BIT; |
1575 |
> |
switch (DefaultDepth(x_display, screen)) { |
1576 |
> |
case 8: |
1577 |
> |
default_depth = VDEPTH_8BIT; |
1578 |
> |
break; |
1579 |
> |
case 15: case 16: |
1580 |
> |
default_depth = VDEPTH_16BIT; |
1581 |
> |
break; |
1582 |
> |
case 24: case 32: |
1583 |
> |
default_depth = VDEPTH_32BIT; |
1584 |
> |
break; |
1585 |
> |
} |
1586 |
|
|
1587 |
|
// Construct list of supported modes |
1588 |
|
if (display_type == DISPLAY_WINDOW) { |
1589 |
|
if (classic) |
1590 |
|
add_mode(512, 342, 0x80, 64, VDEPTH_1BIT); |
1591 |
|
else { |
1592 |
< |
if (default_depth != VDEPTH_1BIT) |
1593 |
< |
add_window_modes(VDEPTH_1BIT); // 1-bit modes are always available |
1594 |
< |
#ifdef ENABLE_VOSF |
1309 |
< |
if (default_depth > VDEPTH_8BIT) { |
1310 |
< |
add_window_modes(VDEPTH_2BIT); // 2, 4 and 8-bit modes are also possible on 16/32-bit screens with VOSF blitters |
1311 |
< |
add_window_modes(VDEPTH_4BIT); |
1312 |
< |
add_window_modes(VDEPTH_8BIT); |
1592 |
> |
for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) { |
1593 |
> |
if (find_visual_for_depth(video_depth(d))) |
1594 |
> |
add_window_modes(video_depth(d)); |
1595 |
|
} |
1314 |
– |
#endif |
1315 |
– |
add_window_modes(default_depth); |
1596 |
|
} |
1597 |
|
} else |
1598 |
|
add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth); |
1599 |
+ |
if (VideoModes.empty()) { |
1600 |
+ |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1601 |
+ |
return false; |
1602 |
+ |
} |
1603 |
+ |
video_init_depth_list(); |
1604 |
+ |
|
1605 |
+ |
#if DEBUG |
1606 |
+ |
D(bug("Available video modes:\n")); |
1607 |
+ |
vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end(); |
1608 |
+ |
while (i != end) { |
1609 |
+ |
int bits = 1 << i->depth; |
1610 |
+ |
if (bits == 16) |
1611 |
+ |
bits = 15; |
1612 |
+ |
else if (bits == 32) |
1613 |
+ |
bits = 24; |
1614 |
+ |
D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits)); |
1615 |
+ |
++i; |
1616 |
+ |
} |
1617 |
+ |
#endif |
1618 |
|
|
1619 |
|
// Find requested default mode and open display |
1620 |
|
if (VideoModes.size() == 1) |
1655 |
|
XSync(x_display, false); |
1656 |
|
|
1657 |
|
#ifdef ENABLE_VOSF |
1359 |
– |
// Deinitialize VOSF |
1658 |
|
if (use_vosf) { |
1659 |
< |
if (mainBuffer.pageInfo) { |
1660 |
< |
free(mainBuffer.pageInfo); |
1363 |
< |
mainBuffer.pageInfo = NULL; |
1364 |
< |
} |
1365 |
< |
if (mainBuffer.dirtyPages) { |
1366 |
< |
free(mainBuffer.dirtyPages); |
1367 |
< |
mainBuffer.dirtyPages = NULL; |
1368 |
< |
} |
1659 |
> |
// Deinitialize VOSF |
1660 |
> |
video_vosf_exit(); |
1661 |
|
} |
1662 |
|
#endif |
1663 |
|
|
1664 |
|
// Close display |
1665 |
|
delete drv; |
1666 |
|
drv = NULL; |
1375 |
– |
} |
1376 |
– |
|
1377 |
– |
void VideoExit(void) |
1378 |
– |
{ |
1379 |
– |
// Close display |
1380 |
– |
video_close(); |
1667 |
|
|
1668 |
|
// Free colormaps |
1669 |
|
if (cmap[0]) { |
1674 |
|
XFreeColormap(x_display, cmap[1]); |
1675 |
|
cmap[1] = 0; |
1676 |
|
} |
1677 |
+ |
} |
1678 |
+ |
|
1679 |
+ |
void VideoExit(void) |
1680 |
+ |
{ |
1681 |
+ |
// Close display |
1682 |
+ |
video_close(); |
1683 |
|
|
1684 |
|
#ifdef ENABLE_XF86_VIDMODE |
1685 |
|
// Free video mode list |
1696 |
|
fbdev_fd = -1; |
1697 |
|
} |
1698 |
|
#endif |
1699 |
+ |
|
1700 |
+ |
// Free depth list |
1701 |
+ |
if (avail_depths) { |
1702 |
+ |
XFree(avail_depths); |
1703 |
+ |
avail_depths = NULL; |
1704 |
+ |
} |
1705 |
|
} |
1706 |
|
|
1707 |
|
|
1743 |
|
|
1744 |
|
// Convert colors to XColor array |
1745 |
|
int num_out = 256; |
1746 |
+ |
bool stretch = false; |
1747 |
|
if (IsDirectMode(VideoMonitor.mode)) { |
1748 |
|
// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries |
1749 |
|
num_out = vis->map_entries; |
1750 |
+ |
stretch = true; |
1751 |
|
} |
1752 |
|
XColor *p = palette; |
1753 |
|
for (int i=0; i<num_out; i++) { |
1754 |
< |
int c = (i * num_in) / num_out; |
1754 |
> |
int c = (stretch ? (i * num_in) / num_out : i); |
1755 |
|
p->red = pal[c*3 + 0] * 0x0101; |
1756 |
|
p->green = pal[c*3 + 1] * 0x0101; |
1757 |
|
p->blue = pal[c*3 + 2] * 0x0101; |
1458 |
– |
if (vis->c_class == PseudoColor) |
1459 |
– |
p->pixel = i; |
1460 |
– |
p->flags = DoRed | DoGreen | DoBlue; |
1758 |
|
p++; |
1759 |
|
} |
1760 |
|
|
1761 |
|
#ifdef ENABLE_VOSF |
1762 |
|
// Recalculate pixel color expansion map |
1763 |
< |
if (!IsDirectMode(VideoMonitor.mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) { |
1763 |
> |
if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) { |
1764 |
|
for (int i=0; i<256; i++) { |
1765 |
< |
int c = i % num_in; // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier) |
1765 |
> |
int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier) |
1766 |
|
ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]); |
1767 |
|
} |
1768 |
|
|
1799 |
|
|
1800 |
|
|
1801 |
|
/* |
1802 |
< |
* Translate key event to Mac keycode |
1802 |
> |
* Translate key event to Mac keycode, returns -1 if no keycode was found |
1803 |
> |
* and -2 if the key was recognized as a hotkey |
1804 |
|
*/ |
1805 |
|
|
1806 |
< |
static int kc_decode(KeySym ks) |
1806 |
> |
static int kc_decode(KeySym ks, bool key_down) |
1807 |
|
{ |
1808 |
|
switch (ks) { |
1809 |
|
case XK_A: case XK_a: return 0x00; |
1856 |
|
case XK_period: case XK_greater: return 0x2f; |
1857 |
|
case XK_slash: case XK_question: return 0x2c; |
1858 |
|
|
1859 |
< |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
1562 |
< |
case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30; |
1563 |
< |
#else |
1564 |
< |
case XK_Tab: return 0x30; |
1565 |
< |
#endif |
1859 |
> |
case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30; |
1860 |
|
case XK_Return: return 0x24; |
1861 |
|
case XK_space: return 0x31; |
1862 |
|
case XK_BackSpace: return 0x33; |
1890 |
|
case XK_Left: return 0x3b; |
1891 |
|
case XK_Right: return 0x3c; |
1892 |
|
|
1893 |
< |
case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35; |
1893 |
> |
case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35; |
1894 |
|
|
1895 |
< |
case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a; |
1895 |
> |
case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a; |
1896 |
|
case XK_F2: return 0x78; |
1897 |
|
case XK_F3: return 0x63; |
1898 |
|
case XK_F4: return 0x76; |
1899 |
< |
case XK_F5: return 0x60; |
1899 |
> |
case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60; |
1900 |
|
case XK_F6: return 0x61; |
1901 |
|
case XK_F7: return 0x62; |
1902 |
|
case XK_F8: return 0x64; |
1944 |
|
return -1; |
1945 |
|
} |
1946 |
|
|
1947 |
< |
static int event2keycode(XKeyEvent &ev) |
1947 |
> |
static int event2keycode(XKeyEvent &ev, bool key_down) |
1948 |
|
{ |
1949 |
|
KeySym ks; |
1656 |
– |
int as; |
1950 |
|
int i = 0; |
1951 |
|
|
1952 |
|
do { |
1953 |
|
ks = XLookupKeysym(&ev, i++); |
1954 |
< |
as = kc_decode(ks); |
1955 |
< |
if (as != -1) |
1954 |
> |
int as = kc_decode(ks, key_down); |
1955 |
> |
if (as >= 0) |
1956 |
> |
return as; |
1957 |
> |
if (as == -2) |
1958 |
|
return as; |
1959 |
|
} while (ks != NoSymbol); |
1960 |
|
|
1973 |
|
XNextEvent(x_display, &event); |
1974 |
|
|
1975 |
|
switch (event.type) { |
1976 |
+ |
|
1977 |
|
// Mouse button |
1978 |
|
case ButtonPress: { |
1979 |
|
unsigned int button = event.xbutton.button; |
2002 |
|
} |
2003 |
|
|
2004 |
|
// Mouse moved |
1709 |
– |
case EnterNotify: |
2005 |
|
case MotionNotify: |
2006 |
< |
ADBMouseMoved(event.xmotion.x, event.xmotion.y); |
2006 |
> |
drv->mouse_moved(event.xmotion.x, event.xmotion.y); |
2007 |
> |
break; |
2008 |
> |
|
2009 |
> |
// Mouse entered window |
2010 |
> |
case EnterNotify: |
2011 |
> |
if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab) |
2012 |
> |
drv->mouse_moved(event.xmotion.x, event.xmotion.y); |
2013 |
|
break; |
2014 |
|
|
2015 |
|
// Keyboard |
2016 |
|
case KeyPress: { |
2017 |
< |
int code; |
2017 |
> |
int code = -1; |
2018 |
|
if (use_keycodes) { |
2019 |
< |
event2keycode(event.xkey); // This is called to process the hotkeys |
2020 |
< |
code = keycode_table[event.xkey.keycode & 0xff]; |
2019 |
> |
if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys |
2020 |
> |
code = keycode_table[event.xkey.keycode & 0xff]; |
2021 |
|
} else |
2022 |
< |
code = event2keycode(event.xkey); |
2023 |
< |
if (code != -1) { |
2022 |
> |
code = event2keycode(event.xkey, true); |
2023 |
> |
if (code >= 0) { |
2024 |
|
if (!emul_suspended) { |
2025 |
|
if (code == 0x39) { // Caps Lock pressed |
2026 |
|
if (caps_on) { |
2042 |
|
break; |
2043 |
|
} |
2044 |
|
case KeyRelease: { |
2045 |
< |
int code; |
2045 |
> |
int code = -1; |
2046 |
|
if (use_keycodes) { |
2047 |
< |
event2keycode(event.xkey); // This is called to process the hotkeys |
2048 |
< |
code = keycode_table[event.xkey.keycode & 0xff]; |
2047 |
> |
if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys |
2048 |
> |
code = keycode_table[event.xkey.keycode & 0xff]; |
2049 |
|
} else |
2050 |
< |
code = event2keycode(event.xkey); |
2051 |
< |
if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases |
2050 |
> |
code = event2keycode(event.xkey, false); |
2051 |
> |
if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases |
2052 |
|
ADBKeyUp(code); |
2053 |
|
if (code == 0x36) |
2054 |
|
ctrl_down = false; |
2312 |
|
|
2313 |
|
static inline void possibly_quit_dga_mode() |
2314 |
|
{ |
2315 |
< |
// Quit DGA mode if requested |
2315 |
> |
// Quit DGA mode if requested (something terrible has happened and we |
2316 |
> |
// want to give control back to the user) |
2317 |
|
if (quit_full_screen) { |
2318 |
|
quit_full_screen = false; |
2319 |
|
delete drv; |
2321 |
|
} |
2322 |
|
} |
2323 |
|
|
2324 |
+ |
static inline void possibly_ungrab_mouse() |
2325 |
+ |
{ |
2326 |
+ |
// Ungrab mouse if requested (something terrible has happened and we |
2327 |
+ |
// want to give control back to the user) |
2328 |
+ |
if (quit_full_screen) { |
2329 |
+ |
quit_full_screen = false; |
2330 |
+ |
if (drv) |
2331 |
+ |
drv->ungrab_mouse(); |
2332 |
+ |
} |
2333 |
+ |
} |
2334 |
+ |
|
2335 |
|
static inline void handle_palette_changes(void) |
2336 |
|
{ |
2337 |
|
LOCK_PALETTE; |
2348 |
|
{ |
2349 |
|
// Quit DGA mode if requested |
2350 |
|
possibly_quit_dga_mode(); |
2038 |
– |
|
2039 |
– |
// Handle X events |
2040 |
– |
handle_events(); |
2041 |
– |
|
2042 |
– |
// Handle palette changes |
2043 |
– |
handle_palette_changes(); |
2351 |
|
} |
2352 |
|
|
2353 |
|
#ifdef ENABLE_VOSF |
2357 |
|
// Quit DGA mode if requested |
2358 |
|
possibly_quit_dga_mode(); |
2359 |
|
|
2053 |
– |
// Handle X events |
2054 |
– |
handle_events(); |
2055 |
– |
|
2056 |
– |
// Handle palette changes |
2057 |
– |
handle_palette_changes(); |
2058 |
– |
|
2360 |
|
// Update display (VOSF variant) |
2361 |
|
static int tick_counter = 0; |
2362 |
|
if (++tick_counter >= frame_skip) { |
2372 |
|
|
2373 |
|
static void video_refresh_window_vosf(void) |
2374 |
|
{ |
2375 |
< |
// Quit DGA mode if requested |
2376 |
< |
possibly_quit_dga_mode(); |
2076 |
< |
|
2077 |
< |
// Handle X events |
2078 |
< |
handle_events(); |
2079 |
< |
|
2080 |
< |
// Handle palette changes |
2081 |
< |
handle_palette_changes(); |
2375 |
> |
// Ungrab mouse if requested |
2376 |
> |
possibly_ungrab_mouse(); |
2377 |
|
|
2378 |
|
// Update display (VOSF variant) |
2379 |
|
static int tick_counter = 0; |
2391 |
|
|
2392 |
|
static void video_refresh_window_static(void) |
2393 |
|
{ |
2394 |
< |
// Handle X events |
2395 |
< |
handle_events(); |
2396 |
< |
|
2102 |
< |
// Handle_palette changes |
2103 |
< |
handle_palette_changes(); |
2104 |
< |
|
2394 |
> |
// Ungrab mouse if requested |
2395 |
> |
possibly_ungrab_mouse(); |
2396 |
> |
|
2397 |
|
// Update display (static variant) |
2398 |
|
static int tick_counter = 0; |
2399 |
|
if (++tick_counter >= frame_skip) { |
2404 |
|
|
2405 |
|
static void video_refresh_window_dynamic(void) |
2406 |
|
{ |
2407 |
< |
// Handle X events |
2408 |
< |
handle_events(); |
2409 |
< |
|
2118 |
< |
// Handle_palette changes |
2119 |
< |
handle_palette_changes(); |
2120 |
< |
|
2407 |
> |
// Ungrab mouse if requested |
2408 |
> |
possibly_ungrab_mouse(); |
2409 |
> |
|
2410 |
|
// Update display (dynamic variant) |
2411 |
|
static int tick_counter = 0; |
2412 |
|
tick_counter++; |
2442 |
|
} |
2443 |
|
} |
2444 |
|
|
2445 |
+ |
// This function is called on non-threaded platforms from a timer interrupt |
2446 |
|
void VideoRefresh(void) |
2447 |
|
{ |
2448 |
|
// We need to check redraw_thread_active to inhibit refreshed during |
2449 |
|
// mode changes on non-threaded platforms |
2450 |
< |
if (redraw_thread_active) |
2451 |
< |
video_refresh(); |
2450 |
> |
if (!redraw_thread_active) |
2451 |
> |
return; |
2452 |
> |
|
2453 |
> |
// Handle X events |
2454 |
> |
handle_events(); |
2455 |
> |
|
2456 |
> |
// Handle palette changes |
2457 |
> |
handle_palette_changes(); |
2458 |
> |
|
2459 |
> |
// Update display |
2460 |
> |
video_refresh(); |
2461 |
|
} |
2462 |
|
|
2463 |
+ |
const int VIDEO_REFRESH_HZ = 60; |
2464 |
+ |
const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ; |
2465 |
+ |
|
2466 |
|
#ifdef HAVE_PTHREADS |
2467 |
|
static void *redraw_func(void *arg) |
2468 |
|
{ |
2469 |
+ |
int fd = ConnectionNumber(x_display); |
2470 |
+ |
|
2471 |
|
uint64 start = GetTicks_usec(); |
2472 |
|
int64 ticks = 0; |
2473 |
< |
uint64 next = GetTicks_usec(); |
2473 |
> |
uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY; |
2474 |
> |
|
2475 |
|
while (!redraw_thread_cancel) { |
2476 |
< |
video_refresh(); |
2172 |
< |
next += 16667; |
2476 |
> |
|
2477 |
|
int64 delay = next - GetTicks_usec(); |
2478 |
< |
if (delay > 0) |
2479 |
< |
Delay_usec(delay); |
2480 |
< |
else if (delay < -16667) |
2478 |
> |
if (delay < -VIDEO_REFRESH_DELAY) { |
2479 |
> |
|
2480 |
> |
// We are lagging far behind, so we reset the delay mechanism |
2481 |
|
next = GetTicks_usec(); |
2482 |
< |
ticks++; |
2482 |
> |
|
2483 |
> |
} else if (delay <= 0) { |
2484 |
> |
|
2485 |
> |
// Delay expired, refresh display |
2486 |
> |
handle_events(); |
2487 |
> |
handle_palette_changes(); |
2488 |
> |
video_refresh(); |
2489 |
> |
next += VIDEO_REFRESH_DELAY; |
2490 |
> |
ticks++; |
2491 |
> |
|
2492 |
> |
} else { |
2493 |
> |
|
2494 |
> |
// No display refresh pending, check for X events |
2495 |
> |
fd_set readfds; |
2496 |
> |
FD_ZERO(&readfds); |
2497 |
> |
FD_SET(fd, &readfds); |
2498 |
> |
struct timeval timeout; |
2499 |
> |
timeout.tv_sec = 0; |
2500 |
> |
timeout.tv_usec = delay; |
2501 |
> |
if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0) |
2502 |
> |
handle_events(); |
2503 |
> |
} |
2504 |
|
} |
2505 |
+ |
|
2506 |
|
uint64 end = GetTicks_usec(); |
2507 |
< |
// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start)); |
2507 |
> |
D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
2508 |
|
return NULL; |
2509 |
|
} |
2510 |
|
#endif |