--- kgsueme/kgsueme/game.pl 2003/05/31 15:19:55 1.8
+++ kgsueme/kgsueme/game.pl 2003/06/28 16:46:51 1.67
@@ -1,3 +1,187 @@
+use utf8;
+
+package game::goclock;
+
+# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
+# is completely borked.
+
+use Time::HiRes ();
+
+use KGS::Constants;
+
+use base gtk::widget;
+
+sub new {
+ my $class = shift;
+ my $self = $class->SUPER::new(@_);
+
+ $self->{widget} = new Gtk2::Label;
+
+ $self->{set} = sub { };
+ $self->{format} = sub { "ERROR" };
+
+ $self;
+}
+
+sub configure {
+ my ($self, $timesys, $main, $interval, $count) = @_;
+
+ if ($timesys == TIMESYS_ABSOLUTE) {
+ $self->{set} = sub { $self->{time} = $_[0] };
+ $self->{format} = sub { util::format_time $_[0] };
+
+ } elsif ($timesys == TIMESYS_BYO_YOMI) {
+ my $low = $interval * $count;
+
+ $self->{set} = sub { $self->{time} = $_[0] };
+
+ $self->{format} = sub {
+ if ($_[0] > $low) {
+ util::format_time $_[0] - $low;
+ } else {
+ sprintf "%s (%d)",
+ util::format_time int (($_[0] - 1) % $interval + 1),
+ ($_[0] - 1) / $interval;
+ }
+ };
+
+ } elsif ($timesys == TIMESYS_CANADIAN) {
+ $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
+
+ $self->{format} = sub {
+ if (!$self->{moves}) {
+ util::format_time $_[0] - $low;
+ } else {
+ my $time = int (($_[0] - 1) % $interval + 1);
+
+ sprintf "%s/%d =%d",
+ util::format_time $time,
+ $self->{moves},
+ $time / ($self->{moves} || 1);
+
+ }
+ };
+
+ } else {
+ # none, or unknown
+ $self->{set} = sub { };
+ $self->{format} = sub { "---" }
+ }
+}
+
+sub refresh {
+ my ($self, $timestamp) = @_;
+ my $timer = $self->{time} + $self->{start} - $timestamp;
+
+ # 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)));
+
+ $timer - int $timer;
+}
+
+sub set_time {
+ my ($self, $time) = @_;
+
+ # we ignore requests to re-set the time of a running clock.
+ # this is the easiest way to ensure that commentary etc.
+ # doesn't re-set the clock. yes, this is frickle design,
+ # but I think the protocol is to blame here, which gives
+ # very little time information. (cgoban2 also has had quite
+ # a lot of small time update problems...)
+ unless ($self->{timeout}) {
+ $self->{set}->($time->[0], $time->[1]);
+ $self->refresh ($self->{start});
+ }
+}
+
+sub start {
+ my ($self, $when) = @_;
+
+ $self->stop;
+
+ $self->{start} = $when;
+
+ my $timeout; $timeout = sub {
+ my $next = $self->refresh (Time::HiRes::time) * 1000;
+ $next += 1000 if $next < 0;
+ $self->{timeout} = add Glib::Timeout $next, $timeout;
+ 0;
+ };
+
+ $timeout->();
+}
+
+sub stop {
+ my ($self) = @_;
+
+ 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;
+
+sub new {
+ my $class = shift;
+ my $self = $class->SUPER::new(@_);
+
+ $self->{widget} = new Gtk2::HBox;
+
+ $self->{widget}->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->{imagebox} = new Gtk2::VBox);
+
+ $self;
+}
+
+sub configure {
+ my ($self, $user, $rules) = @_;
+
+ if ($self->{name}->get_text ne $user->as_string) {
+ $self->{name}->set_text ($user->as_string);
+
+ $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
+ $self->{imagebox}->add (gtk::image_from_data undef);
+ $self->{imagebox}->show_all;
+
+ if ($user->has_pic) {
+ # the big picture...
+ appwin::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]);
+ $self->{imagebox}->show_all;
+ }
+ });
+ }
+ }
+
+ $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
+}
+
+sub set_state {
+ my ($self, $captures, $timer, $when) = @_;
+
+ $self->{clock}->stop unless $when;
+ $self->{clock}->set_time ($timer);
+ $self->{clock}->start ($when) if $when;
+
+ $self->{info}->set_text ("$captures pris.");
+}
+
package game;
use KGS::Constants;
@@ -8,6 +192,8 @@
use base gtk::widget;
+use POSIX qw(ceil);
+
sub new {
my $self = shift;
$self = $self->SUPER::new(@_);
@@ -15,89 +201,107 @@
$self->listen($self->{conn});
$self->{window} = new Gtk2::Window 'toplevel';
- my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
- $self->{window}->set_title("KGS Game $title");
gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
$self->{window}->signal_connect(delete_event => sub {
- if ($self->{joined}) {
- $self->part;
- } else {
- $self->event_part;
- }
+ $self->part;
+ $self->destroy;
1;
});
$self->{window}->add($self->{hpane} = new Gtk2::HPaned);
gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
- $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
+ # LEFT PANE
- $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
+ $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
+
+ $self->{boardbox} = new Gtk2::VBox;
- {
- # grrr...
- $frame->add(my $vbox = new Gtk2::VBox);
- $vbox->add($self->{title} = new Gtk2::Label $title);
+ $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
- $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.01, 0.1, 0;
+ # challenge
- $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
- $scale->set_draw_value (0);
+ $self->{challenge} = new challenge channel => $self->{channel};
+
+ # board box (aspect/canvas)
+
+ $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);
- $self->{moveadj}->signal_connect (value_changed => sub {
- return unless $self->{path};
+ $vbox->add (my $hbox = new Gtk2::HBox);
- my $move = int (@{$self->{path}} * $_[0]->get_value);
+ $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
- $self->{board} = new KGS::Game::Board $self->{size};
- $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
+ $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
- $self->redraw ($self->repaint_board);
+ $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
+ $scale->set_draw_value (0);
+ $scale->set_digits (0);
- $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
- });
+ $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
}
-
- $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0);
- $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});
- $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
+ # RIGHT PANE
+
+ $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
$self->{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");
- $sw->add(($self->{userlist} = new gtk::userlist)->widget);
+ $sw->add(($self->{userlist} = new userlist)->widget);
$self->{vpane}->add(my $vbox = new Gtk2::VBox);
-
- $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
- $sw->set_policy("never", "always");
- $sw->add(($self->{text} = new gtk::text)->widget);
+ $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);
+
+ $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
$vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
$self->{entry}->signal_connect(activate => sub {
my $text = $self->{entry}->get_text;
- # add message
+ $self->say($text) if $text =~ /\S/;
$self->{entry}->set_text("");
});
+ $self->event_update_game;
$self;
}
sub event_update_users {
- my ($self) = @_;
+ my ($self, $add, $update, $remove) = @_;
+
+ $self->{userlist}->update ($add, $update, $remove);
+
+ my %important;
+ $important{$self->{user1}{name}}++;
+ $important{$self->{user2}{name}}++;
+ $important{$self->{user3}{name}}++;
+
+ if (my @users = grep $important{$_->{name}}, @$add) {
+ $self->{text}->append_text ("\n");
+ $self->{text}->append_text (" " . $_->as_string . "") for @users;
+ }
+ if (my @users = grep $important{$_->{name}}, @$remove) {
+ $self->{text}->append_text ("\n");
+ $self->{text}->append_text (" " . $_->as_string . "") for @users;
+ }
- $self->{userlist}->update($self->{users});
}
sub join {
my ($self) = @_;
+ return if $self->{joined};
+
$self->SUPER::join;
$self->{window}->show_all;
@@ -105,349 +309,232 @@
sub part {
my ($self) = @_;
- $self->SUPER::part;
-
- $self->{window}->hide;
-}
-
-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;
- my ($ox, $oy, $s) = @{$self->{offsets}};
-
- $self->redraw (
- (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height)
- ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s)
- );
-
- 0;
+ $self->SUPER::part;
+ $self->destroy;
}
-# 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) = @_;
+sub update_board {
+ my ($self) = @_;
+ return unless $self->{path};
- my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
- $pixbuf->fill ($fill) if defined $fill;
+ my $move = int $self->{moveadj}->get_value;
- $pixbuf;
-}
+ my $running = $move == @{$self->{path}};
-sub scale_pixbuf {
- my ($src, $w, $h, $mode) = @_;
+ $self->{board_label}->set_text ("Move " . ($move - 1));
- my $dst = new_pixbuf $w, $h, 1;
+ $self->{cur_board} = new KGS::Game::Board $self->{size};
+ $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
- $src->scale(
- $dst, 0, 0, $w, $h, 0, 0,
- $w / $src->get_width, $h / $src->get_height,
- $mode,
- );
+ for my $colour (WHITE, 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
+ );
+ }
- $dst;
+ $self->{board}->set_board ($self->{cur_board});
}
-# 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)) {
- $::black_img[0]->composite (
- $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
- $size / $stone->get_width, $size / $stone->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128
- );
- }
-
- # first the big stones (handicap stones different for effect)
- for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
- [MARK_W, $mark & MARK_MOVE ? 255 : 192],
- [MARK_GRAY_B, 128],
- [MARK_GRAY_W, 128]) {
- my ($mask, $alpha) = @$_;
- if ($mark & $mask) {
- $stone->composite (
- $base, 0, 0, $size, $size, -0.5, -0.5,
- $size / $stone->get_width, $size / $stone->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
- );
- }
- }
-
- # then the samll 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, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2,
- $size / $img->get_width / 2, $size / $img->get_height / 2,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
- );
- }
- }
-
- # and lastly any markers
- my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
+sub event_update_tree {
+ my ($self) = @_;
- 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.5, -0.5,
- $size / $img->get_width, $size / $img->get_height,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255
- );
- }
- }
+ $self->{path} = $self->get_path;
- push @$$c, $base;
+ if ($self->{moveadj}) {
+ my $upper = $self->{moveadj}->upper;
+ my $pos = $self->{moveadj}->get_value;
+ my $move = scalar @{$self->{path}};
+
+ $self->{moveadj}->upper ($move);
+
+ $self->{moveadj}->changed;
+ if ($pos == $upper) {
+ $self->{moveadj}->value ($move);
+ $self->{moveadj}->value_changed;
}
}
-
- $$c->[$rand % @$$c];
}
-sub pixbuf_text {
- my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
-
- my @c = grep $_,
- map $::font[$colour][$::fontmap{$_}],
- split //, $text;
+sub event_update_comments {
+ my ($self, $node, $comment, $newnode) = @_;
+ $self->SUPER::event_update_comments($node, $comment, $newnode);
+
+ my $text;
+
+ $text .= "\nMove $node->{move}, Node $node->{id}"
+ if $newnode;
+
+ for (split /\n/, $comment) {
+ $text .= "\n";
+ if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
+ $text .= "" . (util::toxml $1) . ":";
+ }
+
+ # coords only for 19x19 so far
+ $_ = util::toxml $_;
+ s{
+ (
+ \b
+ (?:[bw])?
+ [, ]{0,2}
+ [a-hj-t] # valid for upto 19x19
+ \s?
+ [1-9]?[0-9]
+ \b
+ )
+ }{
+ "$1";
+ }sgexi;
- 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;
+ $text .= $_;
+ }
- $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
- $y -= $height * 0.5;
+ $self->{text}->append_text ($text);
+}
- for (@c) {
- my $w = $_->get_width * $s;
- $_->composite ($pixbuf,
- $x, $y, $w+1, $height+1, $x, $y, $s, $s,
- $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
+sub event_join {
+ my ($self) = @_;
+ $self->SUPER::event_join;
+}
- $x += $w + $spacing;
- }
- }
+sub event_part {
+ my ($self) = @_;
+ $self->SUPER::event_part;
+ $self->destroy;
}
-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 event_move {
+ my ($self, $pass) = @_;
+ sound::play 1, $pass ? "pass" : "move";
}
-sub repaint_board {
+sub event_update_game {
my ($self) = @_;
- my $canvas = $self->{canvas};
- my $expose_area = undef;
+ $self->SUPER::event_update_game;
- return $expose_area unless $self->{board};
+ my $title = defined $self->{channel}
+ ? $self->owner->as_string . " " . $self->opponent_string
+ : "Game Window";
+ $self->{window}->set_title("KGS Game $title");
+ $self->{title}->set_text ($title);
- my ($w, $h) = ($canvas->allocation->values)[2,3];
-
- my $s = $w > $h ? $h : $w;
+ $self->{user}[BLACK] = $self->{user1};
+ $self->{user}[WHITE] = $self->{user2};
- return unless $s > 128;
+ # show board
- $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
-
- my $size = $self->{size};
-
- my $border = int ($s / ($size + 3) * 0.5);
- my $s2 = $s - $border * 2;
- my $edge = int ($s2 / ($size + 1) * 0.95) - ($::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;
- }
+ $self->{left}->remove ($_) for $self->{left}->get_children;
+ if ($self->is_valid) {
+ $self->{left}->add ($self->{boardbox});
+ (delete $self->{challenge})->destroy if $self->{challenge};
} 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 / 25 / $size);
+ $self->{left}->add ($self->{challenge}->widget);
+ }
+ $self->{left}->show_all;
- # 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;
+ # 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] .= " 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[3] = "\nPlayers: " . (util::toxml $self->{user2}->as_string) . ""
+ . " vs. " . (util::toxml $self->{user1}->as_string) . ""
+ if $self->is_valid;
+
+ if ($self->is_valid) {
+ $ga[4] = "\nHandicap: " . $self->{handicap};
+ $ga[5] = "\nKomi: " . $self->{komi};
+ $ga[6] = "\nSize: " . $self->size_string;
+ }
- $a++;
- $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
- }
+ if ($self->is_scored) {
+ $ga[7] = "\nResult: " . $self->score_string;
+ }
- unless ($::config->{conserve_memory}) {
- $self->{background} = $pixbuf;
- $pixbuf = $pixbuf->copy;
+ $text = "\n";
+ for (0..7) {
+ if ($self->{gatext}[$_] ne $ga[$_]) {
+ $text .= $ga[$_];
}
}
+ $text .= "";
- $self->{pixbuf} = $pixbuf;
-
- # hoshi-points(!)#d#
- # caching of empty board gfx(!)#d#
+ $self->{gatext} = \@ga;
+ };
+
+ $self->{text}->append_text ($text);
+}
- for my $x (1 .. $size) {
- for my $y (1 .. $size) {
- my $rand = ($x ^ $y ^ 0x5555);
+sub event_update_rules {
+ my ($self, $rules) = @_;
- my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
+ $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
+ for BLACK, WHITE;
- if ($::config->{randomize}) {
- $dx += ($rand % 7) - 3;
- $dy += ($rand / 3 % 7) - 3;
- }
+ sound::play 3, "gamestart";
- 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;
- }
+ my $text = "\n";
- if ($mark) {
- my $pb = $self->create_stack($mark, $edge, $rand);
+ $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
- $pb->composite ($pixbuf, @$area,
- $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
+ $text .= "\nTime: ";
- # 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];
- }
-
- # old pixmap&mask-way. that was fast ;(
- #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
-
- #$gc->set_clip_mask ($bm);
- #$gc->set_clip_origin ($dx, $dy);
- #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
- }
- }
+ if ($rules->{timesys} == TIMESYS_NONE) {
+ $text .= "UNLIMITED";
+ } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
+ $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 .= 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->{board_shown} = Storable::dclone $self->{board};
- #d# save
- #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
-
- $expose_area;
+
+ $self->{text}->append_text ("$text");
}
-sub redraw {
- my ($self, $area) = @_;
+sub inject_resign_game {
+ my ($self, $msg) = @_;
- if ($area && $self->{pixbuf}) {
- my ($x, $y, $w, $h) = $area->values;
- my ($ox, $oy, $s) = @{$self->{offsets}};
+ sound::play 3, "resign";
- $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
- $x, $y, $x + $ox, $y + $oy, $w, $h,
- "normal", 0, 0);
- $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
- $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
- }
+ $self->{text}->append_text ("\n"
+ . "\n"
+ . (util::toxml $self->{user}[$msg->{player}]->as_string)
+ . " resigned.");
}
-sub event_update_tree {
- my ($self) = @_;
+sub inject_final_result {
+ my ($self, $msg) = @_;
- $self->{path} = $self->get_path;
- $self->{moveadj}->value_changed if $self->{moveadj};
+ $self->{text}->append_text ("\n"
+ . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
+ . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
+ . ""
+ );
}
-sub event_part {
+sub destroy {
my ($self) = @_;
- $self->SUPER::event_part;
+ $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
+ for BLACK, WHITE;
+ $self->SUPER::destroy;
delete $appwin::gamelist->{game}{$self->{channel}};
- $self->destroy;
-}
-
-sub event_move {
- my ($self, $pass) = @_;
- sound::play 1, $pass ? "pass" : "move";
}
1;