ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/AmigaOS/video_amiga.cpp

Comparing BasiliskII/src/AmigaOS/video_amiga.cpp (file contents):
Revision 1.22 by cebix, 2002-01-15T14:58:34Z vs.
Revision 1.27 by gbeauche, 2005-01-30T21:42:13Z

#	Line 1 | Line 1
1		/*
2		*  video_amiga.cpp - Video/graphics emulation, AmigaOS specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2002 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 25 | Line 25
25		#include <cybergraphics/cybergraphics.h>
26		#include <dos/dostags.h>
27		#include <devices/timer.h>
28	+	#define __USE_SYSBASE
29		#include <proto/exec.h>
30		#include <proto/dos.h>
31		#include <proto/intuition.h>
32		#include <proto/graphics.h>
33		#include <proto/Picasso96.h>
34		#include <proto/cybergraphics.h>
35	+	#include <inline/exec.h>
36	+	#include <inline/dos.h>
37	+	#include <inline/intuition.h>
38	+	#include <inline/Picasso96.h>
39	+	#include <inline/cybergraphics.h>
40
41		#include "sysdeps.h"
42		#include "cpu_emulation.h"
#	Line 44 | Line 50
50		#include "debug.h"
51
52
53	+	// Supported video modes
54	+	static vector<video_mode> VideoModes;
55	+
56		// Display types
57		enum {
58		DISPLAY_WINDOW,
#	Line 54 | Line 63 | enum {
63
64		// Global variables
65		static int32 frame_skip;
66	<	static int display_type = DISPLAY_WINDOW;               // See enum above
67	<	static struct Screen *the_screen = NULL;
68	<	static struct Window *the_win = NULL;
60	<	static struct BitMap *the_bitmap = NULL;
61	<	static UWORD *null_pointer = NULL;                              // Blank mouse pointer data
62	<	static UWORD *current_pointer = (UWORD *)-1;    // Currently visible mouse pointer data
63	<	static LONG black_pen = -1, white_pen = -1;
64	<	static struct Process *periodic_proc = NULL;    // Periodic process
65	<	static int window_width, window_height;         // width and height for window display
66	<	static ULONG screen_mode_id;                    // mode ID for screen display
66	>	static UWORD *null_pointer = NULL;                      // Blank mouse pointer data
67	>	static UWORD *current_pointer = (UWORD *)-1;            // Currently visible mouse pointer data
68	>	static struct Process *periodic_proc = NULL;            // Periodic process
69
70	<	extern struct Task *MainTask;                                   // Pointer to main task (from main_amiga.cpp)
70	>	extern struct Task *MainTask;                           // Pointer to main task (from main_amiga.cpp)
71
72
73		// Amiga -> Mac raw keycode translation table
#	Line 89 | Line 91 | static const uint8 keycode2mac[0x80] = {
91		};
92
93
94	<	// Prototypes
95	<	static bool video_open(const video_mode &mode);
96	<	static void video_close();
97	<	static void periodic_func(void);
98	<	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth);
99	<	static void add_modes(uint32 width, uint32 height, video_depth depth);
100	<	static ULONG find_mode_for_depth(uint32 width, uint32 height, uint32 depth);
101	<	static ULONG bits_from_depth(video_depth depth);
102	<	static bool is_valid_modeid(int display_type, ULONG mode_id);
103	<	static bool check_modeid_p96(ULONG mode_id);
104	<	static bool check_modeid_cgfx(ULONG mode_id);
94	>	class Amiga_monitor_desc : public monitor_desc {
95	>	public:
96	>	Amiga_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id, int default_display_type)
97	>	:  monitor_desc(available_modes, default_depth, default_id), display_type(default_display_type) {};
98	>	~Amiga_monitor_desc() {};
99	>
100	>	virtual void switch_to_current_mode(void);
101	>	virtual void set_palette(uint8 *pal, int num);
102	>
103	>	bool video_open(void);
104	>	void video_close(void);
105	>	public:
106	>	int display_type;               // See enum above
107	>	};
108
109
110		/*
111	<	*  Initialization
111	>	*  Display "driver" classes
112		*/
113
114	+	class driver_base {
115	+	public:
116	+	driver_base(Amiga_monitor_desc &m);
117	+	virtual ~driver_base();
118	+
119	+	virtual void set_palette(uint8 *pal, int num) {};
120	+	virtual struct BitMap *get_bitmap() { return NULL; };
121	+	public:
122	+	Amiga_monitor_desc &monitor;    // Associated video monitor
123	+	const video_mode &mode;         // Video mode handled by the driver
124	+	BOOL init_ok;                   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
125	+	struct Window *the_win;
126	+	};
127
110	–	// Open window
111	–	static bool init_window(int width, int height)
112	–	{
113	–	// Set absolute mouse mode
114	–	ADBSetRelMouseMode(false);
115	–
116	–	// Open window
117	–	the_win = OpenWindowTags(NULL,
118	–	WA_Left, 0, WA_Top, 0,
119	–	WA_InnerWidth, width, WA_InnerHeight, height,
120	–	WA_SimpleRefresh, TRUE,
121	–	WA_NoCareRefresh, TRUE,
122	–	WA_Activate, TRUE,
123	–	WA_RMBTrap, TRUE,
124	–	WA_ReportMouse, TRUE,
125	–	WA_DragBar, TRUE,
126	–	WA_DepthGadget, TRUE,
127	–	WA_SizeGadget, FALSE,
128	–	WA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
129	–	TAG_END
130	–	);
131	–	if (the_win == NULL) {
132	–	ErrorAlert(STR_OPEN_WINDOW_ERR);
133	–	return false;
134	–	}
135	–
136	–	// Create bitmap ("height + 2" for safety)
137	–	the_bitmap = AllocBitMap(width, height + 2, 1, BMF_CLEAR, NULL);
138	–	if (the_bitmap == NULL) {
139	–	ErrorAlert(STR_NO_MEM_ERR);
140	–	return false;
141	–	}
142	–
143	–	// Add resolution and set VideoMonitor
144	–	VideoMonitor.mac_frame_base = (uint32)the_bitmap->Planes[0];
145	–
146	–	// Set FgPen and BgPen
147	–	black_pen = ObtainBestPenA(the_win->WScreen->ViewPort.ColorMap, 0, 0, 0, NULL);
148	–	white_pen = ObtainBestPenA(the_win->WScreen->ViewPort.ColorMap, 0xffffffff, 0xffffffff, 0xffffffff, NULL);
149	–	SetAPen(the_win->RPort, black_pen);
150	–	SetBPen(the_win->RPort, white_pen);
151	–	SetDrMd(the_win->RPort, JAM2);
152	–	return true;
153	–	}
154	–
155	–	// Open PIP (requires Picasso96)
156	–	static bool init_pip(int width, int height)
157	–	{
158	–	// Set absolute mouse mode
159	–	ADBSetRelMouseMode(false);
160	–
161	–	// Open window
162	–	ULONG error = 0;
163	–	the_win = p96PIP_OpenTags(
164	–	P96PIP_SourceFormat, RGBFB_R5G5B5,
165	–	P96PIP_SourceWidth, width,
166	–	P96PIP_SourceHeight, height,
167	–	P96PIP_ErrorCode, (ULONG)&error,
168	–	WA_Left, 0, WA_Top, 0,
169	–	WA_InnerWidth, width, WA_InnerHeight, height,
170	–	WA_SimpleRefresh, TRUE,
171	–	WA_NoCareRefresh, TRUE,
172	–	WA_Activate, TRUE,
173	–	WA_RMBTrap, TRUE,
174	–	WA_ReportMouse, TRUE,
175	–	WA_DragBar, TRUE,
176	–	WA_DepthGadget, TRUE,
177	–	WA_SizeGadget, FALSE,
178	–	WA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
179	–	WA_PubScreenName, (ULONG)"Workbench",
180	–	TAG_END
181	–	);
182	–	if (the_win == NULL || error) {
183	–	ErrorAlert(STR_OPEN_WINDOW_ERR);
184	–	return false;
185	–	}
186	–
187	–	// Find bitmap
188	–	p96PIP_GetTags(the_win, P96PIP_SourceBitMap, (ULONG)&the_bitmap, TAG_END);
189	–
190	–	// Add resolution and set VideoMonitor
191	–	VideoMonitor.mac_frame_base = p96GetBitMapAttr(the_bitmap, P96BMA_MEMORY);
128
129	<	return true;
130	<	}
129	>	class driver_window : public driver_base {
130	>	public:
131	>	driver_window(Amiga_monitor_desc &m, int width, int height);
132	>	~driver_window();
133	>
134	>	struct BitMap *get_bitmap() { return the_bitmap; };
135	>
136	>	private:
137	>	LONG black_pen, white_pen;
138	>	struct BitMap *the_bitmap;
139	>	};
140
141	<	// Open Picasso96 screen
142	<	static bool init_screen_p96(ULONG mode_id)
143	<	{
144	<	// Set relative mouse mode
200	<	ADBSetRelMouseMode(true);
141	>	class driver_pip : public driver_base {
142	>	public:
143	>	driver_pip(Amiga_monitor_desc &m, int width, int height);
144	>	~driver_pip();
145
146	<	// Check if the mode is one we can handle
203	<	if (!check_modeid_p96(mode_id))
204	<	{
205	<	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
206	<	return false;
207	<	}
146	>	struct BitMap *get_bitmap() { return the_bitmap; };
147
148	<	// Yes, get width and height
149	<	uint32 depth = p96GetModeIDAttr(mode_id, P96IDA_DEPTH);
150	<	uint32 width = p96GetModeIDAttr(mode_id, P96IDA_WIDTH);
212	<	uint32 height = p96GetModeIDAttr(mode_id, P96IDA_HEIGHT);
148	>	private:
149	>	struct BitMap *the_bitmap;
150	>	};
151
152	<	// Open screen
153	<	the_screen = p96OpenScreenTags(
154	<	P96SA_DisplayID, mode_id,
155	<	P96SA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
218	<	P96SA_Quiet, TRUE,
219	<	P96SA_NoMemory, TRUE,
220	<	P96SA_NoSprite, TRUE,
221	<	P96SA_Exclusive, TRUE,
222	<	TAG_END
223	<	);
224	<	if (the_screen == NULL) {
225	<	ErrorAlert(STR_OPEN_SCREEN_ERR);
226	<	return false;
227	<	}
152	>	class driver_screen_p96 : public driver_base {
153	>	public:
154	>	driver_screen_p96(Amiga_monitor_desc &m, ULONG mode_id);
155	>	~driver_screen_p96();
156
157	<	// Open window
230	<	the_win = OpenWindowTags(NULL,
231	<	WA_Left, 0, WA_Top, 0,
232	<	WA_Width, width, WA_Height, height,
233	<	WA_SimpleRefresh, TRUE,
234	<	WA_NoCareRefresh, TRUE,
235	<	WA_Borderless, TRUE,
236	<	WA_Activate, TRUE,
237	<	WA_RMBTrap, TRUE,
238	<	WA_ReportMouse, TRUE,
239	<	WA_CustomScreen, (ULONG)the_screen,
240	<	TAG_END
241	<	);
242	<	if (the_win == NULL) {
243	<	ErrorAlert(STR_OPEN_WINDOW_ERR);
244	<	return false;
245	<	}
157	>	void set_palette(uint8 *pal, int num);
158
159	<	ScreenToFront(the_screen);
159	>	private:
160	>	struct Screen *the_screen;
161	>	};
162
163	<	// Add resolution and set VideoMonitor
164	<	VideoMonitor.mac_frame_base = p96GetBitMapAttr(the_screen->RastPort.BitMap, P96BMA_MEMORY);
163	>	class driver_screen_cgfx : public driver_base {
164	>	public:
165	>	driver_screen_cgfx(Amiga_monitor_desc &m, ULONG mode_id);
166	>	~driver_screen_cgfx();
167
168	<	return true;
253	<	}
168	>	void set_palette(uint8 *pal, int num);
169
170	<	// Open CyberGraphX screen
171	<	static bool init_screen_cgfx(ULONG mode_id)
172	<	{
258	<	// Set relative mouse mode
259	<	ADBSetRelMouseMode(true);
170	>	private:
171	>	struct Screen *the_screen;
172	>	};
173
261	–	// Check if the mode is one we can handle
262	–	if (!check_modeid_cgfx(mode_id))
263	–	{
264	–	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
265	–	return false;
266	–	}
174
175	<	// Yes, get width and height
269	<	uint32 depth = GetCyberIDAttr(CYBRIDATTR_DEPTH, mode_id);
270	<	uint32 width = GetCyberIDAttr(CYBRIDATTR_WIDTH, mode_id);
271	<	uint32 height = GetCyberIDAttr(CYBRIDATTR_HEIGHT, mode_id);
175	>	static driver_base *drv = NULL; // Pointer to currently used driver object
176
273	–	// Open screen
274	–	the_screen = OpenScreenTags(NULL,
275	–	SA_DisplayID, mode_id,
276	–	SA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
277	–	SA_Quiet, TRUE,
278	–	SA_Exclusive, TRUE,
279	–	TAG_END
280	–	);
281	–	if (the_screen == NULL) {
282	–	ErrorAlert(STR_OPEN_SCREEN_ERR);
283	–	return false;
284	–	}
177
286	–	// Open window
287	–	the_win = OpenWindowTags(NULL,
288	–	WA_Left, 0, WA_Top, 0,
289	–	WA_Width, width, WA_Height, height,
290	–	WA_SimpleRefresh, TRUE,
291	–	WA_NoCareRefresh, TRUE,
292	–	WA_Borderless, TRUE,
293	–	WA_Activate, TRUE,
294	–	WA_RMBTrap, TRUE,
295	–	WA_ReportMouse, TRUE,
296	–	WA_CustomScreen, (ULONG)the_screen,
297	–	TAG_END
298	–	);
299	–	if (the_win == NULL) {
300	–	ErrorAlert(STR_OPEN_WINDOW_ERR);
301	–	return false;
302	–	}
178
179	<	ScreenToFront(the_screen);
180	<	static UWORD ptr[] = { 0, 0, 0, 0 };
181	<	SetPointer(the_win, ptr, 0, 0, 0, 0);   // Hide mouse pointer
179	>	// Prototypes
180	>	static void periodic_func(void);
181	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth);
182	>	static void add_modes(uint32 width, uint32 height, video_depth depth);
183	>	static ULONG find_mode_for_depth(uint32 width, uint32 height, uint32 depth);
184	>	static ULONG bits_from_depth(video_depth depth);
185	>	static bool is_valid_modeid(int display_type, ULONG mode_id);
186	>	static bool check_modeid_p96(ULONG mode_id);
187	>	static bool check_modeid_cgfx(ULONG mode_id);
188
308	–	// Set VideoMonitor
309	–	ULONG frame_base;
310	–	APTR handle = LockBitMapTags(the_screen->RastPort.BitMap,
311	–	LBMI_BASEADDRESS, (ULONG)&frame_base,
312	–	TAG_END
313	–	);
314	–	UnLockBitMap(handle);
189
190	<	VideoMonitor.mac_frame_base = frame_base;
190	>	/*
191	>	*  Initialization
192	>	*/
193
318	–	return true;
319	–	}
194
195		bool VideoInit(bool classic)
196		{
197	<	int default_width, default_height, default_depth;
197	>	video_depth default_depth = VDEPTH_1BIT;
198	>	int default_width, default_height;
199	>	int default_display_type = DISPLAY_WINDOW;
200	>	int window_width, window_height;                        // width and height for window display
201	>	ULONG screen_mode_id;                           // mode ID for screen display
202
203		// Allocate blank mouse pointer data
204		null_pointer = (UWORD *)AllocMem(12, MEMF_PUBLIC | MEMF_CHIP | MEMF_CLEAR);
#	Line 341 | Line 219 | bool VideoInit(bool classic)
219		else
220		mode_str = PrefsFindString("screen");
221
344	–	// Determine type and mode
345	–	display_type = DISPLAY_WINDOW;
346	–
222		default_width = window_width = 512;
223		default_height = window_height = 384;
224
225		if (mode_str) {
226		if (sscanf(mode_str, "win/%d/%d", &window_width, &window_height) == 2)
227	<	display_type = DISPLAY_WINDOW;
227	>	default_display_type = DISPLAY_WINDOW;
228		else if (sscanf(mode_str, "pip/%d/%d", &window_width, &window_height) == 2 && P96Base)
229	<	display_type = DISPLAY_PIP;
229	>	default_display_type = DISPLAY_PIP;
230		else if (sscanf(mode_str, "scr/%08lx", &screen_mode_id) == 1 && (CyberGfxBase || P96Base)) {
231		if (P96Base && p96GetModeIDAttr(screen_mode_id, P96IDA_ISP96))
232	<	display_type = DISPLAY_SCREEN_P96;
232	>	default_display_type = DISPLAY_SCREEN_P96;
233		else if (CyberGfxBase && IsCyberModeID(screen_mode_id))
234	<	display_type = DISPLAY_SCREEN_CGFX;
234	>	default_display_type = DISPLAY_SCREEN_CGFX;
235		else {
236		ErrorAlert(STR_NO_P96_MODE_ERR);
237		return false;
#	Line 364 | Line 239 | bool VideoInit(bool classic)
239		}
240		}
241
242	+	D(bug("default_display_type %d, window_width %d, window_height %d\n", default_display_type, window_width, window_height));
243	+
244		// Construct list of supported modes
245	<	switch (display_type) {
245	>	switch (default_display_type) {
246		case DISPLAY_WINDOW:
247		default_width = window_width;
248		default_height = window_height;
249	<	default_depth = 1;
249	>	default_depth = VDEPTH_1BIT;
250		add_modes(window_width, window_height, VDEPTH_1BIT);
251		break;
252
253		case DISPLAY_PIP:
377	–	default_depth = 16;
254		default_width = window_width;
255		default_height = window_height;
256	+	default_depth = VDEPTH_16BIT;
257		add_modes(window_width, window_height, VDEPTH_16BIT);
258		break;
259
#	Line 385 | Line 262 | bool VideoInit(bool classic)
262		struct DimensionInfo dimInfo;
263		DisplayInfoHandle handle = FindDisplayInfo(screen_mode_id);
264
265	<	if (NULL == handle)
265	>	if (handle == NULL)
266		return false;
267
268		if (GetDisplayInfoData(handle, (UBYTE *) &dimInfo, sizeof(dimInfo), DTAG_DIMS, 0) <= 0)
#	Line 393 | Line 270 | bool VideoInit(bool classic)
270
271		default_width = 1 + dimInfo.Nominal.MaxX - dimInfo.Nominal.MinX;
272		default_height = 1 + dimInfo.Nominal.MaxY - dimInfo.Nominal.MinY;
396	–	default_depth = dimInfo.MaxDepth;
273
274	<	for (unsigned d=VDEPTH_8BIT; d<=VDEPTH_32BIT; d++)
275	<	{
274	>	switch (dimInfo.MaxDepth) {
275	>	case 1:
276	>	default_depth = VDEPTH_1BIT;
277	>	break;
278	>	case 8:
279	>	default_depth = VDEPTH_8BIT;
280	>	break;
281	>	case 15:
282	>	case 16:
283	>	default_depth = VDEPTH_16BIT;
284	>	break;
285	>	case 24:
286	>	case 32:
287	>	default_depth = VDEPTH_32BIT;
288	>	break;
289	>	}
290	>
291	>	for (unsigned d=VDEPTH_8BIT; d<=VDEPTH_32BIT; d++) {
292		ULONG mode_id = find_mode_for_depth(default_width, default_height, bits_from_depth(video_depth(d)));
293
294	<	if (is_valid_modeid(display_type, mode_id))
403	<	{
294	>	if (is_valid_modeid(default_display_type, mode_id))
295		add_modes(default_width, default_height, video_depth(d));
296	<	}
406	<	}
296	>	}
297		break;
298		}
299
410	–	video_init_depth_list();
411	–
300		#if DEBUG
301		bug("Available video modes:\n");
302		vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
303		while (i != end) {
304	<	bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits_from_depth(i->depth));
304	>	bug(" %ld x %ld (ID %02lx), %ld colors\n", i->x, i->y, i->resolution_id, 1 << bits_from_depth(i->depth));
305		++i;
306		}
307		#endif
308
309	<	D(bug("VideoInit: def_width=%ld  def_height=%ld  def_depth=%ld\n", default_width, default_height, default_depth));
309	>	D(bug("VideoInit/%ld: def_width=%ld  def_height=%ld  def_depth=%ld\n", \
310	>	__LINE__, default_width, default_height, default_depth));
311
312		// Find requested default mode and open display
313	<	if (VideoModes.size() == 1)
314	<	return video_open(VideoModes[0]);
315	<	else {
313	>	if (VideoModes.size() == 1) {
314	>	uint32 default_id ;
315	>
316	>	// Create Amiga_monitor_desc for this (the only) display
317	>	default_id = VideoModes[0].resolution_id;
318	>	D(bug("VideoInit/%ld: default_id=%ld\n", __LINE__, default_id));
319	>	Amiga_monitor_desc *monitor = new Amiga_monitor_desc(VideoModes, default_depth, default_id, default_display_type);
320	>	VideoMonitors.push_back(monitor);
321	>
322	>	// Open display
323	>	return monitor->video_open();
324	>
325	>	} else {
326	>
327		// Find mode with specified dimensions
328		std::vector<video_mode>::const_iterator i, end = VideoModes.end();
329	<	for (i = VideoModes.begin(); i != end; ++i)
330	<	{
331	<	D(bug("VideoInit: w=%ld  h=%ld  d=%ld\n", i->x, i->y, bits_from_depth(i->depth)));
332	<	if (i->x == default_width && i->y == default_height && bits_from_depth(i->depth) == default_depth)
333	<	return video_open(*i);
329	>	for (i = VideoModes.begin(); i != end; ++i) {
330	>	D(bug("VideoInit/%ld: w=%ld  h=%ld  d=%ld\n", __LINE__, i->x, i->y, bits_from_depth(i->depth)));
331	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
332	>	// Create Amiga_monitor_desc for this (the only) display
333	>	uint32 default_id = i->resolution_id;
334	>	D(bug("VideoInit/%ld: default_id=%ld\n", __LINE__, default_id));
335	>	Amiga_monitor_desc *monitor = new Amiga_monitor_desc(VideoModes, default_depth, default_id, default_display_type);
336	>	VideoMonitors.push_back(monitor);
337	>
338	>	// Open display
339	>	return monitor->video_open();
340		}
341	<	return video_open(VideoModes[0]);
341	>	}
342	>
343	>	// Create Amiga_monitor_desc for this (the only) display
344	>	uint32 default_id = VideoModes[0].resolution_id;
345	>	D(bug("VideoInit/%ld: default_id=%ld\n", __LINE__, default_id));
346	>	Amiga_monitor_desc *monitor = new Amiga_monitor_desc(VideoModes, default_depth, default_id, default_display_type);
347	>	VideoMonitors.push_back(monitor);
348	>
349	>	// Open display
350	>	return monitor->video_open();
351		}
352
353		return true;
354		}
355
356
357	<	static bool video_open(const video_mode &mode)
357	>	bool Amiga_monitor_desc::video_open()
358		{
359	+	const video_mode &mode = get_current_mode();
360		ULONG depth_bits = bits_from_depth(mode.depth);
361		ULONG ID = find_mode_for_depth(mode.x, mode.y, depth_bits);
362
363	<	D(bug("video_open: width=%ld  height=%ld  depth=%ld  ID=%08lx\n", mode.x, mode.y, depth_bits, ID));
363	>	D(bug("video_open/%ld: width=%ld  height=%ld  depth=%ld  ID=%08lx\n", __LINE__, mode.x, mode.y, depth_bits, ID));
364
365	<	if (INVALID_ID == ID)
450	<	{
365	>	if (ID == INVALID_ID) {
366		ErrorAlert(STR_NO_VIDEO_MODE_ERR);
367		return false;
368	<	}
368	>	}
369
370	<	VideoMonitor.mode = mode;
370	>	D(bug("video_open/%ld: display_type=%ld\n", __LINE__, display_type));
371
372		// Open display
373		switch (display_type) {
374		case DISPLAY_WINDOW:
375	<	if (!init_window(mode.x, mode.y))
461	<	return false;
375	>	drv = new driver_window(*this, mode.x, mode.y);
376		break;
377
378		case DISPLAY_PIP:
379	<	if (!init_pip(mode.x, mode.y))
466	<	return false;
379	>	drv = new driver_pip(*this, mode.x, mode.y);
380		break;
381
382		case DISPLAY_SCREEN_P96:
383	<	if (!init_screen_p96(ID))
471	<	return false;
383	>	drv = new driver_screen_p96(*this, ID);
384		break;
385
386		case DISPLAY_SCREEN_CGFX:
387	<	if (!init_screen_cgfx(ID))
476	<	return false;
387	>	drv = new driver_screen_cgfx(*this, ID);
388		break;
389		}
390
391	+	D(bug("video_open/%ld: drv=%08lx\n", __LINE__, drv));
392	+
393	+	if (drv == NULL)
394	+	return false;
395	+
396	+	D(bug("video_open/%ld: init_ok=%ld\n", __LINE__, drv->init_ok));
397	+	if (!drv->init_ok) {
398	+	delete drv;
399	+	drv = NULL;
400	+	return false;
401	+	}
402	+
403		// Start periodic process
404		periodic_proc = CreateNewProcTags(
405		NP_Entry, (ULONG)periodic_func,
#	Line 484 | Line 407 | static bool video_open(const video_mode
407		NP_Priority, 0,
408		TAG_END
409		);
410	+
411	+	D(bug("video_open/%ld: periodic_proc=%08lx\n", __LINE__, periodic_proc));
412	+
413		if (periodic_proc == NULL) {
414		ErrorAlert(STR_NO_MEM_ERR);
415		return false;
#	Line 493 | Line 419 | static bool video_open(const video_mode
419		}
420
421
422	<	static void video_close()
422	>	void Amiga_monitor_desc::video_close()
423		{
424		// Stop periodic process
425		if (periodic_proc) {
#	Line 502 | Line 428 | static void video_close()
428		Wait(SIGF_SINGLE);
429		}
430
431	<	switch (display_type) {
432	<
507	<	case DISPLAY_WINDOW:
508	<
509	<	// Window mode, free bitmap
510	<	if (the_bitmap) {
511	<	WaitBlit();
512	<	FreeBitMap(the_bitmap);
513	<	}
514	<
515	<	// Free pens and close window
516	<	if (the_win) {
517	<	ReleasePen(the_win->WScreen->ViewPort.ColorMap, black_pen);
518	<	ReleasePen(the_win->WScreen->ViewPort.ColorMap, white_pen);
519	<
520	<	CloseWindow(the_win);
521	<	the_win = NULL;
522	<	}
523	<	break;
524	<
525	<	case DISPLAY_PIP:
526	<
527	<	// Close PIP
528	<	if (the_win)
529	<	p96PIP_Close(the_win);
530	<	break;
531	<
532	<	case DISPLAY_SCREEN_P96:
533	<
534	<	// Close window
535	<	if (the_win)
536	<	{
537	<	CloseWindow(the_win);
538	<	the_win = NULL;
539	<	}
540	<
541	<	// Close screen
542	<	if (the_screen) {
543	<	p96CloseScreen(the_screen);
544	<	the_screen = NULL;
545	<	}
546	<	break;
547	<
548	<	case DISPLAY_SCREEN_CGFX:
549	<
550	<	// Close window
551	<	if (the_win)
552	<	{
553	<	CloseWindow(the_win);
554	<	the_win = NULL;
555	<	}
556	<
557	<	// Close screen
558	<	if (the_screen) {
559	<	CloseScreen(the_screen);
560	<	the_screen = NULL;
561	<	}
562	<	break;
563	<	}
431	>	delete drv;
432	>	drv = NULL;
433
434		// Free mouse pointer
435		if (null_pointer) {
#	Line 576 | Line 445 | static void video_close()
445
446		void VideoExit(void)
447		{
448	<	video_close();
448	>	// Close displays
449	>	vector<monitor_desc *>::iterator i, end = VideoMonitors.end();
450	>	for (i = VideoMonitors.begin(); i != end; ++i)
451	>	dynamic_cast<Amiga_monitor_desc *>(*i)->video_close();
452		}
453
454
#	Line 584 | Line 456 | void VideoExit(void)
456		*  Set palette
457		*/
458
459	<	void video_set_palette(uint8 *pal, int num)
459	>	void Amiga_monitor_desc::set_palette(uint8 *pal, int num)
460		{
461	<	if ((display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX)
590	<	&& !IsDirectMode(VideoMonitor.mode)) {
591	<
592	<	// Convert palette to 32 bits
593	<	ULONG table[2 + 256 * 3];
594	<	table[0] = num << 16;
595	<	table[num * 3 + 1] = 0;
596	<	for (int i=0; i<num; i++) {
597	<	table[i*3+1] = pal[i*3] * 0x01010101;
598	<	table[i*3+2] = pal[i*3+1] * 0x01010101;
599	<	table[i*3+3] = pal[i*3+2] * 0x01010101;
600	<	}
601	<
602	<	// And load it
603	<	LoadRGB32(&the_screen->ViewPort, table);
604	<	}
461	>	drv->set_palette(pal, num);
462		}
463
464
#	Line 609 | Line 466 | void video_set_palette(uint8 *pal, int n
466		*  Switch video mode
467		*/
468
469	<	void video_switch_to_mode(const video_mode &mode)
469	>	void Amiga_monitor_desc::switch_to_current_mode()
470		{
471		// Close and reopen display
472		video_close();
473	<	if (!video_open(mode))
617	<	{
473	>	if (!video_open()) {
474		ErrorAlert(STR_OPEN_WINDOW_ERR);
475		QuitEmulator();
476	<	}
476	>	}
477		}
478
479
#	Line 650 | Line 506 | static __saveds void periodic_func(void)
506		struct IntuiMessage *msg;
507		ULONG win_mask = 0, timer_mask = 0;
508
509	+	D(bug("periodic_func/%ld: \n", __LINE__));
510	+
511		// Create message port for window and attach it
512		struct MsgPort *win_port = CreateMsgPort();
513		if (win_port) {
514		win_mask = 1 << win_port->mp_SigBit;
515	<	the_win->UserPort = win_port;
516	<	ModifyIDCMP(the_win, IDCMP_MOUSEBUTTONS | IDCMP_MOUSEMOVE | IDCMP_RAWKEY | ((display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX) ? IDCMP_DELTAMOVE : 0));
515	>	drv->the_win->UserPort = win_port;
516	>	ModifyIDCMP(drv->the_win, IDCMP_MOUSEBUTTONS | IDCMP_MOUSEMOVE | IDCMP_RAWKEY |
517	>	((drv->monitor.display_type == DISPLAY_SCREEN_P96 || drv->monitor.display_type == DISPLAY_SCREEN_CGFX) ? IDCMP_DELTAMOVE : 0));
518		}
519
520	+	D(bug("periodic_func/%ld: \n", __LINE__));
521	+
522		// Start 60Hz timer for window refresh
523	<	if (display_type == DISPLAY_WINDOW) {
523	>	if (drv->monitor.display_type == DISPLAY_WINDOW) {
524		timer_port = CreateMsgPort();
525		if (timer_port) {
526		timer_io = (struct timerequest *)CreateIORequest(timer_port, sizeof(struct timerequest));
527		if (timer_io) {
528	<	if (!OpenDevice((UBYTE *)TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timer_io, 0)) {
528	>	if (!OpenDevice((UBYTE *) TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timer_io, 0)) {
529		timer_mask = 1 << timer_port->mp_SigBit;
530		timer_io->tr_node.io_Command = TR_ADDREQUEST;
531		timer_io->tr_time.tv_secs = 0;
#	Line 675 | Line 536 | static __saveds void periodic_func(void)
536		}
537		}
538
539	+	D(bug("periodic_func/%ld: \n", __LINE__));
540	+
541		// Main loop
542		for (;;) {
543	+	const video_mode &mode = drv->monitor.get_current_mode();
544
545		// Wait for timer and/or window (CTRL_C is used for quitting the task)
546		ULONG sig = Wait(win_mask | timer_mask | SIGBREAKF_CTRL_C);
#	Line 684 | Line 548 | static __saveds void periodic_func(void)
548		if (sig & SIGBREAKF_CTRL_C)
549		break;
550
551	<	if (sig & timer_mask) {
551	>	//              D(bug("periodic_func/%ld: display_type=%ld  the_win=%08lx\n", __LINE__, drv->monitor.display_type, drv->the_win));
552
553	<	// Timer tick, update display
554	<	BltTemplate(the_bitmap->Planes[0], 0, the_bitmap->BytesPerRow, the_win->RPort,
555	<	the_win->BorderLeft, the_win->BorderTop, VideoMonitor.mode.x, VideoMonitor.mode.y);
553	>	if (sig & timer_mask) {
554	>	if (drv->get_bitmap()) {
555	>	// Timer tick, update display
556	>	BltTemplate(drv->get_bitmap()->Planes[0], 0,
557	>	drv->get_bitmap()->BytesPerRow, drv->the_win->RPort,
558	>	drv->the_win->BorderLeft, drv->the_win->BorderTop,
559	>	mode.x, mode.y);
560	>	}
561
562		// Restart timer
563		timer_io->tr_node.io_Command = TR_ADDREQUEST;
#	Line 713 | Line 582 | static __saveds void periodic_func(void)
582		// Handle message according to class
583		switch (cl) {
584		case IDCMP_MOUSEMOVE:
585	<	if (display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX)
586	<	ADBMouseMoved(mx, my);
587	<	else {
588	<	ADBMouseMoved(mx - the_win->BorderLeft, my - the_win->BorderTop);
589	<	if (mx < the_win->BorderLeft
590	<	|| my < the_win->BorderTop
591	<	|| mx >= the_win->BorderLeft + VideoMonitor.mode.x
592	<	|| my >= the_win->BorderTop + VideoMonitor.mode.y) {
593	<	if (current_pointer) {
594	<	ClearPointer(the_win);
595	<	current_pointer = NULL;
596	<	}
597	<	} else {
598	<	if (current_pointer != null_pointer) {
599	<	// Hide mouse pointer inside window
600	<	SetPointer(the_win, null_pointer, 1, 16, 0, 0);
601	<	current_pointer = null_pointer;
585	>	switch (drv->monitor.display_type) {
586	>	case DISPLAY_SCREEN_P96:
587	>	case DISPLAY_SCREEN_CGFX:
588	>	//                                                              D(bug("periodic_func/%ld: IDCMP_MOUSEMOVE mx=%ld  my=%ld\n", __LINE__, mx, my));
589	>	ADBMouseMoved(mx, my);
590	>	break;
591	>	default:
592	>	//                                                              D(bug("periodic_func/%ld: IDCMP_MOUSEMOVE mx=%ld  my=%ld\n", __LINE__, mx - drv->the_win->BorderLeft, my - drv->the_win->BorderTop));
593	>	ADBMouseMoved(mx - drv->the_win->BorderLeft, my - drv->the_win->BorderTop);
594	>	if (mx < drv->the_win->BorderLeft
595	>	|| my < drv->the_win->BorderTop
596	>	|| mx >= drv->the_win->BorderLeft + mode.x
597	>	|| my >= drv->the_win->BorderTop + mode.y) {
598	>	if (current_pointer) {
599	>	ClearPointer(drv->the_win);
600	>	current_pointer = NULL;
601	>	}
602	>	} else {
603	>	if (current_pointer != null_pointer) {
604	>	// Hide mouse pointer inside window
605	>	SetPointer(drv->the_win, null_pointer, 1, 16, 0, 0);
606	>	current_pointer = null_pointer;
607	>	}
608		}
609	<	}
609	>	break;
610		}
611		break;
612
#	Line 770 | Line 645 | static __saveds void periodic_func(void)
645		}
646		}
647
648	+	D(bug("periodic_func/%ld: \n", __LINE__));
649	+
650		// Stop timer
651		if (timer_io) {
652		if (!CheckIO((struct IORequest *)timer_io))
#	Line 786 | Line 663 | static __saveds void periodic_func(void)
663		msg = (struct IntuiMessage *)win_port->mp_MsgList.lh_Head;
664		struct Node *succ;
665		while (succ = msg->ExecMessage.mn_Node.ln_Succ) {
666	<	if (msg->IDCMPWindow == the_win) {
666	>	if (msg->IDCMPWindow == drv->the_win) {
667		Remove((struct Node *)msg);
668		ReplyMsg((struct Message *)msg);
669		}
670		msg = (struct IntuiMessage *)succ;
671		}
672	<	the_win->UserPort = NULL;
673	<	ModifyIDCMP(the_win, 0);
672	>	drv->the_win->UserPort = NULL;
673	>	ModifyIDCMP(drv->the_win, 0);
674		Permit();
675		DeleteMsgPort(win_port);
676
#	Line 818 | Line 695 | static void add_mode(uint32 width, uint3
695		VideoModes.push_back(mode);
696		}
697
698	<	// Add standard list of windowed modes for given color depth
698	>	// Add standard list of modes for given color depth
699		static void add_modes(uint32 width, uint32 height, video_depth depth)
700		{
701		D(bug("add_modes: w=%ld  h=%ld  d=%ld\n", width, height, depth));
#	Line 869 | Line 746 | static bool is_valid_modeid(int display_
746		if (INVALID_ID == mode_id)
747		return false;
748
749	<	switch (display_type)
750	<	{
751	<	case DISPLAY_SCREEN_P96:
752	<	return check_modeid_p96(mode_id);
753	<	break;
754	<	case DISPLAY_SCREEN_CGFX:
755	<	return check_modeid_cgfx(mode_id);
756	<	break;
757	<	default:
758	<	return false;
759	<	break;
883	<	}
749	>	switch (display_type) {
750	>	case DISPLAY_SCREEN_P96:
751	>	return check_modeid_p96(mode_id);
752	>	break;
753	>	case DISPLAY_SCREEN_CGFX:
754	>	return check_modeid_cgfx(mode_id);
755	>	break;
756	>	default:
757	>	return false;
758	>	break;
759	>	}
760		}
761
762
#	Line 890 | Line 766 | static bool check_modeid_p96(ULONG mode_
766		uint32 depth = p96GetModeIDAttr(mode_id, P96IDA_DEPTH);
767		uint32 format = p96GetModeIDAttr(mode_id, P96IDA_RGBFORMAT);
768
769	<	if (!p96GetModeIDAttr(screen_mode_id, P96IDA_ISP96))
769	>	D(bug("check_modeid_p96: mode_id=%08lx  depth=%ld  format=%ld\n", mode_id, depth, format));
770	>
771	>	if (!p96GetModeIDAttr(mode_id, P96IDA_ISP96))
772		return false;
773
774		switch (depth) {
#	Line 919 | Line 797 | static bool check_modeid_cgfx(ULONG mode
797		uint32 depth = GetCyberIDAttr(CYBRIDATTR_DEPTH, mode_id);
798		uint32 format = GetCyberIDAttr(CYBRIDATTR_PIXFMT, mode_id);
799
800	<	D(bug("init_screen_cgfx: mode_id=%08lx  depth=%ld  format=%ld\n", mode_id, depth, format));
800	>	D(bug("check_modeid_cgfx: mode_id=%08lx  depth=%ld  format=%ld\n", mode_id, depth, format));
801
802		if (!IsCyberModeID(mode_id))
803		return false;
#	Line 929 | Line 807 | static bool check_modeid_cgfx(ULONG mode
807		break;
808		case 15:
809		case 16:
932	–	// !!! PIXFMT_RGB15 is correct !!!
810		if (format != PIXFMT_RGB15)
811		return false;
812		break;
#	Line 945 | Line 822 | static bool check_modeid_cgfx(ULONG mode
822		return true;
823		}
824
825	+
826	+	driver_base::driver_base(Amiga_monitor_desc &m)
827	+	: monitor(m), mode(m.get_current_mode()), init_ok(false)
828	+	{
829	+	}
830	+
831	+	driver_base::~driver_base()
832	+	{
833	+	}
834	+
835	+
836	+	// Open window
837	+	driver_window::driver_window(Amiga_monitor_desc &m, int width, int height)
838	+	: black_pen(-1), white_pen(-1), driver_base(m)
839	+	{
840	+	// Set absolute mouse mode
841	+	ADBSetRelMouseMode(false);
842	+
843	+	// Open window
844	+	the_win = OpenWindowTags(NULL,
845	+	WA_Left, 0, WA_Top, 0,
846	+	WA_InnerWidth, width, WA_InnerHeight, height,
847	+	WA_SimpleRefresh, true,
848	+	WA_NoCareRefresh, true,
849	+	WA_Activate, true,
850	+	WA_RMBTrap, true,
851	+	WA_ReportMouse, true,
852	+	WA_DragBar, true,
853	+	WA_DepthGadget, true,
854	+	WA_SizeGadget, false,
855	+	WA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
856	+	TAG_END
857	+	);
858	+	if (the_win == NULL) {
859	+	init_ok = false;
860	+	ErrorAlert(STR_OPEN_WINDOW_ERR);
861	+	return;
862	+	}
863	+
864	+	// Create bitmap ("height + 2" for safety)
865	+	the_bitmap = AllocBitMap(width, height + 2, 1, BMF_CLEAR, NULL);
866	+	if (the_bitmap == NULL) {
867	+	init_ok = false;
868	+	ErrorAlert(STR_NO_MEM_ERR);
869	+	return;
870	+	}
871	+
872	+	// Add resolution and set VideoMonitor
873	+	monitor.set_mac_frame_base((uint32)the_bitmap->Planes[0]);
874	+
875	+	// Set FgPen and BgPen
876	+	black_pen = ObtainBestPenA(the_win->WScreen->ViewPort.ColorMap, 0, 0, 0, NULL);
877	+	white_pen = ObtainBestPenA(the_win->WScreen->ViewPort.ColorMap, 0xffffffff, 0xffffffff, 0xffffffff, NULL);
878	+	SetAPen(the_win->RPort, black_pen);
879	+	SetBPen(the_win->RPort, white_pen);
880	+	SetDrMd(the_win->RPort, JAM2);
881	+
882	+	init_ok = true;
883	+	}
884	+
885	+
886	+	driver_window::~driver_window()
887	+	{
888	+	// Window mode, free bitmap
889	+	if (the_bitmap) {
890	+	WaitBlit();
891	+	FreeBitMap(the_bitmap);
892	+	}
893	+
894	+	// Free pens and close window
895	+	if (the_win) {
896	+	ReleasePen(the_win->WScreen->ViewPort.ColorMap, black_pen);
897	+	ReleasePen(the_win->WScreen->ViewPort.ColorMap, white_pen);
898	+
899	+	CloseWindow(the_win);
900	+	the_win = NULL;
901	+	}
902	+	}
903	+
904	+
905	+	// Open PIP (requires Picasso96)
906	+	driver_pip::driver_pip(Amiga_monitor_desc &m, int width, int height)
907	+	: driver_base(m)
908	+	{
909	+	// Set absolute mouse mode
910	+	ADBSetRelMouseMode(false);
911	+
912	+	D(bug("driver_pip(%d,%d)\n", width, height));
913	+
914	+	// Open window
915	+	ULONG error = 0;
916	+	the_win = p96PIP_OpenTags(
917	+	P96PIP_SourceFormat, RGBFB_R5G5B5,
918	+	P96PIP_SourceWidth, width,
919	+	P96PIP_SourceHeight, height,
920	+	P96PIP_ErrorCode, (ULONG)&error,
921	+	P96PIP_AllowCropping, true,
922	+	WA_Left, 0, WA_Top, 0,
923	+	WA_InnerWidth, width, WA_InnerHeight, height,
924	+	WA_SimpleRefresh, true,
925	+	WA_NoCareRefresh, true,
926	+	WA_Activate, true,
927	+	WA_RMBTrap, true,
928	+	WA_ReportMouse, true,
929	+	WA_DragBar, true,
930	+	WA_DepthGadget, true,
931	+	WA_SizeGadget, false,
932	+	WA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
933	+	WA_PubScreenName, (ULONG)"Workbench",
934	+	TAG_END
935	+	);
936	+	if (the_win == NULL || error) {
937	+	init_ok = false;
938	+	ErrorAlert(STR_OPEN_WINDOW_ERR);
939	+	return;
940	+	}
941	+
942	+	// Find bitmap
943	+	p96PIP_GetTags(the_win, P96PIP_SourceBitMap, (ULONG)&the_bitmap, TAG_END);
944	+
945	+	// Add resolution and set VideoMonitor
946	+	monitor.set_mac_frame_base(p96GetBitMapAttr(the_bitmap, P96BMA_MEMORY));
947	+
948	+	init_ok = true;
949	+	}
950	+
951	+	driver_pip::~driver_pip()
952	+	{
953	+	// Close PIP
954	+	if (the_win)
955	+	p96PIP_Close(the_win);
956	+	}
957	+
958	+
959	+	// Open Picasso96 screen
960	+	driver_screen_p96::driver_screen_p96(Amiga_monitor_desc &m, ULONG mode_id)
961	+	: driver_base(m)
962	+	{
963	+	// Set relative mouse mode
964	+	ADBSetRelMouseMode(true);
965	+
966	+	// Check if the mode is one we can handle
967	+	if (!check_modeid_p96(mode_id))
968	+	{
969	+	init_ok = false;
970	+	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
971	+	return;
972	+	}
973	+
974	+	// Yes, get width and height
975	+	uint32 depth = p96GetModeIDAttr(mode_id, P96IDA_DEPTH);
976	+	uint32 width = p96GetModeIDAttr(mode_id, P96IDA_WIDTH);
977	+	uint32 height = p96GetModeIDAttr(mode_id, P96IDA_HEIGHT);
978	+
979	+	// Open screen
980	+	the_screen = p96OpenScreenTags(
981	+	P96SA_DisplayID, mode_id,
982	+	P96SA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
983	+	P96SA_Quiet, true,
984	+	P96SA_NoMemory, true,
985	+	P96SA_NoSprite, true,
986	+	P96SA_Exclusive, true,
987	+	TAG_END
988	+	);
989	+	if (the_screen == NULL) {
990	+	ErrorAlert(STR_OPEN_SCREEN_ERR);
991	+	init_ok = false;
992	+	return;
993	+	}
994	+
995	+	// Open window
996	+	the_win = OpenWindowTags(NULL,
997	+	WA_Left, 0, WA_Top, 0,
998	+	WA_Width, width, WA_Height, height,
999	+	WA_SimpleRefresh, true,
1000	+	WA_NoCareRefresh, true,
1001	+	WA_Borderless, true,
1002	+	WA_Activate, true,
1003	+	WA_RMBTrap, true,
1004	+	WA_ReportMouse, true,
1005	+	WA_CustomScreen, (ULONG)the_screen,
1006	+	TAG_END
1007	+	);
1008	+	if (the_win == NULL) {
1009	+	ErrorAlert(STR_OPEN_WINDOW_ERR);
1010	+	init_ok = false;
1011	+	return;
1012	+	}
1013	+
1014	+	ScreenToFront(the_screen);
1015	+
1016	+	// Add resolution and set VideoMonitor
1017	+	monitor.set_mac_frame_base(p96GetBitMapAttr(the_screen->RastPort.BitMap, P96BMA_MEMORY));
1018	+
1019	+	init_ok = true;
1020	+	}
1021	+
1022	+
1023	+	driver_screen_p96::~driver_screen_p96()
1024	+	{
1025	+	// Close window
1026	+	if (the_win)
1027	+	{
1028	+	CloseWindow(the_win);
1029	+	the_win = NULL;
1030	+	}
1031	+
1032	+	// Close screen
1033	+	if (the_screen) {
1034	+	p96CloseScreen(the_screen);
1035	+	the_screen = NULL;
1036	+	}
1037	+	}
1038	+
1039	+
1040	+	void driver_screen_p96::set_palette(uint8 *pal, int num)
1041	+	{
1042	+	// Convert palette to 32 bits
1043	+	ULONG table[2 + 256 * 3];
1044	+	table[0] = num << 16;
1045	+	table[num * 3 + 1] = 0;
1046	+	for (int i=0; i<num; i++) {
1047	+	table[i*3+1] = pal[i*3] * 0x01010101;
1048	+	table[i*3+2] = pal[i*3+1] * 0x01010101;
1049	+	table[i*3+3] = pal[i*3+2] * 0x01010101;
1050	+	}
1051	+
1052	+	// And load it
1053	+	LoadRGB32(&the_screen->ViewPort, table);
1054	+	}
1055	+
1056	+
1057	+	// Open CyberGraphX screen
1058	+	driver_screen_cgfx::driver_screen_cgfx(Amiga_monitor_desc &m, ULONG mode_id)
1059	+	: driver_base(m)
1060	+	{
1061	+	D(bug("driver_screen_cgfx/%ld: mode_id=%08lx\n", __LINE__, mode_id));
1062	+
1063	+	// Set absolute mouse mode
1064	+	ADBSetRelMouseMode(true);
1065	+
1066	+	// Check if the mode is one we can handle
1067	+	if (!check_modeid_cgfx(mode_id))
1068	+	{
1069	+	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
1070	+	init_ok = false;
1071	+	return;
1072	+	}
1073	+
1074	+	// Yes, get width and height
1075	+	uint32 depth = GetCyberIDAttr(CYBRIDATTR_DEPTH, mode_id);
1076	+	uint32 width = GetCyberIDAttr(CYBRIDATTR_WIDTH, mode_id);
1077	+	uint32 height = GetCyberIDAttr(CYBRIDATTR_HEIGHT, mode_id);
1078	+
1079	+	// Open screen
1080	+	the_screen = OpenScreenTags(NULL,
1081	+	SA_DisplayID, mode_id,
1082	+	SA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
1083	+	SA_Quiet, true,
1084	+	SA_Exclusive, true,
1085	+	TAG_END
1086	+	);
1087	+	if (the_screen == NULL) {
1088	+	ErrorAlert(STR_OPEN_SCREEN_ERR);
1089	+	init_ok = false;
1090	+	return;
1091	+	}
1092	+
1093	+	// Open window
1094	+	the_win = OpenWindowTags(NULL,
1095	+	WA_Left, 0, WA_Top, 0,
1096	+	WA_Width, width, WA_Height, height,
1097	+	WA_SimpleRefresh, true,
1098	+	WA_NoCareRefresh, true,
1099	+	WA_Borderless, true,
1100	+	WA_Activate, true,
1101	+	WA_RMBTrap, true,
1102	+	WA_ReportMouse, true,
1103	+	WA_CustomScreen, (ULONG)the_screen,
1104	+	TAG_END
1105	+	);
1106	+	if (the_win == NULL) {
1107	+	ErrorAlert(STR_OPEN_WINDOW_ERR);
1108	+	init_ok = false;
1109	+	return;
1110	+	}
1111	+
1112	+	ScreenToFront(the_screen);
1113	+	static UWORD ptr[] = { 0, 0, 0, 0 };
1114	+	SetPointer(the_win, ptr, 0, 0, 0, 0);   // Hide mouse pointer
1115	+
1116	+	// Set VideoMonitor
1117	+	ULONG frame_base;
1118	+	APTR handle = LockBitMapTags(the_screen->RastPort.BitMap,
1119	+	LBMI_BASEADDRESS, (ULONG)&frame_base,
1120	+	TAG_END
1121	+	);
1122	+	UnLockBitMap(handle);
1123	+
1124	+	D(bug("driver_screen_cgfx/%ld: frame_base=%08lx\n", __LINE__, frame_base));
1125	+
1126	+	monitor.set_mac_frame_base(frame_base);
1127	+
1128	+	init_ok = true;
1129	+	}
1130	+
1131	+
1132	+	driver_screen_cgfx::~driver_screen_cgfx()
1133	+	{
1134	+	D(bug("~driver_screen_cgfx/%ld: \n", __LINE__));
1135	+
1136	+	// Close window
1137	+	if (the_win)
1138	+	{
1139	+	CloseWindow(the_win);
1140	+	the_win = NULL;
1141	+	}
1142	+
1143	+	// Close screen
1144	+	if (the_screen) {
1145	+	CloseScreen(the_screen);
1146	+	the_screen = NULL;
1147	+	}
1148	+	}
1149	+
1150	+
1151	+	void driver_screen_cgfx::set_palette(uint8 *pal, int num)
1152	+	{
1153	+	// Convert palette to 32 bits
1154	+	ULONG table[2 + 256 * 3];
1155	+	table[0] = num << 16;
1156	+	table[num * 3 + 1] = 0;
1157	+	for (int i=0; i<num; i++) {
1158	+	table[i*3+1] = pal[i*3] * 0x01010101;
1159	+	table[i*3+2] = pal[i*3+1] * 0x01010101;
1160	+	table[i*3+3] = pal[i*3+2] * 0x01010101;
1161	+	}
1162	+
1163	+	// And load it
1164	+	LoadRGB32(&the_screen->ViewPort, table);
1165	+	}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines