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.3 by cebix, 2000-04-10T18:52:46Z vs.
Revision 1.18 by cebix, 2001-07-03T19:20:45Z

#	Line 1 | Line 1
1		/*
2		*  video_amiga.cpp - Video/graphics emulation, AmigaOS specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2000 Christian Bauer
4	>	*  Basilisk II (C) 1997-2001 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 22 | Line 22
22		#include <intuition/intuition.h>
23		#include <graphics/rastport.h>
24		#include <graphics/gfx.h>
25	+	#include <cybergraphics/cybergraphics.h>
26		#include <dos/dostags.h>
27		#include <devices/timer.h>
28		#include <proto/exec.h>
#	Line 29 | Line 30
30		#include <proto/intuition.h>
31		#include <proto/graphics.h>
32		#include <proto/Picasso96.h>
33	+	#include <proto/cybergraphics.h>
34
35		#include "sysdeps.h"
36	+	#include "cpu_emulation.h"
37		#include "main.h"
38		#include "adb.h"
39		#include "prefs.h"
40		#include "user_strings.h"
41		#include "video.h"
42
43	<	#define DEBUG 1
43	>	#define DEBUG 0
44		#include "debug.h"
45
46
#	Line 45 | Line 48
48		enum {
49		DISPLAY_WINDOW,
50		DISPLAY_PIP,
51	<	DISPLAY_SCREEN
51	>	DISPLAY_SCREEN_P96,
52	>	DISPLAY_SCREEN_CGFX
53		};
54
55		// Global variables
#	Line 54 | Line 58 | static int display_type = DISPLAY_WINDOW
58		static struct Screen *the_screen = NULL;
59		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
#	Line 89 | Line 95 | static void periodic_func(void);
95		*  Initialization
96		*/
97
98	+	// Add resolution to list of supported modes and set VideoMonitor
99	+	static void set_video_monitor(uint32 width, uint32 height, uint32 bytes_per_row, int depth)
100	+	{
101	+	video_mode mode;
102	+
103	+	mode.x = width;
104	+	mode.y = height;
105	+	mode.resolution_id = 0x80;
106	+	mode.bytes_per_row = bytes_per_row;
107	+
108	+	switch (depth) {
109	+	case 1:
110	+	mode.depth = VDEPTH_1BIT;
111	+	break;
112	+	case 2:
113	+	mode.depth = VDEPTH_2BIT;
114	+	break;
115	+	case 4:
116	+	mode.depth = VDEPTH_4BIT;
117	+	break;
118	+	case 8:
119	+	mode.depth = VDEPTH_8BIT;
120	+	break;
121	+	case 15:
122	+	case 16:
123	+	mode.depth = VDEPTH_16BIT;
124	+	break;
125	+	case 24:
126	+	case 32:
127	+	mode.depth = VDEPTH_32BIT;
128	+	break;
129	+	}
130	+
131	+	VideoModes.push_back(mode);
132	+	video_init_depth_list();
133	+	VideoMonitor.mode = mode;
134	+	}
135	+
136		// Open window
137		static bool init_window(int width, int height)
138		{
#	Line 111 | Line 155 | static bool init_window(int width, int h
155		TAG_END
156		);
157		if (the_win == NULL) {
158	<	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
158	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
159		return false;
160		}
161
162		// Create bitmap ("height + 2" for safety)
163		the_bitmap = AllocBitMap(width, height + 2, 1, BMF_CLEAR, NULL);
164		if (the_bitmap == NULL) {
165	<	ErrorAlert(GetString(STR_NO_MEM_ERR));
165	>	ErrorAlert(STR_NO_MEM_ERR);
166		return false;
167		}
168
169	<	// Set VideoMonitor
169	>	// Add resolution and set VideoMonitor
170	>	set_video_monitor(width, height, the_bitmap->BytesPerRow, 1);
171		VideoMonitor.mac_frame_base = (uint32)the_bitmap->Planes[0];
127	–	VideoMonitor.bytes_per_row = the_bitmap->BytesPerRow;
128	–	VideoMonitor.x = width;
129	–	VideoMonitor.y = height;
130	–	VideoMonitor.mode = VMODE_1BIT;
172
173		// Set FgPen and BgPen
174		black_pen = ObtainBestPenA(the_win->WScreen->ViewPort.ColorMap, 0, 0, 0, NULL);
#	Line 166 | Line 207 | static bool init_pip(int width, int heig
207		TAG_END
208		);
209		if (the_win == NULL || error) {
210	<	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
210	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
211		return false;
212		}
213
214		// Find bitmap
215		p96PIP_GetTags(the_win, P96PIP_SourceBitMap, (ULONG)&the_bitmap, TAG_END);
216
217	<	// Set VideoMonitor
217	>	// Add resolution and set VideoMonitor
218		VideoMonitor.mac_frame_base = p96GetBitMapAttr(the_bitmap, P96BMA_MEMORY);
219	<	VideoMonitor.bytes_per_row = p96GetBitMapAttr(the_bitmap, P96BMA_BYTESPERROW);
179	<	VideoMonitor.x = width;
180	<	VideoMonitor.y = height;
181	<	VideoMonitor.mode = VMODE_16BIT;
219	>	set_video_monitor(width, height, p96GetBitMapAttr(the_bitmap, P96BMA_BYTESPERROW), 16);
220		return true;
221		}
222
223	<	// Open screen (requires Picasso96 as we need chunky modes)
224	<	static bool init_screen(ULONG mode_id)
223	>	// Open Picasso96 screen
224	>	static bool init_screen_p96(ULONG mode_id)
225		{
226		// Set relative mouse mode
227		ADBSetRelMouseMode(true);
228
191	–	// Check if the mode is a Picasso96 mode
192	–	if (!p96GetModeIDAttr(mode_id, P96IDA_ISP96)) {
193	–	ErrorAlert(GetString(STR_NO_P96_MODE_ERR));
194	–	return false;
195	–	}
196	–
229		// Check if the mode is one we can handle
230		uint32 depth = p96GetModeIDAttr(mode_id, P96IDA_DEPTH);
231		uint32 format = p96GetModeIDAttr(mode_id, P96IDA_RGBFORMAT);
232	+
233		switch (depth) {
234		case 8:
202	–	VideoMonitor.mode = VMODE_8BIT;
235		break;
236		case 15:
237		case 16:
238		if (format != RGBFB_R5G5B5) {
239	<	ErrorAlert(GetString(STR_WRONG_SCREEN_FORMAT_ERR));
239	>	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
240		return false;
241		}
210	–	VideoMonitor.mode = VMODE_16BIT;
242		break;
243		case 24:
244		case 32:
245		if (format != RGBFB_A8R8G8B8) {
246	<	ErrorAlert(GetString(STR_WRONG_SCREEN_FORMAT_ERR));
246	>	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
247		return false;
248		}
218	–	VideoMonitor.mode = VMODE_32BIT;
249		break;
250		default:
251	<	ErrorAlert(GetString(STR_WRONG_SCREEN_DEPTH_ERR));
251	>	ErrorAlert(STR_WRONG_SCREEN_DEPTH_ERR);
252		return false;
253		}
254
255		// Yes, get width and height
256		uint32 width = p96GetModeIDAttr(mode_id, P96IDA_WIDTH);
257		uint32 height = p96GetModeIDAttr(mode_id, P96IDA_HEIGHT);
228	–	VideoMonitor.x = width;
229	–	VideoMonitor.y = height;
258
259		// Open screen
260		the_screen = p96OpenScreenTags(
#	Line 239 | Line 267 | static bool init_screen(ULONG mode_id)
267		TAG_END
268		);
269		if (the_screen == NULL) {
270	<	ErrorAlert(GetString(STR_OPEN_SCREEN_ERR));
270	>	ErrorAlert(STR_OPEN_SCREEN_ERR);
271		return false;
272		}
273
#	Line 256 | Line 284 | static bool init_screen(ULONG mode_id)
284		TAG_END
285		);
286		if (the_win == NULL) {
287	<	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
287	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
288		return false;
289		}
290
263	–	// Set VideoMonitor
291		ScreenToFront(the_screen);
292	+
293	+	// Add resolution and set VideoMonitor
294	+	set_video_monitor(width, height, p96GetBitMapAttr(the_screen->RastPort.BitMap, P96BMA_BYTESPERROW), depth);
295		VideoMonitor.mac_frame_base = p96GetBitMapAttr(the_screen->RastPort.BitMap, P96BMA_MEMORY);
296	<	VideoMonitor.bytes_per_row = p96GetBitMapAttr(the_screen->RastPort.BitMap, P96BMA_BYTESPERROW);
296	>	return true;
297	>	}
298	>
299	>	// Open CyberGraphX screen
300	>	static bool init_screen_cgfx(ULONG mode_id)
301	>	{
302	>	// Set relative mouse mode
303	>	ADBSetRelMouseMode(true);
304	>
305	>	// Check if the mode is one we can handle
306	>	uint32 depth = GetCyberIDAttr(CYBRIDATTR_DEPTH, mode_id);
307	>	uint32 format = GetCyberIDAttr(CYBRIDATTR_PIXFMT, mode_id);
308	>
309	>	switch (depth) {
310	>	case 8:
311	>	break;
312	>	case 15:
313	>	case 16:
314	>	// !!! PIXFMT_RGB15 is correct !!!
315	>	if (format != PIXFMT_RGB15) {
316	>	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
317	>	return false;
318	>	}
319	>	break;
320	>	case 24:
321	>	case 32:
322	>	if (format != PIXFMT_ARGB32) {
323	>	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
324	>	return false;
325	>	}
326	>	break;
327	>	default:
328	>	ErrorAlert(STR_WRONG_SCREEN_DEPTH_ERR);
329	>	return false;
330	>	}
331	>
332	>	// Yes, get width and height
333	>	uint32 width = GetCyberIDAttr(CYBRIDATTR_WIDTH, mode_id);
334	>	uint32 height = GetCyberIDAttr(CYBRIDATTR_HEIGHT, mode_id);
335	>
336	>	// Open screen
337	>	the_screen = OpenScreenTags(NULL,
338	>	SA_DisplayID, mode_id,
339	>	SA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
340	>	SA_Quiet, TRUE,
341	>	SA_Exclusive, TRUE,
342	>	TAG_END
343	>	);
344	>	if (the_screen == NULL) {
345	>	ErrorAlert(STR_OPEN_SCREEN_ERR);
346	>	return false;
347	>	}
348	>
349	>	// Open window
350	>	the_win = OpenWindowTags(NULL,
351	>	WA_Left, 0, WA_Top, 0,
352	>	WA_Width, width, WA_Height, height,
353	>	WA_NoCareRefresh, TRUE,
354	>	WA_Borderless, TRUE,
355	>	WA_Activate, TRUE,
356	>	WA_RMBTrap, TRUE,
357	>	WA_ReportMouse, TRUE,
358	>	WA_CustomScreen, (ULONG)the_screen,
359	>	TAG_END
360	>	);
361	>	if (the_win == NULL) {
362	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
363	>	return false;
364	>	}
365	>
366	>	ScreenToFront(the_screen);
367	>	static UWORD ptr[] = { 0, 0, 0, 0 };
368	>	SetPointer(the_win, ptr, 0, 0, 0, 0);   // Hide mouse pointer
369	>
370	>	// Set VideoMonitor
371	>	ULONG frame_base;
372	>	APTR handle = LockBitMapTags(the_screen->RastPort.BitMap,
373	>	LBMI_BASEADDRESS, (ULONG)&frame_base,
374	>	TAG_END
375	>	);
376	>	UnLockBitMap(handle);
377	>	set_video_monitor(width, height, GetCyberMapAttr(the_screen->RastPort.BitMap, CYBRMATTR_XMOD), depth);
378	>	VideoMonitor.mac_frame_base = frame_base;
379		return true;
380		}
381
382		bool VideoInit(bool classic)
383		{
384	+	// Allocate blank mouse pointer data
385	+	null_pointer = (UWORD *)AllocMem(12, MEMF_PUBLIC | MEMF_CHIP | MEMF_CLEAR);
386	+	if (null_pointer == NULL) {
387	+	ErrorAlert(STR_NO_MEM_ERR);
388	+	return false;
389	+	}
390	+
391		// Read frame skip prefs
392		frame_skip = PrefsFindInt32("frameskip");
393		if (frame_skip == 0)
#	Line 290 | Line 409 | bool VideoInit(bool classic)
409		display_type = DISPLAY_WINDOW;
410		else if (sscanf(mode_str, "pip/%d/%d", &width, &height) == 2 && P96Base)
411		display_type = DISPLAY_PIP;
412	<	else if (sscanf(mode_str, "scr/%08lx", &mode_id) == 1 && P96Base)
413	<	display_type = DISPLAY_SCREEN;
412	>	else if (sscanf(mode_str, "scr/%08lx", &mode_id) == 1 && (CyberGfxBase || P96Base)) {
413	>	if (P96Base && p96GetModeIDAttr(mode_id, P96IDA_ISP96))
414	>	display_type = DISPLAY_SCREEN_P96;
415	>	else if (CyberGfxBase && IsCyberModeID(mode_id))
416	>	display_type = DISPLAY_SCREEN_CGFX;
417	>	else {
418	>	ErrorAlert(STR_NO_P96_MODE_ERR);
419	>	return false;
420	>	}
421	>	}
422		}
423
424		// Open display
#	Line 306 | Line 433 | bool VideoInit(bool classic)
433		return false;
434		break;
435
436	<	case DISPLAY_SCREEN:
437	<	if (!init_screen(mode_id))
436	>	case DISPLAY_SCREEN_P96:
437	>	if (!init_screen_p96(mode_id))
438	>	return false;
439	>	break;
440	>
441	>	case DISPLAY_SCREEN_CGFX:
442	>	if (!init_screen_cgfx(mode_id))
443		return false;
444		break;
445		}
#	Line 320 | Line 452 | bool VideoInit(bool classic)
452		TAG_END
453		);
454		if (periodic_proc == NULL) {
455	<	ErrorAlert(GetString(STR_NO_MEM_ERR));
455	>	ErrorAlert(STR_NO_MEM_ERR);
456		return false;
457		}
458		return true;
#	Line 366 | Line 498 | void VideoExit(void)
498		p96PIP_Close(the_win);
499		break;
500
501	<	case DISPLAY_SCREEN:
501	>	case DISPLAY_SCREEN_P96:
502
503		// Close window
504		if (the_win)
505		CloseWindow(the_win);
506
507		// Close screen
508	<	if (the_screen)
508	>	if (the_screen) {
509		p96CloseScreen(the_screen);
510	+	the_screen = NULL;
511	+	}
512	+	break;
513	+
514	+	case DISPLAY_SCREEN_CGFX:
515	+
516	+	// Close window
517	+	if (the_win)
518	+	CloseWindow(the_win);
519	+
520	+	// Close screen
521	+	if (the_screen) {
522	+	CloseScreen(the_screen);
523	+	the_screen = NULL;
524	+	}
525		break;
526		}
527	+
528	+	// Free mouse pointer
529	+	if (null_pointer) {
530	+	FreeMem(null_pointer, 12);
531	+	null_pointer = NULL;
532	+	}
533		}
534
535
#	Line 384 | Line 537 | void VideoExit(void)
537		*  Set palette
538		*/
539
540	<	void video_set_palette(uint8 *pal)
540	>	void video_set_palette(uint8 *pal, in num)
541		{
542	<	if (display_type == DISPLAY_SCREEN) {
542	>	if ((display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX)
543	>	&& !IsDirectMode(VideoMonitor.mode)) {
544
545		// Convert palette to 32 bits
546		ULONG table[2 + 256 * 3];
547	<	table[0] = 256 << 16;
548	<	table[256 * 3 + 1] = 0;
549	<	for (int i=0; i<256; i++) {
547	>	table[0] = num << 16;
548	>	table[num * 3 + 1] = 0;
549	>	for (int i=0; i<num; i++) {
550		table[i*3+1] = pal[i*3] * 0x01010101;
551		table[i*3+2] = pal[i*3+1] * 0x01010101;
552		table[i*3+3] = pal[i*3+2] * 0x01010101;
#	Line 405 | Line 559 | void video_set_palette(uint8 *pal)
559
560
561		/*
562	+	*  Switch video mode
563	+	*/
564	+
565	+	void video_switch_to_mode(const video_mode &mode)
566	+	{
567	+	}
568	+
569	+
570	+	/*
571		*  Video message handling (not neccessary under AmigaOS, handled by periodic_func())
572		*/
573
#	Line 429 | Line 592 | static __saveds void periodic_func(void)
592		if (win_port) {
593		win_mask = 1 << win_port->mp_SigBit;
594		the_win->UserPort = win_port;
595	<	ModifyIDCMP(the_win, IDCMP_MOUSEBUTTONS | IDCMP_MOUSEMOVE | IDCMP_RAWKEY | (display_type == DISPLAY_SCREEN ? IDCMP_DELTAMOVE : 0));
595	>	ModifyIDCMP(the_win, IDCMP_MOUSEBUTTONS | IDCMP_MOUSEMOVE | IDCMP_RAWKEY | ((display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX) ? IDCMP_DELTAMOVE : 0));
596		}
597
598		// Start 60Hz timer for window refresh
#	Line 462 | Line 625 | static __saveds void periodic_func(void)
625
626		// Timer tick, update display
627		BltTemplate(the_bitmap->Planes[0], 0, the_bitmap->BytesPerRow, the_win->RPort,
628	<	the_win->BorderLeft, the_win->BorderTop, VideoMonitor.x, VideoMonitor.y);
628	>	the_win->BorderLeft, the_win->BorderTop, VideoMonitor.mode.x, VideoMonitor.mode.y);
629
630		// Restart timer
631		timer_io->tr_node.io_Command = TR_ADDREQUEST;
#	Line 487 | Line 650 | static __saveds void periodic_func(void)
650		// Handle message according to class
651		switch (cl) {
652		case IDCMP_MOUSEMOVE:
653	<	if (display_type == DISPLAY_SCREEN)
653	>	if (display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX)
654		ADBMouseMoved(mx, my);
655	<	else
655	>	else {
656		ADBMouseMoved(mx - the_win->BorderLeft, my - the_win->BorderTop);
657	+	if (mx < the_win->BorderLeft
658	+	|| my < the_win->BorderTop
659	+	|| mx >= the_win->BorderLeft + VideoMonitor.mode.x
660	+	|| my >= the_win->BorderTop + VideoMonitor.mode.y) {
661	+	if (current_pointer) {
662	+	ClearPointer(the_win);
663	+	current_pointer = NULL;
664	+	}
665	+	} else {
666	+	if (current_pointer != null_pointer) {
667	+	// Hide mouse pointer inside window
668	+	SetPointer(the_win, null_pointer, 1, 16, 0, 0);
669	+	current_pointer = null_pointer;
670	+	}
671	+	}
672	+	}
673		break;
674
675		case IDCMP_MOUSEBUTTONS:
#	Line 511 | Line 690 | static __saveds void periodic_func(void)
690		case IDCMP_RAWKEY:
691		if (qualifier & IEQUALIFIER_REPEAT)     // Keyboard repeat is done by MacOS
692		break;
693	+	if ((qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) ==
694	+	(IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL) && code == 0x5f) {
695	+	SetInterruptFlag(INTFLAG_NMI);
696	+	TriggerInterrupt();
697	+	break;
698	+	}
699	+
700		if (code & IECODE_UP_PREFIX)
701		ADBKeyUp(keycode2mac[code & 0x7f]);
702		else

Diff Legend

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