|
|
1 | use utf8; |
|
|
2 | |
1 | package game::goclock; |
3 | package game::goclock; |
|
|
4 | |
|
|
5 | # Lo and Behold! I admit it! The rounding stuff etc.. in goclock |
|
|
6 | # is completely borked. |
2 | |
7 | |
3 | use Time::HiRes (); |
8 | use Time::HiRes (); |
4 | |
9 | |
5 | use KGS::Constants; |
10 | use KGS::Constants; |
6 | |
11 | |
… | |
… | |
16 | $self->{format} = sub { "ERROR" }; |
21 | $self->{format} = sub { "ERROR" }; |
17 | |
22 | |
18 | $self; |
23 | $self; |
19 | } |
24 | } |
20 | |
25 | |
21 | sub format_time($) { |
26 | sub configure { |
22 | my ($time) = @_; |
|
|
23 | |
|
|
24 | $time > 60*60 |
|
|
25 | ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60 |
|
|
26 | : sprintf "%d:%02d", $time / 60 % 60, $time % 60; |
|
|
27 | } |
|
|
28 | |
|
|
29 | sub set_rules { |
|
|
30 | my ($self, $timesys, $main, $interval, $count) = @_; |
27 | my ($self, $timesys, $main, $interval, $count) = @_; |
31 | |
28 | |
32 | if ($timesys == TIMESYS_ABSOLUTE) { |
29 | if ($timesys == TIMESYS_ABSOLUTE) { |
33 | $self->{set} = sub { $self->{time} = $_[0] }; |
30 | $self->{set} = sub { $self->{time} = $_[0] }; |
34 | $self->{format} = sub { format_time $_[0] }; |
31 | $self->{format} = sub { util::format_time $_[0] }; |
35 | |
32 | |
36 | } elsif ($timesys == TIMESYS_BYO_YOMI) { |
33 | } elsif ($timesys == TIMESYS_BYO_YOMI) { |
37 | my $low = $interval * $count; |
34 | my $low = $interval * $count; |
38 | |
35 | |
39 | $self->{set} = sub { $self->{time} = $_[0] }; |
36 | $self->{set} = sub { $self->{time} = $_[0] }; |
40 | |
37 | |
41 | $self->{format} = sub { |
38 | $self->{format} = sub { |
42 | if ($_[0] > $low) { |
39 | if ($_[0] > $low) { |
43 | format_time $_[0] - $low; |
40 | util::format_time $_[0] - $low; |
44 | } else { |
41 | } else { |
45 | sprintf "%s (%d)", |
42 | sprintf "%s (%d)", |
46 | format_time int ($_[0] % $interval) || $interval, |
43 | util::format_time int (($_[0] - 1) % $interval + 1), |
47 | $_[0] / $interval; |
44 | ($_[0] - 1) / $interval; |
48 | } |
45 | } |
49 | }; |
46 | }; |
50 | |
47 | |
51 | } elsif ($timesys == TIMESYS_CANADIAN) { |
48 | } elsif ($timesys == TIMESYS_CANADIAN) { |
52 | $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; |
49 | $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; |
53 | |
50 | |
54 | $self->{format} = sub { |
51 | $self->{format} = sub { |
55 | if (!$self->{moves}) { |
52 | if (!$self->{moves}) { |
56 | format_time $_[0] - $low; |
53 | util::format_time $_[0] - $low; |
57 | } else { |
54 | } else { |
58 | my $time = int($_[0] % $interval) || $interval; |
55 | my $time = int (($_[0] - 1) % $interval + 1); |
|
|
56 | |
59 | sprintf "%s/%d {%d}", |
57 | sprintf "%s/%d =%d", |
60 | format_time $time, |
58 | util::format_time $time, |
61 | $self->{moves}, |
59 | $self->{moves}, |
62 | int ($time / ($self->{moves} || 1)); |
60 | $time / ($self->{moves} || 1); |
63 | |
61 | |
64 | } |
62 | } |
65 | }; |
63 | }; |
66 | |
64 | |
67 | } else { |
65 | } else { |
… | |
… | |
72 | } |
70 | } |
73 | |
71 | |
74 | sub refresh { |
72 | sub refresh { |
75 | my ($self, $timestamp) = @_; |
73 | my ($self, $timestamp) = @_; |
76 | 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)); |
77 | $self->{widget}->set_text ($self->{format}->($timer)); |
79 | $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); |
78 | |
80 | |
79 | $timer - int $timer; |
81 | $timer - int $timer; |
80 | } |
82 | } |
81 | |
83 | |
82 | sub set_time { |
84 | sub set_time { |
83 | my ($self, $time) = @_; |
85 | my ($self, $time) = @_; |
84 | |
86 | |
85 | # 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. |
86 | # this is the easiest way to ensure that commentary etc. |
88 | # this is the easiest way to ensure that commentary etc. |
87 | # doesn't re-set the clock. yes, this is frickle design, |
89 | # doesn't re-set the clock. yes, this is frickle design, |
88 | # but I think the protoocl is to blame here, which gives |
90 | # but I think the protocol is to blame here, which gives |
89 | # very little time information. (cgoban2 also has had quite |
91 | # very little time information. (cgoban2 also has had quite |
90 | # a lot of small time update problems...) |
92 | # a lot of small time update problems...) |
91 | unless ($self->{timeout}) { |
93 | unless ($self->{timeout}) { |
92 | $self->{set}->($time->[0], $time->[1]); |
94 | $self->{set}->($time->[0], $time->[1]); |
93 | $self->refresh ($self->{start}); |
95 | $self->refresh ($self->{start}); |
94 | } |
96 | } |
95 | } |
97 | } |
96 | |
98 | |
97 | sub start { |
99 | sub start { |
98 | my ($self) = @_; |
100 | my ($self, $when) = @_; |
99 | |
101 | |
100 | return if $self->{timeout}; |
102 | $self->stop; |
101 | |
103 | |
102 | # this is correct, since we assume the last message triggered a start |
104 | $self->{start} = $when; |
103 | $self->{start} = $KGS::Protocol::NOW; |
|
|
104 | |
105 | |
105 | my $timeout; $timeout = sub { |
106 | my $timeout; $timeout = sub { |
106 | # -100 means we run the timer a bit earlier to avoid 10.99 => 10s roundings. |
|
|
107 | # we "could" cheat by precalculating the time, but I feel uneasy about both |
|
|
108 | # ways to cheat. |
|
|
109 | my $next = int ($self->refresh (Time::HiRes::time) * 1000) - 100; |
107 | my $next = $self->refresh (Time::HiRes::time) * 1000; |
110 | $next += 1000 if $next < 0; |
108 | $next += 1000 if $next < 0; |
111 | $self->{timeout} = add Glib::Timeout $next, $timeout; |
109 | $self->{timeout} = add Glib::Timeout $next, $timeout; |
112 | 0; |
110 | 0; |
113 | }; |
111 | }; |
114 | |
112 | |
… | |
… | |
146 | $vbox->add ($self->{imagebox} = new Gtk2::VBox); |
144 | $vbox->add ($self->{imagebox} = new Gtk2::VBox); |
147 | |
145 | |
148 | $self; |
146 | $self; |
149 | } |
147 | } |
150 | |
148 | |
151 | sub set_rules { |
149 | sub configure { |
152 | my ($self, $rules) = @_; |
150 | my ($self, $user, $rules) = @_; |
153 | |
151 | |
154 | if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) { |
152 | if ($self->{name}->get_text ne $user->as_string) { |
155 | $self->{name}->set_text ($rules->{player}[$self->{colour}]); |
153 | $self->{name}->set_text ($user->as_string); |
156 | |
154 | |
157 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
155 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
158 | $self->{imagebox}->add (gtk::image_from_data undef); |
156 | $self->{imagebox}->add (gtk::image_from_data undef); |
159 | $self->{imagebox}->show_all; |
157 | $self->{imagebox}->show_all; |
160 | |
158 | |
|
|
159 | if ($user->has_pic) { |
161 | # the big picture... |
160 | # the big picture... |
162 | appwin::userpic ($rules->{player}[$self->{colour}], sub { |
161 | appwin::userpic ($user->{name}, sub { |
163 | return unless $self->{imagebox}; |
162 | return unless $self->{imagebox}; |
164 | if ($_[0]) { |
163 | if ($_[0]) { |
165 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
164 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
166 | $self->{imagebox}->add (gtk::image_from_data $_[0]); |
165 | $self->{imagebox}->add (gtk::image_from_data $_[0]); |
167 | $self->{imagebox}->show_all; |
166 | $self->{imagebox}->show_all; |
|
|
167 | } |
168 | } |
168 | }); |
169 | }); |
169 | } |
170 | } |
|
|
171 | |
170 | } |
|
|
171 | |
172 | $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)}); |
172 | $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); |
173 | } |
173 | } |
174 | |
174 | |
175 | sub set_state { |
175 | sub set_state { |
176 | my ($self, $captures, $timer, $running) = @_; |
176 | my ($self, $captures, $timer, $when) = @_; |
177 | |
177 | |
178 | $self->{clock}->stop unless $running; |
178 | $self->{clock}->stop unless $when; |
179 | $self->{clock}->set_time ($timer); |
179 | $self->{clock}->set_time ($timer); |
180 | $self->{clock}->start if $running; |
180 | $self->{clock}->start ($when) if $when; |
181 | |
181 | |
182 | $self->{info}->set_text ("$captures pris."); |
182 | $self->{info}->set_text ("$captures pris."); |
183 | } |
183 | } |
184 | |
184 | |
185 | package game; |
185 | package game; |
… | |
… | |
199 | $self = $self->SUPER::new(@_); |
199 | $self = $self->SUPER::new(@_); |
200 | |
200 | |
201 | $self->listen($self->{conn}); |
201 | $self->listen($self->{conn}); |
202 | |
202 | |
203 | $self->{window} = new Gtk2::Window 'toplevel'; |
203 | $self->{window} = new Gtk2::Window 'toplevel'; |
204 | my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window"; |
|
|
205 | $self->{window}->set_title("KGS Game $title"); |
|
|
206 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
204 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
207 | |
205 | |
208 | $self->{window}->signal_connect(delete_event => sub { |
206 | $self->{window}->signal_connect(delete_event => sub { |
209 | $self->part; |
207 | $self->part; |
210 | $self->destroy; |
208 | $self->destroy; |
… | |
… | |
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, 5, 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 | |
… | |
… | |
243 | |
243 | |
244 | $self->{boardbox}->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); |
245 | $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); |
246 | $self->{board_label} = $aspect_frame->get_label_widget; |
246 | $self->{board_label} = $aspect_frame->get_label_widget; |
247 | |
247 | |
248 | $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea); |
248 | $aspect_frame->add($self->{board} = new Gtk2::GoBoard size => $self->{size}); |
249 | $self->{canvas}->double_buffered (0) if $::config->{conserve_memory}; |
|
|
250 | |
|
|
251 | $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); |
|
|
252 | $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); |
|
|
253 | |
249 | |
254 | # RIGHT PANE |
250 | # RIGHT PANE |
255 | |
251 | |
256 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); |
252 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); |
257 | $self->{hpane}->set(position_set => 1); |
253 | $self->{hpane}->set(position_set => 1); |
258 | gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; |
254 | gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; |
259 | |
255 | |
260 | $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); |
256 | $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); |
261 | $sw->set_policy("automatic", "always"); |
257 | $sw->set_policy("automatic", "always"); |
… | |
… | |
283 | |
279 | |
284 | sub event_update_users { |
280 | sub event_update_users { |
285 | my ($self, $add, $update, $remove) = @_; |
281 | my ($self, $add, $update, $remove) = @_; |
286 | |
282 | |
287 | $self->{userlist}->update ($add, $update, $remove); |
283 | $self->{userlist}->update ($add, $update, $remove); |
|
|
284 | |
|
|
285 | my %important; |
|
|
286 | $important{$self->{user1}{name}}++; |
|
|
287 | $important{$self->{user2}{name}}++; |
|
|
288 | $important{$self->{user3}{name}}++; |
|
|
289 | |
|
|
290 | if (my @users = grep $important{$_->{name}}, @$add) { |
|
|
291 | $self->{text}->append_text ("\n<header>Joins:</header>"); |
|
|
292 | $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
|
|
293 | } |
|
|
294 | if (my @users = grep $important{$_->{name}}, @$remove) { |
|
|
295 | $self->{text}->append_text ("\n<header>Parts:</header>"); |
|
|
296 | $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
|
|
297 | } |
|
|
298 | |
288 | } |
299 | } |
289 | |
300 | |
290 | sub join { |
301 | sub join { |
291 | my ($self) = @_; |
302 | my ($self) = @_; |
292 | return if $self->{joined}; |
303 | return if $self->{joined}; |
… | |
… | |
301 | |
312 | |
302 | $self->SUPER::part; |
313 | $self->SUPER::part; |
303 | $self->destroy; |
314 | $self->destroy; |
304 | } |
315 | } |
305 | |
316 | |
306 | sub configure_event { |
|
|
307 | my ($widget, $event, $self) = @_; |
|
|
308 | delete $self->{stack}; |
|
|
309 | delete $self->{pixbuf}; |
|
|
310 | delete $self->{board_shown}; |
|
|
311 | delete $self->{background}; |
|
|
312 | $self->repaint_board; |
|
|
313 | 0; |
|
|
314 | } |
|
|
315 | |
|
|
316 | sub expose_event { |
|
|
317 | my ($widget, $event, $self) = @_; |
|
|
318 | |
|
|
319 | $self->{pixbuf} or return; |
|
|
320 | |
|
|
321 | my $area = $event->area; |
|
|
322 | |
|
|
323 | $self->redraw ($area); |
|
|
324 | |
|
|
325 | 0; |
|
|
326 | } |
|
|
327 | |
|
|
328 | # something Gtk2 fixed |
|
|
329 | sub INTERP_NEAREST (){ 'nearest' } |
|
|
330 | sub INTERP_TILES (){ 'tiles' } |
|
|
331 | sub INTERP_BILINEAR (){ 'bilinear' } |
|
|
332 | sub INTERP_HYPER (){ 'hyper' } |
|
|
333 | |
|
|
334 | sub new_pixbuf { |
|
|
335 | my ($w, $h, $alpha, $fill) = @_; |
|
|
336 | |
|
|
337 | my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h; |
|
|
338 | $pixbuf->fill ($fill) if defined $fill; |
|
|
339 | |
|
|
340 | $pixbuf; |
|
|
341 | } |
|
|
342 | |
|
|
343 | sub scale_pixbuf { |
|
|
344 | my ($src, $w, $h, $mode) = @_; |
|
|
345 | |
|
|
346 | my $dst = new_pixbuf $w, $h, 1; |
|
|
347 | |
|
|
348 | $src->scale( |
|
|
349 | $dst, 0, 0, $w, $h, 0, 0, |
|
|
350 | $w / $src->get_width, $h / $src->get_height, |
|
|
351 | $mode, |
|
|
352 | ); |
|
|
353 | |
|
|
354 | $dst; |
|
|
355 | } |
|
|
356 | |
|
|
357 | # create a stack of stones |
|
|
358 | sub create_stack { |
|
|
359 | my ($self, $mark, $size, $rand) = @_; |
|
|
360 | |
|
|
361 | my $shadow = $size * 0.05; |
|
|
362 | |
|
|
363 | my $c = \$self->{stack}{$mark}; |
|
|
364 | unless ($$c) { |
|
|
365 | for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { |
|
|
366 | my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; |
|
|
367 | |
|
|
368 | # zeroeth the shadow |
|
|
369 | if ($mark & (MARK_B | MARK_W)) { |
|
|
370 | # the -0.5's are a mystery to me |
|
|
371 | $::shadow_img->composite ( |
|
|
372 | $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5, |
|
|
373 | $size / $::shadow_img->get_width, $size / $::shadow_img->get_height, |
|
|
374 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 |
|
|
375 | ); |
|
|
376 | } |
|
|
377 | |
|
|
378 | # first the big stones (handicap stones different for effect) |
|
|
379 | for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], |
|
|
380 | [MARK_W, $mark & MARK_MOVE ? 255 : 192], |
|
|
381 | [MARK_GRAY_B, 128], |
|
|
382 | [MARK_GRAY_W, 128]) { |
|
|
383 | my ($mask, $alpha) = @$_; |
|
|
384 | if ($mark & $mask) { |
|
|
385 | $stone->composite ( |
|
|
386 | $base, 0, 0, $size, $size, 0, 0, |
|
|
387 | $size / $stone->get_width, $size / $stone->get_height, |
|
|
388 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha |
|
|
389 | ); |
|
|
390 | } |
|
|
391 | } |
|
|
392 | |
|
|
393 | # then the small stones |
|
|
394 | for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], |
|
|
395 | [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { |
|
|
396 | my ($mask, $img) = @$_; |
|
|
397 | if ($mark & $mask) { |
|
|
398 | $img->composite ( |
|
|
399 | $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2, |
|
|
400 | $size / $img->get_width / 2, $size / $img->get_height / 2, |
|
|
401 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224 |
|
|
402 | ); |
|
|
403 | } |
|
|
404 | } |
|
|
405 | |
|
|
406 | # and lastly any markers |
|
|
407 | my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B)); |
|
|
408 | |
|
|
409 | for ([MARK_CIRCLE, $::circle_img[$dark_bg]], |
|
|
410 | [MARK_TRIANGLE, $::triangle_img[$dark_bg]], |
|
|
411 | [MARK_SQUARE, $::square_img[$dark_bg]]) { |
|
|
412 | my ($mask, $img) = @$_; |
|
|
413 | if ($mark & $mask) { |
|
|
414 | $img->composite ( |
|
|
415 | $base, 0, 0, $size, $size, 0, 0, |
|
|
416 | $size / $img->get_width, $size / $img->get_height, |
|
|
417 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 |
|
|
418 | ); |
|
|
419 | } |
|
|
420 | } |
|
|
421 | |
|
|
422 | push @$$c, $base; |
|
|
423 | } |
|
|
424 | } |
|
|
425 | |
|
|
426 | $$c->[$rand % @$$c]; |
|
|
427 | } |
|
|
428 | |
|
|
429 | sub pixbuf_text { |
|
|
430 | my ($pixbuf, $colour, $x, $y, $height, $text) = @_; |
|
|
431 | |
|
|
432 | my @c = grep $_, |
|
|
433 | map $::font[$colour][$::fontmap{$_}], |
|
|
434 | split //, $text; |
|
|
435 | |
|
|
436 | if (@c) { |
|
|
437 | my $spacing = $height * 0.1; |
|
|
438 | my $s = $height / List::Util::max map $_->get_height, @c; |
|
|
439 | my $W = List::Util::sum map $_->get_width, @c; |
|
|
440 | |
|
|
441 | $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; |
|
|
442 | $y -= $height * 0.5; |
|
|
443 | |
|
|
444 | for (@c) { |
|
|
445 | my $w = $_->get_width * $s; |
|
|
446 | # +2 == don't fight the rounding |
|
|
447 | $_->composite ($pixbuf, |
|
|
448 | $x, $y, $w+2, $height+2, $x, $y, $s, $s, |
|
|
449 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); |
|
|
450 | |
|
|
451 | $x += $w + $spacing; |
|
|
452 | } |
|
|
453 | } |
|
|
454 | } |
|
|
455 | |
|
|
456 | sub pixbuf_rect { |
|
|
457 | my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_; |
|
|
458 | # we fake lines by... a horrible method :/ |
|
|
459 | my $colour_pb = new_pixbuf 1, 1, 0, $colour; |
|
|
460 | $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1, |
|
|
461 | INTERP_NEAREST, $alpha); |
|
|
462 | } |
|
|
463 | |
|
|
464 | sub repaint_board { |
|
|
465 | my ($self) = @_; |
|
|
466 | my $canvas = $self->{canvas}; |
|
|
467 | my $expose_area = undef; |
|
|
468 | |
|
|
469 | return $expose_area unless $self->{board}; |
|
|
470 | |
|
|
471 | my ($w, $h) = ($canvas->allocation->values)[2,3]; |
|
|
472 | |
|
|
473 | die "FATAL: board aspect ratio != 1" unless $w == $h; |
|
|
474 | |
|
|
475 | my $s = $w; |
|
|
476 | |
|
|
477 | return unless $s >= 200; |
|
|
478 | |
|
|
479 | my $size = $self->{size}; |
|
|
480 | |
|
|
481 | # we leave enough space for the shadows.. I like smaller stones, and we |
|
|
482 | # do no need to do the nifty recursive screen updates that goban2 does |
|
|
483 | my $border = int ($s / ($size + 3) * 0.5); |
|
|
484 | my $s2 = $s - $border * 2; |
|
|
485 | my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0); |
|
|
486 | my $ofs = int ($edge / 2); |
|
|
487 | |
|
|
488 | my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; |
|
|
489 | |
|
|
490 | my $pixbuf; |
|
|
491 | |
|
|
492 | my $oldboard; |
|
|
493 | |
|
|
494 | if ($self->{background}) { |
|
|
495 | if ($oldboard = $self->{board_shown}) { |
|
|
496 | $pixbuf = $self->{pixbuf}; |
|
|
497 | } else { |
|
|
498 | $pixbuf = $self->{background}->copy; |
|
|
499 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
|
|
500 | } |
|
|
501 | } else { |
|
|
502 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
|
|
503 | |
|
|
504 | my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); |
|
|
505 | |
|
|
506 | if ($s < $bw && $s < $bh) { |
|
|
507 | $pixbuf = new_pixbuf $s, $s, 0; |
|
|
508 | $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); |
|
|
509 | } else { |
|
|
510 | $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; |
|
|
511 | } |
|
|
512 | |
|
|
513 | my $linew = int ($s / 40 / $size); |
|
|
514 | |
|
|
515 | # ornamental border... we have time to waste :/ |
|
|
516 | pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; |
|
|
517 | pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; |
|
|
518 | pixbuf_rect $pixbuf, 0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; |
|
|
519 | pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255; |
|
|
520 | |
|
|
521 | for my $i (1 .. $size) { |
|
|
522 | pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; |
|
|
523 | pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; |
|
|
524 | |
|
|
525 | # 38 max, but we allow a bit more |
|
|
526 | my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z |
|
|
527 | AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i]; |
|
|
528 | |
|
|
529 | pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label; |
|
|
530 | pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label; |
|
|
531 | pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1; |
|
|
532 | pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1; |
|
|
533 | |
|
|
534 | $a++; |
|
|
535 | $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... |
|
|
536 | } |
|
|
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 | |
|
|
569 | unless ($::config->{conserve_memory} > 1) { |
|
|
570 | $self->{background} = $pixbuf; |
|
|
571 | $pixbuf = $pixbuf->copy; |
|
|
572 | } |
|
|
573 | } |
|
|
574 | |
|
|
575 | $self->{pixbuf} = $pixbuf; |
|
|
576 | |
|
|
577 | # hoshi-points(!)#d# |
|
|
578 | # caching of empty board gfx(!)#d# |
|
|
579 | |
|
|
580 | for my $x (1 .. $size) { |
|
|
581 | for my $y (1 .. $size) { |
|
|
582 | my $rand = ($x ^ $y ^ 0x5555); |
|
|
583 | |
|
|
584 | my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs); |
|
|
585 | |
|
|
586 | if ($::config->{randomize}) { |
|
|
587 | $dx += ($rand % 7) - 3; |
|
|
588 | $dy += ($rand / 3 % 7) - 3; |
|
|
589 | } |
|
|
590 | |
|
|
591 | my $shadow = $edge * 0.05; |
|
|
592 | my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow]; |
|
|
593 | |
|
|
594 | my $mark = $self->{board}{board}[$x-1][$y-1]; |
|
|
595 | my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0; |
|
|
596 | |
|
|
597 | if ($oldboard) { |
|
|
598 | next if $old == $mark; # no change |
|
|
599 | |
|
|
600 | $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy); |
|
|
601 | $expose_area = $expose_area |
|
|
602 | ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area) |
|
|
603 | : new Gtk2::Gdk::Rectangle @$area; |
|
|
604 | } |
|
|
605 | |
|
|
606 | if ($mark) { |
|
|
607 | my $pb = $self->create_stack($mark, $edge, $rand); |
|
|
608 | |
|
|
609 | $pb->composite ($pixbuf, @$area, |
|
|
610 | $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255); |
|
|
611 | |
|
|
612 | # labels are handled here because they are quite rare |
|
|
613 | if ($mark & MARK_LABEL) { |
|
|
614 | my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1; |
|
|
615 | |
|
|
616 | if ($white) { |
|
|
617 | pixbuf_text $pixbuf, 0, |
|
|
618 | $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7, |
|
|
619 | $self->{board}{label}[$x-1][$y-1]; |
|
|
620 | } |
|
|
621 | pixbuf_text $pixbuf, $white, |
|
|
622 | $k[$x], $k[$y], $ofs * 0.7, |
|
|
623 | $self->{board}{label}[$x-1][$y-1]; |
|
|
624 | } |
|
|
625 | } |
|
|
626 | } |
|
|
627 | } |
|
|
628 | |
|
|
629 | $self->{board_shown} = Storable::dclone $self->{board}; |
|
|
630 | #d# save |
|
|
631 | #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable"; |
|
|
632 | |
|
|
633 | $expose_area; |
|
|
634 | } |
|
|
635 | |
|
|
636 | sub redraw { |
|
|
637 | my ($self, $area) = @_; |
|
|
638 | |
|
|
639 | if ($area && $self->{pixbuf}) { |
|
|
640 | my ($x, $y, $w, $h) = $area->values; |
|
|
641 | |
|
|
642 | $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, |
|
|
643 | $x, $y, $x, $y, $w, $h, |
|
|
644 | "normal", 0, 0); |
|
|
645 | $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, |
|
|
646 | $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; |
|
|
647 | } |
|
|
648 | } |
|
|
649 | |
|
|
650 | sub update_board { |
317 | sub update_board { |
651 | my ($self) = @_; |
318 | my ($self) = @_; |
652 | return unless $self->{path}; |
319 | return unless $self->{path}; |
653 | |
320 | |
654 | my $move = int $self->{moveadj}->get_value; |
321 | my $move = int $self->{moveadj}->get_value; |
655 | |
322 | |
656 | my $running = $move == @{$self->{path}}; |
323 | my $running = $move == @{$self->{path}}; |
657 | |
324 | |
658 | $self->{board_label}->set_text ("Move $move"); |
325 | $self->{board_label}->set_text ("Move " . ($move - 1)); |
659 | |
326 | |
660 | $self->{board} = new KGS::Game::Board $self->{size}; |
327 | $self->{cur_board} = new KGS::Game::Board $self->{size}; |
661 | $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); |
328 | $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); |
662 | |
329 | |
663 | $self->{userpanel}[WHITE]->set_state ($self->{board}{captures}[WHITE], |
330 | for my $colour (WHITE, BLACK) { |
664 | $self->{board}{timer}[WHITE], |
331 | $self->{userpanel}[$colour]->set_state ( |
665 | $running && $self->{board}{last} == BLACK); |
332 | $self->{cur_board}{captures}[$colour], |
666 | $self->{userpanel}[BLACK]->set_state ($self->{board}{captures}[BLACK], |
333 | $self->{cur_board}{timer}[$colour], |
667 | $self->{board}{timer}[BLACK], |
334 | ($running && $self->{lastmove_colour} == !$colour) |
668 | $running && $self->{board}{last} == WHITE); |
335 | ? $self->{lastmove_time} : 0 |
|
|
336 | ); |
|
|
337 | } |
669 | |
338 | |
670 | $self->redraw ($self->repaint_board); |
339 | $self->{board}->set_board ($self->{cur_board}); |
671 | } |
340 | } |
672 | |
341 | |
673 | sub event_update_tree { |
342 | sub event_update_tree { |
674 | my ($self) = @_; |
343 | my ($self) = @_; |
675 | |
344 | |
676 | $self->{path} = $self->get_path; |
345 | $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 | |
346 | |
681 | if ($self->{moveadj}) { |
347 | if ($self->{moveadj}) { |
682 | my $upper = $self->{moveadj}->upper; |
348 | my $upper = $self->{moveadj}->upper; |
683 | my $pos = $self->{moveadj}->get_value; |
349 | my $pos = $self->{moveadj}->get_value; |
|
|
350 | my $move = scalar @{$self->{path}}; |
684 | |
351 | |
685 | $self->{moveadj}->upper (scalar @{$self->{path}}); |
352 | $self->{moveadj}->upper ($move); |
686 | |
353 | |
687 | $self->{moveadj}->changed; |
354 | $self->{moveadj}->changed; |
688 | if ($pos == $upper) { |
355 | if ($pos == $upper) { |
689 | $self->{moveadj}->set_value (scalar @{$self->{path}}); |
356 | $self->{moveadj}->value ($move); |
690 | } else { |
|
|
691 | $self->{moveadj}->value_changed; |
357 | $self->{moveadj}->value_changed; |
692 | } |
358 | } |
693 | } |
359 | } |
694 | } |
360 | } |
695 | |
361 | |
… | |
… | |
702 | $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" |
368 | $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" |
703 | if $newnode; |
369 | if $newnode; |
704 | |
370 | |
705 | for (split /\n/, $comment) { |
371 | for (split /\n/, $comment) { |
706 | $text .= "\n"; |
372 | $text .= "\n"; |
707 | if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { |
373 | if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { |
708 | $text .= "<user>" . (util::toxml $1) . "</user>:"; |
374 | $text .= "<user>" . (util::toxml $1) . "</user>:"; |
709 | } |
375 | } |
|
|
376 | |
|
|
377 | # coords only for 19x19 so far |
|
|
378 | $_ = util::toxml $_; |
|
|
379 | s{ |
|
|
380 | ( |
|
|
381 | \b |
|
|
382 | (?:[bw])? |
|
|
383 | [, ]{0,2} |
|
|
384 | [a-hj-t] # valid for upto 19x19 |
|
|
385 | \s? |
|
|
386 | [1-9]?[0-9] |
|
|
387 | \b |
|
|
388 | ) |
|
|
389 | }{ |
|
|
390 | "<coord>$1</coord>"; |
|
|
391 | }sgexi; |
|
|
392 | |
710 | $text .= $_; |
393 | $text .= $_; |
711 | } |
394 | } |
712 | |
395 | |
713 | $self->{text}->append_text ($text); |
396 | $self->{text}->append_text ($text); |
714 | } |
397 | } |
… | |
… | |
719 | } |
402 | } |
720 | |
403 | |
721 | sub event_part { |
404 | sub event_part { |
722 | my ($self) = @_; |
405 | my ($self) = @_; |
723 | $self->SUPER::event_part; |
406 | $self->SUPER::event_part; |
|
|
407 | $self->destroy; |
724 | } |
408 | } |
725 | |
409 | |
726 | sub event_move { |
410 | sub event_move { |
727 | my ($self, $pass) = @_; |
411 | my ($self, $pass) = @_; |
728 | sound::play 1, $pass ? "pass" : "move"; |
412 | sound::play 1, $pass ? "pass" : "move"; |
729 | } |
413 | } |
730 | |
414 | |
731 | sub event_update_game { |
415 | sub event_update_game { |
732 | my ($self) = @_; |
416 | my ($self) = @_; |
733 | $self->SUPER::event_update_game; |
417 | $self->SUPER::event_update_game; |
734 | warn "GAME UPDATE ".join (":", %$self); |
|
|
735 | warn "SAVED ".$self->is_saved; |
|
|
736 | warn "SCORED ".$self->is_scored; |
|
|
737 | warn "ADJ ".$self->is_adjourned; |
|
|
738 | warn "VALID ".$self->is_valid; |
|
|
739 | warn "MOVES ".$self->moves; |
|
|
740 | warn "TYPE ".$self->type; |
|
|
741 | |
418 | |
|
|
419 | my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; |
|
|
420 | $self->{window}->set_title("KGS Game $title"); |
|
|
421 | $self->{title}->set_text ($title); |
|
|
422 | |
|
|
423 | $self->{user}[BLACK] = $self->{user1}; |
|
|
424 | $self->{user}[WHITE] = $self->{user2}; |
|
|
425 | |
|
|
426 | # show board |
|
|
427 | |
742 | $self->{left}->remove ($_) for $self->{left}->get_children; |
428 | $self->{left}->remove ($_) for $self->{left}->get_children; |
743 | if ($self->is_valid) { |
429 | if ($self->is_valid) { |
744 | $self->{left}->add ($self->{boardbox}); |
430 | $self->{left}->add ($self->{boardbox}); |
745 | (delete $self->{challenge})->destroy if $self->{challenge}; |
431 | (delete $self->{challenge})->destroy if $self->{challenge}; |
746 | } else { |
432 | } else { |
747 | $self->{left}->add ($self->{challenge}->widget); |
433 | $self->{left}->add ($self->{challenge}->widget); |
748 | } |
434 | } |
749 | $self->{left}->show_all; |
435 | $self->{left}->show_all; |
|
|
436 | |
|
|
437 | # view text |
|
|
438 | |
|
|
439 | eval { #d# |
|
|
440 | my @ga; |
|
|
441 | $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) |
|
|
442 | . " (" . (util::toxml $gameopt{$self->option}) . ")"; |
|
|
443 | $ga[1] = "\nFlags:"; |
|
|
444 | $ga[1] .= " valid" if $self->is_valid; |
|
|
445 | $ga[1] .= " adjourned" if $self->is_adjourned; |
|
|
446 | $ga[1] .= " scored" if $self->is_scored; |
|
|
447 | $ga[1] .= " saved" if $self->is_saved; |
|
|
448 | |
|
|
449 | $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; |
|
|
450 | |
|
|
451 | $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" |
|
|
452 | . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" |
|
|
453 | if $self->is_valid; |
|
|
454 | |
|
|
455 | if ($self->is_valid) { |
|
|
456 | $ga[4] = "\nHandicap: " . $self->{handicap}; |
|
|
457 | $ga[5] = "\nKomi: " . $self->{komi}; |
|
|
458 | $ga[6] = "\nSize: " . $self->size_string; |
|
|
459 | } |
|
|
460 | |
|
|
461 | if ($self->is_scored) { |
|
|
462 | $ga[7] = "\nResult: " . $self->score_string; |
|
|
463 | } |
|
|
464 | |
|
|
465 | $text = "\n<infoblock><header>Game Update</header>"; |
|
|
466 | for (0..7) { |
|
|
467 | if ($self->{gatext}[$_] ne $ga[$_]) { |
|
|
468 | $text .= $ga[$_]; |
|
|
469 | } |
|
|
470 | } |
|
|
471 | $text .= "</infoblock>"; |
|
|
472 | |
|
|
473 | $self->{gatext} = \@ga; |
|
|
474 | }; |
|
|
475 | |
|
|
476 | $self->{text}->append_text ($text); |
|
|
477 | } |
|
|
478 | |
|
|
479 | sub event_update_rules { |
|
|
480 | my ($self, $rules) = @_; |
|
|
481 | |
|
|
482 | $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules) |
|
|
483 | for BLACK, WHITE; |
|
|
484 | |
|
|
485 | sound::play 3, "gamestart"; |
|
|
486 | |
|
|
487 | my $text = "\n<header>Game Rules</header>"; |
|
|
488 | |
|
|
489 | $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; |
|
|
490 | |
|
|
491 | $text .= "\nTime: "; |
|
|
492 | |
|
|
493 | if ($rules->{timesys} == TIMESYS_NONE) { |
|
|
494 | $text .= "UNLIMITED"; |
|
|
495 | } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { |
|
|
496 | $text .= util::format_time $rules->{time}; |
|
|
497 | $text .= " ABS"; |
|
|
498 | } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { |
|
|
499 | $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; |
|
|
500 | $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; |
|
|
501 | } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { |
|
|
502 | $text .= util::format_time $rules->{time}; |
|
|
503 | $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; |
|
|
504 | } |
|
|
505 | |
|
|
506 | $self->{text}->append_text ("<infoblock>$text</infoblock>"); |
|
|
507 | } |
|
|
508 | |
|
|
509 | sub inject_resign_game { |
|
|
510 | my ($self, $msg) = @_; |
|
|
511 | |
|
|
512 | sound::play 3, "resign"; |
|
|
513 | |
|
|
514 | $self->{text}->append_text ("\n<infoblock><header>Resign</header>" |
|
|
515 | . "\n<user>" |
|
|
516 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
|
|
517 | . "</user> resigned.</infoblock>"); |
|
|
518 | } |
|
|
519 | |
|
|
520 | sub inject_final_result { |
|
|
521 | my ($self, $msg) = @_; |
|
|
522 | |
|
|
523 | $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" |
|
|
524 | . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) |
|
|
525 | . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) |
|
|
526 | . "</infoblock>" |
|
|
527 | ); |
750 | } |
528 | } |
751 | |
529 | |
752 | sub destroy { |
530 | sub destroy { |
753 | my ($self) = @_; |
531 | my ($self) = @_; |
754 | (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE]; |
532 | $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy |
755 | (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK]; |
533 | for BLACK, WHITE; |
756 | $self->SUPER::destroy; |
534 | $self->SUPER::destroy; |
757 | delete $appwin::gamelist->{game}{$self->{channel}}; |
535 | delete $appwin::gamelist->{game}{$self->{channel}}; |
758 | } |
536 | } |
759 | |
537 | |
760 | 1; |
538 | 1; |