1 |
|
/* |
2 |
|
* video_x.cpp - Video/graphics emulation, X11 specific stuff |
3 |
|
* |
4 |
< |
* Basilisk II (C) 1997-1999 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 |
34 |
|
#include <X11/extensions/XShm.h> |
35 |
|
#include <sys/ipc.h> |
36 |
|
#include <sys/shm.h> |
37 |
– |
#include <pthread.h> |
37 |
|
#include <errno.h> |
38 |
|
|
39 |
+ |
#ifdef HAVE_PTHREADS |
40 |
+ |
# include <pthread.h> |
41 |
+ |
#endif |
42 |
+ |
|
43 |
+ |
#ifdef ENABLE_XF86_DGA |
44 |
+ |
# include <X11/extensions/xf86dga.h> |
45 |
+ |
#endif |
46 |
+ |
|
47 |
+ |
#ifdef ENABLE_XF86_VIDMODE |
48 |
+ |
# include <X11/extensions/xf86vmode.h> |
49 |
+ |
#endif |
50 |
+ |
|
51 |
+ |
#ifdef ENABLE_FBDEV_DGA |
52 |
+ |
# include <sys/mman.h> |
53 |
+ |
#endif |
54 |
+ |
|
55 |
|
#include "cpu_emulation.h" |
56 |
|
#include "main.h" |
57 |
|
#include "adb.h" |
60 |
|
#include "user_strings.h" |
61 |
|
#include "video.h" |
62 |
|
|
63 |
< |
#define DEBUG 1 |
63 |
> |
#define DEBUG 0 |
64 |
|
#include "debug.h" |
65 |
|
|
51 |
– |
#if ENABLE_XF86_DGA |
52 |
– |
#include <X11/extensions/xf86dga.h> |
53 |
– |
#endif |
54 |
– |
|
55 |
– |
#if ENABLE_FBDEV_DGA |
56 |
– |
#include <sys/mman.h> |
57 |
– |
#endif |
58 |
– |
|
59 |
– |
|
66 |
|
|
67 |
|
// Display types |
68 |
|
enum { |
70 |
|
DISPLAY_DGA // DGA fullscreen display |
71 |
|
}; |
72 |
|
|
67 |
– |
|
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 uint8 *the_buffer; // Mac frame buffer |
86 |
> |
static bool local_X11; // Flag: X server running on local machine? |
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 |
> |
|
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 |
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 |
101 |
< |
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; |
108 |
– |
static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask; |
109 |
– |
static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask; |
126 |
|
|
127 |
< |
static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette |
112 |
< |
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 |
< |
// Variables for window mode |
131 |
< |
static GC the_gc; |
132 |
< |
static XImage *img = NULL; |
118 |
< |
static XShmSegmentInfo shminfo; |
119 |
< |
static XImage *cursor_image, *cursor_mask_image; |
120 |
< |
static Pixmap cursor_map, cursor_mask_map; |
121 |
< |
static Cursor mac_cursor; |
122 |
< |
static GC cursor_gc, cursor_mask_gc; |
123 |
< |
static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer |
124 |
< |
static uint8 the_cursor[64]; // Cursor image data |
125 |
< |
static bool have_shm = false; // Flag: SHM extensions available |
126 |
< |
|
127 |
< |
// Variables for XF86 DGA mode |
128 |
< |
static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap |
129 |
< |
static Window suspend_win; // "Suspend" window |
130 |
< |
static void *fb_save = NULL; // Saved frame buffer for suspend |
131 |
< |
static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer |
130 |
> |
#ifdef ENABLE_FBDEV_DGA |
131 |
> |
static int fbdev_fd = -1; |
132 |
> |
#endif |
133 |
|
|
134 |
< |
// Variables for fbdev DGA mode |
135 |
< |
const char FBDEVICE_FILE_NAME[] = "/dev/fb"; |
136 |
< |
static int fbdev_fd; |
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; |
142 |
> |
#define LOCK_PALETTE pthread_mutex_lock(&palette_lock) |
143 |
> |
#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock) |
144 |
> |
#else |
145 |
> |
#define LOCK_PALETTE |
146 |
> |
#define UNLOCK_PALETTE |
147 |
> |
#endif |
148 |
> |
|
149 |
> |
// Mutex to protect frame buffer |
150 |
> |
#ifdef HAVE_PTHREADS |
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 |
155 |
> |
#define LOCK_FRAME_BUFFER |
156 |
> |
#define UNLOCK_FRAME_BUFFER |
157 |
> |
#endif |
158 |
> |
|
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 |
> |
// 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); |
141 |
< |
|
172 |
> |
static int event2keycode(XKeyEvent &ev); |
173 |
|
|
174 |
|
// From main_unix.cpp |
175 |
+ |
extern char *x_display_name; |
176 |
|
extern Display *x_display; |
177 |
|
|
178 |
|
// From sys_unix.cpp |
180 |
|
|
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 |
< |
VideoMonitor.mode = VMODE_1BIT; |
162 |
< |
break; |
163 |
< |
case 8: |
164 |
< |
layout = FLAYOUT_DIRECT; |
165 |
< |
VideoMonitor.mode = VMODE_8BIT; |
166 |
< |
break; |
167 |
< |
case 15: |
168 |
< |
layout = FLAYOUT_HOST_555; |
169 |
< |
VideoMonitor.mode = VMODE_16BIT; |
170 |
< |
break; |
171 |
< |
case 16: |
172 |
< |
layout = FLAYOUT_HOST_565; |
173 |
< |
VideoMonitor.mode = VMODE_16BIT; |
174 |
< |
break; |
175 |
< |
case 24: |
176 |
< |
case 32: |
177 |
< |
layout = FLAYOUT_HOST_888; |
178 |
< |
VideoMonitor.mode = VMODE_32BIT; |
179 |
< |
break; |
180 |
< |
} |
181 |
< |
VideoMonitor.x = width; |
182 |
< |
VideoMonitor.y = height; |
183 |
< |
VideoMonitor.bytes_per_row = bytes_per_row; |
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 |
+ |
D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base)); |
222 |
+ |
} |
223 |
+ |
|
224 |
+ |
// Set window name and class |
225 |
+ |
static void set_window_name(Window w, int name) |
226 |
+ |
{ |
227 |
+ |
const char *str = GetString(name); |
228 |
+ |
XStoreName(x_display, w, str); |
229 |
+ |
XSetIconName(x_display, w, str); |
230 |
+ |
|
231 |
+ |
XClassHint *hints; |
232 |
+ |
hints = XAllocClassHint(); |
233 |
+ |
if (hints) { |
234 |
+ |
hints->res_name = "BasiliskII"; |
235 |
+ |
hints->res_class = "BasiliskII"; |
236 |
+ |
XSetClassHint(x_display, w, hints); |
237 |
+ |
XFree(hints); |
238 |
+ |
} |
239 |
+ |
} |
240 |
+ |
|
241 |
+ |
// Set window input focus flag |
242 |
+ |
static void set_window_focus(Window w) |
243 |
+ |
{ |
244 |
+ |
XWMHints *hints = XAllocWMHints(); |
245 |
+ |
if (hints) { |
246 |
+ |
hints->input = True; |
247 |
+ |
hints->initial_state = NormalState; |
248 |
+ |
hints->flags = InputHint | StateHint; |
249 |
+ |
XSetWMHints(x_display, w, 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); |
259 |
+ |
XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1); |
260 |
+ |
} |
261 |
+ |
|
262 |
+ |
// Wait until window is mapped/unmapped |
263 |
+ |
void wait_mapped(Window w) |
264 |
+ |
{ |
265 |
+ |
XEvent e; |
266 |
+ |
do { |
267 |
+ |
XMaskEvent(x_display, StructureNotifyMask, &e); |
268 |
+ |
} while ((e.type != MapNotify) || (e.xmap.event != w)); |
269 |
+ |
} |
270 |
+ |
|
271 |
+ |
void wait_unmapped(Window w) |
272 |
+ |
{ |
273 |
+ |
XEvent e; |
274 |
+ |
do { |
275 |
+ |
XMaskEvent(x_display, StructureNotifyMask, &e); |
276 |
+ |
} while ((e.type != UnmapNotify) || (e.xmap.event != w)); |
277 |
|
} |
278 |
|
|
279 |
|
// Trap SHM errors |
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 (vis->c_class == DirectColor && VideoMonitor.mode.depth == VDEPTH_16BIT) |
388 |
+ |
num = vis->map_entries; |
389 |
+ |
XStoreColors(x_display, cmap[0], palette, num); |
390 |
+ |
XStoreColors(x_display, cmap[1], palette, num); |
391 |
+ |
} |
392 |
+ |
XSync(x_display, false); |
393 |
+ |
} |
394 |
+ |
|
395 |
+ |
|
396 |
+ |
/* |
397 |
+ |
* Windowed display driver |
398 |
+ |
*/ |
399 |
+ |
|
400 |
+ |
// Open display |
401 |
+ |
driver_window::driver_window(const video_mode &mode) |
402 |
+ |
: gc(0), img(NULL), have_shm(false), mac_cursor(0) |
403 |
+ |
{ |
404 |
+ |
int width = mode.x, height = mode.y; |
405 |
+ |
int aligned_width = (width + 15) & ~15; |
406 |
+ |
int aligned_height = (height + 15) & ~15; |
407 |
+ |
|
408 |
|
// Set absolute mouse mode |
409 |
|
ADBSetRelMouseMode(false); |
410 |
|
|
209 |
– |
// Read frame skip prefs |
210 |
– |
frame_skip = PrefsFindInt32("frameskip"); |
211 |
– |
if (frame_skip == 0) |
212 |
– |
frame_skip = 1; |
213 |
– |
|
411 |
|
// Create window |
412 |
|
XSetWindowAttributes wattr; |
413 |
|
wattr.event_mask = eventmask = win_eventmask; |
414 |
|
wattr.background_pixel = black_pixel; |
415 |
< |
wattr.border_pixel = black_pixel; |
416 |
< |
wattr.backing_store = Always; |
417 |
< |
wattr.backing_planes = xdepth; |
415 |
> |
wattr.colormap = cmap[0]; |
416 |
> |
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
417 |
> |
InputOutput, vis, CWEventMask | CWBackPixel | ((mode.depth == VDEPTH_1BIT || cmap[0] == 0) ? 0 : CWColormap), &wattr); |
418 |
|
|
419 |
< |
XSync(x_display, false); |
420 |
< |
the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
224 |
< |
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | |
225 |
< |
CWBackingStore | CWBackingPlanes, &wattr); |
226 |
< |
XSync(x_display, false); |
227 |
< |
XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE)); |
228 |
< |
XMapRaised(x_display, the_win); |
229 |
< |
XSync(x_display, false); |
419 |
> |
// Set window name/class |
420 |
> |
set_window_name(w, STR_WINDOW_TITLE); |
421 |
|
|
422 |
< |
// Set colormap |
423 |
< |
if (depth == 8) { |
424 |
< |
XSetWindowColormap(x_display, the_win, cmap[0]); |
425 |
< |
XSetWMColormapWindows(x_display, the_win, &the_win, 1); |
426 |
< |
} |
422 |
> |
// Indicate that we want keyboard input |
423 |
> |
set_window_focus(w); |
424 |
> |
|
425 |
> |
// Set delete protocol property |
426 |
> |
set_window_delete_protocol(w); |
427 |
|
|
428 |
|
// Make window unresizable |
429 |
< |
XSizeHints *hints; |
430 |
< |
if ((hints = XAllocSizeHints()) != NULL) { |
431 |
< |
hints->min_width = width; |
432 |
< |
hints->max_width = width; |
433 |
< |
hints->min_height = height; |
434 |
< |
hints->max_height = height; |
435 |
< |
hints->flags = PMinSize | PMaxSize; |
436 |
< |
XSetWMNormalHints(x_display, the_win, hints); |
437 |
< |
XFree((char *)hints); |
429 |
> |
{ |
430 |
> |
XSizeHints *hints = XAllocSizeHints(); |
431 |
> |
if (hints) { |
432 |
> |
hints->min_width = width; |
433 |
> |
hints->max_width = width; |
434 |
> |
hints->min_height = height; |
435 |
> |
hints->max_height = height; |
436 |
> |
hints->flags = PMinSize | PMaxSize; |
437 |
> |
XSetWMNormalHints(x_display, w, hints); |
438 |
> |
XFree(hints); |
439 |
> |
} |
440 |
|
} |
441 |
|
|
442 |
+ |
// Show window |
443 |
+ |
XMapWindow(x_display, w); |
444 |
+ |
wait_mapped(w); |
445 |
+ |
|
446 |
|
// Try to create and attach SHM image |
447 |
< |
have_shm = false; |
251 |
< |
if (depth != 1 && XShmQueryExtension(x_display)) { |
447 |
> |
if (local_X11 && XShmQueryExtension(x_display)) { |
448 |
|
|
449 |
|
// Create SHM image ("height + 2" for safety) |
450 |
< |
img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height); |
451 |
< |
shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777); |
452 |
< |
the_buffer = (uint8 *)shmat(shminfo.shmid, 0, 0); |
453 |
< |
shminfo.shmaddr = img->data = (char *)the_buffer; |
450 |
> |
img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height); |
451 |
> |
shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777); |
452 |
> |
the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0); |
453 |
> |
shminfo.shmaddr = img->data = (char *)the_buffer_copy; |
454 |
|
shminfo.readOnly = False; |
455 |
|
|
456 |
|
// Try to attach SHM image, catching errors |
471 |
|
|
472 |
|
// Create normal X image if SHM doesn't work ("height + 2" for safety) |
473 |
|
if (!have_shm) { |
474 |
< |
int bytes_per_row = width; |
475 |
< |
switch (depth) { |
476 |
< |
case 1: |
281 |
< |
bytes_per_row /= 8; |
282 |
< |
break; |
283 |
< |
case 15: |
284 |
< |
case 16: |
285 |
< |
bytes_per_row *= 2; |
286 |
< |
break; |
287 |
< |
case 24: |
288 |
< |
case 32: |
289 |
< |
bytes_per_row *= 4; |
290 |
< |
break; |
291 |
< |
} |
292 |
< |
the_buffer = (uint8 *)malloc((height + 2) * bytes_per_row); |
293 |
< |
img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer, width, height, 32, bytes_per_row); |
474 |
> |
int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth); |
475 |
> |
the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row); |
476 |
> |
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); |
477 |
|
} |
478 |
|
|
479 |
|
// 1-Bit mode is big-endian |
480 |
< |
if (depth == 1) { |
480 |
> |
if (mode.depth == VDEPTH_1BIT) { |
481 |
|
img->byte_order = MSBFirst; |
482 |
|
img->bitmap_bit_order = MSBFirst; |
483 |
|
} |
484 |
|
|
485 |
< |
// Allocate memory for frame buffer copy |
486 |
< |
the_buffer_copy = (uint8 *)malloc((height + 2) * img->bytes_per_line); |
485 |
> |
#ifdef ENABLE_VOSF |
486 |
> |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
487 |
> |
the_host_buffer = the_buffer_copy; |
488 |
> |
the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line); |
489 |
> |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
490 |
> |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
491 |
> |
#else |
492 |
> |
// Allocate memory for frame buffer |
493 |
> |
the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line); |
494 |
> |
#endif |
495 |
|
|
496 |
|
// Create GC |
497 |
< |
the_gc = XCreateGC(x_display, the_win, 0, 0); |
498 |
< |
XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes); |
497 |
> |
gc = XCreateGC(x_display, w, 0, 0); |
498 |
> |
XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes); |
499 |
|
|
500 |
< |
// Create cursor |
501 |
< |
cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor, 16, 16, 16, 2); |
502 |
< |
cursor_image->byte_order = MSBFirst; |
503 |
< |
cursor_image->bitmap_bit_order = MSBFirst; |
504 |
< |
cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor+32, 16, 16, 16, 2); |
505 |
< |
cursor_mask_image->byte_order = MSBFirst; |
315 |
< |
cursor_mask_image->bitmap_bit_order = MSBFirst; |
316 |
< |
cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1); |
317 |
< |
cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1); |
318 |
< |
cursor_gc = XCreateGC(x_display, cursor_map, 0, 0); |
319 |
< |
cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0); |
320 |
< |
mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0); |
500 |
> |
// Create no_cursor |
501 |
> |
mac_cursor = XCreatePixmapCursor(x_display, |
502 |
> |
XCreatePixmap(x_display, w, 1, 1, 1), |
503 |
> |
XCreatePixmap(x_display, w, 1, 1, 1), |
504 |
> |
&black, &white, 0, 0); |
505 |
> |
XDefineCursor(x_display, w, mac_cursor); |
506 |
|
|
507 |
< |
// Set VideoMonitor |
507 |
> |
// Init blitting routines |
508 |
> |
bool native_byte_order; |
509 |
|
#ifdef WORDS_BIGENDIAN |
510 |
< |
set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst); |
510 |
> |
native_byte_order = (XImageByteOrder(x_display) == MSBFirst); |
511 |
|
#else |
512 |
< |
set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst); |
512 |
> |
native_byte_order = (XImageByteOrder(x_display) == LSBFirst); |
513 |
> |
#endif |
514 |
> |
#ifdef ENABLE_VOSF |
515 |
> |
Screen_blitter_init(&visualInfo, native_byte_order); |
516 |
> |
#endif |
517 |
> |
|
518 |
> |
// Set VideoMonitor |
519 |
> |
VideoMonitor.mode = mode; |
520 |
> |
set_mac_frame_buffer(mode.depth, native_byte_order); |
521 |
> |
|
522 |
> |
// Everything went well |
523 |
> |
init_ok = true; |
524 |
> |
} |
525 |
> |
|
526 |
> |
// Close display |
527 |
> |
driver_window::~driver_window() |
528 |
> |
{ |
529 |
> |
if (img) |
530 |
> |
XDestroyImage(img); |
531 |
> |
if (have_shm) { |
532 |
> |
XShmDetach(x_display, &shminfo); |
533 |
> |
the_buffer_copy = NULL; // don't free() in driver_base dtor |
534 |
> |
} |
535 |
> |
if (gc) |
536 |
> |
XFreeGC(x_display, gc); |
537 |
> |
} |
538 |
> |
|
539 |
> |
|
540 |
> |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
541 |
> |
/* |
542 |
> |
* DGA display driver base class |
543 |
> |
*/ |
544 |
> |
|
545 |
> |
class driver_dga : public driver_base { |
546 |
> |
public: |
547 |
> |
driver_dga(); |
548 |
> |
~driver_dga(); |
549 |
> |
|
550 |
> |
void suspend(void); |
551 |
> |
void resume(void); |
552 |
> |
|
553 |
> |
private: |
554 |
> |
Window suspend_win; // "Suspend" information window |
555 |
> |
void *fb_save; // Saved frame buffer for suspend/resume |
556 |
> |
}; |
557 |
> |
|
558 |
> |
driver_dga::driver_dga() |
559 |
> |
: suspend_win(0), fb_save(NULL) |
560 |
> |
{ |
561 |
> |
} |
562 |
> |
|
563 |
> |
driver_dga::~driver_dga() |
564 |
> |
{ |
565 |
> |
XUngrabPointer(x_display, CurrentTime); |
566 |
> |
XUngrabKeyboard(x_display, CurrentTime); |
567 |
> |
} |
568 |
> |
|
569 |
> |
// Suspend emulation |
570 |
> |
void driver_dga::suspend(void) |
571 |
> |
{ |
572 |
> |
// Release ctrl key |
573 |
> |
ADBKeyUp(0x36); |
574 |
> |
ctrl_down = false; |
575 |
> |
|
576 |
> |
// Lock frame buffer (this will stop the MacOS thread) |
577 |
> |
LOCK_FRAME_BUFFER; |
578 |
> |
|
579 |
> |
// Save frame buffer |
580 |
> |
fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
581 |
> |
if (fb_save) |
582 |
> |
memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
583 |
> |
|
584 |
> |
// Close full screen display |
585 |
> |
#ifdef ENABLE_XF86_DGA |
586 |
> |
XF86DGADirectVideo(x_display, screen, 0); |
587 |
> |
#endif |
588 |
> |
XUngrabPointer(x_display, CurrentTime); |
589 |
> |
XUngrabKeyboard(x_display, CurrentTime); |
590 |
> |
XUnmapWindow(x_display, w); |
591 |
> |
wait_unmapped(w); |
592 |
> |
|
593 |
> |
// Open "suspend" window |
594 |
> |
XSetWindowAttributes wattr; |
595 |
> |
wattr.event_mask = KeyPressMask; |
596 |
> |
wattr.background_pixel = black_pixel; |
597 |
> |
|
598 |
> |
suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth, |
599 |
> |
InputOutput, vis, CWEventMask | CWBackPixel, &wattr); |
600 |
> |
set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE); |
601 |
> |
set_window_focus(suspend_win); |
602 |
> |
XMapWindow(x_display, suspend_win); |
603 |
> |
emul_suspended = true; |
604 |
> |
} |
605 |
> |
|
606 |
> |
// Resume emulation |
607 |
> |
void driver_dga::resume(void) |
608 |
> |
{ |
609 |
> |
// Close "suspend" window |
610 |
> |
XDestroyWindow(x_display, suspend_win); |
611 |
> |
XSync(x_display, false); |
612 |
> |
|
613 |
> |
// Reopen full screen display |
614 |
> |
XMapRaised(x_display, w); |
615 |
> |
wait_mapped(w); |
616 |
> |
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
617 |
> |
XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime); |
618 |
> |
XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
619 |
> |
#ifdef ENABLE_XF86_DGA |
620 |
> |
XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); |
621 |
> |
XF86DGASetViewPort(x_display, screen, 0, 0); |
622 |
|
#endif |
623 |
+ |
XSync(x_display, false); |
624 |
|
|
625 |
< |
#if REAL_ADDRESSING |
626 |
< |
VideoMonitor.mac_frame_base = (uint32)the_buffer; |
627 |
< |
MacFrameLayout = FLAYOUT_DIRECT; |
628 |
< |
#else |
629 |
< |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
625 |
> |
// the_buffer already contains the data to restore. i.e. since a temporary |
626 |
> |
// frame buffer is used when VOSF is actually used, fb_save is therefore |
627 |
> |
// not necessary. |
628 |
> |
#ifdef ENABLE_VOSF |
629 |
> |
if (use_vosf) { |
630 |
> |
LOCK_VOSF; |
631 |
> |
PFLAG_SET_ALL; |
632 |
> |
UNLOCK_VOSF; |
633 |
> |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
634 |
> |
} |
635 |
|
#endif |
636 |
< |
return true; |
636 |
> |
|
637 |
> |
// Restore frame buffer |
638 |
> |
if (fb_save) { |
639 |
> |
#ifdef ENABLE_VOSF |
640 |
> |
// Don't copy fb_save to the temporary frame buffer in VOSF mode |
641 |
> |
if (!use_vosf) |
642 |
> |
#endif |
643 |
> |
memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row); |
644 |
> |
free(fb_save); |
645 |
> |
fb_save = NULL; |
646 |
> |
} |
647 |
> |
|
648 |
> |
// Unlock frame buffer (and continue MacOS thread) |
649 |
> |
UNLOCK_FRAME_BUFFER; |
650 |
> |
emul_suspended = false; |
651 |
|
} |
652 |
+ |
#endif |
653 |
+ |
|
654 |
+ |
|
655 |
+ |
#ifdef ENABLE_FBDEV_DGA |
656 |
+ |
/* |
657 |
+ |
* fbdev DGA display driver |
658 |
+ |
*/ |
659 |
+ |
|
660 |
+ |
const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices"; |
661 |
+ |
const char FBDEVICE_FILE_NAME[] = "/dev/fb"; |
662 |
|
|
663 |
< |
// Init fbdev DGA display |
664 |
< |
static bool init_fbdev_dga(char *in_fb_name) |
663 |
> |
class driver_fbdev : public driver_dga { |
664 |
> |
public: |
665 |
> |
driver_fbdev(const video_mode &mode); |
666 |
> |
~driver_fbdev(); |
667 |
> |
}; |
668 |
> |
|
669 |
> |
// Open display |
670 |
> |
driver_fbdev::driver_fbdev(const video_mode &mode) |
671 |
|
{ |
672 |
< |
#if ENABLE_FBDEV_DGA |
672 |
> |
int width = mode.x, height = mode.y; |
673 |
> |
|
674 |
> |
// Set absolute mouse mode |
675 |
> |
ADBSetRelMouseMode(false); |
676 |
> |
|
677 |
|
// Find the maximum depth available |
678 |
|
int ndepths, max_depth(0); |
679 |
|
int *depths = XListDepths(x_display, screen, &ndepths); |
680 |
|
if (depths == NULL) { |
681 |
|
printf("FATAL: Could not determine the maximal depth available\n"); |
682 |
< |
return false; |
682 |
> |
return; |
683 |
|
} else { |
684 |
|
while (ndepths-- > 0) { |
685 |
|
if (depths[ndepths] > max_depth) |
696 |
|
char str[256]; |
697 |
|
sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno)); |
698 |
|
ErrorAlert(str); |
699 |
< |
return false; |
699 |
> |
return; |
700 |
|
} |
701 |
|
|
702 |
|
int fb_depth; // supported depth |
716 |
|
continue; |
717 |
|
|
718 |
|
if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3) |
719 |
< |
&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) { |
719 |
> |
&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) { |
720 |
|
device_found = true; |
721 |
|
break; |
722 |
|
} |
728 |
|
// Frame buffer name not found ? Then, display warning |
729 |
|
if (!device_found) { |
730 |
|
char str[256]; |
731 |
< |
sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth); |
731 |
> |
sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth); |
732 |
|
ErrorAlert(str); |
733 |
< |
return false; |
733 |
> |
return; |
734 |
|
} |
735 |
|
|
401 |
– |
int width = DisplayWidth(x_display, screen); |
402 |
– |
int height = DisplayHeight(x_display, screen); |
403 |
– |
depth = fb_depth; // max_depth |
404 |
– |
|
405 |
– |
// Set relative mouse mode |
406 |
– |
ADBSetRelMouseMode(false); |
407 |
– |
|
736 |
|
// Create window |
737 |
|
XSetWindowAttributes wattr; |
738 |
< |
wattr.override_redirect = True; |
739 |
< |
wattr.backing_store = NotUseful; |
740 |
< |
wattr.background_pixel = white_pixel; |
741 |
< |
wattr.border_pixel = black_pixel; |
414 |
< |
wattr.event_mask = eventmask = dga_eventmask; |
738 |
> |
wattr.event_mask = eventmask = dga_eventmask; |
739 |
> |
wattr.background_pixel = white_pixel; |
740 |
> |
wattr.override_redirect = True; |
741 |
> |
wattr.colormap = cmap[0]; |
742 |
|
|
743 |
< |
XSync(x_display, false); |
417 |
< |
the_win = XCreateWindow(x_display, rootwin, |
743 |
> |
w = XCreateWindow(x_display, rootwin, |
744 |
|
0, 0, width, height, |
745 |
|
0, xdepth, InputOutput, vis, |
746 |
< |
CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore, |
746 |
> |
CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0), |
747 |
|
&wattr); |
748 |
< |
XSync(x_display, false); |
749 |
< |
XMapRaised(x_display, the_win); |
750 |
< |
XSync(x_display, false); |
748 |
> |
|
749 |
> |
// Set window name/class |
750 |
> |
set_window_name(w, STR_WINDOW_TITLE); |
751 |
> |
|
752 |
> |
// Indicate that we want keyboard input |
753 |
> |
set_window_focus(w); |
754 |
> |
|
755 |
> |
// Show window |
756 |
> |
XMapRaised(x_display, w); |
757 |
> |
wait_mapped(w); |
758 |
|
|
759 |
|
// Grab mouse and keyboard |
760 |
< |
XGrabKeyboard(x_display, the_win, True, |
760 |
> |
XGrabKeyboard(x_display, w, True, |
761 |
|
GrabModeAsync, GrabModeAsync, CurrentTime); |
762 |
< |
XGrabPointer(x_display, the_win, True, |
762 |
> |
XGrabPointer(x_display, w, True, |
763 |
|
PointerMotionMask | ButtonPressMask | ButtonReleaseMask, |
764 |
< |
GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime); |
764 |
> |
GrabModeAsync, GrabModeAsync, w, None, CurrentTime); |
765 |
|
|
766 |
< |
// Set colormap |
767 |
< |
if (depth == 8) { |
435 |
< |
XSetWindowColormap(x_display, the_win, cmap[0]); |
436 |
< |
XSetWMColormapWindows(x_display, the_win, &the_win, 1); |
437 |
< |
} |
438 |
< |
|
439 |
< |
// Set VideoMonitor |
440 |
< |
int bytes_per_row = width; |
441 |
< |
switch (depth) { |
442 |
< |
case 1: |
443 |
< |
bytes_per_row = ((width | 7) & ~7) >> 3; |
444 |
< |
break; |
445 |
< |
case 15: |
446 |
< |
case 16: |
447 |
< |
bytes_per_row *= 2; |
448 |
< |
break; |
449 |
< |
case 24: |
450 |
< |
case 32: |
451 |
< |
bytes_per_row *= 4; |
452 |
< |
break; |
453 |
< |
} |
766 |
> |
// Calculate bytes per row |
767 |
> |
int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth); |
768 |
|
|
769 |
+ |
// Map frame buffer |
770 |
|
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { |
771 |
|
if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { |
772 |
|
char str[256]; |
773 |
|
sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno)); |
774 |
|
ErrorAlert(str); |
775 |
< |
return false; |
775 |
> |
return; |
776 |
|
} |
777 |
|
} |
778 |
|
|
779 |
< |
set_video_monitor(width, height, bytes_per_row, true); |
780 |
< |
#if REAL_ADDRESSING |
781 |
< |
VideoMonitor.mac_frame_base = (uint32)the_buffer; |
782 |
< |
MacFrameLayout = FLAYOUT_DIRECT; |
779 |
> |
#if ENABLE_VOSF |
780 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
781 |
> |
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
782 |
> |
// i.e. the framebuffer update function is not Blit_Copy_Raw |
783 |
> |
use_vosf = Screen_blitter_init(&visualInfo, true); |
784 |
> |
|
785 |
> |
if (use_vosf) { |
786 |
> |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
787 |
> |
the_host_buffer = the_buffer; |
788 |
> |
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
789 |
> |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
790 |
> |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
791 |
> |
} |
792 |
|
#else |
793 |
< |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
793 |
> |
use_vosf = false; |
794 |
|
#endif |
471 |
– |
return true; |
472 |
– |
#else |
473 |
– |
ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled."); |
474 |
– |
return false; |
795 |
|
#endif |
796 |
+ |
|
797 |
+ |
// Set VideoMonitor |
798 |
+ |
VideoModes[0].bytes_per_row = bytes_per_row; |
799 |
+ |
VideoModes[0].depth = DepthModeForPixelDepth(fb_depth); |
800 |
+ |
VideoMonitor.mode = mode; |
801 |
+ |
set_mac_frame_buffer(mode.depth, true); |
802 |
+ |
|
803 |
+ |
// Everything went well |
804 |
+ |
init_ok = true; |
805 |
|
} |
806 |
|
|
807 |
< |
// Init XF86 DGA display |
808 |
< |
static bool init_xf86_dga(int width, int height) |
807 |
> |
// Close display |
808 |
> |
driver_fbdev::~driver_fbdev() |
809 |
> |
{ |
810 |
> |
} |
811 |
> |
#endif |
812 |
> |
|
813 |
> |
|
814 |
> |
#ifdef ENABLE_XF86_DGA |
815 |
> |
/* |
816 |
> |
* XFree86 DGA display driver |
817 |
> |
*/ |
818 |
> |
|
819 |
> |
class driver_xf86dga : public driver_dga { |
820 |
> |
public: |
821 |
> |
driver_xf86dga(const video_mode &mode); |
822 |
> |
~driver_xf86dga(); |
823 |
> |
|
824 |
> |
void update_palette(void); |
825 |
> |
void resume(void); |
826 |
> |
|
827 |
> |
private: |
828 |
> |
int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap |
829 |
> |
}; |
830 |
> |
|
831 |
> |
// Open display |
832 |
> |
driver_xf86dga::driver_xf86dga(const video_mode &mode) |
833 |
> |
: current_dga_cmap(0) |
834 |
|
{ |
835 |
< |
#if ENABLE_XF86_DGA |
835 |
> |
int width = mode.x, height = mode.y; |
836 |
> |
|
837 |
|
// Set relative mouse mode |
838 |
|
ADBSetRelMouseMode(true); |
839 |
|
|
840 |
+ |
#ifdef ENABLE_XF86_VIDMODE |
841 |
+ |
// Switch to best mode |
842 |
+ |
if (has_vidmode) { |
843 |
+ |
int best = 0; |
844 |
+ |
for (int i=1; i<num_x_video_modes; i++) { |
845 |
+ |
if (x_video_modes[i]->hdisplay >= width && x_video_modes[i]->vdisplay >= height && |
846 |
+ |
x_video_modes[i]->hdisplay <= x_video_modes[best]->hdisplay && x_video_modes[i]->vdisplay <= x_video_modes[best]->vdisplay) { |
847 |
+ |
best = i; |
848 |
+ |
} |
849 |
+ |
} |
850 |
+ |
XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]); |
851 |
+ |
XF86VidModeSetViewPort(x_display, screen, 0, 0); |
852 |
+ |
XSync(x_display, false); |
853 |
+ |
} |
854 |
+ |
#endif |
855 |
+ |
|
856 |
|
// Create window |
857 |
|
XSetWindowAttributes wattr; |
858 |
|
wattr.event_mask = eventmask = dga_eventmask; |
488 |
– |
wattr.border_pixel = black_pixel; |
859 |
|
wattr.override_redirect = True; |
860 |
|
|
861 |
< |
XSync(x_display, false); |
862 |
< |
the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
863 |
< |
InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr); |
864 |
< |
XSync(x_display, false); |
865 |
< |
XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE)); |
866 |
< |
XMapRaised(x_display, the_win); |
867 |
< |
XSync(x_display, false); |
861 |
> |
w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, |
862 |
> |
InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr); |
863 |
> |
|
864 |
> |
// Set window name/class |
865 |
> |
set_window_name(w, STR_WINDOW_TITLE); |
866 |
> |
|
867 |
> |
// Indicate that we want keyboard input |
868 |
> |
set_window_focus(w); |
869 |
> |
|
870 |
> |
// Show window |
871 |
> |
XMapRaised(x_display, w); |
872 |
> |
wait_mapped(w); |
873 |
|
|
874 |
|
// Establish direct screen connection |
875 |
< |
XMoveResizeWindow(x_display, the_win, 0, 0, width, height); |
875 |
> |
XMoveResizeWindow(x_display, w, 0, 0, width, height); |
876 |
|
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
877 |
|
XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime); |
878 |
|
XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
884 |
|
XF86DGASetVidPage(x_display, screen, 0); |
885 |
|
|
886 |
|
// Set colormap |
887 |
< |
if (depth == 8) { |
888 |
< |
XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]); |
514 |
< |
XSetWMColormapWindows(x_display, the_win, &the_win, 1); |
887 |
> |
if (!IsDirectMode(mode)) { |
888 |
> |
XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]); |
889 |
|
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
890 |
|
} |
891 |
+ |
XSync(x_display, false); |
892 |
|
|
893 |
< |
// Set VideoMonitor |
894 |
< |
int bytes_per_row = (v_width + 7) & ~7; |
895 |
< |
switch (depth) { |
896 |
< |
case 1: |
897 |
< |
bytes_per_row /= 8; |
898 |
< |
break; |
899 |
< |
case 15: |
900 |
< |
case 16: |
901 |
< |
bytes_per_row *= 2; |
902 |
< |
break; |
903 |
< |
case 24: |
904 |
< |
case 32: |
905 |
< |
bytes_per_row *= 4; |
906 |
< |
break; |
893 |
> |
// Init blitting routines |
894 |
> |
int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth); |
895 |
> |
#ifdef VIDEO_VOSF |
896 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
897 |
> |
// Screen_blitter_init() returns TRUE if VOSF is mandatory |
898 |
> |
// i.e. the framebuffer update function is not Blit_Copy_Raw |
899 |
> |
use_vosf = Screen_blitter_init(&visualInfo, true); |
900 |
> |
|
901 |
> |
if (use_vosf) { |
902 |
> |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
903 |
> |
the_host_buffer = the_buffer; |
904 |
> |
the_buffer_size = page_extend((height + 2) * bytes_per_row); |
905 |
> |
the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size); |
906 |
> |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
907 |
|
} |
533 |
– |
set_video_monitor(width, height, bytes_per_row, true); |
534 |
– |
#if REAL_ADDRESSING |
535 |
– |
VideoMonitor.mac_frame_base = (uint32)the_buffer; |
536 |
– |
MacFrameLayout = FLAYOUT_DIRECT; |
908 |
|
#else |
909 |
< |
VideoMonitor.mac_frame_base = MacFrameBaseMac; |
909 |
> |
use_vosf = false; |
910 |
|
#endif |
540 |
– |
return true; |
541 |
– |
#else |
542 |
– |
ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled."); |
543 |
– |
return false; |
911 |
|
#endif |
912 |
+ |
|
913 |
+ |
// Set VideoMonitor |
914 |
+ |
const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row; |
915 |
+ |
VideoMonitor.mode = mode; |
916 |
+ |
set_mac_frame_buffer(mode.depth, true); |
917 |
+ |
|
918 |
+ |
// Everything went well |
919 |
+ |
init_ok = true; |
920 |
+ |
} |
921 |
+ |
|
922 |
+ |
// Close display |
923 |
+ |
driver_xf86dga::~driver_xf86dga() |
924 |
+ |
{ |
925 |
+ |
XF86DGADirectVideo(x_display, screen, 0); |
926 |
+ |
#ifdef ENABLE_XF86_VIDMODE |
927 |
+ |
if (has_vidmode) |
928 |
+ |
XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]); |
929 |
+ |
#endif |
930 |
+ |
} |
931 |
+ |
|
932 |
+ |
// Palette has changed |
933 |
+ |
void driver_xf86dga::update_palette(void) |
934 |
+ |
{ |
935 |
+ |
driver_dga::update_palette(); |
936 |
+ |
current_dga_cmap ^= 1; |
937 |
+ |
if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap]) |
938 |
+ |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
939 |
|
} |
940 |
|
|
941 |
+ |
// Resume emulation |
942 |
+ |
void driver_xf86dga::resume(void) |
943 |
+ |
{ |
944 |
+ |
driver_dga::resume(); |
945 |
+ |
if (!IsDirectMode(VideoMonitor.mode)) |
946 |
+ |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
947 |
+ |
} |
948 |
+ |
#endif |
949 |
+ |
|
950 |
+ |
|
951 |
+ |
/* |
952 |
+ |
* Initialization |
953 |
+ |
*/ |
954 |
+ |
|
955 |
|
// Init keycode translation table |
956 |
|
static void keycode_init(void) |
957 |
|
{ |
1017 |
|
} |
1018 |
|
} |
1019 |
|
|
1020 |
+ |
// Open display for specified mode |
1021 |
+ |
static bool video_open(const video_mode &mode) |
1022 |
+ |
{ |
1023 |
+ |
// Create display driver object of requested type |
1024 |
+ |
switch (display_type) { |
1025 |
+ |
case DISPLAY_WINDOW: |
1026 |
+ |
drv = new driver_window(mode); |
1027 |
+ |
break; |
1028 |
+ |
#ifdef ENABLE_FBDEV_DGA |
1029 |
+ |
case DISPLAY_DGA: |
1030 |
+ |
drv = new driver_fbdev(mode); |
1031 |
+ |
break; |
1032 |
+ |
#endif |
1033 |
+ |
#ifdef ENABLE_XF86_DGA |
1034 |
+ |
case DISPLAY_DGA: |
1035 |
+ |
drv = new driver_xf86dga(mode); |
1036 |
+ |
break; |
1037 |
+ |
#endif |
1038 |
+ |
} |
1039 |
+ |
if (drv == NULL) |
1040 |
+ |
return false; |
1041 |
+ |
if (!drv->init_ok) { |
1042 |
+ |
delete drv; |
1043 |
+ |
drv = NULL; |
1044 |
+ |
return false; |
1045 |
+ |
} |
1046 |
+ |
|
1047 |
+ |
#ifdef ENABLE_VOSF |
1048 |
+ |
if (use_vosf) { |
1049 |
+ |
// Initialize the mainBuffer structure |
1050 |
+ |
if (!video_init_buffer()) { |
1051 |
+ |
ErrorAlert(STR_VOSF_INIT_ERR); |
1052 |
+ |
return false; |
1053 |
+ |
} |
1054 |
+ |
|
1055 |
+ |
// Initialize the handler for SIGSEGV |
1056 |
+ |
if (!sigsegv_install_handler(screen_fault_handler)) { |
1057 |
+ |
ErrorAlert("Could not initialize Video on SEGV signals"); |
1058 |
+ |
return false; |
1059 |
+ |
} |
1060 |
+ |
} |
1061 |
+ |
#endif |
1062 |
+ |
|
1063 |
+ |
// Initialize VideoRefresh function |
1064 |
+ |
VideoRefreshInit(); |
1065 |
+ |
|
1066 |
+ |
// Lock down frame buffer |
1067 |
+ |
XSync(x_display, false); |
1068 |
+ |
LOCK_FRAME_BUFFER; |
1069 |
+ |
|
1070 |
+ |
// Start redraw/input thread |
1071 |
+ |
#ifdef HAVE_PTHREADS |
1072 |
+ |
redraw_thread_cancel = false; |
1073 |
+ |
redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0); |
1074 |
+ |
if (!redraw_thread_active) { |
1075 |
+ |
printf("FATAL: cannot create redraw thread\n"); |
1076 |
+ |
return false; |
1077 |
+ |
} |
1078 |
+ |
#else |
1079 |
+ |
redraw_thread_active = true; |
1080 |
+ |
#endif |
1081 |
+ |
|
1082 |
+ |
return true; |
1083 |
+ |
} |
1084 |
+ |
|
1085 |
|
bool VideoInit(bool classic) |
1086 |
|
{ |
1087 |
+ |
classic_mode = classic; |
1088 |
+ |
|
1089 |
+ |
#ifdef ENABLE_VOSF |
1090 |
+ |
// Zero the mainBuffer structure |
1091 |
+ |
mainBuffer.dirtyPages = NULL; |
1092 |
+ |
mainBuffer.pageInfo = NULL; |
1093 |
+ |
#endif |
1094 |
+ |
|
1095 |
+ |
// Check if X server runs on local machine |
1096 |
+ |
local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0) |
1097 |
+ |
|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0); |
1098 |
+ |
|
1099 |
|
// Init keycode translation |
1100 |
|
keycode_init(); |
1101 |
|
|
1102 |
|
// Read prefs |
1103 |
< |
mouse_wheel_mode = PrefsFindInt16("mousewheelmode"); |
1104 |
< |
mouse_wheel_lines = PrefsFindInt16("mousewheellines"); |
1103 |
> |
frame_skip = PrefsFindInt32("frameskip"); |
1104 |
> |
mouse_wheel_mode = PrefsFindInt32("mousewheelmode"); |
1105 |
> |
mouse_wheel_lines = PrefsFindInt32("mousewheellines"); |
1106 |
|
|
1107 |
|
// Find screen and root window |
1108 |
|
screen = XDefaultScreen(x_display); |
1111 |
|
// Get screen depth |
1112 |
|
xdepth = DefaultDepth(x_display, screen); |
1113 |
|
|
1114 |
< |
#if ENABLE_FBDEV_DGA |
1114 |
> |
#ifdef ENABLE_FBDEV_DGA |
1115 |
|
// Frame buffer name |
1116 |
|
char fb_name[20]; |
1117 |
|
|
1118 |
< |
// Could do fbdev dga ? |
1118 |
> |
// Could do fbdev DGA? |
1119 |
|
if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1) |
1120 |
|
has_dga = true; |
1121 |
|
else |
1122 |
|
has_dga = false; |
1123 |
|
#endif |
1124 |
< |
|
1125 |
< |
#if ENABLE_XF86_DGA |
1124 |
> |
|
1125 |
> |
#ifdef ENABLE_XF86_DGA |
1126 |
|
// DGA available? |
1127 |
< |
int event_base, error_base; |
1128 |
< |
if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) { |
1127 |
> |
int dga_event_base, dga_error_base; |
1128 |
> |
if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) { |
1129 |
|
int dga_flags = 0; |
1130 |
|
XF86DGAQueryDirectVideo(x_display, screen, &dga_flags); |
1131 |
|
has_dga = dga_flags & XF86DGADirectPresent; |
1133 |
|
has_dga = false; |
1134 |
|
#endif |
1135 |
|
|
1136 |
+ |
#ifdef ENABLE_XF86_VIDMODE |
1137 |
+ |
// VidMode available? |
1138 |
+ |
int vm_event_base, vm_error_base; |
1139 |
+ |
has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base); |
1140 |
+ |
if (has_vidmode) |
1141 |
+ |
XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes); |
1142 |
+ |
#endif |
1143 |
+ |
|
1144 |
|
// Find black and white colors |
1145 |
|
XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black); |
1146 |
|
XAllocColor(x_display, DefaultColormap(x_display, screen), &black); |
1161 |
|
case 15: |
1162 |
|
case 16: |
1163 |
|
case 24: |
1164 |
< |
case 32: |
1165 |
< |
color_class = TrueColor; |
1164 |
> |
case 32: // Try DirectColor first, as this will allow gamma correction |
1165 |
> |
color_class = DirectColor; |
1166 |
> |
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) |
1167 |
> |
color_class = TrueColor; |
1168 |
|
break; |
1169 |
|
default: |
1170 |
< |
ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR)); |
1170 |
> |
ErrorAlert(STR_UNSUPP_DEPTH_ERR); |
1171 |
|
return false; |
1172 |
|
} |
1173 |
|
if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) { |
1174 |
< |
ErrorAlert(GetString(STR_NO_XVISUAL_ERR)); |
1174 |
> |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1175 |
|
return false; |
1176 |
|
} |
1177 |
|
if (visualInfo.depth != xdepth) { |
1178 |
< |
ErrorAlert(GetString(STR_NO_XVISUAL_ERR)); |
1178 |
> |
ErrorAlert(STR_NO_XVISUAL_ERR); |
1179 |
|
return false; |
1180 |
|
} |
1181 |
|
vis = visualInfo.visual; |
1182 |
|
|
1183 |
< |
// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise |
1184 |
< |
classic_mode = classic; |
689 |
< |
if (classic) |
690 |
< |
depth = 1; |
691 |
< |
else |
692 |
< |
depth = xdepth; |
693 |
< |
|
694 |
< |
// Create color maps for 8 bit mode |
695 |
< |
if (depth == 8) { |
1183 |
> |
// Create color maps |
1184 |
> |
if (color_class == PseudoColor || color_class == DirectColor) { |
1185 |
|
cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1186 |
|
cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll); |
1187 |
< |
XInstallColormap(x_display, cmap[0]); |
1188 |
< |
XInstallColormap(x_display, cmap[1]); |
1187 |
> |
|
1188 |
> |
// Preset pixel members for gamma table |
1189 |
> |
if (color_class == DirectColor) { |
1190 |
> |
int num = vis->map_entries; |
1191 |
> |
uint32 rmask = vis->red_mask, gmask = vis->green_mask, bmask = vis->blue_mask; |
1192 |
> |
uint32 mask; |
1193 |
> |
int rloss = 8, rshift = 0; |
1194 |
> |
for (mask=rmask; !(mask&1); mask>>=1) |
1195 |
> |
++rshift; |
1196 |
> |
for (; mask&1; mask>>=1) |
1197 |
> |
--rloss; |
1198 |
> |
int gloss = 8, gshift = 0; |
1199 |
> |
for (mask=gmask; !(mask&1); mask>>=1) |
1200 |
> |
++gshift; |
1201 |
> |
for (; mask&1; mask>>=1) |
1202 |
> |
--gloss; |
1203 |
> |
int bloss = 8, bshift = 0; |
1204 |
> |
for (mask=bmask; !(mask&1); mask>>=1) |
1205 |
> |
++bshift; |
1206 |
> |
for (; mask&1; mask>>=1) |
1207 |
> |
--bloss; |
1208 |
> |
for (int i=0; i<num; i++) { |
1209 |
> |
int c = (i * 256) / num; |
1210 |
> |
palette[i].pixel = ((c >> rloss) << rshift) | ((c >> gloss) << gshift) | ((c >> bloss) << bshift); |
1211 |
> |
} |
1212 |
> |
} |
1213 |
|
} |
1214 |
|
|
1215 |
|
// Get screen mode from preferences |
1216 |
|
const char *mode_str; |
1217 |
< |
if (classic) |
1217 |
> |
if (classic_mode) |
1218 |
|
mode_str = "win/512/342"; |
1219 |
|
else |
1220 |
|
mode_str = PrefsFindString("screen"); |
1221 |
|
|
1222 |
< |
// Determine type and mode |
1223 |
< |
int width = 512, height = 384; |
1222 |
> |
// Determine display type and default dimensions |
1223 |
> |
int default_width = 512, default_height = 384; |
1224 |
|
display_type = DISPLAY_WINDOW; |
1225 |
|
if (mode_str) { |
1226 |
< |
if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2) |
1226 |
> |
if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) { |
1227 |
|
display_type = DISPLAY_WINDOW; |
1228 |
< |
#if ENABLE_FBDEV_DGA |
1229 |
< |
else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) { |
1230 |
< |
#else |
1231 |
< |
else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) { |
1228 |
> |
#ifdef ENABLE_FBDEV_DGA |
1229 |
> |
} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) { |
1230 |
> |
display_type = DISPLAY_DGA; |
1231 |
> |
default_width = -1; default_height = -1; // use entire screen |
1232 |
|
#endif |
1233 |
+ |
#ifdef ENABLE_XF86_DGA |
1234 |
+ |
} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) { |
1235 |
|
display_type = DISPLAY_DGA; |
721 |
– |
if (width > DisplayWidth(x_display, screen)) |
722 |
– |
width = DisplayWidth(x_display, screen); |
723 |
– |
if (height > DisplayHeight(x_display, screen)) |
724 |
– |
height = DisplayHeight(x_display, screen); |
725 |
– |
} |
726 |
– |
if (width <= 0) |
727 |
– |
width = DisplayWidth(x_display, screen); |
728 |
– |
if (height <= 0) |
729 |
– |
height = DisplayHeight(x_display, screen); |
730 |
– |
} |
731 |
– |
|
732 |
– |
// Initialize according to display type |
733 |
– |
switch (display_type) { |
734 |
– |
case DISPLAY_WINDOW: |
735 |
– |
if (!init_window(width, height)) |
736 |
– |
return false; |
737 |
– |
break; |
738 |
– |
case DISPLAY_DGA: |
739 |
– |
#if ENABLE_FBDEV_DGA |
740 |
– |
if (!init_fbdev_dga(fb_name)) |
741 |
– |
#else |
742 |
– |
if (!init_xf86_dga(width, height)) |
1236 |
|
#endif |
1237 |
< |
return false; |
745 |
< |
break; |
1237 |
> |
} |
1238 |
|
} |
1239 |
+ |
if (default_width <= 0) |
1240 |
+ |
default_width = DisplayWidth(x_display, screen); |
1241 |
+ |
else if (default_width > DisplayWidth(x_display, screen)) |
1242 |
+ |
default_width = DisplayWidth(x_display, screen); |
1243 |
+ |
if (default_height <= 0) |
1244 |
+ |
default_height = DisplayHeight(x_display, screen); |
1245 |
+ |
else if (default_height > DisplayHeight(x_display, screen)) |
1246 |
+ |
default_height = DisplayHeight(x_display, screen); |
1247 |
|
|
1248 |
< |
// Lock down frame buffer |
1249 |
< |
pthread_mutex_lock(&frame_buffer_lock); |
1250 |
< |
|
751 |
< |
#if !REAL_ADDRESSING |
752 |
< |
// Set variables for UAE memory mapping |
753 |
< |
MacFrameBaseHost = the_buffer; |
754 |
< |
MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y; |
1248 |
> |
// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise |
1249 |
> |
int depth = (classic_mode ? 1 : xdepth); |
1250 |
> |
video_depth depth_mode = DepthModeForPixelDepth(depth); |
1251 |
|
|
1252 |
< |
// No special frame buffer in Classic mode (frame buffer is in Mac RAM) |
1253 |
< |
if (classic) |
1254 |
< |
MacFrameLayout = FLAYOUT_NONE; |
1255 |
< |
#endif |
1252 |
> |
// Construct list of supported modes |
1253 |
> |
if (display_type == DISPLAY_WINDOW) { |
1254 |
> |
if (classic) |
1255 |
> |
add_mode(512, 342, 0x80, 64, depth_mode); |
1256 |
> |
else { |
1257 |
> |
add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode); |
1258 |
> |
add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode); |
1259 |
> |
add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode); |
1260 |
> |
add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode); |
1261 |
> |
add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode); |
1262 |
> |
} |
1263 |
> |
} else |
1264 |
> |
add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode); |
1265 |
|
|
1266 |
< |
// Start redraw/input thread |
1267 |
< |
XSync(x_display, false); |
1268 |
< |
redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0); |
1269 |
< |
if (!redraw_thread_active) |
1270 |
< |
printf("FATAL: cannot create redraw thread\n"); |
1271 |
< |
return redraw_thread_active; |
1266 |
> |
// Find requested default mode and open display |
1267 |
> |
if (VideoModes.size() == 1) |
1268 |
> |
return video_open(VideoModes[0]); |
1269 |
> |
else { |
1270 |
> |
// Find mode with specified dimensions |
1271 |
> |
std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end(); |
1272 |
> |
while (i != end) { |
1273 |
> |
if (i->x == default_width && i->y == default_height) |
1274 |
> |
return video_open(*i); |
1275 |
> |
++i; |
1276 |
> |
} |
1277 |
> |
return video_open(VideoModes[0]); |
1278 |
> |
} |
1279 |
|
} |
1280 |
|
|
1281 |
|
|
1283 |
|
* Deinitialization |
1284 |
|
*/ |
1285 |
|
|
1286 |
< |
void VideoExit(void) |
1286 |
> |
// Close display |
1287 |
> |
static void video_close(void) |
1288 |
|
{ |
1289 |
|
// Stop redraw thread |
1290 |
+ |
#ifdef HAVE_PTHREADS |
1291 |
|
if (redraw_thread_active) { |
1292 |
|
redraw_thread_cancel = true; |
1293 |
|
#ifdef HAVE_PTHREAD_CANCEL |
1294 |
|
pthread_cancel(redraw_thread); |
1295 |
|
#endif |
1296 |
|
pthread_join(redraw_thread, NULL); |
783 |
– |
redraw_thread_active = false; |
1297 |
|
} |
1298 |
+ |
#endif |
1299 |
+ |
redraw_thread_active = false; |
1300 |
|
|
1301 |
|
// Unlock frame buffer |
1302 |
< |
pthread_mutex_unlock(&frame_buffer_lock); |
1303 |
< |
|
789 |
< |
// Close window and server connection |
790 |
< |
if (x_display != NULL) { |
791 |
< |
XSync(x_display, false); |
1302 |
> |
UNLOCK_FRAME_BUFFER; |
1303 |
> |
XSync(x_display, false); |
1304 |
|
|
1305 |
< |
#if ENABLE_XF86_DGA |
1306 |
< |
if (display_type == DISPLAY_DGA) { |
1307 |
< |
XF86DGADirectVideo(x_display, screen, 0); |
1308 |
< |
XUngrabPointer(x_display, CurrentTime); |
1309 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
1305 |
> |
#ifdef ENABLE_VOSF |
1306 |
> |
// Deinitialize VOSF |
1307 |
> |
if (use_vosf) { |
1308 |
> |
if (mainBuffer.pageInfo) { |
1309 |
> |
free(mainBuffer.pageInfo); |
1310 |
> |
mainBuffer.pageInfo = NULL; |
1311 |
|
} |
1312 |
+ |
if (mainBuffer.dirtyPages) { |
1313 |
+ |
free(mainBuffer.dirtyPages); |
1314 |
+ |
mainBuffer.dirtyPages = NULL; |
1315 |
+ |
} |
1316 |
+ |
} |
1317 |
|
#endif |
1318 |
|
|
1319 |
< |
#if ENABLE_FBDEV_DGA |
1320 |
< |
if (display_type == DISPLAY_DGA) { |
1321 |
< |
XUngrabPointer(x_display, CurrentTime); |
1322 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
1323 |
< |
close(fbdev_fd); |
1324 |
< |
} |
1319 |
> |
// Close display |
1320 |
> |
delete drv; |
1321 |
> |
drv = NULL; |
1322 |
> |
} |
1323 |
> |
|
1324 |
> |
void VideoExit(void) |
1325 |
> |
{ |
1326 |
> |
// Close display |
1327 |
> |
video_close(); |
1328 |
> |
|
1329 |
> |
// Free colormaps |
1330 |
> |
if (cmap[0]) { |
1331 |
> |
XFreeColormap(x_display, cmap[0]); |
1332 |
> |
cmap[0] = 0; |
1333 |
> |
} |
1334 |
> |
if (cmap[1]) { |
1335 |
> |
XFreeColormap(x_display, cmap[1]); |
1336 |
> |
cmap[1] = 0; |
1337 |
> |
} |
1338 |
> |
|
1339 |
> |
#ifdef ENABLE_XF86_VIDMODE |
1340 |
> |
// Free video mode list |
1341 |
> |
if (x_video_modes) { |
1342 |
> |
XFree(x_video_modes); |
1343 |
> |
x_video_modes = NULL; |
1344 |
> |
} |
1345 |
|
#endif |
808 |
– |
|
809 |
– |
if (the_buffer_copy) { |
810 |
– |
free(the_buffer_copy); |
811 |
– |
the_buffer_copy = NULL; |
812 |
– |
} |
1346 |
|
|
1347 |
< |
XFlush(x_display); |
1348 |
< |
XSync(x_display, false); |
1349 |
< |
if (depth == 8) { |
1350 |
< |
XFreeColormap(x_display, cmap[0]); |
1351 |
< |
XFreeColormap(x_display, cmap[1]); |
819 |
< |
} |
1347 |
> |
#ifdef ENABLE_FBDEV_DGA |
1348 |
> |
// Close framebuffer device |
1349 |
> |
if (fbdev_fd >= 0) { |
1350 |
> |
close(fbdev_fd); |
1351 |
> |
fbdev_fd = -1; |
1352 |
|
} |
1353 |
+ |
#endif |
1354 |
|
} |
1355 |
|
|
1356 |
|
|
1361 |
|
void VideoQuitFullScreen(void) |
1362 |
|
{ |
1363 |
|
D(bug("VideoQuitFullScreen()\n")); |
1364 |
< |
if (display_type == DISPLAY_DGA) |
832 |
< |
quit_full_screen = true; |
1364 |
> |
quit_full_screen = true; |
1365 |
|
} |
1366 |
|
|
1367 |
|
|
1377 |
|
|
1378 |
|
// Temporarily give up frame buffer lock (this is the point where |
1379 |
|
// we are suspended when the user presses Ctrl-Tab) |
1380 |
< |
pthread_mutex_unlock(&frame_buffer_lock); |
1381 |
< |
pthread_mutex_lock(&frame_buffer_lock); |
1380 |
> |
UNLOCK_FRAME_BUFFER; |
1381 |
> |
LOCK_FRAME_BUFFER; |
1382 |
|
} |
1383 |
|
|
1384 |
|
|
1388 |
|
|
1389 |
|
void video_set_palette(uint8 *pal) |
1390 |
|
{ |
1391 |
< |
pthread_mutex_lock(&palette_lock); |
1391 |
> |
LOCK_PALETTE; |
1392 |
|
|
1393 |
|
// Convert colors to XColor array |
1394 |
< |
for (int i=0; i<256; i++) { |
1395 |
< |
palette[i].pixel = i; |
1396 |
< |
palette[i].red = pal[i*3] * 0x0101; |
1397 |
< |
palette[i].green = pal[i*3+1] * 0x0101; |
1398 |
< |
palette[i].blue = pal[i*3+2] * 0x0101; |
1399 |
< |
palette[i].flags = DoRed | DoGreen | DoBlue; |
1394 |
> |
int num_in = 256, num_out = 256; |
1395 |
> |
if (VideoMonitor.mode.depth == VDEPTH_16BIT) { |
1396 |
> |
num_in = 32; |
1397 |
> |
// If X is in 565 mode we have to stretch the palette from 32 to 64 entries |
1398 |
> |
if (vis->c_class == DirectColor) |
1399 |
> |
num_out = vis->map_entries; |
1400 |
> |
} |
1401 |
> |
XColor *p = palette; |
1402 |
> |
for (int i=0; i<num_out; i++) { |
1403 |
> |
int c = (i * num_in) / num_out; |
1404 |
> |
p->red = pal[c*3 + 0] * 0x0101; |
1405 |
> |
p->green = pal[c*3 + 1] * 0x0101; |
1406 |
> |
p->blue = pal[c*3 + 2] * 0x0101; |
1407 |
> |
if (!IsDirectMode(VideoMonitor.mode)) |
1408 |
> |
p->pixel = i; |
1409 |
> |
p->flags = DoRed | DoGreen | DoBlue; |
1410 |
> |
p++; |
1411 |
|
} |
1412 |
|
|
1413 |
|
// Tell redraw thread to change palette |
1414 |
|
palette_changed = true; |
1415 |
|
|
1416 |
< |
pthread_mutex_unlock(&palette_lock); |
1416 |
> |
UNLOCK_PALETTE; |
1417 |
|
} |
1418 |
|
|
1419 |
|
|
1420 |
|
/* |
1421 |
< |
* Suspend/resume emulator |
1421 |
> |
* Switch video mode |
1422 |
|
*/ |
1423 |
|
|
1424 |
< |
#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA |
882 |
< |
static void suspend_emul(void) |
1424 |
> |
void video_switch_to_mode(const video_mode &mode) |
1425 |
|
{ |
1426 |
< |
if (display_type == DISPLAY_DGA) { |
1427 |
< |
// Release ctrl key |
1428 |
< |
ADBKeyUp(0x36); |
887 |
< |
ctrl_down = false; |
888 |
< |
|
889 |
< |
// Lock frame buffer (this will stop the MacOS thread) |
890 |
< |
pthread_mutex_lock(&frame_buffer_lock); |
891 |
< |
|
892 |
< |
// Save frame buffer |
893 |
< |
fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row); |
894 |
< |
if (fb_save) |
895 |
< |
memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row); |
896 |
< |
|
897 |
< |
// Close full screen display |
898 |
< |
#if ENABLE_XF86_DGA |
899 |
< |
XF86DGADirectVideo(x_display, screen, 0); |
900 |
< |
#endif |
901 |
< |
XUngrabPointer(x_display, CurrentTime); |
902 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
903 |
< |
XUnmapWindow(x_display, the_win); |
904 |
< |
XSync(x_display, false); |
905 |
< |
|
906 |
< |
// Open "suspend" window |
907 |
< |
XSetWindowAttributes wattr; |
908 |
< |
wattr.event_mask = KeyPressMask; |
909 |
< |
wattr.background_pixel = black_pixel; |
910 |
< |
wattr.border_pixel = black_pixel; |
911 |
< |
wattr.backing_store = Always; |
912 |
< |
wattr.backing_planes = xdepth; |
913 |
< |
wattr.colormap = DefaultColormap(x_display, screen); |
914 |
< |
|
915 |
< |
XSync(x_display, false); |
916 |
< |
suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth, |
917 |
< |
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | |
918 |
< |
CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr); |
919 |
< |
XSync(x_display, false); |
920 |
< |
XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE)); |
921 |
< |
XMapRaised(x_display, suspend_win); |
922 |
< |
XSync(x_display, false); |
923 |
< |
emul_suspended = true; |
924 |
< |
} |
925 |
< |
} |
926 |
< |
|
927 |
< |
static void resume_emul(void) |
928 |
< |
{ |
929 |
< |
// Close "suspend" window |
930 |
< |
XDestroyWindow(x_display, suspend_win); |
931 |
< |
XSync(x_display, false); |
1426 |
> |
// Close and reopen display |
1427 |
> |
video_close(); |
1428 |
> |
video_open(mode); |
1429 |
|
|
1430 |
< |
// Reopen full screen display |
1431 |
< |
XMapRaised(x_display, the_win); |
1432 |
< |
XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0); |
936 |
< |
XSync(x_display, false); |
937 |
< |
XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime); |
938 |
< |
XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); |
939 |
< |
#if ENABLE_XF86_DGA |
940 |
< |
XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); |
941 |
< |
XF86DGASetViewPort(x_display, screen, 0, 0); |
942 |
< |
#endif |
943 |
< |
XSync(x_display, false); |
944 |
< |
|
945 |
< |
// Restore frame buffer |
946 |
< |
if (fb_save) { |
947 |
< |
memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row); |
948 |
< |
free(fb_save); |
949 |
< |
fb_save = NULL; |
1430 |
> |
if (drv == NULL) { |
1431 |
> |
ErrorAlert(STR_OPEN_WINDOW_ERR); |
1432 |
> |
QuitEmulator(); |
1433 |
|
} |
951 |
– |
|
952 |
– |
if (depth == 8) |
953 |
– |
#if ENABLE_XF86_DGA |
954 |
– |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
955 |
– |
#endif |
956 |
– |
|
957 |
– |
// Unlock frame buffer (and continue MacOS thread) |
958 |
– |
pthread_mutex_unlock(&frame_buffer_lock); |
959 |
– |
emul_suspended = false; |
1434 |
|
} |
961 |
– |
#endif |
1435 |
|
|
1436 |
|
|
1437 |
|
/* |
1491 |
|
case XK_period: case XK_greater: return 0x2f; |
1492 |
|
case XK_slash: case XK_question: return 0x2c; |
1493 |
|
|
1494 |
< |
#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA |
1495 |
< |
case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30; |
1494 |
> |
#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) |
1495 |
> |
case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30; |
1496 |
|
#else |
1497 |
|
case XK_Tab: return 0x30; |
1498 |
|
#endif |
1583 |
|
return -1; |
1584 |
|
} |
1585 |
|
|
1586 |
< |
static int event2keycode(XKeyEvent *ev) |
1586 |
> |
static int event2keycode(XKeyEvent &ev) |
1587 |
|
{ |
1588 |
|
KeySym ks; |
1589 |
|
int as; |
1590 |
|
int i = 0; |
1591 |
|
|
1592 |
|
do { |
1593 |
< |
ks = XLookupKeysym(ev, i++); |
1593 |
> |
ks = XLookupKeysym(&ev, i++); |
1594 |
|
as = kc_decode(ks); |
1595 |
|
if (as != -1) |
1596 |
|
return as; |
1606 |
|
|
1607 |
|
static void handle_events(void) |
1608 |
|
{ |
1609 |
< |
XEvent event; |
1610 |
< |
for (;;) { |
1611 |
< |
if (!XCheckMaskEvent(x_display, eventmask, &event)) |
1139 |
< |
break; |
1609 |
> |
while (XPending(x_display)) { |
1610 |
> |
XEvent event; |
1611 |
> |
XNextEvent(x_display, &event); |
1612 |
|
|
1613 |
|
switch (event.type) { |
1614 |
|
// Mouse button |
1615 |
|
case ButtonPress: { |
1616 |
< |
unsigned int button = ((XButtonEvent *)&event)->button; |
1616 |
> |
unsigned int button = event.xbutton.button; |
1617 |
|
if (button < 4) |
1618 |
|
ADBMouseDown(button - 1); |
1619 |
|
else if (button < 6) { // Wheel mouse |
1632 |
|
break; |
1633 |
|
} |
1634 |
|
case ButtonRelease: { |
1635 |
< |
unsigned int button = ((XButtonEvent *)&event)->button; |
1635 |
> |
unsigned int button = event.xbutton.button; |
1636 |
|
if (button < 4) |
1637 |
|
ADBMouseUp(button - 1); |
1638 |
|
break; |
1640 |
|
|
1641 |
|
// Mouse moved |
1642 |
|
case EnterNotify: |
1171 |
– |
ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y); |
1172 |
– |
break; |
1643 |
|
case MotionNotify: |
1644 |
< |
ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y); |
1644 |
> |
ADBMouseMoved(event.xmotion.x, event.xmotion.y); |
1645 |
|
break; |
1646 |
|
|
1647 |
|
// Keyboard |
1648 |
|
case KeyPress: { |
1649 |
|
int code; |
1650 |
|
if (use_keycodes) { |
1651 |
< |
event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys |
1652 |
< |
code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff]; |
1651 |
> |
event2keycode(event.xkey); // This is called to process the hotkeys |
1652 |
> |
code = keycode_table[event.xkey.keycode & 0xff]; |
1653 |
|
} else |
1654 |
< |
code = event2keycode((XKeyEvent *)&event); |
1654 |
> |
code = event2keycode(event.xkey); |
1655 |
|
if (code != -1) { |
1656 |
|
if (!emul_suspended) { |
1657 |
|
if (code == 0x39) { // Caps Lock pressed |
1667 |
|
if (code == 0x36) |
1668 |
|
ctrl_down = true; |
1669 |
|
} else { |
1200 |
– |
#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA |
1670 |
|
if (code == 0x31) |
1671 |
< |
resume_emul(); // Space wakes us up |
1203 |
< |
#endif |
1671 |
> |
drv->resume(); // Space wakes us up |
1672 |
|
} |
1673 |
|
} |
1674 |
|
break; |
1676 |
|
case KeyRelease: { |
1677 |
|
int code; |
1678 |
|
if (use_keycodes) { |
1679 |
< |
event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys |
1680 |
< |
code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff]; |
1679 |
> |
event2keycode(event.xkey); // This is called to process the hotkeys |
1680 |
> |
code = keycode_table[event.xkey.keycode & 0xff]; |
1681 |
|
} else |
1682 |
< |
code = event2keycode((XKeyEvent *)&event); |
1682 |
> |
code = event2keycode(event.xkey); |
1683 |
|
if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases |
1684 |
|
ADBKeyUp(code); |
1685 |
|
if (code == 0x36) |
1690 |
|
|
1691 |
|
// Hidden parts exposed, force complete refresh of window |
1692 |
|
case Expose: |
1693 |
< |
if (display_type == DISPLAY_WINDOW) |
1694 |
< |
memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); |
1693 |
> |
if (display_type == DISPLAY_WINDOW) { |
1694 |
> |
#ifdef ENABLE_VOSF |
1695 |
> |
if (use_vosf) { // VOSF refresh |
1696 |
> |
LOCK_VOSF; |
1697 |
> |
PFLAG_SET_ALL; |
1698 |
> |
UNLOCK_VOSF; |
1699 |
> |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
1700 |
> |
} |
1701 |
> |
else |
1702 |
> |
#endif |
1703 |
> |
if (frame_skip == 0) { // Dynamic refresh |
1704 |
> |
int x1, y1; |
1705 |
> |
for (y1=0; y1<16; y1++) |
1706 |
> |
for (x1=0; x1<16; x1++) |
1707 |
> |
updt_box[x1][y1] = true; |
1708 |
> |
nr_boxes = 16 * 16; |
1709 |
> |
} else // Static refresh |
1710 |
> |
memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y); |
1711 |
> |
} |
1712 |
> |
break; |
1713 |
> |
|
1714 |
> |
// Window "close" widget clicked |
1715 |
> |
case ClientMessage: |
1716 |
> |
if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) { |
1717 |
> |
ADBKeyDown(0x7f); // Power key |
1718 |
> |
ADBKeyUp(0x7f); |
1719 |
> |
} |
1720 |
|
break; |
1721 |
|
} |
1722 |
|
} |
1727 |
|
* Window display update |
1728 |
|
*/ |
1729 |
|
|
1730 |
< |
static void update_display(void) |
1730 |
> |
// Dynamic display update (variable frame rate for each box) |
1731 |
> |
static void update_display_dynamic(int ticker, driver_window *drv) |
1732 |
> |
{ |
1733 |
> |
int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi; |
1734 |
> |
int xil = 0; |
1735 |
> |
int rxm = 0, rxmo = 0; |
1736 |
> |
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
1737 |
> |
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
1738 |
> |
int rx = VideoMonitor.mode.bytes_per_row / 16; |
1739 |
> |
int ry = VideoMonitor.mode.y / 16; |
1740 |
> |
int max_box; |
1741 |
> |
|
1742 |
> |
y2s = sm_uptd[ticker % 8]; |
1743 |
> |
y2a = 8; |
1744 |
> |
for (i = 0; i < 6; i++) |
1745 |
> |
if (ticker % (2 << i)) |
1746 |
> |
break; |
1747 |
> |
max_box = sm_no_boxes[i]; |
1748 |
> |
|
1749 |
> |
if (y2a) { |
1750 |
> |
for (y1=0; y1<16; y1++) { |
1751 |
> |
for (y2=y2s; y2 < ry; y2 += y2a) { |
1752 |
> |
i = ((y1 * ry) + y2) * bytes_per_row; |
1753 |
> |
for (x1=0; x1<16; x1++, i += rx) { |
1754 |
> |
if (updt_box[x1][y1] == false) { |
1755 |
> |
if (memcmp(&the_buffer_copy[i], &the_buffer[i], rx)) { |
1756 |
> |
updt_box[x1][y1] = true; |
1757 |
> |
nr_boxes++; |
1758 |
> |
} |
1759 |
> |
} |
1760 |
> |
} |
1761 |
> |
} |
1762 |
> |
} |
1763 |
> |
} |
1764 |
> |
|
1765 |
> |
if ((nr_boxes <= max_box) && (nr_boxes)) { |
1766 |
> |
for (y1=0; y1<16; y1++) { |
1767 |
> |
for (x1=0; x1<16; x1++) { |
1768 |
> |
if (updt_box[x1][y1] == true) { |
1769 |
> |
if (rxm == 0) |
1770 |
> |
xm = x1; |
1771 |
> |
rxm += rx; |
1772 |
> |
updt_box[x1][y1] = false; |
1773 |
> |
} |
1774 |
> |
if (((updt_box[x1+1][y1] == false) || (x1 == 15)) && (rxm)) { |
1775 |
> |
if ((rxmo != rxm) || (xmo != xm) || (yo != y1 - 1)) { |
1776 |
> |
if (rxmo) { |
1777 |
> |
xi = xmo * rx; |
1778 |
> |
yi = ymo * ry; |
1779 |
> |
xil = rxmo; |
1780 |
> |
yil = (yo - ymo +1) * ry; |
1781 |
> |
} |
1782 |
> |
rxmo = rxm; |
1783 |
> |
xmo = xm; |
1784 |
> |
ymo = y1; |
1785 |
> |
} |
1786 |
> |
rxm = 0; |
1787 |
> |
yo = y1; |
1788 |
> |
} |
1789 |
> |
if (xil) { |
1790 |
> |
i = (yi * bytes_per_row) + xi; |
1791 |
> |
for (y2=0; y2 < yil; y2++, i += bytes_per_row) |
1792 |
> |
memcpy(&the_buffer_copy[i], &the_buffer[i], xil); |
1793 |
> |
if (VideoMonitor.mode.depth == VDEPTH_1BIT) { |
1794 |
> |
if (drv->have_shm) |
1795 |
> |
XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0); |
1796 |
> |
else |
1797 |
> |
XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil); |
1798 |
> |
} else { |
1799 |
> |
if (drv->have_shm) |
1800 |
> |
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); |
1801 |
> |
else |
1802 |
> |
XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil); |
1803 |
> |
} |
1804 |
> |
xil = 0; |
1805 |
> |
} |
1806 |
> |
if ((x1 == 15) && (y1 == 15) && (rxmo)) { |
1807 |
> |
x1--; |
1808 |
> |
xi = xmo * rx; |
1809 |
> |
yi = ymo * ry; |
1810 |
> |
xil = rxmo; |
1811 |
> |
yil = (yo - ymo +1) * ry; |
1812 |
> |
rxmo = 0; |
1813 |
> |
} |
1814 |
> |
} |
1815 |
> |
} |
1816 |
> |
nr_boxes = 0; |
1817 |
> |
} |
1818 |
> |
} |
1819 |
> |
|
1820 |
> |
// Static display update (fixed frame rate, but incremental) |
1821 |
> |
static void update_display_static(driver_window *drv) |
1822 |
|
{ |
1239 |
– |
// In classic mode, copy the frame buffer from Mac RAM |
1240 |
– |
if (classic_mode) |
1241 |
– |
Mac2Host_memcpy(the_buffer, 0x3fa700, VideoMonitor.bytes_per_row * VideoMonitor.y); |
1242 |
– |
|
1823 |
|
// Incremental update code |
1824 |
|
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
1825 |
< |
int bytes_per_row = VideoMonitor.bytes_per_row; |
1826 |
< |
int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x; |
1825 |
> |
int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
1826 |
> |
int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
1827 |
|
uint8 *p, *p2; |
1828 |
|
|
1829 |
|
// Check for first line from top and first line from bottom that have changed |
1830 |
|
y1 = 0; |
1831 |
< |
for (j=0; j<VideoMonitor.y; j++) { |
1831 |
> |
for (j=0; j<VideoMonitor.mode.y; j++) { |
1832 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
1833 |
|
y1 = j; |
1834 |
|
break; |
1835 |
|
} |
1836 |
|
} |
1837 |
|
y2 = y1 - 1; |
1838 |
< |
for (j=VideoMonitor.y-1; j>=y1; j--) { |
1838 |
> |
for (j=VideoMonitor.mode.y-1; j>=y1; j--) { |
1839 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
1840 |
|
y2 = j; |
1841 |
|
break; |
1845 |
|
|
1846 |
|
// Check for first column from left and first column from right that have changed |
1847 |
|
if (high) { |
1848 |
< |
if (depth == 1) { |
1849 |
< |
x1 = VideoMonitor.x; |
1848 |
> |
if (VideoMonitor.mode.depth == VDEPTH_1BIT) { |
1849 |
> |
x1 = VideoMonitor.mode.x - 1; |
1850 |
|
for (j=y1; j<=y2; j++) { |
1851 |
|
p = &the_buffer[j * bytes_per_row]; |
1852 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1855 |
|
x1 = i << 3; |
1856 |
|
break; |
1857 |
|
} |
1858 |
< |
p++; |
1279 |
< |
p2++; |
1858 |
> |
p++; p2++; |
1859 |
|
} |
1860 |
|
} |
1861 |
|
x2 = x1; |
1864 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1865 |
|
p += bytes_per_row; |
1866 |
|
p2 += bytes_per_row; |
1867 |
< |
for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) { |
1868 |
< |
p--; |
1290 |
< |
p2--; |
1867 |
> |
for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) { |
1868 |
> |
p--; p2--; |
1869 |
|
if (*p != *p2) { |
1870 |
< |
x2 = i << 3; |
1870 |
> |
x2 = (i << 3) + 7; |
1871 |
|
break; |
1872 |
|
} |
1873 |
|
} |
1874 |
|
} |
1875 |
< |
wide = x2 - x1; |
1875 |
> |
wide = x2 - x1 + 1; |
1876 |
|
|
1877 |
|
// Update copy of the_buffer |
1878 |
|
if (high && wide) { |
1879 |
|
for (j=y1; j<=y2; j++) { |
1880 |
|
i = j * bytes_per_row + (x1 >> 3); |
1881 |
< |
memcpy(&the_buffer_copy[i], &the_buffer[i], wide >> 3); |
1881 |
> |
memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3); |
1882 |
|
} |
1883 |
|
} |
1884 |
|
|
1885 |
|
} else { |
1886 |
< |
x1 = VideoMonitor.x; |
1886 |
> |
x1 = VideoMonitor.mode.x; |
1887 |
|
for (j=y1; j<=y2; j++) { |
1888 |
|
p = &the_buffer[j * bytes_per_row]; |
1889 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1890 |
< |
for (i=0; i<x1; i++) { |
1891 |
< |
if (memcmp(p, p2, bytes_per_pixel)) { |
1892 |
< |
x1 = i; |
1890 |
> |
for (i=0; i<x1*bytes_per_pixel; i++) { |
1891 |
> |
if (*p != *p2) { |
1892 |
> |
x1 = i / bytes_per_pixel; |
1893 |
|
break; |
1894 |
|
} |
1895 |
< |
p += bytes_per_pixel; |
1318 |
< |
p2 += bytes_per_pixel; |
1895 |
> |
p++; p2++; |
1896 |
|
} |
1897 |
|
} |
1898 |
|
x2 = x1; |
1901 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1902 |
|
p += bytes_per_row; |
1903 |
|
p2 += bytes_per_row; |
1904 |
< |
for (i=VideoMonitor.x; i>x2; i--) { |
1905 |
< |
p -= bytes_per_pixel; |
1906 |
< |
p2 -= bytes_per_pixel; |
1907 |
< |
if (memcmp(p, p2, bytes_per_pixel)) { |
1908 |
< |
x2 = i; |
1904 |
> |
for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
1905 |
> |
p--; |
1906 |
> |
p2--; |
1907 |
> |
if (*p != *p2) { |
1908 |
> |
x2 = i / bytes_per_pixel; |
1909 |
|
break; |
1910 |
|
} |
1911 |
|
} |
1916 |
|
if (high && wide) { |
1917 |
|
for (j=y1; j<=y2; j++) { |
1918 |
|
i = j * bytes_per_row + x1 * bytes_per_pixel; |
1919 |
< |
memcpy(&the_buffer_copy[i], &the_buffer[i], bytes_per_pixel * wide); |
1919 |
> |
memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide); |
1920 |
|
} |
1921 |
|
} |
1922 |
|
} |
1924 |
|
|
1925 |
|
// Refresh display |
1926 |
|
if (high && wide) { |
1927 |
< |
if (have_shm) |
1928 |
< |
XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0); |
1927 |
> |
if (drv->have_shm) |
1928 |
> |
XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0); |
1929 |
|
else |
1930 |
< |
XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high); |
1354 |
< |
} |
1355 |
< |
|
1356 |
< |
// Has the Mac started? (cursor data is not valid otherwise) |
1357 |
< |
if (HasMacStarted()) { |
1358 |
< |
|
1359 |
< |
// Set new cursor image if it was changed |
1360 |
< |
if (memcmp(the_cursor, Mac2HostAddr(0x844), 64)) { |
1361 |
< |
Mac2Host_memcpy(the_cursor, 0x844, 64); |
1362 |
< |
memcpy(cursor_image->data, the_cursor, 32); |
1363 |
< |
memcpy(cursor_mask_image->data, the_cursor+32, 32); |
1364 |
< |
XFreeCursor(x_display, mac_cursor); |
1365 |
< |
XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16); |
1366 |
< |
XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16); |
1367 |
< |
mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, ReadMacInt8(0x885), ReadMacInt8(0x887)); |
1368 |
< |
XDefineCursor(x_display, the_win, mac_cursor); |
1369 |
< |
} |
1930 |
> |
XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high); |
1931 |
|
} |
1932 |
|
} |
1933 |
|
|
1934 |
|
|
1935 |
|
/* |
1936 |
< |
* Thread for screen refresh, input handling etc. |
1936 |
> |
* Screen refresh functions |
1937 |
|
*/ |
1938 |
|
|
1939 |
< |
static void *redraw_func(void *arg) |
1939 |
> |
// We suggest the compiler to inline the next two functions so that it |
1940 |
> |
// may specialise the code according to the current screen depth and |
1941 |
> |
// display type. A clever compiler would do that job by itself though... |
1942 |
> |
|
1943 |
> |
// NOTE: update_display_vosf is inlined too |
1944 |
> |
|
1945 |
> |
static inline void possibly_quit_dga_mode() |
1946 |
|
{ |
1947 |
< |
int tick_counter = 0; |
1947 |
> |
// Quit DGA mode if requested |
1948 |
> |
if (quit_full_screen) { |
1949 |
> |
quit_full_screen = false; |
1950 |
> |
delete drv; |
1951 |
> |
drv = NULL; |
1952 |
> |
} |
1953 |
> |
} |
1954 |
|
|
1955 |
< |
while (!redraw_thread_cancel) { |
1955 |
> |
static inline void handle_palette_changes(void) |
1956 |
> |
{ |
1957 |
> |
LOCK_PALETTE; |
1958 |
|
|
1959 |
< |
// Wait |
1960 |
< |
#ifdef HAVE_NANOSLEEP |
1961 |
< |
struct timespec req = {0, 16666667}; |
1962 |
< |
nanosleep(&req, NULL); |
1388 |
< |
#else |
1389 |
< |
usleep(16667); |
1390 |
< |
#endif |
1959 |
> |
if (palette_changed) { |
1960 |
> |
palette_changed = false; |
1961 |
> |
drv->update_palette(); |
1962 |
> |
} |
1963 |
|
|
1964 |
< |
#if ENABLE_XF86_DGA |
1965 |
< |
// Quit DGA mode if requested |
1966 |
< |
if (quit_full_screen) { |
1967 |
< |
quit_full_screen = false; |
1968 |
< |
if (display_type == DISPLAY_DGA) { |
1969 |
< |
XF86DGADirectVideo(x_display, screen, 0); |
1970 |
< |
XUngrabPointer(x_display, CurrentTime); |
1971 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
1972 |
< |
XUnmapWindow(x_display, the_win); |
1973 |
< |
XSync(x_display, false); |
1974 |
< |
} |
1964 |
> |
UNLOCK_PALETTE; |
1965 |
> |
} |
1966 |
> |
|
1967 |
> |
static void video_refresh_dga(void) |
1968 |
> |
{ |
1969 |
> |
// Quit DGA mode if requested |
1970 |
> |
possibly_quit_dga_mode(); |
1971 |
> |
|
1972 |
> |
// Handle X events |
1973 |
> |
handle_events(); |
1974 |
> |
|
1975 |
> |
// Handle palette changes |
1976 |
> |
handle_palette_changes(); |
1977 |
> |
} |
1978 |
> |
|
1979 |
> |
#ifdef ENABLE_VOSF |
1980 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
1981 |
> |
static void video_refresh_dga_vosf(void) |
1982 |
> |
{ |
1983 |
> |
// Quit DGA mode if requested |
1984 |
> |
possibly_quit_dga_mode(); |
1985 |
> |
|
1986 |
> |
// Handle X events |
1987 |
> |
handle_events(); |
1988 |
> |
|
1989 |
> |
// Handle palette changes |
1990 |
> |
handle_palette_changes(); |
1991 |
> |
|
1992 |
> |
// Update display (VOSF variant) |
1993 |
> |
static int tick_counter = 0; |
1994 |
> |
if (++tick_counter >= frame_skip) { |
1995 |
> |
tick_counter = 0; |
1996 |
> |
if (mainBuffer.dirty) { |
1997 |
> |
LOCK_VOSF; |
1998 |
> |
update_display_dga_vosf(); |
1999 |
> |
UNLOCK_VOSF; |
2000 |
|
} |
2001 |
+ |
} |
2002 |
+ |
} |
2003 |
|
#endif |
2004 |
|
|
2005 |
< |
#if ENABLE_FBDEV_DGA |
2006 |
< |
// Quit DGA mode if requested |
2007 |
< |
if (quit_full_screen) { |
2008 |
< |
quit_full_screen = false; |
2009 |
< |
if (display_type == DISPLAY_DGA) { |
2010 |
< |
XUngrabPointer(x_display, CurrentTime); |
2011 |
< |
XUngrabKeyboard(x_display, CurrentTime); |
2012 |
< |
XUnmapWindow(x_display, the_win); |
2013 |
< |
XSync(x_display, false); |
2014 |
< |
} |
2005 |
> |
static void video_refresh_window_vosf(void) |
2006 |
> |
{ |
2007 |
> |
// Quit DGA mode if requested |
2008 |
> |
possibly_quit_dga_mode(); |
2009 |
> |
|
2010 |
> |
// Handle X events |
2011 |
> |
handle_events(); |
2012 |
> |
|
2013 |
> |
// Handle palette changes |
2014 |
> |
handle_palette_changes(); |
2015 |
> |
|
2016 |
> |
// Update display (VOSF variant) |
2017 |
> |
static int tick_counter = 0; |
2018 |
> |
if (++tick_counter >= frame_skip) { |
2019 |
> |
tick_counter = 0; |
2020 |
> |
if (mainBuffer.dirty) { |
2021 |
> |
LOCK_VOSF; |
2022 |
> |
update_display_window_vosf(static_cast<driver_window *>(drv)); |
2023 |
> |
UNLOCK_VOSF; |
2024 |
> |
XSync(x_display, false); // Let the server catch up |
2025 |
|
} |
2026 |
< |
#endif |
2027 |
< |
// Handle X events |
2028 |
< |
handle_events(); |
2026 |
> |
} |
2027 |
> |
} |
2028 |
> |
#endif // def ENABLE_VOSF |
2029 |
|
|
2030 |
< |
// Handle palette changes |
2031 |
< |
pthread_mutex_lock(&palette_lock); |
2032 |
< |
if (palette_changed) { |
2033 |
< |
palette_changed = false; |
2034 |
< |
if (depth == 8) { |
2035 |
< |
XStoreColors(x_display, cmap[0], palette, 256); |
2036 |
< |
XStoreColors(x_display, cmap[1], palette, 256); |
2037 |
< |
|
2038 |
< |
#if ENABLE_XF86_DGA |
2039 |
< |
if (display_type == DISPLAY_DGA) { |
2040 |
< |
current_dga_cmap ^= 1; |
2041 |
< |
XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); |
2042 |
< |
} |
2030 |
> |
static void video_refresh_window_static(void) |
2031 |
> |
{ |
2032 |
> |
// Handle X events |
2033 |
> |
handle_events(); |
2034 |
> |
|
2035 |
> |
// Handle_palette changes |
2036 |
> |
handle_palette_changes(); |
2037 |
> |
|
2038 |
> |
// Update display (static variant) |
2039 |
> |
static int tick_counter = 0; |
2040 |
> |
if (++tick_counter >= frame_skip) { |
2041 |
> |
tick_counter = 0; |
2042 |
> |
update_display_static(static_cast<driver_window *>(drv)); |
2043 |
> |
} |
2044 |
> |
} |
2045 |
> |
|
2046 |
> |
static void video_refresh_window_dynamic(void) |
2047 |
> |
{ |
2048 |
> |
// Handle X events |
2049 |
> |
handle_events(); |
2050 |
> |
|
2051 |
> |
// Handle_palette changes |
2052 |
> |
handle_palette_changes(); |
2053 |
> |
|
2054 |
> |
// Update display (dynamic variant) |
2055 |
> |
static int tick_counter = 0; |
2056 |
> |
tick_counter++; |
2057 |
> |
update_display_dynamic(tick_counter, static_cast<driver_window *>(drv)); |
2058 |
> |
} |
2059 |
> |
|
2060 |
> |
|
2061 |
> |
/* |
2062 |
> |
* Thread for screen refresh, input handling etc. |
2063 |
> |
*/ |
2064 |
> |
|
2065 |
> |
static void VideoRefreshInit(void) |
2066 |
> |
{ |
2067 |
> |
// TODO: set up specialised 8bpp VideoRefresh handlers ? |
2068 |
> |
if (display_type == DISPLAY_DGA) { |
2069 |
> |
#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING) |
2070 |
> |
if (use_vosf) |
2071 |
> |
video_refresh = video_refresh_dga_vosf; |
2072 |
> |
else |
2073 |
|
#endif |
2074 |
< |
} |
2075 |
< |
} |
2076 |
< |
pthread_mutex_unlock(&palette_lock); |
2074 |
> |
video_refresh = video_refresh_dga; |
2075 |
> |
} |
2076 |
> |
else { |
2077 |
> |
#ifdef ENABLE_VOSF |
2078 |
> |
if (use_vosf) |
2079 |
> |
video_refresh = video_refresh_window_vosf; |
2080 |
> |
else |
2081 |
> |
#endif |
2082 |
> |
if (frame_skip == 0) |
2083 |
> |
video_refresh = video_refresh_window_dynamic; |
2084 |
> |
else |
2085 |
> |
video_refresh = video_refresh_window_static; |
2086 |
> |
} |
2087 |
> |
} |
2088 |
|
|
2089 |
< |
// In window mode, update display and mouse pointer |
2090 |
< |
if (display_type == DISPLAY_WINDOW) { |
2091 |
< |
tick_counter++; |
2092 |
< |
if (tick_counter >= frame_skip) { |
2093 |
< |
tick_counter = 0; |
2094 |
< |
update_display(); |
2095 |
< |
} |
2096 |
< |
} |
2089 |
> |
void VideoRefresh(void) |
2090 |
> |
{ |
2091 |
> |
// We need to check redraw_thread_active to inhibit refreshed during |
2092 |
> |
// mode changes on non-threaded platforms |
2093 |
> |
if (redraw_thread_active) |
2094 |
> |
video_refresh(); |
2095 |
> |
} |
2096 |
> |
|
2097 |
> |
#ifdef HAVE_PTHREADS |
2098 |
> |
static void *redraw_func(void *arg) |
2099 |
> |
{ |
2100 |
> |
uint64 start = GetTicks_usec(); |
2101 |
> |
int64 ticks = 0; |
2102 |
> |
uint64 next = GetTicks_usec(); |
2103 |
> |
while (!redraw_thread_cancel) { |
2104 |
> |
video_refresh(); |
2105 |
> |
next += 16667; |
2106 |
> |
int64 delay = next - GetTicks_usec(); |
2107 |
> |
if (delay > 0) |
2108 |
> |
Delay_usec(delay); |
2109 |
> |
else if (delay < -16667) |
2110 |
> |
next = GetTicks_usec(); |
2111 |
> |
ticks++; |
2112 |
|
} |
2113 |
+ |
uint64 end = GetTicks_usec(); |
2114 |
+ |
// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start)); |
2115 |
|
return NULL; |
2116 |
|
} |
2117 |
+ |
#endif |