ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/bin/kgsueme
(Generate patch)

Comparing kgsueme/bin/kgsueme (file contents):
Revision 1.7 by pcg, Thu May 29 07:30:17 2003 UTC vs.
Revision 1.18 by pcg, Fri May 30 10:40:21 2003 UTC

1#!/usr/bin/perl -I../lib/ 1#!/usr/bin/perl -I../lib/
2
3#use PApp::Util qw(dumpval); # debug only
4 2
5use Gtk; 3use Gtk;
6use Gtk::Gdk; 4use Gtk::Gdk;
7#use Gtk::Gdk::Pixbuf; 5use Gtk::Gdk::Pixbuf;
8use Gtk::Gdk::ImlibImage; 6#use Gtk::Gdk::ImlibImage;
9
10use Gnome;
11 7
12use KGS::Protocol; 8use KGS::Protocol;
13use KGS::Listener::Debug; 9use KGS::Listener::Debug;
14 10
11use Audio::Data;
12use Audio::Play;
13
15use IO::Socket::INET; 14use IO::Socket::INET;
16 15
17use Errno; 16use Errno;
18 17
19init Gnome "kgsueme"; 18init Gtk;
20 19
21$HACK = 1; # do NEVER enable. ;) 20$HACK = 1; # do NEVER enable. ;)
22 21
23our $config; 22our $config;
23our $LIBDIR = ".";
24our $IMGDIR = "images"; 24our $IMGDIR = "$LIBDIR/images";
25our $SNDDIR = "$LIBDIR/sounds";
25 26
26sub load_img { 27sub load_img {
27# new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]" 28 new_from_file Gtk::Gdk::Pixbuf "$IMGDIR/$_[0]"
28 load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]" 29# load_image Gtk::Gdk::ImlibImage "$IMGDIR/$_[0]"
29 or die "$IMGDIR/$_[0]: $!"; 30 or die "$IMGDIR/$_[0]: $!";
30} 31}
31 32
33my @fontchars = ('A' .. 'Z', 0 .. 9);
34
32our @black_img = load_img "b01-100x102.png"; 35our @black_img = load_img "b-01.png";
33our @white_img = map +(load_img "w0$_-100x102_retouched.png"), 1,2,3; 36our @white_img = map +(load_img "w-0$_.png"), 1,2,3,4,5;
37our @triangle_img = map +(load_img "triangle-$_.png"), qw(b w);
38our @square_img = map +(load_img "square-$_.png"), qw(b w);
39our @circle_img = map +(load_img "circle-$_.png"), qw(b w);
34our $board_img = load_img "woodgrain-01.jpg"; 40our $board_img = load_img "woodgrain-01.jpg";
41
42our @font = (
43 [map +(load_img "font/$_-black.png"), @fontchars],
44 [map +(load_img "font/$_-white.png"), @fontchars],
45 );
46our %fontmap;
47@fontmap{@fontchars} = (0..25 + 10);
48@fontmap{'a' .. 'z'} = (0..25);
49
50{
51 #my $audioserver = new Audio::Play(0);
52 my %sound;
53 $SIG{CHLD} = 'IGNORE';
54
55 for (qw(alarm warning move)) {
56 local $/;
57 open my $snd, "<", "$SNDDIR/$_"
58 or die "$SNDDIR: $!";
59 binmode $snd;
60
61 $sound{$_} = new Audio::Data;
62 $sound{$_}->Load($snd);
63 }
64
65 sub play_sound {
66 if (fork == 0) {
67 my $audioserver = new Audio::Play(1);
68 $audioserver->play ($sound{$_[0]});
69 Gtk->_exit(0);
70 }
71 }
72}
35 73
36{ 74{
37 use Storable (); 75 use Storable ();
38 use Scalar::Util (); 76 use Scalar::Util ();
39 77
… …
44 82
45 $config = $state->{config} ||= {}; 83 $config = $state->{config} ||= {};
46 84
47 # grr... more gtk+ brokenness 85 # grr... more gtk+ brokenness
48 my %get = ( 86 my %get = (
87 hpane_position => sub { ($_[0]->children)[0]->allocation->[2] },
88 vpane_position => sub { ($_[0]->children)[0]->allocation->[3] },
49 window_size => sub { [ @{$_[0]->allocation}[2,3] ] }, 89 window_size => sub { [ @{$_[0]->allocation}[2,3] ] },
50 #window_pos => sub { die PApp::Util::dumpval [ $_[0]->get_root_origin ] }, 90 #window_pos => sub { die KGS::Listener::Debug::dumpval [ $_[0]->get_root_origin ] },
51 clist_column_widths => sub { 91 clist_column_widths => sub {
52 $_[0]{column_widths}; 92 $_[0]{column_widths};
53 }, 93 },
54 ); 94 );
55 95
… …
135 $main->{status}->pop($context_id{$type}) if $context_id{$type}; 175 $main->{status}->pop($context_id{$type}) if $context_id{$type};
136 $main->{status}->push($context_id{$type} ||= $main->{status}->get_context_id($type), $text) if $text; 176 $main->{status}->push($context_id{$type} ||= $main->{status}->get_context_id($type), $text) if $text;
137 } 177 }
138} 178}
139 179
180if (0) {
181 use KGS::Constants;
182
183 my $board = new game size => 5;
184 $board->{board} = new KGS::Game::Board;
185 $board->{board}{board}[0][0] = MARK_B;
186 $board->{board}{board}[1][1] = MARK_GRAY_B | MARK_SMALL_W;
187 $board->{board}{board}[2][2] = MARK_W | MARK_TRIANGLE;
188 $board->{window}->show_all;
189}
190
140main Gtk; 191main Gtk;
141 192
142############################################################################# 193#############################################################################
143 194
144package kgsueme; 195package kgsueme;
… …
238 if ($msg->{success}) { 289 if ($msg->{success}) {
239 for (keys %{$::config->{rooms}}) { 290 for (keys %{$::config->{rooms}}) {
240 $self->{roomlist}->join_room($_); 291 $self->{roomlist}->join_room($_);
241 } 292 }
242 } 293 }
243
244 warn PApp::Util::dumpval($::config);
245} 294}
246 295
247sub event_disconnect { } 296sub event_disconnect { }
248 297
249############################################################################# 298#############################################################################
… …
296 345
297 $self->msg(list_rooms => group => $_) for 0..5; # fetch all room names (should not!) 346 $self->msg(list_rooms => group => $_) for 0..5; # fetch all room names (should not!)
298 $self->{window}->show_all; 347 $self->{window}->show_all;
299} 348}
300 349
301sub event_update { 350sub event_update_rooms {
302 my ($self) = @_; 351 my ($self) = @_;
303 352
304 $self->{event_update} ||= Gtk->timeout_add(200, sub { 353 $self->{event_update} ||= Gtk->timeout_add(200, sub {
305 my $l = $self->{roomlist}; 354 my $l = $self->{roomlist};
306 355
… …
383 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30]; 432 ::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30];
384 433
385 $self; 434 $self;
386} 435}
387 436
388sub event_update { 437sub event_update_users {
389 my ($self) = @_; 438 my ($self) = @_;
390 439
391 $self->{event_update} ||= Gtk->timeout_add(200, sub { 440 $self->{event_update} ||= Gtk->timeout_add(200, sub {
392 my $l = $self->{userlist}; 441 my $l = $self->{userlist};
393 442
… …
444 my ($self) = @_; 493 my ($self) = @_;
445 $self->SUPER::part; 494 $self->SUPER::part;
446 495
447 delete $::config->{rooms}{$self->{channel}}; 496 delete $::config->{rooms}{$self->{channel}};
448 $self->{window}->hide_all; 497 $self->{window}->hide_all;
449 $self->event_update; 498 $self->event_update_users;
450 $self->event_update_games; 499 $self->event_update_games;
451} 500}
452 501
453sub event_join { 502sub event_join {
454 my ($self) = @_; 503 my ($self) = @_;
… …
473############################################################################# 522#############################################################################
474 523
475package game; 524package game;
476 525
477use KGS::Constants; 526use KGS::Constants;
527use KGS::Game::Board;
478 528
479use base KGS::Listener::Game; 529use base KGS::Listener::Game;
480use base KGS::Game; 530use base KGS::Game;
481 531
482sub new { 532sub new {
… …
484 $self = $self->SUPER::new(@_); 534 $self = $self->SUPER::new(@_);
485 535
486 $self->listen($self->{conn}); 536 $self->listen($self->{conn});
487 537
488 $self->{window} = new Gtk::Window 'toplevel'; 538 $self->{window} = new Gtk::Window 'toplevel';
489 $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1); 539 $self->{window}->set_title("KGS Game ".$self->user0." ".$self->user1) if $self->{channel};#d#
490 ::state $self->{window}, "game::window", undef, window_size => [600, 500]; 540 ::state $self->{window}, "game::window", undef, window_size => [600, 500];
491 541
492 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); 542 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
493 543
494 $self->{window}->add(my $hpane = new Gtk::HPaned); 544 $self->{window}->add(my $hpane = new Gtk::HPaned);
495 ::state $hpane, "game::hpane", undef, hpane_position => 500; 545 ::state $hpane, "game::hpane", undef, hpane_position => 500;
496 546
497 $::config{aa}++; 547 Gtk::Widget->push_visual (Gtk::Gdk::Rgb->get_visual);
498 $self->{canvas} = $::config{aa} ? new_aa Gnome::Canvas : new Gnome::Canvas; 548 Gtk::Widget->push_colormap (Gtk::Gdk::Rgb->get_cmap);
499 $hpane->add($self->{canvas}); 549 $hpane->pack1(($self->{canvas} = new Gtk::DrawingArea), 1, 1);
550 Gtk::Widget->pop_colormap;
551 Gtk::Widget->pop_visual;
500 552
501 $self->{canvas}->signal_connect(size_allocate => sub { 553 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
502 warn "@_ @{$_[1]}"; 554 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
503 #$self->{canvas}->set_pixels_per_unit(
504 });
505 555
506 my $line_colour = $::config{line_colour} || "darkbrown";
507 my $border = 0.1;
508
509 $self->{canvas}->set_pixels_per_unit(300);
510 $self->{canvas}->set_scroll_region(-$border,-$border,1+$border,1+$border);
511
512 {
513 my $croot = $self->{canvas}->root;
514 my $cgroup = $croot; #->new($croot, "Gnome::CanvasGroup");
515
516 if ($::board_img) {
517 $cgroup->new($cgroup, "Gnome::CanvasImage",
518 x => -$border, y => -$border,
519 width => 1+$border*2, height => 1+$border*2,
520 image => $::board_img,
521 anchor => "nw"
522 );
523 } else {
524 die;
525 $cgroup->new($cgroup, "Gnome::CanvasRect",
526 x1 => -$border, x2 => 1+$border,
527 y1 => -$border, y2 => 1+$border,
528 outline_color => "black",
529 fill_color => "brown",
530 width_pixels => 2,
531 );
532 }
533
534 my $x1 = $pad * 2; # == my $y1 = 30;
535 my $x2 = $w - ($pad * 2); # == my $y2 = 270;
536 my $w = $x2 - $x1;
537 my $s = $self->{size} - 1;
538 my $ofs = 0.5 / $self->{size};
539
540 my $a = "A";
541 for my $i (1 .. $self->{size}) { # one more iteration for the last lines
542 my $k = $i / $self->{size} - $ofs;
543
544 $cgroup->new($cgroup, "Gnome::CanvasLine",
545 points => [ $k,$ofs, $k,1-$ofs ],
546 fill_color => $line_colour,
547 width_pixels => 1);
548
549 $cgroup->new($cgroup, "Gnome::CanvasLine",
550 points => [ $ofs,$k, 1-$ofs,$k ],
551 fill_color => $line_colour,
552 width_pixels => 1);
553
554 for ( [$k,-$border*0.5,$a], [$k,1+$border*0.5,$a], [-$border*0.5,$k,$i], [1+$border*0.5,$k,$i] ) {
555 my ($x, $y, $text) = @$_;
556
557 my $text = $cgroup->new($cgroup, "Gnome::CanvasText",
558 x => 0, y => 0, text => $text,
559 justification => "center",
560 anchor => "center",
561 font => "-*-helvetica-medium-r-*--34-*",
562 fill_color => $line_colour);
563
564 $text->affine_relative($border*0.015,0, 0,$border*0.015, $x,$y);
565 }
566
567 $a++;
568 }
569
570 my $stones = [[]];
571
572 for my $x (1 .. $self->{size}) {
573 my $xk = $x / $self->{size} - $ofs;
574 for my $y (1 .. $self->{size}) {
575 my $yk = $y / $self->{size} - $ofs;
576
577 my $col = $stones->[$x-1][$y-1] = [];
578
579 if (1) {
580 $col->[0] =
581 $cgroup->new($cgroup, "Gnome::CanvasImage",
582 x => $xk, y => $yk,
583 width => $ofs*2, height => $ofs*2,
584 image => $::black_img[int rand @::black_img],
585 anchor => "center");
586 $col->[1] =
587 $cgroup->new($cgroup, "Gnome::CanvasImage",
588 x => $xk, y => $yk,
589 width => $ofs*2, height => $ofs*2,
590 image => $::white_img[int rand @::white_img],
591 anchor => "center");
592 } else {
593 # too large, scale has NO effect
594 $col->[0] =
595 $cgroup->new($cgroup, "Gnome::CanvasEllipse",
596 x1 => $xk, x2 => $xk + 0.001,
597 y1 => $yk, y2 => $yk + 0.001,
598 outline_color => "black", width_pixels => 2,
599 fill_color => "black");
600 $col->[1] =
601 $cgroup->new($cgroup, "Gnome::CanvasEllipse",
602 x1 => $xk, x2 => $xk + 0.001,
603 y1 => $yk, y2 => $yk + 0.001,
604 outline_color => "black", width_pixels => 2,
605 fill_color => "white");
606 }
607 }
608 }
609
610 $self->{board_gfx}->{stones} = $stones;
611 }
612
613 $hpane->add(my $vpane = new Gtk::VPaned); 556 $hpane->pack2((my $vpane = new Gtk::VPaned), 0, 0);
614 ::state $vpane, "game", $self->{name}, vpane_position => 80; 557 ::state $vpane, "game", $self->{name}, vpane_position => 80;
615 558
616 $vpane->add(my $sw = new Gtk::ScrolledWindow); 559 $vpane->add(my $sw = new Gtk::ScrolledWindow);
617 $sw->set_policy("automatic", "always"); 560 $sw->set_policy("automatic", "always");
618 561
… …
635 }); 578 });
636 579
637 $self; 580 $self;
638} 581}
639 582
640sub event_update { 583sub event_update_users {
641 my ($self) = @_; 584 my ($self) = @_;
642 585
643 $self->{event_update} ||= Gtk->timeout_add(200, sub { 586 room::event_update_users $self;
644 my $l = $self->{userlist};
645
646 $l->freeze;
647 my $pos = $l->get_vadjustment->get_value;
648 $l->clear;
649
650 my $row = 0;
651 for (values %{$self->{users}}) {
652 $l->append($_->{name});
653 $l->set_row_data($row++, $_);
654 }
655 $l->sort;
656 $l->get_vadjustment->set_value($pos);
657 $l->thaw;
658
659 delete $self->{event_update};
660 0;
661 });
662} 587}
663 588
664sub join { 589sub join {
665 my ($self) = @_; 590 my ($self) = @_;
666 $self->SUPER::join; 591 $self->SUPER::join;
… …
670 595
671sub part { 596sub part {
672 my ($self) = @_; 597 my ($self) = @_;
673 $self->SUPER::part; 598 $self->SUPER::part;
674 599
675 $self->{window}->hide_all; 600 $self->{window}->hide;
676 $self->event_update; 601}
602
603sub configure_event {
604 my ($widget, $self, $event) = @_;
605 delete $self->{stack};
606 delete $self->{background};
607 $self->repaint_board;
608 1;
609}
610
611sub INTERP_NEAREST (){ 1 }
612sub INTERP_TILES (){ 1 }
613sub INTERP_BILINEAR (){ 2 }
614sub INTERP_HYPER (){ 3 }
615
616sub new_pixbuf {
617 my ($w, $h, $alpha, $clear) = @_;
618
619 my $pixbuf = new Gtk::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
620
621 if ($clear) { # damn, need to clear it ourselves
622 my $row = "\x00\x00\x00\x00" x $w;
623 $pixbuf->put_pixels ($row, $_, 0) for 0 .. $h - 1;
624 }
625
626 $pixbuf;
627}
628
629sub scale_pixbuf {
630 my ($src, $w, $h, $mode) = @_;
631
632 my $dst = new_pixbuf $w, $h, 1;
633
634 $src->scale(
635 $dst, 0, 0, $w, $h, 0, 0,
636 $w / $src->get_width, $h / $src->get_height,
637 $mode,
638 );
639
640 $dst;
641}
642
643# create a stack of stones
644sub create_stack {
645 my ($self, $mark, $size, $rand) = @_;
646
647 my $c = \$self->{stack}{$mark};
648 unless ($$c) {
649 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
650 my $base = new_pixbuf $size, $size, 1, 1;
651
652 # first the big stones
653 for ([MARK_B, 255],
654 [MARK_W, 255],
655 [MARK_GRAY_B, 128],
656 [MARK_GRAY_W, 128]) {
657 my ($mask, $alpha) = @$_;
658 if ($mark & $mask) {
659 $stone->composite (
660 $base, 0, 0, $size, $size, -0.5, -0.5,
661 $size / $stone->get_width, $size / $stone->get_height,
662 INTERP_HYPER, $alpha
663 );
664 }
665 }
666
667 # then the samll stones
668 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
669 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
670 my ($mask, $img) = @$_;
671 if ($mark & $mask) {
672 $img->composite (
673 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2,
674 $size / $img->get_width / 2, $size / $img->get_height / 2,
675 INTERP_HYPER, 192
676 );
677 }
678 }
679
680 # and lastly any markers (labels NYI)
681 my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B));
682
683 for ([MARK_CIRCLE, $::circle_img[$dark_bg]],
684 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
685 [MARK_SQUARE, $::square_img[$dark_bg]]) {
686 my ($mask, $img) = @$_;
687 if ($mark & $mask) {
688 $img->composite (
689 $base, 0, 0, $size, $size, -0.5, -0.5,
690 $size / $img->get_width, $size / $img->get_height,
691 INTERP_HYPER, 255
692 );
693 }
694 }
695
696 push @$$c, $base;
697 }
698 }
699
700 $$c->[$rand % @$$c];
701}
702
703sub pixbuf_text {
704 my ($pixbuf, $colour, $x, $y, $height, $text) = @_;
705
706 my $c = $::font[$colour][$::fontmap{substr $text, 0, 1}];
707
708 if ($c) {
709 my ($w, $h) = ($c->get_width, $c->get_height);
710 my $s = ($height-1) / ($h-1);
711
712 $x -= $w * $s * 0.5;
713 $y -= $height * 0.5;
714
715 $c->composite ($pixbuf,
716 $x, $y, $w*$s+0.5, $height+0.5, $x-0.5, $y-0.5, $s, $s,
717 INTERP_BILINEAR, 192);
718
719 } else {
720 warn "unable to render character '$text'";
721 }
722}
723
724my $black_pb;
725
726sub pixbuf_rect {
727 my ($pb, $x1, $y1, $x2, $y2) = @_;
728 # we fake lines by... an unspeakable method :/
729 unless ($black_pb) {
730 $black_pb = new_pixbuf 1, 1, 0, 0;
731 $black_pb->put_pixels ("\x44\x11\x11", 0, 0);
732 }
733
734 $black_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, 1, 1, INTERP_NEAREST, 192);
735}
736
737sub repaint_board {
738 my ($self) = @_;
739 my $canvas = $self->{canvas};
740
741 return unless $self->{board};
742
743 my ($w, $h) = @{$canvas->allocation}[2,3];
744
745 my $s = $w > $h ? $h : $w;
746
747 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
748
749 my $size = $self->{size};
750
751 my $border = int ($s / $size);
752 my $s2 = $s - $border * 2;
753 my $edge = int ($s2 / $size) | 1;
754 my $ofs = int ($edge / 2);
755
756 my @k = map int ($s2 * $_ / $size - $ofs + $border + 0.5), 0 .. $size;
757
758 unless ($self->{background}) {
759 my $pixbuf;
760
761 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
762
763 if ($s < $bw && $s < $bh) {
764 $pixbuf = new_pixbuf $s, $s, 1, 0;
765 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
766 } else {
767 $pixbuf = scale_pixbuf $::board_img, $s, $s, INTERP_TILES;
768 }
769
770 my $linew = int ($s / 300);
771
772 my $a = "A";
773 for my $i (1 .. $size) {
774 pixbuf_rect $pixbuf, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew;
775 pixbuf_rect $pixbuf, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew;
776
777 pixbuf_text $pixbuf, 0, $k[$i], ($ofs +$border) / 2, $ofs, $a;
778 pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border + $ofs / 2, $ofs, $a;
779 pixbuf_text $pixbuf, 0, ($ofs + $border) / 2, $k[$i], $ofs, $size - $i + 1;
780 pixbuf_text $pixbuf, 0, $s2 + $border + $ofs / 2, $k[$i], $ofs, $size - $i + 1;
781
782 $a++;
783 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
784 }
785
786 $self->{background} = $pixbuf;
787 }
788
789 my $pixbuf = $self->{pixbuf} = $self->{background}->copy;
790
791 # hoshi-points(!)#d#
792 # caching of empty board gfx(!)#d#
793
794 for my $x (1 .. $size) {
795 for my $y (1 .. $size) {
796 my $mark = $self->{board}{board}[$x-1][$y-1];
797
798 if ($mark) {
799 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
800 my $pb = $self->create_stack($mark, $edge, $x * 17 + $y * 11 );
801
802 $pb->composite ($pixbuf, $dx, $dy, $edge, $edge, $dx, $dy, 1, 1, INTERP_NEAREST, 255);
803
804 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
805
806 #$gc->set_clip_mask ($bm);
807 #$gc->set_clip_origin ($dx, $dy);
808 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
809 }
810 }
811 }
812}
813
814sub expose_event {
815 my ($widget, $self, $event) = @_;
816
817 $self->{pixbuf} or return;
818
819 my ($ox, $oy, $s) = @{$self->{offsets}};
820
821 my ($x, $y, $w, $h) =
822 @{Gtk::Gdk::Rectangle->intersect(
823 $event->{area},
824 [$ox, $oy, $s, $s]
825 )};
826
827 if (defined $x) {
828 $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc,
829 $x - $ox, $y - $oy, $x, $y, $w, $h);
830 #$self->{canvas}->window->draw_pixmap (
831 # $self->{canvas}->style->white_gc,
832 # $self->{pixmap},
833 # $x - $ox, $y - $oy, $x, $y, $w, $h,
834 #);
835 }
836 1;
677} 837}
678 838
679sub event_update_tree { 839sub event_update_tree {
680 my ($self) = @_; 840 my ($self) = @_;
681 841
682 my $board = new KGS::Game::Board $self->{size}; 842 $self->{board} = new KGS::Game::Board $self->{size};
683 $board->interpret_path ($self->get_path); 843 $self->{board}->interpret_path ($self->get_path);
684 844
685# if (not defined $self->{board_pm}) { 845 $self->repaint_board;
686# $self->{board_pm} = new Gtk::Gdk::Pixmap ($self->{board}->window, 100, 100, -1);
687# $self->{board_pm}->draw_rectangle($self->{board}->style->white_gc, 1, 0, 0, 100, 100);
688# }
689# my $red = $self->{board}->window->get_colormap->color_alloc( { red => 65000, green => 0, blue => 0 } );
690# my $red_gc = new Gtk::Gdk::GC ( $self->{board}->window );
691# $red_gc->set_foreground( $red );
692#
693# my $px = $self->{board_pm};
694 846
695 for my $x (0 .. $self->{size} - 1) { 847 # force a redraw (not perfect(?))
696 for my $y (0 .. $self->{size} - 1) { 848 expose_event $self->{canvas}, $self, { area => $self->{canvas}->allocation };
697 my $v = $board->{board}[$x][$y];
698 849
699 $v & MARK_B 850 $self->{text}->backward_delete($self->{text}->get_length);
700 ? $self->{board_gfx}->{stones}->[$x][$y][0]->show 851 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
701 : $self->{board_gfx}->{stones}->[$x][$y][0]->hide; 852}
702 $v & MARK_W 853
703 ? $self->{board_gfx}->{stones}->[$x][$y][1]->show 854sub event_move {
704 : $self->{board_gfx}->{stones}->[$x][$y][1]->hide; 855 ::play_sound "move";
705 }
706 }
707} 856}
708 857
7091; 8581;
710 859
711 860

Diff Legend

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