--- kgsueme/kgsueme/game.pl 2003/06/12 23:24:53 1.56
+++ kgsueme/kgsueme/game.pl 2004/05/20 23:09:53 1.84
@@ -1,5 +1,7 @@
use utf8;
+use Scalar::Util ();
+
package game::goclock;
# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
@@ -9,18 +11,16 @@
use KGS::Constants;
-use base gtk::widget;
+use Glib::Object::Subclass
+ Gtk2::Label;
-sub new {
- my $class = shift;
- my $self = $class->SUPER::new(@_);
+sub INIT_INSTANCE {
+ my $self = shift;
- $self->{widget} = new Gtk2::Label;
+ $self->signal_connect (destroy => sub { $_[0]->stop });
$self->{set} = sub { };
$self->{format} = sub { "ERROR" };
-
- $self;
}
sub configure {
@@ -54,11 +54,12 @@
} else {
my $time = int (($_[0] - 1) % $interval + 1);
- sprintf "%s/%d [%d]",
+ sprintf "%s/%d =%d",
util::format_time $time,
$self->{moves},
- $time / ($self->{moves} || 1);
-
+ $self->{moves} > 1
+ ? $time / $self->{moves}
+ : $interval;
}
};
@@ -76,7 +77,7 @@
# we round the timer value slightly... the protocol isn't exact anyways,
# and this gives smoother timers ;)
my @format = $self->{format}->(int ($timer + 0.4));
- $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
+ $self->set_text ($self->{format}->(int ($timer + 0.4)));
$timer - int $timer;
}
@@ -119,27 +120,22 @@
remove Glib::Source delete $self->{timeout} if $self->{timeout};
}
-sub destroy {
- my ($self) = @_;
- $self->stop;
- $self->SUPER::destroy;
-}
-
package game::userpanel;
-use base gtk::widget;
+use Glib::Object::Subclass
+ Gtk2::HBox,
+ properties => [
+ Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
+ ];
-sub new {
- my $class = shift;
- my $self = $class->SUPER::new(@_);
-
- $self->{widget} = new Gtk2::HBox;
+sub INIT_INSTANCE {
+ my ($self) = @_;
- $self->{widget}->add (my $vbox = new Gtk2::VBox);
+ $self->add (my $vbox = new Gtk2::VBox);
$vbox->add ($self->{name} = new Gtk2::Label $self->{name});
$vbox->add ($self->{info} = new Gtk2::Label "");
- $vbox->add (($self->{clock} = new game::goclock)->widget);
+ $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
$vbox->add ($self->{imagebox} = new Gtk2::VBox);
@@ -147,7 +143,7 @@
}
sub configure {
- my ($self, $user, $rules) = @_;
+ my ($self, $app, $user, $rules) = @_;
if ($self->{name}->get_text ne $user->as_string) {
$self->{name}->set_text ($user->as_string);
@@ -158,8 +154,9 @@
if ($user->has_pic) {
# the big picture...
- appwin::userpic ($user->{name}, sub {
+ $app->userpic ($user->{name}, sub {
return unless $self->{imagebox};
+
if ($_[0]) {
$self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
$self->{imagebox}->add (gtk::image_from_data $_[0]);
@@ -184,41 +181,44 @@
package game;
+use Scalar::Util qw(weaken);
+
use KGS::Constants;
use KGS::Game::Board;
+use Gtk2::GoBoard;
+
+use Glib::Object::Subclass
+ Gtk2::Window;
+
use base KGS::Listener::Game;
use base KGS::Game;
-use base gtk::widget;
-
use POSIX qw(ceil);
sub new {
- my $self = shift;
- $self = $self->SUPER::new(@_);
+ my ($self, %arg) = @_;
- $self->listen($self->{conn});
+ $self = $self->Glib::Object::new;
+ $self->{$_} = delete $arg{$_} for keys %arg;
- $self->{window} = new Gtk2::Window 'toplevel';
- gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
+ $self->listen ($self->{conn});
- $self->{window}->signal_connect(delete_event => sub {
- $self->part;
- $self->destroy;
- 1;
- });
+ gtk::state $self, "game::window", undef, window_size => [600, 500];
+
+ $self->signal_connect (delete_event => sub { $self->part; 1 });
+ $self->signal_connect (destroy => sub { %{$_[0]} = () });
- $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
- gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
+ $self->add (my $hpane = new Gtk2::HPaned);
+ gtk::state $hpane, "game::hpane", undef, position => 500;
# LEFT PANE
- $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
+ $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
$self->{boardbox} = new Gtk2::VBox;
- $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
+ $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
# challenge
@@ -229,448 +229,112 @@
$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
{
- $frame->add(my $vbox = new Gtk2::VBox);
- $vbox->add($self->{title} = new Gtk2::Label $title);
+ $frame->add (my $vbox = new Gtk2::VBox);
+ $vbox->add ($self->{title} = new Gtk2::Label $title);
+
+ $vbox->add (my $hbox = new Gtk2::HBox);
- $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0;
+ $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
- $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
+ $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
+
+ $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
$scale->set_draw_value (0);
$scale->set_digits (0);
$self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
}
- $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
- $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
- $self->{board_label} = $aspect_frame->get_label_widget;
-
- $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
- $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
-
- $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
- $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
+ $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
# RIGHT PANE
- $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
- $self->{hpane}->set(position_set => 1);
+ $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
+ $hpane->set (position_set => 1);
gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
- $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
- $sw->set_policy("automatic", "always");
+ $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
+ $sw->set_policy ("automatic", "always");
+
+ $sw->add ($self->{userlist} = new userlist);
- $sw->add(($self->{userlist} = new userlist)->widget);
+ $self->{vpane}->add (my $vbox = new Gtk2::VBox);
- $self->{vpane}->add(my $vbox = new Gtk2::VBox);
+ $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
- $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
- $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
- $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
+ $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
+ for COLOUR_WHITE, COLOUR_BLACK;
- $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
+ $vbox->pack_start (($self->{chat} = new chat), 1, 1, 0);
+ weaken $self->{chat};
- $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
- $self->{entry}->signal_connect(activate => sub {
- my $text = $self->{entry}->get_text;
- $self->say($text) if $text =~ /\S/;
- $self->{entry}->set_text("");
+ $self->{chat}->signal_connect (command => sub {
+ my ($chat, $cmd, $arg) = @_;
+ if ($cmd eq "rsave") {
+ Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
+ } else {
+ $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
+ }
});
- $self->event_update_game;
$self;
}
sub event_update_users {
my ($self, $add, $update, $remove) = @_;
- $self->{userlist}->update ($add, $update, $remove);
-}
-
-sub join {
- my ($self) = @_;
- return if $self->{joined};
-
- $self->SUPER::join;
-
- $self->{window}->show_all;
-}
-
-sub part {
- my ($self) = @_;
-
- $self->SUPER::part;
- $self->destroy;
-}
-
-sub configure_event {
- my ($widget, $event, $self) = @_;
- delete $self->{stack};
- delete $self->{pixbuf};
- delete $self->{board_shown};
- delete $self->{background};
- $self->repaint_board;
- 0;
-}
-
-sub expose_event {
- my ($widget, $event, $self) = @_;
-
- $self->{pixbuf} or return;
-
- my $area = $event->area;
-
- $self->redraw ($area);
-
- 0;
-}
-
-# something Gtk2 fixed
-sub INTERP_NEAREST (){ 'nearest' }
-sub INTERP_TILES (){ 'tiles' }
-sub INTERP_BILINEAR (){ 'bilinear' }
-sub INTERP_HYPER (){ 'hyper' }
-
-sub new_pixbuf {
- my ($w, $h, $alpha, $fill) = @_;
-
- my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
- $pixbuf->fill ($fill) if defined $fill;
-
- $pixbuf;
-}
-
-sub scale_pixbuf {
- my ($src, $w, $h, $mode) = @_;
-
- my $dst = new_pixbuf $w, $h, 1;
-
- $src->scale(
- $dst, 0, 0, $w, $h, 0, 0,
- $w / $src->get_width, $h / $src->get_height,
- $mode,
- );
-
- $dst;
-}
-
-# create a stack of stones
-sub create_stack {
- my ($self, $mark, $size, $rand) = @_;
-
- my $shadow = $size * 0.05;
-
- my $c = \$self->{stack}{$mark};
- unless ($$c) {
- for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
- my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
-
- # zeroeth the shadow
- if ($mark & (MARK_B | MARK_W)) {
- # the -0.5's are a mystery to me
- $::shadow_img->composite (
- $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
- $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
- );
- }
-
- # first the big stones (handicap stones could be different)
- for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
- [MARK_W, $mark & MARK_MOVE ? 255 : 255],
- [MARK_GRAY_B, 128],
- [MARK_GRAY_W, 128]) {
- my ($mask, $alpha) = @$_;
- if ($mark & $mask) {
- $stone->composite (
- $base, 0, 0, $size, $size, 0, 0,
- $size / $stone->get_width, $size / $stone->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
- );
- }
- }
-
- # then the small stones
- for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
- [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
- my ($mask, $img) = @$_;
- if ($mark & $mask) {
- $img->composite (
- $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
- $size / $img->get_width / 2, $size / $img->get_height / 2,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
- );
- }
- }
-
- # and lastly any markers
- my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
-
- for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
- [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
- [MARK_SQUARE, $::square_img[$dark_bg]]) {
- my ($mask, $img) = @$_;
- if ($mark & $mask) {
- $img->composite (
- $base, 0, 0, $size, $size, 0, 0,
- $size / $img->get_width, $size / $img->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
- );
- }
- }
+ return unless $self->{userlist};
- push @$$c, $base;
- }
- }
-
- $$c->[$rand % @$$c];
-}
-
-sub pixbuf_text {
- my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
-
- my @c = grep $_,
- map $::font[$colour][$::fontmap{$_}],
- split //, $text;
-
- if (@c) {
- my $spacing = $height * 0.1;
- my $s = $height / List::Util::max map $_->get_height, @c;
- my $W = List::Util::sum map $_->get_width, @c;
-
- $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
- $y -= $height * 0.5;
-
- for (@c) {
- my $w = $_->get_width * $s;
- # +2 == don't fight the rounding
- $_->composite ($pixbuf,
- $x, $y, $w+2, $height+2, $x, $y, $s, $s,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
+ $self->{userlist}->update ($add, $update, $remove);
- $x += $w + $spacing;
- }
+ my %important;
+ $important{$self->{user1}{name}}++;
+ $important{$self->{user2}{name}}++;
+ $important{$self->{user3}{name}}++;
+
+ if (my @users = grep $important{$_->{name}}, @$add) {
+ $self->{chat}->append_text ("\n");
+ $self->{chat}->append_text (" " . $_->as_string . "") for @users;
+ }
+ if (my @users = grep $important{$_->{name}}, @$remove) {
+ $self->{chat}->append_text ("\n");
+ $self->{chat}->append_text (" " . $_->as_string . "") for @users;
}
-}
-sub pixbuf_rect {
- my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
- # we fake lines by... a horrible method :/
- my $colour_pb = new_pixbuf 1, 1, 0, $colour;
- $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
- INTERP_NEAREST, $alpha);
}
-sub repaint_board {
+sub join {
my ($self) = @_;
- my $canvas = $self->{canvas};
- my $expose_area = undef;
-
- return $expose_area unless $self->{board};
-
- my ($w, $h) = ($canvas->allocation->values)[2,3];
-
- die "FATAL: board aspect ratio != 1" unless $w == $h;
-
- my $s = $w;
-
- return unless $s >= 200;
-
- my $size = $self->{size};
-
- # we leave enough space for the shadows.. I like smaller stones, and we
- # do no need to do the nifty recursive screen updates that goban2 does
- my $border = int ($s / ($size + 3) * 0.5);
- my $s2 = $s - $border * 2;
- my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
- my $ofs = int ($edge / 2);
-
- my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
-
- my $pixbuf;
-
- my $oldboard;
-
- if ($self->{background}) {
- if ($oldboard = $self->{board_shown}) {
- $pixbuf = $self->{pixbuf};
- } else {
- $pixbuf = $self->{background}->copy;
- $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
- }
- } else {
- $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
-
- my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
-
- if ($s < $bw && $s < $bh) {
- $pixbuf = new_pixbuf $s, $s, 0;
- $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
- } else {
- $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
- }
-
- my $linew = int ($s / 40 / $size);
-
- # ornamental border... we have time to waste :/
- pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
- pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
- pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
- pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
-
- for my $i (1 .. $size) {
- pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
- pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
-
- # 38 max, but we allow a bit more
- my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z
- AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i];
-
- pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
- pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
- pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
- pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
-
- $a++;
- $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
- }
-
- # hoshi points
- my $hoshi = sub {
- my ($x, $y) = @_;
- my $hs = int ($edge / 4) | 1;
- $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
-
- # we use the shadow mask... not perfect, but I want to finish this
- $::shadow_img->composite ($pixbuf,
- $x, $y, $hs + 1, $hs + 1, $x, $y,
- $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
- };
-
- my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
- $hoshi->($h1, $h1);
- $hoshi->($size - $h1 + 1, $h1);
- $hoshi->($h1, $size - $h1 + 1);
- $hoshi->($size - $h1 + 1, $size - $h1 + 1);
-
- if ($size % 2) { # on odd boards, also the remaining 5
- my $h2 = ($size + 1) / 2;
- if ($size > 10) {
- $hoshi->($h1, $h2);
- $hoshi->($size - $h1 + 1, $h2);
- $hoshi->($h2, $size - $h1 + 1);
- $hoshi->($h2, $h1);
- }
- # the tengen
- $hoshi->($h2, $h2);
- }
-
- unless ($::config->{conserve_memory} > 1) {
- $self->{background} = $pixbuf;
- $pixbuf = $pixbuf->copy;
- }
- }
-
- $self->{pixbuf} = $pixbuf;
-
- for my $x (1 .. $size) {
- for my $y (1 .. $size) {
- my $rand = ($x ^ $y ^ 0x5555);
-
- my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
-
- if ($::config->{randomize}) {
- $dx += ($rand % 7) - 3;
- $dy += ($rand / 3 % 7) - 3;
- }
-
- my $shadow = $edge * 0.05;
- my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
-
- my $mark = $self->{board}{board}[$x-1][$y-1];
- my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
-
- if ($oldboard) {
- next if $old == $mark; # no change
-
- $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
- $expose_area = $expose_area
- ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
- : new Gtk2::Gdk::Rectangle @$area;
- }
-
- if ($mark) {
- my $pb = $self->create_stack($mark, $edge, $rand);
-
- $pb->composite ($pixbuf, @$area,
- $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
-
- # labels are handled here because they are quite rare
- if ($mark & MARK_LABEL) {
- my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
-
- if ($white) {
- pixbuf_text $pixbuf, 0,
- $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
- $self->{board}{label}[$x-1][$y-1];
- }
- pixbuf_text $pixbuf, $white,
- $k[$x], $k[$y], $ofs * 0.7,
- $self->{board}{label}[$x-1][$y-1];
- }
- }
- }
- }
-
- $self->{board_shown} = Storable::dclone $self->{board};
- #d# save
- #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
-
- $expose_area;
-}
-
-sub redraw {
- my ($self, $area) = @_;
+ return if $self->{joined};
- if ($area && $self->{pixbuf}) {
- my ($x, $y, $w, $h) = $area->values;
+ $self->SUPER::join;
- $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
- $x, $y, $x, $y, $w, $h,
- "normal", 0, 0);
- $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
- $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
- }
+ $self->show_all;
}
sub update_board {
my ($self) = @_;
return unless $self->{path};
- #$self->{update_board_cb} ||= add Glib::Idle sub {
- my $move = int $self->{moveadj}->get_value;
+ my $move = int $self->{moveadj}->get_value;
- my $running = $move == @{$self->{path}};
+ my $running = $move == @{$self->{path}};
- $self->{board_label}->set_text ("Move " . ($move - 1));
+ $self->{board_label}->set_text ("Move " . ($move - 1));
- $self->{board} = new KGS::Game::Board $self->{size};
- $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
-
- for my $colour (WHITE, BLACK) {
- $self->{userpanel}[$colour]->set_state (
- $self->{board}{captures}[$colour],
- $self->{board}{timer}[$colour],
- ($running && $self->{lastmove_colour} == !$colour)
- ? $self->{lastmove_time} : 0
- );
- }
+ $self->{cur_board} = new KGS::Game::Board $self->{size};
+ $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
- $self->redraw ($self->repaint_board);
+ for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
+ $self->{userpanel}[$colour]->set_state (
+ $self->{cur_board}{captures}[$colour],
+ $self->{cur_board}{timer}[$colour],
+ ($running && $self->{lastmove_colour} == !$colour)
+ ? $self->{lastmove_time} : 0
+ );
+ }
- # delete $self->{update_board_cb};
- #}
+ $self->{board}->set_board ($self->{cur_board});
}
sub event_update_tree {
@@ -727,16 +391,19 @@
$text .= $_;
}
- $self->{text}->append_text ($text);
+ $self->{chat}->append_text ($text);
}
sub event_join {
my ($self) = @_;
- $self->SUPER::event_join;
+
+ $self->SUPER::event_join (@_);
+ $self->event_update_game;
}
sub event_part {
my ($self) = @_;
+
$self->SUPER::event_part;
$self->destroy;
}
@@ -750,42 +417,48 @@
my ($self) = @_;
$self->SUPER::event_update_game;
- my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window";
- $self->{window}->set_title("KGS Game $title");
+ return unless $self->{joined};
+
+ my $title = defined $self->{channel}
+ ? $self->owner->as_string . " " . $self->opponent_string
+ : "Game Window";
+ $self->set_title("KGS Game $title");
$self->{title}->set_text ($title);
- $self->{user}[BLACK] = $self->{user1};
- $self->{user}[WHITE] = $self->{user2};
+ $self->{user}[COLOUR_BLACK] = $self->{user1};
+ $self->{user}[COLOUR_WHITE] = $self->{user2};
# show board
- $self->{left}->remove ($_) for $self->{left}->get_children;
- if ($self->is_valid) {
- $self->{left}->add ($self->{boardbox});
- (delete $self->{challenge})->destroy if $self->{challenge};
+ if ($self->is_inprogress) {
+ $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge} && $self->{boardbox}->parent;
+ $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
} else {
- $self->{left}->add ($self->{challenge}->widget);
+ $self->{left}->remove ($self->{boardbox}) if $self->{boardbox}->parent;
+ $self->{left}->add ($self->{challenge}->widget) unless $self->{challenge}->widget->parent;
}
$self->{left}->show_all;
# view text
+ eval { #d#
my @ga;
$ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
. " (" . (util::toxml $gameopt{$self->option}) . ")";
$ga[1] = "\nFlags:";
- $ga[1] .= " valid" if $self->is_valid;
+ $ga[1] .= " started" if $self->is_inprogress;
$ga[1] .= " adjourned" if $self->is_adjourned;
$ga[1] .= " scored" if $self->is_scored;
$ga[1] .= " saved" if $self->is_saved;
- $ga[2] = "\nOwner: " . (util::toxml $self->{user3}->as_string) . "" if $self->{user3}->is_valid;
+ $ga[2] = "\nOwner: " . (util::toxml $self->{user3}->as_string) . ""
+ if $self->{user3}->is_inprogress;
$ga[3] = "\nPlayers: " . (util::toxml $self->{user2}->as_string) . ""
. " vs. " . (util::toxml $self->{user1}->as_string) . ""
- if $self->is_valid;
+ if $self->is_inprogress;
- if ($self->is_valid) {
+ if ($self->is_inprogress) {
$ga[4] = "\nHandicap: " . $self->{handicap};
$ga[5] = "\nKomi: " . $self->{komi};
$ga[6] = "\nSize: " . $self->size_string;
@@ -804,15 +477,18 @@
$text .= "";
$self->{gatext} = \@ga;
+ };
- $self->{text}->append_text ($text);
+ $self->{chat}->append_text ($text);
}
sub event_update_rules {
my ($self, $rules) = @_;
- $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
- for BLACK, WHITE;
+ if ($self->{user}) {
+ $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
+ for COLOUR_BLACK, COLOUR_WHITE;
+ }
sound::play 3, "gamestart";
@@ -828,14 +504,14 @@
$text .= util::format_time $rules->{time};
$text .= " ABS";
} elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
- $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
+ $text .= util::format_time $rules->{time};
$text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
} elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
$text .= util::format_time $rules->{time};
$text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
}
- $self->{text}->append_text ("$text");
+ $self->{chat}->append_text ("$text");
}
sub inject_resign_game {
@@ -843,7 +519,7 @@
sound::play 3, "resign";
- $self->{text}->append_text ("\n"
+ $self->{chat}->append_text ("\n"
. "\n"
. (util::toxml $self->{user}[$msg->{player}]->as_string)
. " resigned.");
@@ -852,19 +528,18 @@
sub inject_final_result {
my ($self, $msg) = @_;
- $self->{text}->append_text ("\n"
+ $self->{chat}->append_text ("\n"
. "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
. ""
);
}
-sub destroy {
- my ($self) = @_;
- $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
- for BLACK, WHITE;
- $self->SUPER::destroy;
- delete $appwin::gamelist->{game}{$self->{channel}};
+sub event_challenge {
+ my ($self, $challenge) = @_;
+
+ use KGS::Listener::Debug;
+ $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
}
1;