ViewVC Help

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

root/cebix/Frodo4/Src/Display_svga.h

Comparing Frodo4/Src/Display_svga.h (file contents):
Revision 1.2 by cebix, 2003-07-01T17:51:17Z vs.
Revision 1.4 by cebix, 2004-01-12T15:13:20Z

#	Line 2 | Line 2
2		*  Display_svga.h - C64 graphics display, emulator window handling,
3		*                   SVGAlib specific stuff
4		*
5	<	*  Frodo (C) 1994-1997,2002-2003 Christian Bauer
5	>	*  Frodo (C) 1994-1997,2002-2004 Christian Bauer
6		*
7		*  This program is free software; you can redistribute it and/or modify
8		*  it under the terms of the GNU General Public License as published by
#	Line 150 | Line 150 | static int keystate[256];
150		static int f11pressed = 0, f12pressed = 0, quit = 0;
151		static int joystate = 0xFF;
152		static int numlock = 0;
153	<	static UBYTE rev_matrix[8], key_matrix[8];
153	>	static uint8 rev_matrix[8], key_matrix[8];
154
155		/*
156		C64 keyboard matrix:
#	Line 495 | Line 495 | void C64Display::Update(void)
495		return;
496
497		for (y = 0; y < DISPLAY_Y; y++) {
498	<	vga_drawscanline(y, bufmem + hsize * y);
498	>	vga_drawscanline(y, (uint8 *)bufmem + hsize * y);
499		}
500		}
501
502
503	<	UBYTE *C64Display::BitmapBase(void)
503	>	uint8 *C64Display::BitmapBase(void)
504		{
505	<	return (UBYTE *)bufmem;
505	>	return (uint8 *)bufmem;
506		}
507
508
#	Line 512 | Line 512 | int C64Display::BitmapXMod(void)
512		}
513
514
515	<	void C64Display::PollKeyboard(UBYTE *CIA_key_matrix, UBYTE *CIA_rev_matrix, UBYTE *joystick)
515	>	void C64Display::PollKeyboard(uint8 *CIA_key_matrix, uint8 *CIA_rev_matrix, uint8 *joystick)
516		{
517		keyboard_update();
518		*joystick = joystate;
#	Line 547 | Line 547 | static int colorval(int v)
547		return ((v & 255)*0x01010101) >> 26;
548		}
549
550	<	void C64Display::InitColors(UBYTE *colors)
550	>	void C64Display::InitColors(uint8 *colors)
551		{
552		int i;
553

Diff Legend

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