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.46 by pcg, Thu Jun 5 06:01:01 2003 UTC vs.
Revision 1.54 by pcg, Thu Jun 12 22:10:04 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 }
… …
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, 1, 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
… …
646 646
647sub update_board { 647sub update_board {
648 my ($self) = @_; 648 my ($self) = @_;
649 return unless $self->{path}; 649 return unless $self->{path};
650 650
651 #$self->{update_board_cb} ||= add Glib::Idle sub {
651 my $move = int $self->{moveadj}->get_value; 652 my $move = int $self->{moveadj}->get_value;
652 653
653 warn "update_board called $move\n";#d#
654
655 my $running = $move == @{$self->{path}}; 654 my $running = $move == @{$self->{path}};
656 655
657 $self->{board_label}->set_text ("Move $move"); 656 $self->{board_label}->set_text ("Move " . ($move - 1));
658 657
659 $self->{board} = new KGS::Game::Board $self->{size}; 658 $self->{board} = new KGS::Game::Board $self->{size};
660 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 659 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
661 660
662 for my $colour (WHITE, BLACK) { 661 for my $colour (WHITE, BLACK) {
663 $self->{userpanel}[$colour]->set_state ( 662 $self->{userpanel}[$colour]->set_state (
664 $self->{board}{captures}[$colour], 663 $self->{board}{captures}[$colour],
665 $self->{board}{timer}[$colour], 664 $self->{board}{timer}[$colour],
666 ($running && $self->{lastmove_colour} == $colour) 665 ($running && $self->{lastmove_colour} == !$colour)
667 ? $self->{lastmove_time} : 0 666 ? $self->{lastmove_time} : 0
668 ); 667 );
669 } 668 }
670 669
671 $self->redraw ($self->repaint_board); 670 $self->redraw ($self->repaint_board);
671
672 # delete $self->{update_board_cb};
673 #}
672} 674}
673 675
674sub event_update_tree { 676sub event_update_tree {
675 my ($self) = @_; 677 my ($self) = @_;
676 678
677 $self->{path} = $self->get_path; 679 $self->{path} = $self->get_path;
678 680
679 if ($self->{moveadj}) { 681 if ($self->{moveadj}) {
680 my $upper = $self->{moveadj}->upper; 682 my $upper = $self->{moveadj}->upper;
681 my $pos = $self->{moveadj}->get_value; 683 my $pos = $self->{moveadj}->get_value;
684 my $move = scalar @{$self->{path}};
682 685
683 $self->{moveadj}->upper (scalar @{$self->{path}}); 686 $self->{moveadj}->upper ($move);
684 687
685 warn "UPDATE_TREE $pos,$upper";#d#
686 $self->{moveadj}->changed; 688 $self->{moveadj}->changed;
687 if ($pos == $upper) { 689 if ($pos == $upper) {
688 $self->{moveadj}->set_value (scalar @{$self->{path}}); 690 $self->{moveadj}->value ($move);
689 } else { 691 $self->{moveadj}->value_changed;
690 $self->update_board;
691 } 692 }
692 } 693 }
693} 694}
694 695
695sub event_update_comments { 696sub event_update_comments {
… …
735} 736}
736 737
737sub event_part { 738sub event_part {
738 my ($self) = @_; 739 my ($self) = @_;
739 $self->SUPER::event_part; 740 $self->SUPER::event_part;
741 $self->destroy;
740} 742}
741 743
742sub event_move { 744sub event_move {
743 my ($self, $pass) = @_; 745 my ($self, $pass) = @_;
744 sound::play 1, $pass ? "pass" : "move"; 746 sound::play 1, $pass ? "pass" : "move";
… …
746 748
747sub event_update_game { 749sub event_update_game {
748 my ($self) = @_; 750 my ($self) = @_;
749 $self->SUPER::event_update_game; 751 $self->SUPER::event_update_game;
750 752
753 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
754 $self->{window}->set_title("KGS Game $title");
755
751 $self->{user}[BLACK] = $self->{user1}; 756 $self->{user}[BLACK] = $self->{user1};
752 $self->{user}[WHITE] = $self->{user2}; 757 $self->{user}[WHITE] = $self->{user2};
753 758
754 # show board 759 # show board
755 760
756 $self->{left}->remove ($_) for $self->{left}->get_children; 761 $self->{left}->remove ($_) for $self->{left}->get_children;
757 if ($self->is_valid) { 762 if ($self->is_valid) {
758 $self->{left}->add ($self->{boardbox}); 763 $self->{left}->add ($self->{boardbox});
759 (delete $self->{challenge})->destroy if $self->{challenge}; 764 (delete $self->{challenge})->destroy if $self->{challenge};
760 } else { 765 } else {
… …
762 } 767 }
763 $self->{left}->show_all; 768 $self->{left}->show_all;
764 769
765 # view text 770 # view text
766 771
767 $text = "\n<header>Game Update</header>"; 772 my @ga;
768
769 $text .= "\nType: " . (util::toxml $gametype{$self->type}) 773 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
770 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 774 . " (" . (util::toxml $gameopt{$self->option}) . ")";
771 $text .= "\nFlags:"; 775 $ga[1] = "\nFlags:";
772 $text .= " valid" if $self->is_valid; 776 $ga[1] .= " valid" if $self->is_valid;
773 $text .= " adjourned" if $self->is_adjourned; 777 $ga[1] .= " adjourned" if $self->is_adjourned;
774 $text .= " scored" if $self->is_scored; 778 $ga[1] .= " scored" if $self->is_scored;
775 $text .= " saved" if $self->is_saved; 779 $ga[1] .= " saved" if $self->is_saved;
776 780
777 $text .= "\nWhite: <user>" . (util::toxml $self->{user2}->as_string) . "</user>";
778 $text .= "\nBlack: <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
779 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; 781 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
782
783 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
784 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
780 785
781 if ($self->is_valid) { 786 if ($self->is_valid) {
782 $text .= "\nHandicap: " . $self->{handicap}; 787 $ga[4] = "\nHandicap: " . $self->{handicap};
783 $text .= "\nKomi: " . $self->{komi}; 788 $ga[5] = "\nKomi: " . $self->{komi};
784 $text .= "\nSize: " . $self->size_string; 789 $ga[6] = "\nSize: " . $self->size_string;
790 }
791
792 if ($self->is_scored) {
793 $ga[7] = "\nResult: " . $self->score_string;
794 }
795
796 $text = "\n<infoblock><header>Game Update</header>";
797 for (0..7) {
798 if ($self->{gatext}[$_] ne $ga[$_]) {
799 $text .= $ga[$_];
800 }
801 }
802 $text .= "</infoblock>";
803
804 $self->{gatext} = \@ga;
785 } 805
786
787 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 806 $self->{text}->append_text ($text);
788} 807}
789 808
790sub event_update_rules { 809sub event_update_rules {
791 my ($self, $rules) = @_; 810 my ($self, $rules) = @_;
792 811
793 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 812 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
794 for BLACK, WHITE; 813 for BLACK, WHITE;
814
815 sound::play 3, "gamestart";
795 816
796 my $text = "\n<header>Game Rules</header>"; 817 my $text = "\n<header>Game Rules</header>";
797 818
798 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 819 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
799 820
… …
816} 837}
817 838
818sub inject_resign_game { 839sub inject_resign_game {
819 my ($self, $msg) = @_; 840 my ($self, $msg) = @_;
820 841
842 sound::play 3, "resign";
843
821 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 844 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
822 . "\n<user>" 845 . "\n<user>"
823 . (util::toxml $self->{user}[$msg->{player}]->as_string) 846 . (util::toxml $self->{user}[$msg->{player}]->as_string)
824 . "</user> resigned.</infoblock>"); 847 . "</user> resigned.</infoblock>");
825} 848}

Diff Legend

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