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.81 by pcg, Fri Apr 2 23:22:30 2004 UTC vs.
Revision 1.117 by root, Tue Jun 1 21:24:11 2004 UTC

1use utf8; 1use utf8;
2
3use Scalar::Util ();
4
5### GO CLOCK WIDGET #########################################################
2 6
3package game::goclock; 7package game::goclock;
4 8
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 9# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked. 10# is completely borked.
7 11
8use Time::HiRes (); 12use Time::HiRes ();
9 13
10use KGS::Constants; 14use KGS::Constants;
11 15
12use base gtk::widget; 16use Glib::Object::Subclass
17 Gtk2::Label;
13 18
14sub new { 19sub INIT_INSTANCE {
15 my $class = shift; 20 my $self = shift;
16 my $self = $class->SUPER::new(@_);
17 21
18 $self->{widget} = new Gtk2::Label; 22 $self->signal_connect (destroy => sub { $_[0]->stop });
19 23
20 $self->{set} = sub { }; 24 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" }; 25 $self->{format} = sub { "???" };
26}
22 27
28sub FINALIZE_INSTANCE {
29 my $self = shift;
30
23 $self; 31 $self->stop;
24} 32}
25 33
26sub configure { 34sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 35 my ($self, $timesys, $main, $interval, $count) = @_;
28 36
29 if ($timesys == TIMESYS_ABSOLUTE) { 37 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] }; 38 $self->{format} = sub {
31 $self->{format} = sub { util::format_time $_[0] }; 39 if ($_[0] < 0) {
40 "TIMEOUT";
41 } else {
42 util::format_time $_[0];
43 }
44 };
32 45
33 } elsif ($timesys == TIMESYS_BYO_YOMI) { 46 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count; 47 my $low = $interval * $count;
35 48
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub { 49 $self->{format} = sub {
50 if ($_[0] < 0) {
51 "TIMEOUT";
39 if ($_[0] > $low) { 52 } elsif ($_[0] > $low) {
40 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
41 } else { 54 } else {
42 sprintf "%s (%d)", 55 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1), 56 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval; 57 ($_[0] - 1) / $interval;
45 } 58 }
46 }; 59 };
47 60
48 } elsif ($timesys == TIMESYS_CANADIAN) { 61 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub { 62 $self->{format} = sub {
63 if ($_[0] < 0) {
64 "TIMEOUT";
52 if (!$self->{moves}) { 65 } elsif (!$self->{moves}) {
53 util::format_time $_[0] - $low; 66 util::format_time $_[0] - $low;
54 } else { 67 } else {
55 my $time = int (($_[0] - 1) % $interval + 1); 68 my $time = int (($_[0] - 1) % $interval + 1);
56 69
57 sprintf "%s/%d =%d", 70 sprintf "%s/%d =%d",
… …
63 } 76 }
64 }; 77 };
65 78
66 } else { 79 } else {
67 # none, or unknown 80 # none, or unknown
68 $self->{set} = sub { };
69 $self->{format} = sub { "---" } 81 $self->{format} = sub { "-" }
70 } 82 }
71} 83}
72 84
73sub refresh { 85sub refresh {
74 my ($self, $timestamp) = @_; 86 my ($self, $timestamp) = @_;
75 my $timer = $self->{time} + $self->{start} - $timestamp; 87 my $timer = $self->{time} + $self->{start} - $timestamp;
76 88
77 # we round the timer value slightly... the protocol isn't exact anyways, 89 # we round the timer value slightly... the protocol isn't exact anyways,
78 # and this gives smoother timers ;) 90 # and this gives smoother timers ;)
79 my @format = $self->{format}->(int ($timer + 0.4)); 91 my $timer2 = int $timer + 0.4;
92
80 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 93 $self->set_text ($self->{format}->($timer2));
81 94
82 $timer - int $timer; 95 $timer - int $timer;
83} 96}
84 97
85sub set_time { 98sub set_time {
86 my ($self, $time) = @_; 99 my ($self, $start, $time, $moves) = @_;
87 100
88 # we ignore requests to re-set the time of a running clock. 101 $self->{time} = $time;
89 # this is the easiest way to ensure that commentary etc. 102 $self->{moves} = $moves;
90 # doesn't re-set the clock. yes, this is frickle design, 103
91 # but I think the protocol is to blame here, which gives 104 if ($start) {
92 # very little time information. (cgoban2 also has had quite 105 $self->{start} = $start;
93 # a lot of small time update problems...) 106 $self->start;
94 unless ($self->{timeout}) { 107 } else {
95 $self->{set}->($time->[0], $time->[1]); 108 $self->stop;
96 $self->refresh ($self->{start}); 109 $self->refresh ($self->{start});
97 } 110 }
98} 111}
99 112
100sub start { 113sub start {
101 my ($self, $when) = @_; 114 my ($self) = @_;
102 115
103 $self->stop; 116 $self->stop;
104
105 $self->{start} = $when;
106 117
107 my $timeout; $timeout = sub { 118 my $timeout; $timeout = sub {
108 my $next = $self->refresh (Time::HiRes::time) * 1000; 119 my $next = $self->refresh (Time::HiRes::time) * 1000;
109 $next += 1000 if $next < 0; 120 $next += 1000 if $next < 0;
110 $self->{timeout} = add Glib::Timeout $next, $timeout; 121 $self->{timeout} = add Glib::Timeout $next, $timeout;
… …
118 my ($self) = @_; 129 my ($self) = @_;
119 130
120 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 131 remove Glib::Source delete $self->{timeout} if $self->{timeout};
121} 132}
122 133
123sub destroy { 134### USER PANEL ##############################################################
124 my ($self) = @_;
125 $self->stop;
126 $self->SUPER::destroy;
127}
128 135
129package game::userpanel; 136package game::userpanel;
130 137
131use base gtk::widget; 138use KGS::Constants;
132 139
133sub new { 140use Glib::Object::Subclass
134 my $class = shift; 141 Gtk2::Frame,
135 my $self = $class->SUPER::new(@_); 142 properties => [
143 Glib::ParamSpec->IV ("colour", "colour", "User Colour",
144 COLOUR_BLACK, COLOUR_WHITE, COLOUR_BLACK,
145 [qw(construct-only readable writable)]),
146 ];
136 147
137 $self->{widget} = new Gtk2::HBox; 148sub INIT_INSTANCE {
149 my ($self) = @_;
138 150
139 $self->{widget}->add (my $vbox = new Gtk2::VBox); 151 $self->add (my $vbox = new Gtk2::VBox);
140 152
141 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 153 $vbox->pack_start (($self->{name} = new Gtk2::Label "-"), 1, 1, 0);
142 $vbox->add ($self->{info} = new Gtk2::Label ""); 154 $vbox->pack_start (($self->{info} = new Gtk2::Label "-"), 1, 1, 0);
143 $vbox->add (($self->{clock} = new game::goclock)->widget); 155 $vbox->pack_start (($self->{clock} = new game::goclock), 1, 1, 0);
144 156
145 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 157 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
146 158
147 $self; 159 $self;
148} 160}
… …
172 } 184 }
173 185
174 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); 186 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
175} 187}
176 188
177sub set_state { 189sub set_captures {
178 my ($self, $captures, $timer, $when) = @_; 190 my ($self, $captures) = @_;
179
180 $self->{clock}->stop unless $when;
181 $self->{clock}->set_time ($timer);
182 $self->{clock}->start ($when) if $when;
183 191
184 $self->{info}->set_text ("$captures pris."); 192 $self->{info}->set_text ("$captures pris.");
185} 193}
186 194
195sub set_timer {
196 my ($self, $start, $time, $moves) = @_;
197
198 $self->{clock}->set_time ($start, $time, $moves);
199}
200
201### GAME WINDOW #############################################################
202
187package game; 203package game;
204
205use Scalar::Util qw(weaken);
188 206
189use KGS::Constants; 207use KGS::Constants;
190use KGS::Game::Board; 208use KGS::Game::Board;
191 209
192use Gtk2::GoBoard; 210use Gtk2::GoBoard;
211use Gtk2::GoBoard::Constants;
193 212
213use base KGS::Game;
194use base KGS::Listener::Game; 214use base KGS::Listener::Game;
195use base KGS::Game;
196 215
197use base gtk::widget; 216use Glib::Object::Subclass
217 Gtk2::Window;
198 218
199use POSIX qw(ceil); 219use POSIX qw(ceil);
200 220
201sub new { 221sub new {
202 my $self = shift; 222 my ($self, %arg) = @_;
203 $self = $self->SUPER::new(@_); 223 $self = $self->Glib::Object::new;
224 $self->{$_} = delete $arg{$_} for keys %arg;
204 225
205 $self->listen($self->{conn});
206
207 $self->{window} = new Gtk2::Window 'toplevel';
208 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 226 gtk::state $self, "game::window", undef, window_size => [600, 500];
209 227
210 $self->{window}->signal_connect(delete_event => sub { 228 $self->signal_connect (destroy => sub {
211 $self->part; 229 $self->unlisten;
212 $self->destroy; 230 delete $self->{app}{game}{$self->{channel}};
213 1; 231 %{$_[0]} = ();
214 }); 232 });#d#
215 233
216 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 234 $self->add (my $hpane = new Gtk2::HPaned);
217 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 235 gtk::state $hpane, "game::hpane", undef, position => 500;
218 236
219 # LEFT PANE 237 # LEFT PANE
220 238
221 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 239 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
222 240
223 $self->{boardbox} = new Gtk2::VBox;
224
225 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 241 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
226 242
227 # challenge
228
229 $self->{challenge} = new challenge channel => $self->{channel};
230
231 # board box (aspect/canvas) 243 # board box (aspect/canvas)
232 244
245 # RIGHT PANE
246
247 $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
248 $hpane->set (position_set => 1);
249
233 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 250 $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
234 251
235 { 252 {
236 $frame->add (my $vbox = new Gtk2::VBox); 253 $frame->add (my $vbox = new Gtk2::VBox);
237 $vbox->add ($self->{title} = new Gtk2::Label $title); 254 $vbox->add ($self->{title} = new Gtk2::Label "-");
238 255
239 $vbox->add (my $hbox = new Gtk2::HBox); 256 $vbox->add (my $hbox = new Gtk2::HBox);
240 257
241 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); 258 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 0, 0);
242 259
243 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; 260 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
244 261
245 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); 262 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
246 $scale->set_draw_value (0); 263 $scale->set_draw_value (0);
247 $scale->set_digits (0); 264 $scale->set_digits (0);
248 265
249 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 266 $self->{moveadj}->signal_connect (value_changed => sub {
267 $self->{showmove} = int $self->{moveadj}->get_value;
268 $self->update_board;
269 });
250 } 270 }
251 271
252 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
253
254 # RIGHT PANE
255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always");
262
263 $sw->add(($self->{userlist} = new userlist)->widget);
264
265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
266
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 272 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
273
268 $hbox->add (($self->{userpanel}[COLOUR_WHITE] = new game::userpanel colour => COLOUR_WHITE)->widget); 274 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
269 $hbox->add (($self->{userpanel}[COLOUR_BLACK] = new game::userpanel colour => COLOUR_BLACK)->widget); 275 for COLOUR_WHITE, COLOUR_BLACK;
276
277 $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0);
278
279 $buttonbox->add ($self->{button_pass} =
280 Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0));
281 $self->{button_pass}->signal_connect (clicked => sub {
282 $self->{board_click}->(255, 255) if $self->{board_click};
283 });
284 $buttonbox->add ($self->{button_undo} =
285 Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0));
286 $self->{button_undo}->signal_connect (clicked => sub {
287 $self->send (req_undo => channel => $self->{channel});
288 });
289 $buttonbox->add ($self->{button_resign} =
290 Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0));
291 $self->{button_resign}->signal_connect (clicked => sub {
292 $self->send (resign_game => channel => $self->{channel}, player => $self->{colour});
293 });
270 294
271 $vbox->pack_start(($self->{chat} = new chat), 1, 1, 0); 295 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
272 296
297 $self->set_channel ($self->{channel});
298
299 $self->show_all;
300
301 $self;
302}
303
304sub set_channel {
305 my ($self, $channel) = @_;
306
307 $self->{channel} = $channel;
308
309 if ($self->{channel} > 0) {
310 $self->listen ($self->{conn});
311
312 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1);
313 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1);
314
315 $self->signal_connect (delete_event => sub { $self->part; 1 });
273 $self->{chat}->signal_connect(command => sub { 316 $self->{chat}->signal_connect (command => sub {
274 my ($chat, $cmd, $arg) = @_; 317 my ($chat, $cmd, $arg) = @_;
275 if ($cmd eq "rsave") { 318 if ($cmd eq "rsave") {
276 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# 319 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
277 } else { 320 } else {
278 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); 321 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
322 }
279 } 323 });
280 }); 324 }
325}
281 326
327### JOIN/LEAVE ##############################################################
328
329sub join {
330 my ($self) = @_;
331 return if $self->{joined};
332
333 $self->SUPER::join;
334}
335
336sub event_join {
337 my ($self) = @_;
338
339 $self->SUPER::event_join (@_);
340 $self->init_tree;
282 $self->event_update_game; 341 $self->event_update_game;
283 $self; 342}
343
344sub event_part {
345 my ($self) = @_;
346
347 $self->SUPER::event_part;
348 $self->destroy;
349}
350
351sub event_quit {
352 my ($self) = @_;
353
354 $self->SUPER::event_quit;
355 $self->destroy;
356}
357
358### USERS ###################################################################
359
360sub draw_users {
361 my ($self, $inlay) = @_;
362
363 for (sort keys %{$self->{users}}) {
364 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
365 }
284} 366}
285 367
286sub event_update_users { 368sub event_update_users {
287 my ($self, $add, $update, $remove) = @_; 369 my ($self, $add, $update, $remove) = @_;
288 370
289 return unless $self->{userlist};
290
291 $self->{userlist}->update ($add, $update, $remove); 371# $self->{userlist}->update ($add, $update, $remove);
372
373 $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
374 for @$remove;
375
376 $self->{users_inlay}->refresh;
292 377
293 my %important; 378 my %important;
379 $important{$self->{black}{name}}++;
380 $important{$self->{white}{name}}++;
294 $important{$self->{user1}{name}}++; 381 $important{$self->{owner}{name}}++;
295 $important{$self->{user2}{name}}++;
296 $important{$self->{user3}{name}}++;
297 382
298 if (my @users = grep $important{$_->{name}}, @$add) { 383 if (my @users = grep $important{$_->{name}}, @$add) {
299 $self->{chat}->append_text ("\n<header>Joins:</header>"); 384 $self->{chat}->append_text ("\n<header>Joins:</header>");
300 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 385 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
301 } 386 }
302 if (my @users = grep $important{$_->{name}}, @$remove) { 387 if (my @users = grep $important{$_->{name}}, @$remove) {
303 $self->{chat}->append_text ("\n<header>Parts:</header>"); 388 $self->{chat}->append_text ("\n<header>Parts:</header>");
304 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; 389 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
305 } 390 }
306
307} 391}
308 392
309sub join { 393### GAME INFO ###############################################################
394
395sub draw_setup {
310 my ($self) = @_; 396 my ($self, $inlay) = @_;
397
311 return if $self->{joined}; 398 return unless $self->{joined};
312 399
313 $self->SUPER::join; 400 my $rules = $self->{rules};
314 401
402 my $text = "";
403
404 $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>"
405 if $self->{teacher};
406
407 $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>"
408 if $self->{owner}->is_valid;
409
410 if ($self->is_inprogress) {
411 $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>"
412 . " vs. <user>" . (util::toxml $self->{black}->as_string) . "</user>";
413 }
414 $text .= "\nType: " . util::toxml $gametype{$self->type};
415
416 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
417
418 $text .= "\nTime: ";
419
420 if ($rules->{timesys} == TIMESYS_NONE) {
421 $text .= "UNLIMITED";
422 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
423 $text .= util::format_time $rules->{time};
424 $text .= " ABS";
425 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
426 $text .= util::format_time $rules->{time};
427 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
428 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
429 $text .= util::format_time $rules->{time};
430 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
431 }
432
433 $text .= "\nFlags:";
434 $text .= " private" if $self->is_private;
435 $text .= " started" if $self->is_inprogress;
436 $text .= " adjourned" if $self->is_adjourned;
437 $text .= " scored" if $self->is_scored;
438 $text .= " saved" if $self->is_saved;
439
440 if ($self->is_inprogress) {
441 $text .= "\nHandicap: " . $self->{handicap};
442 $text .= "\nKomi: " . $self->{komi};
443 $text .= "\nSize: " . $self->size_string;
444 }
445
446 if ($self->is_scored) {
447 $text .= "\nResult: " . $self->score_string;
448 }
449
450 $inlay->append_text ("<infoblock>$text</infoblock>");
451
452}
453
454sub event_update_game {
455 my ($self) = @_;
456
457 $self->SUPER::event_update_game;
458
459 return unless $self->{joined};
460
461 $self->{colour} = $self->player_colour ($self->{conn}{name});
462
463 $self->{user}[COLOUR_BLACK] = $self->{black};
464 $self->{user}[COLOUR_WHITE] = $self->{white};
465
466 # show board
467 if ($self->is_inprogress) {
468 if (!$self->{board}) {
469 $self->{left}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
470 $self->{board}->signal_connect (button_release => sub {
471 return unless $self->{cur_board};
472 if ($_[1] == 1) {
473 $self->{board_click}->($_[2], $_[3]) if $self->{board_click};
474 }
475 });
315 $self->{window}->show_all; 476 $self->{board}->show_all;
316} 477 }
478 if (my $ch = delete $self->{challenge}) {
479 $_->{inlay}->destroy for values %$ch;
480 }
481 $self->update_cursor;
482 }
317 483
318sub part { 484 my $title = defined $self->{channel}
485 ? $self->owner->as_string . " " . $self->opponent_string
486 : "Game Window";
487 $self->set_title ("KGS Game $title");
488 $self->{title}->set_text ($title); # title gets redrawn wrongly
489
490 $self->{rules_inlay}->refresh;
491
492 if (exists $self->{teacher}) {
493 $self->{teacher_inlay} ||= $self->{chat}->new_inlay;
494 $self->{teacher_inlay}->clear;
495 $self->{teacher_inlay}->append_text ("\n<header>Teacher:</header> <user>"
496 . (util::toxml $self->{teacher}) . "</user>");
497 } elsif ($self->{teacher_inlay}) {
498 (delete $self->{teacher_inlay})->clear;
499 }
500
501 $self->update_cursor;
502}
503
504sub event_update_rules {
505 my ($self, $rules) = @_;
506
507 $self->{rules} = $rules;
508
509 if ($self->{user}) {
510 # todo. gets drawn wrongly
511
512 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
513 for COLOUR_BLACK, COLOUR_WHITE;
514 }
515
516 sound::play 3, "gamestart";
517 $self->{rules_inlay}->refresh;
518}
519
520### BOARD DISPLAY ###########################################################
521
522sub update_timers {
523 my ($self, $timers) = @_;
524
525 my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher};
526
527 for my $colour (COLOUR_BLACK, COLOUR_WHITE) {
528 my $t = $timers->[$colour];
529 $self->{userpanel}[$colour]->set_timer (
530 $running && $colour == $self->{whosemove} && $t->[0],
531 $t->[1] || $self->{rules}{time}
532 + ($self->{rules}{timesys} == TIMESYS_BYO_YOMI
533 && $self->{rules}{interval} * $self->{rules}{count}),
534 $t->[2]);
535 }
536}
537
538sub inject_set_gametime {
319 my ($self) = @_; 539 my ($self, $msg) = @_;
320 540
321 $self->SUPER::part; 541 $self->{timers} = [
322 $self->destroy; 542 [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}],
543 [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}],
544 ];
545
546 $self->update_timers ($self->{timers})
547 if $self->{showmove} == @{$self->{path}};
548}
549
550sub update_cursor {
551 my ($self) = @_;
552
553 return unless $self->{cur_board};
554
555 my $running = $self->{showmove} == @{$self->{path}} && $self->is_active;
556
557 delete $self->{board_click};
558
559 if ($self->{teacher} eq $self->{app}{conn}) {
560 #TODO# # teaching mode not implemented
561 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
562 $self->{button_undo}->hide;
563 $self->{button_resign}->hide;
564 $self->{board}->set (cursor => undef);
565
566 } elsif ($running && $self->{colour} != COLOUR_NONE) {
567 # during game
568 $self->{button_undo}->show;
569 $self->{button_resign}->show;
570
571 if ($self->{cur_board}{score}) {
572 # during scoring
573 $self->{button_pass}->set (label => "Done", visible => 1, sensitive => 1);
574 $self->{board}->set (cursor => sub {
575 $_[0] & (MARK_B | MARK_W)
576 ? $_[0] ^ MARK_GRAYED
577 : $_[0];
578 });
579 $self->{board_click} = sub {
580 if ($_[0] == 255) {
581 $self->{button_pass}->sensitive (0);
582 $self->done;
583 } else {
584 $self->send (mark_dead =>
585 channel => $self->{channel},
586 x => $_[0],
587 y => $_[1],
588 dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED),
589 );
590 }
591 };
592
593 } elsif ($self->{colour} == $self->{whosemove}) {
594 # normal move
595 $self->{button_pass}->set (label => "Pass", visible => 1, sensitive => 1);
596 $self->{board}->set (cursor => sub {
597 $self->{cur_board}
598 && $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
599 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND)
600 ? $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B)
601 : $_[0];
602 });
603 $self->{board_click} = sub {
604 return unless
605 $self->{cur_board}->is_valid_move ($self->{colour}, $_[1], $_[2],
606 $self->{rules}{ruleset} == RULESET_NEW_ZEALAND);
607 $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]);
608 $self->{board}->set (cursor => undef);
609 delete $self->{board_click};
610 $self->{button_pass}->sensitive (0);
611 };
612 } else {
613 $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1);
614 $self->{board}->set (cursor => undef);
615 }
616 } else {
617 $self->{button_undo}->hide;
618 $self->{button_resign}->hide;
619 $self->{button_pass}->hide;
620 $self->{board}->set (cursor => undef);
621 #TODO# # implement coordinate-grabbing
622 }
323} 623}
324 624
325sub update_board { 625sub update_board {
326 my ($self) = @_; 626 my ($self) = @_;
627
327 return unless $self->{path}; 628 return unless $self->{path};
328 629
329 my $move = int $self->{moveadj}->get_value; 630 if ($self->{rules}{ruleset} == RULESET_JAPANESE) {
631 if ($self->{curnode}{move} == 0) {
632 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
633 } else {
634 $self->{whosemove} = 1 - $self->{cur_board}{last};
635 }
636 } else {
637 # Chinese, Aga, NZ all have manual placement
638 if ($self->{curnode}{move} < $self->{handicap}) {
639 $self->{whosemove} = COLOUR_BLACK;
640 } elsif ($self->{curnode}{move} == $self->{handicap}) {
641 $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK;
642 } else {
643 $self->{whosemove} = 1 - $self->{cur_board}{last};
644 }
645 }
330 646
331 my $running = $move == @{$self->{path}};
332
333 $self->{board_label}->set_text ("Move " . ($move - 1)); 647 $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1));
334 648
335 $self->{cur_board} = new KGS::Game::Board $self->{size}; 649 $self->{cur_board} = new KGS::Game::Board $self->{size};
336 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 650 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]);
337 651
652 $self->update_cursor;
653
654 $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_])
338 for my $colour (COLOUR_WHITE, COLOUR_BLACK) { 655 for COLOUR_WHITE, COLOUR_BLACK;
339 $self->{userpanel}[$colour]->set_state ( 656
340 $self->{cur_board}{captures}[$colour], 657 my $start_time = $self->{rules}{time};
658
659 if ($self->{showmove} == @{$self->{path}}) {
660 $self->{timers} = [
661 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}],
662 [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}],
663 ];
664 $self->update_timers ($self->{timers});
665 } else {
666 $self->update_timers ([
341 $self->{cur_board}{timer}[$colour], 667 [0, @{$self->{cur_board}{timer}[0]}],
342 ($running && $self->{lastmove_colour} == !$colour) 668 [0, @{$self->{cur_board}{timer}[1]}],
343 ? $self->{lastmove_time} : 0
344 ); 669 ]);
345 } 670 }
346 671
347 $self->{board}->set_board ($self->{cur_board}); 672 $self->{board}->set_board ($self->{cur_board});
673
674 if ($self->{cur_board}{score}) {
675 $self->{score_inlay} ||= $self->{chat}->new_inlay;
676 $self->{score_inlay}->clear;
677 $self->{score_inlay}->append_text ("\n<header>Scoring</header>"
678 . "\n<score>"
679 . "White: $self->{cur_board}{score}[COLOUR_WHITE], "
680 . "Black: $self->{cur_board}{score}[COLOUR_BLACK]"
681 . "</score>");
682 } elsif ($self->{score_inlay}) {
683 (delete $self->{score_inlay})->clear;
684 }
348} 685}
349 686
350sub event_update_tree { 687sub event_update_tree {
351 my ($self) = @_; 688 my ($self) = @_;
689
690 (delete $self->{undo_inlay})->clear
691 if $self->{undo_inlay};
352 692
353 $self->{path} = $self->get_path; 693 $self->{path} = $self->get_path;
354 694
355 if ($self->{moveadj}) { 695 if ($self->{moveadj}) {
356 my $upper = $self->{moveadj}->upper; 696 my $upper = $self->{moveadj}->upper;
… …
402 } 742 }
403 743
404 $self->{chat}->append_text ($text); 744 $self->{chat}->append_text ($text);
405} 745}
406 746
407sub event_join {
408 my ($self) = @_;
409 $self->SUPER::event_join;
410}
411
412sub event_part {
413 my ($self) = @_;
414 $self->SUPER::event_part;
415 $self->destroy;
416}
417
418sub event_move { 747sub event_move {
419 my ($self, $pass) = @_; 748 my ($self, $pass) = @_;
749
420 sound::play 1, $pass ? "pass" : "move"; 750 sound::play 1, $pass ? "pass" : "move";
421} 751}
422 752
423sub event_update_game { 753### GAMEPLAY EVENTS #########################################################
424 my ($self) = @_;
425 $self->SUPER::event_update_game;
426 754
427 return unless $self->{window};
428
429 my $title = defined $self->{channel}
430 ? $self->owner->as_string . " " . $self->opponent_string
431 : "Game Window";
432 $self->{window}->set_title("KGS Game $title");
433 $self->{title}->set_text ($title);
434
435 $self->{user}[COLOUR_BLACK] = $self->{user1};
436 $self->{user}[COLOUR_WHITE] = $self->{user2};
437
438 # show board
439
440 if ($self->is_inprogress) {
441 $self->{left}->remove ($self->{challenge}->widget) if $self->{challenge} && $self->{boardbox}->parent;
442 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
443 } else {
444 $self->{left}->remove ($self->{boardbox}) if $self->{boardbox}->parent;
445 $self->{left}->add ($self->{challenge}->widget) unless $self->{challenge}->widget->parent;
446 }
447 $self->{left}->show_all;
448
449 # view text
450
451 eval { #d#
452 my @ga;
453 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
454 . " (" . (util::toxml $gameopt{$self->option}) . ")";
455 $ga[1] = "\nFlags:";
456 $ga[1] .= " started" if $self->is_inprogress;
457 $ga[1] .= " adjourned" if $self->is_adjourned;
458 $ga[1] .= " scored" if $self->is_scored;
459 $ga[1] .= " saved" if $self->is_saved;
460
461 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
462 if $self->{user3}->is_inprogress;
463
464 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
465 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
466 if $self->is_inprogress;
467
468 if ($self->is_inprogress) {
469 $ga[4] = "\nHandicap: " . $self->{handicap};
470 $ga[5] = "\nKomi: " . $self->{komi};
471 $ga[6] = "\nSize: " . $self->size_string;
472 }
473
474 if ($self->is_scored) {
475 $ga[7] = "\nResult: " . $self->score_string;
476 }
477
478 $text = "\n<infoblock><header>Game Update</header>";
479 for (0..7) {
480 if ($self->{gatext}[$_] ne $ga[$_]) {
481 $text .= $ga[$_];
482 }
483 }
484 $text .= "</infoblock>";
485
486 $self->{gatext} = \@ga;
487 };
488
489 $self->{chat}->append_text ($text);
490}
491
492sub event_update_rules {
493 my ($self, $rules) = @_;
494
495 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
496 for COLOUR_BLACK, COLOUR_WHITE;
497
498 sound::play 3, "gamestart";
499
500 my $text = "\n<header>Game Rules</header>";
501
502 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
503
504 $text .= "\nTime: ";
505
506 if ($rules->{timesys} == TIMESYS_NONE) {
507 $text .= "UNLIMITED";
508 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
509 $text .= util::format_time $rules->{time};
510 $text .= " ABS";
511 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
512 $text .= util::format_time $rules->{time};
513 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
514 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
515 $text .= util::format_time $rules->{time};
516 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
517 }
518
519 $self->{chat}->append_text ("<infoblock>$text</infoblock>");
520}
521
522sub inject_resign_game { 755sub event_resign_game {
523 my ($self, $msg) = @_; 756 my ($self, $player) = @_;
524 757
525 sound::play 3, "resign"; 758 sound::play 3, "resign";
526
527 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" 759 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
528 . "\n<user>" 760 . "\n<user>"
529 . (util::toxml $self->{user}[$msg->{player}]->as_string) 761 . (util::toxml $self->{user}[$msg->{player}]->as_string)
530 . "</user> resigned.</infoblock>"); 762 . "</user> resigned."
763 . "\n<user>"
764 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
765 . "</user> wins the game."
766 . "</infoblock>");
767}
768
769sub event_time_win {
770 my ($self, $player) = @_;
771
772 sound::play 3, "timewin";
773 $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>"
774 . "\n<user>"
775 . (util::toxml $self->{user}[1 - $msg->{player}]->as_string)
776 . "</user> ran out of time and lost."
777 . "\n<user>"
778 . (util::toxml $self->{user}[$msg->{player}]->as_string)
779 . "</user> wins the game."
780 . "</infoblock>");
781}
782
783sub event_owner_left {
784 my ($self) = @_;
785
786 $self->{chat}->append_text ("\n<infoblock><header>Owner left</header>"
787 . "\nThe owner of this game left.</infoblock>");
788}
789
790sub event_teacher_left {
791 my ($self) = @_;
792
793 $self->{chat}->append_text ("\n<infoblock><header>Teacher left</header>"
794 . "\nThe teacher left the game.</infoblock>");
795}
796
797sub event_done {
798 my ($self) = @_;
799
800 if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) {
801 sound::play 2, "info" unless $inlay->{count};
802 $self->{chat}->append_text ("\n<infoblock><header>Press Done</header>"
803 . "\nYour opponent pressed done. Now it's up to you.");
804 }
805 if ($self->{doneid} & 0x80000000) {
806 sound::play 2, "info" unless $inlay->{count};
807 $self->{chat}->append_text ("\n<infoblock><header>Press Done Again</header>"
808 . "\nThe board has changed.");
809 }
810
811 $self->{button_pass}->sensitive (!$self->{done}[$self->{colour}]);
812
813 $self->{chat}->set_end;
531} 814}
532 815
533sub inject_final_result { 816sub inject_final_result {
534 my ($self, $msg) = @_; 817 my ($self, $msg) = @_;
535 818
… …
538 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 821 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
539 . "</infoblock>" 822 . "</infoblock>"
540 ); 823 );
541} 824}
542 825
826sub inject_req_undo {
827 my ($self, $msg) = @_;
828
829 my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay;
830 return if $inlay->{ignore};
831
832 sound::play 2, "warning" unless $inlay->{count};
833 $inlay->{count}++;
834
835 $inlay->clear;
836 $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n");
837 $inlay->append_button ("Grant", sub {
838 (delete $self->{undo_inlay})->clear;
839 $self->send (grant_undo => channel => $self->{channel});
840 });
841 $inlay->append_button ("Ignore", sub {
842 $inlay->clear;
843 $inlay->{ignore} = 1;
844 # but leave inlay, so further undo requests get counted
845 });
846
847 $self->{chat}->set_end;
848}
849
850sub inject_new_game {
851 my ($self, $msg) = @_;
852
853 if ($msg->{cid} != $self->{cid}) {
854 $self->part;
855 warn "ERROR: challenge id mismatch, PLEASE REPORT, especially the circumstances (many games open? etc..)\n";#d#
856 }
857
858 $self->{chat}->append_text ("\n<header>Game successfully created on server.</header>");
859 delete $self->{cid};
860}
861
862### CHALLENGE HANDLING ######################################################
863
864sub draw_challenge {
865 my ($self, $id) = @_;
866
867 my $info = $self->{challenge}{$id};
868 my $inlay = $info->{inlay};
869 my $rules = $info->{rules};
870
871 my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;;
872 my $opponent = $as_black ? $info->{white} : $info->{black};
873
874 my ($size, $time, $interval, $count, $type);
875
876 if (!$self->{channel}) {
877 $inlay->append_text ("\nNotes: ");
878 $inlay->append_entry (\$info->{notes}, 20, "");
879 $inlay->append_text ("\nGlobal Offer: ");
880 $inlay->append_optionmenu (\$info->{flags},
881 0 => "No",
882 2 => "Yes",
883 );
884 } else {
885 $inlay->append_text ("\nNotes: " . util::toxml $info->{notes});
886 }
887
888 $inlay->append_text ("\nType: ");
889 $type = $inlay->append_optionmenu (
890 \$info->{gametype},
891 GAMETYPE_DEMONSTRATION , "Demonstration (not yet)",
892 GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P) (not yet)",
893 GAMETYPE_TEACHING , "Teaching (not yet)",
894 GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P) (not yet)",
895 GAMETYPE_SIMUL , "Simul (not yet!)",
896 GAMETYPE_FREE , "Free",
897 GAMETYPE_RATED , "Rated",
898 sub {
899 $size->set_history (2) if $_[0] eq GAMETYPE_RATED;
900 },
901 );
902
903 if ($self->{channel}) {
904 $inlay->append_text ("\nMy Colour: ");
905 $inlay->append_optionmenu (
906 \$as_black,
907 0 => "White",
908 1 => "Black",
909 sub {
910 if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) {
911 ($info->{black}, $info->{white}) = ($info->{white}, $info->{black});
912 }
913 }
914 );
915 }
916
917 $inlay->append_text ("\nRuleset: ");
918 $inlay->append_optionmenu (
919 \$info->{rules}{ruleset},
920 RULESET_JAPANESE , "Japanese",
921 RULESET_CHINESE , "Chinese",
922 RULESET_AGA , "AGA",
923 RULESET_NEW_ZEALAND, "New Zealand",
924 );
925
926 $inlay->append_text ("\nSize: ");
927 $size = $inlay->append_optionmenu (
928 \$info->{rules}{size},
929 (9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38),
930 sub {
931 $type->set_history (5) # reset to free
932 if $_[0] != 19 && $info->{gametype} == GAMETYPE_RATED;
933 },
934 );
935
936 if ($self->{channel}) {
937 $inlay->append_text ("\nHandicap: ");
938 $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9);
939
940 $inlay->append_text ("\nKomi: ");
941 $inlay->append_entry (\$info->{rules}{komi}, 5);
942 }
943
944 $inlay->append_text ("\nTimesys: ");
945 $inlay->append_optionmenu (
946 \$info->{rules}{timesys},
947 &TIMESYS_NONE => "None",
948 &TIMESYS_ABSOLUTE => "Absolute",
949 &TIMESYS_BYO_YOMI => "Byo Yomi",
950 &TIMESYS_CANADIAN => "Canadian",
951 sub {
952 my ($new) = @_;
953
954 if ($new eq TIMESYS_NONE) {
955 $time->hide;
956 $interval->hide;
957 $count->hide;
958 } else {
959 $time->show;
960 $time->set_text ($self->{app}{defaults}{time});
961 if ($new eq TIMESYS_ABSOLUTE) {
962 $interval->hide;
963 $count->hide;
964 } else {
965 $interval->show;
966 $count->show;
967 if ($new eq TIMESYS_BYO_YOMI) {
968 $interval->set_text ($self->{app}{defaults}{byo_time});
969 $count->set_text ($self->{app}{defaults}{byo_period});
970 } elsif ($new eq TIMESYS_CANADIAN) {
971 $interval->set_text ($self->{app}{defaults}{can_time});
972 $count->set_text ($self->{app}{defaults}{can_period});
973 }
974 }
975 }
976 }
977 );
978
979 $inlay->append_text ("\nMain Time: ");
980 $time = $inlay->append_entry (\$info->{rules}{time}, 5);
981 $inlay->append_text ("\nInterval: ");
982 $interval = $inlay->append_entry (\$info->{rules}{interval}, 3);
983 $inlay->append_text ("\nPeriods/Stones: ");
984 $count = $inlay->append_entry (\$info->{rules}{count}, 2);
985
986 $inlay->append_text ("\n");
987
988 if (!$self->{channel}) {
989 $inlay->append_button ("Create Challenge", sub {
990 $inlay->clear;
991 $self->{cid} = $self->{conn}->alloc_clientid;
992 $self->send (new_game =>
993 channel => delete $self->{roomid},
994 gametype => $info->{gametype},
995 cid => $self->{cid},
996 flags => $info->{flags},
997 rules => $info->{rules},
998 notes => $info->{notes},
999 );
1000 });
1001 } else {
1002 $inlay->append_button ("OK", sub {
1003 $inlay->clear;
1004 $self->send (challenge =>
1005 channel => $self->{channel},
1006 black => $info->{black},
1007 white => $info->{white},
1008 gametype => $info->{gametype},
1009 cid => $info->{cid},
1010 rules => $info->{rules},
1011 );
1012 });
1013 if (exists $self->{challenge}{""}) {
1014 $inlay->append_button ("Reject", sub {
1015 $inlay->clear;
1016 $self->send (reject_challenge =>
1017 channel => $self->{channel},
1018 name => $opponent->{name},
1019 gametype => $info->{gametype},
1020 cid => $info->{cid},
1021 rules => $info->{rules},
1022 );
1023 });
1024 }
1025 }
1026}
1027
1028sub new_game_challenge {
1029 my ($self) = @_;
1030
1031 my $d = $self->{app}{defaults};
1032
1033 $self->{challenge}{""} = {
1034 gametype => $d->{gametype},
1035 flags => 0,
1036 notes => $d->{stones},
1037 rules => {
1038 ruleset => $d->{ruleset},
1039 size => $d->{size},
1040 timesys => $d->{timesys},
1041 time => $d->{time},
1042 interval => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_time} : $d->{can_time},
1043 count => $d->{timesys} == TIMESYS_BYO_YOMI ? $d->{byo_periods} : $d->{can_stones},
1044 },
1045
1046 inlay => $self->{chat}->new_inlay,
1047 };
1048 $self->draw_challenge ("");
1049}
1050
543sub event_challenge { 1051sub event_challenge {
544 my ($self, $challenge) = @_;
545
546 use KGS::Listener::Debug;
547 $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
548}
549
550sub destroy {
551 my ($self) = @_; 1052 my ($self, $info) = @_;
552 1053
553 delete $self->{app}{gamelist}{game}{$self->{channel}}; 1054 my $as_black = $info->{black}->{name} eq $self->{conn}{name};
554 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 1055 my $opponent = $as_black ? $info->{white} : $info->{black};
555 for COLOUR_BLACK, COLOUR_WHITE; 1056
556 $self->SUPER::destroy; 1057 my $id = $opponent->{name};
1058
1059 sound::play 2, "info";
1060
1061 $self->{challenge}{$id} = $info;
1062 $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay (
1063 exists $self->{challenge}{""}
1064 ? "Challenge from " . $opponent->as_string
1065 : "Challenge to " . $opponent->as_string,
1066 sub {
1067 $self->{challenge}{$id}{inlay} = $_[0];
1068 $self->draw_challenge ($id);
1069 },
1070 !exists $self->{challenge}{""} # only open when not offerer
1071 );
557} 1072}
558 1073
5591; 10741;
560 1075

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines