1 |
|
/* |
2 |
|
* video_x.cpp - Video/graphics emulation, X11 specific stuff |
3 |
|
* |
4 |
< |
* Basilisk II (C) 1997-2000 Christian Bauer |
4 |
> |
* Basilisk II (C) 1997-2001 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 |
52 |
|
# include <sys/mman.h> |
53 |
|
#endif |
54 |
|
|
55 |
– |
#ifdef ENABLE_VOSF |
56 |
– |
# include <unistd.h> |
57 |
– |
# include <signal.h> |
58 |
– |
# include <fcntl.h> |
59 |
– |
# include <sys/mman.h> |
60 |
– |
#endif |
61 |
– |
|
55 |
|
#include "cpu_emulation.h" |
56 |
|
#include "main.h" |
57 |
|
#include "adb.h" |
72 |
|
|
73 |
|
// Constants |
74 |
|
const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes"; |
75 |
< |
const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices"; |
75 |
> |
|
76 |
> |
static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask; |
77 |
> |
static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask; |
78 |
|
|
79 |
|
|
80 |
|
// Global variables |
81 |
|
static int32 frame_skip; // Prefs items |
82 |
< |
static int16 mouse_wheel_mode = 1; |
83 |
< |
static int16 mouse_wheel_lines = 3; |
82 |
> |
static int16 mouse_wheel_mode; |
83 |
> |
static int16 mouse_wheel_lines; |
84 |
|
|
85 |
|
static int display_type = DISPLAY_WINDOW; // See enum above |
86 |
|
static bool local_X11; // Flag: X server running on local machine? |
87 |
< |
static uint8 *the_buffer; // Mac frame buffer |
87 |
> |
static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into) |
88 |
> |
static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes) |
89 |
|
|
94 |
– |
#ifdef HAVE_PTHREADS |
90 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
91 |
< |
static volatile bool redraw_thread_cancel = false; // Flag: Cancel Redraw thread |
91 |
> |
#ifdef HAVE_PTHREADS |
92 |
> |
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread |
93 |
|
static pthread_t redraw_thread; // Redraw thread |
94 |
|
#endif |
95 |
|
|
96 |
|
static bool has_dga = false; // Flag: Video DGA capable |
97 |
|
static bool has_vidmode = false; // Flag: VidMode extension available |
98 |
|
|
99 |
+ |
#ifdef ENABLE_VOSF |
100 |
+ |
static bool use_vosf = true; // Flag: VOSF enabled |
101 |
+ |
#else |
102 |
+ |
static const bool use_vosf = false; // VOSF not possible |
103 |
+ |
#endif |
104 |
+ |
|
105 |
|
static bool ctrl_down = false; // Flag: Ctrl key pressed |
106 |
|
static bool caps_on = false; // Flag: Caps Lock on |
107 |
|
static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread |
116 |
|
// X11 variables |
117 |
|
static int screen; // Screen number |
118 |
|
static int xdepth; // Depth of X screen |
119 |
< |
static int depth; // Depth of Mac frame buffer |
118 |
< |
static Window rootwin, the_win; // Root window and our window |
119 |
> |
static Window rootwin; // Root window and our window |
120 |
|
static XVisualInfo visualInfo; |
121 |
|
static Visual *vis; |
122 |
< |
static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode |
122 |
> |
static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them) |
123 |
|
static XColor black, white; |
124 |
|
static unsigned long black_pixel, white_pixel; |
125 |
|
static int eventmask; |
125 |
– |
static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask; |
126 |
– |
static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask; |
127 |
– |
static Atom WM_DELETE_WINDOW = (Atom)0; |
126 |
|
|
127 |
< |
static XColor palette[256]; // Color palette for 8-bit mode |
127 |
> |
static XColor palette[256]; // Color palette for indexed modes |
128 |
|
static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
129 |
+ |
|
130 |
+ |
#ifdef ENABLE_FBDEV_DGA |
131 |
+ |
static int fbdev_fd = -1; |
132 |
+ |
#endif |
133 |
+ |
|
134 |
+ |
#ifdef ENABLE_XF86_VIDMODE |
135 |
+ |
static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes |
136 |
+ |
static int num_x_video_modes; |
137 |
+ |
#endif |
138 |
+ |
|
139 |
+ |
// Mutex to protect palette |
140 |
|
#ifdef HAVE_PTHREADS |
141 |
< |
static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette |
141 |
> |
static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; |
142 |
|
#define LOCK_PALETTE pthread_mutex_lock(&palette_lock) |
143 |
|
#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock) |
144 |
|
#else |
146 |
|
#define UNLOCK_PALETTE |
147 |
|
#endif |
148 |
|
|
149 |
< |
// Variables for window mode |
141 |
< |
static GC the_gc; |
142 |
< |
static XImage *img = NULL; |
143 |
< |
static XShmSegmentInfo shminfo; |
144 |
< |
static Cursor mac_cursor; |
145 |
< |
static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer |
146 |
< |
static bool have_shm = false; // Flag: SHM extensions available |
147 |
< |
static bool updt_box[17][17]; // Flag for Update |
148 |
< |
static int nr_boxes; |
149 |
< |
static const int sm_uptd[] = {4,1,6,3,0,5,2,7}; |
150 |
< |
static int sm_no_boxes[] = {1,8,32,64,128,300}; |
151 |
< |
|
152 |
< |
// Variables for XF86 DGA mode |
153 |
< |
static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap |
154 |
< |
static Window suspend_win; // "Suspend" window |
155 |
< |
static void *fb_save = NULL; // Saved frame buffer for suspend |
149 |
> |
// Mutex to protect frame buffer |
150 |
|
#ifdef HAVE_PTHREADS |
151 |
< |
static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer |
151 |
> |
static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; |
152 |
|
#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock); |
153 |
|
#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock); |
154 |
|
#else |
156 |
|
#define UNLOCK_FRAME_BUFFER |
157 |
|
#endif |
158 |
|
|
159 |
< |
// Variables for fbdev DGA mode |
160 |
< |
const char FBDEVICE_FILE_NAME[] = "/dev/fb"; |
161 |
< |
static int fbdev_fd; |
162 |
< |
|
163 |
< |
#ifdef ENABLE_XF86_VIDMODE |
170 |
< |
// Variables for XF86 VidMode support |
171 |
< |
static XF86VidModeModeInfo **x_video_modes; // Array of all available modes |
172 |
< |
static int num_x_video_modes; |
173 |
< |
#endif |
174 |
< |
|
175 |
< |
#ifdef ENABLE_VOSF |
176 |
< |
static bool use_vosf = true; // Flag: VOSF enabled |
177 |
< |
#else |
178 |
< |
static const bool use_vosf = false; // Flag: VOSF enabled |
179 |
< |
#endif |
180 |
< |
|
181 |
< |
#ifdef ENABLE_VOSF |
182 |
< |
// Variables for Video on SEGV support (taken from the Win32 port) |
183 |
< |
static uint8 *the_host_buffer; // Host frame buffer in VOSF mode |
184 |
< |
static uint32 the_buffer_size; // Size of allocated the_buffer |
185 |
< |
|
186 |
< |
struct ScreenPageInfo { |
187 |
< |
int top, bottom; // Mapping between this virtual page and Mac scanlines |
188 |
< |
}; |
189 |
< |
|
190 |
< |
struct ScreenInfo { |
191 |
< |
uint32 memBase; // Real start address |
192 |
< |
uint32 memStart; // Start address aligned to page boundary |
193 |
< |
uint32 memEnd; // Address of one-past-the-end of the screen |
194 |
< |
uint32 memLength; // Length of the memory addressed by the screen pages |
195 |
< |
|
196 |
< |
uint32 pageSize; // Size of a page |
197 |
< |
int pageBits; // Shift count to get the page number |
198 |
< |
uint32 pageCount; // Number of pages allocated to the screen |
199 |
< |
|
200 |
< |
uint8 * dirtyPages; // Table of flags set if page was altered |
201 |
< |
ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines |
202 |
< |
}; |
203 |
< |
|
204 |
< |
static ScreenInfo mainBuffer; |
205 |
< |
|
206 |
< |
#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1 |
207 |
< |
#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0 |
208 |
< |
#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page] |
209 |
< |
#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0) |
210 |
< |
#ifdef UNALIGNED_PROFITABLE |
211 |
< |
# define PFLAG_ISCLEAR_4(page) (*((uint32 *)(mainBuffer.dirtyPages + page)) == 0) |
212 |
< |
#else |
213 |
< |
# define PFLAG_ISCLEAR_4(page) \ |
214 |
< |
(mainBuffer.dirtyPages[page ] == 0) \ |
215 |
< |
&& (mainBuffer.dirtyPages[page+1] == 0) \ |
216 |
< |
&& (mainBuffer.dirtyPages[page+2] == 0) \ |
217 |
< |
&& (mainBuffer.dirtyPages[page+3] == 0) |
218 |
< |
#endif |
219 |
< |
#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount) |
220 |
< |
#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount) |
221 |
< |
|
222 |
< |
static int zero_fd = -1; |
223 |
< |
static bool Screen_fault_handler_init(); |
224 |
< |
static struct sigaction vosf_sa; |
225 |
< |
|
226 |
< |
#ifdef HAVE_PTHREADS |
227 |
< |
static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact) |
228 |
< |
#define LOCK_VOSF pthread_mutex_lock(&vosf_lock); |
229 |
< |
#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock); |
230 |
< |
#else |
231 |
< |
#define LOCK_VOSF |
232 |
< |
#define UNLOCK_VOSF |
233 |
< |
#endif |
234 |
< |
|
235 |
< |
static int log_base_2(uint32 x) |
236 |
< |
{ |
237 |
< |
uint32 mask = 0x80000000; |
238 |
< |
int l = 31; |
239 |
< |
while (l >= 0 && (x & mask) == 0) { |
240 |
< |
mask >>= 1; |
241 |
< |
l--; |
242 |
< |
} |
243 |
< |
return l; |
244 |
< |
} |
245 |
< |
|
246 |
< |
#endif |
159 |
> |
// Variables for non-VOSF incremental refresh |
160 |
> |
static const int sm_uptd[] = {4,1,6,3,0,5,2,7}; |
161 |
> |
static int sm_no_boxes[] = {1,8,32,64,128,300}; |
162 |
> |
static bool updt_box[17][17]; |
163 |
> |
static int nr_boxes; |
164 |
|
|
165 |
< |
// VideoRefresh function |
166 |
< |
void VideoRefreshInit(void); |
165 |
> |
// Video refresh function |
166 |
> |
static void VideoRefreshInit(void); |
167 |
|
static void (*video_refresh)(void); |
168 |
|
|
169 |
+ |
|
170 |
|
// Prototypes |
171 |
|
static void *redraw_func(void *arg); |
172 |
|
static int event2keycode(XKeyEvent &ev); |
173 |
|
|
256 |
– |
|
174 |
|
// From main_unix.cpp |
175 |
|
extern char *x_display_name; |
176 |
|
extern Display *x_display; |
178 |
|
// From sys_unix.cpp |
179 |
|
extern void SysMountFirstFloppy(void); |
180 |
|
|
264 |
– |
#ifdef ENABLE_VOSF |
265 |
– |
# include "video_vosf.h" |
266 |
– |
#endif |
267 |
– |
|
181 |
|
|
182 |
|
/* |
183 |
< |
* Initialization |
183 |
> |
* Utility functions |
184 |
|
*/ |
185 |
|
|
186 |
< |
// Set VideoMonitor according to video mode |
187 |
< |
void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order) |
186 |
> |
// Add mode to list of supported modes |
187 |
> |
static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth) |
188 |
> |
{ |
189 |
> |
video_mode mode; |
190 |
> |
mode.x = width; |
191 |
> |
mode.y = height; |
192 |
> |
mode.resolution_id = resolution_id; |
193 |
> |
mode.bytes_per_row = bytes_per_row; |
194 |
> |
mode.depth = depth; |
195 |
> |
VideoModes.push_back(mode); |
196 |
> |
} |
197 |
> |
|
198 |
> |
// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac) |
199 |
> |
static void set_mac_frame_buffer(video_depth depth, bool native_byte_order) |
200 |
|
{ |
201 |
|
#if !REAL_ADDRESSING && !DIRECT_ADDRESSING |
202 |
|
int layout = FLAYOUT_DIRECT; |
203 |
< |
switch (depth) { |
204 |
< |
case 1: |
205 |
< |
layout = FLAYOUT_DIRECT; |
206 |
< |
break; |
282 |
< |
case 8: |
283 |
< |
layout = FLAYOUT_DIRECT; |
284 |
< |
break; |
285 |
< |
case 15: |
286 |
< |
layout = FLAYOUT_HOST_555; |
287 |
< |
break; |
288 |
< |
case 16: |
289 |
< |
layout = FLAYOUT_HOST_565; |
290 |
< |
break; |
291 |
< |
case 24: |
292 |
< |
case 32: |
293 |
< |
layout = FLAYOUT_HOST_888; |
294 |
< |
break; |
295 |
< |
} |
203 |
> |
if (depth == VDEPTH_16BIT) |
204 |
> |
layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565; |
205 |
> |
else if (depth == VDEPTH_32BIT) |
206 |
> |
layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT; |
207 |
|
if (native_byte_order) |
208 |
|
MacFrameLayout = layout; |
209 |
|
else |
210 |
|
MacFrameLayout = FLAYOUT_DIRECT; |
211 |
+ |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
212 |
+ |
|
213 |
+ |
// Set variables used by UAE memory banking |
214 |
+ |
MacFrameBaseHost = the_buffer; |
215 |
+ |
MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y; |
216 |
+ |
InitFrameBufferMapping(); |
217 |
+ |
#else |
218 |
+ |
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
219 |
+ |
D(bug("Host frame buffer = %p, ", the_buffer)); |
220 |
|
#endif |
221 |
< |
switch (depth) { |
302 |
< |
case 1: |
303 |
< |
VideoMonitor.mode = VMODE_1BIT; |
304 |
< |
break; |
305 |
< |
case 8: |
306 |
< |
VideoMonitor.mode = VMODE_8BIT; |
307 |
< |
break; |
308 |
< |
case 15: |
309 |
< |
VideoMonitor.mode = VMODE_16BIT; |
310 |
< |
break; |
311 |
< |
case 16: |
312 |
< |
VideoMonitor.mode = VMODE_16BIT; |
313 |
< |
break; |
314 |
< |
case 24: |
315 |
< |
case 32: |
316 |
< |
VideoMonitor.mode = VMODE_32BIT; |
317 |
< |
break; |
318 |
< |
} |
319 |
< |
VideoMonitor.x = width; |
320 |
< |
VideoMonitor.y = height; |
321 |
< |
VideoMonitor.bytes_per_row = bytes_per_row; |
221 |
> |
D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base)); |
222 |
|
} |
223 |
|
|
224 |
|
// Set window name and class |
234 |
|
hints->res_name = "BasiliskII"; |
235 |
|
hints->res_class = "BasiliskII"; |
236 |
|
XSetClassHint(x_display, w, hints); |
237 |
< |
XFree((char *)hints); |
237 |
> |
XFree(hints); |
238 |
|
} |
239 |
|
} |
240 |
|
|
247 |
|
hints->initial_state = NormalState; |
248 |
|
hints->flags = InputHint | StateHint; |
249 |
|
XSetWMHints(x_display, w, hints); |
250 |
< |
XFree((char *)hints); |
250 |
> |
XFree(hints); |
251 |
|
} |
252 |
|
} |
253 |
|
|
254 |
|
// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget) |
255 |
+ |
static Atom WM_DELETE_WINDOW = (Atom)0; |
256 |
|
static void set_window_delete_protocol(Window w) |
257 |
|
{ |
258 |
|
WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false); |
289 |
|
return old_error_handler(d, e); |
290 |
|
} |
291 |
|
|
292 |
< |
// Init window mode |
293 |
< |
static bool init_window(int width, int height) |
292 |
> |
|
293 |
> |
/* |
294 |
> |
* Display "driver" classes |
295 |
> |
*/ |
296 |
> |
|
297 |
> |
class driver_base { |
298 |
> |
public: |
299 |
> |
driver_base(); |
300 |
> |
virtual ~driver_base(); |
301 |
> |
|
302 |
> |
virtual void update_palette(void); |
303 |
> |
virtual void suspend(void) {} |
304 |
> |
virtual void resume(void) {} |
305 |
> |
|
306 |
> |
public: |
307 |
> |
bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer) |
308 |
> |
Window w; // The window we draw into |
309 |
> |
}; |
310 |
> |
|
311 |
> |
class driver_window; |
312 |
> |
static void update_display_window_vosf(driver_window *drv); |
313 |
> |
static void update_display_dynamic(int ticker, driver_window *drv); |
314 |
> |
static void update_display_static(driver_window *drv); |
315 |
> |
|
316 |
> |
class driver_window : public driver_base { |
317 |
> |
friend void update_display_window_vosf(driver_window *drv); |
318 |
> |
friend void update_display_dynamic(int ticker, driver_window *drv); |
319 |
> |
friend void update_display_static(driver_window *drv); |
320 |
> |
|
321 |
> |
public: |
322 |
> |
driver_window(const video_mode &mode); |
323 |
> |
~driver_window(); |
324 |
> |
|
325 |
> |
private: |
326 |
> |
GC gc; |
327 |
> |
XImage *img; |
328 |
> |
bool have_shm; // Flag: SHM extensions available |
329 |
> |
XShmSegmentInfo shminfo; |
330 |
> |
Cursor mac_cursor; |
331 |
> |
}; |
332 |
> |
|
333 |
> |
static driver_base *drv = NULL; // Pointer to currently used driver object |
334 |
> |
|
335 |
> |
#ifdef ENABLE_VOSF |
336 |
> |
# include "video_vosf.h" |
337 |
> |
#endif |
338 |
> |
|
339 |
> |
driver_base::driver_base() |
340 |
> |
: init_ok(false), w(0) |
341 |
> |
{ |
342 |
> |
the_buffer = NULL; |
343 |
> |
the_buffer_copy = NULL; |
344 |
> |
} |
345 |
> |
|
346 |
> |
driver_base::~driver_base() |
347 |
> |
{ |
348 |
> |
if (w) { |
349 |
> |
XUnmapWindow(x_display, w); |
350 |
> |
wait_unmapped(w); |
351 |
> |
XDestroyWindow(x_display, w); |
352 |
> |
} |
353 |
> |
|
354 |
> |
XFlush(x_display); |
355 |
> |
XSync(x_display, false); |
356 |
> |
|
357 |
> |
// Free frame buffer(s) |
358 |
> |
if (!use_vosf) { |
359 |
> |
if (the_buffer) { |
360 |
> |
free(the_buffer); |
361 |
> |
the_buffer = NULL; |
362 |
> |
} |
363 |
> |
if (the_buffer_copy) { |
364 |
> |
free(the_buffer_copy); |
365 |
> |
the_buffer_copy = NULL; |
366 |
> |
} |
367 |
> |
} |
368 |
> |
#ifdef ENABLE_VOSF |
369 |
> |
else { |
370 |
> |
if (the_buffer != (uint8 *)VM_MAP_FAILED) { |
371 |
> |
vm_release(the_buffer, the_buffer_size); |
372 |
> |
the_buffer = NULL; |
373 |
> |
} |
374 |
> |
if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) { |
375 |
> |
vm_release(the_buffer_copy, the_buffer_size); |
376 |
> |
the_buffer_copy = NULL; |
377 |
> |
} |
378 |
> |
} |
379 |
> |
#endif |
380 |
> |
} |
381 |
> |
|
382 |
> |
// Palette has changed |
383 |
> |
void driver_base::update_palette(void) |
384 |
|
{ |
385 |
+ |
if (cmap[0] && cmap[1]) { |
386 |
+ |
int num = 256; |
387 |
+ |
if (xdepth == 15) |
388 |
+ |
num = 32; |
389 |
+ |
else if (xdepth == 16) |
390 |
+ |
num = 64; |
391 |
+ |
XStoreColors(x_display, cmap[0], palette, num); |
392 |
+ |
XStoreColors(x_display, cmap[1], palette, num); |
393 |
+ |
} |
394 |
+ |
XSync(x_display, false); |
395 |
+ |
} |
396 |
+ |
|
397 |
+ |
|
398 |
+ |
/* |
399 |
+ |
* Windowed display driver |
400 |
+ |
*/ |
401 |
+ |
|
402 |
+ |
// Open display |
403 |
+ |
driver_window::driver_window(const video_mode &mode) |
404 |
+ |
: gc(0), img(NULL), have_shm(false), mac_cursor(0) |
405 |
+ |
{ |
406 |
+ |
int width = mode.x, height = mode.y; |
407 |
|
int aligned_width = (width + 15) & ~15; |
408 |
|
int aligned_height = (height + 15) & ~15; |
409 |
|
|
410 |
|
// Set absolute mouse mode |
411 |
|
ADBSetRelMouseMode(false); |
412 |
|
|
400 |
– |
// Read frame skip prefs |
401 |
– |
frame_skip = PrefsFindInt32("frameskip"); |
402 |
– |
|
413 |
|
// Create window |
414 |
|
XSetWindowAttributes wattr; |
415 |
|
wattr.event_mask = eventmask = win_eventmask; |
416 |
|
wattr.background_pixel = black_pixel; |
417 |
|
wattr.colormap = cmap[0]; |
418 |
< |
|
419 |
< |
the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
410 |
< |
InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr); |
418 |
> |
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
419 |
> |
InputOutput, vis, CWEventMask | CWBackPixel | ((mode.depth == VDEPTH_1BIT || cmap[0] == 0) ? 0 : CWColormap), &wattr); |
420 |
|
|
421 |
|
// Set window name/class |
422 |
< |
set_window_name(the_win, STR_WINDOW_TITLE); |
422 |
> |
set_window_name(w, STR_WINDOW_TITLE); |
423 |
|
|
424 |
|
// Indicate that we want keyboard input |
425 |
< |
set_window_focus(the_win); |
425 |
> |
set_window_focus(w); |
426 |
|
|
427 |
|
// Set delete protocol property |
428 |
< |
set_window_delete_protocol(the_win); |
428 |
> |
set_window_delete_protocol(w); |
429 |
|
|
430 |
|
// Make window unresizable |
431 |
|
{ |
436 |
|
hints->min_height = height; |
437 |
|
hints->max_height = height; |
438 |
|
hints->flags = PMinSize | PMaxSize; |
439 |
< |
XSetWMNormalHints(x_display, the_win, hints); |
440 |
< |
XFree((char *)hints); |
439 |
> |
XSetWMNormalHints(x_display, w, hints); |
440 |
> |
XFree(hints); |
441 |
|
} |
442 |
|
} |
443 |
|
|
444 |
|
// Show window |
445 |
< |
XMapWindow(x_display, the_win); |
446 |
< |
wait_mapped(the_win); |
445 |
> |
XMapWindow(x_display, w); |
446 |
> |
wait_mapped(w); |
447 |
|
|
448 |
|
// Try to create and attach SHM image |
449 |
< |
have_shm = false; |
441 |
< |
if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) { |
449 |
> |
if (local_X11 && XShmQueryExtension(x_display)) { |
450 |
|
|
451 |
|
// Create SHM image ("height + 2" for safety) |
452 |
< |
img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height); |
452 |
> |
img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height); |
453 |
|
shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777); |
454 |
|
the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0); |
455 |
|
shminfo.shmaddr = img->data = (char *)the_buffer_copy; |
473 |
|
|
474 |
|
// Create normal X image if SHM doesn't work ("height + 2" for safety) |
475 |
|
if (!have_shm) { |
476 |
< |
int bytes_per_row = aligned_width; |
469 |
< |
switch (depth) { |
470 |
< |
case 1: |
471 |
< |
bytes_per_row /= 8; |
472 |
< |
break; |
473 |
< |
case 15: |
474 |
< |
case 16: |
475 |
< |
bytes_per_row *= 2; |
476 |
< |
break; |
477 |
< |
case 24: |
478 |
< |
case 32: |
479 |
< |
bytes_per_row *= 4; |
480 |
< |
break; |
481 |
< |
} |
476 |
> |
int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth); |
477 |
|
the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row); |
478 |
< |
img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row); |
478 |
> |
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); |
479 |
|
} |
480 |
|
|
481 |
|
// 1-Bit mode is big-endian |
482 |
< |
if (depth == 1) { |
482 |
> |
if (mode.depth == VDEPTH_1BIT) { |
483 |
|
img->byte_order = MSBFirst; |
484 |
|
img->bitmap_bit_order = MSBFirst; |
485 |
|
} |
486 |
|
|
487 |
|
#ifdef ENABLE_VOSF |
488 |
< |
// Allocate a page-aligned chunk of memory for frame buffer |
494 |
< |
the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line); |
488 |
> |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
489 |
|
the_host_buffer = the_buffer_copy; |
490 |
< |
|
491 |
< |
the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size); |
492 |
< |
memset(the_buffer_copy, 0, the_buffer_size); |
499 |
< |
|
500 |
< |
the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size); |
501 |
< |
memset(the_buffer, 0, the_buffer_size); |
490 |
> |
the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line); |
491 |
> |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
492 |
> |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
493 |
|
#else |
494 |
|
// Allocate memory for frame buffer |
495 |
|
the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line); |
496 |
|
#endif |
497 |
|
|
498 |
|
// Create GC |
499 |
< |
the_gc = XCreateGC(x_display, the_win, 0, 0); |
500 |
< |
XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes); |
499 |
> |
gc = XCreateGC(x_display, w, 0, 0); |
500 |
> |
XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes); |
501 |
|
|
502 |
|
// Create no_cursor |
503 |
|
mac_cursor = XCreatePixmapCursor(x_display, |
504 |
< |
XCreatePixmap(x_display, the_win, 1, 1, 1), |
505 |
< |
XCreatePixmap(x_display, the_win, 1, 1, 1), |
504 |
> |
XCreatePixmap(x_display, w, 1, 1, 1), |
505 |
> |
XCreatePixmap(x_display, w, 1, 1, 1), |
506 |
|
&black, &white, 0, 0); |
507 |
< |
XDefineCursor(x_display, the_win, mac_cursor); |
507 |
> |
XDefineCursor(x_display, w, mac_cursor); |
508 |
|
|
509 |
< |
// Set VideoMonitor |
509 |
> |
// Init blitting routines |
510 |
|
bool native_byte_order; |
511 |
|
#ifdef WORDS_BIGENDIAN |
512 |
< |
native_byte_order = (img->bitmap_bit_order == MSBFirst); |
512 |
> |
native_byte_order = (XImageByteOrder(x_display) == MSBFirst); |
513 |
|
#else |
514 |
< |
native_byte_order = (img->bitmap_bit_order == LSBFirst); |
514 |
> |
native_byte_order = (XImageByteOrder(x_display) == LSBFirst); |
515 |
|
#endif |
516 |
|
#ifdef ENABLE_VOSF |
517 |
< |
do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW); |
517 |
> |
Screen_blitter_init(&visualInfo, native_byte_order); |
518 |
|
#endif |
519 |
< |
set_video_monitor(width, height, img->bytes_per_line, native_byte_order); |
520 |
< |
|
521 |
< |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
522 |
< |
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
523 |
< |
#else |
524 |
< |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
519 |
> |
|
520 |
> |
// Set VideoMonitor |
521 |
> |
VideoMonitor.mode = mode; |
522 |
> |
set_mac_frame_buffer(mode.depth, native_byte_order); |
523 |
> |
|
524 |
> |
// Everything went well |
525 |
> |
init_ok = true; |
526 |
> |
} |
527 |
> |
|
528 |
> |
// Close display |
529 |
> |
driver_window::~driver_window() |
530 |
> |
{ |
531 |
> |
if (img) |
532 |
> |
XDestroyImage(img); |
533 |
> |
if (have_shm) { |
534 |
> |
XShmDetach(x_display, &shminfo); |
535 |
> |
the_buffer_copy = NULL; // don't free() in driver_base dtor |
536 |
> |
} |
537 |
> |
if (gc) |
538 |
> |
XFreeGC(x_display, gc); |
539 |
> |
} |
540 |
> |
|
541 |
> |
|
542 |
> |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
543 |
> |
/* |
544 |
> |
* DGA display driver base class |
545 |
> |
*/ |
546 |
> |
|
547 |
> |
class driver_dga : public driver_base { |
548 |
> |
public: |
549 |
> |
driver_dga(); |
550 |
> |
~driver_dga(); |
551 |
> |
|
552 |
> |
void suspend(void); |
553 |
> |
void resume(void); |
554 |
> |
|
555 |
> |
private: |
556 |
> |
Window suspend_win; // "Suspend" information window |
557 |
> |
void *fb_save; // Saved frame buffer for suspend/resume |
558 |
> |
}; |
559 |
> |
|
560 |
> |
driver_dga::driver_dga() |
561 |
> |
: suspend_win(0), fb_save(NULL) |
562 |
> |
{ |
563 |
> |
} |
564 |
> |
|
565 |
> |
driver_dga::~driver_dga() |
566 |
> |
{ |
567 |
> |
XUngrabPointer(x_display, CurrentTime); |
568 |
> |
XUngrabKeyboard(x_display, CurrentTime); |
569 |
> |
} |
570 |
> |
|
571 |
> |
// Suspend emulation |
572 |
> |
void driver_dga::suspend(void) |
573 |
> |
{ |
574 |
> |
// Release ctrl key |
575 |
> |
ADBKeyUp(0x36); |
576 |
> |
ctrl_down = false; |
577 |
> |
|
578 |
> |
// Lock frame buffer (this will stop the MacOS thread) |
579 |
> |
LOCK_FRAME_BUFFER; |
580 |
> |
|
581 |
> |
// Save frame buffer |
582 |
> |
fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
583 |
> |
if (fb_save) |
584 |
> |
memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
585 |
> |
|
586 |
> |
// Close full screen display |
587 |
> |
#ifdef ENABLE_XF86_DGA |
588 |
> |
XF86DGADirectVideo(x_display, screen, 0); |
589 |
|
#endif |
590 |
< |
return true; |
590 |
> |
XUngrabPointer(x_display, CurrentTime); |
591 |
> |
XUngrabKeyboard(x_display, CurrentTime); |
592 |
> |
XUnmapWindow(x_display, w); |
593 |
> |
wait_unmapped(w); |
594 |
> |
|
595 |
> |
// Open "suspend" window |
596 |
> |
XSetWindowAttributes wattr; |
597 |
> |
wattr.event_mask = KeyPressMask; |
598 |
> |
wattr.background_pixel = black_pixel; |
599 |
> |
|
600 |
> |
suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth, |
601 |
> |
InputOutput, vis, CWEventMask | CWBackPixel, &wattr); |
602 |
> |
set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE); |
603 |
> |
set_window_focus(suspend_win); |
604 |
> |
XMapWindow(x_display, suspend_win); |
605 |
> |
emul_suspended = true; |
606 |
|
} |
607 |
|
|
608 |
< |
// Init fbdev DGA display |
609 |
< |
static bool init_fbdev_dga(char *in_fb_name) |
608 |
> |
// Resume emulation |
609 |
> |
void driver_dga::resume(void) |
610 |
|
{ |
611 |
+ |
// Close "suspend" window |
612 |
+ |
XDestroyWindow(x_display, suspend_win); |
613 |
+ |
XSync(x_display, false); |
614 |
+ |
|
615 |
+ |
// Reopen full screen display |
616 |
+ |
XMapRaised(x_display, w); |
617 |
+ |
wait_mapped(w); |
618 |
+ |
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
619 |
+ |
XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime); |
620 |
+ |
XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
621 |
+ |
#ifdef ENABLE_XF86_DGA |
622 |
+ |
XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); |
623 |
+ |
XF86DGASetViewPort(x_display, screen, 0, 0); |
624 |
+ |
#endif |
625 |
+ |
XSync(x_display, false); |
626 |
+ |
|
627 |
+ |
// the_buffer already contains the data to restore. i.e. since a temporary |
628 |
+ |
// frame buffer is used when VOSF is actually used, fb_save is therefore |
629 |
+ |
// not necessary. |
630 |
+ |
#ifdef ENABLE_VOSF |
631 |
+ |
if (use_vosf) { |
632 |
+ |
LOCK_VOSF; |
633 |
+ |
PFLAG_SET_ALL; |
634 |
+ |
UNLOCK_VOSF; |
635 |
+ |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
636 |
+ |
} |
637 |
+ |
#endif |
638 |
+ |
|
639 |
+ |
// Restore frame buffer |
640 |
+ |
if (fb_save) { |
641 |
+ |
#ifdef ENABLE_VOSF |
642 |
+ |
// Don't copy fb_save to the temporary frame buffer in VOSF mode |
643 |
+ |
if (!use_vosf) |
644 |
+ |
#endif |
645 |
+ |
memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
646 |
+ |
free(fb_save); |
647 |
+ |
fb_save = NULL; |
648 |
+ |
} |
649 |
+ |
|
650 |
+ |
// Unlock frame buffer (and continue MacOS thread) |
651 |
+ |
UNLOCK_FRAME_BUFFER; |
652 |
+ |
emul_suspended = false; |
653 |
+ |
} |
654 |
+ |
#endif |
655 |
+ |
|
656 |
+ |
|
657 |
|
#ifdef ENABLE_FBDEV_DGA |
658 |
+ |
/* |
659 |
+ |
* fbdev DGA display driver |
660 |
+ |
*/ |
661 |
+ |
|
662 |
+ |
const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices"; |
663 |
+ |
const char FBDEVICE_FILE_NAME[] = "/dev/fb"; |
664 |
+ |
|
665 |
+ |
class driver_fbdev : public driver_dga { |
666 |
+ |
public: |
667 |
+ |
driver_fbdev(const video_mode &mode); |
668 |
+ |
~driver_fbdev(); |
669 |
+ |
}; |
670 |
+ |
|
671 |
+ |
// Open display |
672 |
+ |
driver_fbdev::driver_fbdev(const video_mode &mode) |
673 |
+ |
{ |
674 |
+ |
int width = mode.x, height = mode.y; |
675 |
+ |
|
676 |
+ |
// Set absolute mouse mode |
677 |
+ |
ADBSetRelMouseMode(false); |
678 |
+ |
|
679 |
|
// Find the maximum depth available |
680 |
|
int ndepths, max_depth(0); |
681 |
|
int *depths = XListDepths(x_display, screen, &ndepths); |
682 |
|
if (depths == NULL) { |
683 |
|
printf("FATAL: Could not determine the maximal depth available\n"); |
684 |
< |
return false; |
684 |
> |
return; |
685 |
|
} else { |
686 |
|
while (ndepths-- > 0) { |
687 |
|
if (depths[ndepths] > max_depth) |
698 |
|
char str[256]; |
699 |
|
sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno)); |
700 |
|
ErrorAlert(str); |
701 |
< |
return false; |
701 |
> |
return; |
702 |
|
} |
703 |
|
|
704 |
|
int fb_depth; // supported depth |
718 |
|
continue; |
719 |
|
|
720 |
|
if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3) |
721 |
< |
&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) { |
721 |
> |
&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) { |
722 |
|
device_found = true; |
723 |
|
break; |
724 |
|
} |
730 |
|
// Frame buffer name not found ? Then, display warning |
731 |
|
if (!device_found) { |
732 |
|
char str[256]; |
733 |
< |
sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth); |
733 |
> |
sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth); |
734 |
|
ErrorAlert(str); |
735 |
< |
return false; |
735 |
> |
return; |
736 |
|
} |
737 |
|
|
601 |
– |
int width = DisplayWidth(x_display, screen); |
602 |
– |
int height = DisplayHeight(x_display, screen); |
603 |
– |
depth = fb_depth; // max_depth |
604 |
– |
|
605 |
– |
// Set relative mouse mode |
606 |
– |
ADBSetRelMouseMode(false); |
607 |
– |
|
738 |
|
// Create window |
739 |
|
XSetWindowAttributes wattr; |
740 |
|
wattr.event_mask = eventmask = dga_eventmask; |
742 |
|
wattr.override_redirect = True; |
743 |
|
wattr.colormap = cmap[0]; |
744 |
|
|
745 |
< |
the_win = XCreateWindow(x_display, rootwin, |
745 |
> |
w = XCreateWindow(x_display, rootwin, |
746 |
|
0, 0, width, height, |
747 |
|
0, xdepth, InputOutput, vis, |
748 |
< |
CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0), |
748 |
> |
CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0), |
749 |
|
&wattr); |
750 |
|
|
751 |
|
// Set window name/class |
752 |
< |
set_window_name(the_win, STR_WINDOW_TITLE); |
752 |
> |
set_window_name(w, STR_WINDOW_TITLE); |
753 |
|
|
754 |
|
// Indicate that we want keyboard input |
755 |
< |
set_window_focus(the_win); |
755 |
> |
set_window_focus(w); |
756 |
|
|
757 |
|
// Show window |
758 |
< |
XMapRaised(x_display, the_win); |
759 |
< |
wait_mapped(the_win); |
758 |
> |
XMapRaised(x_display, w); |
759 |
> |
wait_mapped(w); |
760 |
|
|
761 |
|
// Grab mouse and keyboard |
762 |
< |
XGrabKeyboard(x_display, the_win, True, |
762 |
> |
XGrabKeyboard(x_display, w, True, |
763 |
|
GrabModeAsync, GrabModeAsync, CurrentTime); |
764 |
< |
XGrabPointer(x_display, the_win, True, |
764 |
> |
XGrabPointer(x_display, w, True, |
765 |
|
PointerMotionMask | ButtonPressMask | ButtonReleaseMask, |
766 |
< |
GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime); |
766 |
> |
GrabModeAsync, GrabModeAsync, w, None, CurrentTime); |
767 |
|
|
768 |
< |
// Set VideoMonitor |
769 |
< |
int bytes_per_row = width; |
640 |
< |
switch (depth) { |
641 |
< |
case 1: |
642 |
< |
bytes_per_row = ((width | 7) & ~7) >> 3; |
643 |
< |
break; |
644 |
< |
case 15: |
645 |
< |
case 16: |
646 |
< |
bytes_per_row *= 2; |
647 |
< |
break; |
648 |
< |
case 24: |
649 |
< |
case 32: |
650 |
< |
bytes_per_row *= 4; |
651 |
< |
break; |
652 |
< |
} |
768 |
> |
// Calculate bytes per row |
769 |
> |
int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth); |
770 |
|
|
771 |
+ |
// Map frame buffer |
772 |
|
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { |
773 |
|
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { |
774 |
|
char str[256]; |
775 |
|
sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno)); |
776 |
|
ErrorAlert(str); |
777 |
< |
return false; |
777 |
> |
return; |
778 |
|
} |
779 |
|
} |
780 |
|
|
781 |
|
#if ENABLE_VOSF |
782 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
783 |
< |
// If the blit function is null, i.e. just a copy of the buffer, |
784 |
< |
// we first try to avoid the allocation of a temporary frame buffer |
785 |
< |
use_vosf = true; |
668 |
< |
do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA); |
669 |
< |
if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw)) |
670 |
< |
use_vosf = false; |
783 |
> |
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
784 |
> |
// i.e. the framebuffer update function is not Blit_Copy_Raw |
785 |
> |
use_vosf = Screen_blitter_init(&visualInfo, true); |
786 |
|
|
787 |
|
if (use_vosf) { |
788 |
< |
the_host_buffer = the_buffer; |
789 |
< |
the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row); |
790 |
< |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
791 |
< |
memset(the_buffer_copy, 0, the_buffer_size); |
792 |
< |
the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size); |
678 |
< |
memset(the_buffer, 0, the_buffer_size); |
788 |
> |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
789 |
> |
the_host_buffer = the_buffer; |
790 |
> |
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
791 |
> |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
792 |
> |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
793 |
|
} |
794 |
|
#else |
795 |
|
use_vosf = false; |
796 |
|
#endif |
797 |
|
#endif |
798 |
|
|
799 |
< |
set_video_monitor(width, height, bytes_per_row, true); |
800 |
< |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
801 |
< |
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
802 |
< |
#else |
803 |
< |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
804 |
< |
#endif |
805 |
< |
return true; |
806 |
< |
#else |
693 |
< |
ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled."); |
694 |
< |
return false; |
695 |
< |
#endif |
799 |
> |
// Set VideoMonitor |
800 |
> |
VideoModes[0].bytes_per_row = bytes_per_row; |
801 |
> |
VideoModes[0].depth = DepthModeForPixelDepth(fb_depth); |
802 |
> |
VideoMonitor.mode = mode; |
803 |
> |
set_mac_frame_buffer(mode.depth, true); |
804 |
> |
|
805 |
> |
// Everything went well |
806 |
> |
init_ok = true; |
807 |
|
} |
808 |
|
|
809 |
< |
// Init XF86 DGA display |
810 |
< |
static bool init_xf86_dga(int width, int height) |
809 |
> |
// Close display |
810 |
> |
driver_fbdev::~driver_fbdev() |
811 |
|
{ |
812 |
+ |
} |
813 |
+ |
#endif |
814 |
+ |
|
815 |
+ |
|
816 |
|
#ifdef ENABLE_XF86_DGA |
817 |
+ |
/* |
818 |
+ |
* XFree86 DGA display driver |
819 |
+ |
*/ |
820 |
+ |
|
821 |
+ |
class driver_xf86dga : public driver_dga { |
822 |
+ |
public: |
823 |
+ |
driver_xf86dga(const video_mode &mode); |
824 |
+ |
~driver_xf86dga(); |
825 |
+ |
|
826 |
+ |
void update_palette(void); |
827 |
+ |
void resume(void); |
828 |
+ |
|
829 |
+ |
private: |
830 |
+ |
int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap |
831 |
+ |
}; |
832 |
+ |
|
833 |
+ |
// Open display |
834 |
+ |
driver_xf86dga::driver_xf86dga(const video_mode &mode) |
835 |
+ |
: current_dga_cmap(0) |
836 |
+ |
{ |
837 |
+ |
int width = mode.x, height = mode.y; |
838 |
+ |
|
839 |
|
// Set relative mouse mode |
840 |
|
ADBSetRelMouseMode(true); |
841 |
|
|
860 |
|
wattr.event_mask = eventmask = dga_eventmask; |
861 |
|
wattr.override_redirect = True; |
862 |
|
|
863 |
< |
the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
863 |
> |
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
864 |
|
InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr); |
865 |
|
|
866 |
|
// Set window name/class |
867 |
< |
set_window_name(the_win, STR_WINDOW_TITLE); |
867 |
> |
set_window_name(w, STR_WINDOW_TITLE); |
868 |
|
|
869 |
|
// Indicate that we want keyboard input |
870 |
< |
set_window_focus(the_win); |
870 |
> |
set_window_focus(w); |
871 |
|
|
872 |
|
// Show window |
873 |
< |
XMapRaised(x_display, the_win); |
874 |
< |
wait_mapped(the_win); |
873 |
> |
XMapRaised(x_display, w); |
874 |
> |
wait_mapped(w); |
875 |
|
|
876 |
|
// Establish direct screen connection |
877 |
< |
XMoveResizeWindow(x_display, the_win, 0, 0, width, height); |
877 |
> |
XMoveResizeWindow(x_display, w, 0, 0, width, height); |
878 |
|
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
879 |
|
XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); |
880 |
|
XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
886 |
|
XF86DGASetVidPage(x_display, screen, 0); |
887 |
|
|
888 |
|
// Set colormap |
889 |
< |
if (depth == 8) { |
890 |
< |
XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]); |
889 |
> |
if (!IsDirectMode(mode)) { |
890 |
> |
XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]); |
891 |
|
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
892 |
|
} |
893 |
|
XSync(x_display, false); |
894 |
|
|
895 |
< |
// Set VideoMonitor |
896 |
< |
int bytes_per_row = (v_width + 7) & ~7; |
897 |
< |
switch (depth) { |
761 |
< |
case 1: |
762 |
< |
bytes_per_row /= 8; |
763 |
< |
break; |
764 |
< |
case 15: |
765 |
< |
case 16: |
766 |
< |
bytes_per_row *= 2; |
767 |
< |
break; |
768 |
< |
case 24: |
769 |
< |
case 32: |
770 |
< |
bytes_per_row *= 4; |
771 |
< |
break; |
772 |
< |
} |
773 |
< |
|
895 |
> |
// Init blitting routines |
896 |
> |
int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth); |
897 |
> |
#ifdef VIDEO_VOSF |
898 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
899 |
< |
// If the blit function is null, i.e. just a copy of the buffer, |
900 |
< |
// we first try to avoid the allocation of a temporary frame buffer |
901 |
< |
use_vosf = true; |
778 |
< |
do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA); |
779 |
< |
if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw)) |
780 |
< |
use_vosf = false; |
899 |
> |
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
900 |
> |
// i.e. the framebuffer update function is not Blit_Copy_Raw |
901 |
> |
use_vosf = Screen_blitter_init(&visualInfo, true); |
902 |
|
|
903 |
|
if (use_vosf) { |
904 |
< |
the_host_buffer = the_buffer; |
905 |
< |
the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row); |
906 |
< |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
907 |
< |
memset(the_buffer_copy, 0, the_buffer_size); |
908 |
< |
the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size); |
788 |
< |
memset(the_buffer, 0, the_buffer_size); |
904 |
> |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
905 |
> |
the_host_buffer = the_buffer; |
906 |
> |
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
907 |
> |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
908 |
> |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
909 |
|
} |
910 |
< |
#elif defined(ENABLE_VOSF) |
791 |
< |
// The UAE memory handlers will already handle color conversion, if needed. |
910 |
> |
#else |
911 |
|
use_vosf = false; |
912 |
|
#endif |
794 |
– |
|
795 |
– |
set_video_monitor(width, height, bytes_per_row, true); |
796 |
– |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
797 |
– |
VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); |
798 |
– |
// MacFrameLayout = FLAYOUT_DIRECT; |
799 |
– |
#else |
800 |
– |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
913 |
|
#endif |
914 |
< |
return true; |
915 |
< |
#else |
916 |
< |
ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled."); |
917 |
< |
return false; |
914 |
> |
|
915 |
> |
// Set VideoMonitor |
916 |
> |
const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row; |
917 |
> |
VideoMonitor.mode = mode; |
918 |
> |
set_mac_frame_buffer(mode.depth, true); |
919 |
> |
|
920 |
> |
// Everything went well |
921 |
> |
init_ok = true; |
922 |
> |
} |
923 |
> |
|
924 |
> |
// Close display |
925 |
> |
driver_xf86dga::~driver_xf86dga() |
926 |
> |
{ |
927 |
> |
XF86DGADirectVideo(x_display, screen, 0); |
928 |
> |
#ifdef ENABLE_XF86_VIDMODE |
929 |
> |
if (has_vidmode) |
930 |
> |
XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]); |
931 |
|
#endif |
932 |
|
} |
933 |
|
|
934 |
+ |
// Palette has changed |
935 |
+ |
void driver_xf86dga::update_palette(void) |
936 |
+ |
{ |
937 |
+ |
driver_dga::update_palette(); |
938 |
+ |
current_dga_cmap ^= 1; |
939 |
+ |
if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap]) |
940 |
+ |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
941 |
+ |
} |
942 |
+ |
|
943 |
+ |
// Resume emulation |
944 |
+ |
void driver_xf86dga::resume(void) |
945 |
+ |
{ |
946 |
+ |
driver_dga::resume(); |
947 |
+ |
if (!IsDirectMode(VideoMonitor.mode)) |
948 |
+ |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
949 |
+ |
} |
950 |
+ |
#endif |
951 |
+ |
|
952 |
+ |
|
953 |
+ |
/* |
954 |
+ |
* Initialization |
955 |
+ |
*/ |
956 |
+ |
|
957 |
|
// Init keycode translation table |
958 |
|
static void keycode_init(void) |
959 |
|
{ |
1019 |
|
} |
1020 |
|
} |
1021 |
|
|
1022 |
< |
bool VideoInitBuffer() |
1022 |
> |
// Open display for specified mode |
1023 |
> |
static bool video_open(const video_mode &mode) |
1024 |
|
{ |
1025 |
+ |
// Create display driver object of requested type |
1026 |
+ |
switch (display_type) { |
1027 |
+ |
case DISPLAY_WINDOW: |
1028 |
+ |
drv = new driver_window(mode); |
1029 |
+ |
break; |
1030 |
+ |
#ifdef ENABLE_FBDEV_DGA |
1031 |
+ |
case DISPLAY_DGA: |
1032 |
+ |
drv = new driver_fbdev(mode); |
1033 |
+ |
break; |
1034 |
+ |
#endif |
1035 |
+ |
#ifdef ENABLE_XF86_DGA |
1036 |
+ |
case DISPLAY_DGA: |
1037 |
+ |
drv = new driver_xf86dga(mode); |
1038 |
+ |
break; |
1039 |
+ |
#endif |
1040 |
+ |
} |
1041 |
+ |
if (drv == NULL) |
1042 |
+ |
return false; |
1043 |
+ |
if (!drv->init_ok) { |
1044 |
+ |
delete drv; |
1045 |
+ |
drv = NULL; |
1046 |
+ |
return false; |
1047 |
+ |
} |
1048 |
+ |
|
1049 |
|
#ifdef ENABLE_VOSF |
1050 |
|
if (use_vosf) { |
1051 |
< |
const uint32 page_size = getpagesize(); |
1052 |
< |
const uint32 page_mask = page_size - 1; |
1053 |
< |
|
1054 |
< |
mainBuffer.memBase = (uint32) the_buffer; |
1055 |
< |
// Align the frame buffer on page boundary |
883 |
< |
mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask); |
884 |
< |
mainBuffer.memLength = the_buffer_size; |
885 |
< |
mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength; |
886 |
< |
|
887 |
< |
mainBuffer.pageSize = page_size; |
888 |
< |
mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize; |
889 |
< |
mainBuffer.pageBits = log_base_2(mainBuffer.pageSize); |
890 |
< |
|
891 |
< |
if (mainBuffer.dirtyPages != 0) |
892 |
< |
free(mainBuffer.dirtyPages); |
893 |
< |
|
894 |
< |
mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount); |
895 |
< |
|
896 |
< |
if (mainBuffer.pageInfo != 0) |
897 |
< |
free(mainBuffer.pageInfo); |
898 |
< |
|
899 |
< |
mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo)); |
1051 |
> |
// Initialize the mainBuffer structure |
1052 |
> |
if (!video_init_buffer()) { |
1053 |
> |
ErrorAlert(STR_VOSF_INIT_ERR); |
1054 |
> |
return false; |
1055 |
> |
} |
1056 |
|
|
1057 |
< |
if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0)) |
1057 |
> |
// Initialize the handler for SIGSEGV |
1058 |
> |
if (!sigsegv_install_handler(screen_fault_handler)) { |
1059 |
> |
ErrorAlert("Could not initialize Video on SEGV signals"); |
1060 |
|
return false; |
1061 |
+ |
} |
1062 |
+ |
} |
1063 |
+ |
#endif |
1064 |
+ |
|
1065 |
+ |
// Initialize VideoRefresh function |
1066 |
+ |
VideoRefreshInit(); |
1067 |
|
|
1068 |
< |
PFLAG_CLEAR_ALL; |
1068 |
> |
// Lock down frame buffer |
1069 |
> |
XSync(x_display, false); |
1070 |
> |
LOCK_FRAME_BUFFER; |
1071 |
|
|
1072 |
< |
uint32 a = 0; |
1073 |
< |
for (int i = 0; i < mainBuffer.pageCount; i++) { |
1074 |
< |
int y1 = a / VideoMonitor.bytes_per_row; |
1075 |
< |
if (y1 >= VideoMonitor.y) |
1076 |
< |
y1 = VideoMonitor.y - 1; |
1077 |
< |
|
1078 |
< |
int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row; |
913 |
< |
if (y2 >= VideoMonitor.y) |
914 |
< |
y2 = VideoMonitor.y - 1; |
915 |
< |
|
916 |
< |
mainBuffer.pageInfo[i].top = y1; |
917 |
< |
mainBuffer.pageInfo[i].bottom = y2; |
918 |
< |
|
919 |
< |
a += mainBuffer.pageSize; |
920 |
< |
if (a > mainBuffer.memLength) |
921 |
< |
a = mainBuffer.memLength; |
922 |
< |
} |
923 |
< |
|
924 |
< |
// We can now write-protect the frame buffer |
925 |
< |
if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0) |
926 |
< |
return false; |
1072 |
> |
// Start redraw/input thread |
1073 |
> |
#ifdef HAVE_PTHREADS |
1074 |
> |
redraw_thread_cancel = false; |
1075 |
> |
redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0); |
1076 |
> |
if (!redraw_thread_active) { |
1077 |
> |
printf("FATAL: cannot create redraw thread\n"); |
1078 |
> |
return false; |
1079 |
|
} |
1080 |
+ |
#else |
1081 |
+ |
redraw_thread_active = true; |
1082 |
|
#endif |
1083 |
+ |
|
1084 |
|
return true; |
1085 |
|
} |
1086 |
|
|
1087 |
|
bool VideoInit(bool classic) |
1088 |
|
{ |
1089 |
+ |
classic_mode = classic; |
1090 |
+ |
|
1091 |
|
#ifdef ENABLE_VOSF |
935 |
– |
// Open /dev/zero |
936 |
– |
zero_fd = open("/dev/zero", O_RDWR); |
937 |
– |
if (zero_fd < 0) { |
938 |
– |
char str[256]; |
939 |
– |
sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno)); |
940 |
– |
ErrorAlert(str); |
941 |
– |
return false; |
942 |
– |
} |
943 |
– |
|
1092 |
|
// Zero the mainBuffer structure |
1093 |
< |
mainBuffer.dirtyPages = 0; |
1094 |
< |
mainBuffer.pageInfo = 0; |
1093 |
> |
mainBuffer.dirtyPages = NULL; |
1094 |
> |
mainBuffer.pageInfo = NULL; |
1095 |
|
#endif |
1096 |
|
|
1097 |
|
// Check if X server runs on local machine |
1102 |
|
keycode_init(); |
1103 |
|
|
1104 |
|
// Read prefs |
1105 |
< |
mouse_wheel_mode = PrefsFindInt16("mousewheelmode"); |
1106 |
< |
mouse_wheel_lines = PrefsFindInt16("mousewheellines"); |
1105 |
> |
frame_skip = PrefsFindInt32("frameskip"); |
1106 |
> |
mouse_wheel_mode = PrefsFindInt32("mousewheelmode"); |
1107 |
> |
mouse_wheel_lines = PrefsFindInt32("mousewheellines"); |
1108 |
|
|
1109 |
|
// Find screen and root window |
1110 |
|
screen = XDefaultScreen(x_display); |
1117 |
|
// Frame buffer name |
1118 |
|
char fb_name[20]; |
1119 |
|
|
1120 |
< |
// Could do fbdev dga ? |
1120 |
> |
// Could do fbdev DGA? |
1121 |
|
if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1) |
1122 |
|
has_dga = true; |
1123 |
|
else |
1163 |
|
case 15: |
1164 |
|
case 16: |
1165 |
|
case 24: |
1166 |
< |
case 32: |
1167 |
< |
color_class = TrueColor; |
1166 |
> |
case 32: // Try DirectColor first, as this will allow gamma correction |
1167 |
> |
if (!XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)) |
1168 |
> |
color_class = TrueColor; |
1169 |
|
break; |
1170 |
|
default: |
1171 |
< |
ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR)); |
1171 |
> |
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1172 |
|
return false; |
1173 |
|
} |
1174 |
|
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) { |
1175 |
< |
ErrorAlert(GetString(STR_NO_XVISUAL_ERR)); |
1175 |
> |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1176 |
|
return false; |
1177 |
|
} |
1178 |
|
if (visualInfo.depth != xdepth) { |
1179 |
< |
ErrorAlert(GetString(STR_NO_XVISUAL_ERR)); |
1179 |
> |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1180 |
|
return false; |
1181 |
|
} |
1182 |
|
vis = visualInfo.visual; |
1183 |
|
|
1184 |
< |
// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise |
1185 |
< |
classic_mode = classic; |
1036 |
< |
if (classic) |
1037 |
< |
depth = 1; |
1038 |
< |
else |
1039 |
< |
depth = xdepth; |
1040 |
< |
|
1041 |
< |
// Create color maps for 8 bit mode |
1042 |
< |
if (depth == 8) { |
1184 |
> |
// Create color maps |
1185 |
> |
if (color_class == PseudoColor || color_class == DirectColor) { |
1186 |
|
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1187 |
|
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1045 |
– |
XInstallColormap(x_display, cmap[0]); |
1046 |
– |
XInstallColormap(x_display, cmap[1]); |
1188 |
|
} |
1189 |
|
|
1190 |
|
// Get screen mode from preferences |
1191 |
|
const char *mode_str; |
1192 |
< |
if (classic) |
1192 |
> |
if (classic_mode) |
1193 |
|
mode_str = "win/512/342"; |
1194 |
|
else |
1195 |
|
mode_str = PrefsFindString("screen"); |
1196 |
|
|
1197 |
< |
// Determine type and mode |
1198 |
< |
int width = 512, height = 384; |
1197 |
> |
// Determine display type and default dimensions |
1198 |
> |
int default_width = 512, default_height = 384; |
1199 |
|
display_type = DISPLAY_WINDOW; |
1200 |
|
if (mode_str) { |
1201 |
< |
if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2) |
1201 |
> |
if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) { |
1202 |
|
display_type = DISPLAY_WINDOW; |
1203 |
|
#ifdef ENABLE_FBDEV_DGA |
1204 |
< |
else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) { |
1205 |
< |
#else |
1206 |
< |
else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) { |
1204 |
> |
} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) { |
1205 |
> |
display_type = DISPLAY_DGA; |
1206 |
> |
default_width = -1; default_height = -1; // use entire screen |
1207 |
|
#endif |
1208 |
+ |
#ifdef ENABLE_XF86_DGA |
1209 |
+ |
} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) { |
1210 |
|
display_type = DISPLAY_DGA; |
1068 |
– |
if (width > DisplayWidth(x_display, screen)) |
1069 |
– |
width = DisplayWidth(x_display, screen); |
1070 |
– |
if (height > DisplayHeight(x_display, screen)) |
1071 |
– |
height = DisplayHeight(x_display, screen); |
1072 |
– |
} |
1073 |
– |
if (width <= 0) |
1074 |
– |
width = DisplayWidth(x_display, screen); |
1075 |
– |
if (height <= 0) |
1076 |
– |
height = DisplayHeight(x_display, screen); |
1077 |
– |
} |
1078 |
– |
|
1079 |
– |
// Initialize according to display type |
1080 |
– |
switch (display_type) { |
1081 |
– |
case DISPLAY_WINDOW: |
1082 |
– |
if (!init_window(width, height)) |
1083 |
– |
return false; |
1084 |
– |
break; |
1085 |
– |
case DISPLAY_DGA: |
1086 |
– |
#ifdef ENABLE_FBDEV_DGA |
1087 |
– |
if (!init_fbdev_dga(fb_name)) |
1088 |
– |
#else |
1089 |
– |
if (!init_xf86_dga(width, height)) |
1211 |
|
#endif |
1212 |
< |
return false; |
1092 |
< |
break; |
1212 |
> |
} |
1213 |
|
} |
1214 |
+ |
if (default_width <= 0) |
1215 |
+ |
default_width = DisplayWidth(x_display, screen); |
1216 |
+ |
else if (default_width > DisplayWidth(x_display, screen)) |
1217 |
+ |
default_width = DisplayWidth(x_display, screen); |
1218 |
+ |
if (default_height <= 0) |
1219 |
+ |
default_height = DisplayHeight(x_display, screen); |
1220 |
+ |
else if (default_height > DisplayHeight(x_display, screen)) |
1221 |
+ |
default_height = DisplayHeight(x_display, screen); |
1222 |
|
|
1223 |
< |
// Lock down frame buffer |
1224 |
< |
LOCK_FRAME_BUFFER; |
1225 |
< |
|
1098 |
< |
#if !REAL_ADDRESSING && !DIRECT_ADDRESSING |
1099 |
< |
// Set variables for UAE memory mapping |
1100 |
< |
MacFrameBaseHost = the_buffer; |
1101 |
< |
MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y; |
1102 |
< |
|
1103 |
< |
// No special frame buffer in Classic mode (frame buffer is in Mac RAM) |
1104 |
< |
if (classic) |
1105 |
< |
MacFrameLayout = FLAYOUT_NONE; |
1106 |
< |
#endif |
1223 |
> |
// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise |
1224 |
> |
int depth = (classic_mode ? 1 : xdepth); |
1225 |
> |
video_depth depth_mode = DepthModeForPixelDepth(depth); |
1226 |
|
|
1227 |
< |
#ifdef ENABLE_VOSF |
1228 |
< |
if (use_vosf) { |
1229 |
< |
// Initialize the mainBuffer structure |
1230 |
< |
if (!VideoInitBuffer()) { |
1231 |
< |
// TODO: STR_VOSF_INIT_ERR ? |
1232 |
< |
ErrorAlert("Could not initialize Video on SEGV signals"); |
1233 |
< |
return false; |
1227 |
> |
// Construct list of supported modes |
1228 |
> |
if (display_type == DISPLAY_WINDOW) { |
1229 |
> |
if (classic) |
1230 |
> |
add_mode(512, 342, 0x80, 64, depth_mode); |
1231 |
> |
else { |
1232 |
> |
add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode); |
1233 |
> |
add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode); |
1234 |
> |
add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode); |
1235 |
> |
add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode); |
1236 |
> |
add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode); |
1237 |
|
} |
1238 |
+ |
} else |
1239 |
+ |
add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode); |
1240 |
|
|
1241 |
< |
// Initialize the handler for SIGSEGV |
1242 |
< |
if (!Screen_fault_handler_init()) { |
1243 |
< |
// TODO: STR_VOSF_INIT_ERR ? |
1244 |
< |
ErrorAlert("Could not initialize Video on SEGV signals"); |
1245 |
< |
return false; |
1241 |
> |
// Find requested default mode and open display |
1242 |
> |
if (VideoModes.size() == 1) |
1243 |
> |
return video_open(VideoModes[0]); |
1244 |
> |
else { |
1245 |
> |
// Find mode with specified dimensions |
1246 |
> |
std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end(); |
1247 |
> |
while (i != end) { |
1248 |
> |
if (i->x == default_width && i->y == default_height) |
1249 |
> |
return video_open(*i); |
1250 |
> |
++i; |
1251 |
|
} |
1252 |
+ |
return video_open(VideoModes[0]); |
1253 |
|
} |
1124 |
– |
#endif |
1125 |
– |
|
1126 |
– |
// Initialize VideoRefresh function |
1127 |
– |
VideoRefreshInit(); |
1128 |
– |
|
1129 |
– |
XSync(x_display, false); |
1130 |
– |
|
1131 |
– |
#ifdef HAVE_PTHREADS |
1132 |
– |
// Start redraw/input thread |
1133 |
– |
redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0); |
1134 |
– |
if (!redraw_thread_active) { |
1135 |
– |
printf("FATAL: cannot create redraw thread\n"); |
1136 |
– |
return false; |
1137 |
– |
} |
1138 |
– |
#endif |
1139 |
– |
return true; |
1254 |
|
} |
1255 |
|
|
1256 |
|
|
1258 |
|
* Deinitialization |
1259 |
|
*/ |
1260 |
|
|
1261 |
< |
void VideoExit(void) |
1261 |
> |
// Close display |
1262 |
> |
static void video_close(void) |
1263 |
|
{ |
1149 |
– |
#ifdef HAVE_PTHREADS |
1264 |
|
// Stop redraw thread |
1265 |
+ |
#ifdef HAVE_PTHREADS |
1266 |
|
if (redraw_thread_active) { |
1267 |
|
redraw_thread_cancel = true; |
1268 |
|
#ifdef HAVE_PTHREAD_CANCEL |
1269 |
|
pthread_cancel(redraw_thread); |
1270 |
|
#endif |
1271 |
|
pthread_join(redraw_thread, NULL); |
1157 |
– |
redraw_thread_active = false; |
1272 |
|
} |
1273 |
|
#endif |
1274 |
+ |
redraw_thread_active = false; |
1275 |
|
|
1276 |
|
// Unlock frame buffer |
1277 |
|
UNLOCK_FRAME_BUFFER; |
1278 |
+ |
XSync(x_display, false); |
1279 |
|
|
1164 |
– |
// Close window and server connection |
1165 |
– |
if (x_display != NULL) { |
1166 |
– |
XSync(x_display, false); |
1167 |
– |
|
1168 |
– |
#ifdef ENABLE_XF86_DGA |
1169 |
– |
if (display_type == DISPLAY_DGA) { |
1170 |
– |
XF86DGADirectVideo(x_display, screen, 0); |
1171 |
– |
XUngrabPointer(x_display, CurrentTime); |
1172 |
– |
XUngrabKeyboard(x_display, CurrentTime); |
1173 |
– |
} |
1174 |
– |
#endif |
1175 |
– |
|
1176 |
– |
#ifdef ENABLE_XF86_VIDMODE |
1177 |
– |
if (has_vidmode && display_type == DISPLAY_DGA) |
1178 |
– |
XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]); |
1179 |
– |
#endif |
1180 |
– |
|
1181 |
– |
#ifdef ENABLE_FBDEV_DGA |
1182 |
– |
if (display_type == DISPLAY_DGA) { |
1183 |
– |
XUngrabPointer(x_display, CurrentTime); |
1184 |
– |
XUngrabKeyboard(x_display, CurrentTime); |
1185 |
– |
close(fbdev_fd); |
1186 |
– |
} |
1187 |
– |
#endif |
1188 |
– |
|
1189 |
– |
XFlush(x_display); |
1190 |
– |
XSync(x_display, false); |
1191 |
– |
if (depth == 8) { |
1192 |
– |
XFreeColormap(x_display, cmap[0]); |
1193 |
– |
XFreeColormap(x_display, cmap[1]); |
1194 |
– |
} |
1195 |
– |
|
1196 |
– |
if (!use_vosf) { |
1197 |
– |
if (the_buffer) { |
1198 |
– |
free(the_buffer); |
1199 |
– |
the_buffer = NULL; |
1200 |
– |
} |
1201 |
– |
|
1202 |
– |
if (!have_shm && the_buffer_copy) { |
1203 |
– |
free(the_buffer_copy); |
1204 |
– |
the_buffer_copy = NULL; |
1205 |
– |
} |
1206 |
– |
} |
1207 |
– |
#ifdef ENABLE_VOSF |
1208 |
– |
else { |
1209 |
– |
if (the_buffer != (uint8 *)MAP_FAILED) { |
1210 |
– |
munmap((caddr_t)the_buffer, the_buffer_size); |
1211 |
– |
the_buffer = 0; |
1212 |
– |
} |
1213 |
– |
|
1214 |
– |
if (the_buffer_copy != (uint8 *)MAP_FAILED) { |
1215 |
– |
munmap((caddr_t)the_buffer_copy, the_buffer_size); |
1216 |
– |
the_buffer_copy = 0; |
1217 |
– |
} |
1218 |
– |
} |
1219 |
– |
#endif |
1220 |
– |
} |
1221 |
– |
|
1280 |
|
#ifdef ENABLE_VOSF |
1281 |
+ |
// Deinitialize VOSF |
1282 |
|
if (use_vosf) { |
1224 |
– |
// Clear mainBuffer data |
1283 |
|
if (mainBuffer.pageInfo) { |
1284 |
|
free(mainBuffer.pageInfo); |
1285 |
< |
mainBuffer.pageInfo = 0; |
1285 |
> |
mainBuffer.pageInfo = NULL; |
1286 |
|
} |
1229 |
– |
|
1287 |
|
if (mainBuffer.dirtyPages) { |
1288 |
|
free(mainBuffer.dirtyPages); |
1289 |
< |
mainBuffer.dirtyPages = 0; |
1289 |
> |
mainBuffer.dirtyPages = NULL; |
1290 |
|
} |
1291 |
|
} |
1292 |
+ |
#endif |
1293 |
+ |
|
1294 |
+ |
// Close display |
1295 |
+ |
delete drv; |
1296 |
+ |
drv = NULL; |
1297 |
+ |
} |
1298 |
+ |
|
1299 |
+ |
void VideoExit(void) |
1300 |
+ |
{ |
1301 |
+ |
// Close display |
1302 |
+ |
video_close(); |
1303 |
+ |
|
1304 |
+ |
// Free colormaps |
1305 |
+ |
if (cmap[0]) { |
1306 |
+ |
XFreeColormap(x_display, cmap[0]); |
1307 |
+ |
cmap[0] = 0; |
1308 |
+ |
} |
1309 |
+ |
if (cmap[1]) { |
1310 |
+ |
XFreeColormap(x_display, cmap[1]); |
1311 |
+ |
cmap[1] = 0; |
1312 |
+ |
} |
1313 |
|
|
1314 |
< |
// Close /dev/zero |
1315 |
< |
if (zero_fd > 0) |
1316 |
< |
close(zero_fd); |
1314 |
> |
#ifdef ENABLE_XF86_VIDMODE |
1315 |
> |
// Free video mode list |
1316 |
> |
if (x_video_modes) { |
1317 |
> |
XFree(x_video_modes); |
1318 |
> |
x_video_modes = NULL; |
1319 |
> |
} |
1320 |
> |
#endif |
1321 |
> |
|
1322 |
> |
#ifdef ENABLE_FBDEV_DGA |
1323 |
> |
// Close framebuffer device |
1324 |
> |
if (fbdev_fd >= 0) { |
1325 |
> |
close(fbdev_fd); |
1326 |
> |
fbdev_fd = -1; |
1327 |
> |
} |
1328 |
|
#endif |
1329 |
|
} |
1330 |
|
|
1336 |
|
void VideoQuitFullScreen(void) |
1337 |
|
{ |
1338 |
|
D(bug("VideoQuitFullScreen()\n")); |
1339 |
< |
if (display_type == DISPLAY_DGA) |
1251 |
< |
quit_full_screen = true; |
1339 |
> |
quit_full_screen = true; |
1340 |
|
} |
1341 |
|
|
1342 |
|
|
1367 |
|
|
1368 |
|
// Convert colors to XColor array |
1369 |
|
for (int i=0; i<256; i++) { |
1282 |
– |
palette[i].pixel = i; |
1370 |
|
palette[i].red = pal[i*3] * 0x0101; |
1371 |
|
palette[i].green = pal[i*3+1] * 0x0101; |
1372 |
|
palette[i].blue = pal[i*3+2] * 0x0101; |
1373 |
+ |
palette[i].pixel = i; |
1374 |
|
palette[i].flags = DoRed | DoGreen | DoBlue; |
1375 |
|
} |
1376 |
|
|
1382 |
|
|
1383 |
|
|
1384 |
|
/* |
1385 |
< |
* Suspend/resume emulator |
1385 |
> |
* Switch video mode |
1386 |
|
*/ |
1387 |
|
|
1388 |
< |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
1301 |
< |
static void suspend_emul(void) |
1302 |
< |
{ |
1303 |
< |
if (display_type == DISPLAY_DGA) { |
1304 |
< |
// Release ctrl key |
1305 |
< |
ADBKeyUp(0x36); |
1306 |
< |
ctrl_down = false; |
1307 |
< |
|
1308 |
< |
// Lock frame buffer (this will stop the MacOS thread) |
1309 |
< |
LOCK_FRAME_BUFFER; |
1310 |
< |
|
1311 |
< |
// Save frame buffer |
1312 |
< |
fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row); |
1313 |
< |
if (fb_save) |
1314 |
< |
memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row); |
1315 |
< |
|
1316 |
< |
// Close full screen display |
1317 |
< |
#ifdef ENABLE_XF86_DGA |
1318 |
< |
XF86DGADirectVideo(x_display, screen, 0); |
1319 |
< |
#endif |
1320 |
< |
XUngrabPointer(x_display, CurrentTime); |
1321 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
1322 |
< |
XUnmapWindow(x_display, the_win); |
1323 |
< |
wait_unmapped(the_win); |
1324 |
< |
|
1325 |
< |
// Open "suspend" window |
1326 |
< |
XSetWindowAttributes wattr; |
1327 |
< |
wattr.event_mask = KeyPressMask; |
1328 |
< |
wattr.background_pixel = black_pixel; |
1329 |
< |
|
1330 |
< |
suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth, |
1331 |
< |
InputOutput, vis, CWEventMask | CWBackPixel, &wattr); |
1332 |
< |
set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE); |
1333 |
< |
set_window_focus(suspend_win); |
1334 |
< |
XMapWindow(x_display, suspend_win); |
1335 |
< |
emul_suspended = true; |
1336 |
< |
} |
1337 |
< |
} |
1338 |
< |
|
1339 |
< |
static void resume_emul(void) |
1388 |
> |
void video_switch_to_mode(const video_mode &mode) |
1389 |
|
{ |
1390 |
< |
// Close "suspend" window |
1391 |
< |
XDestroyWindow(x_display, suspend_win); |
1392 |
< |
XSync(x_display, false); |
1390 |
> |
// Close and reopen display |
1391 |
> |
video_close(); |
1392 |
> |
video_open(mode); |
1393 |
|
|
1394 |
< |
// Reopen full screen display |
1395 |
< |
XMapRaised(x_display, the_win); |
1396 |
< |
wait_mapped(the_win); |
1348 |
< |
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
1349 |
< |
XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime); |
1350 |
< |
XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
1351 |
< |
#ifdef ENABLE_XF86_DGA |
1352 |
< |
XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); |
1353 |
< |
XF86DGASetViewPort(x_display, screen, 0, 0); |
1354 |
< |
#endif |
1355 |
< |
XSync(x_display, false); |
1356 |
< |
|
1357 |
< |
// the_buffer already contains the data to restore. i.e. since a temporary |
1358 |
< |
// frame buffer is used when VOSF is actually used, fb_save is therefore |
1359 |
< |
// not necessary. |
1360 |
< |
#ifdef ENABLE_VOSF |
1361 |
< |
if (use_vosf) { |
1362 |
< |
LOCK_VOSF; |
1363 |
< |
PFLAG_SET_ALL; |
1364 |
< |
UNLOCK_VOSF; |
1365 |
< |
memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); |
1366 |
< |
} |
1367 |
< |
#endif |
1368 |
< |
|
1369 |
< |
// Restore frame buffer |
1370 |
< |
if (fb_save) { |
1371 |
< |
#ifdef ENABLE_VOSF |
1372 |
< |
// Don't copy fb_save to the temporary frame buffer in VOSF mode |
1373 |
< |
if (!use_vosf) |
1374 |
< |
#endif |
1375 |
< |
memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row); |
1376 |
< |
free(fb_save); |
1377 |
< |
fb_save = NULL; |
1394 |
> |
if (drv == NULL) { |
1395 |
> |
ErrorAlert(STR_OPEN_WINDOW_ERR); |
1396 |
> |
QuitEmulator(); |
1397 |
|
} |
1379 |
– |
|
1380 |
– |
#ifdef ENABLE_XF86_DGA |
1381 |
– |
if (depth == 8) |
1382 |
– |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
1383 |
– |
#endif |
1384 |
– |
|
1385 |
– |
// Unlock frame buffer (and continue MacOS thread) |
1386 |
– |
UNLOCK_FRAME_BUFFER; |
1387 |
– |
emul_suspended = false; |
1398 |
|
} |
1389 |
– |
#endif |
1399 |
|
|
1400 |
|
|
1401 |
|
/* |
1456 |
|
case XK_slash: case XK_question: return 0x2c; |
1457 |
|
|
1458 |
|
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
1459 |
< |
case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30; |
1459 |
> |
case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30; |
1460 |
|
#else |
1461 |
|
case XK_Tab: return 0x30; |
1462 |
|
#endif |
1631 |
|
if (code == 0x36) |
1632 |
|
ctrl_down = true; |
1633 |
|
} else { |
1625 |
– |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
1634 |
|
if (code == 0x31) |
1635 |
< |
resume_emul(); // Space wakes us up |
1628 |
< |
#endif |
1635 |
> |
drv->resume(); // Space wakes us up |
1636 |
|
} |
1637 |
|
} |
1638 |
|
break; |
1660 |
|
LOCK_VOSF; |
1661 |
|
PFLAG_SET_ALL; |
1662 |
|
UNLOCK_VOSF; |
1663 |
< |
memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); |
1663 |
> |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
1664 |
|
} |
1665 |
|
else |
1666 |
|
#endif |
1671 |
|
updt_box[x1][y1] = true; |
1672 |
|
nr_boxes = 16 * 16; |
1673 |
|
} else // Static refresh |
1674 |
< |
memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); |
1674 |
> |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
1675 |
|
} |
1676 |
|
break; |
1677 |
|
|
1678 |
|
// Window "close" widget clicked |
1679 |
|
case ClientMessage: |
1680 |
< |
if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) |
1681 |
< |
XBell(x_display, 0); |
1680 |
> |
if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) { |
1681 |
> |
ADBKeyDown(0x7f); // Power key |
1682 |
> |
ADBKeyUp(0x7f); |
1683 |
> |
} |
1684 |
|
break; |
1685 |
|
} |
1686 |
|
} |
1692 |
|
*/ |
1693 |
|
|
1694 |
|
// Dynamic display update (variable frame rate for each box) |
1695 |
< |
static void update_display_dynamic(int ticker) |
1695 |
> |
static void update_display_dynamic(int ticker, driver_window *drv) |
1696 |
|
{ |
1697 |
|
int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi; |
1698 |
|
int xil = 0; |
1699 |
|
int rxm = 0, rxmo = 0; |
1700 |
< |
int bytes_per_row = VideoMonitor.bytes_per_row; |
1701 |
< |
int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x; |
1702 |
< |
int rx = VideoMonitor.bytes_per_row / 16; |
1703 |
< |
int ry = VideoMonitor.y / 16; |
1700 |
> |
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
1701 |
> |
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
1702 |
> |
int rx = VideoMonitor.mode.bytes_per_row / 16; |
1703 |
> |
int ry = VideoMonitor.mode.y / 16; |
1704 |
|
int max_box; |
1705 |
|
|
1706 |
|
y2s = sm_uptd[ticker % 8]; |
1754 |
|
i = (yi * bytes_per_row) + xi; |
1755 |
|
for (y2=0; y2 < yil; y2++, i += bytes_per_row) |
1756 |
|
memcpy(&the_buffer_copy[i], &the_buffer[i], xil); |
1757 |
< |
if (depth == 1) { |
1758 |
< |
if (have_shm) |
1759 |
< |
XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0); |
1757 |
> |
if (VideoMonitor.mode.depth == VDEPTH_1BIT) { |
1758 |
> |
if (drv->have_shm) |
1759 |
> |
XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0); |
1760 |
|
else |
1761 |
< |
XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil); |
1761 |
> |
XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil); |
1762 |
|
} else { |
1763 |
< |
if (have_shm) |
1764 |
< |
XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0); |
1763 |
> |
if (drv->have_shm) |
1764 |
> |
XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0); |
1765 |
|
else |
1766 |
< |
XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil); |
1766 |
> |
XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil); |
1767 |
|
} |
1768 |
|
xil = 0; |
1769 |
|
} |
1782 |
|
} |
1783 |
|
|
1784 |
|
// Static display update (fixed frame rate, but incremental) |
1785 |
< |
static void update_display_static(void) |
1785 |
> |
static void update_display_static(driver_window *drv) |
1786 |
|
{ |
1787 |
|
// Incremental update code |
1788 |
|
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
1789 |
< |
int bytes_per_row = VideoMonitor.bytes_per_row; |
1790 |
< |
int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x; |
1789 |
> |
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
1790 |
> |
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
1791 |
|
uint8 *p, *p2; |
1792 |
|
|
1793 |
|
// Check for first line from top and first line from bottom that have changed |
1794 |
|
y1 = 0; |
1795 |
< |
for (j=0; j<VideoMonitor.y; j++) { |
1795 |
> |
for (j=0; j<VideoMonitor.mode.y; j++) { |
1796 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
1797 |
|
y1 = j; |
1798 |
|
break; |
1799 |
|
} |
1800 |
|
} |
1801 |
|
y2 = y1 - 1; |
1802 |
< |
for (j=VideoMonitor.y-1; j>=y1; j--) { |
1802 |
> |
for (j=VideoMonitor.mode.y-1; j>=y1; j--) { |
1803 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
1804 |
|
y2 = j; |
1805 |
|
break; |
1809 |
|
|
1810 |
|
// Check for first column from left and first column from right that have changed |
1811 |
|
if (high) { |
1812 |
< |
if (depth == 1) { |
1813 |
< |
x1 = VideoMonitor.x - 1; |
1812 |
> |
if (VideoMonitor.mode.depth == VDEPTH_1BIT) { |
1813 |
> |
x1 = VideoMonitor.mode.x - 1; |
1814 |
|
for (j=y1; j<=y2; j++) { |
1815 |
|
p = &the_buffer[j * bytes_per_row]; |
1816 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1828 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1829 |
|
p += bytes_per_row; |
1830 |
|
p2 += bytes_per_row; |
1831 |
< |
for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) { |
1831 |
> |
for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) { |
1832 |
|
p--; p2--; |
1833 |
|
if (*p != *p2) { |
1834 |
|
x2 = (i << 3) + 7; |
1847 |
|
} |
1848 |
|
|
1849 |
|
} else { |
1850 |
< |
x1 = VideoMonitor.x; |
1850 |
> |
x1 = VideoMonitor.mode.x; |
1851 |
|
for (j=y1; j<=y2; j++) { |
1852 |
|
p = &the_buffer[j * bytes_per_row]; |
1853 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1865 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1866 |
|
p += bytes_per_row; |
1867 |
|
p2 += bytes_per_row; |
1868 |
< |
for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
1868 |
> |
for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
1869 |
|
p--; |
1870 |
|
p2--; |
1871 |
|
if (*p != *p2) { |
1888 |
|
|
1889 |
|
// Refresh display |
1890 |
|
if (high && wide) { |
1891 |
< |
if (have_shm) |
1892 |
< |
XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0); |
1891 |
> |
if (drv->have_shm) |
1892 |
> |
XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0); |
1893 |
|
else |
1894 |
< |
XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high); |
1894 |
> |
XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high); |
1895 |
|
} |
1896 |
|
} |
1897 |
|
|
1900 |
|
* Screen refresh functions |
1901 |
|
*/ |
1902 |
|
|
1903 |
< |
// The specialisations hereunder are meant to enable VOSF with DGA in direct |
1904 |
< |
// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could |
1905 |
< |
// not get mapped correctly with respect to the predetermined host frame |
1906 |
< |
// buffer base address. |
1907 |
< |
// |
1899 |
< |
// Hmm, in other words, when in direct addressing mode and DGA is requested, |
1900 |
< |
// we first try to "triple allocate" the address spaces according to the real |
1901 |
< |
// host frame buffer address. Then, if it fails, we will use a temporary |
1902 |
< |
// frame buffer thus making the real host frame buffer updated when pages |
1903 |
< |
// of the temp frame buffer are altered. |
1904 |
< |
// |
1905 |
< |
// As a side effect, a little speed gain in screen updates could be noticed |
1906 |
< |
// for other modes than DGA. |
1907 |
< |
// |
1908 |
< |
// The following two functions below are inline so that a clever compiler |
1909 |
< |
// could specialise the code according to the current screen depth and |
1910 |
< |
// display type. A more clever compiler would the job by itself though... |
1911 |
< |
// (update_display_vosf is inlined as well) |
1903 |
> |
// We suggest the compiler to inline the next two functions so that it |
1904 |
> |
// may specialise the code according to the current screen depth and |
1905 |
> |
// display type. A clever compiler would do that job by itself though... |
1906 |
> |
|
1907 |
> |
// NOTE: update_display_vosf is inlined too |
1908 |
|
|
1909 |
|
static inline void possibly_quit_dga_mode() |
1910 |
|
{ |
1915 |
– |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
1911 |
|
// Quit DGA mode if requested |
1912 |
|
if (quit_full_screen) { |
1913 |
|
quit_full_screen = false; |
1914 |
< |
#ifdef ENABLE_XF86_DGA |
1915 |
< |
XF86DGADirectVideo(x_display, screen, 0); |
1921 |
< |
#endif |
1922 |
< |
XUngrabPointer(x_display, CurrentTime); |
1923 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
1924 |
< |
XUnmapWindow(x_display, the_win); |
1925 |
< |
XSync(x_display, false); |
1914 |
> |
delete drv; |
1915 |
> |
drv = NULL; |
1916 |
|
} |
1927 |
– |
#endif |
1917 |
|
} |
1918 |
|
|
1919 |
< |
static inline void handle_palette_changes(int depth, int display_type) |
1919 |
> |
static inline void handle_palette_changes(void) |
1920 |
|
{ |
1921 |
|
LOCK_PALETTE; |
1922 |
|
|
1923 |
|
if (palette_changed) { |
1924 |
|
palette_changed = false; |
1925 |
< |
if (depth == 8) { |
1937 |
< |
XStoreColors(x_display, cmap[0], palette, 256); |
1938 |
< |
XStoreColors(x_display, cmap[1], palette, 256); |
1939 |
< |
XSync(x_display, false); |
1940 |
< |
|
1941 |
< |
#ifdef ENABLE_XF86_DGA |
1942 |
< |
if (display_type == DISPLAY_DGA) { |
1943 |
< |
current_dga_cmap ^= 1; |
1944 |
< |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
1945 |
< |
} |
1946 |
< |
#endif |
1947 |
< |
} |
1925 |
> |
drv->update_palette(); |
1926 |
|
} |
1927 |
|
|
1928 |
|
UNLOCK_PALETTE; |
1937 |
|
handle_events(); |
1938 |
|
|
1939 |
|
// Handle palette changes |
1940 |
< |
handle_palette_changes(depth, DISPLAY_DGA); |
1940 |
> |
handle_palette_changes(); |
1941 |
|
} |
1942 |
|
|
1943 |
|
#ifdef ENABLE_VOSF |
1951 |
|
handle_events(); |
1952 |
|
|
1953 |
|
// Handle palette changes |
1954 |
< |
handle_palette_changes(depth, DISPLAY_DGA); |
1954 |
> |
handle_palette_changes(); |
1955 |
|
|
1956 |
|
// Update display (VOSF variant) |
1957 |
|
static int tick_counter = 0; |
1958 |
|
if (++tick_counter >= frame_skip) { |
1959 |
|
tick_counter = 0; |
1960 |
< |
LOCK_VOSF; |
1961 |
< |
update_display_dga_vosf(); |
1962 |
< |
UNLOCK_VOSF; |
1960 |
> |
if (mainBuffer.dirty) { |
1961 |
> |
LOCK_VOSF; |
1962 |
> |
update_display_dga_vosf(); |
1963 |
> |
UNLOCK_VOSF; |
1964 |
> |
} |
1965 |
|
} |
1966 |
|
} |
1967 |
|
#endif |
1975 |
|
handle_events(); |
1976 |
|
|
1977 |
|
// Handle palette changes |
1978 |
< |
handle_palette_changes(depth, DISPLAY_WINDOW); |
1978 |
> |
handle_palette_changes(); |
1979 |
|
|
1980 |
|
// Update display (VOSF variant) |
1981 |
|
static int tick_counter = 0; |
1982 |
|
if (++tick_counter >= frame_skip) { |
1983 |
|
tick_counter = 0; |
1984 |
< |
LOCK_VOSF; |
1985 |
< |
update_display_window_vosf(); |
1986 |
< |
UNLOCK_VOSF; |
1984 |
> |
if (mainBuffer.dirty) { |
1985 |
> |
LOCK_VOSF; |
1986 |
> |
update_display_window_vosf(static_cast<driver_window *>(drv)); |
1987 |
> |
UNLOCK_VOSF; |
1988 |
> |
XSync(x_display, false); // Let the server catch up |
1989 |
> |
} |
1990 |
|
} |
1991 |
|
} |
1992 |
|
#endif // def ENABLE_VOSF |
1997 |
|
handle_events(); |
1998 |
|
|
1999 |
|
// Handle_palette changes |
2000 |
< |
handle_palette_changes(depth, DISPLAY_WINDOW); |
2000 |
> |
handle_palette_changes(); |
2001 |
|
|
2002 |
|
// Update display (static variant) |
2003 |
|
static int tick_counter = 0; |
2004 |
|
if (++tick_counter >= frame_skip) { |
2005 |
|
tick_counter = 0; |
2006 |
< |
update_display_static(); |
2006 |
> |
update_display_static(static_cast<driver_window *>(drv)); |
2007 |
|
} |
2008 |
|
} |
2009 |
|
|
2013 |
|
handle_events(); |
2014 |
|
|
2015 |
|
// Handle_palette changes |
2016 |
< |
handle_palette_changes(depth, DISPLAY_WINDOW); |
2016 |
> |
handle_palette_changes(); |
2017 |
|
|
2018 |
|
// Update display (dynamic variant) |
2019 |
|
static int tick_counter = 0; |
2020 |
|
tick_counter++; |
2021 |
< |
update_display_dynamic(tick_counter); |
2021 |
> |
update_display_dynamic(tick_counter, static_cast<driver_window *>(drv)); |
2022 |
|
} |
2023 |
|
|
2024 |
|
|
2026 |
|
* Thread for screen refresh, input handling etc. |
2027 |
|
*/ |
2028 |
|
|
2029 |
< |
void VideoRefreshInit(void) |
2029 |
> |
static void VideoRefreshInit(void) |
2030 |
|
{ |
2031 |
|
// TODO: set up specialised 8bpp VideoRefresh handlers ? |
2032 |
|
if (display_type == DISPLAY_DGA) { |
2052 |
|
|
2053 |
|
void VideoRefresh(void) |
2054 |
|
{ |
2055 |
< |
// TODO: make main_unix/VideoRefresh call directly video_refresh() ? |
2056 |
< |
video_refresh(); |
2055 |
> |
// We need to check redraw_thread_active to inhibit refreshed during |
2056 |
> |
// mode changes on non-threaded platforms |
2057 |
> |
if (redraw_thread_active) |
2058 |
> |
video_refresh(); |
2059 |
|
} |
2060 |
|
|
2061 |
|
#ifdef HAVE_PTHREADS |
2075 |
|
ticks++; |
2076 |
|
} |
2077 |
|
uint64 end = GetTicks_usec(); |
2078 |
< |
printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks); |
2078 |
> |
// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start)); |
2079 |
|
return NULL; |
2080 |
|
} |
2081 |
|
#endif |