--- Screen.pm	2007/08/05 14:08:48	149
+++ Screen.pm	2007/08/05 15:16:10	150
@@ -237,7 +237,17 @@
 
 	my $event = $self->event || confess "no event?";
 
-	$event->poll || return $pending_key;
+	if ( ! $event->poll ) {
+		if ( my $h = $self->session_event('key_pressed') ) {
+			my ( $key, $state ) = %$h;
+			if ( $state ) {
+				$pending_key = $key;
+			} else {
+				undef $pending_key;
+			}
+		}
+		return $pending_key;
+	}
 
 	my $type = $event->type();
 
@@ -255,18 +265,17 @@
 		} else {
 			warn "SDL_KEYDOWN ($type) = '$k'", $just_checking ? ' fake' : '', "\n";
 			$pending_key = $k;
+			$self->record_session('key_pressed', { $k => 1 });
 		}
 	} elsif ( $type == SDL_KEYUP ) {
 		my $up = $event->key_name();
-		$key_down->{$up} = 0;
 		warn "SDL_KEYUP ($type) = '$up'", $just_checking ? ' fake' : '', "\n";
+		$self->record_session('key_pressed', { $up => 0 });
+		$key_down->{$up} = 0;
 		undef $pending_key;
 	}
 
-	if ( $pending_key ) {
-		warn "key_pressed = $pending_key\n";
-		$self->record_session('key_pressed', $pending_key);
-	}
+	warn "key_pressed = $pending_key\n" if ( $pending_key );
 
 	return $pending_key;
 }