--- kgsueme/kgsueme/game.pl 2003/06/02 14:36:10 1.33 +++ kgsueme/kgsueme/game.pl 2004/04/02 23:22:30 1.81 @@ -1,5 +1,10 @@ +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; @@ -18,26 +23,12 @@ $self; } -sub append_text { - my ($self, $text) = @_; - - $self->{buffer}->insert ($self->{buffer}->get_end_iter, $text); -} - -sub format_time { - my ($time) = @_; - - $time > 60*60 - ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60 - : sprintf "%d:%02d", $time / 60 % 60, $time % 60; -} - -sub set_rules { +sub configure { my ($self, $timesys, $main, $interval, $count) = @_; if ($timesys == TIMESYS_ABSOLUTE) { $self->{set} = sub { $self->{time} = $_[0] }; - $self->{format} = sub { format_time $_[0] }; + $self->{format} = sub { util::format_time $_[0] }; } elsif ($timesys == TIMESYS_BYO_YOMI) { my $low = $interval * $count; @@ -46,22 +37,29 @@ $self->{format} = sub { if ($_[0] > $low) { - format_time $_[0] - $low; + util::format_time $_[0] - $low; } else { - sprintf "%s (%d)", (format_time int ($_[0] % $interval) || $interval), $_[0] / $interval; + sprintf "%s (%d)", + util::format_time int (($_[0] - 1) % $interval + 1), + ($_[0] - 1) / $interval; } }; } elsif ($timesys == TIMESYS_CANADIAN) { - my $low = $interval; - $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; $self->{format} = sub { - if ($_[0] > $low) { - format_time $_[0] - $low; + if (!$self->{moves}) { + util::format_time $_[0] - $low; } else { - sprintf "%s / %d", (format_time int($_[0] % $interval) || $interval), $self->{moves}; + my $time = int (($_[0] - 1) % $interval + 1); + + sprintf "%s/%d =%d", + util::format_time $time, + $self->{moves}, + $self->{moves} > 1 + ? $time / $self->{moves} + : $interval; } }; @@ -75,7 +73,11 @@ sub refresh { my ($self, $timestamp) = @_; my $timer = $self->{time} + $self->{start} - $timestamp; - $self->{widget}->set_text ($self->{format}->($timer)); + + # 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; } @@ -86,7 +88,7 @@ # 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 protoocl is to blame here, which gives + # 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}) { @@ -96,18 +98,14 @@ } sub start { - my ($self) = @_; + my ($self, $when) = @_; - return if $self->{timeout}; + $self->stop; - # this is correct, since we assume the last message triggered a start - $self->{start} = $KGS::Protocol::NOW; + $self->{start} = $when; my $timeout; $timeout = sub { - # -100 means we run the timer a bit earlier to avoid 10.99 => 10s roundings. - # we "could" cheat by precalculating the time, but I feel uneasy about both - # ways to cheat. - my $next = int ($self->refresh (Time::HiRes::time) * 1000) - 100; + my $next = $self->refresh (Time::HiRes::time) * 1000; $next += 1000 if $next < 0; $self->{timeout} = add Glib::Timeout $next, $timeout; 0; @@ -149,35 +147,39 @@ $self; } -sub set_rules { - my ($self, $rules) = @_; +sub configure { + my ($self, $app, $user, $rules) = @_; - if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) { - $self->{name}->set_text ($rules->{player}[$self->{colour}]); + 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; - # the big picture... - appwin::userpic ($rules->{player}[$self->{colour}], sub { - if ($_[0]) { - $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; - $self->{imagebox}->add (gtk::image_from_data $_[0]); - $self->{imagebox}->show_all; - } - }); + if ($user->has_pic) { + # the big picture... + $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]); + $self->{imagebox}->show_all; + } + }); + } } - $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)}); + $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); } sub set_state { - my ($self, $captures, $timer, $running) = @_; + my ($self, $captures, $timer, $when) = @_; - $self->{clock}->stop unless $running; + $self->{clock}->stop unless $when; $self->{clock}->set_time ($timer); - $self->{clock}->start if $running; + $self->{clock}->start ($when) if $when; $self->{info}->set_text ("$captures pris."); } @@ -187,6 +189,8 @@ use KGS::Constants; use KGS::Game::Board; +use Gtk2::GoBoard; + use base KGS::Listener::Game; use base KGS::Game; @@ -201,8 +205,6 @@ $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 { @@ -214,7 +216,9 @@ $self->{window}->add($self->{hpane} = new Gtk2::HPaned); gtk::state $self->{hpane}, "game::hpane", undef, position => 500; - $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 1); + # LEFT PANE + + $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); $self->{boardbox} = new Gtk2::VBox; @@ -229,31 +233,27 @@ $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); + + $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); - $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0; + $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; - $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); + $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), 0, 0); + $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; @@ -265,16 +265,18 @@ $self->{vpane}->add(my $vbox = new Gtk2::VBox); $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}[COLOUR_WHITE] = new game::userpanel colour => COLOUR_WHITE)->widget); + $hbox->add (($self->{userpanel}[COLOUR_BLACK] = new game::userpanel colour => COLOUR_BLACK)->widget); - $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); + $vbox->pack_start(($self->{chat} = new chat), 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; - $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; @@ -284,7 +286,24 @@ sub event_update_users { my ($self, $add, $update, $remove) = @_; + return unless $self->{userlist}; + $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->{chat}->append_text ("\n
Joins:
"); + $self->{chat}->append_text (" " . $_->as_string . "") for @users; + } + if (my @users = grep $important{$_->{name}}, @$remove) { + $self->{chat}->append_text ("\n
Parts:
"); + $self->{chat}->append_text (" " . $_->as_string . "") for @users; + } + } sub join { @@ -303,350 +322,6 @@ $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 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, 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 - ); - } - } - - 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); - - $x += $w + $spacing; - } - } -} - -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 { - 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; - - # hoshi-points(!)#d# - # caching of empty board gfx(!)#d# - - 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) = @_; - - if ($area && $self->{pixbuf}) { - my ($x, $y, $w, $h) = $area->values; - - $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; - } -} - sub update_board { my ($self) = @_; return unless $self->{path}; @@ -655,19 +330,21 @@ my $running = $move == @{$self->{path}}; - $self->{board_label}->set_text ("Move $move"); + $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]]); + $self->{cur_board} = new KGS::Game::Board $self->{size}; + $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); - $self->{userpanel}[WHITE]->set_state ($self->{board}{captures}[WHITE], - $self->{board}{timer}[WHITE], - $running && $self->{board}{last} == BLACK); - $self->{userpanel}[BLACK]->set_state ($self->{board}{captures}[BLACK], - $self->{board}{timer}[BLACK], - $running && $self->{board}{last} == WHITE); + 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 + ); + } - $self->redraw ($self->repaint_board); + $self->{board}->set_board ($self->{cur_board}); } sub event_update_tree { @@ -675,19 +352,16 @@ $self->{path} = $self->get_path; - $self->{userpanel}[WHITE]->set_rules ($self->{path}[0]); # should be onload only - $self->{userpanel}[BLACK]->set_rules ($self->{path}[0]); # should be onload only - if ($self->{moveadj}) { my $upper = $self->{moveadj}->upper; my $pos = $self->{moveadj}->get_value; + my $move = scalar @{$self->{path}}; - $self->{moveadj}->upper (scalar @{$self->{path}}); + $self->{moveadj}->upper ($move); $self->{moveadj}->changed; if ($pos == $upper) { - $self->{moveadj}->set_value (scalar @{$self->{path}}); - } else { + $self->{moveadj}->value ($move); $self->{moveadj}->value_changed; } } @@ -699,18 +373,35 @@ my $text; - $text .= "\n
Move $node->{move},
Node $node->{id}
" + $text .= "\n
Move $node->{move}, Node $node->{id}
" if $newnode; for (split /\n/, $comment) { $text .= "\n"; - if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { + 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; + $text .= $_; } - $self->{text}->append_text ($text); + $self->{chat}->append_text ($text); } sub event_join { @@ -721,6 +412,7 @@ sub event_part { my ($self) = @_; $self->SUPER::event_part; + $self->destroy; } sub event_move { @@ -731,30 +423,137 @@ sub event_update_game { my ($self) = @_; $self->SUPER::event_update_game; - warn "GAME UPDATE ".join (":", %$self); - warn "SAVED ".$self->is_saved; - warn "SCORED ".$self->is_scored; - warn "ADJ ".$self->is_adjourned; - warn "VALID ".$self->is_valid; - warn "MOVES ".$self->moves; - warn "TYPE ".$self->type; - - $self->{left}->remove ($_) for $self->{left}->get_children; - if ($self->is_valid) { - $self->{left}->add ($self->{boardbox}); - (delete $self->{challenge})->destroy if $self->{challenge}; + + return unless $self->{window}; + + 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); + + $self->{user}[COLOUR_BLACK] = $self->{user1}; + $self->{user}[COLOUR_WHITE] = $self->{user2}; + + # show board + + 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] .= " 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_inprogress; + + $ga[3] = "\nPlayers: " . (util::toxml $self->{user2}->as_string) . "" + . " vs. " . (util::toxml $self->{user1}->as_string) . "" + if $self->is_inprogress; + + if ($self->is_inprogress) { + $ga[4] = "\nHandicap: " . $self->{handicap}; + $ga[5] = "\nKomi: " . $self->{komi}; + $ga[6] = "\nSize: " . $self->size_string; + } + + if ($self->is_scored) { + $ga[7] = "\nResult: " . $self->score_string; + } + + $text = "\n
Game Update
"; + for (0..7) { + if ($self->{gatext}[$_] ne $ga[$_]) { + $text .= $ga[$_]; + } + } + $text .= ""; + + $self->{gatext} = \@ga; + }; + + $self->{chat}->append_text ($text); +} + +sub event_update_rules { + my ($self, $rules) = @_; + + $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules) + for COLOUR_BLACK, COLOUR_WHITE; + + sound::play 3, "gamestart"; + + my $text = "\n
Game Rules
"; + + $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; + + $text .= "\nTime: "; + + 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}; + $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->{chat}->append_text ("$text"); +} + +sub inject_resign_game { + my ($self, $msg) = @_; + + sound::play 3, "resign"; + + $self->{chat}->append_text ("\n
Resign
" + . "\n" + . (util::toxml $self->{user}[$msg->{player}]->as_string) + . " resigned."); +} + +sub inject_final_result { + my ($self, $msg) = @_; + + $self->{chat}->append_text ("\n
Game Over
" + . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) + . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) + . "" + ); +} + +sub event_challenge { + my ($self, $challenge) = @_; + + use KGS::Listener::Debug; + $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); } sub destroy { my ($self) = @_; - (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE]; - (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK]; + + delete $self->{app}{gamelist}{game}{$self->{channel}}; + $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy + for COLOUR_BLACK, COLOUR_WHITE; $self->SUPER::destroy; - delete $appwin::gamelist->{game}{$self->{channel}}; } 1;