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.33 by pcg, Mon Jun 2 14:36:10 2003 UTC vs.
Revision 1.49 by pcg, Tue Jun 10 09:06:39 2003 UTC

1use utf8;
2
1package game::goclock; 3package game::goclock;
4
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked.
2 7
3use Time::HiRes (); 8use Time::HiRes ();
4 9
5use KGS::Constants; 10use KGS::Constants;
6 11
… …
16 $self->{format} = sub { "ERROR" }; 21 $self->{format} = sub { "ERROR" };
17 22
18 $self; 23 $self;
19} 24}
20 25
21sub append_text { 26sub configure {
22 my ($self, $text) = @_;
23
24 $self->{buffer}->insert ($self->{buffer}->get_end_iter, $text);
25}
26
27sub format_time {
28 my ($time) = @_;
29
30 $time > 60*60
31 ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60
32 : sprintf "%d:%02d", $time / 60 % 60, $time % 60;
33}
34
35sub set_rules {
36 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
37 28
38 if ($timesys == TIMESYS_ABSOLUTE) { 29 if ($timesys == TIMESYS_ABSOLUTE) {
39 $self->{set} = sub { $self->{time} = $_[0] }; 30 $self->{set} = sub { $self->{time} = $_[0] };
40 $self->{format} = sub { format_time $_[0] }; 31 $self->{format} = sub { util::format_time $_[0] };
41 32
42 } elsif ($timesys == TIMESYS_BYO_YOMI) { 33 } elsif ($timesys == TIMESYS_BYO_YOMI) {
43 my $low = $interval * $count; 34 my $low = $interval * $count;
44 35
45 $self->{set} = sub { $self->{time} = $_[0] }; 36 $self->{set} = sub { $self->{time} = $_[0] };
46 37
47 $self->{format} = sub { 38 $self->{format} = sub {
48 if ($_[0] > $low) { 39 if ($_[0] > $low) {
49 format_time $_[0] - $low; 40 util::format_time $_[0] - $low;
50 } else { 41 } else {
51 sprintf "%s (%d)", (format_time int ($_[0] % $interval) || $interval), $_[0] / $interval; 42 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval;
52 } 45 }
53 }; 46 };
54 47
55 } elsif ($timesys == TIMESYS_CANADIAN) { 48 } elsif ($timesys == TIMESYS_CANADIAN) {
56 my $low = $interval;
57
58 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; 49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
59 50
60 $self->{format} = sub { 51 $self->{format} = sub {
61 if ($_[0] > $low) { 52 if (!$self->{moves}) {
62 format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
63 } else { 54 } else {
64 sprintf "%s / %d", (format_time int($_[0] % $interval) || $interval), $self->{moves}; 55 my $time = int (($_[0] - 1) % $interval + 1);
56
57 sprintf "%s/%d [%d]",
58 util::format_time $time,
59 $self->{moves},
60 $time / ($self->{moves} || 1);
61
65 } 62 }
66 }; 63 };
67 64
68 } else { 65 } else {
69 # none, or unknown 66 # none, or unknown
… …
73} 70}
74 71
75sub refresh { 72sub refresh {
76 my ($self, $timestamp) = @_; 73 my ($self, $timestamp) = @_;
77 my $timer = $self->{time} + $self->{start} - $timestamp; 74 my $timer = $self->{time} + $self->{start} - $timestamp;
75
76 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4));
78 $self->{widget}->set_text ($self->{format}->($timer)); 79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
79 80
80 $timer - int $timer; 81 $timer - int $timer;
81} 82}
82 83
83sub set_time { 84sub set_time {
84 my ($self, $time) = @_; 85 my ($self, $time) = @_;
85 86
86 # we ignore requests to re-set the time of a running clock. 87 # we ignore requests to re-set the time of a running clock.
87 # this is the easiest way to ensure that commentary etc. 88 # this is the easiest way to ensure that commentary etc.
88 # doesn't re-set the clock. yes, this is frickle design, 89 # doesn't re-set the clock. yes, this is frickle design,
89 # but I think the protoocl is to blame here, which gives 90 # but I think the protocol is to blame here, which gives
90 # very little time information. (cgoban2 also has had quite 91 # very little time information. (cgoban2 also has had quite
91 # a lot of small time update problems...) 92 # a lot of small time update problems...)
92 unless ($self->{timeout}) { 93 unless ($self->{timeout}) {
93 $self->{set}->($time->[0], $time->[1]); 94 $self->{set}->($time->[0], $time->[1]);
94 $self->refresh ($self->{start}); 95 $self->refresh ($self->{start});
95 } 96 }
96} 97}
97 98
98sub start { 99sub start {
99 my ($self) = @_; 100 my ($self, $when) = @_;
100 101
101 return if $self->{timeout}; 102 $self->stop;
102 103
103 # this is correct, since we assume the last message triggered a start 104 $self->{start} = $when;
104 $self->{start} = $KGS::Protocol::NOW;
105 105
106 my $timeout; $timeout = sub { 106 my $timeout; $timeout = sub {
107 # -100 means we run the timer a bit earlier to avoid 10.99 => 10s roundings.
108 # we "could" cheat by precalculating the time, but I feel uneasy about both
109 # ways to cheat.
110 my $next = int ($self->refresh (Time::HiRes::time) * 1000) - 100; 107 my $next = $self->refresh (Time::HiRes::time) * 1000;
111 $next += 1000 if $next < 0; 108 $next += 1000 if $next < 0;
112 $self->{timeout} = add Glib::Timeout $next, $timeout; 109 $self->{timeout} = add Glib::Timeout $next, $timeout;
113 0; 110 0;
114 }; 111 };
115 112
… …
147 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 144 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
148 145
149 $self; 146 $self;
150} 147}
151 148
152sub set_rules { 149sub configure {
153 my ($self, $rules) = @_; 150 my ($self, $user, $rules) = @_;
154 151
155 if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) { 152 if ($self->{name}->get_text ne $user->as_string) {
156 $self->{name}->set_text ($rules->{player}[$self->{colour}]); 153 $self->{name}->set_text ($user->as_string);
157 154
158 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
159 $self->{imagebox}->add (gtk::image_from_data undef); 156 $self->{imagebox}->add (gtk::image_from_data undef);
160 $self->{imagebox}->show_all; 157 $self->{imagebox}->show_all;
161 158
162 # the big picture... 159 # the big picture...
163 appwin::userpic ($rules->{player}[$self->{colour}], sub { 160 appwin::userpic ($user->{name}, sub {
161 return unless $self->{imagebox};
164 if ($_[0]) { 162 if ($_[0]) {
165 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 163 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
166 $self->{imagebox}->add (gtk::image_from_data $_[0]); 164 $self->{imagebox}->add (gtk::image_from_data $_[0]);
167 $self->{imagebox}->show_all; 165 $self->{imagebox}->show_all;
168 } 166 }
169 }); 167 });
170 } 168 }
171 169
172 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)}); 170 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
173} 171}
174 172
175sub set_state { 173sub set_state {
176 my ($self, $captures, $timer, $running) = @_; 174 my ($self, $captures, $timer, $when) = @_;
177 175
178 $self->{clock}->stop unless $running; 176 $self->{clock}->stop unless $when;
179 $self->{clock}->set_time ($timer); 177 $self->{clock}->set_time ($timer);
180 $self->{clock}->start if $running; 178 $self->{clock}->start ($when) if $when;
181 179
182 $self->{info}->set_text ("$captures pris."); 180 $self->{info}->set_text ("$captures pris.");
183} 181}
184 182
185package game; 183package game;
… …
212 }); 210 });
213 211
214 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
215 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
216 214
215 # LEFT PANE
216
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 1); 217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
218 218
219 $self->{boardbox} = new Gtk2::VBox; 219 $self->{boardbox} = new Gtk2::VBox;
220 220
221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222 222
… …
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
… …
251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253 253
254 # RIGHT PANE 254 # RIGHT PANE
255 255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1); 257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259 259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always"); 261 $sw->set_policy("automatic", "always");
… …
373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height, 373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
375 ); 375 );
376 } 376 }
377 377
378 # first the big stones (handicap stones different for effect) 378 # first the big stones (handicap stones could be different)
379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
380 [MARK_W, $mark & MARK_MOVE ? 255 : 192], 380 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
381 [MARK_GRAY_B, 128], 381 [MARK_GRAY_B, 128],
382 [MARK_GRAY_W, 128]) { 382 [MARK_GRAY_W, 128]) {
383 my ($mask, $alpha) = @$_; 383 my ($mask, $alpha) = @$_;
384 if ($mark & $mask) { 384 if ($mark & $mask) {
385 $stone->composite ( 385 $stone->composite (
… …
572 } 572 }
573 } 573 }
574 574
575 $self->{pixbuf} = $pixbuf; 575 $self->{pixbuf} = $pixbuf;
576 576
577 # hoshi-points(!)#d#
578 # caching of empty board gfx(!)#d#
579
580 for my $x (1 .. $size) { 577 for my $x (1 .. $size) {
581 for my $y (1 .. $size) { 578 for my $y (1 .. $size) {
582 my $rand = ($x ^ $y ^ 0x5555); 579 my $rand = ($x ^ $y ^ 0x5555);
583 580
584 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs); 581 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
… …
649 646
650sub update_board { 647sub update_board {
651 my ($self) = @_; 648 my ($self) = @_;
652 return unless $self->{path}; 649 return unless $self->{path};
653 650
651 #$self->{update_board_cb} ||= add Glib::Idle sub {
654 my $move = int $self->{moveadj}->get_value; 652 my $move = int $self->{moveadj}->get_value;
655 653
654 warn "update_board called $move\n";#d#
655
656 my $running = $move == @{$self->{path}}; 656 my $running = $move == @{$self->{path}};
657 657
658 $self->{board_label}->set_text ("Move $move"); 658 $self->{board_label}->set_text ("Move " . ($move - 1));
659 659
660 $self->{board} = new KGS::Game::Board $self->{size}; 660 $self->{board} = new KGS::Game::Board $self->{size};
661 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 661 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
662 662
663 $self->{userpanel}[WHITE]->set_state ($self->{board}{captures}[WHITE], 663 for my $colour (WHITE, BLACK) {
664 $self->{board}{timer}[WHITE], 664 $self->{userpanel}[$colour]->set_state (
665 $running && $self->{board}{last} == BLACK); 665 $self->{board}{captures}[$colour],
666 $self->{userpanel}[BLACK]->set_state ($self->{board}{captures}[BLACK], 666 $self->{board}{timer}[$colour],
667 $self->{board}{timer}[BLACK], 667 ($running && $self->{lastmove_colour} == !$colour)
668 $running && $self->{board}{last} == WHITE); 668 ? $self->{lastmove_time} : 0
669 );
670 }
669 671
670 $self->redraw ($self->repaint_board); 672 $self->redraw ($self->repaint_board);
673
674 # delete $self->{update_board_cb};
675 #}
671} 676}
672 677
673sub event_update_tree { 678sub event_update_tree {
674 my ($self) = @_; 679 my ($self) = @_;
675 680
676 $self->{path} = $self->get_path; 681 $self->{path} = $self->get_path;
677
678 $self->{userpanel}[WHITE]->set_rules ($self->{path}[0]); # should be onload only
679 $self->{userpanel}[BLACK]->set_rules ($self->{path}[0]); # should be onload only
680 682
681 if ($self->{moveadj}) { 683 if ($self->{moveadj}) {
682 my $upper = $self->{moveadj}->upper; 684 my $upper = $self->{moveadj}->upper;
683 my $pos = $self->{moveadj}->get_value; 685 my $pos = $self->{moveadj}->get_value;
686 my $move = scalar @{$self->{path}};
684 687
685 $self->{moveadj}->upper (scalar @{$self->{path}}); 688 $self->{moveadj}->upper ($move);
686 689
690 warn "UPDATE_TREE $pos,$upper";#d#
687 $self->{moveadj}->changed; 691 $self->{moveadj}->changed;
688 if ($pos == $upper) { 692 if ($pos == $upper) {
689 $self->{moveadj}->set_value (scalar @{$self->{path}}); 693 $self->{moveadj}->value ($move);
690 } else {
691 $self->{moveadj}->value_changed; 694 $self->{moveadj}->value_changed;
692 } 695 }
693 } 696 }
694} 697}
695 698
… …
697 my ($self, $node, $comment, $newnode) = @_; 700 my ($self, $node, $comment, $newnode) = @_;
698 $self->SUPER::event_update_comments($node, $comment, $newnode); 701 $self->SUPER::event_update_comments($node, $comment, $newnode);
699 702
700 my $text; 703 my $text;
701 704
702 $text .= "\n<header>Move <move>$node->{move}</move>, <header>Node <node>$node->{id}</node></header>" 705 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
703 if $newnode; 706 if $newnode;
704 707
705 for (split /\n/, $comment) { 708 for (split /\n/, $comment) {
706 $text .= "\n"; 709 $text .= "\n";
707 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { 710 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
708 $text .= "<user>" . (util::toxml $1) . "</user>:"; 711 $text .= "<user>" . (util::toxml $1) . "</user>:";
709 } 712 }
713
714 # coords only for 19x19 so far
715 $_ = util::toxml $_;
716 s{
717 (
718 \b
719 (?:[bw])?
720 [, ]{0,2}
721 [a-hj-t] # valid for upto 19x19
722 \s?
723 [1-9]?[0-9]
724 \b
725 )
726 }{
727 "<coord>$1</coord>";
728 }sgexi;
729
710 $text .= $_; 730 $text .= $_;
711 } 731 }
712 732
713 $self->{text}->append_text ($text); 733 $self->{text}->append_text ($text);
714} 734}
… …
729} 749}
730 750
731sub event_update_game { 751sub event_update_game {
732 my ($self) = @_; 752 my ($self) = @_;
733 $self->SUPER::event_update_game; 753 $self->SUPER::event_update_game;
734 warn "GAME UPDATE ".join (":", %$self); 754
735 warn "SAVED ".$self->is_saved; 755 $self->{user}[BLACK] = $self->{user1};
736 warn "SCORED ".$self->is_scored; 756 $self->{user}[WHITE] = $self->{user2};
737 warn "ADJ ".$self->is_adjourned; 757
738 warn "VALID ".$self->is_valid; 758 # show board
739 warn "MOVES ".$self->moves;
740 warn "TYPE ".$self->type;
741 759
742 $self->{left}->remove ($_) for $self->{left}->get_children; 760 $self->{left}->remove ($_) for $self->{left}->get_children;
743 if ($self->is_valid) { 761 if ($self->is_valid) {
744 $self->{left}->add ($self->{boardbox}); 762 $self->{left}->add ($self->{boardbox});
745 (delete $self->{challenge})->destroy if $self->{challenge}; 763 (delete $self->{challenge})->destroy if $self->{challenge};
746 } else { 764 } else {
747 $self->{left}->add ($self->{challenge}->widget); 765 $self->{left}->add ($self->{challenge}->widget);
748 } 766 }
749 $self->{left}->show_all; 767 $self->{left}->show_all;
768
769 # view text
770
771 $text = "\n<header>Game Update</header>";
772
773 $text .= "\nType: " . (util::toxml $gametype{$self->type})
774 . " (" . (util::toxml $gameopt{$self->option}) . ")";
775 $text .= "\nFlags:";
776 $text .= " valid" if $self->is_valid;
777 $text .= " adjourned" if $self->is_adjourned;
778 $text .= " scored" if $self->is_scored;
779 $text .= " saved" if $self->is_saved;
780
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;
784
785 if ($self->is_valid) {
786 $text .= "\nHandicap: " . $self->{handicap};
787 $text .= "\nKomi: " . $self->{komi};
788 $text .= "\nSize: " . $self->size_string;
789 }
790
791 if ($self->is_scored) {
792 $text .= "\nResult: " . $self->score_string;
793 }
794
795 $self->{text}->append_text ("<infoblock>$text</infoblock>");
796}
797
798sub event_update_rules {
799 my ($self, $rules) = @_;
800
801 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
802 for BLACK, WHITE;
803
804 my $text = "\n<header>Game Rules</header>";
805
806 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
807
808 $text .= "\nTime: ";
809
810 if ($rules->{timesys} == TIMESYS_NONE) {
811 $text .= "UNLIMITED";
812 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
813 $text .= util::format_time $rules->{time};
814 $text .= " ABS";
815 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
816 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
817 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
818 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
819 $text .= util::format_time $rules->{time};
820 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
821 }
822
823 $self->{text}->append_text ("<infoblock>$text</infoblock>");
824}
825
826sub inject_resign_game {
827 my ($self, $msg) = @_;
828
829 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
830 . "\n<user>"
831 . (util::toxml $self->{user}[$msg->{player}]->as_string)
832 . "</user> resigned.</infoblock>");
833}
834
835sub inject_final_result {
836 my ($self, $msg) = @_;
837
838 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
839 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
840 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
841 . "</infoblock>"
842 );
750} 843}
751 844
752sub destroy { 845sub destroy {
753 my ($self) = @_; 846 my ($self) = @_;
754 (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE]; 847 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
755 (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK]; 848 for BLACK, WHITE;
756 $self->SUPER::destroy; 849 $self->SUPER::destroy;
757 delete $appwin::gamelist->{game}{$self->{channel}}; 850 delete $appwin::gamelist->{game}{$self->{channel}};
758} 851}
759 852
7601; 8531;

Diff Legend

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