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.57 by pcg, Sat Jun 14 11:53:24 2003 UTC vs.
Revision 1.72 by pcg, Fri Jul 25 03:50:33 2003 UTC

52 if (!$self->{moves}) { 52 if (!$self->{moves}) {
53 util::format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
54 } else { 54 } else {
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 $time / ($self->{moves} || 1); 60 $time / ($self->{moves} || 1);
61 61
62 } 62 }
145 145
146 $self; 146 $self;
147} 147}
148 148
149sub configure { 149sub configure {
150 my ($self, $user, $rules) = @_; 150 my ($self, $app, $user, $rules) = @_;
151 151
152 if ($self->{name}->get_text ne $user->as_string) { 152 if ($self->{name}->get_text ne $user->as_string) {
153 $self->{name}->set_text ($user->as_string); 153 $self->{name}->set_text ($user->as_string);
154 154
155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156 $self->{imagebox}->add (gtk::image_from_data undef); 156 $self->{imagebox}->add (gtk::image_from_data undef);
157 $self->{imagebox}->show_all; 157 $self->{imagebox}->show_all;
158 158
159 if ($user->has_pic) { 159 if ($user->has_pic) {
160 # the big picture... 160 # the big picture...
161 appwin::userpic ($user->{name}, sub { 161 $app->userpic ($user->{name}, sub {
162 return unless $self->{imagebox}; 162 return unless $self->{imagebox};
163
163 if ($_[0]) { 164 if ($_[0]) {
164 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 165 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
165 $self->{imagebox}->add (gtk::image_from_data $_[0]); 166 $self->{imagebox}->add (gtk::image_from_data $_[0]);
166 $self->{imagebox}->show_all; 167 $self->{imagebox}->show_all;
167 } 168 }
227 # board box (aspect/canvas) 228 # board box (aspect/canvas)
228 229
229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 230 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
230 231
231 { 232 {
232 $frame->add(my $vbox = new Gtk2::VBox); 233 $frame->add (my $vbox = new Gtk2::VBox);
233 $vbox->add($self->{title} = new Gtk2::Label $title); 234 $vbox->add ($self->{title} = new Gtk2::Label $title);
234 235
236 $vbox->add (my $hbox = new Gtk2::HBox);
237
238 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
239
235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0; 240 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
236 241
237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 242 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
238 $scale->set_draw_value (0); 243 $scale->set_draw_value (0);
239 $scale->set_digits (0); 244 $scale->set_digits (0);
240 245
241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 246 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
242 } 247 }
243 248
244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0); 249 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
245 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
246 $self->{board_label} = $aspect_frame->get_label_widget;
247
248 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
249 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
250
251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253 250
254 # RIGHT PANE 251 # RIGHT PANE
255 252
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 253 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1); 254 $self->{hpane}->set(position_set => 1);
266 263
267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 264 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); 265 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); 266 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
270 267
271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); 268 $vbox->pack_start(($self->{text} = new chat), 1, 1, 0);
272
273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
274 $self->{entry}->signal_connect(activate => sub {
275 my $text = $self->{entry}->get_text;
276 $self->say($text) if $text =~ /\S/;
277 $self->{entry}->set_text("");
278 });
279 269
280 $self->event_update_game; 270 $self->event_update_game;
281 $self; 271 $self;
282} 272}
283 273
284sub event_update_users { 274sub event_update_users {
285 my ($self, $add, $update, $remove) = @_; 275 my ($self, $add, $update, $remove) = @_;
276
277 return unless $self->{userlist};
286 278
287 $self->{userlist}->update ($add, $update, $remove); 279 $self->{userlist}->update ($add, $update, $remove);
288 280
289 my %important; 281 my %important;
290 $important{$self->{user1}{name}}++; 282 $important{$self->{user1}{name}}++;
316 308
317 $self->SUPER::part; 309 $self->SUPER::part;
318 $self->destroy; 310 $self->destroy;
319} 311}
320 312
321sub configure_event {
322 my ($widget, $event, $self) = @_;
323 delete $self->{stack};
324 delete $self->{pixbuf};
325 delete $self->{board_shown};
326 delete $self->{background};
327 $self->repaint_board;
328 0;
329}
330
331sub expose_event {
332 my ($widget, $event, $self) = @_;
333
334 $self->{pixbuf} or return;
335
336 my $area = $event->area;
337
338 $self->redraw ($area);
339
340 0;
341}
342
343# something Gtk2 fixed
344sub INTERP_NEAREST (){ 'nearest' }
345sub INTERP_TILES (){ 'tiles' }
346sub INTERP_BILINEAR (){ 'bilinear' }
347sub INTERP_HYPER (){ 'hyper' }
348
349sub new_pixbuf {
350 my ($w, $h, $alpha, $fill) = @_;
351
352 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
353 $pixbuf->fill ($fill) if defined $fill;
354
355 $pixbuf;
356}
357
358sub scale_pixbuf {
359 my ($src, $w, $h, $mode) = @_;
360
361 my $dst = new_pixbuf $w, $h, 1;
362
363 $src->scale(
364 $dst, 0, 0, $w, $h, 0, 0,
365 $w / $src->get_width, $h / $src->get_height,
366 $mode,
367 );
368
369 $dst;
370}
371
372# create a stack of stones
373sub create_stack {
374 my ($self, $mark, $size, $rand) = @_;
375
376 my $shadow = $size * 0.05;
377
378 my $c = \$self->{stack}{$mark};
379 unless ($$c) {
380 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
381 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
382
383 # zeroeth the shadow
384 if ($mark & (MARK_B | MARK_W)) {
385 # the -0.5's are a mystery to me
386 $::shadow_img->composite (
387 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
388 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
389 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
390 );
391 }
392
393 # first the big stones (handicap stones could be different)
394 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
395 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
396 [MARK_GRAY_B, 128],
397 [MARK_GRAY_W, 128]) {
398 my ($mask, $alpha) = @$_;
399 if ($mark & $mask) {
400 $stone->composite (
401 $base, 0, 0, $size, $size, 0, 0,
402 $size / $stone->get_width, $size / $stone->get_height,
403 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
404 );
405 }
406 }
407
408 # then the small stones
409 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
410 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
411 my ($mask, $img) = @$_;
412 if ($mark & $mask) {
413 $img->composite (
414 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
415 $size / $img->get_width / 2, $size / $img->get_height / 2,
416 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
417 );
418 }
419 }
420
421 # and lastly any markers
422 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
423
424 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
425 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
426 [MARK_SQUARE, $::square_img[$dark_bg]]) {
427 my ($mask, $img) = @$_;
428 if ($mark & $mask) {
429 $img->composite (
430 $base, 0, 0, $size, $size, 0, 0,
431 $size / $img->get_width, $size / $img->get_height,
432 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
433 );
434 }
435 }
436
437 push @$$c, $base;
438 }
439 }
440
441 $$c->[$rand % @$$c];
442}
443
444sub pixbuf_text {
445 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
446
447 my @c = grep $_,
448 map $::font[$colour][$::fontmap{$_}],
449 split //, $text;
450
451 if (@c) {
452 my $spacing = $height * 0.1;
453 my $s = $height / List::Util::max map $_->get_height, @c;
454 my $W = List::Util::sum map $_->get_width, @c;
455
456 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
457 $y -= $height * 0.5;
458
459 for (@c) {
460 my $w = $_->get_width * $s;
461 # +2 == don't fight the rounding
462 $_->composite ($pixbuf,
463 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
464 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
465
466 $x += $w + $spacing;
467 }
468 }
469}
470
471sub pixbuf_rect {
472 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
473 # we fake lines by... a horrible method :/
474 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
475 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
476 INTERP_NEAREST, $alpha);
477}
478
479sub repaint_board {
480 my ($self) = @_;
481 my $canvas = $self->{canvas};
482 my $expose_area = undef;
483
484 return $expose_area unless $self->{board};
485
486 my ($w, $h) = ($canvas->allocation->values)[2,3];
487
488 die "FATAL: board aspect ratio != 1" unless $w == $h;
489
490 my $s = $w;
491
492 return unless $s >= 200;
493
494 my $size = $self->{size};
495
496 # we leave enough space for the shadows.. I like smaller stones, and we
497 # do no need to do the nifty recursive screen updates that goban2 does
498 my $border = int ($s / ($size + 3) * 0.5);
499 my $s2 = $s - $border * 2;
500 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
501 my $ofs = int ($edge / 2);
502
503 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
504
505 my $pixbuf;
506
507 my $oldboard;
508
509 if ($self->{background}) {
510 if ($oldboard = $self->{board_shown}) {
511 $pixbuf = $self->{pixbuf};
512 } else {
513 $pixbuf = $self->{background}->copy;
514 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
515 }
516 } else {
517 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
518
519 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
520
521 if ($s < $bw && $s < $bh) {
522 $pixbuf = new_pixbuf $s, $s, 0;
523 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
524 } else {
525 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
526 }
527
528 my $linew = int ($s / 40 / $size);
529
530 # ornamental border... we have time to waste :/
531 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
532 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
533 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
534 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
535
536 for my $i (1 .. $size) {
537 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
538 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
539
540 # 38 max, but we allow a bit more
541 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
542 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];
543
544 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
545 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
546 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
547 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
548
549 $a++;
550 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
551 }
552
553 # hoshi points
554 my $hoshi = sub {
555 my ($x, $y) = @_;
556 my $hs = int ($edge / 4) | 1;
557 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
558
559 # we use the shadow mask... not perfect, but I want to finish this
560 $::shadow_img->composite ($pixbuf,
561 $x, $y, $hs + 1, $hs + 1, $x, $y,
562 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
563 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
564 };
565
566 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
567 $hoshi->($h1, $h1);
568 $hoshi->($size - $h1 + 1, $h1);
569 $hoshi->($h1, $size - $h1 + 1);
570 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
571
572 if ($size % 2) { # on odd boards, also the remaining 5
573 my $h2 = ($size + 1) / 2;
574 if ($size > 10) {
575 $hoshi->($h1, $h2);
576 $hoshi->($size - $h1 + 1, $h2);
577 $hoshi->($h2, $size - $h1 + 1);
578 $hoshi->($h2, $h1);
579 }
580 # the tengen
581 $hoshi->($h2, $h2);
582 }
583
584 unless ($::config->{conserve_memory} > 1) {
585 $self->{background} = $pixbuf;
586 $pixbuf = $pixbuf->copy;
587 }
588 }
589
590 $self->{pixbuf} = $pixbuf;
591
592 for my $x (1 .. $size) {
593 for my $y (1 .. $size) {
594 my $rand = ($x ^ $y ^ 0x5555);
595
596 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
597
598 if ($::config->{randomize}) {
599 $dx += ($rand % 7) - 3;
600 $dy += ($rand / 3 % 7) - 3;
601 }
602
603 my $shadow = $edge * 0.05;
604 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
605
606 my $mark = $self->{board}{board}[$x-1][$y-1];
607 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
608
609 if ($oldboard) {
610 next if $old == $mark; # no change
611
612 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
613 $expose_area = $expose_area
614 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
615 : new Gtk2::Gdk::Rectangle @$area;
616 }
617
618 if ($mark) {
619 my $pb = $self->create_stack($mark, $edge, $rand);
620
621 $pb->composite ($pixbuf, @$area,
622 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
623
624 # labels are handled here because they are quite rare
625 if ($mark & MARK_LABEL) {
626 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
627
628 if ($white) {
629 pixbuf_text $pixbuf, 0,
630 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
631 $self->{board}{label}[$x-1][$y-1];
632 }
633 pixbuf_text $pixbuf, $white,
634 $k[$x], $k[$y], $ofs * 0.7,
635 $self->{board}{label}[$x-1][$y-1];
636 }
637 }
638 }
639 }
640
641 $self->{board_shown} = Storable::dclone $self->{board};
642 #d# save
643 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
644
645 $expose_area;
646}
647
648sub redraw {
649 my ($self, $area) = @_;
650
651 if ($area && $self->{pixbuf}) {
652 my ($x, $y, $w, $h) = $area->values;
653
654 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
655 $x, $y, $x, $y, $w, $h,
656 "normal", 0, 0);
657 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
658 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
659 }
660}
661
662sub update_board { 313sub update_board {
663 my ($self) = @_; 314 my ($self) = @_;
664 return unless $self->{path}; 315 return unless $self->{path};
665 316
666 #$self->{update_board_cb} ||= add Glib::Idle sub {
667 my $move = int $self->{moveadj}->get_value; 317 my $move = int $self->{moveadj}->get_value;
668 318
669 my $running = $move == @{$self->{path}}; 319 my $running = $move == @{$self->{path}};
670 320
671 $self->{board_label}->set_text ("Move " . ($move - 1)); 321 $self->{board_label}->set_text ("Move " . ($move - 1));
672 322
673 $self->{board} = new KGS::Game::Board $self->{size}; 323 $self->{cur_board} = new KGS::Game::Board $self->{size};
674 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 324 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
675 325
676 for my $colour (WHITE, BLACK) { 326 for my $colour (WHITE, BLACK) {
677 $self->{userpanel}[$colour]->set_state ( 327 $self->{userpanel}[$colour]->set_state (
678 $self->{board}{captures}[$colour], 328 $self->{cur_board}{captures}[$colour],
679 $self->{board}{timer}[$colour], 329 $self->{cur_board}{timer}[$colour],
680 ($running && $self->{lastmove_colour} == !$colour) 330 ($running && $self->{lastmove_colour} == !$colour)
681 ? $self->{lastmove_time} : 0 331 ? $self->{lastmove_time} : 0
682 ); 332 );
683 }
684
685 $self->redraw ($self->repaint_board);
686
687 # delete $self->{update_board_cb};
688 #} 333 }
334
335 $self->{board}->set_board ($self->{cur_board});
689} 336}
690 337
691sub event_update_tree { 338sub event_update_tree {
692 my ($self) = @_; 339 my ($self) = @_;
693 340
763 410
764sub event_update_game { 411sub event_update_game {
765 my ($self) = @_; 412 my ($self) = @_;
766 $self->SUPER::event_update_game; 413 $self->SUPER::event_update_game;
767 414
768 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; 415 return unless $self->{window};
416
417 my $title = defined $self->{channel}
418 ? $self->owner->as_string . " " . $self->opponent_string
419 : "Game Window";
769 $self->{window}->set_title("KGS Game $title"); 420 $self->{window}->set_title("KGS Game $title");
770 $self->{title}->set_text ($title); 421 $self->{title}->set_text ($title);
771 422
772 $self->{user}[BLACK] = $self->{user1}; 423 $self->{user}[BLACK] = $self->{user1};
773 $self->{user}[WHITE] = $self->{user2}; 424 $self->{user}[WHITE] = $self->{user2};
783 } 434 }
784 $self->{left}->show_all; 435 $self->{left}->show_all;
785 436
786 # view text 437 # view text
787 438
439 eval { #d#
788 my @ga; 440 my @ga;
789 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) 441 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
790 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 442 . " (" . (util::toxml $gameopt{$self->option}) . ")";
791 $ga[1] = "\nFlags:"; 443 $ga[1] = "\nFlags:";
792 $ga[1] .= " valid" if $self->is_valid; 444 $ga[1] .= " valid" if $self->is_valid;
817 } 469 }
818 } 470 }
819 $text .= "</infoblock>"; 471 $text .= "</infoblock>";
820 472
821 $self->{gatext} = \@ga; 473 $self->{gatext} = \@ga;
474 };
822 475
823 $self->{text}->append_text ($text); 476 $self->{text}->append_text ($text);
824} 477}
825 478
826sub event_update_rules { 479sub event_update_rules {
827 my ($self, $rules) = @_; 480 my ($self, $rules) = @_;
828 481
829 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 482 $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules)
830 for BLACK, WHITE; 483 for BLACK, WHITE;
831 484
832 sound::play 3, "gamestart"; 485 sound::play 3, "gamestart";
833 486
834 my $text = "\n<header>Game Rules</header>"; 487 my $text = "\n<header>Game Rules</header>";
872 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 525 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
873 . "</infoblock>" 526 . "</infoblock>"
874 ); 527 );
875} 528}
876 529
530sub event_challenge {
531 my ($self, $challenge) = @_;
532
533 use KGS::Listener::Debug;
534 $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
535}
536
877sub destroy { 537sub destroy {
878 my ($self) = @_; 538 my ($self) = @_;
539
540 delete $self->{app}{gamelist}{game}{$self->{channel}};
879 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 541 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
880 for BLACK, WHITE; 542 for BLACK, WHITE;
881 $self->SUPER::destroy; 543 $self->SUPER::destroy;
882 delete $appwin::gamelist->{game}{$self->{channel}};
883} 544}
884 545
8851; 5461;
886 547

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines