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.52 by pcg, Thu Jun 12 21:03:03 2003 UTC vs.
Revision 1.68 by pcg, Mon Jul 21 01:41:02 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 }
199 $self = $self->SUPER::new(@_); 199 $self = $self->SUPER::new(@_);
200 200
201 $self->listen($self->{conn}); 201 $self->listen($self->{conn});
202 202
203 $self->{window} = new Gtk2::Window 'toplevel'; 203 $self->{window} = new Gtk2::Window 'toplevel';
204 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
205 $self->{window}->set_title("KGS Game $title");
206 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
207 205
208 $self->{window}->signal_connect(delete_event => sub { 206 $self->{window}->signal_connect(delete_event => sub {
209 $self->part; 207 $self->part;
210 $self->destroy; 208 $self->destroy;
229 # board box (aspect/canvas) 227 # board box (aspect/canvas)
230 228
231 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
232 230
233 { 231 {
234 $frame->add(my $vbox = new Gtk2::VBox); 232 $frame->add (my $vbox = new Gtk2::VBox);
235 $vbox->add($self->{title} = new Gtk2::Label $title); 233 $vbox->add ($self->{title} = new Gtk2::Label $title);
236 234
235 $vbox->add (my $hbox = new Gtk2::HBox);
236
237 $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0);
238
237 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0; 239 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0;
238 240
239 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 241 $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0);
240 $scale->set_draw_value (0); 242 $scale->set_draw_value (0);
241 $scale->set_digits (0); 243 $scale->set_digits (0);
242 244
243 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 245 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
244 } 246 }
245 247
246 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0); 248 $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
247 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
248 $self->{board_label} = $aspect_frame->get_label_widget;
249
250 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
251 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
252
253 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
254 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
255 249
256 # RIGHT PANE 250 # RIGHT PANE
257 251
258 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); 252 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
259 $self->{hpane}->set(position_set => 1); 253 $self->{hpane}->set(position_set => 1);
285 279
286sub event_update_users { 280sub event_update_users {
287 my ($self, $add, $update, $remove) = @_; 281 my ($self, $add, $update, $remove) = @_;
288 282
289 $self->{userlist}->update ($add, $update, $remove); 283 $self->{userlist}->update ($add, $update, $remove);
284
285 my %important;
286 $important{$self->{user1}{name}}++;
287 $important{$self->{user2}{name}}++;
288 $important{$self->{user3}{name}}++;
289
290 if (my @users = grep $important{$_->{name}}, @$add) {
291 $self->{text}->append_text ("\n<header>Joins:</header>");
292 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users;
293 }
294 if (my @users = grep $important{$_->{name}}, @$remove) {
295 $self->{text}->append_text ("\n<header>Parts:</header>");
296 $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users;
297 }
298
290} 299}
291 300
292sub join { 301sub join {
293 my ($self) = @_; 302 my ($self) = @_;
294 return if $self->{joined}; 303 return if $self->{joined};
303 312
304 $self->SUPER::part; 313 $self->SUPER::part;
305 $self->destroy; 314 $self->destroy;
306} 315}
307 316
308sub configure_event {
309 my ($widget, $event, $self) = @_;
310 delete $self->{stack};
311 delete $self->{pixbuf};
312 delete $self->{board_shown};
313 delete $self->{background};
314 $self->repaint_board;
315 0;
316}
317
318sub expose_event {
319 my ($widget, $event, $self) = @_;
320
321 $self->{pixbuf} or return;
322
323 my $area = $event->area;
324
325 $self->redraw ($area);
326
327 0;
328}
329
330# something Gtk2 fixed
331sub INTERP_NEAREST (){ 'nearest' }
332sub INTERP_TILES (){ 'tiles' }
333sub INTERP_BILINEAR (){ 'bilinear' }
334sub INTERP_HYPER (){ 'hyper' }
335
336sub new_pixbuf {
337 my ($w, $h, $alpha, $fill) = @_;
338
339 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
340 $pixbuf->fill ($fill) if defined $fill;
341
342 $pixbuf;
343}
344
345sub scale_pixbuf {
346 my ($src, $w, $h, $mode) = @_;
347
348 my $dst = new_pixbuf $w, $h, 1;
349
350 $src->scale(
351 $dst, 0, 0, $w, $h, 0, 0,
352 $w / $src->get_width, $h / $src->get_height,
353 $mode,
354 );
355
356 $dst;
357}
358
359# create a stack of stones
360sub create_stack {
361 my ($self, $mark, $size, $rand) = @_;
362
363 my $shadow = $size * 0.05;
364
365 my $c = \$self->{stack}{$mark};
366 unless ($$c) {
367 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
368 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
369
370 # zeroeth the shadow
371 if ($mark & (MARK_B | MARK_W)) {
372 # the -0.5's are a mystery to me
373 $::shadow_img->composite (
374 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
375 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
376 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
377 );
378 }
379
380 # first the big stones (handicap stones could be different)
381 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
382 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
383 [MARK_GRAY_B, 128],
384 [MARK_GRAY_W, 128]) {
385 my ($mask, $alpha) = @$_;
386 if ($mark & $mask) {
387 $stone->composite (
388 $base, 0, 0, $size, $size, 0, 0,
389 $size / $stone->get_width, $size / $stone->get_height,
390 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
391 );
392 }
393 }
394
395 # then the small stones
396 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
397 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
398 my ($mask, $img) = @$_;
399 if ($mark & $mask) {
400 $img->composite (
401 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
402 $size / $img->get_width / 2, $size / $img->get_height / 2,
403 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
404 );
405 }
406 }
407
408 # and lastly any markers
409 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
410
411 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
412 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
413 [MARK_SQUARE, $::square_img[$dark_bg]]) {
414 my ($mask, $img) = @$_;
415 if ($mark & $mask) {
416 $img->composite (
417 $base, 0, 0, $size, $size, 0, 0,
418 $size / $img->get_width, $size / $img->get_height,
419 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
420 );
421 }
422 }
423
424 push @$$c, $base;
425 }
426 }
427
428 $$c->[$rand % @$$c];
429}
430
431sub pixbuf_text {
432 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
433
434 my @c = grep $_,
435 map $::font[$colour][$::fontmap{$_}],
436 split //, $text;
437
438 if (@c) {
439 my $spacing = $height * 0.1;
440 my $s = $height / List::Util::max map $_->get_height, @c;
441 my $W = List::Util::sum map $_->get_width, @c;
442
443 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
444 $y -= $height * 0.5;
445
446 for (@c) {
447 my $w = $_->get_width * $s;
448 # +2 == don't fight the rounding
449 $_->composite ($pixbuf,
450 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
451 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
452
453 $x += $w + $spacing;
454 }
455 }
456}
457
458sub pixbuf_rect {
459 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
460 # we fake lines by... a horrible method :/
461 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
462 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
463 INTERP_NEAREST, $alpha);
464}
465
466sub repaint_board {
467 my ($self) = @_;
468 my $canvas = $self->{canvas};
469 my $expose_area = undef;
470
471 return $expose_area unless $self->{board};
472
473 my ($w, $h) = ($canvas->allocation->values)[2,3];
474
475 die "FATAL: board aspect ratio != 1" unless $w == $h;
476
477 my $s = $w;
478
479 return unless $s >= 200;
480
481 my $size = $self->{size};
482
483 # we leave enough space for the shadows.. I like smaller stones, and we
484 # do no need to do the nifty recursive screen updates that goban2 does
485 my $border = int ($s / ($size + 3) * 0.5);
486 my $s2 = $s - $border * 2;
487 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
488 my $ofs = int ($edge / 2);
489
490 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
491
492 my $pixbuf;
493
494 my $oldboard;
495
496 if ($self->{background}) {
497 if ($oldboard = $self->{board_shown}) {
498 $pixbuf = $self->{pixbuf};
499 } else {
500 $pixbuf = $self->{background}->copy;
501 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
502 }
503 } else {
504 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
505
506 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
507
508 if ($s < $bw && $s < $bh) {
509 $pixbuf = new_pixbuf $s, $s, 0;
510 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
511 } else {
512 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
513 }
514
515 my $linew = int ($s / 40 / $size);
516
517 # ornamental border... we have time to waste :/
518 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
519 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
520 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
521 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
522
523 for my $i (1 .. $size) {
524 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
525 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
526
527 # 38 max, but we allow a bit more
528 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
529 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];
530
531 pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label;
532 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label;
533 pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1;
534 pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1;
535
536 $a++;
537 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
538 }
539
540 # hoshi points
541 my $hoshi = sub {
542 my ($x, $y) = @_;
543 my $hs = int ($edge / 4) | 1;
544 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
545
546 # we use the shadow mask... not perfect, but I want to finish this
547 $::shadow_img->composite ($pixbuf,
548 $x, $y, $hs + 1, $hs + 1, $x, $y,
549 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
550 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
551 };
552
553 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
554 $hoshi->($h1, $h1);
555 $hoshi->($size - $h1 + 1, $h1);
556 $hoshi->($h1, $size - $h1 + 1);
557 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
558
559 if ($size % 2) { # on odd boards, also the remaining 5
560 my $h2 = ($size + 1) / 2;
561 if ($size > 10) {
562 $hoshi->($h1, $h2);
563 $hoshi->($size - $h1 + 1, $h2);
564 $hoshi->($h2, $size - $h1 + 1);
565 $hoshi->($h2, $h1);
566 }
567 # the tengen
568 $hoshi->($h2, $h2);
569 }
570
571 unless ($::config->{conserve_memory} > 1) {
572 $self->{background} = $pixbuf;
573 $pixbuf = $pixbuf->copy;
574 }
575 }
576
577 $self->{pixbuf} = $pixbuf;
578
579 for my $x (1 .. $size) {
580 for my $y (1 .. $size) {
581 my $rand = ($x ^ $y ^ 0x5555);
582
583 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
584
585 if ($::config->{randomize}) {
586 $dx += ($rand % 7) - 3;
587 $dy += ($rand / 3 % 7) - 3;
588 }
589
590 my $shadow = $edge * 0.05;
591 my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow];
592
593 my $mark = $self->{board}{board}[$x-1][$y-1];
594 my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0;
595
596 if ($oldboard) {
597 next if $old == $mark; # no change
598
599 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
600 $expose_area = $expose_area
601 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
602 : new Gtk2::Gdk::Rectangle @$area;
603 }
604
605 if ($mark) {
606 my $pb = $self->create_stack($mark, $edge, $rand);
607
608 $pb->composite ($pixbuf, @$area,
609 $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255);
610
611 # labels are handled here because they are quite rare
612 if ($mark & MARK_LABEL) {
613 my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1;
614
615 if ($white) {
616 pixbuf_text $pixbuf, 0,
617 $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7,
618 $self->{board}{label}[$x-1][$y-1];
619 }
620 pixbuf_text $pixbuf, $white,
621 $k[$x], $k[$y], $ofs * 0.7,
622 $self->{board}{label}[$x-1][$y-1];
623 }
624 }
625 }
626 }
627
628 $self->{board_shown} = Storable::dclone $self->{board};
629 #d# save
630 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
631
632 $expose_area;
633}
634
635sub redraw {
636 my ($self, $area) = @_;
637
638 if ($area && $self->{pixbuf}) {
639 my ($x, $y, $w, $h) = $area->values;
640
641 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
642 $x, $y, $x, $y, $w, $h,
643 "normal", 0, 0);
644 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
645 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
646 }
647}
648
649sub update_board { 317sub update_board {
650 my ($self) = @_; 318 my ($self) = @_;
651 return unless $self->{path}; 319 return unless $self->{path};
652 320
653 #$self->{update_board_cb} ||= add Glib::Idle sub {
654 my $move = int $self->{moveadj}->get_value; 321 my $move = int $self->{moveadj}->get_value;
655 322
656 my $running = $move == @{$self->{path}}; 323 my $running = $move == @{$self->{path}};
657 324
658 $self->{board_label}->set_text ("Move " . ($move - 1)); 325 $self->{board_label}->set_text ("Move " . ($move - 1));
659 326
660 $self->{board} = new KGS::Game::Board $self->{size}; 327 $self->{cur_board} = new KGS::Game::Board $self->{size};
661 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 328 $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
662 329
663 for my $colour (WHITE, BLACK) { 330 for my $colour (WHITE, BLACK) {
664 $self->{userpanel}[$colour]->set_state ( 331 $self->{userpanel}[$colour]->set_state (
665 $self->{board}{captures}[$colour], 332 $self->{cur_board}{captures}[$colour],
666 $self->{board}{timer}[$colour], 333 $self->{cur_board}{timer}[$colour],
667 ($running && $self->{lastmove_colour} == !$colour) 334 ($running && $self->{lastmove_colour} == !$colour)
668 ? $self->{lastmove_time} : 0 335 ? $self->{lastmove_time} : 0
669 ); 336 );
670 }
671
672 $self->redraw ($self->repaint_board);
673
674 # delete $self->{update_board_cb};
675 #} 337 }
338
339 $self->{board}->set_board ($self->{cur_board});
676} 340}
677 341
678sub event_update_tree { 342sub event_update_tree {
679 my ($self) = @_; 343 my ($self) = @_;
680 344
750 414
751sub event_update_game { 415sub event_update_game {
752 my ($self) = @_; 416 my ($self) = @_;
753 $self->SUPER::event_update_game; 417 $self->SUPER::event_update_game;
754 418
419 my $title = defined $self->{channel}
420 ? $self->owner->as_string . " " . $self->opponent_string
421 : "Game Window";
422 $self->{window}->set_title("KGS Game $title");
423 $self->{title}->set_text ($title);
424
755 $self->{user}[BLACK] = $self->{user1}; 425 $self->{user}[BLACK] = $self->{user1};
756 $self->{user}[WHITE] = $self->{user2}; 426 $self->{user}[WHITE] = $self->{user2};
757 427
758 # show board 428 # show board
759 429
760 $self->{left}->remove ($_) for $self->{left}->get_children; 430 $self->{left}->remove ($_) for $self->{left}->get_children;
761 if ($self->is_valid) { 431 if ($self->is_valid) {
762 $self->{left}->add ($self->{boardbox}); 432 $self->{left}->add ($self->{boardbox});
763 (delete $self->{challenge})->destroy if $self->{challenge}; 433 (delete $self->{challenge})->destroy if $self->{challenge};
764 } else { 434 } else {
766 } 436 }
767 $self->{left}->show_all; 437 $self->{left}->show_all;
768 438
769 # view text 439 # view text
770 440
771 $text = "\n<header>Game Update</header>"; 441 eval { #d#
772 442 my @ga;
773 $text .= "\nType: " . (util::toxml $gametype{$self->type}) 443 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
774 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 444 . " (" . (util::toxml $gameopt{$self->option}) . ")";
775 $text .= "\nFlags:"; 445 $ga[1] = "\nFlags:";
776 $text .= " valid" if $self->is_valid; 446 $ga[1] .= " valid" if $self->is_valid;
777 $text .= " adjourned" if $self->is_adjourned; 447 $ga[1] .= " adjourned" if $self->is_adjourned;
778 $text .= " scored" if $self->is_scored; 448 $ga[1] .= " scored" if $self->is_scored;
779 $text .= " saved" if $self->is_saved; 449 $ga[1] .= " saved" if $self->is_saved;
780 450
781 $text .= "\nWhite: <user>" . (util::toxml $self->{user2}->as_string) . "</user>";
782 $text .= "\nBlack: <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
783 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 451 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
452
453 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
454 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
455 if $self->is_valid;
784 456
785 if ($self->is_valid) { 457 if ($self->is_valid) {
786 $text .= "\nHandicap: " . $self->{handicap}; 458 $ga[4] = "\nHandicap: " . $self->{handicap};
787 $text .= "\nKomi: " . $self->{komi}; 459 $ga[5] = "\nKomi: " . $self->{komi};
788 $text .= "\nSize: " . $self->size_string; 460 $ga[6] = "\nSize: " . $self->size_string;
789 } 461 }
790 462
791 if ($self->is_scored) { 463 if ($self->is_scored) {
792 $text .= "\nResult: " . $self->score_string; 464 $ga[7] = "\nResult: " . $self->score_string;
465 }
466
467 $text = "\n<infoblock><header>Game Update</header>";
468 for (0..7) {
469 if ($self->{gatext}[$_] ne $ga[$_]) {
470 $text .= $ga[$_];
471 }
472 }
473 $text .= "</infoblock>";
474
475 $self->{gatext} = \@ga;
793 } 476 };
794 477
795 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 478 $self->{text}->append_text ($text);
796} 479}
797 480
798sub event_update_rules { 481sub event_update_rules {
799 my ($self, $rules) = @_; 482 my ($self, $rules) = @_;
800 483
801 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 484 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
802 for BLACK, WHITE; 485 for BLACK, WHITE;
486
487 sound::play 3, "gamestart";
803 488
804 my $text = "\n<header>Game Rules</header>"; 489 my $text = "\n<header>Game Rules</header>";
805 490
806 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 491 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
807 492
824} 509}
825 510
826sub inject_resign_game { 511sub inject_resign_game {
827 my ($self, $msg) = @_; 512 my ($self, $msg) = @_;
828 513
514 sound::play 3, "resign";
515
829 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 516 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
830 . "\n<user>" 517 . "\n<user>"
831 . (util::toxml $self->{user}[$msg->{player}]->as_string) 518 . (util::toxml $self->{user}[$msg->{player}]->as_string)
832 . "</user> resigned.</infoblock>"); 519 . "</user> resigned.</infoblock>");
833} 520}
840 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 527 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
841 . "</infoblock>" 528 . "</infoblock>"
842 ); 529 );
843} 530}
844 531
532sub event_challenge {
533 my ($self, $challenge) = @_;
534
535 use KGS::Listener::Debug;
536 $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));
537}
538
845sub destroy { 539sub destroy {
846 my ($self) = @_; 540 my ($self) = @_;
847 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy 541 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
848 for BLACK, WHITE; 542 for BLACK, WHITE;
849 $self->SUPER::destroy; 543 $self->SUPER::destroy;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines