ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/kgsueme/game.pl
(Generate patch)

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.17 by pcg, Sun Jun 1 02:39:00 2003 UTC vs.
Revision 1.105 by pcg, Sun May 30 07:37:28 2004 UTC

1use utf8;
2
3use Scalar::Util ();
4
5package game::goclock;
6
7# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
8# is completely borked.
9
10use Time::HiRes ();
11
12use KGS::Constants;
13
14use Glib::Object::Subclass
15 Gtk2::Label;
16
17sub INIT_INSTANCE {
18 my $self = shift;
19
20 $self->signal_connect (destroy => sub { $_[0]->stop });
21
22 $self->{set} = sub { };
23 $self->{format} = sub { "???" };
24}
25
26sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_;
28
29 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] };
31 $self->{format} = sub {
32 if ($_[0] <= 0) {
33 "TIMEOUT";
34 } else {
35 util::format_time $_[0];
36 }
37 };
38
39 } elsif ($timesys == TIMESYS_BYO_YOMI) {
40 my $low = $interval * $count;
41
42 $self->{set} = sub { $self->{time} = $_[0] };
43
44 $self->{format} = sub {
45 if ($_[0] <= 0) {
46 "TIMEOUT";
47 } elsif ($_[0] > $low) {
48 util::format_time $_[0] - $low;
49 } else {
50 sprintf "%s (%d)",
51 util::format_time int (($_[0] - 1) % $interval + 1),
52 ($_[0] - 1) / $interval;
53 }
54 };
55
56 } elsif ($timesys == TIMESYS_CANADIAN) {
57 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
58
59 $self->{format} = sub {
60 if ($_[0] <= 0) {
61 "TIMEOUT";
62 } elsif (!$self->{moves}) {
63 util::format_time $_[0] - $low;
64 } else {
65 my $time = int (($_[0] - 1) % $interval + 1);
66
67 sprintf "%s/%d =%d",
68 util::format_time $time,
69 $self->{moves},
70 $self->{moves} > 1
71 ? $time / $self->{moves}
72 : $interval;
73 }
74 };
75
76 } else {
77 # none, or unknown
78 $self->{set} = sub { };
79 $self->{format} = sub { "-" }
80 }
81}
82
83sub refresh {
84 my ($self, $timestamp) = @_;
85 my $timer = $self->{time} + $self->{start} - $timestamp;
86
87 # we round the timer value slightly... the protocol isn't exact anyways,
88 # and this gives smoother timers ;)
89 my $timer2 = int $timer + 0.4;
90
91 $self->set_text ($self->{format}->($timer2));
92
93 $timer - int $timer;
94}
95
96sub set_time {
97 my ($self, $time, $moves) = @_;
98
99 # we ignore requests to re-set the time of a running clock.
100 # this is the easiest way to ensure that commentary etc.
101 # doesn't re-set the clock. yes, this is frickle design,
102 # but I think the protocol is to blame here, which gives
103 # very little time information. (cgoban2 also has had quite
104 # a lot of small time update problems...)
105 unless ($self->{timeout}) {
106 $self->{set}->($time, $moves);
107 $self->refresh ($self->{start});
108 }
109}
110
111sub start {
112 my ($self, $when) = @_;
113
114 $self->stop;
115
116 $self->{start} = $when;
117
118 my $timeout; $timeout = sub {
119 my $next = $self->refresh (Time::HiRes::time) * 1000;
120 $next += 1000 if $next < 0;
121 $self->{timeout} = add Glib::Timeout $next, $timeout;
122 0;
123 };
124
125 $timeout->();
126}
127
128sub stop {
129 my ($self) = @_;
130
131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
132}
133
134package game::userpanel;
135
136use Glib::Object::Subclass
137 Gtk2::HBox,
138 properties => [
139 Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
140 ];
141
142sub INIT_INSTANCE {
143 my ($self) = @_;
144
145 $self->add (my $vbox = new Gtk2::VBox);
146
147 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
148 $vbox->add ($self->{info} = new Gtk2::Label "");
149 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
150
151 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
152
153 $self;
154}
155
156sub configure {
157 my ($self, $app, $user, $rules) = @_;
158
159 if ($self->{name}->get_text ne $user->as_string) {
160 $self->{name}->set_text ($user->as_string);
161
162 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
163 $self->{imagebox}->add (gtk::image_from_data undef);
164 $self->{imagebox}->show_all;
165
166 if ($user->has_pic) {
167 # the big picture...
168 $app->userpic ($user->{name}, sub {
169 return unless $self->{imagebox};
170
171 if ($_[0]) {
172 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
173 $self->{imagebox}->add (gtk::image_from_data $_[0]);
174 $self->{imagebox}->show_all;
175 }
176 });
177 }
178 }
179
180 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
181}
182
183sub set_captures {
184 my ($self, $captures) = @_;
185
186 $self->{info}->set_text ("$captures pris.");
187}
188
189sub set_timer {
190 my ($self, $when, $time, $moves) = @_;
191
192 $self->{clock}->stop unless $when;
193 $self->{clock}->set_time ($time, $moves);
194 $self->{clock}->start ($when) if $when;
195}
196
1package game; 197package game;
198
199use Scalar::Util qw(weaken);
2 200
3use KGS::Constants; 201use KGS::Constants;
4use KGS::Game::Board; 202use KGS::Game::Board;
5 203
204use Gtk2::GoBoard;
205use Gtk2::GoBoard::Constants;
206
207use base KGS::Game;
6use base KGS::Listener::Game; 208use base KGS::Listener::Game;
7use base KGS::Game;
8 209
9use base gtk::widget; 210use Glib::Object::Subclass
211 Gtk2::Window;
10 212
11use POSIX qw(ceil); 213use POSIX qw(ceil);
12 214
13sub new { 215sub new {
14 my $self = shift; 216 my ($self, %arg) = @_;
15 $self = $self->SUPER::new(@_); 217 $self = $self->Glib::Object::new;
218 $self->{$_} = delete $arg{$_} for keys %arg;
16 219
17 $self->listen($self->{conn});
18
19 $self->{window} = new Gtk2::Window 'toplevel';
20 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
21 $self->{window}->set_title("KGS Game $title");
22 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 220 gtk::state $self, "game::window", undef, window_size => [600, 500];
23 221
24 $self->{window}->signal_connect(delete_event => sub { 222 $self->signal_connect (destroy => sub {
25 if ($self->{joined}) { 223 $self->unlisten;
224 delete $self->{app}{game}{$self->{channel}};
225 %{$_[0]} = ();
226 });#d#
227
228 $self->add (my $hpane = new Gtk2::HPaned);
229 gtk::state $hpane, "game::hpane", undef, position => 500;
230
231 # LEFT PANE
232
233 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
234
235 $self->{boardbox} = new Gtk2::VBox;
236
237 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
238
239 # board box (aspect/canvas)
240
241 #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
242
243 # RIGHT PANE
244
245 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
246 $hpane->set (position_set => 1);
247
248 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
249
250 {
251 $frame->add (my $vbox = new Gtk2::VBox);
252 $vbox->add ($self->{title} = new Gtk2::Label $title);
253
254 $vbox->add (my $hbox = new Gtk2::HBox);
255
256 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
257
258 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
259
260 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
261 $scale->set_draw_value (0);
262 $scale->set_digits (0);
263
264 $self->{moveadj}->signal_connect (value_changed => sub {
265 $self->{showmove} = int $self->{moveadj}->get_value;
26 $self->part; 266 $self->update_board;
27 } else {
28 $self->event_part;
29 } 267 });
30 1; 268 }
269
270 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
271
272 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
273 for COLOUR_WHITE, COLOUR_BLACK;
274
275 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
276
277 $buttonbox->add ($self->{button_pass} =
278 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));
279 $self->{button_pass}->signal_connect (clicked => sub {
280 $self->{board_click}->(255, 255) if $self->{board_click};
31 }); 281 });
32 282 $buttonbox->add ($self->{button_undo} =
33 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 283 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));
34 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 284 $self->{button_undo}->signal_connect (clicked => sub {
35 285 $self->send (req_undo => channel => $self->{channel});
36 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 286 });
37 287 $buttonbox->add ($self->{button_resign} =
38 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 288 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));
39 289 $self->{button_resign}->signal_connect (clicked => sub {
290 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
291 });
40 { 292
41 # grrr... 293 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
42 $frame->add(my $vbox = new Gtk2::VBox);
43 $vbox->add($self->{title} = new Gtk2::Label $title);
44 294
45 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0; 295 $self->set_channel ($self->{channel});
46 296
47 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 297 $self->show_all;
48 $scale->set_draw_value (0);
49 298
299 $self;
300}
301
302sub set_channel {
303 my ($self, $channel) = @_;
304
305 $self->{channel} = $channel;
306
307 if ($self->{channel} > 0) {
308 $self->listen ($self->{conn});
309
310 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
311 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
312
313 $self->signal_connect (delete_event => sub { $self->part; 1 });
50 $self->{moveadj}->signal_connect (value_changed => sub { 314 $self->{chat}->signal_connect (command => sub {
51 return unless $self->{path}; 315 my ($chat, $cmd, $arg) = @_;
52 316 if ($cmd eq "rsave") {
53 my $move = int (@{$self->{path}} * $_[0]->get_value); 317 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
54 318 } else {
55 $self->{board} = new KGS::Game::Board $self->{size}; 319 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
56 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 320 }
57
58 $self->redraw ($self->repaint_board);
59
60 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
61 }); 321 });
62 } 322 }
63
64 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0);
65
66 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
67 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
68
69 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
70 $self->{hpane}->set(position_set => 1);
71 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
72
73 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
74 $sw->set_policy("automatic", "always");
75
76 $sw->add(($self->{userlist} = new gtk::userlist)->widget);
77
78 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
79
80 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
81 $sw->set_policy("never", "always");
82
83 $sw->add(($self->{text} = new gtk::text)->widget);
84
85 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
86 $self->{entry}->signal_connect(activate => sub {
87 my $text = $self->{entry}->get_text;
88 $self->say($text) if $text =~ /\S/;
89 $self->{entry}->set_text("");
90 });
91
92 $self;
93} 323}
94 324
95sub event_update_users { 325sub event_update_users {
96 my ($self) = @_; 326 my ($self, $add, $update, $remove) = @_;
97 327
98 $self->{userlist}->update($self->{users}); 328# $self->{userlist}->update ($add, $update, $remove);
329
330 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
331 for @$remove;
332
333 $self->{users_inlay}->refresh;
334
335 my %important;
336 $important{$self->{black}{name}}++;
337 $important{$self->{white}{name}}++;
338 $important{$self->{owner}{name}}++;
339
340 if (my @users = grep $important{$_->{name}}, @$add) {
341 $self->{chat}->append_text ("\n<header>Joins:</header>");
342 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
343 }
344 if (my @users = grep $important{$_->{name}}, @$remove) {
345 $self->{chat}->append_text ("\n<header>Parts:</header>");
346 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
347 }
99} 348}
100 349
101sub join { 350sub join {
102 my ($self) = @_; 351 my ($self) = @_;
352 return if $self->{joined};
353
103 $self->SUPER::join; 354 $self->SUPER::join;
104
105 $self->{window}->show_all;
106} 355}
107 356
108sub part { 357sub update_cursor {
109 my ($self) = @_; 358 my ($self) = @_;
110 $self->SUPER::part;
111 359
112 $self->{window}->hide; 360 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
113}
114 361
115sub configure_event {
116 my ($widget, $event, $self) = @_;
117 delete $self->{stack};
118 delete $self->{pixbuf};
119 delete $self->{board_shown}; 362 delete $self->{board_click};
120 delete $self->{background};
121 $self->repaint_board;
122 0;
123}
124 363
125sub expose_event { 364 if ($self->{teacher} eq $self->{app}{conn}) {
126 my ($widget, $event, $self) = @_; 365 #TODO# # teaching mode not implemented
366 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
367 $self->{button_undo}->hide;
368 $self->{button_resign}->hide;
369 $self->{board}->set (cursor => undef);
127 370
128 $self->{pixbuf} or return; 371 } elsif ($running && $self->{colour} != COLOUR_NONE) {
372 # during game
373 $self->{button_undo}->show;
374 $self->{button_resign}->show;
129 375
130 my $area = $event->area; 376 if ($self->{cur_board}{score}) {
131 my ($ox, $oy, $s) = @{$self->{offsets}}; 377 # during scoring
132 378 $self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1);
133 $self->redraw ( 379 $self->{board}->set (cursor => sub {
134 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height) 380 $_[0] & (MARK_B | MARK_W)
135 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s) 381 ? $_[0] ^ MARK_GRAYED
382 : $_[0];
136 ); 383 });
137 384 $self->{board_click} = sub {
138 0; 385 if ($_[0] == 255) {
139} 386 $self->{button_pass}->sensitive (0);
140 387 $self->done;
141# something Gtk2 fixed 388 } else {
142sub INTERP_NEAREST (){ 'nearest' } 389 $self->send (mark_dead =>
143sub INTERP_TILES (){ 'tiles' } 390 channel => $self->{channel},
144sub INTERP_BILINEAR (){ 'bilinear' } 391 x => $_[0],
145sub INTERP_HYPER (){ 'hyper' } 392 y => $_[1],
146 393 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
147sub new_pixbuf {
148 my ($w, $h, $alpha, $fill) = @_;
149
150 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
151 $pixbuf->fill ($fill) if defined $fill;
152
153 $pixbuf;
154}
155
156sub scale_pixbuf {
157 my ($src, $w, $h, $mode) = @_;
158
159 my $dst = new_pixbuf $w, $h, 1;
160
161 $src->scale(
162 $dst, 0, 0, $w, $h, 0, 0,
163 $w / $src->get_width, $h / $src->get_height,
164 $mode,
165 );
166
167 $dst;
168}
169
170# create a stack of stones
171sub create_stack {
172 my ($self, $mark, $size, $rand) = @_;
173
174 my $shadow = $size * 0.05;
175
176 my $c = \$self->{stack}{$mark};
177 unless ($$c) {
178 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
179 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
180
181 # zeroeth the shadow
182 if ($mark & (MARK_B | MARK_W)) {
183 $::shadow_img->composite (
184 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
185 $size / $stone->get_width, $size / $stone->get_height,
186 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
187 );
188 }
189
190 # first the big stones (handicap stones different for effect)
191 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
192 [MARK_W, $mark & MARK_MOVE ? 255 : 192],
193 [MARK_GRAY_B, 128],
194 [MARK_GRAY_W, 128]) {
195 my ($mask, $alpha) = @$_;
196 if ($mark & $mask) {
197 $stone->composite (
198 $base, 0, 0, $size, $size, 0, 0,
199 $size / $stone->get_width, $size / $stone->get_height,
200 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
201 ); 394 );
202 } 395 }
203 } 396 };
204 397
205 # then the small stones 398 } elsif (1 - $self->{colour} == $self->{cur_board}{last}) {
206 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 399 # normal move
207 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 400 $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1);
208 my ($mask, $img) = @$_; 401 $self->{board}->set (cursor => sub {
209 if ($mark & $mask) { 402 # if is_valid_move oder so#TODO#
210 $img->composite ( 403 $_[0] & (MARK_B | MARK_W)
211 $base, (ceil ($size / 4)) x2, (ceil ($size / 2)) x2, (ceil ($size / 4)) x2,
212 $size / $img->get_width / 2, $size / $img->get_height / 2,
213 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
214 ); 404 ? $_[0]
405 : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B);
215 } 406 });
407 $self->{board_click} = sub {
408 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
409 $self->{board}->set (cursor => undef);
410 delete $self->{board_click};
411 $self->{button_pass}->sensitive (0);
216 } 412 };
217
218 # and lastly any markers
219 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
220
221 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
222 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
223 [MARK_SQUARE, $::square_img[$dark_bg]]) {
224 my ($mask, $img) = @$_;
225 if ($mark & $mask) {
226 $img->composite (
227 $base, 0, 0, $size, $size, -0.5, -0.5,
228 $size / $img->get_width, $size / $img->get_height,
229 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255
230 );
231 }
232 }
233
234 push @$$c, $base;
235 }
236 }
237
238 $$c->[$rand % @$$c];
239}
240
241sub pixbuf_text {
242 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
243
244 my @c = grep $_,
245 map $::font[$colour][$::fontmap{$_}],
246 split //, $text;
247
248 if (@c) {
249 my $spacing = $height * 0.1;
250 my $s = $height / List::Util::max map $_->get_height, @c;
251 my $W = List::Util::sum map $_->get_width, @c;
252
253 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
254 $y -= $height * 0.5;
255
256 for (@c) {
257 my $w = $_->get_width * $s;
258 # +2 == don't fight the rounding
259 $_->composite ($pixbuf,
260 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
261 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
262
263 $x += $w + $spacing;
264 }
265 }
266}
267
268sub pixbuf_rect {
269 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
270 # we fake lines by... a horrible method :/
271 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
272 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
273 INTERP_NEAREST, $alpha);
274}
275
276sub repaint_board {
277 my ($self) = @_;
278 my $canvas = $self->{canvas};
279 my $expose_area = undef;
280
281 return $expose_area unless $self->{board};
282
283 my ($w, $h) = ($canvas->allocation->values)[2,3];
284
285 my $s = $w > $h ? $h : $w;
286
287 return unless $s > 128;
288
289 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
290
291 my $size = $self->{size};
292
293 # we leave enough space for the shadows.. I like smaller stones, and we
294 # do no need to do the nifty recursive screen updates that goban2 does
295 my $border = int ($s / ($size + 3) * 0.5);
296 my $s2 = $s - $border * 2;
297 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
298 my $ofs = int ($edge / 2);
299
300 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
301
302 my $pixbuf;
303
304 my $oldboard;
305
306 if ($self->{background}) {
307 if ($oldboard = $self->{board_shown}) {
308 $pixbuf = $self->{pixbuf};
309 } else { 413 } else {
310 $pixbuf = $self->{background}->copy; 414 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
311 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
312 } 415 }
313 } else { 416 } else {
314 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; 417 $self->{button_undo}->hide;
418 $self->{button_resign}->hide;
419 $self->{button_pass}->hide;
420 $self->{board}->set (cursor => undef);
421 #TODO# # implement coordinate-grabbing
422 }
423}
315 424
316 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 425sub update_timers {
426 my ($self, $timers) = @_;
317 427
318 if ($s < $bw && $s < $bh) { 428 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
319 $pixbuf = new_pixbuf $s, $s, 0; 429
320 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 430 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
431 my $t = $timers->[$colour];
432 $self->{userpanel}[$colour]->set_timer (
433 $running && $self->{lastmove_colour} == 1 - $colour && $t->[0],
434 $t->[1], $t->[2]);
435 }
436}
437
438sub update_board {
439 my ($self) = @_;
440 return unless $self->{path};
441
442 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
443
444 $self->{cur_board} = new KGS::Game::Board $self->{size};
445 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
446
447 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
448 for COLOUR_WHITE, COLOUR_BLACK;
449
450 if ($self->{showmove} == @{$self->{path}}) {
451 $self->{timers} = [
452 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
453 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
454 ];
455 $self->update_timers ($self->{timers});
321 } else { 456 } else {
322 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 457 $self->update_timers ([
458 [0, @{$self->{cur_board}{timer}[0]}],
459 [0, @{$self->{cur_board}{timer}[1]}],
323 } 460 ]);
324
325 my $linew = int ($s / 25 / $size);
326
327 # ornamental border... we have time to waste :/
328 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
329 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
330 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
331 pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
332
333 for my $i (1 .. $size) {
334 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
335 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
336
337 # 38 max, but we allow a bit more
338 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
339 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];
340
341 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
342 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
343 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
344 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
345
346 $a++;
347 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
348 }
349
350 unless ($::config->{conserve_memory}) {
351 $self->{background} = $pixbuf;
352 $pixbuf = $pixbuf->copy;
353 }
354 } 461 }
355 462
356 $self->{pixbuf} = $pixbuf; 463 $self->{board}->set_board ($self->{cur_board});
357 464
358 # hoshi-points(!)#d# 465 if ($self->{cur_board}{score}) {
359 # caching of empty board gfx(!)#d# 466 $self->{score_inlay} ||= $self->{chat}->new_inlay;
360 467 $self->{score_inlay}->clear;
361 for my $x (1 .. $size) { 468 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
362 for my $y (1 .. $size) { 469 . "\n<score>"
363 my $rand = ($x ^ $y ^ 0x5555); 470 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
364 471 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
365 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs); 472 . "</score>");
366 473 } elsif ($self->{score_inlay}) {
367 if ($::config->{randomize}) { 474 (delete $self->{score_inlay})->clear;
368 $dx += ($rand % 7) - 3;
369 $dy += ($rand / 3 % 7) - 3;
370 }
371
372 my $shadow = $edge * 0.05;
373 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
374
375 my $mark = $self->{board}{board}[$x-1][$y-1];
376 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
377
378 if ($oldboard) {
379 next if $old == $mark; # no change
380
381 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
382 $expose_area = $expose_area
383 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
384 : new Gtk2::Gdk::Rectangle @$area;
385 }
386
387 if ($mark) {
388 my $pb = $self->create_stack($mark, $edge, $rand);
389
390 $pb->composite ($pixbuf, @$area,
391 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
392
393 # labels are handled here because they are quite rare
394 if ($mark & MARK_LABEL) {
395 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
396
397 if ($white) {
398 pixbuf_text $pixbuf, 0,
399 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
400 $self->{board}{label}[$x-1][$y-1];
401 }
402 pixbuf_text $pixbuf, $white,
403 $k[$x], $k[$y], $ofs * 0.7,
404 $self->{board}{label}[$x-1][$y-1];
405 }
406
407 # old pixmap&mask-way. that was fast ;(
408 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
409
410 #$gc->set_clip_mask ($bm);
411 #$gc->set_clip_origin ($dx, $dy);
412 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
413 }
414 }
415 } 475 }
416 476
417 $self->{board_shown} = Storable::dclone $self->{board}; 477 $self->update_cursor;
418 #d# save
419 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
420
421 $expose_area;
422}
423
424sub redraw {
425 my ($self, $area) = @_;
426
427 if ($area && $self->{pixbuf}) {
428 my ($x, $y, $w, $h) = $area->values;
429 my ($ox, $oy, $s) = @{$self->{offsets}};
430
431 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
432 $x, $y, $x + $ox, $y + $oy, $w, $h,
433 "normal", 0, 0);
434 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
435 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
436 }
437} 478}
438 479
439sub event_update_tree { 480sub event_update_tree {
440 my ($self) = @_; 481 my ($self) = @_;
441 482
442 $self->{path} = $self->get_path; 483 $self->{path} = $self->get_path;
443 $self->{moveadj}->value_changed if $self->{moveadj}; 484
485 if ($self->{moveadj}) {
486 my $upper = $self->{moveadj}->upper;
487 my $pos = $self->{moveadj}->get_value;
488 my $move = scalar @{$self->{path}};
489
490 $self->{moveadj}->upper ($move);
491
492 $self->{moveadj}->changed;
493 if ($pos == $upper) {
494 $self->{moveadj}->value ($move);
495 $self->{moveadj}->value_changed;
496 }
497 }
498}
499
500sub event_update_comments {
501 my ($self, $node, $comment, $newnode) = @_;
502 $self->SUPER::event_update_comments($node, $comment, $newnode);
503
504 my $text;
505
506 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
507 if $newnode;
508
509 for (split /\n/, $comment) {
510 $text .= "\n";
511 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
512 $text .= "<user>" . (util::toxml $1) . "</user>:";
513 }
514
515 # coords only for 19x19 so far
516 $_ = util::toxml $_;
517 s{
518 (
519 \b
520 (?:[bw])?
521 [, ]{0,2}
522 [a-hj-t] # valid for upto 19x19
523 \s?
524 [1-9]?[0-9]
525 \b
526 )
527 }{
528 "<coord>$1</coord>";
529 }sgexi;
530
531 $text .= $_;
532 }
533
534 $self->{chat}->append_text ($text);
535}
536
537sub event_join {
538 my ($self) = @_;
539
540 $self->SUPER::event_join (@_);
541 $self->init_tree;
542 $self->event_update_game;
444} 543}
445 544
446sub event_part { 545sub event_part {
447 my ($self) = @_; 546 my ($self) = @_;
547
448 $self->SUPER::event_part; 548 $self->SUPER::event_part;
449 delete $appwin::gamelist->{game}{$self->{channel}};
450 $self->destroy; 549 $self->destroy;
451} 550}
452 551
453sub event_move { 552sub event_move {
454 my ($self, $pass) = @_; 553 my ($self, $pass) = @_;
455 sound::play 1, $pass ? "pass" : "move"; 554 sound::play 1, $pass ? "pass" : "move";
555
556 if ($self->{undo_inlay}) {
557 (delete $self->{undo_inlay})->clear;
558 }
559}
560
561sub event_update_game {
562 my ($self) = @_;
563
564 $self->SUPER::event_update_game;
565
566 return unless $self->{joined};
567
568 $self->{colour} = $self->player_colour ($self->{conn}{name});
569
570 my $title = defined $self->{channel}
571 ? $self->owner->as_string . " " . $self->opponent_string
572 : "Game Window";
573 $self->set_title ("KGS Game $title");
574 $self->{title}->set_text ($title);
575
576 $self->{user}[COLOUR_BLACK] = $self->{black};
577 $self->{user}[COLOUR_WHITE] = $self->{white};
578
579 # show board
580 if ($self->is_inprogress) {
581 if (!$self->{boardbox}->parent) {
582 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
583 $self->{left}->add ($self->{boardbox});
584 $self->{board}->signal_connect (button_release => sub {
585 if ($_[1] == 1) {
586 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
587 }
588 });
589 }
590 if (my $ch = delete $self->{challenge}) {
591 $_->{inlay}->destroy for values %$ch;
592 }
593 $self->update_cursor;
594 }
595
596 $self->{left}->show_all;
597
598 $self->{rules_inlay}->refresh;
599
600}
601
602sub draw_setup {
603 my ($self, $inlay) = @_;
604
605 return unless $self->{joined};
606
607 my $rules = $self->{rules};
608
609 my $text = "";
610
611 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
612 if $self->{teacher};
613
614 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
615 if $self->{owner}->is_valid;
616
617 if ($self->is_inprogress) {
618 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
619 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
620 }
621 $text .= "\nType: " . util::toxml $gametype{$self->type};
622
623 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
624
625 $text .= "\nTime: ";
626
627 if ($rules->{timesys} == TIMESYS_NONE) {
628 $text .= "UNLIMITED";
629 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
630 $text .= util::format_time $rules->{time};
631 $text .= " ABS";
632 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
633 $text .= util::format_time $rules->{time};
634 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
635 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
636 $text .= util::format_time $rules->{time};
637 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
638 }
639
640 $text .= "\nFlags:";
641 $text .= " private" if $self->is_private;
642 $text .= " started" if $self->is_inprogress;
643 $text .= " adjourned" if $self->is_adjourned;
644 $text .= " scored" if $self->is_scored;
645 $text .= " saved" if $self->is_saved;
646
647 if ($self->is_inprogress) {
648 $text .= "\nHandicap: " . $self->{handicap};
649 $text .= "\nKomi: " . $self->{komi};
650 $text .= "\nSize: " . $self->size_string;
651 }
652
653 if ($self->is_scored) {
654 $text .= "\nResult: " . $self->score_string;
655 }
656
657 $inlay->append_text ("<infoblock>$text</infoblock>");
658
659}
660
661sub event_update_rules {
662 my ($self, $rules) = @_;
663
664 $self->{rules} = $rules;
665
666 if ($self->{user}) {
667 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
668 for COLOUR_BLACK, COLOUR_WHITE;
669 }
670
671 sound::play 3, "gamestart";
672
673 $self->{rules_inlay}->refresh;
674}
675
676sub event_resign_game {
677 my ($self, $player) = @_;
678
679 sound::play 3, "resign";
680 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
681 . "\n<user>"
682 . (util::toxml $self->{user}[$msg->{player}]->as_string)
683 . "</user> resigned.</infoblock>");
684}
685
686sub event_out_of_time {
687 my ($self, $player) = @_;
688
689 sound::play 3, "timewin";
690 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
691 . "\n<user>"
692 . (util::toxml $self->{user}[$msg->{player}]->as_string)
693 . "</user> ran out of time and lost.</infoblock>");
694}
695
696sub event_done {
697 my ($self) = @_;
698
699 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
700 $self->{chat}->append_text ("\n<infoblock><header>Done</header>"
701 . "\nYour opponent pressed done.");
702 }
703}
704
705sub inject_final_result {
706 my ($self, $msg) = @_;
707
708 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
709 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
710 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
711 . "</infoblock>"
712 );
713}
714
715sub inject_set_gametime {
716 my ($self, $msg) = @_;
717
718 $self->{timers} = [
719 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
720 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
721 ];
722
723 $self->update_timers ($self->{timers})
724 if $self->{showmove} == @{$self->{path}};
725}
726
727sub inject_req_undo {
728 my ($self, $msg) = @_;
729
730 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
731 return if $inlay->{ignore};
732
733 sound::play 3, "warning" unless $inlay->{count};
734 $inlay->{count}++;
735
736 $inlay->clear;
737 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
738 $inlay->append_button ("Grant", sub {
739 $inlay->clear;
740 $self->send (grant_undo => channel => $self->{channel});
741 });
742 $inlay->append_button ("Ignore", sub {
743 $inlay->clear;
744 $inlay->{ignore} = 1;
745 # but leave inlay, so further undo requests get counted
746 });
747
748 $self->{chat}->set_end;
749}
750
751sub inject_new_game {
752 my ($self, $msg) = @_;
753
754 $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
755 delete $self->{cid};
756}
757
758sub draw_challenge {
759 my ($self, $id) = @_;
760
761 my $info = $self->{challenge}{$id};
762 my $inlay = $info->{inlay};
763 my $rules = $info->{rules};
764
765 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
766 my $opponent = $as_black ? $info->{white} : $info->{black};
767
768 my ($size, $time, $interval, $count);
769
770 if (!$self->{channel}) {
771 $inlay->append_text ("\nNotes: ");
772 $inlay->append_entry (\$info->{notes}, 20, "");
773 $inlay->append_text ("\nGlobal Offer: ");
774 $inlay->append_optionmenu (\$info->{flags},
775 0 => "No",
776 2 => "Yes",
777 );
778 } else {
779 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
780 }
781
782 $inlay->append_text ("\nType: ");
783 $inlay->append_optionmenu (
784 \$info->{gametype},
785 GAMETYPE_DEMONSTRATION , "Demonstration",
786 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)",
787 GAMETYPE_TEACHING , "Teaching",
788 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)",
789 GAMETYPE_SIMUL , "Simul (not yet!)",
790 GAMETYPE_FREE , "Free",
791 GAMETYPE_RATED , "Rated",
792 sub {
793 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
794 },
795 );
796
797 if ($self->{channel}) {
798 $inlay->append_text ("\nMy Colour: ");
799 $inlay->append_optionmenu (
800 \$as_black,
801 0 => "White",
802 1 => "Black",
803 sub {
804 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
805 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
806 }
807 }
808 );
809 }
810
811 $inlay->append_text ("\nRuleset: ");
812 $inlay->append_optionmenu (
813 \$info->{rules}{ruleset},
814 RULESET_JAPANESE , "Japanese",
815 RULESET_CHINESE , "Chinese",
816 RULESET_AGA , "AGA",
817 RULESET_NEW_ZEALAND, "New Zealand",
818 );
819
820 $inlay->append_text ("\nSize: ");
821 $size = $inlay->append_optionmenu (
822 \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38
823 );
824
825 if ($self->{channel}) {
826 $inlay->append_text ("\nHandicap: ");
827 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
828
829 $inlay->append_text ("\nKomi: ");
830 $inlay->append_entry (\$info->{rules}{komi}, 5);
831 }
832
833 $inlay->append_text ("\nTimesys: ");
834 $inlay->append_optionmenu (
835 \$info->{rules}{timesys},
836 &TIMESYS_NONE => "None",
837 &TIMESYS_ABSOLUTE => "Absolute",
838 &TIMESYS_BYO_YOMI => "Byo Yomi",
839 &TIMESYS_CANADIAN => "Canadian",
840 sub {
841 my ($new) = @_;
842
843 if ($new eq TIMESYS_NONE) {
844 $time->hide;
845 $interval->hide;
846 $count->hide;
847 } else {
848 $time->show;
849 $time->set_text ($self->{app}{defaults}{time});
850 if ($new eq TIMESYS_ABSOLUTE) {
851 $interval->hide;
852 $count->hide;
853 } else {
854 $interval->show;
855 $count->show;
856 if ($new eq TIMESYS_BYO_YOMI) {
857 $interval->set_text ($self->{app}{defaults}{byo_time});
858 $count->set_text ($self->{app}{defaults}{byo_period});
859 } elsif ($new eq TIMESYS_CANADIAN) {
860 $interval->set_text ($self->{app}{defaults}{can_time});
861 $count->set_text ($self->{app}{defaults}{can_period});
862 }
863 }
864 }
865 }
866 );
867
868 $inlay->append_text ("\nMain Time: ");
869 $time = $inlay->append_entry (\$info->{rules}{time}, 5);
870 $inlay->append_text ("\nInterval: ");
871 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
872 $inlay->append_text ("\nPeriods/Stones: ");
873 $count = $inlay->append_entry (\$info->{rules}{count}, 2);
874
875 $inlay->append_text ("\n");
876
877 if (!$self->{channel}) {
878 $inlay->append_button ("Create Challenge", sub {
879 $inlay->clear;
880 $self->{cid} = $self->{conn}->alloc_clientid;
881 $self->send (new_game =>
882 channel => delete $self->{roomid},
883 gametype => $info->{gametype},
884 cid => $self->{cid},
885 flags => $info->{flags},
886 rules => $info->{rules},
887 notes => $info->{notes},
888 );
889 });
890 } else {
891 $inlay->append_button ("OK", sub {
892 $inlay->clear;
893 $self->send (challenge =>
894 channel => $self->{channel},
895 black => $info->{black},
896 white => $info->{white},
897 gametype => $info->{gametype},
898 cid => $info->{cid},
899 rules => $info->{rules},
900 );
901 });
902 if (exists $self->{challenge}{""}) {
903 $inlay->append_button ("Reject", sub {
904 $inlay->clear;
905 $self->send (reject_challenge =>
906 channel => $self->{channel},
907 name => $opponent->{name},
908 gametype => $info->{gametype},
909 cid => $info->{cid},
910 rules => $info->{rules},
911 );
912 });
913 }
914 }
915}
916
917sub draw_users {
918 my ($self, $inlay) = @_;
919
920 for (sort keys %{$self->{users}}) {
921 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
922 }
923}
924
925sub event_challenge {
926 my ($self, $info) = @_;
927
928 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
929 my $opponent = $as_black ? $info->{white} : $info->{black};
930
931 my $id = $opponent->{name};
932
933 $self->{challenge}{$id} = $info;
934 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
935 exists $self->{challenge}{""}
936 ? "Challenge from $opponent->{name}"
937 : "Challenge to $opponent->{name}",
938 sub {
939 $self->{challenge}{$id}{inlay} = $_[0];
940 $self->draw_challenge ($id);
941 },
942 !exists $self->{challenge}{""} # only open when not offerer
943 );
456} 944}
457 945
4581; 9461;
459 947

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines