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.9 by jlachmann, 2000-08-20T14:08:43Z 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 95 | 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 117 | 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];
133	–	VideoMonitor.bytes_per_row = the_bitmap->BytesPerRow;
134	–	VideoMonitor.x = width;
135	–	VideoMonitor.y = height;
136	–	VideoMonitor.mode = VMODE_1BIT;
172
173		// Set FgPen and BgPen
174		black_pen = ObtainBestPenA(the_win->WScreen->ViewPort.ColorMap, 0, 0, 0, NULL);
#	Line 172 | 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);
185	<	VideoMonitor.x = width;
186	<	VideoMonitor.y = height;
187	<	VideoMonitor.mode = VMODE_16BIT;
219	>	set_video_monitor(width, height, p96GetBitMapAttr(the_bitmap, P96BMA_BYTESPERROW), 16);
220		return true;
221		}
222
#	Line 200 | Line 232 | static bool init_screen_p96(ULONG mode_i
232
233		switch (depth) {
234		case 8:
203	–	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		}
211	–	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		}
219	–	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
#	Line 227 | Line 256 | static bool init_screen_p96(ULONG mode_i
256		uint32 width = p96GetModeIDAttr(mode_id, P96IDA_WIDTH);
257		uint32 height = p96GetModeIDAttr(mode_id, P96IDA_HEIGHT);
258
230	–	VideoMonitor.x = width;
231	–	VideoMonitor.y = height;
232	–
259		// Open screen
260		the_screen = p96OpenScreenTags(
261		P96SA_DisplayID, mode_id,
#	Line 241 | Line 267 | static bool init_screen_p96(ULONG mode_i
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 258 | Line 284 | static bool init_screen_p96(ULONG mode_i
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
265	–	// 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);
268	–	VideoMonitor.bytes_per_row = p96GetBitMapAttr(the_screen->RastPort.BitMap, P96BMA_BYTESPERROW);
296		return true;
297		}
298
#	Line 281 | Line 308 | static bool init_screen_cgfx(ULONG mode_
308
309		switch (depth) {
310		case 8:
284	–	VideoMonitor.mode = VMODE_8BIT;
311		break;
312		case 15:
313		case 16:
314		// !!! PIXFMT_RGB15 is correct !!!
315		if (format != PIXFMT_RGB15) {
316	<	ErrorAlert(GetString(STR_WRONG_SCREEN_FORMAT_ERR));
316	>	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
317		return false;
318		}
293	–	VideoMonitor.mode = VMODE_16BIT;
319		break;
320		case 24:
321		case 32:
322		if (format != PIXFMT_ARGB32) {
323	<	ErrorAlert(GetString(STR_WRONG_SCREEN_FORMAT_ERR));
323	>	ErrorAlert(STR_WRONG_SCREEN_FORMAT_ERR);
324		return false;
325		}
301	–	VideoMonitor.mode = VMODE_32BIT;
326		break;
327		default:
328	<	ErrorAlert(GetString(STR_WRONG_SCREEN_DEPTH_ERR));
328	>	ErrorAlert(STR_WRONG_SCREEN_DEPTH_ERR);
329		return false;
330		}
331
#	Line 309 | Line 333 | static bool init_screen_cgfx(ULONG mode_
333		uint32 width = GetCyberIDAttr(CYBRIDATTR_WIDTH, mode_id);
334		uint32 height = GetCyberIDAttr(CYBRIDATTR_HEIGHT, mode_id);
335
312	–	VideoMonitor.x = width;
313	–	VideoMonitor.y = height;
314	–
336		// Open screen
337		the_screen = OpenScreenTags(NULL,
338		SA_DisplayID, mode_id,
#	Line 321 | Line 342 | static bool init_screen_cgfx(ULONG mode_
342		TAG_END
343		);
344		if (the_screen == NULL) {
345	<	ErrorAlert(GetString(STR_OPEN_SCREEN_ERR));
345	>	ErrorAlert(STR_OPEN_SCREEN_ERR);
346		return false;
347		}
348
#	Line 338 | Line 359 | static bool init_screen_cgfx(ULONG mode_
359		TAG_END
360		);
361		if (the_win == NULL) {
362	<	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
362	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
363		return false;
364		}
365
345	–	// Set VideoMonitor
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)&VideoMonitor.mac_frame_base,
374	<	TAG_END);
373	>	LBMI_BASEADDRESS, (ULONG)&frame_base,
374	>	TAG_END
375	>	);
376		UnLockBitMap(handle);
377	<	VideoMonitor.bytes_per_row = GetCyberMapAttr(the_screen->RastPort.BitMap, CYBRMATTR_XMOD);
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
#	Line 359 | Line 384 | bool VideoInit(bool classic)
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(GetString(STR_NO_MEM_ERR));
387	>	ErrorAlert(STR_NO_MEM_ERR);
388		return false;
389		}
390
#	Line 390 | Line 415 | bool VideoInit(bool classic)
415		else if (CyberGfxBase && IsCyberModeID(mode_id))
416		display_type = DISPLAY_SCREEN_CGFX;
417		else {
418	<	ErrorAlert(GetString(STR_NO_P96_MODE_ERR));
418	>	ErrorAlert(STR_NO_P96_MODE_ERR);
419		return false;
420		}
421		}
#	Line 427 | 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 512 | 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_P96 || display_type == DISPLAY_SCREEN_CGFX) {
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 533 | 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 590 | 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 621 | Line 656 | static __saveds void periodic_func(void)
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.x
660	<	|| my >= the_win->BorderTop + VideoMonitor.y) {
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;
#	Line 655 | 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 ((IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL) ==
694	<	(qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL))
660	<	&& 0x5f == code)
661	<	{
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	<	}
698	>	}
699
700		if (code & IECODE_UP_PREFIX)
701		ADBKeyUp(keycode2mac[code & 0x7f]);

Diff Legend

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