|
|
1 | use utf8; |
|
|
2 | |
|
|
3 | package game::goclock; |
|
|
4 | |
|
|
5 | # Lo and Behold! I admit it! The rounding stuff etc.. in goclock |
|
|
6 | # is completely borked. |
|
|
7 | |
|
|
8 | use Time::HiRes (); |
|
|
9 | |
|
|
10 | use KGS::Constants; |
|
|
11 | |
|
|
12 | use base gtk::widget; |
|
|
13 | |
|
|
14 | sub new { |
|
|
15 | my $class = shift; |
|
|
16 | my $self = $class->SUPER::new(@_); |
|
|
17 | |
|
|
18 | $self->{widget} = new Gtk2::Label; |
|
|
19 | |
|
|
20 | $self->{set} = sub { }; |
|
|
21 | $self->{format} = sub { "ERROR" }; |
|
|
22 | |
|
|
23 | $self; |
|
|
24 | } |
|
|
25 | |
|
|
26 | sub configure { |
|
|
27 | my ($self, $timesys, $main, $interval, $count) = @_; |
|
|
28 | |
|
|
29 | if ($timesys == TIMESYS_ABSOLUTE) { |
|
|
30 | $self->{set} = sub { $self->{time} = $_[0] }; |
|
|
31 | $self->{format} = sub { util::format_time $_[0] }; |
|
|
32 | |
|
|
33 | } elsif ($timesys == TIMESYS_BYO_YOMI) { |
|
|
34 | my $low = $interval * $count; |
|
|
35 | |
|
|
36 | $self->{set} = sub { $self->{time} = $_[0] }; |
|
|
37 | |
|
|
38 | $self->{format} = sub { |
|
|
39 | if ($_[0] > $low) { |
|
|
40 | util::format_time $_[0] - $low; |
|
|
41 | } else { |
|
|
42 | sprintf "%s (%d)", |
|
|
43 | util::format_time int (($_[0] - 1) % $interval + 1), |
|
|
44 | ($_[0] - 1) / $interval; |
|
|
45 | } |
|
|
46 | }; |
|
|
47 | |
|
|
48 | } elsif ($timesys == TIMESYS_CANADIAN) { |
|
|
49 | $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; |
|
|
50 | |
|
|
51 | $self->{format} = sub { |
|
|
52 | if (!$self->{moves}) { |
|
|
53 | util::format_time $_[0] - $low; |
|
|
54 | } else { |
|
|
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 | |
|
|
62 | } |
|
|
63 | }; |
|
|
64 | |
|
|
65 | } else { |
|
|
66 | # none, or unknown |
|
|
67 | $self->{set} = sub { }; |
|
|
68 | $self->{format} = sub { "---" } |
|
|
69 | } |
|
|
70 | } |
|
|
71 | |
|
|
72 | sub refresh { |
|
|
73 | my ($self, $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)); |
|
|
79 | $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); |
|
|
80 | |
|
|
81 | $timer - int $timer; |
|
|
82 | } |
|
|
83 | |
|
|
84 | sub set_time { |
|
|
85 | my ($self, $time) = @_; |
|
|
86 | |
|
|
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}) { |
|
|
94 | $self->{set}->($time->[0], $time->[1]); |
|
|
95 | $self->refresh ($self->{start}); |
|
|
96 | } |
|
|
97 | } |
|
|
98 | |
|
|
99 | sub start { |
|
|
100 | my ($self, $when) = @_; |
|
|
101 | |
|
|
102 | $self->stop; |
|
|
103 | |
|
|
104 | $self->{start} = $when; |
|
|
105 | |
|
|
106 | my $timeout; $timeout = sub { |
|
|
107 | my $next = $self->refresh (Time::HiRes::time) * 1000; |
|
|
108 | $next += 1000 if $next < 0; |
|
|
109 | $self->{timeout} = add Glib::Timeout $next, $timeout; |
|
|
110 | 0; |
|
|
111 | }; |
|
|
112 | |
|
|
113 | $timeout->(); |
|
|
114 | } |
|
|
115 | |
|
|
116 | sub stop { |
|
|
117 | my ($self) = @_; |
|
|
118 | |
|
|
119 | remove Glib::Source delete $self->{timeout} if $self->{timeout}; |
|
|
120 | } |
|
|
121 | |
|
|
122 | sub destroy { |
|
|
123 | my ($self) = @_; |
|
|
124 | $self->stop; |
|
|
125 | $self->SUPER::destroy; |
|
|
126 | } |
|
|
127 | |
|
|
128 | package game::userpanel; |
|
|
129 | |
|
|
130 | use base gtk::widget; |
|
|
131 | |
|
|
132 | sub new { |
|
|
133 | my $class = shift; |
|
|
134 | my $self = $class->SUPER::new(@_); |
|
|
135 | |
|
|
136 | $self->{widget} = new Gtk2::HBox; |
|
|
137 | |
|
|
138 | $self->{widget}->add (my $vbox = new Gtk2::VBox); |
|
|
139 | |
|
|
140 | $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); |
|
|
141 | $vbox->add ($self->{info} = new Gtk2::Label ""); |
|
|
142 | $vbox->add (($self->{clock} = new game::goclock)->widget); |
|
|
143 | |
|
|
144 | $vbox->add ($self->{imagebox} = new Gtk2::VBox); |
|
|
145 | |
|
|
146 | $self; |
|
|
147 | } |
|
|
148 | |
|
|
149 | sub configure { |
|
|
150 | my ($self, $app, $user, $rules) = @_; |
|
|
151 | |
|
|
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 | $app->userpic ($user->{name}, sub { |
|
|
162 | return unless $self->{imagebox}; |
|
|
163 | |
|
|
164 | if ($_[0]) { |
|
|
165 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
|
|
166 | $self->{imagebox}->add (gtk::image_from_data $_[0]); |
|
|
167 | $self->{imagebox}->show_all; |
|
|
168 | } |
|
|
169 | }); |
|
|
170 | } |
|
|
171 | } |
|
|
172 | |
|
|
173 | $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); |
|
|
174 | } |
|
|
175 | |
|
|
176 | sub set_state { |
|
|
177 | my ($self, $captures, $timer, $when) = @_; |
|
|
178 | |
|
|
179 | $self->{clock}->stop unless $when; |
|
|
180 | $self->{clock}->set_time ($timer); |
|
|
181 | $self->{clock}->start ($when) if $when; |
|
|
182 | |
|
|
183 | $self->{info}->set_text ("$captures pris."); |
|
|
184 | } |
|
|
185 | |
| 1 | package game; |
186 | package game; |
| 2 | |
187 | |
| 3 | use KGS::Constants; |
188 | use KGS::Constants; |
| 4 | use KGS::Game::Board; |
189 | use KGS::Game::Board; |
| 5 | |
190 | |
| 6 | use base KGS::Listener::Game; |
191 | use base KGS::Listener::Game; |
| 7 | use base KGS::Game; |
192 | use base KGS::Game; |
| 8 | |
193 | |
| 9 | use base gtk::widget; |
194 | use base gtk::widget; |
|
|
195 | |
|
|
196 | use POSIX qw(ceil); |
| 10 | |
197 | |
| 11 | sub new { |
198 | sub new { |
| 12 | my $self = shift; |
199 | my $self = shift; |
| 13 | $self = $self->SUPER::new(@_); |
200 | $self = $self->SUPER::new(@_); |
| 14 | |
201 | |
| 15 | $self->listen($self->{conn}); |
202 | $self->listen($self->{conn}); |
| 16 | |
203 | |
| 17 | $self->{window} = new Gtk2::Window 'toplevel'; |
204 | $self->{window} = new Gtk2::Window 'toplevel'; |
| 18 | my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window"; |
|
|
| 19 | $self->{window}->set_title("KGS Game $title"); |
|
|
| 20 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
205 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
| 21 | |
206 | |
| 22 | $self->{window}->signal_connect(delete_event => sub { |
207 | $self->{window}->signal_connect(delete_event => sub { |
| 23 | if ($self->{joined}) { |
|
|
| 24 | $self->part; |
208 | $self->part; |
| 25 | } else { |
209 | $self->destroy; |
| 26 | $self->event_part; |
|
|
| 27 | } |
|
|
| 28 | 1; |
210 | 1; |
| 29 | }); |
211 | }); |
| 30 | |
212 | |
| 31 | $self->{window}->add($self->{hpane} = new Gtk2::HPaned); |
213 | $self->{window}->add($self->{hpane} = new Gtk2::HPaned); |
| 32 | gtk::state $self->{hpane}, "game::hpane", undef, position => 500; |
214 | gtk::state $self->{hpane}, "game::hpane", undef, position => 500; |
| 33 | |
215 | |
|
|
216 | # LEFT PANE |
|
|
217 | |
|
|
218 | $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); |
|
|
219 | |
|
|
220 | $self->{boardbox} = new Gtk2::VBox; |
|
|
221 | |
| 34 | $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); |
222 | $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); |
| 35 | |
223 | |
|
|
224 | # challenge |
|
|
225 | |
|
|
226 | $self->{challenge} = new challenge channel => $self->{channel}; |
|
|
227 | |
|
|
228 | # board box (aspect/canvas) |
|
|
229 | |
| 36 | $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); |
230 | $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); |
| 37 | |
231 | |
| 38 | { |
232 | { |
| 39 | # grrr... |
|
|
| 40 | $frame->add(my $vbox = new Gtk2::VBox); |
233 | $frame->add (my $vbox = new Gtk2::VBox); |
| 41 | $vbox->add($self->{title} = new Gtk2::Label $title); |
234 | $vbox->add ($self->{title} = new Gtk2::Label $title); |
| 42 | |
235 | |
|
|
236 | $vbox->add (my $hbox = new Gtk2::HBox); |
|
|
237 | |
|
|
238 | $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); |
|
|
239 | |
| 43 | $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.01, 0.1, 0; |
240 | $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; |
| 44 | |
241 | |
| 45 | $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); |
242 | $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); |
| 46 | $scale->set_draw_value (0); |
243 | $scale->set_draw_value (0); |
|
|
244 | $scale->set_digits (0); |
| 47 | |
245 | |
| 48 | $self->{moveadj}->signal_connect (value_changed => sub { |
246 | $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); |
| 49 | return unless $self->{path}; |
|
|
| 50 | |
|
|
| 51 | my $move = int (@{$self->{path}} * $_[0]->get_value); |
|
|
| 52 | |
|
|
| 53 | $self->{board} = new KGS::Game::Board $self->{size}; |
|
|
| 54 | $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); |
|
|
| 55 | |
|
|
| 56 | $self->redraw ($self->repaint_board); |
|
|
| 57 | |
|
|
| 58 | $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment}); |
|
|
| 59 | }); |
|
|
| 60 | } |
|
|
| 61 | |
247 | } |
| 62 | $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); |
|
|
| 63 | |
248 | |
| 64 | $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); |
249 | $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); |
| 65 | $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); |
|
|
| 66 | |
250 | |
|
|
251 | # RIGHT PANE |
|
|
252 | |
| 67 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); |
253 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); |
| 68 | $self->{hpane}->set(position_set => 1); |
254 | $self->{hpane}->set(position_set => 1); |
| 69 | gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; |
255 | gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; |
| 70 | |
256 | |
| 71 | $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); |
257 | $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); |
| 72 | $sw->set_policy("automatic", "always"); |
258 | $sw->set_policy("automatic", "always"); |
| 73 | |
259 | |
| 74 | $sw->add(($self->{userlist} = new gtk::userlist)->widget); |
260 | $sw->add(($self->{userlist} = new userlist)->widget); |
| 75 | |
261 | |
| 76 | $self->{vpane}->add(my $vbox = new Gtk2::VBox); |
262 | $self->{vpane}->add(my $vbox = new Gtk2::VBox); |
| 77 | |
263 | |
| 78 | $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); |
264 | $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); |
| 79 | $sw->set_policy("never", "always"); |
265 | $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); |
| 80 | |
266 | $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); |
|
|
267 | |
| 81 | $sw->add(($self->{text} = new gtk::text)->widget); |
268 | $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); |
| 82 | |
269 | |
| 83 | $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); |
270 | $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); |
| 84 | $self->{entry}->signal_connect(activate => sub { |
271 | $self->{entry}->signal_connect(activate => sub { |
| 85 | my $text = $self->{entry}->get_text; |
272 | my $text = $self->{entry}->get_text; |
| 86 | # add message |
273 | $self->say($text) if $text =~ /\S/; |
| 87 | $self->{entry}->set_text(""); |
274 | $self->{entry}->set_text(""); |
| 88 | }); |
275 | }); |
| 89 | |
276 | |
|
|
277 | $self->event_update_game; |
| 90 | $self; |
278 | $self; |
| 91 | } |
279 | } |
| 92 | |
280 | |
| 93 | sub event_update_users { |
281 | sub event_update_users { |
| 94 | my ($self) = @_; |
282 | my ($self, $add, $update, $remove) = @_; |
| 95 | |
283 | |
| 96 | $self->{userlist}->update($self->{users}); |
284 | return unless $self->{userlist}; |
|
|
285 | |
|
|
286 | $self->{userlist}->update ($add, $update, $remove); |
|
|
287 | |
|
|
288 | my %important; |
|
|
289 | $important{$self->{user1}{name}}++; |
|
|
290 | $important{$self->{user2}{name}}++; |
|
|
291 | $important{$self->{user3}{name}}++; |
|
|
292 | |
|
|
293 | if (my @users = grep $important{$_->{name}}, @$add) { |
|
|
294 | $self->{text}->append_text ("\n<header>Joins:</header>"); |
|
|
295 | $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
|
|
296 | } |
|
|
297 | if (my @users = grep $important{$_->{name}}, @$remove) { |
|
|
298 | $self->{text}->append_text ("\n<header>Parts:</header>"); |
|
|
299 | $self->{text}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
|
|
300 | } |
|
|
301 | |
| 97 | } |
302 | } |
| 98 | |
303 | |
| 99 | sub join { |
304 | sub join { |
| 100 | my ($self) = @_; |
305 | my ($self) = @_; |
|
|
306 | return if $self->{joined}; |
|
|
307 | |
| 101 | $self->SUPER::join; |
308 | $self->SUPER::join; |
| 102 | |
309 | |
| 103 | $self->{window}->show_all; |
310 | $self->{window}->show_all; |
| 104 | } |
311 | } |
| 105 | |
312 | |
| 106 | sub part { |
313 | sub part { |
| 107 | my ($self) = @_; |
314 | my ($self) = @_; |
|
|
315 | |
| 108 | $self->SUPER::part; |
316 | $self->SUPER::part; |
| 109 | |
317 | $self->destroy; |
| 110 | $self->{window}->hide; |
|
|
| 111 | } |
318 | } |
| 112 | |
319 | |
| 113 | sub configure_event { |
320 | sub update_board { |
| 114 | my ($widget, $event, $self) = @_; |
321 | my ($self) = @_; |
| 115 | delete $self->{stack}; |
322 | return unless $self->{path}; |
| 116 | delete $self->{pixbuf}; |
|
|
| 117 | delete $self->{board_shown}; |
|
|
| 118 | delete $self->{background}; |
|
|
| 119 | $self->repaint_board; |
|
|
| 120 | 0; |
|
|
| 121 | } |
|
|
| 122 | |
323 | |
| 123 | sub expose_event { |
324 | my $move = int $self->{moveadj}->get_value; |
| 124 | my ($widget, $event, $self) = @_; |
|
|
| 125 | |
325 | |
| 126 | $self->{pixbuf} or return; |
326 | my $running = $move == @{$self->{path}}; |
| 127 | |
327 | |
| 128 | my $area = $event->area; |
328 | $self->{board_label}->set_text ("Move " . ($move - 1)); |
| 129 | my ($ox, $oy, $s) = @{$self->{offsets}}; |
|
|
| 130 | |
329 | |
| 131 | $self->redraw ( |
330 | $self->{cur_board} = new KGS::Game::Board $self->{size}; |
| 132 | (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height) |
331 | $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); |
| 133 | ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s) |
332 | |
|
|
333 | for my $colour (WHITE, BLACK) { |
|
|
334 | $self->{userpanel}[$colour]->set_state ( |
|
|
335 | $self->{cur_board}{captures}[$colour], |
|
|
336 | $self->{cur_board}{timer}[$colour], |
|
|
337 | ($running && $self->{lastmove_colour} == !$colour) |
|
|
338 | ? $self->{lastmove_time} : 0 |
| 134 | ); |
339 | ); |
|
|
340 | } |
| 135 | |
341 | |
| 136 | 0; |
342 | $self->{board}->set_board ($self->{cur_board}); |
| 137 | } |
343 | } |
| 138 | |
344 | |
| 139 | # something Gtk2 fixed |
345 | sub event_update_tree { |
| 140 | sub INTERP_NEAREST (){ 'nearest' } |
346 | my ($self) = @_; |
| 141 | sub INTERP_TILES (){ 'tiles' } |
|
|
| 142 | sub INTERP_BILINEAR (){ 'bilinear' } |
|
|
| 143 | sub INTERP_HYPER (){ 'hyper' } |
|
|
| 144 | |
347 | |
| 145 | sub new_pixbuf { |
348 | $self->{path} = $self->get_path; |
| 146 | my ($w, $h, $alpha, $fill) = @_; |
|
|
| 147 | |
349 | |
| 148 | my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h; |
350 | if ($self->{moveadj}) { |
| 149 | $pixbuf->fill ($fill) if defined $fill; |
351 | my $upper = $self->{moveadj}->upper; |
|
|
352 | my $pos = $self->{moveadj}->get_value; |
|
|
353 | my $move = scalar @{$self->{path}}; |
| 150 | |
354 | |
| 151 | $pixbuf; |
355 | $self->{moveadj}->upper ($move); |
| 152 | } |
|
|
| 153 | |
|
|
| 154 | sub scale_pixbuf { |
|
|
| 155 | my ($src, $w, $h, $mode) = @_; |
|
|
| 156 | |
|
|
| 157 | my $dst = new_pixbuf $w, $h, 1; |
|
|
| 158 | |
|
|
| 159 | $src->scale( |
|
|
| 160 | $dst, 0, 0, $w, $h, 0, 0, |
|
|
| 161 | $w / $src->get_width, $h / $src->get_height, |
|
|
| 162 | $mode, |
|
|
| 163 | ); |
|
|
| 164 | |
|
|
| 165 | $dst; |
|
|
| 166 | } |
|
|
| 167 | |
|
|
| 168 | # create a stack of stones |
|
|
| 169 | sub create_stack { |
|
|
| 170 | my ($self, $mark, $size, $rand) = @_; |
|
|
| 171 | |
|
|
| 172 | my $shadow = $size * 0.05; |
|
|
| 173 | |
|
|
| 174 | my $c = \$self->{stack}{$mark}; |
|
|
| 175 | unless ($$c) { |
|
|
| 176 | for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { |
|
|
| 177 | my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; |
|
|
| 178 | |
|
|
| 179 | # zeroeth the shadow |
|
|
| 180 | if ($mark & (MARK_B | MARK_W)) { |
|
|
| 181 | $::black_img[0]->composite ( |
|
|
| 182 | $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, |
|
|
| 183 | $size / $stone->get_width, $size / $stone->get_height, |
|
|
| 184 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128 |
|
|
| 185 | ); |
|
|
| 186 | } |
356 | |
| 187 | |
357 | $self->{moveadj}->changed; |
| 188 | # first the big stones (handicap stones different for effect) |
358 | if ($pos == $upper) { |
| 189 | for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], |
359 | $self->{moveadj}->value ($move); |
| 190 | [MARK_W, $mark & MARK_MOVE ? 255 : 192], |
360 | $self->{moveadj}->value_changed; |
| 191 | [MARK_GRAY_B, 128], |
|
|
| 192 | [MARK_GRAY_W, 128]) { |
|
|
| 193 | my ($mask, $alpha) = @$_; |
|
|
| 194 | if ($mark & $mask) { |
|
|
| 195 | $stone->composite ( |
|
|
| 196 | $base, 0, 0, $size, $size, -0.5, -0.5, |
|
|
| 197 | $size / $stone->get_width, $size / $stone->get_height, |
|
|
| 198 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha |
|
|
| 199 | ); |
|
|
| 200 | } |
|
|
| 201 | } |
|
|
| 202 | |
|
|
| 203 | # then the samll stones |
|
|
| 204 | for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], |
|
|
| 205 | [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { |
|
|
| 206 | my ($mask, $img) = @$_; |
|
|
| 207 | if ($mark & $mask) { |
|
|
| 208 | $img->composite ( |
|
|
| 209 | $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, |
|
|
| 210 | $size / $img->get_width / 2, $size / $img->get_height / 2, |
|
|
| 211 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 |
|
|
| 212 | ); |
|
|
| 213 | } |
|
|
| 214 | } |
|
|
| 215 | |
|
|
| 216 | # and lastly any markers |
|
|
| 217 | my $dark_bg = ! ! ($mark & (MARK_B | MARK_GRAY_B)); |
|
|
| 218 | |
|
|
| 219 | for ([MARK_CIRCLE, $::circle_img[$dark_bg]], |
|
|
| 220 | [MARK_TRIANGLE, $::triangle_img[$dark_bg]], |
|
|
| 221 | [MARK_SQUARE, $::square_img[$dark_bg]]) { |
|
|
| 222 | my ($mask, $img) = @$_; |
|
|
| 223 | if ($mark & $mask) { |
|
|
| 224 | $img->composite ( |
|
|
| 225 | $base, 0, 0, $size, $size, -0.5, -0.5, |
|
|
| 226 | $size / $img->get_width, $size / $img->get_height, |
|
|
| 227 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255 |
|
|
| 228 | ); |
|
|
| 229 | } |
|
|
| 230 | } |
|
|
| 231 | |
|
|
| 232 | push @$$c, $base; |
|
|
| 233 | } |
361 | } |
| 234 | } |
362 | } |
| 235 | |
|
|
| 236 | $$c->[$rand % @$$c]; |
|
|
| 237 | } |
363 | } |
| 238 | |
364 | |
| 239 | sub pixbuf_text { |
365 | sub event_update_comments { |
| 240 | my ($pixbuf, $colour, $x, $y, $height, $text) = @_; |
366 | my ($self, $node, $comment, $newnode) = @_; |
|
|
367 | $self->SUPER::event_update_comments($node, $comment, $newnode); |
| 241 | |
368 | |
| 242 | my @c = grep $_, |
369 | my $text; |
| 243 | map $::font[$colour][$::fontmap{$_}], |
|
|
| 244 | split //, $text; |
|
|
| 245 | |
370 | |
| 246 | if (@c) { |
371 | $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" |
| 247 | my $spacing = $height * 0.1; |
372 | if $newnode; |
| 248 | my $s = $height / List::Util::max map $_->get_height, @c; |
|
|
| 249 | my $W = List::Util::sum map $_->get_width, @c; |
|
|
| 250 | |
373 | |
| 251 | $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; |
374 | for (split /\n/, $comment) { |
| 252 | $y -= $height * 0.5; |
375 | $text .= "\n"; |
| 253 | |
376 | if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { |
| 254 | for (@c) { |
377 | $text .= "<user>" . (util::toxml $1) . "</user>:"; |
| 255 | my $w = $_->get_width * $s; |
|
|
| 256 | $_->composite ($pixbuf, |
|
|
| 257 | $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, |
|
|
| 258 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); |
|
|
| 259 | |
|
|
| 260 | $x += $w + $spacing; |
|
|
| 261 | } |
378 | } |
| 262 | } |
|
|
| 263 | } |
|
|
| 264 | |
|
|
| 265 | sub pixbuf_rect { |
|
|
| 266 | my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_; |
|
|
| 267 | # we fake lines by... a horrible method :/ |
|
|
| 268 | my $colour_pb = new_pixbuf 1, 1, 0, $colour; |
|
|
| 269 | $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1, |
|
|
| 270 | INTERP_NEAREST, $alpha); |
|
|
| 271 | } |
|
|
| 272 | |
|
|
| 273 | sub repaint_board { |
|
|
| 274 | my ($self) = @_; |
|
|
| 275 | my $canvas = $self->{canvas}; |
|
|
| 276 | my $expose_area = undef; |
|
|
| 277 | |
|
|
| 278 | return $expose_area unless $self->{board}; |
|
|
| 279 | |
|
|
| 280 | my ($w, $h) = ($canvas->allocation->values)[2,3]; |
|
|
| 281 | |
|
|
| 282 | my $s = $w > $h ? $h : $w; |
|
|
| 283 | |
|
|
| 284 | return unless $s > 128; |
|
|
| 285 | |
|
|
| 286 | $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; |
|
|
| 287 | |
|
|
| 288 | my $size = $self->{size}; |
|
|
| 289 | |
|
|
| 290 | my $border = int ($s / ($size + 3) * 0.5); |
|
|
| 291 | my $s2 = $s - $border * 2; |
|
|
| 292 | my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); |
|
|
| 293 | my $ofs = int ($edge / 2); |
|
|
| 294 | |
|
|
| 295 | my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; |
|
|
| 296 | |
|
|
| 297 | my $pixbuf; |
|
|
| 298 | |
|
|
| 299 | my $oldboard; |
|
|
| 300 | |
|
|
| 301 | if ($self->{background}) { |
|
|
| 302 | if ($oldboard = $self->{board_shown}) { |
|
|
| 303 | $pixbuf = $self->{pixbuf}; |
|
|
| 304 | } else { |
|
|
| 305 | $pixbuf = $self->{background}->copy; |
|
|
| 306 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
|
|
| 307 | } |
379 | |
| 308 | } else { |
380 | # coords only for 19x19 so far |
| 309 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
381 | $_ = util::toxml $_; |
| 310 | |
|
|
| 311 | my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); |
|
|
| 312 | |
|
|
| 313 | if ($s < $bw && $s < $bh) { |
|
|
| 314 | $pixbuf = new_pixbuf $s, $s, 0; |
|
|
| 315 | $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); |
|
|
| 316 | } else { |
|
|
| 317 | $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; |
|
|
| 318 | } |
382 | s{ |
| 319 | |
|
|
| 320 | my $linew = int ($s / 25 / $size); |
|
|
| 321 | |
|
|
| 322 | # ornamental border... we have time to waste :/ |
|
|
| 323 | pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255; |
|
|
| 324 | pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255; |
|
|
| 325 | pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255; |
|
|
| 326 | pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255; |
|
|
| 327 | |
|
|
| 328 | for my $i (1 .. $size) { |
|
|
| 329 | pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; |
|
|
| 330 | pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; |
|
|
| 331 | |
|
|
| 332 | # 38 max, but we allow a bit more |
|
|
| 333 | 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 |
|
|
| 334 | 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]; |
|
|
| 335 | |
|
|
| 336 | pixbuf_text $pixbuf, 0, $k[$i], $border, $ofs, $label; |
|
|
| 337 | pixbuf_text $pixbuf, 0, $k[$i], $s2 + $border, $ofs, $label; |
|
|
| 338 | pixbuf_text $pixbuf, 0, $border, $k[$i], $ofs, $size - $i + 1; |
|
|
| 339 | pixbuf_text $pixbuf, 0, $s2 + $border, $k[$i], $ofs, $size - $i + 1; |
|
|
| 340 | |
|
|
| 341 | $a++; |
|
|
| 342 | $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... |
|
|
| 343 | } |
|
|
| 344 | |
|
|
| 345 | unless ($::config->{conserve_memory}) { |
|
|
| 346 | $self->{background} = $pixbuf; |
|
|
| 347 | $pixbuf = $pixbuf->copy; |
|
|
| 348 | } |
|
|
| 349 | } |
|
|
| 350 | |
|
|
| 351 | $self->{pixbuf} = $pixbuf; |
|
|
| 352 | |
|
|
| 353 | # hoshi-points(!)#d# |
|
|
| 354 | # caching of empty board gfx(!)#d# |
|
|
| 355 | |
|
|
| 356 | for my $x (1 .. $size) { |
|
|
| 357 | for my $y (1 .. $size) { |
|
|
| 358 | my $rand = ($x ^ $y ^ 0x5555); |
|
|
| 359 | |
|
|
| 360 | my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs); |
|
|
| 361 | |
|
|
| 362 | if ($::config->{randomize}) { |
|
|
| 363 | $dx += ($rand % 7) - 3; |
|
|
| 364 | $dy += ($rand / 3 % 7) - 3; |
|
|
| 365 | } |
|
|
| 366 | |
|
|
| 367 | my $shadow = $edge * 0.05; |
|
|
| 368 | my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow]; |
|
|
| 369 | |
383 | ( |
| 370 | my $mark = $self->{board}{board}[$x-1][$y-1]; |
|
|
| 371 | my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0; |
|
|
| 372 | |
|
|
| 373 | if ($oldboard) { |
|
|
| 374 | next if $old == $mark; # no change |
|
|
| 375 | |
|
|
| 376 | $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy); |
|
|
| 377 | $expose_area = $expose_area |
|
|
| 378 | ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area) |
|
|
| 379 | : new Gtk2::Gdk::Rectangle @$area; |
|
|
| 380 | } |
|
|
| 381 | |
|
|
| 382 | if ($mark) { |
|
|
| 383 | my $pb = $self->create_stack($mark, $edge, $rand); |
|
|
| 384 | |
|
|
| 385 | $pb->composite ($pixbuf, @$area, |
|
|
| 386 | $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255); |
|
|
| 387 | |
|
|
| 388 | # labels are handled here because they are quite rare |
|
|
| 389 | if ($mark & MARK_LABEL) { |
|
|
| 390 | my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1; |
|
|
| 391 | |
|
|
| 392 | if ($white) { |
|
|
| 393 | pixbuf_text $pixbuf, 0, |
|
|
| 394 | $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7, |
|
|
| 395 | $self->{board}{label}[$x-1][$y-1]; |
|
|
| 396 | } |
|
|
| 397 | pixbuf_text $pixbuf, $white, |
|
|
| 398 | $k[$x], $k[$y], $ofs * 0.7, |
|
|
| 399 | $self->{board}{label}[$x-1][$y-1]; |
|
|
| 400 | } |
|
|
| 401 | |
384 | \b |
| 402 | # old pixmap&mask-way. that was fast ;( |
385 | (?:[bw])? |
| 403 | #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 ); |
386 | [, ]{0,2} |
| 404 | |
387 | [a-hj-t] # valid for upto 19x19 |
| 405 | #$gc->set_clip_mask ($bm); |
388 | \s? |
| 406 | #$gc->set_clip_origin ($dx, $dy); |
389 | [1-9]?[0-9] |
| 407 | #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge); |
390 | \b |
| 408 | } |
391 | ) |
| 409 | } |
392 | }{ |
| 410 | } |
393 | "<coord>$1</coord>"; |
|
|
394 | }sgexi; |
| 411 | |
395 | |
| 412 | $self->{board_shown} = Storable::dclone $self->{board}; |
396 | $text .= $_; |
| 413 | #d# save |
397 | } |
| 414 | #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable"; |
|
|
| 415 | |
398 | |
| 416 | $expose_area; |
399 | $self->{text}->append_text ($text); |
| 417 | } |
400 | } |
| 418 | |
401 | |
| 419 | sub redraw { |
402 | sub event_join { |
| 420 | my ($self, $area) = @_; |
403 | my ($self) = @_; |
| 421 | |
404 | $self->SUPER::event_join; |
| 422 | if ($area && $self->{pixbuf}) { |
|
|
| 423 | my ($x, $y, $w, $h) = $area->values; |
|
|
| 424 | my ($ox, $oy, $s) = @{$self->{offsets}}; |
|
|
| 425 | |
|
|
| 426 | $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, |
|
|
| 427 | $x, $y, $x + $ox, $y + $oy, $w, $h, |
|
|
| 428 | "normal", 0, 0); |
|
|
| 429 | $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, |
|
|
| 430 | $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; |
|
|
| 431 | } |
|
|
| 432 | } |
|
|
| 433 | |
|
|
| 434 | sub event_update_tree { |
|
|
| 435 | my ($self) = @_; |
|
|
| 436 | |
|
|
| 437 | $self->{path} = $self->get_path; |
|
|
| 438 | $self->{moveadj}->value_changed if $self->{moveadj}; |
|
|
| 439 | } |
405 | } |
| 440 | |
406 | |
| 441 | sub event_part { |
407 | sub event_part { |
| 442 | my ($self) = @_; |
408 | my ($self) = @_; |
| 443 | $self->SUPER::event_part; |
409 | $self->SUPER::event_part; |
| 444 | delete $appwin::gamelist->{game}{$self->{channel}}; |
|
|
| 445 | $self->destroy; |
410 | $self->destroy; |
| 446 | } |
411 | } |
| 447 | |
412 | |
| 448 | sub event_move { |
413 | sub event_move { |
| 449 | my ($self, $pass) = @_; |
414 | my ($self, $pass) = @_; |
| 450 | sound::play 1, $pass ? "pass" : "move"; |
415 | sound::play 1, $pass ? "pass" : "move"; |
| 451 | } |
416 | } |
| 452 | |
417 | |
|
|
418 | sub event_update_game { |
|
|
419 | my ($self) = @_; |
|
|
420 | $self->SUPER::event_update_game; |
|
|
421 | |
|
|
422 | my $title = defined $self->{channel} |
|
|
423 | ? $self->owner->as_string . " " . $self->opponent_string |
|
|
424 | : "Game Window"; |
|
|
425 | $self->{window}->set_title("KGS Game $title"); |
|
|
426 | $self->{title}->set_text ($title); |
|
|
427 | |
|
|
428 | $self->{user}[BLACK] = $self->{user1}; |
|
|
429 | $self->{user}[WHITE] = $self->{user2}; |
|
|
430 | |
|
|
431 | # show board |
|
|
432 | |
|
|
433 | $self->{left}->remove ($_) for $self->{left}->get_children; |
|
|
434 | if ($self->is_valid) { |
|
|
435 | $self->{left}->add ($self->{boardbox}); |
|
|
436 | (delete $self->{challenge})->destroy if $self->{challenge}; |
|
|
437 | } else { |
|
|
438 | $self->{left}->add ($self->{challenge}->widget); |
|
|
439 | } |
|
|
440 | $self->{left}->show_all; |
|
|
441 | |
|
|
442 | # view text |
|
|
443 | |
|
|
444 | eval { #d# |
|
|
445 | my @ga; |
|
|
446 | $ga[0] = "\nType: " . (util::toxml $gametype{$self->type}) |
|
|
447 | . " (" . (util::toxml $gameopt{$self->option}) . ")"; |
|
|
448 | $ga[1] = "\nFlags:"; |
|
|
449 | $ga[1] .= " valid" if $self->is_valid; |
|
|
450 | $ga[1] .= " adjourned" if $self->is_adjourned; |
|
|
451 | $ga[1] .= " scored" if $self->is_scored; |
|
|
452 | $ga[1] .= " saved" if $self->is_saved; |
|
|
453 | |
|
|
454 | $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid; |
|
|
455 | |
|
|
456 | $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>" |
|
|
457 | . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" |
|
|
458 | if $self->is_valid; |
|
|
459 | |
|
|
460 | if ($self->is_valid) { |
|
|
461 | $ga[4] = "\nHandicap: " . $self->{handicap}; |
|
|
462 | $ga[5] = "\nKomi: " . $self->{komi}; |
|
|
463 | $ga[6] = "\nSize: " . $self->size_string; |
|
|
464 | } |
|
|
465 | |
|
|
466 | if ($self->is_scored) { |
|
|
467 | $ga[7] = "\nResult: " . $self->score_string; |
|
|
468 | } |
|
|
469 | |
|
|
470 | $text = "\n<infoblock><header>Game Update</header>"; |
|
|
471 | for (0..7) { |
|
|
472 | if ($self->{gatext}[$_] ne $ga[$_]) { |
|
|
473 | $text .= $ga[$_]; |
|
|
474 | } |
|
|
475 | } |
|
|
476 | $text .= "</infoblock>"; |
|
|
477 | |
|
|
478 | $self->{gatext} = \@ga; |
|
|
479 | }; |
|
|
480 | |
|
|
481 | $self->{text}->append_text ($text); |
|
|
482 | } |
|
|
483 | |
|
|
484 | sub event_update_rules { |
|
|
485 | my ($self, $rules) = @_; |
|
|
486 | |
|
|
487 | $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules) |
|
|
488 | for BLACK, WHITE; |
|
|
489 | |
|
|
490 | sound::play 3, "gamestart"; |
|
|
491 | |
|
|
492 | my $text = "\n<header>Game Rules</header>"; |
|
|
493 | |
|
|
494 | $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; |
|
|
495 | |
|
|
496 | $text .= "\nTime: "; |
|
|
497 | |
|
|
498 | if ($rules->{timesys} == TIMESYS_NONE) { |
|
|
499 | $text .= "UNLIMITED"; |
|
|
500 | } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { |
|
|
501 | $text .= util::format_time $rules->{time}; |
|
|
502 | $text .= " ABS"; |
|
|
503 | } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { |
|
|
504 | $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; |
|
|
505 | $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; |
|
|
506 | } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { |
|
|
507 | $text .= util::format_time $rules->{time}; |
|
|
508 | $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; |
|
|
509 | } |
|
|
510 | |
|
|
511 | $self->{text}->append_text ("<infoblock>$text</infoblock>"); |
|
|
512 | } |
|
|
513 | |
|
|
514 | sub inject_resign_game { |
|
|
515 | my ($self, $msg) = @_; |
|
|
516 | |
|
|
517 | sound::play 3, "resign"; |
|
|
518 | |
|
|
519 | $self->{text}->append_text ("\n<infoblock><header>Resign</header>" |
|
|
520 | . "\n<user>" |
|
|
521 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
|
|
522 | . "</user> resigned.</infoblock>"); |
|
|
523 | } |
|
|
524 | |
|
|
525 | sub inject_final_result { |
|
|
526 | my ($self, $msg) = @_; |
|
|
527 | |
|
|
528 | $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" |
|
|
529 | . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) |
|
|
530 | . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) |
|
|
531 | . "</infoblock>" |
|
|
532 | ); |
|
|
533 | } |
|
|
534 | |
|
|
535 | sub event_challenge { |
|
|
536 | my ($self, $challenge) = @_; |
|
|
537 | |
|
|
538 | use KGS::Listener::Debug; |
|
|
539 | $self->{text}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge)); |
|
|
540 | } |
|
|
541 | |
|
|
542 | sub destroy { |
|
|
543 | my ($self) = @_; |
|
|
544 | |
|
|
545 | delete $self->{app}{gamelist}{game}{$self->{channel}}; |
|
|
546 | $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy |
|
|
547 | for BLACK, WHITE; |
|
|
548 | $self->SUPER::destroy; |
|
|
549 | } |
|
|
550 | |
| 453 | 1; |
551 | 1; |
| 454 | |
552 | |
