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.69 by pcg, Tue Jul 22 21:24:50 2003 UTC vs.
Revision 1.88 by pcg, Fri May 21 16:13:41 2004 UTC

1use utf8; 1use utf8;
2
3use Scalar::Util ();
2 4
3package game::goclock; 5package game::goclock;
4 6
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock 7# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked. 8# is completely borked.
7 9
8use Time::HiRes (); 10use Time::HiRes ();
9 11
10use KGS::Constants; 12use KGS::Constants;
11 13
12use base gtk::widget; 14use Glib::Object::Subclass
15 Gtk2::Label;
13 16
14sub new { 17sub INIT_INSTANCE {
15 my $class = shift; 18 my $self = shift;
16 my $self = $class->SUPER::new(@_);
17 19
18 $self->{widget} = new Gtk2::Label; 20 $self->signal_connect (destroy => sub { $_[0]->stop });
19 21
20 $self->{set} = sub { }; 22 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" }; 23 $self->{format} = sub { "???" };
22
23 $self;
24} 24}
25 25
26sub configure { 26sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
28 28
… …
55 my $time = int (($_[0] - 1) % $interval + 1); 55 my $time = int (($_[0] - 1) % $interval + 1);
56 56
57 sprintf "%s/%d =%d", 57 sprintf "%s/%d =%d",
58 util::format_time $time, 58 util::format_time $time,
59 $self->{moves}, 59 $self->{moves},
60 $self->{moves} > 1
60 $time / ($self->{moves} || 1); 61 ? $time / $self->{moves}
61 62 : $interval;
62 } 63 }
63 }; 64 };
64 65
65 } else { 66 } else {
66 # none, or unknown 67 # none, or unknown
… …
74 my $timer = $self->{time} + $self->{start} - $timestamp; 75 my $timer = $self->{time} + $self->{start} - $timestamp;
75 76
76 # we round the timer value slightly... the protocol isn't exact anyways, 77 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;) 78 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4)); 79 my @format = $self->{format}->(int ($timer + 0.4));
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); 80 $self->set_text ($self->{format}->(int ($timer + 0.4)));
80 81
81 $timer - int $timer; 82 $timer - int $timer;
82} 83}
83 84
84sub set_time { 85sub set_time {
… …
117 my ($self) = @_; 118 my ($self) = @_;
118 119
119 remove Glib::Source delete $self->{timeout} if $self->{timeout}; 120 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120} 121}
121 122
122sub destroy {
123 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127
128package game::userpanel; 123package game::userpanel;
129 124
130use base gtk::widget; 125use Glib::Object::Subclass
126 Gtk2::HBox,
127 properties => [
128 Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]),
129 ];
131 130
132sub new { 131sub INIT_INSTANCE {
133 my $class = shift; 132 my ($self) = @_;
134 my $self = $class->SUPER::new(@_);
135 133
136 $self->{widget} = new Gtk2::HBox;
137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox); 134 $self->add (my $vbox = new Gtk2::VBox);
139 135
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); 136 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141 $vbox->add ($self->{info} = new Gtk2::Label ""); 137 $vbox->add ($self->{info} = new Gtk2::Label "");
142 $vbox->add (($self->{clock} = new game::goclock)->widget); 138 $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock};
143 139
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 140 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145 141
146 $self; 142 $self;
147} 143}
… …
183 $self->{info}->set_text ("$captures pris."); 179 $self->{info}->set_text ("$captures pris.");
184} 180}
185 181
186package game; 182package game;
187 183
184use Scalar::Util qw(weaken);
185
188use KGS::Constants; 186use KGS::Constants;
189use KGS::Game::Board; 187use KGS::Game::Board;
190 188
189use Gtk2::GoBoard;
190
191use Glib::Object::Subclass
192 Gtk2::Window;
193
191use base KGS::Listener::Game; 194use base KGS::Listener::Game;
192use base KGS::Game; 195use base KGS::Game;
193 196
194use base gtk::widget;
195
196use POSIX qw(ceil); 197use POSIX qw(ceil);
197 198
198sub new { 199sub new {
199 my $self = shift; 200 my ($self, %arg) = @_;
200 $self = $self->SUPER::new(@_); 201 $self = $self->Glib::Object::new;
202 $self->{$_} = delete $arg{$_} for keys %arg;
201 203
202 $self->listen($self->{conn}); 204 $self->listen ($self->{conn});
203 205
204 $self->{window} = new Gtk2::Window 'toplevel';
205 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 206 gtk::state $self, "game::window", undef, window_size => [600, 500];
206 207
208 $self->signal_connect (delete_event => sub { $self->part; 1 });
207 $self->{window}->signal_connect(delete_event => sub { 209 $self->signal_connect (destroy => sub {
208 $self->part; 210 $self->unlisten;
209 $self->destroy; 211 delete $self->{app}{game}{$self->{channel}};
210 1; 212 %{$_[0]} = ();
211 }); 213 });#d#
212 214
213 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 215 $self->add (my $hpane = new Gtk2::HPaned);
214 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 216 gtk::state $hpane, "game::hpane", undef, position => 500;
215 217
216 # LEFT PANE 218 # LEFT PANE
217 219
218 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); 220 $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0);
219 221
220 $self->{boardbox} = new Gtk2::VBox; 222 $self->{boardbox} = new Gtk2::VBox;
221 223
222 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 224 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
223 225
224 # challenge
225
226 $self->{challenge} = new challenge channel => $self->{channel};
227
228 # board box (aspect/canvas) 226 # board box (aspect/canvas)
229 227
230 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 228 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
231 229
232 { 230 {
… …
248 246
249 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); 247 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
250 248
251 # RIGHT PANE 249 # RIGHT PANE
252 250
253 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 251 $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
254 $self->{hpane}->set(position_set => 1); 252 $hpane->set (position_set => 1);
255 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 253 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
256 254
257 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 255# $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
258 $sw->set_policy("automatic", "always"); 256# $sw->set_policy ("automatic", "always");
259
260 $sw->add(($self->{userlist} = new userlist)->widget); 257# $sw->add ($self->{userlist} = new userlist);
261 258
262 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 259 $self->{vpane}->add (my $vbox = new Gtk2::VBox);
263 260
264 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 261 $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
262
265 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 263 $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
266 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 264 for COLOUR_WHITE, COLOUR_BLACK;
267 265
268 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 266 $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0);
269 267
270 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 268 $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Rules", sub { $self->draw_rules (@_) }, 1);
269 $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 0);
270
271 $self->{entry}->signal_connect(activate => sub { 271 $self->{chat}->signal_connect (command => sub {
272 my $text = $self->{entry}->get_text; 272 my ($chat, $cmd, $arg) = @_;
273 $self->say($text) if $text =~ /\S/; 273 if ($cmd eq "rsave") {
274 $self->{entry}->set_text(""); 274 Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d#
275 } else {
276 $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self);
277 }
275 }); 278 });
276 279
277 $self->event_update_game;
278 $self; 280 $self;
279} 281}
280 282
281sub event_update_users { 283sub event_update_users {
282 my ($self, $add, $update, $remove) = @_; 284 my ($self, $add, $update, $remove) = @_;
283 285
284 $self->{userlist}->update ($add, $update, $remove); 286# $self->{userlist}->update ($add, $update, $remove);
287
288 $self->{users_inlay}->refresh;
285 289
286 my %important; 290 my %important;
287 $important{$self->{user1}{name}}++; 291 $important{$self->{user1}{name}}++;
288 $important{$self->{user2}{name}}++; 292 $important{$self->{user2}{name}}++;
289 $important{$self->{user3}{name}}++; 293 $important{$self->{user3}{name}}++;
290 294
291 if (my @users = grep $important{$_->{name}}, @$add) { 295 if (my @users = grep $important{$_->{name}}, @$add) {
292 $self->{text}->append_text ("\n<header>Joins:</header>"); 296 $self->{chat}->append_text ("\n<header>Joins:</header>");
293 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 297 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
294 } 298 }
295 if (my @users = grep $important{$_->{name}}, @$remove) { 299 if (my @users = grep $important{$_->{name}}, @$remove) {
296 $self->{text}->append_text ("\n<header>Parts:</header>"); 300 $self->{chat}->append_text ("\n<header>Parts:</header>");
297 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; 301 $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
298 } 302 }
299 303
300} 304}
301 305
302sub join { 306sub join {
303 my ($self) = @_; 307 my ($self) = @_;
304 return if $self->{joined}; 308 return if $self->{joined};
305 309
306 $self->SUPER::join; 310 $self->SUPER::join;
307
308 $self->{window}->show_all;
309}
310
311sub part {
312 my ($self) = @_;
313
314 $self->SUPER::part;
315 $self->destroy;
316} 311}
317 312
318sub update_board { 313sub update_board {
319 my ($self) = @_; 314 my ($self) = @_;
320 return unless $self->{path}; 315 return unless $self->{path};
… …
326 $self->{board_label}->set_text ("Move " . ($move - 1)); 321 $self->{board_label}->set_text ("Move " . ($move - 1));
327 322
328 $self->{cur_board} = new KGS::Game::Board $self->{size}; 323 $self->{cur_board} = new KGS::Game::Board $self->{size};
329 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 324 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
330 325
331 for my $colour (WHITE, BLACK) { 326 for my $colour (COLOUR_WHITE, COLOUR_BLACK) {
332 $self->{userpanel}[$colour]->set_state ( 327 $self->{userpanel}[$colour]->set_state (
333 $self->{cur_board}{captures}[$colour], 328 $self->{cur_board}{captures}[$colour],
334 $self->{cur_board}{timer}[$colour], 329 $self->{cur_board}{timer}[$colour],
335 ($running && $self->{lastmove_colour} == !$colour) 330 ($running && $self->{lastmove_colour} == !$colour)
336 ? $self->{lastmove_time} : 0 331 ? $self->{lastmove_time} : 0
… …
392 }sgexi; 387 }sgexi;
393 388
394 $text .= $_; 389 $text .= $_;
395 } 390 }
396 391
397 $self->{text}->append_text ($text); 392 $self->{chat}->append_text ($text);
398} 393}
399 394
400sub event_join { 395sub event_join {
401 my ($self) = @_; 396 my ($self) = @_;
397
402 $self->SUPER::event_join; 398 $self->SUPER::event_join (@_);
399 $self->event_update_game;
400 $self->show_all;
403} 401}
404 402
405sub event_part { 403sub event_part {
406 my ($self) = @_; 404 my ($self) = @_;
405
407 $self->SUPER::event_part; 406 $self->SUPER::event_part;
408 $self->destroy; 407 $self->destroy;
409} 408}
410 409
411sub event_move { 410sub event_move {
… …
415 414
416sub event_update_game { 415sub event_update_game {
417 my ($self) = @_; 416 my ($self) = @_;
418 $self->SUPER::event_update_game; 417 $self->SUPER::event_update_game;
419 418
419 return unless $self->{joined};
420
420 my $title = defined $self->{channel} 421 my $title = defined $self->{channel}
421 ? $self->owner->as_string . " " . $self->opponent_string 422 ? $self->owner->as_string . " " . $self->opponent_string
422 : "Game Window"; 423 : "Game Window";
423 $self->{window}->set_title("KGS Game $title"); 424 $self->set_title("KGS Game $title");
424 $self->{title}->set_text ($title); 425 $self->{title}->set_text ($title);
425 426
426 $self->{user}[BLACK] = $self->{user1}; 427 $self->{user}[COLOUR_BLACK] = $self->{user1};
427 $self->{user}[WHITE] = $self->{user2}; 428 $self->{user}[COLOUR_WHITE] = $self->{user2};
428 429
429 # show board 430 # show board
431 if ($self->is_inprogress) {
432 $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
433 if (my $ch = delete $self->{challenge}) {
434 (delete $_->{inlay})->clear for values %$ch;
435 }
430 436 }
431 $self->{left}->remove ($_) for $self->{left}->get_children; 437
432 if ($self->is_valid) {
433 $self->{left}->add ($self->{boardbox});
434 (delete $self->{challenge})->destroy if $self->{challenge};
435 } else {
436 $self->{left}->add ($self->{challenge}->widget);
437 }
438 $self->{left}->show_all; 438 $self->{left}->show_all;
439 439
440 # view text 440 # view text
441 441
442 eval { #d# 442 eval { #d#
443 my @ga; 443 my @ga;
444 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 444 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
445 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 445 . " (" . (util::toxml $gameopt{$self->option}) . ")";
446 $ga[1] = "\nFlags:"; 446 $ga[1] = "\nFlags:";
447 $ga[1] .= " valid" if $self->is_valid; 447 $ga[1] .= " started" if $self->is_inprogress;
448 $ga[1] .= " adjourned" if $self->is_adjourned; 448 $ga[1] .= " adjourned" if $self->is_adjourned;
449 $ga[1] .= " scored" if $self->is_scored; 449 $ga[1] .= " scored" if $self->is_scored;
450 $ga[1] .= " saved" if $self->is_saved; 450 $ga[1] .= " saved" if $self->is_saved;
451 451
452 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 452 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>"
453 if $self->{user3}->is_inprogress;
453 454
454 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" 455 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
455 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" 456 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
456 if $self->is_valid; 457 if $self->is_inprogress;
457 458
458 if ($self->is_valid) { 459 if ($self->is_inprogress) {
459 $ga[4] = "\nHandicap: " . $self->{handicap}; 460 $ga[4] = "\nHandicap: " . $self->{handicap};
460 $ga[5] = "\nKomi: " . $self->{komi}; 461 $ga[5] = "\nKomi: " . $self->{komi};
461 $ga[6] = "\nSize: " . $self->size_string; 462 $ga[6] = "\nSize: " . $self->size_string;
462 } 463 }
463 464
… …
474 $text .= "</infoblock>"; 475 $text .= "</infoblock>";
475 476
476 $self->{gatext} = \@ga; 477 $self->{gatext} = \@ga;
477 }; 478 };
478 479
479 $self->{text}->append_text ($text); 480 $self->{chat}->append_text ($text);
480} 481}
481 482
482sub event_update_rules { 483sub draw_rules {
483 my ($self, $rules) = @_; 484 my ($self, $inlay) = @_;
484 485
485 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules) 486 my $rules = $self->{rules};
486 for BLACK, WHITE;
487 487
488 sound::play 3, "gamestart"; 488 my $text = "";
489
490 my $text = "\n<header>Game Rules</header>";
491 489
492 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 490 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
493 491
494 $text .= "\nTime: "; 492 $text .= "\nTime: ";
495 493
… …
497 $text .= "UNLIMITED"; 495 $text .= "UNLIMITED";
498 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 496 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
499 $text .= util::format_time $rules->{time}; 497 $text .= util::format_time $rules->{time};
500 $text .= " ABS"; 498 $text .= " ABS";
501 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 499 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
502 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 500 $text .= util::format_time $rules->{time};
503 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; 501 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
504 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 502 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
505 $text .= util::format_time $rules->{time}; 503 $text .= util::format_time $rules->{time};
506 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; 504 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
507 } 505 }
508 506
509 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 507 $inlay->append_text ("<infoblock>$text</infoblock>");
508}
509
510sub event_update_rules {
511 my ($self, $rules) = @_;
512
513 $self->{rules} = $rules;
514
515 if ($self->{user}) {
516 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
517 for COLOUR_BLACK, COLOUR_WHITE;
518 }
519
520 sound::play 3, "gamestart";
521
522 $self->draw_rules ($self->{rules_inlay});
510} 523}
511 524
512sub inject_resign_game { 525sub inject_resign_game {
513 my ($self, $msg) = @_; 526 my ($self, $msg) = @_;
514 527
515 sound::play 3, "resign"; 528 sound::play 3, "resign";
516 529
517 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 530 $self->{chat}->append_text ("\n<infoblock><header>Resign</header>"
518 . "\n<user>" 531 . "\n<user>"
519 . (util::toxml $self->{user}[$msg->{player}]->as_string) 532 . (util::toxml $self->{user}[$msg->{player}]->as_string)
520 . "</user> resigned.</infoblock>"); 533 . "</user> resigned.</infoblock>");
521} 534}
522 535
523sub inject_final_result { 536sub inject_final_result {
524 my ($self, $msg) = @_; 537 my ($self, $msg) = @_;
525 538
526 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" 539 $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>"
527 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 540 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
528 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 541 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
529 . "</infoblock>" 542 . "</infoblock>"
530 ); 543 );
531} 544}
532 545
546sub draw_challenge {
547 my ($self, $c) = @_;
548
549 my $inlay = $c->{inlay};
550 my $challenge = $c->{challenge};
551 my $rules = $challenge->{rules};
552
553 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
554 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
555
556 $inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");
557 $inlay->append_text ("\nHandicap: $rules->{handicap}");
558
559#bless( (
560# gametype => 3,
561# user1 => bless( {
562# flags => 2633,
563# name => 'dorkusx'
564# }, 'KGS::User' ),
565# rules => bless( {
566# count => 5,
567# time => 900,
568# timesys => 2,
569# interval => 30,
570# komi => '6.5',
571# size => 19,
572# ruleset => 0,
573# handicap => 0
574# }, 'KGS::Rules' ),
575# user2 => bless( {
576# flags => 436220808,
577# name => 'Nerdamus'
578# }, 'KGS::User' )
579# ), 'KGS::Challenge' )
580}
581
582sub draw_users {
583 my ($self, $inlay) = @_;
584
585 for (sort keys %{$self->{users}}) {
586 $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
587 }
588}
589
533sub event_challenge { 590sub event_challenge {
534 my ($self, $challenge) = @_; 591 my ($self, $challenge) = @_;
535 592
593 my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
594 my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
595
596 my $c = $self->{challenge}{$opponent->{name}} ||= {};
597
598 $c->{inlay} ||= $self->{chat}->new_inlay;
599 $c->{challenge} = $challenge;
600
601 $self->draw_challenge ($c);
602
536 use KGS::Listener::Debug; 603# require KGS::Listener::Debug;
537 $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); 604# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
538}
539
540sub destroy {
541 my ($self) = @_;
542 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
543 for BLACK, WHITE;
544 $self->SUPER::destroy;
545 delete $self->{app}{gamelist}{game}{$self->{channel}};
546} 605}
547 606
5481; 6071;
549 608

Diff Legend

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