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.39 by pcg, Tue Jun 3 15:19:20 2003 UTC vs.
Revision 1.54 by pcg, Thu Jun 12 22:10:04 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, 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 my $running = $move == @{$self->{path}}; 654 my $running = $move == @{$self->{path}};
654 655
655 $self->{board_label}->set_text ("Move $move"); 656 $self->{board_label}->set_text ("Move " . ($move - 1));
656 657
657 $self->{board} = new KGS::Game::Board $self->{size}; 658 $self->{board} = new KGS::Game::Board $self->{size};
658 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 659 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
659 660
660 for my $colour (WHITE, BLACK) { 661 for my $colour (WHITE, BLACK) {
661 $self->{userpanel}[$colour]->set_state ( 662 $self->{userpanel}[$colour]->set_state (
662 $self->{board}{captures}[$colour], 663 $self->{board}{captures}[$colour],
663 $self->{board}{timer}[$colour], 664 $self->{board}{timer}[$colour],
664 ($running && $self->{lastmove_colour} == !$colour) 665 ($running && $self->{lastmove_colour} == !$colour)
665 ? $self->{lastmove_time} : 0 666 ? $self->{lastmove_time} : 0
666 ); 667 );
667 } 668 }
668 669
669 $self->redraw ($self->repaint_board); 670 $self->redraw ($self->repaint_board);
671
672 # delete $self->{update_board_cb};
673 #}
670} 674}
671 675
672sub event_update_tree { 676sub event_update_tree {
673 my ($self) = @_; 677 my ($self) = @_;
674 678
675 $self->{path} = $self->get_path; 679 $self->{path} = $self->get_path;
676 680
677 if ($self->{moveadj}) { 681 if ($self->{moveadj}) {
678 my $upper = $self->{moveadj}->upper; 682 my $upper = $self->{moveadj}->upper;
679 my $pos = $self->{moveadj}->get_value; 683 my $pos = $self->{moveadj}->get_value;
684 my $move = scalar @{$self->{path}};
680 685
681 $self->{moveadj}->upper (scalar @{$self->{path}}); 686 $self->{moveadj}->upper ($move);
682 687
683 $self->{moveadj}->changed; 688 $self->{moveadj}->changed;
684 if ($pos == $upper) { 689 if ($pos == $upper) {
685 $self->{moveadj}->set_value (scalar @{$self->{path}}); 690 $self->{moveadj}->value ($move);
686 } else {
687 $self->{moveadj}->value_changed; 691 $self->{moveadj}->value_changed;
688 } 692 }
689 } 693 }
690} 694}
691 695
… …
698 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" 702 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
699 if $newnode; 703 if $newnode;
700 704
701 for (split /\n/, $comment) { 705 for (split /\n/, $comment) {
702 $text .= "\n"; 706 $text .= "\n";
703 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { 707 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
704 $text .= "<user>" . (util::toxml $1) . "</user>:"; 708 $text .= "<user>" . (util::toxml $1) . "</user>:";
705 } 709 }
706 # 710
707 # only for 19x19 so far 711 # coords only for 19x19 so far
708 $_ .= util::toxml $_; 712 $_ = util::toxml $_;
709 s{ 713 s{
710 ( 714 (
711 \b 715 \b
712 (?:[bw])? 716 (?:[bw])?
713 [, ]{0,2} 717 [, ]{0,2}
714 [a-t]\s?[0-9]{1,2}) 718 [a-hj-t] # valid for upto 19x19
719 \s?
715 (?=[^0-9] 720 [1-9]?[0-9]
721 \b
716 ) 722 )
717 }{ 723 }{
718 "<coord>$1</coord>"; 724 "<coord>$1</coord>";
719 }sgexi; 725 }sgexi;
720 726
… …
730} 736}
731 737
732sub event_part { 738sub event_part {
733 my ($self) = @_; 739 my ($self) = @_;
734 $self->SUPER::event_part; 740 $self->SUPER::event_part;
741 $self->destroy;
735} 742}
736 743
737sub event_move { 744sub event_move {
738 my ($self, $pass) = @_; 745 my ($self, $pass) = @_;
739 sound::play 1, $pass ? "pass" : "move"; 746 sound::play 1, $pass ? "pass" : "move";
… …
741 748
742sub event_update_game { 749sub event_update_game {
743 my ($self) = @_; 750 my ($self) = @_;
744 $self->SUPER::event_update_game; 751 $self->SUPER::event_update_game;
745 752
753 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
754 $self->{window}->set_title("KGS Game $title");
755
746 $self->{user}[BLACK] = $self->{user1}; 756 $self->{user}[BLACK] = $self->{user1};
747 $self->{user}[WHITE] = $self->{user2}; 757 $self->{user}[WHITE] = $self->{user2};
748 758
749 # show board 759 # show board
750 760
751 $self->{left}->remove ($_) for $self->{left}->get_children; 761 $self->{left}->remove ($_) for $self->{left}->get_children;
752 if ($self->is_valid) { 762 if ($self->is_valid) {
753 $self->{left}->add ($self->{boardbox}); 763 $self->{left}->add ($self->{boardbox});
754 (delete $self->{challenge})->destroy if $self->{challenge}; 764 (delete $self->{challenge})->destroy if $self->{challenge};
755 } else { 765 } else {
… …
757 } 767 }
758 $self->{left}->show_all; 768 $self->{left}->show_all;
759 769
760 # view text 770 # view text
761 771
762 $text = "\n<header>Game Update</header>"; 772 my @ga;
763
764 $text .= "\nType: " . (util::toxml $gametype{$self->type}) 773 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
765 . " (" . (util::toxml $gameopt{$self->option}) . ")"; 774 . " (" . (util::toxml $gameopt{$self->option}) . ")";
766 $text .= "\nFlags:"; 775 $ga[1] = "\nFlags:";
767 $text .= " valid" if $self->is_valid; 776 $ga[1] .= " valid" if $self->is_valid;
768 $text .= " adjourned" if $self->is_adjourned; 777 $ga[1] .= " adjourned" if $self->is_adjourned;
769 $text .= " scored" if $self->is_scored; 778 $ga[1] .= " scored" if $self->is_scored;
770 $text .= " saved" if $self->is_saved; 779 $ga[1] .= " saved" if $self->is_saved;
771 780
772 $text .= "\nWhite: <user>" . (util::toxml $self->{user2}->as_string) . "</user>";
773 $text .= "\nBlack: <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
774 $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>";
775 785
776 if ($self->is_valid) { 786 if ($self->is_valid) {
777 $text .= "\nHandicap: " . $self->{handicap}; 787 $ga[4] = "\nHandicap: " . $self->{handicap};
778 $text .= "\nKomi: " . $self->{komi}; 788 $ga[5] = "\nKomi: " . $self->{komi};
779 $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;
780 } 805
781
782 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 806 $self->{text}->append_text ($text);
783} 807}
784 808
785sub event_update_rules { 809sub event_update_rules {
786 my ($self, $rules) = @_; 810 my ($self, $rules) = @_;
787 811
788 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) 812 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
789 for BLACK, WHITE; 813 for BLACK, WHITE;
790 814
815 sound::play 3, "gamestart";
816
791 my $text = "\n<header>Game Rules</header>"; 817 my $text = "\n<header>Game Rules</header>";
792 818
793 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; 819 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
794 820
795 $text .= "\nTime: "; 821 $text .= "\nTime: ";
796 822
797 if ($rules->{timesys} == TIMESYS_NONE) { 823 if ($rules->{timesys} == TIMESYS_NONE) {
798 $text .= "infinite"; 824 $text .= "UNLIMITED";
799 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { 825 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
800 $text .= util::format_time $rules->{time}; 826 $text .= util::format_time $rules->{time};
827 $text .= " ABS";
801 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { 828 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
802 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; 829 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
803 $text .= sprintf " + %s (%d)", util::format_time $rules->{interval}, $rules->{count}; 830 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
804 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { 831 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
805 $text .= util::format_time $rules->{time}; 832 $text .= util::format_time $rules->{time};
806 $text .= sprintf " + %s/%d", util::format_time $rules->{interval}, $rules->{count}; 833 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
807 } 834 }
808 835
809 $self->{text}->append_text ("<infoblock>$text</infoblock>"); 836 $self->{text}->append_text ("<infoblock>$text</infoblock>");
810} 837}
811 838
812sub inject_resign_game { 839sub inject_resign_game {
813 my ($self, $msg) = @_; 840 my ($self, $msg) = @_;
841
842 sound::play 3, "resign";
814 843
815 $self->{text}->append_text ("\n<infoblock><header>Resign</header>" 844 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
816 . "\n<user>" 845 . "\n<user>"
817 . (util::toxml $self->{user}[$msg->{player}]->as_string) 846 . (util::toxml $self->{user}[$msg->{player}]->as_string)
818 . "</user> resigned.</infoblock>"); 847 . "</user> resigned.</infoblock>");
819} 848}
820 849
821sub inject_final_result { 850sub inject_final_result {
822 my ($self, $msg) = @_; 851 my ($self, $msg) = @_;
823 852
824 $self->{text}->append_text ("\n<header>Game Over</header>" 853 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
825 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) 854 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
826 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) 855 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
856 . "</infoblock>"
827 ); 857 );
828} 858}
829 859
830sub destroy { 860sub destroy {
831 my ($self) = @_; 861 my ($self) = @_;

Diff Legend

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