--- kgsueme/kgsueme/game.pl 2003/06/10 09:29:53 1.50
+++ kgsueme/kgsueme/game.pl 2004/05/30 07:24:06 1.104
@@ -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;
+ $self->{format} = sub { "???" };
}
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;
}
};
@@ -72,17 +73,23 @@
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)));
+ my $timer2 = int $timer + 0.4;
+
+ if ($timer2 <= 0) {
+ $timer2 = 0 if $timer2 < 0;
+ $self->set_text ("TIME OUT");
+ } else {
+ $self->set_text ($self->{format}->($timer2));
+ }
$timer - int $timer;
}
sub set_time {
- my ($self, $time) = @_;
+ my ($self, $time, $moves) = @_;
# we ignore requests to re-set the time of a running clock.
# this is the easiest way to ensure that commentary etc.
@@ -91,7 +98,7 @@
# 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->{set}->($time, $moves);
$self->refresh ($self->{start});
}
}
@@ -119,27 +126,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 +149,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);
@@ -156,491 +158,275 @@
$self->{imagebox}->add (gtk::image_from_data undef);
$self->{imagebox}->show_all;
- # 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;
- }
- });
+ 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}->configure (@{$rules}{qw(timesys time interval count)});
}
-sub set_state {
- my ($self, $captures, $timer, $when) = @_;
+sub set_captures {
+ my ($self, $captures) = @_;
+
+ $self->{info}->set_text ("$captures pris.");
+}
+
+sub set_timer {
+ my ($self, $when, $time, $moves) = @_;
$self->{clock}->stop unless $when;
- $self->{clock}->set_time ($timer);
+ $self->{clock}->set_time ($time, $moves);
$self->{clock}->start ($when) if $when;
-
- $self->{info}->set_text ("$captures pris.");
}
package game;
+use Scalar::Util qw(weaken);
+
use KGS::Constants;
use KGS::Game::Board;
-use base KGS::Listener::Game;
+use Gtk2::GoBoard;
+use Gtk2::GoBoard::Constants;
+
use base KGS::Game;
+use base KGS::Listener::Game;
-use base gtk::widget;
+use Glib::Object::Subclass
+ Gtk2::Window;
use POSIX qw(ceil);
sub new {
- my $self = shift;
- $self = $self->SUPER::new(@_);
+ my ($self, %arg) = @_;
+ $self = $self->Glib::Object::new;
+ $self->{$_} = delete $arg{$_} for keys %arg;
+
+ gtk::state $self, "game::window", undef, window_size => [600, 500];
+
+ $self->signal_connect (destroy => sub {
+ $self->unlisten;
+ delete $self->{app}{game}{$self->{channel}};
+ %{$_[0]} = ();
+ });#d#
- $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 {
- $self->part;
- $self->destroy;
- 1;
- });
-
- $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);
-
- # challenge
+ $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
- $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} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0;
-
- $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
- $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}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 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 userlist)->widget);
-
- $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);
-
- $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;
- $self->say($text) if $text =~ /\S/;
- $self->{entry}->set_text("");
- });
-
- $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) = @_;
+ $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
+ $hpane->set (position_set => 1);
- $self->SUPER::part;
- $self->destroy;
-}
+ $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
-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) = @_;
+ {
+ $frame->add (my $vbox = new Gtk2::VBox);
+ $vbox->add ($self->{title} = new Gtk2::Label $title);
- $self->{pixbuf} or return;
+ $vbox->add (my $hbox = new Gtk2::HBox);
- my $area = $event->area;
+ $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
- $self->redraw ($area);
+ $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
- 0;
-}
+ $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
+ $scale->set_draw_value (0);
+ $scale->set_digits (0);
-# something Gtk2 fixed
-sub INTERP_NEAREST (){ 'nearest' }
-sub INTERP_TILES (){ 'tiles' }
-sub INTERP_BILINEAR (){ 'bilinear' }
-sub INTERP_HYPER (){ 'hyper' }
+ $self->{moveadj}->signal_connect (value_changed => sub {
+ $self->{showmove} = int $self->{moveadj}->get_value;
+ $self->update_board;
+ });
+ }
-sub new_pixbuf {
- my ($w, $h, $alpha, $fill) = @_;
+ $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
- my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
- $pixbuf->fill ($fill) if defined $fill;
+ $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
+ for COLOUR_WHITE, COLOUR_BLACK;
- $pixbuf;
-}
+ $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
-sub scale_pixbuf {
- my ($src, $w, $h, $mode) = @_;
+ $buttonbox->add ($self->{button_pass} =
+ Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));
+ $self->{button_pass}->signal_connect (clicked => sub {
+ $self->{board_click}->(255, 255) if $self->{board_click};
+ });
+ $buttonbox->add ($self->{button_undo} =
+ Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));
+ $self->{button_undo}->signal_connect (clicked => sub {
+ $self->send (req_undo => channel => $self->{channel});
+ });
+ $buttonbox->add ($self->{button_resign} =
+ Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));
+ $self->{button_resign}->signal_connect (clicked => sub {
+ $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
+ });
+
+ $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
- my $dst = new_pixbuf $w, $h, 1;
+ $self->set_channel ($self->{channel});
- $src->scale(
- $dst, 0, 0, $w, $h, 0, 0,
- $w / $src->get_width, $h / $src->get_height,
- $mode,
- );
+ $self->show_all;
- $dst;
+ $self;
}
-# 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
- );
- }
+sub set_channel {
+ my ($self, $channel) = @_;
- # 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
- );
- }
- }
+ $self->{channel} = $channel;
- # and lastly any markers
- my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
+ if ($self->{channel} > 0) {
+ $self->listen ($self->{conn});
- 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
- );
- }
+ $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
+ $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
+
+ $self->signal_connect (delete_event => sub { $self->part; 1 });
+ $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);
}
-
- push @$$c, $base;
- }
+ });
}
-
- $$c->[$rand % @$$c];
}
-sub pixbuf_text {
- my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
+sub event_update_users {
+ my ($self, $add, $update, $remove) = @_;
- my @c = grep $_,
- map $::font[$colour][$::fontmap{$_}],
- split //, $text;
+# $self->{userlist}->update ($add, $update, $remove);
- 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;
+ $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
+ for @$remove;
- $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
- $y -= $height * 0.5;
+ $self->{users_inlay}->refresh;
- 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);
+ my %important;
+ $important{$self->{black}{name}}++;
+ $important{$self->{white}{name}}++;
+ $important{$self->{owner}{name}}++;
- $x += $w + $spacing;
- }
+ 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 if $self->{joined};
- return unless $s >= 200;
-
- my $size = $self->{size};
+ $self->SUPER::join;
+}
- # 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);
+sub update_cursor {
+ my ($self) = @_;
- my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
+ my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
- my $pixbuf;
+ delete $self->{board_click};
- my $oldboard;
+ if ($self->{teacher} eq $self->{app}{conn}) {
+ #TODO# # teaching mode not implemented
+ $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
+ $self->{button_undo}->hide;
+ $self->{button_resign}->hide;
+ $self->{board}->set (cursor => undef);
+
+ } elsif ($running && $self->{colour} != COLOUR_NONE) {
+ # during game
+ $self->{button_undo}->show;
+ $self->{button_resign}->show;
+
+ if ($self->{cur_board}{score}) {
+ # during scoring
+ $self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1);
+ $self->{board}->set (cursor => sub {
+ $_[0] & (MARK_B | MARK_W)
+ ? $_[0] ^ MARK_GRAYED
+ : $_[0];
+ });
+ $self->{board_click} = sub {
+ if ($_[0] == 255) {
+ $self->{button_pass}->sensitive (0);
+ $self->done;
+ } else {
+ $self->send (mark_dead =>
+ channel => $self->{channel},
+ x => $_[0],
+ y => $_[1],
+ dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
+ );
+ }
+ };
- if ($self->{background}) {
- if ($oldboard = $self->{board_shown}) {
- $pixbuf = $self->{pixbuf};
+ } elsif (1 - $self->{colour} == $self->{cur_board}{last}) {
+ # normal move
+ $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
+ $self->{board}->set (cursor => sub {
+ # if is_valid_move oder so#TODO#
+ $_[0] & (MARK_B | MARK_W)
+ ? $_[0]
+ : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B);
+ });
+ $self->{board_click} = sub {
+ $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
+ $self->{board}->set (cursor => undef);
+ delete $self->{board_click};
+ $self->{button_pass}->sensitive (0);
+ };
} else {
- $pixbuf = $self->{background}->copy;
- $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
+ $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
}
} 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->{button_undo}->hide;
+ $self->{button_resign}->hide;
+ $self->{button_pass}->hide;
+ $self->{board}->set (cursor => undef);
+ #TODO# # implement coordinate-grabbing
}
-
- $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) = @_;
+sub update_timers {
+ my ($self, $timers) = @_;
- if ($area && $self->{pixbuf}) {
- my ($x, $y, $w, $h) = $area->values;
+ my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
- $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;
+ for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
+ my $t = $timers->[$colour];
+ $self->{userpanel}[$colour]->set_timer (
+ $running && $self->{lastmove_colour} == 1 - $colour && $t->[0],
+ $t->[1], $t->[2]);
}
}
@@ -648,31 +434,30 @@
my ($self) = @_;
return unless $self->{path};
- #$self->{update_board_cb} ||= add Glib::Idle sub {
- my $move = int $self->{moveadj}->get_value;
-
- warn "update_board called $move\n";#d#
+ $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
- my $running = $move == @{$self->{path}};
+ $self->{cur_board} = new KGS::Game::Board $self->{size};
+ $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
- $self->{board_label}->set_text ("Move " . ($move - 1));
+ $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
+ for COLOUR_WHITE, COLOUR_BLACK;
- $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
- );
- }
+ if ($self->{showmove} == @{$self->{path}}) {
+ $self->{timers} = [
+ [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
+ [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
+ ];
+ $self->update_timers ($self->{timers});
+ } else {
+ $self->update_timers ([
+ [0, @{$self->{cur_board}{timer}[0]}],
+ [0, @{$self->{cur_board}{timer}[1]}],
+ ]);
+ }
- $self->redraw ($self->repaint_board);
+ $self->{board}->set_board ($self->{cur_board});
- # delete $self->{update_board_cb};
- #}
+ $self->update_cursor;
}
sub event_update_tree {
@@ -687,7 +472,6 @@
$self->{moveadj}->upper ($move);
- warn "UPDATE_TREE $pos,$upper";#d#
$self->{moveadj}->changed;
if ($pos == $upper) {
$self->{moveadj}->value ($move);
@@ -730,16 +514,20 @@
$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->init_tree;
+ $self->event_update_game;
}
sub event_part {
my ($self) = @_;
+
$self->SUPER::event_part;
$self->destroy;
}
@@ -747,62 +535,73 @@
sub event_move {
my ($self, $pass) = @_;
sound::play 1, $pass ? "pass" : "move";
+
+ if ($self->{undo_inlay}) {
+ (delete $self->{undo_inlay})->clear;
+ }
}
sub event_update_game {
my ($self) = @_;
+
$self->SUPER::event_update_game;
- $self->{user}[BLACK] = $self->{user1};
- $self->{user}[WHITE] = $self->{user2};
+ return unless $self->{joined};
- # show board
+ $self->{colour} = $self->player_colour ($self->{conn}{name});
+
+ 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->{left}->remove ($_) for $self->{left}->get_children;
- if ($self->is_valid) {
- $self->{left}->add ($self->{boardbox});
- (delete $self->{challenge})->destroy if $self->{challenge};
- } else {
- $self->{left}->add ($self->{challenge}->widget);
+ $self->{user}[COLOUR_BLACK] = $self->{black};
+ $self->{user}[COLOUR_WHITE] = $self->{white};
+
+ # show board
+ if ($self->is_inprogress) {
+ if (!$self->{boardbox}->parent) {
+ $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
+ $self->{left}->add ($self->{boardbox});
+ $self->{board}->signal_connect (button_release => sub {
+ if ($_[1] == 1) {
+ $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
+ }
+ });
+ }
+ if (my $ch = delete $self->{challenge}) {
+ $_->{inlay}->destroy for values %$ch;
+ }
+ $self->update_cursor;
}
+
$self->{left}->show_all;
- # view text
+ $self->{rules_inlay}->refresh;
- $text = "\n";
-
- $text .= "\nType: " . (util::toxml $gametype{$self->type})
- . " (" . (util::toxml $gameopt{$self->option}) . ")";
- $text .= "\nFlags:";
- $text .= " valid" if $self->is_valid;
- $text .= " adjourned" if $self->is_adjourned;
- $text .= " scored" if $self->is_scored;
- $text .= " saved" if $self->is_saved;
+}
- $text .= "\nWhite: " . (util::toxml $self->{user2}->as_string) . "";
- $text .= "\nBlack: " . (util::toxml $self->{user1}->as_string) . "";
- $text .= "\nOwner: " . (util::toxml $self->{user3}->as_string) . "" if $self->{user3}->is_valid;
+sub draw_setup {
+ my ($self, $inlay) = @_;
- if ($self->is_valid) {
- $text .= "\nHandicap: " . $self->{handicap};
- $text .= "\nKomi: " . $self->{komi};
- $text .= "\nSize: " . $self->size_string;
- }
+ return unless $self->{joined};
- if ($self->is_scored) {
- $text .= "\nResult: " . $self->score_string;
- }
+ my $rules = $self->{rules};
- $self->{text}->append_text ("$text");
-}
+ my $text = "";
-sub event_update_rules {
- my ($self, $rules) = @_;
+ $text .= "\nTeacher: " . (util::toxml $self->{teacher}) . ""
+ if $self->{teacher};
- $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
- for BLACK, WHITE;
+ $text .= "\nOwner: " . (util::toxml $self->{owner}->as_string) . ""
+ if $self->{owner}->is_valid;
- my $text = "\n";
+ if ($self->is_inprogress) {
+ $text .= "\nPlayers: " . (util::toxml $self->{white}->as_string) . ""
+ . " vs. " . (util::toxml $self->{black}->as_string) . "";
+ }
+ $text .= "\nType: " . util::toxml $gametype{$self->type};
$text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
@@ -814,41 +613,318 @@
$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");
+ $text .= "\nFlags:";
+ $text .= " private" if $self->is_private;
+ $text .= " started" if $self->is_inprogress;
+ $text .= " adjourned" if $self->is_adjourned;
+ $text .= " scored" if $self->is_scored;
+ $text .= " saved" if $self->is_saved;
+
+ if ($self->is_inprogress) {
+ $text .= "\nHandicap: " . $self->{handicap};
+ $text .= "\nKomi: " . $self->{komi};
+ $text .= "\nSize: " . $self->size_string;
+ }
+
+ if ($self->is_scored) {
+ $text .= "\nResult: " . $self->score_string;
+ }
+
+ $inlay->append_text ("$text");
+
}
-sub inject_resign_game {
- my ($self, $msg) = @_;
+sub event_update_rules {
+ my ($self, $rules) = @_;
+
+ $self->{rules} = $rules;
+
+ if ($self->{user}) {
+ $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
+ for COLOUR_BLACK, COLOUR_WHITE;
+ }
+
+ sound::play 3, "gamestart";
- $self->{text}->append_text ("\n"
+ $self->{rules_inlay}->refresh;
+}
+
+sub event_resign_game {
+ my ($self, $player) = @_;
+
+ sound::play 3, "resign";
+ $self->{chat}->append_text ("\n"
. "\n"
. (util::toxml $self->{user}[$msg->{player}]->as_string)
. " resigned.");
}
+sub event_out_of_time {
+ my ($self, $player) = @_;
+
+ sound::play 3, "timewin";
+ $self->{chat}->append_text ("\n"
+ . "\n"
+ . (util::toxml $self->{user}[$msg->{player}]->as_string)
+ . " ran out of time and lost.");
+}
+
+sub event_done {
+ my ($self) = @_;
+
+ if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
+ $self->{chat}->append_text ("\n"
+ . "\nYour opponent pressed done.");
+ }
+}
+
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 inject_set_gametime {
+ my ($self, $msg) = @_;
+
+ $self->{timers} = [
+ [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
+ [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
+ ];
+
+ print "SGT\n";#d#
+ $self->update_timers ($self->{timers})
+ if $self->{showmove} == @{$self->{path}};
+}
+
+sub inject_req_undo {
+ my ($self, $msg) = @_;
+
+ my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
+ return if $inlay->{ignore};
+
+ sound::play 3, "warning" unless $inlay->{count};
+ $inlay->{count}++;
+
+ $inlay->clear;
+ $inlay->append_text ("\nUndo requested ($inlay->{count} times)\n");
+ $inlay->append_button ("Grant", sub {
+ $inlay->clear;
+ $self->send (grant_undo => channel => $self->{channel});
+ });
+ $inlay->append_button ("Ignore", sub {
+ $inlay->clear;
+ $inlay->{ignore} = 1;
+ # but leave inlay, so further undo requests get counted
+ });
+
+ $self->{chat}->set_end;
+}
+
+sub inject_new_game {
+ my ($self, $msg) = @_;
+
+ $self->{chat}->append_text ("\nACK from server ($msg->{cid} == $self->{cid})");
+ delete $self->{cid};
+}
+
+sub draw_challenge {
+ my ($self, $id) = @_;
+
+ my $info = $self->{challenge}{$id};
+ my $inlay = $info->{inlay};
+ my $rules = $info->{rules};
+
+ my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
+ my $opponent = $as_black ? $info->{white} : $info->{black};
+
+ my ($size, $time, $interval, $count);
+
+ if (!$self->{channel}) {
+ $inlay->append_text ("\nNotes: ");
+ $inlay->append_entry (\$info->{notes}, 20, "");
+ $inlay->append_text ("\nGlobal Offer: ");
+ $inlay->append_optionmenu (\$info->{flags},
+ 0 => "No",
+ 2 => "Yes",
+ );
+ } else {
+ $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
+ }
+
+ $inlay->append_text ("\nType: ");
+ $inlay->append_optionmenu (
+ \$info->{gametype},
+ GAMETYPE_DEMONSTRATION , "Demonstration",
+ GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)",
+ GAMETYPE_TEACHING , "Teaching",
+ GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)",
+ GAMETYPE_SIMUL , "Simul (not yet!)",
+ GAMETYPE_FREE , "Free",
+ GAMETYPE_RATED , "Rated",
+ sub {
+ $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
+ },
+ );
+
+ if ($self->{channel}) {
+ $inlay->append_text ("\nMy Colour: ");
+ $inlay->append_optionmenu (
+ \$as_black,
+ 0 => "White",
+ 1 => "Black",
+ sub {
+ if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
+ ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
+ }
+ }
+ );
+ }
+
+ $inlay->append_text ("\nRuleset: ");
+ $inlay->append_optionmenu (
+ \$info->{rules}{ruleset},
+ RULESET_JAPANESE , "Japanese",
+ RULESET_CHINESE , "Chinese",
+ RULESET_AGA , "AGA",
+ RULESET_NEW_ZEALAND, "New Zealand",
+ );
+
+ $inlay->append_text ("\nSize: ");
+ $size = $inlay->append_optionmenu (
+ \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38
+ );
+
+ if ($self->{channel}) {
+ $inlay->append_text ("\nHandicap: ");
+ $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
+
+ $inlay->append_text ("\nKomi: ");
+ $inlay->append_entry (\$info->{rules}{komi}, 5);
+ }
+
+ $inlay->append_text ("\nTimesys: ");
+ $inlay->append_optionmenu (
+ \$info->{rules}{timesys},
+ &TIMESYS_NONE => "None",
+ &TIMESYS_ABSOLUTE => "Absolute",
+ &TIMESYS_BYO_YOMI => "Byo Yomi",
+ &TIMESYS_CANADIAN => "Canadian",
+ sub {
+ my ($new) = @_;
+
+ if ($new eq TIMESYS_NONE) {
+ $time->hide;
+ $interval->hide;
+ $count->hide;
+ } else {
+ $time->show;
+ $time->set_text ($self->{app}{defaults}{time});
+ if ($new eq TIMESYS_ABSOLUTE) {
+ $interval->hide;
+ $count->hide;
+ } else {
+ $interval->show;
+ $count->show;
+ if ($new eq TIMESYS_BYO_YOMI) {
+ $interval->set_text ($self->{app}{defaults}{byo_time});
+ $count->set_text ($self->{app}{defaults}{byo_period});
+ } elsif ($new eq TIMESYS_CANADIAN) {
+ $interval->set_text ($self->{app}{defaults}{can_time});
+ $count->set_text ($self->{app}{defaults}{can_period});
+ }
+ }
+ }
+ }
+ );
+
+ $inlay->append_text ("\nMain Time: ");
+ $time = $inlay->append_entry (\$info->{rules}{time}, 5);
+ $inlay->append_text ("\nInterval: ");
+ $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
+ $inlay->append_text ("\nPeriods/Stones: ");
+ $count = $inlay->append_entry (\$info->{rules}{count}, 2);
+
+ $inlay->append_text ("\n");
+
+ if (!$self->{channel}) {
+ $inlay->append_button ("Create Challenge", sub {
+ $inlay->clear;
+ $self->{cid} = $self->{conn}->alloc_clientid;
+ $self->send (new_game =>
+ channel => delete $self->{roomid},
+ gametype => $info->{gametype},
+ cid => $self->{cid},
+ flags => $info->{flags},
+ rules => $info->{rules},
+ notes => $info->{notes},
+ );
+ });
+ } else {
+ $inlay->append_button ("OK", sub {
+ $inlay->clear;
+ $self->send (challenge =>
+ channel => $self->{channel},
+ black => $info->{black},
+ white => $info->{white},
+ gametype => $info->{gametype},
+ cid => $info->{cid},
+ rules => $info->{rules},
+ );
+ });
+ if (exists $self->{challenge}{""}) {
+ $inlay->append_button ("Reject", sub {
+ $inlay->clear;
+ $self->send (reject_challenge =>
+ channel => $self->{channel},
+ name => $opponent->{name},
+ gametype => $info->{gametype},
+ cid => $info->{cid},
+ rules => $info->{rules},
+ );
+ });
+ }
+ }
+}
+
+sub draw_users {
+ my ($self, $inlay) = @_;
+
+ for (sort keys %{$self->{users}}) {
+ $inlay->append_text (" " . $self->{users}{$_}->as_string . "");
+ }
+}
+
+sub event_challenge {
+ my ($self, $info) = @_;
+
+ my $as_black = $info->{black}->{name} eq $self->{conn}{name};
+ my $opponent = $as_black ? $info->{white} : $info->{black};
+
+ my $id = $opponent->{name};
+
+ $self->{challenge}{$id} = $info;
+ $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
+ exists $self->{challenge}{""}
+ ? "Challenge from $opponent->{name}"
+ : "Challenge to $opponent->{name}",
+ sub {
+ $self->{challenge}{$id}{inlay} = $_[0];
+ $self->draw_challenge ($id);
+ },
+ !exists $self->{challenge}{""} # only open when not offerer
+ );
}
1;