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.25 by pcg, Sun Jun 1 11:02:41 2003 UTC vs.
Revision 1.56 by pcg, Thu Jun 12 23:24:53 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]; 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]; 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 $self->{start} = $time->[0]; 87 # we ignore requests to re-set the time of a running clock.
88 # this is the easiest way to ensure that commentary etc.
89 # doesn't re-set the clock. yes, this is frickle design,
90 # but I think the protocol is to blame here, which gives
91 # very little time information. (cgoban2 also has had quite
92 # a lot of small time update problems...)
93 unless ($self->{timeout}) {
87 $self->{set}->($time->[1], $time->[2]); 94 $self->{set}->($time->[0], $time->[1]);
88 95 $self->refresh ($self->{start});
89 $self->refresh ($time->[0]); 96 }
90} 97}
91 98
92sub start { 99sub start {
93 my ($self) = @_; 100 my ($self, $when) = @_;
94 101
95 return if $self->{timeout}; 102 $self->stop;
103
104 $self->{start} = $when;
96 105
97 my $timeout; $timeout = sub { 106 my $timeout; $timeout = sub {
98 my $next = int ($self->refresh (Time::HiRes::time) * 1000); 107 my $next = $self->refresh (Time::HiRes::time) * 1000;
108 $next += 1000 if $next < 0;
99 $self->{timeout} = add Glib::Timeout $next, $timeout; 109 $self->{timeout} = add Glib::Timeout $next, $timeout;
100 0; 110 0;
101 }; 111 };
102 112
103 $timeout->(); 113 $timeout->();
121 131
122sub new { 132sub new {
123 my $class = shift; 133 my $class = shift;
124 my $self = $class->SUPER::new(@_); 134 my $self = $class->SUPER::new(@_);
125 135
126 $self->{widget} = new Gtk2::VBox; 136 $self->{widget} = new Gtk2::HBox;
127 137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox);
139
128 $self->{widget}->add ($self->{name} = new Gtk2::Label $self->{name}); 140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
129 $self->{widget}->add ($self->{info} = new Gtk2::Label ""); 141 $vbox->add ($self->{info} = new Gtk2::Label "");
130 $self->{widget}->add (($self->{clock} = new game::goclock)->widget); 142 $vbox->add (($self->{clock} = new game::goclock)->widget);
143
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
131 145
132 $self; 146 $self;
133} 147}
134 148
135sub set_rules { 149sub configure {
136 my ($self, $rules) = @_; 150 my ($self, $user, $rules) = @_;
137 151
138 $self->{name}->set_text ($rules->{player}[$self->{colour}]); 152 if ($self->{name}->get_text ne $user->as_string) {
153 $self->{name}->set_text ($user->as_string);
154
155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156 $self->{imagebox}->add (gtk::image_from_data undef);
157 $self->{imagebox}->show_all;
158
159 if ($user->has_pic) {
160 # the big picture...
161 appwin::userpic ($user->{name}, sub {
162 return unless $self->{imagebox};
163 if ($_[0]) {
164 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
165 $self->{imagebox}->add (gtk::image_from_data $_[0]);
166 $self->{imagebox}->show_all;
167 }
168 });
169 }
170 }
171
139 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)}); 172 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
140} 173}
141 174
142sub set_state { 175sub set_state {
143 my ($self, $captures, $timer, $running) = @_; 176 my ($self, $captures, $timer, $when) = @_;
144 177
178 $self->{clock}->stop unless $when;
145 $self->{clock}->set_time ($timer); 179 $self->{clock}->set_time ($timer);
146 $running ? $self->{clock}->start : $self->{clock}->stop; 180 $self->{clock}->start ($when) if $when;
181
147 $self->{info}->set_text ("$captures pris."); 182 $self->{info}->set_text ("$captures pris.");
148} 183}
149 184
150package game; 185package game;
151 186
164 $self = $self->SUPER::new(@_); 199 $self = $self->SUPER::new(@_);
165 200
166 $self->listen($self->{conn}); 201 $self->listen($self->{conn});
167 202
168 $self->{window} = new Gtk2::Window 'toplevel'; 203 $self->{window} = new Gtk2::Window 'toplevel';
169 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
170 $self->{window}->set_title("KGS Game $title");
171 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
172 205
173 $self->{window}->signal_connect(delete_event => sub { 206 $self->{window}->signal_connect(delete_event => sub {
174 $self->part; 207 $self->part;
175 $self->destroy; 208 $self->destroy;
177 }); 210 });
178 211
179 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
180 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
181 214
215 # LEFT PANE
216
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
218
219 $self->{boardbox} = new Gtk2::VBox;
220
182 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
183 222
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas)
228
184 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
185 230
186 { 231 {
187 # grrr...
188 $frame->add(my $vbox = new Gtk2::VBox); 232 $frame->add(my $vbox = new Gtk2::VBox);
189 $vbox->add($self->{title} = new Gtk2::Label $title); 233 $vbox->add($self->{title} = new Gtk2::Label $title);
190 234
191 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0; 235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0;
192 236
193 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
194 $scale->set_draw_value (0); 238 $scale->set_draw_value (0);
239 $scale->set_digits (0);
195 240
196 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); 241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
197 } 242 }
198 243
199 $vbox->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);
200 $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);
201 $self->{board_label} = $aspect_frame->get_label_widget; 246 $self->{board_label} = $aspect_frame->get_label_widget;
202 247
203 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea); 248 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
204 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory}; 249 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
206 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
207 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
208 253
209 # RIGHT PANE 254 # RIGHT PANE
210 255
211 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
212 $self->{hpane}->set(position_set => 1); 257 $self->{hpane}->set(position_set => 1);
213 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
214 259
215 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
216 $sw->set_policy("automatic", "always"); 261 $sw->set_policy("automatic", "always");
218 $sw->add(($self->{userlist} = new userlist)->widget); 263 $sw->add(($self->{userlist} = new userlist)->widget);
219 264
220 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
221 266
222 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); 267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
223 $hbox->add (($self->{user0} = new game::userpanel colour => WHITE)->widget); 268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
224 $hbox->add (($self->{user1} = new game::userpanel colour => BLACK)->widget); 269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
225 270
226 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
227 $sw->set_policy("never", "always");
228
229 $sw->add(($self->{text} = new gtk::text)->widget); 271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
230 272
231 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
232 $self->{entry}->signal_connect(activate => sub { 274 $self->{entry}->signal_connect(activate => sub {
233 my $text = $self->{entry}->get_text; 275 my $text = $self->{entry}->get_text;
234 $self->say($text) if $text =~ /\S/; 276 $self->say($text) if $text =~ /\S/;
235 $self->{entry}->set_text(""); 277 $self->{entry}->set_text("");
236 }); 278 });
237 279
280 $self->event_update_game;
238 $self; 281 $self;
239} 282}
240 283
241sub event_update_users { 284sub event_update_users {
242 my ($self, $add, $update, $remove) = @_; 285 my ($self, $add, $update, $remove) = @_;
322 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 365 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
323 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 366 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
324 367
325 # zeroeth the shadow 368 # zeroeth the shadow
326 if ($mark & (MARK_B | MARK_W)) { 369 if ($mark & (MARK_B | MARK_W)) {
370 # the -0.5's are a mystery to me
327 $::shadow_img->composite ( 371 $::shadow_img->composite (
328 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5, 372 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
329 $size / $stone->get_width, $size / $stone->get_height, 373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
330 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
331 ); 375 );
332 } 376 }
333 377
334 # first the big stones (handicap stones different for effect) 378 # first the big stones (handicap stones could be different)
335 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
336 [MARK_W, $mark & MARK_MOVE ? 255 : 192], 380 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
337 [MARK_GRAY_B, 128], 381 [MARK_GRAY_B, 128],
338 [MARK_GRAY_W, 128]) { 382 [MARK_GRAY_W, 128]) {
339 my ($mask, $alpha) = @$_; 383 my ($mask, $alpha) = @$_;
340 if ($mark & $mask) { 384 if ($mark & $mask) {
341 $stone->composite ( 385 $stone->composite (
350 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 394 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
351 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 395 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
352 my ($mask, $img) = @$_; 396 my ($mask, $img) = @$_;
353 if ($mark & $mask) { 397 if ($mark & $mask) {
354 $img->composite ( 398 $img->composite (
355 $base, (ceil ($size / 4)) x2, (ceil ($size / 2)) x2, (ceil ($size / 4)) x2, 399 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
356 $size / $img->get_width / 2, $size / $img->get_height / 2, 400 $size / $img->get_width / 2, $size / $img->get_height / 2,
357 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224 401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
358 ); 402 );
359 } 403 }
360 } 404 }
366 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 410 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
367 [MARK_SQUARE, $::square_img[$dark_bg]]) { 411 [MARK_SQUARE, $::square_img[$dark_bg]]) {
368 my ($mask, $img) = @$_; 412 my ($mask, $img) = @$_;
369 if ($mark & $mask) { 413 if ($mark & $mask) {
370 $img->composite ( 414 $img->composite (
371 $base, 0, 0, $size, $size, -0.5, -0.5, 415 $base, 0, 0, $size, $size, 0, 0,
372 $size / $img->get_width, $size / $img->get_height, 416 $size / $img->get_width, $size / $img->get_height,
373 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 417 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
374 ); 418 );
375 } 419 }
376 } 420 }
377 421
378 push @$$c, $base; 422 push @$$c, $base;
464 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 508 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
465 } else { 509 } else {
466 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 510 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
467 } 511 }
468 512
469 my $linew = int ($s / 25 / $size); 513 my $linew = int ($s / 40 / $size);
470 514
471 # ornamental border... we have time to waste :/ 515 # ornamental border... we have time to waste :/
472 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; 516 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
473 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; 517 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
474 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; 518 pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
475 pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255; 519 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
476 520
477 for my $i (1 .. $size) { 521 for my $i (1 .. $size) {
478 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 522 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
479 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; 523 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
480 524
489 533
490 $a++; 534 $a++;
491 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 535 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
492 } 536 }
493 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
494 unless ($::config->{conserve_memory} > 1) { 569 unless ($::config->{conserve_memory} > 1) {
495 $self->{background} = $pixbuf; 570 $self->{background} = $pixbuf;
496 $pixbuf = $pixbuf->copy; 571 $pixbuf = $pixbuf->copy;
497 } 572 }
498 } 573 }
499 574
500 $self->{pixbuf} = $pixbuf; 575 $self->{pixbuf} = $pixbuf;
501
502 # hoshi-points(!)#d#
503 # caching of empty board gfx(!)#d#
504 576
505 for my $x (1 .. $size) { 577 for my $x (1 .. $size) {
506 for my $y (1 .. $size) { 578 for my $y (1 .. $size) {
507 my $rand = ($x ^ $y ^ 0x5555); 579 my $rand = ($x ^ $y ^ 0x5555);
508 580
545 } 617 }
546 pixbuf_text $pixbuf, $white, 618 pixbuf_text $pixbuf, $white,
547 $k[$x], $k[$y], $ofs * 0.7, 619 $k[$x], $k[$y], $ofs * 0.7,
548 $self->{board}{label}[$x-1][$y-1]; 620 $self->{board}{label}[$x-1][$y-1];
549 } 621 }
550
551 # old pixmap&mask-way. that was fast ;(
552 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
553
554 #$gc->set_clip_mask ($bm);
555 #$gc->set_clip_origin ($dx, $dy);
556 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
557 } 622 }
558 } 623 }
559 } 624 }
560 625
561 $self->{board_shown} = Storable::dclone $self->{board}; 626 $self->{board_shown} = Storable::dclone $self->{board};
581 646
582sub update_board { 647sub update_board {
583 my ($self) = @_; 648 my ($self) = @_;
584 return unless $self->{path}; 649 return unless $self->{path};
585 650
586 $self->{NOW} = Time::HiRes::time; #d# get from msg(!) 651 #$self->{update_board_cb} ||= add Glib::Idle sub {
587
588 my $move = int (@{$self->{path}} * $self->{moveadj}->get_value); 652 my $move = int $self->{moveadj}->get_value;
589 653
590 my $running = $move == @{$self->{path}}; 654 my $running = $move == @{$self->{path}};
591 655
592 $self->{board_label}->set_text ("Move $move"); 656 $self->{board_label}->set_text ("Move " . ($move - 1));
593 657
594 $self->{board} = new KGS::Game::Board $self->{size}; 658 $self->{board} = new KGS::Game::Board $self->{size};
595 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 659 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
596 660
597 $self->{user0}->set_state ($self->{board}{captures}[0], 661 for my $colour (WHITE, BLACK) {
598 $self->{board}{timer}[0], 662 $self->{userpanel}[$colour]->set_state (
599 $running && $self->{board}{last} == WHITE); 663 $self->{board}{captures}[$colour],
600 $self->{user1}->set_state ($self->{board}{captures}[1], 664 $self->{board}{timer}[$colour],
601 $self->{board}{timer}[1], 665 ($running && $self->{lastmove_colour} == !$colour)
602 $running && $self->{board}{last} == BLACK); 666 ? $self->{lastmove_time} : 0
667 );
668 }
603 669
604 $self->redraw ($self->repaint_board); 670 $self->redraw ($self->repaint_board);
605 671
606 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment}); 672 # delete $self->{update_board_cb};
673 #}
607} 674}
608 675
609sub event_update_tree { 676sub event_update_tree {
610 my ($self) = @_; 677 my ($self) = @_;
611 678
612 $self->{path} = $self->get_path; 679 $self->{path} = $self->get_path;
613 $self->{user0}->set_rules ($self->{path}[0]);
614 $self->{user1}->set_rules ($self->{path}[0]);
615 680
616 $self->{moveadj}->value_changed if $self->{moveadj}; 681 if ($self->{moveadj}) {
682 my $upper = $self->{moveadj}->upper;
683 my $pos = $self->{moveadj}->get_value;
684 my $move = scalar @{$self->{path}};
685
686 $self->{moveadj}->upper ($move);
687
688 $self->{moveadj}->changed;
689 if ($pos == $upper) {
690 $self->{moveadj}->value ($move);
691 $self->{moveadj}->value_changed;
692 }
693 }
694}
695
696sub event_update_comments {
697 my ($self, $node, $comment, $newnode) = @_;
698 $self->SUPER::event_update_comments($node, $comment, $newnode);
699
700 my $text;
701
702 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
703 if $newnode;
704
705 for (split /\n/, $comment) {
706 $text .= "\n";
707 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
708 $text .= "<user>" . (util::toxml $1) . "</user>:";
709 }
710
711 # coords only for 19x19 so far
712 $_ = util::toxml $_;
713 s{
714 (
715 \b
716 (?:[bw])?
717 [, ]{0,2}
718 [a-hj-t] # valid for upto 19x19
719 \s?
720 [1-9]?[0-9]
721 \b
722 )
723 }{
724 "<coord>$1</coord>";
725 }sgexi;
726
727 $text .= $_;
728 }
729
730 $self->{text}->append_text ($text);
731}
732
733sub event_join {
734 my ($self) = @_;
735 $self->SUPER::event_join;
617} 736}
618 737
619sub event_part { 738sub event_part {
620 my ($self) = @_; 739 my ($self) = @_;
621 $self->SUPER::event_part; 740 $self->SUPER::event_part;
741 $self->destroy;
622} 742}
623 743
624sub event_move { 744sub event_move {
625 my ($self, $pass) = @_; 745 my ($self, $pass) = @_;
626 sound::play 1, $pass ? "pass" : "move"; 746 sound::play 1, $pass ? "pass" : "move";
627} 747}
628 748
629sub event_update_game { 749sub event_update_game {
630 my ($self) = @_; 750 my ($self) = @_;
631 $self->SUPER::event_update_game; 751 $self->SUPER::event_update_game;
632 warn "UPDATE GAME";#d# 752
753 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window";
754 $self->{window}->set_title("KGS Game $title");
755 $self->{title}->set_text ($title);
756
757 $self->{user}[BLACK] = $self->{user1};
758 $self->{user}[WHITE] = $self->{user2};
759
760 # show board
761
762 $self->{left}->remove ($_) for $self->{left}->get_children;
763 if ($self->is_valid) {
764 $self->{left}->add ($self->{boardbox});
765 (delete $self->{challenge})->destroy if $self->{challenge};
766 } else {
767 $self->{left}->add ($self->{challenge}->widget);
768 }
769 $self->{left}->show_all;
770
771 # view text
772
773 my @ga;
774 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
775 . " (" . (util::toxml $gameopt{$self->option}) . ")";
776 $ga[1] = "\nFlags:";
777 $ga[1] .= " valid" if $self->is_valid;
778 $ga[1] .= " adjourned" if $self->is_adjourned;
779 $ga[1] .= " scored" if $self->is_scored;
780 $ga[1] .= " saved" if $self->is_saved;
781
782 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
783
784 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
785 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
786 if $self->is_valid;
787
788 if ($self->is_valid) {
789 $ga[4] = "\nHandicap: " . $self->{handicap};
790 $ga[5] = "\nKomi: " . $self->{komi};
791 $ga[6] = "\nSize: " . $self->size_string;
792 }
793
794 if ($self->is_scored) {
795 $ga[7] = "\nResult: " . $self->score_string;
796 }
797
798 $text = "\n<infoblock><header>Game Update</header>";
799 for (0..7) {
800 if ($self->{gatext}[$_] ne $ga[$_]) {
801 $text .= $ga[$_];
802 }
803 }
804 $text .= "</infoblock>";
805
806 $self->{gatext} = \@ga;
807
808 $self->{text}->append_text ($text);
809}
810
811sub event_update_rules {
812 my ($self, $rules) = @_;
813
814 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
815 for BLACK, WHITE;
816
817 sound::play 3, "gamestart";
818
819 my $text = "\n<header>Game Rules</header>";
820
821 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
822
823 $text .= "\nTime: ";
824
825 if ($rules->{timesys} == TIMESYS_NONE) {
826 $text .= "UNLIMITED";
827 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
828 $text .= util::format_time $rules->{time};
829 $text .= " ABS";
830 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
831 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
832 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
833 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
834 $text .= util::format_time $rules->{time};
835 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
836 }
837
838 $self->{text}->append_text ("<infoblock>$text</infoblock>");
839}
840
841sub inject_resign_game {
842 my ($self, $msg) = @_;
843
844 sound::play 3, "resign";
845
846 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
847 . "\n<user>"
848 . (util::toxml $self->{user}[$msg->{player}]->as_string)
849 . "</user> resigned.</infoblock>");
850}
851
852sub inject_final_result {
853 my ($self, $msg) = @_;
854
855 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
856 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
857 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
858 . "</infoblock>"
859 );
633} 860}
634 861
635sub destroy { 862sub destroy {
636 my ($self) = @_; 863 my ($self) = @_;
864 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
865 for BLACK, WHITE;
637 $self->SUPER::destroy; 866 $self->SUPER::destroy;
638 delete $appwin::gamelist->{game}{$self->{channel}}; 867 delete $appwin::gamelist->{game}{$self->{channel}};
639} 868}
640 869
6411; 8701;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines