--- M6502/Screen.pm	2007/07/31 21:43:57	73
+++ M6502/Screen.pm	2007/08/03 08:57:37	107
@@ -8,11 +8,14 @@
 use SDL::App;
 use SDL::Rect;
 use SDL::Color;
+use SDL::Constants;
 
 use Carp qw/confess/;
+use Data::Dump qw/dump/;
+use M6502 qw'@mem';
 
 use base qw(Class::Accessor Prefs);
-__PACKAGE__->mk_accessors(qw(app));
+__PACKAGE__->mk_accessors(qw(app event));
 
 =head1 NAME
 
@@ -41,10 +44,15 @@
 		-height => 256 * $self->scale,
 		-depth  => 16,
 	);
-	#$app->grab_input( 0 );
+	#$app->grab_input( SDL_GRAB_QUERY );
+	$app->grab_input( SDL_GRAB_OFF );
 
-	warn "# created SDL::App\n";
 	$self->app( $app );
+
+	my $event = SDL::Event->new();
+	$self->event( $event );
+
+	warn "# created SDL::App\n";
 }
 
 my $white	= SDL::Color->new( -r => 0xff, -g => 0xff, -b => 0xff );
@@ -54,6 +62,9 @@
 my $green	= SDL::Color->new( -r => 0x00, -g => 0xff, -b => 0x00 );
 my $blue	= SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0xff );
 
+my $rect_screen = SDL::Rect->new( -x => 0, -y => 0, -width => 256, -height => 256 );
+my $rect_mem = SDL::Rect->new( -x => 256, -y => 0, -width => 256, -height => 256 );
+
 =head2 p
 
  $screen->p( $x, $y, 1 );
@@ -96,38 +107,6 @@
 	return ($x,$y);
 }
 
-=head2 vram
-
-Push byte to video memory and draw it
-
-  $screen->vram( $offset, $byte );
-
-=cut
-
-my $_vram_counter;
-
-sub vram {
-	my ( $self, $offset, $byte ) = @_;
-	my $x = ( $offset % 32 ) << 3;
-	my $y = $offset >> 5;
-	my $mask = 1;
-	my $scale = $self->scale;
-
-	printf "## vram %04x %02x*%02x %02x\n", $offset, $x, $y, $byte if $self->trace;
-
-	foreach ( 0 .. 7 ) {
-		my $on = $byte & $mask;
-		if ( $scale == 1 ) {
-			$app->pixel( $x + $_, $y, $on ? $white : $black );
-		} else {
-			$self->p($x + $_, $y, $on );
-		}
-		$mask = $mask << 1;
-	}
-
-	$app->sync if ( $_vram_counter++ % 10 == 0 );
-}
-
 =head2 mmap_pixel
 
 Draw pixel in memory map
@@ -166,36 +145,173 @@
 	$app->sync;
 }
 
-=head2 render
+=head2 render_vram
 
-  $self->render( @video_memory );
+Render one frame of video ram
+
+  $self->render_vram( @video_memory );
 
 =cut
 
-sub render {
+my @flip;
+
+foreach my $i ( 0 .. 255 ) {
+	my $t = 0;
+	$i & 0b00000001 and $t = $t | 0b10000000;
+	$i & 0b00000010 and $t = $t | 0b01000000;
+	$i & 0b00000100 and $t = $t | 0b00100000;
+	$i & 0b00001000 and $t = $t | 0b00010000;
+	$i & 0b00010000 and $t = $t | 0b00001000;
+	$i & 0b00100000 and $t = $t | 0b00000100;
+	$i & 0b01000000 and $t = $t | 0b00000010;
+	$i & 0b10000000 and $t = $t | 0b00000001;
+	warn "$i = $t\n";
+	$flip[$i] = $t;
+}
+
+
+sub render_vram {
 	my $self = shift;
 
+	return unless $self->booted;
+
 	die "this function isn't supported if scale isn't 1" unless $self->scale == 1;
 
-	$app->lock;
+	confess "no data?" unless (@_);
+	confess "screen size not 256*256/8 but ",($#_+1) unless (($#_+1) == (256*256/8));
 
-	my ( $x, $y ) = ( 0,0 );
 
-	foreach my $b ( @_ ) {
-		foreach my $p ( split(//, unpack("B8",pack("C",$b)) ) ) {
-			$app->pixel( $x, $y, $p ? $white : $black );
-			$x++;
-		}
-		if ( $x == 256 ) {
-			$x = 0;
-			$y++;
+	my $pixels = pack("C*", map { $flip[$_] } @_);
+
+	my $vram = SDL::Surface->new(
+		-width => 256,
+		-height => 256,
+		-depth => 1,	# 1 bit per pixel
+		-pitch => 32,	# bytes per line
+		-from => $pixels,
+	);
+	$vram->set_colors( 0, $black, $white, $red );
+	$vram->display_format;
+
+	my $rect = SDL::Rect->new( -x => 0, -y => 0, -width => 256, -height => 256 );
+	$vram->blit( $rect, $app, $rect_screen );
+
+	$app->sync;
+}
+
+=head2 render_mem
+
+  $self->render_mem( @ram );
+
+=cut
+
+sub render_mem {
+	my $self = shift;
+
+	return unless $self->show_mem;
+
+	my $pixels = pack("C*", @_);
+
+	my $vram = SDL::Surface->new(
+		-width => 256,
+		-height => 256,
+		-depth => 8,	# 1 bit per pixel
+		-pitch => 256,	# bytes per line
+		-from => $pixels,
+		-Rmask => 0xffff00ff,
+		-Gmask => 0xffff00ff,
+		-Bmask => 0xffff00ff,
+	);
+
+	$vram->display_format;
+
+	my $rect = SDL::Rect->new( -x => 0, -y => 0, -width => 256, -height => 256 );
+	$vram->blit( $rect, $app, $rect_mem );
+
+	$app->sync;
+}
+
+=head2 key_pressed
+
+Check SDL event loop if there are any pending keys
+
+  my $key = $self->key_pressed;
+
+  if ( $self->key_pressed( 1 ) ) {
+  	# just to check other events, don't process
+	# key
+  }
+
+=cut
+
+my $pending_key;
+my $run_for = 2000;
+
+my $key_down;
+
+sub key_down {
+	my $self = shift;
+	my $key = shift;
+	warn "key_down($key) = ",$key_down->{$key}, "\n" if $self->debug;
+	return $key_down->{$key};
+}
+
+sub key_pressed {
+	my $self = shift;
+
+	# don't take key, just pull event
+	my $just_checking = shift || 0;
+
+	my $event = $self->event || confess "no event?";
+
+	$event->poll || return $pending_key;
+
+	my $type = $event->type();
+
+	exit if ($type == SDL_QUIT);
+
+	my $k = $pending_key;
+
+	if ($type == SDL_KEYDOWN) {
+		$k = $event->key_name();
+		$key_down->{$k}++;
+		if ( $k eq 'escape' ) {
+			$run_for = $self->cli;
+			warn "will check event loop every $run_for cycles\n";
+			$pending_key = '~';
+		} else {
+			warn "SDL_KEYDOWN ($type) = '$k'", $just_checking ? ' fake' : '', "\n";
+			$pending_key = $k;
 		}
+	} elsif ( $type == SDL_KEYUP ) {
+		my $up = $event->key_name();
+		$key_down->{$up} = 0;
+		warn "SDL_KEYUP ($type) = '$up'", $just_checking ? ' fake' : '', "\n";
+		undef $pending_key;
 	}
 
-	$app->unlock;
-	$app->sync;
+	warn "key_pressed = $pending_key\n" if $pending_key;
 
-	warn "Screen::render over\n";
+	return $pending_key;
+}
+
+=head2 loop
+
+Implement SDL event loop
+
+=cut
+
+sub loop {
+	my $self = shift;
+	my $event = SDL::Event->new();
+
+
+	MAIN_LOOP:
+	while ( 1 ) {
+		$self->key_pressed( 1 );
+		M6502::exec($run_for);
+		$self->render_vram( @mem[ 0x6000 .. 0x7fff ] );
+	}
 }
 
 =head1 SEE ALSO