X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=SCX%2FGUI.pm;h=af9f769493d4ae7bdca18409ed15ac0589b79106;hb=c54ae2a857087ca405826081955dcdef81abc7bb;hp=2f1aa5af7b08349f5038afd1c2f59167fb2d3f1f;hpb=972687391b212153ee34a6ecf616fd1c1a53d01b;p=slotcarman.git

diff --git a/SCX/GUI.pm b/SCX/GUI.pm
index 2f1aa5a..af9f769 100755
--- a/SCX/GUI.pm
+++ b/SCX/GUI.pm
@@ -8,6 +8,7 @@ use utf8;
 use Carp;
 use Encode;
 use Gtk2 '-init';
+use Gtk2::Gdk::Keysyms;
 use Glib qw(TRUE FALSE);
 
 our $BASE_SIZE;
@@ -26,7 +27,7 @@ sub new {
 
 	$self->{builder}->add_from_file('slotcarman.glade');
 
-	$self->{builder}->connect_signals(undef);
+	$self->{builder}->connect_signals($self);
 	$self->load_all_images;
 	$self->set_font_sizes;
 
@@ -60,14 +61,52 @@ sub delete_event { Gtk2->main_quit; }
 
 sub quit { Gtk2->main_quit; }
 
+use Data::Dumper;
+
+sub hotkey {
+	my ($window, $key, $self) = @_;
+
+	if ($key->keyval == $Gtk2::Gdk::Keysyms{F5}) {
+		if ($self->{fullscreen}) {
+			leave_fullscreen($window, $self);
+		} else {
+			fullscreen($window, $self);
+		}
+		return 1;
+	}
+	return 0;
+}
+
 sub fullscreen {
-	my ($self) = @_;
+	my ($widget, $self) = @_;
+
+	return if $self->{fullscreen};
 
+	$self->get_object('menubar1')->hide;
+	$self->get_object('statusbar1')->hide;
 	$self->get_object('slotcarman')->fullscreen;
+
+	$self->{fullscreen} = 1;
 	my $h = $self->get_object('image_car1')->allocation->height;
-	print "h=$h\n";
+	my $h1 = $self->get_object('slotcarman')->allocation->height;
+	print "h=$h, h1=$h1\n";
 }
-	
+
+sub leave_fullscreen {
+	my ($widget, $self) = @_;
+
+	return if !$self->{fullscreen};
+
+	$self->get_object('menubar1')->show;
+	$self->get_object('statusbar1')->show;
+	$self->get_object('slotcarman')->unfullscreen;
+
+	$self->{fullscreen} = undef;;
+	my $h = $self->get_object('image_car1')->allocation->height;
+	my $h1 = $self->get_object('slotcarman')->allocation->height;
+	print "h=$h, h1=$h1\n";
+}
+
 sub watch_resize {
 	my ($window, $rectangle, $self) = @_;
 	print "w=", $rectangle->width, ", h=", $rectangle->height, "\n";
@@ -81,7 +120,7 @@ sub set_font_sizes {
 
 	if ($self->{img_height} <= 80) {
 		$self->{label_size} = 10;
-		$self->{value_size} = 18;
+		$self->{value_size} = 16;
 		$self->{lap_size} = 24;
 	} elsif ($self->{img_height} <= 100) {
 		$self->{label_size} = 12;
@@ -110,10 +149,14 @@ sub load_all_images {
 	$self->{throttle_images} = [
 		load_image_set('img/throttle%d.svg', 13, $h)
 	];
+	$self->{throttle_button_images} = [
+		load_image_set('img/throttle%dbutton.svg', 12, $h)
+	];
 	$self->{fuel_images} = [
 			load_image_set('img/fuel%d.svg', 8, int(0.6 * $h))
 	];
-	$self->{car_images} = load_image_dir('img/SCXCars', $h);
+	$self->{car_images} = load_images_glob('img/SCXCars/*', $h);
+	$self->{state_images} = load_images_glob('img/state*.svg', $h);
 	$self->{semaphore_images} = [
 			load_image_set('img/semaphore%d.svg', 5, 1.5 * $h)
 	];
@@ -135,11 +178,11 @@ sub load_image_set {
 	return @rv;
 }
 
-sub load_image_dir {
-	my ($dir, $height) = @_;
+sub load_images_glob {
+	my ($glob, $height) = @_;
 
 	my %rv;
-	for my $file (<$dir/*>) {
+	for my $file (glob($glob)) {
 		$file = Encode::decode('utf-8', $file);
 		my $name = $file;
 		$name =~ s/.*\///;
@@ -193,15 +236,18 @@ sub set_image {
 }
 
 sub set_throttle {
-	my ($self, $row, $val) = @_;
+	my ($self, $row, $val, $button) = @_;
 
 	$val = 13 if !defined $val;
-	$self->set_image('image_throttle', $row, 'throttle', $val);
+	$self->set_image('image_throttle', $row,
+		$button ? 'throttle_button' : 'throttle', $val);
 }
 
 sub set_fuel {
 	my ($self, $row, $val) = @_;
 
+	return if $val > 8;
+
 	$self->set_image('image_fuel', $row, 'fuel', $val || 0);
 }
 
@@ -220,16 +266,21 @@ sub set_lap {
 }
 
 sub set_distance {
-	my ($self, $row, $time, $lap_diff, $time_diff) = @_;
+	my ($self, $row, $time, $lap_diff, $time_diff, $greyout) = @_;
 
 	my $text = '--';
 
 	if (defined $time) {
 		$text = format_race_time($time);
 	} elsif (defined $time_diff) {
-		$text = '−' . format_lap_time($time_diff);
+		$text = '+' . format_lap_time($time_diff);
 	} elsif (defined $lap_diff) {
-		$text = '−' . $lap_diff . ' laps';
+		$text = '+' . $lap_diff
+			. ($lap_diff == 1 ? ' lap' : ' laps');
+	}
+
+	if ($greyout) {
+		$text = '<span fgcolor="grey">' . $text . '</span>';
 	}
 
 	$self->set_label('label_distance', $row, $text);
@@ -241,12 +292,6 @@ sub set_laptime {
 	$self->set_label('label_laptime', $row, format_lap_time($text));
 }
 
-sub set_avg_lap {
-	my ($self, $row, $text) = @_;
-
-	$self->set_label('label_avg_lap', $row, format_lap_time($text));
-}
-
 sub set_best_lap {
 	my ($self, $row, $text) = @_;
 
@@ -265,17 +310,6 @@ sub set_car_id {
 	$self->set_label('label_car_id', $row, $text);
 }
 
-sub enter_pit_lane {
-	my ($self, $row) = @_;
-	$self->set_label('label_laptime', $row, 'PIT');
-}
-
-sub leave_pit_lane {
-	my ($self, $row) = @_;
-
-	$self->set_label('label_laptime', $row, 'GO!');
-}
-
 sub show_semaphore {
 	my ($self, $num) = @_;
 
@@ -335,5 +369,11 @@ sub format_lap_time {
 		: '--';
 }
 
+sub set_state {
+	my ($self, $num, $name) = @_;
+
+	$self->set_image('image_status', $num, 'state', 'state '.$name);
+}
+
 1;