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.42 by pcg, Tue Jun 3 18:17:05 2003 UTC vs.
Revision 1.65 by pcg, Mon Jun 23 01:14:21 2003 UTC

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

Diff Legend

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