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-2005 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 |
39 |
|
|
40 |
|
#include <algorithm> |
41 |
|
|
42 |
– |
#ifndef NO_STD_NAMESPACE |
43 |
– |
using std::sort; |
44 |
– |
#endif |
45 |
– |
|
42 |
|
#ifdef HAVE_PTHREADS |
43 |
|
# include <pthread.h> |
44 |
|
#endif |
62 |
|
#include "prefs.h" |
63 |
|
#include "user_strings.h" |
64 |
|
#include "video.h" |
65 |
+ |
#include "video_blit.h" |
66 |
|
|
67 |
|
#define DEBUG 0 |
68 |
|
#include "debug.h" |
69 |
|
|
70 |
|
|
71 |
+ |
// Supported video modes |
72 |
+ |
static vector<video_mode> VideoModes; |
73 |
+ |
|
74 |
|
// Display types |
75 |
|
enum { |
76 |
|
DISPLAY_WINDOW, // X11 window, using MIT SHM extensions if possible |
97 |
|
|
98 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
99 |
|
#ifdef HAVE_PTHREADS |
100 |
+ |
static pthread_attr_t redraw_thread_attr; // Redraw thread attributes |
101 |
|
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread |
102 |
+ |
static volatile bool redraw_thread_cancel_ack; // Flag: Acknowledge for redraw thread cancellation |
103 |
|
static pthread_t redraw_thread; // Redraw thread |
104 |
|
#endif |
105 |
|
|
124 |
|
static int keycode_table[256]; // X keycode -> Mac keycode translation table |
125 |
|
|
126 |
|
// X11 variables |
127 |
+ |
char *x_display_name = NULL; // X11 display name |
128 |
+ |
Display *x_display = NULL; // X11 display handle |
129 |
|
static int screen; // Screen number |
130 |
|
static Window rootwin; // Root window and our window |
131 |
|
static int num_depths = 0; // Number of available X depths |
135 |
|
static int eventmask; |
136 |
|
|
137 |
|
static int xdepth; // Depth of X screen |
138 |
+ |
static VisualFormat visualFormat; |
139 |
|
static XVisualInfo visualInfo; |
140 |
|
static Visual *vis; |
141 |
|
static int color_class; |
142 |
|
|
143 |
+ |
static bool x_native_byte_order; // XImage has native byte order? |
144 |
|
static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes |
145 |
|
|
146 |
|
static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them) |
147 |
|
|
148 |
< |
static XColor palette[256]; // Color palette to be used as CLUT and gamma table |
149 |
< |
static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
148 |
> |
static XColor x_palette[256]; // Color palette to be used as CLUT and gamma table |
149 |
> |
static bool x_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
150 |
|
|
151 |
|
#ifdef ENABLE_FBDEV_DGA |
152 |
|
static int fbdev_fd = -1; |
159 |
|
|
160 |
|
// Mutex to protect palette |
161 |
|
#ifdef HAVE_PTHREADS |
162 |
< |
static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; |
163 |
< |
#define LOCK_PALETTE pthread_mutex_lock(&palette_lock) |
164 |
< |
#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock) |
162 |
> |
static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER; |
163 |
> |
#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock) |
164 |
> |
#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock) |
165 |
|
#else |
166 |
|
#define LOCK_PALETTE |
167 |
|
#define UNLOCK_PALETTE |
190 |
|
|
191 |
|
// Prototypes |
192 |
|
static void *redraw_func(void *arg); |
187 |
– |
static int event2keycode(XKeyEvent &ev); |
193 |
|
|
194 |
|
// From main_unix.cpp |
195 |
|
extern char *x_display_name; |
196 |
|
extern Display *x_display; |
197 |
+ |
extern void *vm_acquire_mac(size_t size); |
198 |
|
|
199 |
|
// From sys_unix.cpp |
200 |
|
extern void SysMountFirstFloppy(void); |
201 |
|
|
202 |
+ |
// From clip_unix.cpp |
203 |
+ |
extern void ClipboardSelectionClear(XSelectionClearEvent *); |
204 |
+ |
extern void ClipboardSelectionRequest(XSelectionRequestEvent *); |
205 |
+ |
|
206 |
+ |
|
207 |
+ |
/* |
208 |
+ |
* monitor_desc subclass for X11 display |
209 |
+ |
*/ |
210 |
+ |
|
211 |
+ |
class X11_monitor_desc : public monitor_desc { |
212 |
+ |
public: |
213 |
+ |
X11_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {} |
214 |
+ |
~X11_monitor_desc() {} |
215 |
+ |
|
216 |
+ |
virtual void switch_to_current_mode(void); |
217 |
+ |
virtual void set_palette(uint8 *pal, int num); |
218 |
+ |
|
219 |
+ |
bool video_open(void); |
220 |
+ |
void video_close(void); |
221 |
+ |
}; |
222 |
+ |
|
223 |
|
|
224 |
|
/* |
225 |
|
* Utility functions |
226 |
|
*/ |
227 |
|
|
228 |
+ |
// Map video_mode depth ID to numerical depth value |
229 |
+ |
static inline int depth_of_video_mode(video_mode const & mode) |
230 |
+ |
{ |
231 |
+ |
int depth = -1; |
232 |
+ |
switch (mode.depth) { |
233 |
+ |
case VDEPTH_1BIT: |
234 |
+ |
depth = 1; |
235 |
+ |
break; |
236 |
+ |
case VDEPTH_2BIT: |
237 |
+ |
depth = 2; |
238 |
+ |
break; |
239 |
+ |
case VDEPTH_4BIT: |
240 |
+ |
depth = 4; |
241 |
+ |
break; |
242 |
+ |
case VDEPTH_8BIT: |
243 |
+ |
depth = 8; |
244 |
+ |
break; |
245 |
+ |
case VDEPTH_16BIT: |
246 |
+ |
depth = 16; |
247 |
+ |
break; |
248 |
+ |
case VDEPTH_32BIT: |
249 |
+ |
depth = 32; |
250 |
+ |
break; |
251 |
+ |
default: |
252 |
+ |
abort(); |
253 |
+ |
} |
254 |
+ |
return depth; |
255 |
+ |
} |
256 |
+ |
|
257 |
|
// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals) |
258 |
< |
static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue) |
258 |
> |
static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue, bool fix_byte_order = false) |
259 |
|
{ |
260 |
< |
return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift); |
260 |
> |
uint32 val = ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift); |
261 |
> |
if (fix_byte_order && !x_native_byte_order) { |
262 |
> |
// We have to fix byte order in the ExpandMap[] |
263 |
> |
// NOTE: this is only an optimization since Screen_blitter_init() |
264 |
> |
// could be arranged to choose an NBO or OBO (with |
265 |
> |
// byteswapping) Blit_Expand_X_To_Y() function |
266 |
> |
switch (visualFormat.depth) { |
267 |
> |
case 15: case 16: |
268 |
> |
val = do_byteswap_16(val); |
269 |
> |
break; |
270 |
> |
case 24: case 32: |
271 |
> |
val = do_byteswap_32(val); |
272 |
> |
break; |
273 |
> |
} |
274 |
> |
} |
275 |
> |
return val; |
276 |
|
} |
277 |
|
|
278 |
|
// Do we have a visual for handling the specified Mac depth? If so, set the |
281 |
|
{ |
282 |
|
D(bug("have_visual_for_depth(%d)\n", 1 << depth)); |
283 |
|
|
284 |
+ |
// 1-bit works always and uses default visual |
285 |
+ |
if (depth == VDEPTH_1BIT) { |
286 |
+ |
vis = DefaultVisual(x_display, screen); |
287 |
+ |
visualInfo.visualid = XVisualIDFromVisual(vis); |
288 |
+ |
int num = 0; |
289 |
+ |
XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num); |
290 |
+ |
visualInfo = vi[0]; |
291 |
+ |
XFree(vi); |
292 |
+ |
xdepth = visualInfo.depth; |
293 |
+ |
color_class = visualInfo.c_class; |
294 |
+ |
D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth)); |
295 |
+ |
return true; |
296 |
+ |
} |
297 |
+ |
|
298 |
|
// Calculate minimum and maximum supported X depth |
299 |
|
int min_depth = 1, max_depth = 32; |
300 |
|
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; |
301 |
|
#ifdef ENABLE_VOSF |
302 |
|
case VDEPTH_2BIT: |
303 |
|
case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit |
403 |
|
} |
404 |
|
|
405 |
|
// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac) |
406 |
< |
static void set_mac_frame_buffer(video_depth depth, bool native_byte_order) |
406 |
> |
static void set_mac_frame_buffer(X11_monitor_desc &monitor, video_depth depth, bool native_byte_order) |
407 |
|
{ |
408 |
|
#if !REAL_ADDRESSING && !DIRECT_ADDRESSING |
409 |
|
int layout = FLAYOUT_DIRECT; |
415 |
|
MacFrameLayout = layout; |
416 |
|
else |
417 |
|
MacFrameLayout = FLAYOUT_DIRECT; |
418 |
< |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
418 |
> |
monitor.set_mac_frame_base(MacFrameBaseMac); |
419 |
|
|
420 |
|
// Set variables used by UAE memory banking |
421 |
+ |
const video_mode &mode = monitor.get_current_mode(); |
422 |
|
MacFrameBaseHost = the_buffer; |
423 |
< |
MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y; |
423 |
> |
MacFrameSize = mode.bytes_per_row * mode.y; |
424 |
|
InitFrameBufferMapping(); |
425 |
|
#else |
426 |
< |
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
426 |
> |
monitor.set_mac_frame_base(Host2MacAddr(the_buffer)); |
427 |
|
#endif |
428 |
< |
D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base)); |
428 |
> |
D(bug("monitor.mac_frame_base = %08x\n", monitor.get_mac_frame_base())); |
429 |
|
} |
430 |
|
|
431 |
|
// Set window name and class |
503 |
|
|
504 |
|
class driver_base { |
505 |
|
public: |
506 |
< |
driver_base(); |
506 |
> |
driver_base(X11_monitor_desc &m); |
507 |
|
virtual ~driver_base(); |
508 |
|
|
509 |
|
virtual void update_palette(void); |
519 |
|
virtual void ungrab_mouse(void) {} |
520 |
|
|
521 |
|
public: |
522 |
+ |
X11_monitor_desc &monitor; // Associated video monitor |
523 |
+ |
const video_mode &mode; // Video mode handled by the driver |
524 |
+ |
|
525 |
|
bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer) |
526 |
|
Window w; // The window we draw into |
527 |
|
|
539 |
|
friend void update_display_static(driver_window *drv); |
540 |
|
|
541 |
|
public: |
542 |
< |
driver_window(const video_mode &mode); |
542 |
> |
driver_window(X11_monitor_desc &monitor); |
543 |
|
~driver_window(); |
544 |
|
|
545 |
|
void toggle_mouse_grab(void); |
558 |
|
int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode) |
559 |
|
}; |
560 |
|
|
561 |
+ |
class driver_dga; |
562 |
+ |
static void update_display_dga_vosf(driver_dga *drv); |
563 |
+ |
|
564 |
+ |
class driver_dga : public driver_base { |
565 |
+ |
friend void update_display_dga_vosf(driver_dga *drv); |
566 |
+ |
|
567 |
+ |
public: |
568 |
+ |
driver_dga(X11_monitor_desc &monitor); |
569 |
+ |
~driver_dga(); |
570 |
+ |
|
571 |
+ |
void suspend(void); |
572 |
+ |
void resume(void); |
573 |
+ |
|
574 |
+ |
protected: |
575 |
+ |
struct FakeXImage { |
576 |
+ |
int width, height; // size of image |
577 |
+ |
int depth; // depth of image |
578 |
+ |
int bytes_per_line; // accelerator to next line |
579 |
+ |
|
580 |
+ |
FakeXImage(int w, int h, int d) |
581 |
+ |
: width(w), height(h), depth(d) |
582 |
+ |
{ bytes_per_line = TrivialBytesPerRow(width, DepthModeForPixelDepth(depth)); } |
583 |
+ |
}; |
584 |
+ |
FakeXImage *img; |
585 |
+ |
|
586 |
+ |
private: |
587 |
+ |
Window suspend_win; // "Suspend" information window |
588 |
+ |
void *fb_save; // Saved frame buffer for suspend/resume |
589 |
+ |
}; |
590 |
+ |
|
591 |
|
static driver_base *drv = NULL; // Pointer to currently used driver object |
592 |
|
|
593 |
|
#ifdef ENABLE_VOSF |
594 |
|
# include "video_vosf.h" |
595 |
|
#endif |
596 |
|
|
597 |
< |
driver_base::driver_base() |
598 |
< |
: init_ok(false), w(0) |
597 |
> |
driver_base::driver_base(X11_monitor_desc &m) |
598 |
> |
: monitor(m), mode(m.get_current_mode()), init_ok(false), w(0) |
599 |
|
{ |
600 |
|
the_buffer = NULL; |
601 |
|
the_buffer_copy = NULL; |
629 |
|
} |
630 |
|
#ifdef ENABLE_VOSF |
631 |
|
else { |
632 |
+ |
// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will |
633 |
+ |
if (the_buffer != VM_MAP_FAILED) { |
634 |
+ |
D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size)); |
635 |
+ |
vm_release(the_buffer, the_buffer_size); |
636 |
+ |
the_buffer = NULL; |
637 |
+ |
} |
638 |
|
if (the_host_buffer) { |
639 |
+ |
D(bug(" freeing the_host_buffer at %p\n", the_host_buffer)); |
640 |
|
free(the_host_buffer); |
641 |
|
the_host_buffer = NULL; |
642 |
|
} |
520 |
– |
if (the_buffer) { |
521 |
– |
free(the_buffer); |
522 |
– |
the_buffer = NULL; |
523 |
– |
} |
643 |
|
if (the_buffer_copy) { |
644 |
+ |
D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy)); |
645 |
|
free(the_buffer_copy); |
646 |
|
the_buffer_copy = NULL; |
647 |
|
} |
654 |
|
{ |
655 |
|
if (color_class == PseudoColor || color_class == DirectColor) { |
656 |
|
int num = vis->map_entries; |
657 |
< |
if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor) |
657 |
> |
if (!IsDirectMode(monitor.get_current_mode()) && color_class == DirectColor) |
658 |
|
return; // Indexed mode on true color screen, don't set CLUT |
659 |
< |
XStoreColors(x_display, cmap[0], palette, num); |
660 |
< |
XStoreColors(x_display, cmap[1], palette, num); |
659 |
> |
XStoreColors(x_display, cmap[0], x_palette, num); |
660 |
> |
XStoreColors(x_display, cmap[1], x_palette, num); |
661 |
|
} |
662 |
|
XSync(x_display, false); |
663 |
|
} |
680 |
|
*/ |
681 |
|
|
682 |
|
// Open display |
683 |
< |
driver_window::driver_window(const video_mode &mode) |
684 |
< |
: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0) |
683 |
> |
driver_window::driver_window(X11_monitor_desc &m) |
684 |
> |
: driver_base(m), gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false) |
685 |
|
{ |
686 |
|
int width = mode.x, height = mode.y; |
687 |
|
int aligned_width = (width + 15) & ~15; |
690 |
|
// Set absolute mouse mode |
691 |
|
ADBSetRelMouseMode(mouse_grabbed); |
692 |
|
|
693 |
< |
// Create window (setting backround_pixel, border_pixel and colormap is |
693 |
> |
// Create window (setting background_pixel, border_pixel and colormap is |
694 |
|
// mandatory when using a non-default visual; in 1-bit mode we use the |
695 |
|
// default visual, so we can also use the default colormap) |
696 |
|
XSetWindowAttributes wattr; |
700 |
|
wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]); |
701 |
|
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
702 |
|
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr); |
703 |
+ |
D(bug(" window created\n")); |
704 |
|
|
705 |
|
// Set window name/class |
706 |
|
set_window_name(w, STR_WINDOW_TITLE); |
724 |
|
XFree(hints); |
725 |
|
} |
726 |
|
} |
727 |
+ |
D(bug(" window attributes set\n")); |
728 |
|
|
729 |
|
// Show window |
730 |
|
XMapWindow(x_display, w); |
731 |
|
wait_mapped(w); |
732 |
+ |
D(bug(" window mapped\n")); |
733 |
|
|
734 |
|
// 1-bit mode is big-endian; if the X server is little-endian, we can't |
735 |
|
// use SHM because that doesn't allow changing the image byte order |
740 |
|
|
741 |
|
// Create SHM image ("height + 2" for safety) |
742 |
|
img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height); |
743 |
+ |
D(bug(" shm image created\n")); |
744 |
|
shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777); |
745 |
|
the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0); |
746 |
|
shminfo.shmaddr = img->data = (char *)the_buffer_copy; |
761 |
|
have_shm = true; |
762 |
|
shmctl(shminfo.shmid, IPC_RMID, 0); |
763 |
|
} |
764 |
+ |
D(bug(" shm image attached\n")); |
765 |
|
} |
766 |
|
|
767 |
|
// Create normal X image if SHM doesn't work ("height + 2" for safety) |
769 |
|
int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth))); |
770 |
|
the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row); |
771 |
|
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); |
772 |
+ |
D(bug(" X image created\n")); |
773 |
|
} |
774 |
|
|
775 |
|
if (need_msb_image) { |
782 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
783 |
|
the_host_buffer = the_buffer_copy; |
784 |
|
the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line); |
785 |
< |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
786 |
< |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
785 |
> |
the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size); |
786 |
> |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
787 |
|
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
788 |
|
#else |
789 |
|
// Allocate memory for frame buffer |
803 |
|
XDefineCursor(x_display, w, mac_cursor); |
804 |
|
|
805 |
|
// Init blitting routines |
680 |
– |
bool native_byte_order; |
681 |
– |
#ifdef WORDS_BIGENDIAN |
682 |
– |
native_byte_order = (XImageByteOrder(x_display) == MSBFirst); |
683 |
– |
#else |
684 |
– |
native_byte_order = (XImageByteOrder(x_display) == LSBFirst); |
685 |
– |
#endif |
806 |
|
#ifdef ENABLE_VOSF |
807 |
< |
Screen_blitter_init(&visualInfo, native_byte_order, mode.depth); |
807 |
> |
Screen_blitter_init(visualFormat, x_native_byte_order, depth_of_video_mode(mode)); |
808 |
|
#endif |
809 |
|
|
810 |
< |
// Set VideoMonitor |
811 |
< |
VideoMonitor.mode = mode; |
692 |
< |
set_mac_frame_buffer(mode.depth, native_byte_order); |
810 |
> |
// Set frame buffer base |
811 |
> |
set_mac_frame_buffer(monitor, mode.depth, x_native_byte_order); |
812 |
|
|
813 |
|
// Everything went well |
814 |
|
init_ok = true; |
825 |
|
the_buffer_copy = NULL; // don't free() in driver_base dtor |
826 |
|
#endif |
827 |
|
} |
828 |
< |
#ifdef ENABLE_VOSF |
829 |
< |
if (use_vosf) { |
830 |
< |
// 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) |
828 |
> |
if (img) { |
829 |
> |
if (!have_shm) |
830 |
> |
img->data = NULL; |
831 |
|
XDestroyImage(img); |
832 |
+ |
} |
833 |
|
if (have_shm) { |
834 |
|
shmdt(shminfo.shmaddr); |
835 |
|
shmctl(shminfo.shmid, IPC_RMID, 0); |
888 |
|
// Warped mouse motion (this code is taken from SDL) |
889 |
|
|
890 |
|
// Post first mouse event |
891 |
< |
int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y; |
891 |
> |
int width = monitor.get_current_mode().x, height = monitor.get_current_mode().y; |
892 |
|
int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y; |
893 |
|
mouse_last_x = x; mouse_last_y = y; |
894 |
|
ADBMouseMoved(delta_x, delta_y); |
923 |
|
* DGA display driver base class |
924 |
|
*/ |
925 |
|
|
926 |
< |
class driver_dga : public driver_base { |
927 |
< |
public: |
819 |
< |
driver_dga(); |
820 |
< |
~driver_dga(); |
821 |
< |
|
822 |
< |
void suspend(void); |
823 |
< |
void resume(void); |
824 |
< |
|
825 |
< |
private: |
826 |
< |
Window suspend_win; // "Suspend" information window |
827 |
< |
void *fb_save; // Saved frame buffer for suspend/resume |
828 |
< |
}; |
829 |
< |
|
830 |
< |
driver_dga::driver_dga() |
831 |
< |
: suspend_win(0), fb_save(NULL) |
926 |
> |
driver_dga::driver_dga(X11_monitor_desc &m) |
927 |
> |
: driver_base(m), suspend_win(0), fb_save(NULL), img(NULL) |
928 |
|
{ |
929 |
|
} |
930 |
|
|
932 |
|
{ |
933 |
|
XUngrabPointer(x_display, CurrentTime); |
934 |
|
XUngrabKeyboard(x_display, CurrentTime); |
935 |
+ |
|
936 |
+ |
if (img) |
937 |
+ |
delete img; |
938 |
|
} |
939 |
|
|
940 |
|
// Suspend emulation |
948 |
|
LOCK_FRAME_BUFFER; |
949 |
|
|
950 |
|
// Save frame buffer |
951 |
< |
fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
951 |
> |
fb_save = malloc(mode.y * mode.bytes_per_row); |
952 |
|
if (fb_save) |
953 |
< |
memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
953 |
> |
memcpy(fb_save, the_buffer, mode.y * mode.bytes_per_row); |
954 |
|
|
955 |
|
// Close full screen display |
956 |
|
#ifdef ENABLE_XF86_DGA |
1003 |
|
LOCK_VOSF; |
1004 |
|
PFLAG_SET_ALL; |
1005 |
|
UNLOCK_VOSF; |
1006 |
< |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
1006 |
> |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
1007 |
|
} |
1008 |
|
#endif |
1009 |
|
|
1013 |
|
// Don't copy fb_save to the temporary frame buffer in VOSF mode |
1014 |
|
if (!use_vosf) |
1015 |
|
#endif |
1016 |
< |
memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
1016 |
> |
memcpy(the_buffer, fb_save, mode.y * mode.bytes_per_row); |
1017 |
|
free(fb_save); |
1018 |
|
fb_save = NULL; |
1019 |
|
} |
1035 |
|
|
1036 |
|
class driver_fbdev : public driver_dga { |
1037 |
|
public: |
1038 |
< |
driver_fbdev(const video_mode &mode); |
1038 |
> |
driver_fbdev(X11_monitor_desc &monitor); |
1039 |
|
~driver_fbdev(); |
1040 |
|
}; |
1041 |
|
|
1042 |
|
// Open display |
1043 |
< |
driver_fbdev::driver_fbdev(const video_mode &mode) |
1043 |
> |
driver_fbdev::driver_fbdev(X11_monitor_desc &m) : driver_dga(m) |
1044 |
|
{ |
1045 |
|
int width = mode.x, height = mode.y; |
1046 |
|
|
1088 |
|
if ((line[0] == '#') || (line[0] == ';') || (line[0] == '\0')) |
1089 |
|
continue; |
1090 |
|
|
1091 |
< |
if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3) |
1091 |
> |
if ((sscanf(line, "%19s %d %x", fb_name, &fb_depth, &fb_offset) == 3) |
1092 |
|
&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) { |
1093 |
|
device_found = true; |
1094 |
|
break; |
1155 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
1156 |
|
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
1157 |
|
// i.e. the framebuffer update function is not Blit_Copy_Raw |
1158 |
< |
use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth); |
1158 |
> |
use_vosf = Screen_blitter_init(visualFormat, true, mode.depth); |
1159 |
|
|
1160 |
|
if (use_vosf) { |
1161 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
1162 |
|
the_host_buffer = the_buffer; |
1163 |
|
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
1164 |
< |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
1165 |
< |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
1164 |
> |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
1165 |
> |
the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size); |
1166 |
> |
|
1167 |
> |
// Fake image for DGA/VOSF mode to know about display bounds |
1168 |
> |
img = new FakeXImage(width, height, depth_of_video_mode(mode)); |
1169 |
|
} |
1170 |
|
#else |
1171 |
|
use_vosf = false; |
1172 |
|
#endif |
1173 |
|
#endif |
1174 |
|
|
1175 |
< |
// Set VideoMonitor |
1176 |
< |
VideoModes[0].bytes_per_row = bytes_per_row; |
1177 |
< |
VideoModes[0].depth = DepthModeForPixelDepth(fb_depth); |
1178 |
< |
VideoMonitor.mode = mode; |
1077 |
< |
set_mac_frame_buffer(mode.depth, true); |
1175 |
> |
// Set frame buffer base |
1176 |
> |
const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row; |
1177 |
> |
const_cast<video_mode *>(&mode)->depth = DepthModeForPixelDepth(fb_depth); |
1178 |
> |
set_mac_frame_buffer(monitor, mode.depth, true); |
1179 |
|
|
1180 |
|
// Everything went well |
1181 |
|
init_ok = true; |
1198 |
|
munmap(the_host_buffer, the_buffer_size); |
1199 |
|
the_host_buffer = NULL; |
1200 |
|
} |
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 |
– |
} |
1201 |
|
} |
1202 |
|
#endif |
1203 |
|
} |
1211 |
|
|
1212 |
|
class driver_xf86dga : public driver_dga { |
1213 |
|
public: |
1214 |
< |
driver_xf86dga(const video_mode &mode); |
1214 |
> |
driver_xf86dga(X11_monitor_desc &monitor); |
1215 |
|
~driver_xf86dga(); |
1216 |
|
|
1217 |
|
void update_palette(void); |
1222 |
|
}; |
1223 |
|
|
1224 |
|
// Open display |
1225 |
< |
driver_xf86dga::driver_xf86dga(const video_mode &mode) |
1226 |
< |
: current_dga_cmap(0) |
1225 |
> |
driver_xf86dga::driver_xf86dga(X11_monitor_desc &m) |
1226 |
> |
: driver_dga(m), current_dga_cmap(0) |
1227 |
|
{ |
1228 |
|
int width = mode.x, height = mode.y; |
1229 |
|
|
1250 |
|
XSetWindowAttributes wattr; |
1251 |
|
wattr.event_mask = eventmask = dga_eventmask; |
1252 |
|
wattr.override_redirect = True; |
1253 |
+ |
wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]); |
1254 |
|
|
1255 |
|
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
1256 |
< |
InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr); |
1256 |
> |
InputOutput, vis, CWEventMask | CWOverrideRedirect | |
1257 |
> |
(color_class == DirectColor ? CWColormap : 0), &wattr); |
1258 |
|
|
1259 |
|
// Set window name/class |
1260 |
|
set_window_name(w, STR_WINDOW_TITLE); |
1288 |
|
|
1289 |
|
// Init blitting routines |
1290 |
|
int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth); |
1291 |
< |
#if VIDEO_VOSF |
1291 |
> |
#if ENABLE_VOSF |
1292 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
1293 |
|
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
1294 |
|
// i.e. the framebuffer update function is not Blit_Copy_Raw |
1295 |
< |
use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth); |
1295 |
> |
use_vosf = Screen_blitter_init(visualFormat, x_native_byte_order, depth_of_video_mode(mode)); |
1296 |
|
|
1297 |
|
if (use_vosf) { |
1298 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
1299 |
|
the_host_buffer = the_buffer; |
1300 |
|
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
1301 |
< |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
1302 |
< |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
1301 |
> |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
1302 |
> |
the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size); |
1303 |
> |
|
1304 |
> |
// Fake image for DGA/VOSF mode to know about display bounds |
1305 |
> |
img = new FakeXImage((v_width + 7) & ~7, height, depth_of_video_mode(mode)); |
1306 |
|
} |
1307 |
|
#else |
1308 |
|
use_vosf = false; |
1309 |
|
#endif |
1310 |
|
#endif |
1311 |
|
|
1312 |
< |
// Set VideoMonitor |
1312 |
> |
// Set frame buffer base |
1313 |
|
const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row; |
1314 |
< |
VideoMonitor.mode = mode; |
1217 |
< |
set_mac_frame_buffer(mode.depth, true); |
1314 |
> |
set_mac_frame_buffer(monitor, mode.depth, true); |
1315 |
|
|
1316 |
|
// Everything went well |
1317 |
|
init_ok = true; |
1329 |
|
else { |
1330 |
|
// don't free() the screen buffer in driver_base dtor |
1331 |
|
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 |
– |
} |
1332 |
|
} |
1333 |
|
#endif |
1334 |
|
#ifdef ENABLE_XF86_VIDMODE |
1342 |
|
{ |
1343 |
|
driver_dga::update_palette(); |
1344 |
|
current_dga_cmap ^= 1; |
1345 |
< |
if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap]) |
1345 |
> |
if (!IsDirectMode(monitor.get_current_mode()) && cmap[current_dga_cmap]) |
1346 |
|
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
1347 |
|
} |
1348 |
|
|
1350 |
|
void driver_xf86dga::resume(void) |
1351 |
|
{ |
1352 |
|
driver_dga::resume(); |
1353 |
< |
if (!IsDirectMode(VideoMonitor.mode)) |
1353 |
> |
if (!IsDirectMode(monitor.get_current_mode())) |
1354 |
|
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
1355 |
|
} |
1356 |
|
#endif |
1384 |
|
|
1385 |
|
// Search for server vendor string, then read keycodes |
1386 |
|
const char *vendor = ServerVendor(x_display); |
1387 |
+ |
// Force use of MacX mappings on MacOS X with Apple's X server |
1388 |
+ |
int dummy; |
1389 |
+ |
if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy)) |
1390 |
+ |
vendor = "MacX"; |
1391 |
|
bool vendor_found = false; |
1392 |
|
char line[256]; |
1393 |
|
while (fgets(line, 255, f)) { |
1429 |
|
} |
1430 |
|
} |
1431 |
|
|
1432 |
< |
// Open display for specified mode |
1433 |
< |
static bool video_open(const video_mode &mode) |
1432 |
> |
// Open display for current mode |
1433 |
> |
bool X11_monitor_desc::video_open(void) |
1434 |
|
{ |
1435 |
+ |
D(bug("video_open()\n")); |
1436 |
+ |
const video_mode &mode = get_current_mode(); |
1437 |
+ |
|
1438 |
|
// Find best available X visual |
1439 |
|
if (!find_visual_for_depth(mode.depth)) { |
1440 |
|
ErrorAlert(STR_NO_XVISUAL_ERR); |
1441 |
|
return false; |
1442 |
|
} |
1443 |
|
|
1444 |
+ |
// Determine the byte order of an XImage content |
1445 |
+ |
#ifdef WORDS_BIGENDIAN |
1446 |
+ |
x_native_byte_order = (XImageByteOrder(x_display) == MSBFirst); |
1447 |
+ |
#else |
1448 |
+ |
x_native_byte_order = (XImageByteOrder(x_display) == LSBFirst); |
1449 |
+ |
#endif |
1450 |
+ |
|
1451 |
+ |
// Build up visualFormat structure |
1452 |
+ |
visualFormat.fullscreen = (display_type == DISPLAY_DGA); |
1453 |
+ |
visualFormat.depth = visualInfo.depth; |
1454 |
+ |
visualFormat.Rmask = visualInfo.red_mask; |
1455 |
+ |
visualFormat.Gmask = visualInfo.green_mask; |
1456 |
+ |
visualFormat.Bmask = visualInfo.blue_mask; |
1457 |
+ |
|
1458 |
|
// Create color maps |
1459 |
|
if (color_class == PseudoColor || color_class == DirectColor) { |
1460 |
|
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1488 |
|
int num = vis->map_entries; |
1489 |
|
for (int i=0; i<num; i++) { |
1490 |
|
int c = (i * 256) / num; |
1491 |
< |
palette[i].pixel = map_rgb(c, c, c); |
1492 |
< |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1491 |
> |
x_palette[i].pixel = map_rgb(c, c, c); |
1492 |
> |
x_palette[i].flags = DoRed | DoGreen | DoBlue; |
1493 |
|
} |
1494 |
|
} else if (color_class == PseudoColor) { |
1495 |
|
for (int i=0; i<256; i++) { |
1496 |
< |
palette[i].pixel = i; |
1497 |
< |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1496 |
> |
x_palette[i].pixel = i; |
1497 |
> |
x_palette[i].flags = DoRed | DoGreen | DoBlue; |
1498 |
|
} |
1499 |
|
} |
1500 |
|
|
1502 |
|
int num = (color_class == DirectColor ? vis->map_entries : 256); |
1503 |
|
for (int i=0; i<num; i++) { |
1504 |
|
int c = (i * 256) / num; |
1505 |
< |
palette[i].red = c * 0x0101; |
1506 |
< |
palette[i].green = c * 0x0101; |
1507 |
< |
palette[i].blue = c * 0x0101; |
1505 |
> |
x_palette[i].red = c * 0x0101; |
1506 |
> |
x_palette[i].green = c * 0x0101; |
1507 |
> |
x_palette[i].blue = c * 0x0101; |
1508 |
|
} |
1509 |
|
if (color_class == PseudoColor || color_class == DirectColor) { |
1510 |
< |
XStoreColors(x_display, cmap[0], palette, num); |
1511 |
< |
XStoreColors(x_display, cmap[1], palette, num); |
1510 |
> |
XStoreColors(x_display, cmap[0], x_palette, num); |
1511 |
> |
XStoreColors(x_display, cmap[1], x_palette, num); |
1512 |
|
} |
1513 |
|
|
1514 |
|
#ifdef ENABLE_VOSF |
1515 |
|
// Load gray ramp to 8->16/32 expand map |
1516 |
|
if (!IsDirectMode(mode) && xdepth > 8) |
1517 |
|
for (int i=0; i<256; i++) |
1518 |
< |
ExpandMap[i] = map_rgb(i, i, i); |
1518 |
> |
ExpandMap[i] = map_rgb(i, i, i, true); |
1519 |
|
#endif |
1520 |
|
|
1521 |
|
// Create display driver object of requested type |
1522 |
|
switch (display_type) { |
1523 |
|
case DISPLAY_WINDOW: |
1524 |
< |
drv = new driver_window(mode); |
1524 |
> |
drv = new driver_window(*this); |
1525 |
|
break; |
1526 |
|
#ifdef ENABLE_FBDEV_DGA |
1527 |
|
case DISPLAY_DGA: |
1528 |
< |
drv = new driver_fbdev(mode); |
1528 |
> |
drv = new driver_fbdev(*this); |
1529 |
|
break; |
1530 |
|
#endif |
1531 |
|
#ifdef ENABLE_XF86_DGA |
1532 |
|
case DISPLAY_DGA: |
1533 |
< |
drv = new driver_xf86dga(mode); |
1533 |
> |
drv = new driver_xf86dga(*this); |
1534 |
|
break; |
1535 |
|
#endif |
1536 |
|
} |
1545 |
|
#ifdef ENABLE_VOSF |
1546 |
|
if (use_vosf) { |
1547 |
|
// Initialize the VOSF system |
1548 |
< |
if (!video_vosf_init()) { |
1548 |
> |
if (!video_vosf_init(*this)) { |
1549 |
|
ErrorAlert(STR_VOSF_INIT_ERR); |
1550 |
|
return false; |
1551 |
|
} |
1560 |
|
LOCK_FRAME_BUFFER; |
1561 |
|
|
1562 |
|
// Start redraw/input thread |
1563 |
< |
#ifdef HAVE_PTHREADS |
1563 |
> |
#ifdef USE_PTHREADS_SERVICES |
1564 |
|
redraw_thread_cancel = false; |
1565 |
< |
redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0); |
1565 |
> |
Set_pthread_attr(&redraw_thread_attr, 0); |
1566 |
> |
redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0); |
1567 |
|
if (!redraw_thread_active) { |
1568 |
|
printf("FATAL: cannot create redraw thread\n"); |
1569 |
|
return false; |
1607 |
|
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1608 |
|
return false; |
1609 |
|
} |
1610 |
< |
sort(avail_depths, avail_depths + num_depths); |
1610 |
> |
std::sort(avail_depths, avail_depths + num_depths); |
1611 |
|
|
1612 |
|
#ifdef ENABLE_FBDEV_DGA |
1613 |
|
// Frame buffer name |
1710 |
|
ErrorAlert(STR_NO_XVISUAL_ERR); |
1711 |
|
return false; |
1712 |
|
} |
1713 |
< |
video_init_depth_list(); |
1713 |
> |
|
1714 |
> |
// Find requested default mode with specified dimensions |
1715 |
> |
uint32 default_id; |
1716 |
> |
std::vector<video_mode>::const_iterator i, end = VideoModes.end(); |
1717 |
> |
for (i = VideoModes.begin(); i != end; ++i) { |
1718 |
> |
if (i->x == default_width && i->y == default_height && i->depth == default_depth) { |
1719 |
> |
default_id = i->resolution_id; |
1720 |
> |
break; |
1721 |
> |
} |
1722 |
> |
} |
1723 |
> |
if (i == end) { // not found, use first available mode |
1724 |
> |
default_depth = VideoModes[0].depth; |
1725 |
> |
default_id = VideoModes[0].resolution_id; |
1726 |
> |
} |
1727 |
|
|
1728 |
|
#if DEBUG |
1729 |
|
D(bug("Available video modes:\n")); |
1730 |
< |
vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end(); |
1608 |
< |
while (i != end) { |
1730 |
> |
for (i = VideoModes.begin(); i != end; ++i) { |
1731 |
|
int bits = 1 << i->depth; |
1732 |
|
if (bits == 16) |
1733 |
|
bits = 15; |
1734 |
|
else if (bits == 32) |
1735 |
|
bits = 24; |
1736 |
|
D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits)); |
1615 |
– |
++i; |
1737 |
|
} |
1738 |
|
#endif |
1739 |
|
|
1740 |
< |
// Find requested default mode and open display |
1741 |
< |
if (VideoModes.size() == 1) |
1742 |
< |
return video_open(VideoModes[0]); |
1743 |
< |
else { |
1744 |
< |
// Find mode with specified dimensions |
1745 |
< |
std::vector<video_mode>::const_iterator i, end = VideoModes.end(); |
1625 |
< |
for (i = VideoModes.begin(); i != end; ++i) { |
1626 |
< |
if (i->x == default_width && i->y == default_height && i->depth == default_depth) |
1627 |
< |
return video_open(*i); |
1628 |
< |
} |
1629 |
< |
return video_open(VideoModes[0]); |
1630 |
< |
} |
1740 |
> |
// Create X11_monitor_desc for this (the only) display |
1741 |
> |
X11_monitor_desc *monitor = new X11_monitor_desc(VideoModes, default_depth, default_id); |
1742 |
> |
VideoMonitors.push_back(monitor); |
1743 |
> |
|
1744 |
> |
// Open display |
1745 |
> |
return monitor->video_open(); |
1746 |
|
} |
1747 |
|
|
1748 |
|
|
1751 |
|
*/ |
1752 |
|
|
1753 |
|
// Close display |
1754 |
< |
static void video_close(void) |
1754 |
> |
void X11_monitor_desc::video_close(void) |
1755 |
|
{ |
1756 |
+ |
D(bug("video_close()\n")); |
1757 |
+ |
|
1758 |
|
// Stop redraw thread |
1759 |
< |
#ifdef HAVE_PTHREADS |
1759 |
> |
#ifdef USE_PTHREADS_SERVICES |
1760 |
|
if (redraw_thread_active) { |
1761 |
|
redraw_thread_cancel = true; |
1762 |
< |
#ifdef HAVE_PTHREAD_CANCEL |
1646 |
< |
pthread_cancel(redraw_thread); |
1647 |
< |
#endif |
1762 |
> |
redraw_thread_cancel_ack = false; |
1763 |
|
pthread_join(redraw_thread, NULL); |
1764 |
+ |
while (!redraw_thread_cancel_ack) ; |
1765 |
|
} |
1766 |
|
#endif |
1767 |
|
redraw_thread_active = false; |
1769 |
|
// Unlock frame buffer |
1770 |
|
UNLOCK_FRAME_BUFFER; |
1771 |
|
XSync(x_display, false); |
1772 |
+ |
D(bug(" frame buffer unlocked\n")); |
1773 |
|
|
1774 |
|
#ifdef ENABLE_VOSF |
1775 |
|
if (use_vosf) { |
1795 |
|
|
1796 |
|
void VideoExit(void) |
1797 |
|
{ |
1798 |
< |
// Close display |
1799 |
< |
video_close(); |
1798 |
> |
// Close displays |
1799 |
> |
vector<monitor_desc *>::iterator i, end = VideoMonitors.end(); |
1800 |
> |
for (i = VideoMonitors.begin(); i != end; ++i) |
1801 |
> |
dynamic_cast<X11_monitor_desc *>(*i)->video_close(); |
1802 |
|
|
1803 |
|
#ifdef ENABLE_XF86_VIDMODE |
1804 |
|
// Free video mode list |
1856 |
|
* Set palette |
1857 |
|
*/ |
1858 |
|
|
1859 |
< |
void video_set_palette(uint8 *pal, int num_in) |
1859 |
> |
void X11_monitor_desc::set_palette(uint8 *pal, int num_in) |
1860 |
|
{ |
1861 |
+ |
const video_mode &mode = get_current_mode(); |
1862 |
+ |
|
1863 |
|
LOCK_PALETTE; |
1864 |
|
|
1865 |
|
// Convert colors to XColor array |
1866 |
|
int num_out = 256; |
1867 |
|
bool stretch = false; |
1868 |
< |
if (IsDirectMode(VideoMonitor.mode)) { |
1868 |
> |
if (IsDirectMode(mode)) { |
1869 |
|
// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries |
1870 |
|
num_out = vis->map_entries; |
1871 |
|
stretch = true; |
1872 |
|
} |
1873 |
< |
XColor *p = palette; |
1873 |
> |
XColor *p = x_palette; |
1874 |
|
for (int i=0; i<num_out; i++) { |
1875 |
|
int c = (stretch ? (i * num_in) / num_out : i); |
1876 |
|
p->red = pal[c*3 + 0] * 0x0101; |
1881 |
|
|
1882 |
|
#ifdef ENABLE_VOSF |
1883 |
|
// Recalculate pixel color expansion map |
1884 |
< |
if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) { |
1884 |
> |
if (!IsDirectMode(mode) && xdepth > 8) { |
1885 |
|
for (int i=0; i<256; i++) { |
1886 |
|
int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier) |
1887 |
< |
ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]); |
1887 |
> |
ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2], true); |
1888 |
|
} |
1889 |
|
|
1890 |
|
// We have to redraw everything because the interpretation of pixel values changed |
1891 |
|
LOCK_VOSF; |
1892 |
|
PFLAG_SET_ALL; |
1893 |
|
UNLOCK_VOSF; |
1894 |
< |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
1894 |
> |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
1895 |
|
} |
1896 |
|
#endif |
1897 |
|
|
1898 |
|
// Tell redraw thread to change palette |
1899 |
< |
palette_changed = true; |
1899 |
> |
x_palette_changed = true; |
1900 |
|
|
1901 |
|
UNLOCK_PALETTE; |
1902 |
|
} |
1906 |
|
* Switch video mode |
1907 |
|
*/ |
1908 |
|
|
1909 |
< |
void video_switch_to_mode(const video_mode &mode) |
1909 |
> |
void X11_monitor_desc::switch_to_current_mode(void) |
1910 |
|
{ |
1911 |
|
// Close and reopen display |
1912 |
|
video_close(); |
1913 |
< |
video_open(mode); |
1913 |
> |
video_open(); |
1914 |
|
|
1915 |
|
if (drv == NULL) { |
1916 |
|
ErrorAlert(STR_OPEN_WINDOW_ERR); |
2089 |
|
|
2090 |
|
static void handle_events(void) |
2091 |
|
{ |
2092 |
< |
while (XPending(x_display)) { |
2092 |
> |
for (;;) { |
2093 |
|
XEvent event; |
2094 |
< |
XNextEvent(x_display, &event); |
2094 |
> |
XDisplayLock(); |
2095 |
> |
|
2096 |
> |
if (!XCheckMaskEvent(x_display, eventmask, &event)) { |
2097 |
> |
// Handle clipboard events |
2098 |
> |
if (XCheckTypedEvent(x_display, SelectionRequest, &event)) |
2099 |
> |
ClipboardSelectionRequest(&event.xselectionrequest); |
2100 |
> |
else if (XCheckTypedEvent(x_display, SelectionClear, &event)) |
2101 |
> |
ClipboardSelectionClear(&event.xselectionclear); |
2102 |
|
|
2103 |
+ |
// Window "close" widget clicked |
2104 |
+ |
else if (XCheckTypedEvent(x_display, ClientMessage, &event)) { |
2105 |
+ |
if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) { |
2106 |
+ |
ADBKeyDown(0x7f); // Power key |
2107 |
+ |
ADBKeyUp(0x7f); |
2108 |
+ |
} |
2109 |
+ |
} |
2110 |
+ |
XDisplayUnlock(); |
2111 |
+ |
break; |
2112 |
+ |
} |
2113 |
+ |
|
2114 |
|
switch (event.type) { |
2115 |
|
|
2116 |
|
// Mouse button |
2198 |
|
// Hidden parts exposed, force complete refresh of window |
2199 |
|
case Expose: |
2200 |
|
if (display_type == DISPLAY_WINDOW) { |
2201 |
+ |
const video_mode &mode = VideoMonitors[0]->get_current_mode(); |
2202 |
|
#ifdef ENABLE_VOSF |
2203 |
|
if (use_vosf) { // VOSF refresh |
2204 |
|
LOCK_VOSF; |
2205 |
|
PFLAG_SET_ALL; |
2206 |
|
UNLOCK_VOSF; |
2207 |
< |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
2207 |
> |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
2208 |
|
} |
2209 |
|
else |
2210 |
|
#endif |
2215 |
|
updt_box[x1][y1] = true; |
2216 |
|
nr_boxes = 16 * 16; |
2217 |
|
} else // Static refresh |
2218 |
< |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
2079 |
< |
} |
2080 |
< |
break; |
2081 |
< |
|
2082 |
< |
// Window "close" widget clicked |
2083 |
< |
case ClientMessage: |
2084 |
< |
if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) { |
2085 |
< |
ADBKeyDown(0x7f); // Power key |
2086 |
< |
ADBKeyUp(0x7f); |
2218 |
> |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
2219 |
|
} |
2220 |
|
break; |
2221 |
|
} |
2222 |
+ |
|
2223 |
+ |
XDisplayUnlock(); |
2224 |
|
} |
2225 |
|
} |
2226 |
|
|
2235 |
|
int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi; |
2236 |
|
int xil = 0; |
2237 |
|
int rxm = 0, rxmo = 0; |
2238 |
< |
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
2239 |
< |
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
2240 |
< |
int rx = VideoMonitor.mode.bytes_per_row / 16; |
2241 |
< |
int ry = VideoMonitor.mode.y / 16; |
2238 |
> |
const video_mode &mode = drv->monitor.get_current_mode(); |
2239 |
> |
int bytes_per_row = mode.bytes_per_row; |
2240 |
> |
int bytes_per_pixel = mode.bytes_per_row / mode.x; |
2241 |
> |
int rx = mode.bytes_per_row / 16; |
2242 |
> |
int ry = mode.y / 16; |
2243 |
|
int max_box; |
2244 |
|
|
2245 |
|
y2s = sm_uptd[ticker % 8]; |
2265 |
|
} |
2266 |
|
} |
2267 |
|
|
2268 |
+ |
XDisplayLock(); |
2269 |
|
if ((nr_boxes <= max_box) && (nr_boxes)) { |
2270 |
|
for (y1=0; y1<16; y1++) { |
2271 |
|
for (x1=0; x1<16; x1++) { |
2294 |
|
i = (yi * bytes_per_row) + xi; |
2295 |
|
for (y2=0; y2 < yil; y2++, i += bytes_per_row) |
2296 |
|
memcpy(&the_buffer_copy[i], &the_buffer[i], xil); |
2297 |
< |
if (VideoMonitor.mode.depth == VDEPTH_1BIT) { |
2297 |
> |
if (mode.depth == VDEPTH_1BIT) { |
2298 |
|
if (drv->have_shm) |
2299 |
|
XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0); |
2300 |
|
else |
2319 |
|
} |
2320 |
|
nr_boxes = 0; |
2321 |
|
} |
2322 |
+ |
XDisplayUnlock(); |
2323 |
|
} |
2324 |
|
|
2325 |
|
// Static display update (fixed frame rate, but incremental) |
2326 |
|
static void update_display_static(driver_window *drv) |
2327 |
|
{ |
2328 |
|
// Incremental update code |
2329 |
< |
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
2330 |
< |
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
2331 |
< |
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
2329 |
> |
unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j; |
2330 |
> |
const video_mode &mode = drv->monitor.get_current_mode(); |
2331 |
> |
int bytes_per_row = mode.bytes_per_row; |
2332 |
> |
int bytes_per_pixel = mode.bytes_per_row / mode.x; |
2333 |
|
uint8 *p, *p2; |
2334 |
|
|
2335 |
|
// Check for first line from top and first line from bottom that have changed |
2336 |
|
y1 = 0; |
2337 |
< |
for (j=0; j<VideoMonitor.mode.y; j++) { |
2337 |
> |
for (j=0; j<mode.y; j++) { |
2338 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
2339 |
|
y1 = j; |
2340 |
|
break; |
2341 |
|
} |
2342 |
|
} |
2343 |
|
y2 = y1 - 1; |
2344 |
< |
for (j=VideoMonitor.mode.y-1; j>=y1; j--) { |
2344 |
> |
for (j=mode.y-1; j>=y1; j--) { |
2345 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
2346 |
|
y2 = j; |
2347 |
|
break; |
2351 |
|
|
2352 |
|
// Check for first column from left and first column from right that have changed |
2353 |
|
if (high) { |
2354 |
< |
if (VideoMonitor.mode.depth == VDEPTH_1BIT) { |
2355 |
< |
x1 = VideoMonitor.mode.x - 1; |
2354 |
> |
if (mode.depth == VDEPTH_1BIT) { |
2355 |
> |
x1 = mode.x - 1; |
2356 |
|
for (j=y1; j<=y2; j++) { |
2357 |
|
p = &the_buffer[j * bytes_per_row]; |
2358 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
2370 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
2371 |
|
p += bytes_per_row; |
2372 |
|
p2 += bytes_per_row; |
2373 |
< |
for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) { |
2373 |
> |
for (i=(mode.x>>3); i>(x2>>3); i--) { |
2374 |
|
p--; p2--; |
2375 |
|
if (*p != *p2) { |
2376 |
|
x2 = (i << 3) + 7; |
2389 |
|
} |
2390 |
|
|
2391 |
|
} else { |
2392 |
< |
x1 = VideoMonitor.mode.x; |
2392 |
> |
x1 = mode.x; |
2393 |
|
for (j=y1; j<=y2; j++) { |
2394 |
|
p = &the_buffer[j * bytes_per_row]; |
2395 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
2407 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
2408 |
|
p += bytes_per_row; |
2409 |
|
p2 += bytes_per_row; |
2410 |
< |
for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
2410 |
> |
for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
2411 |
|
p--; |
2412 |
|
p2--; |
2413 |
|
if (*p != *p2) { |
2429 |
|
} |
2430 |
|
|
2431 |
|
// Refresh display |
2432 |
+ |
XDisplayLock(); |
2433 |
|
if (high && wide) { |
2434 |
|
if (drv->have_shm) |
2435 |
|
XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0); |
2436 |
|
else |
2437 |
|
XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high); |
2438 |
|
} |
2439 |
+ |
XDisplayUnlock(); |
2440 |
|
} |
2441 |
|
|
2442 |
|
|
2476 |
|
{ |
2477 |
|
LOCK_PALETTE; |
2478 |
|
|
2479 |
< |
if (palette_changed) { |
2480 |
< |
palette_changed = false; |
2479 |
> |
if (x_palette_changed) { |
2480 |
> |
x_palette_changed = false; |
2481 |
> |
XDisplayLock(); |
2482 |
|
drv->update_palette(); |
2483 |
+ |
XDisplayUnlock(); |
2484 |
|
} |
2485 |
|
|
2486 |
|
UNLOCK_PALETTE; |
2505 |
|
tick_counter = 0; |
2506 |
|
if (mainBuffer.dirty) { |
2507 |
|
LOCK_VOSF; |
2508 |
< |
update_display_dga_vosf(); |
2508 |
> |
update_display_dga_vosf(static_cast<driver_dga *>(drv)); |
2509 |
|
UNLOCK_VOSF; |
2510 |
|
} |
2511 |
|
} |
2522 |
|
if (++tick_counter >= frame_skip) { |
2523 |
|
tick_counter = 0; |
2524 |
|
if (mainBuffer.dirty) { |
2525 |
+ |
XDisplayLock(); |
2526 |
|
LOCK_VOSF; |
2527 |
|
update_display_window_vosf(static_cast<driver_window *>(drv)); |
2528 |
|
UNLOCK_VOSF; |
2529 |
|
XSync(x_display, false); // Let the server catch up |
2530 |
+ |
XDisplayUnlock(); |
2531 |
|
} |
2532 |
|
} |
2533 |
|
} |
2607 |
|
const int VIDEO_REFRESH_HZ = 60; |
2608 |
|
const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ; |
2609 |
|
|
2610 |
< |
#ifdef HAVE_PTHREADS |
2610 |
> |
#ifdef USE_PTHREADS_SERVICES |
2611 |
|
static void *redraw_func(void *arg) |
2612 |
|
{ |
2613 |
|
int fd = ConnectionNumber(x_display); |
2648 |
|
} |
2649 |
|
|
2650 |
|
uint64 end = GetTicks_usec(); |
2651 |
< |
D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
2651 |
> |
D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
2652 |
> |
|
2653 |
> |
redraw_thread_cancel_ack = true; |
2654 |
|
return NULL; |
2655 |
|
} |
2656 |
|
#endif |