1 | use utf8; |
1 | use utf8; |
|
|
2 | |
|
|
3 | use Scalar::Util (); |
2 | |
4 | |
3 | package game::goclock; |
5 | package game::goclock; |
4 | |
6 | |
5 | # Lo and Behold! I admit it! The rounding stuff etc.. in goclock |
7 | # Lo and Behold! I admit it! The rounding stuff etc.. in goclock |
6 | # is completely borked. |
8 | # is completely borked. |
7 | |
9 | |
8 | use Time::HiRes (); |
10 | use Time::HiRes (); |
9 | |
11 | |
10 | use KGS::Constants; |
12 | use KGS::Constants; |
11 | |
13 | |
12 | use base gtk::widget; |
14 | use Glib::Object::Subclass |
|
|
15 | Gtk2::Label; |
13 | |
16 | |
14 | sub new { |
17 | sub INIT_INSTANCE { |
15 | my $class = shift; |
18 | my $self = shift; |
16 | my $self = $class->SUPER::new(@_); |
|
|
17 | |
19 | |
18 | $self->{widget} = new Gtk2::Label; |
20 | $self->signal_connect (destroy => sub { $_[0]->stop }); |
19 | |
21 | |
20 | $self->{set} = sub { }; |
22 | $self->{set} = sub { }; |
21 | $self->{format} = sub { "ERROR" }; |
23 | $self->{format} = sub { "???" }; |
22 | |
|
|
23 | $self; |
|
|
24 | } |
24 | } |
25 | |
25 | |
26 | sub configure { |
26 | sub configure { |
27 | my ($self, $timesys, $main, $interval, $count) = @_; |
27 | my ($self, $timesys, $main, $interval, $count) = @_; |
28 | |
28 | |
… | |
… | |
52 | if (!$self->{moves}) { |
52 | if (!$self->{moves}) { |
53 | util::format_time $_[0] - $low; |
53 | util::format_time $_[0] - $low; |
54 | } else { |
54 | } else { |
55 | my $time = int (($_[0] - 1) % $interval + 1); |
55 | my $time = int (($_[0] - 1) % $interval + 1); |
56 | |
56 | |
57 | sprintf "%s/%d [%d]", |
57 | sprintf "%s/%d =%d", |
58 | util::format_time $time, |
58 | util::format_time $time, |
59 | $self->{moves}, |
59 | $self->{moves}, |
|
|
60 | $self->{moves} > 1 |
60 | $time / ($self->{moves} || 1); |
61 | ? $time / $self->{moves} |
61 | |
62 | : $interval; |
62 | } |
63 | } |
63 | }; |
64 | }; |
64 | |
65 | |
65 | } else { |
66 | } else { |
66 | # none, or unknown |
67 | # none, or unknown |
… | |
… | |
70 | } |
71 | } |
71 | |
72 | |
72 | sub refresh { |
73 | sub refresh { |
73 | my ($self, $timestamp) = @_; |
74 | my ($self, $timestamp) = @_; |
74 | my $timer = $self->{time} + $self->{start} - $timestamp; |
75 | my $timer = $self->{time} + $self->{start} - $timestamp; |
75 | |
76 | |
76 | # we round the timer value slightly... the protocol isn't exact anyways, |
77 | # we round the timer value slightly... the protocol isn't exact anyways, |
77 | # and this gives smoother timers ;) |
78 | # and this gives smoother timers ;) |
78 | my @format = $self->{format}->(int ($timer + 0.4)); |
79 | my $timer2 = int $timer + 0.4; |
|
|
80 | |
|
|
81 | if ($timer2 <= 0) { |
|
|
82 | $timer2 = 0 if $timer2 < 0; |
|
|
83 | $self->set_text ("TIME OUT"); |
|
|
84 | } else { |
79 | $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4))); |
85 | $self->set_text ($self->{format}->($timer2)); |
|
|
86 | } |
80 | |
87 | |
81 | $timer - int $timer; |
88 | $timer - int $timer; |
82 | } |
89 | } |
83 | |
90 | |
84 | sub set_time { |
91 | sub set_time { |
85 | my ($self, $time) = @_; |
92 | my ($self, $time, $moves) = @_; |
86 | |
93 | |
87 | # we ignore requests to re-set the time of a running clock. |
94 | # we ignore requests to re-set the time of a running clock. |
88 | # this is the easiest way to ensure that commentary etc. |
95 | # this is the easiest way to ensure that commentary etc. |
89 | # doesn't re-set the clock. yes, this is frickle design, |
96 | # doesn't re-set the clock. yes, this is frickle design, |
90 | # but I think the protocol is to blame here, which gives |
97 | # but I think the protocol is to blame here, which gives |
91 | # very little time information. (cgoban2 also has had quite |
98 | # very little time information. (cgoban2 also has had quite |
92 | # a lot of small time update problems...) |
99 | # a lot of small time update problems...) |
93 | unless ($self->{timeout}) { |
100 | unless ($self->{timeout}) { |
94 | $self->{set}->($time->[0], $time->[1]); |
101 | $self->{set}->($time, $moves); |
95 | $self->refresh ($self->{start}); |
102 | $self->refresh ($self->{start}); |
96 | } |
103 | } |
97 | } |
104 | } |
98 | |
105 | |
99 | sub start { |
106 | sub start { |
… | |
… | |
117 | my ($self) = @_; |
124 | my ($self) = @_; |
118 | |
125 | |
119 | remove Glib::Source delete $self->{timeout} if $self->{timeout}; |
126 | remove Glib::Source delete $self->{timeout} if $self->{timeout}; |
120 | } |
127 | } |
121 | |
128 | |
122 | sub destroy { |
129 | package game::userpanel; |
|
|
130 | |
|
|
131 | use Glib::Object::Subclass |
|
|
132 | Gtk2::HBox, |
|
|
133 | properties => [ |
|
|
134 | Glib::ParamSpec->IV ("colour", "colour", "User Colour", 0, 1, 0, [qw(construct-only writable)]), |
|
|
135 | ]; |
|
|
136 | |
|
|
137 | sub INIT_INSTANCE { |
123 | my ($self) = @_; |
138 | my ($self) = @_; |
124 | $self->stop; |
|
|
125 | $self->SUPER::destroy; |
|
|
126 | } |
|
|
127 | |
139 | |
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); |
140 | $self->add (my $vbox = new Gtk2::VBox); |
139 | |
141 | |
140 | $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); |
142 | $vbox->add ($self->{name} = new Gtk2::Label $self->{name}); |
141 | $vbox->add ($self->{info} = new Gtk2::Label ""); |
143 | $vbox->add ($self->{info} = new Gtk2::Label ""); |
142 | $vbox->add (($self->{clock} = new game::goclock)->widget); |
144 | $vbox->add ($self->{clock} = new game::goclock); Scalar::Util::weaken $self->{clock}; |
143 | |
145 | |
144 | $vbox->add ($self->{imagebox} = new Gtk2::VBox); |
146 | $vbox->add ($self->{imagebox} = new Gtk2::VBox); |
145 | |
147 | |
146 | $self; |
148 | $self; |
147 | } |
149 | } |
148 | |
150 | |
149 | sub configure { |
151 | sub configure { |
150 | my ($self, $user, $rules) = @_; |
152 | my ($self, $app, $user, $rules) = @_; |
151 | |
153 | |
152 | if ($self->{name}->get_text ne $user->as_string) { |
154 | if ($self->{name}->get_text ne $user->as_string) { |
153 | $self->{name}->set_text ($user->as_string); |
155 | $self->{name}->set_text ($user->as_string); |
154 | |
156 | |
155 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
157 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
156 | $self->{imagebox}->add (gtk::image_from_data undef); |
158 | $self->{imagebox}->add (gtk::image_from_data undef); |
157 | $self->{imagebox}->show_all; |
159 | $self->{imagebox}->show_all; |
158 | |
160 | |
159 | if ($user->has_pic) { |
161 | if ($user->has_pic) { |
160 | # the big picture... |
162 | # the big picture... |
161 | appwin::userpic ($user->{name}, sub { |
163 | $app->userpic ($user->{name}, sub { |
162 | return unless $self->{imagebox}; |
164 | return unless $self->{imagebox}; |
|
|
165 | |
163 | if ($_[0]) { |
166 | if ($_[0]) { |
164 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
167 | $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; |
165 | $self->{imagebox}->add (gtk::image_from_data $_[0]); |
168 | $self->{imagebox}->add (gtk::image_from_data $_[0]); |
166 | $self->{imagebox}->show_all; |
169 | $self->{imagebox}->show_all; |
167 | } |
170 | } |
… | |
… | |
170 | } |
173 | } |
171 | |
174 | |
172 | $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); |
175 | $self->{clock}->configure (@{$rules}{qw(timesys time interval count)}); |
173 | } |
176 | } |
174 | |
177 | |
175 | sub set_state { |
178 | sub set_captures { |
176 | my ($self, $captures, $timer, $when) = @_; |
179 | my ($self, $captures) = @_; |
|
|
180 | |
|
|
181 | $self->{info}->set_text ("$captures pris."); |
|
|
182 | } |
|
|
183 | |
|
|
184 | sub set_timer { |
|
|
185 | my ($self, $when, $time, $moves) = @_; |
177 | |
186 | |
178 | $self->{clock}->stop unless $when; |
187 | $self->{clock}->stop unless $when; |
179 | $self->{clock}->set_time ($timer); |
188 | $self->{clock}->set_time ($time, $moves); |
180 | $self->{clock}->start ($when) if $when; |
189 | $self->{clock}->start ($when) if $when; |
181 | |
|
|
182 | $self->{info}->set_text ("$captures pris."); |
|
|
183 | } |
190 | } |
184 | |
191 | |
185 | package game; |
192 | package game; |
|
|
193 | |
|
|
194 | use Scalar::Util qw(weaken); |
186 | |
195 | |
187 | use KGS::Constants; |
196 | use KGS::Constants; |
188 | use KGS::Game::Board; |
197 | use KGS::Game::Board; |
189 | |
198 | |
|
|
199 | use Gtk2::GoBoard; |
|
|
200 | use Gtk2::GoBoard::Constants; |
|
|
201 | |
|
|
202 | use base KGS::Game; |
190 | use base KGS::Listener::Game; |
203 | use base KGS::Listener::Game; |
191 | use base KGS::Game; |
|
|
192 | |
204 | |
193 | use base gtk::widget; |
205 | use Glib::Object::Subclass |
|
|
206 | Gtk2::Window; |
194 | |
207 | |
195 | use POSIX qw(ceil); |
208 | use POSIX qw(ceil); |
196 | |
209 | |
197 | sub new { |
210 | sub new { |
198 | my $self = shift; |
211 | my ($self, %arg) = @_; |
199 | $self = $self->SUPER::new(@_); |
212 | $self = $self->Glib::Object::new; |
|
|
213 | $self->{$_} = delete $arg{$_} for keys %arg; |
200 | |
214 | |
201 | $self->listen($self->{conn}); |
|
|
202 | |
|
|
203 | $self->{window} = new Gtk2::Window 'toplevel'; |
|
|
204 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
215 | gtk::state $self, "game::window", undef, window_size => [600, 500]; |
205 | |
216 | |
206 | $self->{window}->signal_connect(delete_event => sub { |
217 | $self->signal_connect (destroy => sub { |
207 | $self->part; |
218 | $self->unlisten; |
208 | $self->destroy; |
219 | delete $self->{app}{game}{$self->{channel}}; |
209 | 1; |
220 | %{$_[0]} = (); |
210 | }); |
221 | });#d# |
211 | |
222 | |
212 | $self->{window}->add($self->{hpane} = new Gtk2::HPaned); |
223 | $self->add (my $hpane = new Gtk2::HPaned); |
213 | gtk::state $self->{hpane}, "game::hpane", undef, position => 500; |
224 | gtk::state $hpane, "game::hpane", undef, position => 500; |
214 | |
225 | |
215 | # LEFT PANE |
226 | # LEFT PANE |
216 | |
227 | |
217 | $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0); |
228 | $hpane->pack1 (($self->{left} = new Gtk2::VBox), 1, 0); |
218 | |
229 | |
219 | $self->{boardbox} = new Gtk2::VBox; |
230 | $self->{boardbox} = new Gtk2::VBox; |
220 | |
231 | |
221 | $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); |
232 | $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); |
222 | |
233 | |
223 | # challenge |
|
|
224 | |
|
|
225 | $self->{challenge} = new challenge channel => $self->{channel}; |
|
|
226 | |
|
|
227 | # board box (aspect/canvas) |
234 | # board box (aspect/canvas) |
228 | |
235 | |
229 | $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); |
236 | #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); |
|
|
237 | |
|
|
238 | # RIGHT PANE |
|
|
239 | |
|
|
240 | $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1); |
|
|
241 | $hpane->set (position_set => 1); |
|
|
242 | |
|
|
243 | $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0); |
230 | |
244 | |
231 | { |
245 | { |
232 | $frame->add(my $vbox = new Gtk2::VBox); |
246 | $frame->add (my $vbox = new Gtk2::VBox); |
233 | $vbox->add($self->{title} = new Gtk2::Label $title); |
247 | $vbox->add ($self->{title} = new Gtk2::Label $title); |
234 | |
248 | |
|
|
249 | $vbox->add (my $hbox = new Gtk2::HBox); |
|
|
250 | |
|
|
251 | $hbox->pack_start (($self->{board_label} = new Gtk2::Label), 0, 1, 0); |
|
|
252 | |
235 | $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0; |
253 | $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 5, 0; |
236 | |
254 | |
237 | $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); |
255 | $hbox->pack_start ((my $scale = new Gtk2::HScale $self->{moveadj}), 1, 1, 0); |
238 | $scale->set_draw_value (0); |
256 | $scale->set_draw_value (0); |
239 | $scale->set_digits (0); |
257 | $scale->set_digits (0); |
240 | |
258 | |
241 | $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board }); |
259 | $self->{moveadj}->signal_connect (value_changed => sub { |
|
|
260 | $self->{showmove} = int $self->{moveadj}->get_value; |
|
|
261 | $self->update_board; |
|
|
262 | }); |
242 | } |
263 | } |
243 | |
264 | |
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); |
|
|
246 | $self->{board_label} = $aspect_frame->get_label_widget; |
|
|
247 | |
|
|
248 | $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea); |
|
|
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 | |
|
|
254 | # RIGHT PANE |
|
|
255 | |
|
|
256 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1); |
|
|
257 | $self->{hpane}->set(position_set => 1); |
|
|
258 | gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; |
|
|
259 | |
|
|
260 | $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); |
|
|
261 | $sw->set_policy("automatic", "always"); |
|
|
262 | |
|
|
263 | $sw->add(($self->{userlist} = new userlist)->widget); |
|
|
264 | |
|
|
265 | $self->{vpane}->add(my $vbox = new Gtk2::VBox); |
|
|
266 | |
|
|
267 | $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0); |
265 | $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0); |
|
|
266 | |
268 | $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget); |
267 | $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_) |
269 | $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget); |
268 | for COLOUR_WHITE, COLOUR_BLACK; |
|
|
269 | |
|
|
270 | $vbox->pack_start ((my $buttonbox = new Gtk2::HButtonBox), 0, 1, 0); |
|
|
271 | |
|
|
272 | $buttonbox->add ($self->{button_pass} = |
|
|
273 | Gtk2::Button->Glib::Object::new (label => "Pass", no_show_all => 1, visible => 0)); |
|
|
274 | $self->{button_pass}->signal_connect (clicked => sub { |
|
|
275 | $self->{board_click}->(255, 255) if $self->{board_click}; |
|
|
276 | }); |
|
|
277 | $buttonbox->add ($self->{button_undo} = |
|
|
278 | Gtk2::Button->Glib::Object::new (label => "Undo", no_show_all => 1, visible => 0)); |
|
|
279 | $self->{button_undo}->signal_connect (clicked => sub { |
|
|
280 | $self->send (req_undo => channel => $self->{channel}); |
|
|
281 | }); |
|
|
282 | $buttonbox->add ($self->{button_resign} = |
|
|
283 | Gtk2::Button->Glib::Object::new (label => "Resign", no_show_all => 1, visible => 0)); |
|
|
284 | $self->{button_resign}->signal_connect (clicked => sub { |
|
|
285 | $self->send (resign_game => channel => $self->{channel}, player => $self->{colour}); |
|
|
286 | }); |
270 | |
287 | |
271 | $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0); |
288 | $vbox->pack_start (($self->{chat} = new superchat), 1, 1, 0); |
272 | |
289 | |
273 | $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); |
290 | $self->set_channel ($self->{channel}); |
274 | $self->{entry}->signal_connect(activate => sub { |
|
|
275 | my $text = $self->{entry}->get_text; |
|
|
276 | $self->say($text) if $text =~ /\S/; |
|
|
277 | $self->{entry}->set_text(""); |
|
|
278 | }); |
|
|
279 | |
291 | |
280 | $self->event_update_game; |
292 | $self->show_all; |
|
|
293 | |
281 | $self; |
294 | $self; |
|
|
295 | } |
|
|
296 | |
|
|
297 | sub set_channel { |
|
|
298 | my ($self, $channel) = @_; |
|
|
299 | |
|
|
300 | $self->{channel} = $channel; |
|
|
301 | |
|
|
302 | if ($self->{channel} > 0) { |
|
|
303 | $self->listen ($self->{conn}); |
|
|
304 | |
|
|
305 | $self->{rules_inlay} = $self->{chat}->new_switchable_inlay ("Game Setup:", sub { $self->draw_setup (@_) }, 1); |
|
|
306 | $self->{users_inlay} = $self->{chat}->new_switchable_inlay ("Users:", sub { $self->draw_users (@_) }, 1); |
|
|
307 | |
|
|
308 | $self->signal_connect (delete_event => sub { $self->part; 1 }); |
|
|
309 | $self->{chat}->signal_connect (command => sub { |
|
|
310 | my ($chat, $cmd, $arg) = @_; |
|
|
311 | if ($cmd eq "rsave") { |
|
|
312 | Storable::nstore { tree => $self->{tree}, curnode => $self->{curnode}, move => $self->{move} }, $arg;#d# |
|
|
313 | } else { |
|
|
314 | $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, game => $self); |
|
|
315 | } |
|
|
316 | }); |
|
|
317 | } |
282 | } |
318 | } |
283 | |
319 | |
284 | sub event_update_users { |
320 | sub event_update_users { |
285 | my ($self, $add, $update, $remove) = @_; |
321 | my ($self, $add, $update, $remove) = @_; |
286 | |
322 | |
287 | $self->{userlist}->update ($add, $update, $remove); |
323 | # $self->{userlist}->update ($add, $update, $remove); |
|
|
324 | |
|
|
325 | $self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy |
|
|
326 | for @$remove; |
|
|
327 | |
|
|
328 | $self->{users_inlay}->refresh; |
|
|
329 | |
|
|
330 | my %important; |
|
|
331 | $important{$self->{black}{name}}++; |
|
|
332 | $important{$self->{white}{name}}++; |
|
|
333 | $important{$self->{owner}{name}}++; |
|
|
334 | |
|
|
335 | if (my @users = grep $important{$_->{name}}, @$add) { |
|
|
336 | $self->{chat}->append_text ("\n<header>Joins:</header>"); |
|
|
337 | $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
|
|
338 | } |
|
|
339 | if (my @users = grep $important{$_->{name}}, @$remove) { |
|
|
340 | $self->{chat}->append_text ("\n<header>Parts:</header>"); |
|
|
341 | $self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users; |
|
|
342 | } |
288 | } |
343 | } |
289 | |
344 | |
290 | sub join { |
345 | sub join { |
291 | my ($self) = @_; |
346 | my ($self) = @_; |
292 | return if $self->{joined}; |
347 | return if $self->{joined}; |
293 | |
348 | |
294 | $self->SUPER::join; |
349 | $self->SUPER::join; |
295 | |
|
|
296 | $self->{window}->show_all; |
|
|
297 | } |
350 | } |
298 | |
351 | |
299 | sub part { |
352 | sub update_cursor { |
300 | my ($self) = @_; |
353 | my ($self) = @_; |
301 | |
354 | |
302 | $self->SUPER::part; |
355 | my $running = $self->{showmove} == @{$self->{path}} && $self->is_active; |
303 | $self->destroy; |
|
|
304 | } |
|
|
305 | |
356 | |
306 | sub configure_event { |
|
|
307 | my ($widget, $event, $self) = @_; |
|
|
308 | delete $self->{stack}; |
|
|
309 | delete $self->{pixbuf}; |
|
|
310 | delete $self->{board_shown}; |
357 | delete $self->{board_click}; |
311 | delete $self->{background}; |
|
|
312 | $self->repaint_board; |
|
|
313 | 0; |
|
|
314 | } |
|
|
315 | |
358 | |
316 | sub expose_event { |
359 | if ($self->{teacher} eq $self->{app}{conn}) { |
317 | my ($widget, $event, $self) = @_; |
360 | #TODO# # teaching mode not implemented |
|
|
361 | $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1); |
|
|
362 | $self->{button_undo}->hide; |
|
|
363 | $self->{button_resign}->hide; |
|
|
364 | $self->{board}->set (cursor => undef); |
318 | |
365 | |
319 | $self->{pixbuf} or return; |
366 | } elsif ($running && $self->{colour} != COLOUR_NONE) { |
|
|
367 | # during game |
|
|
368 | $self->{button_undo}->show; |
|
|
369 | $self->{button_resign}->show; |
320 | |
370 | |
321 | my $area = $event->area; |
371 | if ($self->{cur_board}{score}) { |
322 | |
372 | # during scoring |
323 | $self->redraw ($area); |
373 | $self->{button_pass}->set (label => "Done", sensitive => 1, visible => 1); |
324 | |
374 | $self->{board}->set (cursor => sub { |
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)) { |
375 | $_[0] & (MARK_B | MARK_W) |
370 | # the -0.5's are a mystery to me |
376 | ? $_[0] ^ MARK_GRAYED |
371 | $::shadow_img->composite ( |
377 | : $_[0]; |
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 | } |
378 | }); |
377 | |
379 | $self->{board_click} = sub { |
378 | # first the big stones (handicap stones could be different) |
380 | if ($_[0] == 255) { |
379 | for ([MARK_B, $mark & MARK_MOVE ? 255 : 255], |
381 | $self->{button_pass}->sensitive (0); |
380 | [MARK_W, $mark & MARK_MOVE ? 255 : 255], |
382 | $self->done; |
381 | [MARK_GRAY_B, 128], |
383 | } else { |
382 | [MARK_GRAY_W, 128]) { |
384 | $self->send (mark_dead => |
383 | my ($mask, $alpha) = @$_; |
385 | channel => $self->{channel}, |
384 | if ($mark & $mask) { |
386 | x => $_[0], |
385 | $stone->composite ( |
387 | y => $_[1], |
386 | $base, 0, 0, $size, $size, 0, 0, |
388 | dead => !($self->{cur_board}{board}[$_[0]][$_[1]] & MARK_GRAYED), |
387 | $size / $stone->get_width, $size / $stone->get_height, |
|
|
388 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha |
|
|
389 | ); |
389 | ); |
390 | } |
390 | } |
391 | } |
391 | }; |
392 | |
392 | |
393 | # then the small stones |
393 | } elsif (1 - $self->{colour} == $self->{cur_board}{last}) { |
394 | for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], |
394 | # normal move |
395 | [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { |
395 | $self->{button_pass}->set (label => "Pass", sensitive => 1, visible => 1); |
396 | my ($mask, $img) = @$_; |
396 | $self->{board}->set (cursor => sub { |
397 | if ($mark & $mask) { |
397 | # if is_valid_move oder so#TODO# |
398 | $img->composite ( |
398 | $_[0] & (MARK_B | MARK_W) |
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 | ); |
399 | ? $_[0] |
|
|
400 | : $_[0] | MARK_GRAYED | ($self->{colour} == COLOUR_WHITE ? MARK_W : MARK_B); |
403 | } |
401 | }); |
|
|
402 | $self->{board_click} = sub { |
|
|
403 | $self->send (game_move => channel => $self->{channel}, x => $_[0], y => $_[1]); |
|
|
404 | $self->{board}->set (cursor => undef); |
|
|
405 | delete $self->{board_click}; |
|
|
406 | $self->{button_pass}->sensitive (0); |
404 | } |
407 | }; |
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 { |
408 | } else { |
498 | $pixbuf = $self->{background}->copy; |
409 | $self->{button_pass}->set (label => "Pass", sensitive => 0, visible => 1); |
499 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
|
|
500 | } |
410 | } |
501 | } else { |
411 | } else { |
502 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
412 | $self->{button_undo}->hide; |
503 | |
413 | $self->{button_resign}->hide; |
504 | my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); |
414 | $self->{button_pass}->hide; |
505 | |
415 | $self->{board}->set (cursor => undef); |
506 | if ($s < $bw && $s < $bh) { |
416 | #TODO# # implement coordinate-grabbing |
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 | } |
417 | } |
574 | |
|
|
575 | $self->{pixbuf} = $pixbuf; |
|
|
576 | |
|
|
577 | for my $x (1 .. $size) { |
|
|
578 | for my $y (1 .. $size) { |
|
|
579 | my $rand = ($x ^ $y ^ 0x5555); |
|
|
580 | |
|
|
581 | my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs); |
|
|
582 | |
|
|
583 | if ($::config->{randomize}) { |
|
|
584 | $dx += ($rand % 7) - 3; |
|
|
585 | $dy += ($rand / 3 % 7) - 3; |
|
|
586 | } |
|
|
587 | |
|
|
588 | my $shadow = $edge * 0.05; |
|
|
589 | my $area = [$dx, $dy, $edge + $shadow, $edge + $shadow]; |
|
|
590 | |
|
|
591 | my $mark = $self->{board}{board}[$x-1][$y-1]; |
|
|
592 | my $old = $oldboard ? $oldboard->{board}[$x-1][$y-1] : 0; |
|
|
593 | |
|
|
594 | if ($oldboard) { |
|
|
595 | next if $old == $mark; # no change |
|
|
596 | |
|
|
597 | $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy); |
|
|
598 | $expose_area = $expose_area |
|
|
599 | ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area) |
|
|
600 | : new Gtk2::Gdk::Rectangle @$area; |
|
|
601 | } |
|
|
602 | |
|
|
603 | if ($mark) { |
|
|
604 | my $pb = $self->create_stack($mark, $edge, $rand); |
|
|
605 | |
|
|
606 | $pb->composite ($pixbuf, @$area, |
|
|
607 | $dx, $dy, 1, 1, $::config->{speed} ? INTERP_NEAREST : INTERP_NEAREST, 255); |
|
|
608 | |
|
|
609 | # labels are handled here because they are quite rare |
|
|
610 | if ($mark & MARK_LABEL) { |
|
|
611 | my $white = $mark & (MARK_W | MARK_GRAY_W) ? 0 : 1; |
|
|
612 | |
|
|
613 | if ($white) { |
|
|
614 | pixbuf_text $pixbuf, 0, |
|
|
615 | $k[$x] + $ofs * 0.1, $k[$y] + $ofs * 0.1, $ofs * 0.7, |
|
|
616 | $self->{board}{label}[$x-1][$y-1]; |
|
|
617 | } |
|
|
618 | pixbuf_text $pixbuf, $white, |
|
|
619 | $k[$x], $k[$y], $ofs * 0.7, |
|
|
620 | $self->{board}{label}[$x-1][$y-1]; |
|
|
621 | } |
|
|
622 | } |
|
|
623 | } |
|
|
624 | } |
|
|
625 | |
|
|
626 | $self->{board_shown} = Storable::dclone $self->{board}; |
|
|
627 | #d# save |
|
|
628 | #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable"; |
|
|
629 | |
|
|
630 | $expose_area; |
|
|
631 | } |
418 | } |
632 | |
419 | |
633 | sub redraw { |
420 | sub update_timers { |
634 | my ($self, $area) = @_; |
421 | my ($self, $timers) = @_; |
635 | |
422 | |
636 | if ($area && $self->{pixbuf}) { |
423 | my $running = $self->{showmove} == @{$self->{path}} && !$self->{teacher}; |
637 | my ($x, $y, $w, $h) = $area->values; |
|
|
638 | |
424 | |
639 | $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, |
425 | for my $colour (COLOUR_BLACK, COLOUR_WHITE) { |
640 | $x, $y, $x, $y, $w, $h, |
426 | my $t = $timers->[$colour]; |
641 | "normal", 0, 0); |
427 | $self->{userpanel}[$colour]->set_timer ( |
642 | $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, |
428 | $running && $self->{lastmove_colour} == 1 - $colour && $t->[0], |
643 | $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; |
429 | $t->[1], $t->[2]); |
644 | } |
430 | } |
645 | } |
431 | } |
646 | |
432 | |
647 | sub update_board { |
433 | sub update_board { |
648 | my ($self) = @_; |
434 | my ($self) = @_; |
649 | return unless $self->{path}; |
435 | return unless $self->{path}; |
650 | |
436 | |
651 | #$self->{update_board_cb} ||= add Glib::Idle sub { |
|
|
652 | my $move = int $self->{moveadj}->get_value; |
|
|
653 | |
|
|
654 | my $running = $move == @{$self->{path}}; |
|
|
655 | |
|
|
656 | $self->{board_label}->set_text ("Move " . ($move - 1)); |
437 | $self->{board_label}->set_text ("Move " . ($self->{showmove} - 1)); |
657 | |
438 | |
658 | $self->{board} = new KGS::Game::Board $self->{size}; |
439 | $self->{cur_board} = new KGS::Game::Board $self->{size}; |
659 | $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); |
440 | $self->{cur_board}->interpret_path ([@{$self->{path}}[0 .. $self->{showmove} - 1]]); |
660 | |
441 | |
661 | for my $colour (WHITE, BLACK) { |
442 | $self->{userpanel}[$_]->set_captures ($self->{cur_board}{captures}[$_]) |
662 | $self->{userpanel}[$colour]->set_state ( |
443 | for COLOUR_WHITE, COLOUR_BLACK; |
663 | $self->{board}{captures}[$colour], |
444 | |
664 | $self->{board}{timer}[$colour], |
445 | if ($self->{showmove} == @{$self->{path}}) { |
665 | ($running && $self->{lastmove_colour} == !$colour) |
446 | $self->{timers} = [ |
666 | ? $self->{lastmove_time} : 0 |
447 | [$self->{lastmove_time}, @{$self->{cur_board}{timer}[0]}], |
667 | ); |
448 | [$self->{lastmove_time}, @{$self->{cur_board}{timer}[1]}], |
668 | } |
449 | ]; |
669 | |
450 | $self->update_timers ($self->{timers}); |
670 | $self->redraw ($self->repaint_board); |
451 | } else { |
671 | |
452 | $self->update_timers ([ |
672 | # delete $self->{update_board_cb}; |
453 | [0, @{$self->{cur_board}{timer}[0]}], |
|
|
454 | [0, @{$self->{cur_board}{timer}[1]}], |
|
|
455 | ]); |
673 | #} |
456 | } |
|
|
457 | |
|
|
458 | $self->{board}->set_board ($self->{cur_board}); |
|
|
459 | |
|
|
460 | $self->update_cursor; |
674 | } |
461 | } |
675 | |
462 | |
676 | sub event_update_tree { |
463 | sub event_update_tree { |
677 | my ($self) = @_; |
464 | my ($self) = @_; |
678 | |
465 | |
… | |
… | |
725 | }sgexi; |
512 | }sgexi; |
726 | |
513 | |
727 | $text .= $_; |
514 | $text .= $_; |
728 | } |
515 | } |
729 | |
516 | |
730 | $self->{text}->append_text ($text); |
517 | $self->{chat}->append_text ($text); |
731 | } |
518 | } |
732 | |
519 | |
733 | sub event_join { |
520 | sub event_join { |
734 | my ($self) = @_; |
521 | my ($self) = @_; |
|
|
522 | |
735 | $self->SUPER::event_join; |
523 | $self->SUPER::event_join (@_); |
|
|
524 | $self->init_tree; |
|
|
525 | $self->event_update_game; |
736 | } |
526 | } |
737 | |
527 | |
738 | sub event_part { |
528 | sub event_part { |
739 | my ($self) = @_; |
529 | my ($self) = @_; |
|
|
530 | |
740 | $self->SUPER::event_part; |
531 | $self->SUPER::event_part; |
741 | $self->destroy; |
532 | $self->destroy; |
742 | } |
533 | } |
743 | |
534 | |
744 | sub event_move { |
535 | sub event_move { |
745 | my ($self, $pass) = @_; |
536 | my ($self, $pass) = @_; |
746 | sound::play 1, $pass ? "pass" : "move"; |
537 | sound::play 1, $pass ? "pass" : "move"; |
|
|
538 | |
|
|
539 | if ($self->{undo_inlay}) { |
|
|
540 | (delete $self->{undo_inlay})->clear; |
|
|
541 | } |
747 | } |
542 | } |
748 | |
543 | |
749 | sub event_update_game { |
544 | sub event_update_game { |
750 | my ($self) = @_; |
545 | my ($self) = @_; |
|
|
546 | |
751 | $self->SUPER::event_update_game; |
547 | $self->SUPER::event_update_game; |
752 | |
548 | |
753 | my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window"; |
549 | return unless $self->{joined}; |
|
|
550 | |
|
|
551 | $self->{colour} = $self->player_colour ($self->{conn}{name}); |
|
|
552 | |
|
|
553 | my $title = defined $self->{channel} |
|
|
554 | ? $self->owner->as_string . " " . $self->opponent_string |
|
|
555 | : "Game Window"; |
754 | $self->{window}->set_title("KGS Game $title"); |
556 | $self->set_title ("KGS Game $title"); |
755 | $self->{title}->set_text ($title); |
557 | $self->{title}->set_text ($title); |
756 | |
558 | |
757 | $self->{user}[BLACK] = $self->{user1}; |
559 | $self->{user}[COLOUR_BLACK] = $self->{black}; |
758 | $self->{user}[WHITE] = $self->{user2}; |
560 | $self->{user}[COLOUR_WHITE] = $self->{white}; |
759 | |
561 | |
760 | # show board |
562 | # show board |
|
|
563 | if ($self->is_inprogress) { |
|
|
564 | if (!$self->{boardbox}->parent) { |
|
|
565 | $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size}); |
|
|
566 | $self->{left}->add ($self->{boardbox}); |
|
|
567 | $self->{board}->signal_connect (button_release => sub { |
|
|
568 | if ($_[1] == 1) { |
|
|
569 | $self->{board_click}->($_[2], $_[3]) if $self->{board_click}; |
|
|
570 | } |
|
|
571 | }); |
|
|
572 | } |
|
|
573 | if (my $ch = delete $self->{challenge}) { |
|
|
574 | $_->{inlay}->destroy for values %$ch; |
|
|
575 | } |
|
|
576 | $self->update_cursor; |
|
|
577 | } |
|
|
578 | |
|
|
579 | $self->{left}->show_all; |
|
|
580 | |
|
|
581 | $self->{rules_inlay}->refresh; |
761 | |
582 | |
762 | $self->{left}->remove ($_) for $self->{left}->get_children; |
583 | } |
|
|
584 | |
|
|
585 | sub draw_setup { |
|
|
586 | my ($self, $inlay) = @_; |
|
|
587 | |
|
|
588 | return unless $self->{joined}; |
|
|
589 | |
|
|
590 | my $rules = $self->{rules}; |
|
|
591 | |
|
|
592 | my $text = ""; |
|
|
593 | |
|
|
594 | $text .= "\nTeacher: <user>" . (util::toxml $self->{teacher}) . "</user>" |
|
|
595 | if $self->{teacher}; |
|
|
596 | |
|
|
597 | $text .= "\nOwner: <user>" . (util::toxml $self->{owner}->as_string) . "</user>" |
|
|
598 | if $self->{owner}->is_valid; |
|
|
599 | |
763 | if ($self->is_valid) { |
600 | if ($self->is_inprogress) { |
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>" |
601 | $text .= "\nPlayers: <user>" . (util::toxml $self->{white}->as_string) . "</user>" |
785 | . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>" |
602 | . " vs. <user>" . (util::toxml $self->{black}->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 | |
603 | } |
808 | $self->{text}->append_text ($text); |
604 | $text .= "\nType: " . util::toxml $gametype{$self->type}; |
809 | } |
|
|
810 | |
|
|
811 | sub 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 | |
605 | |
821 | $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; |
606 | $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}}; |
822 | |
607 | |
823 | $text .= "\nTime: "; |
608 | $text .= "\nTime: "; |
824 | |
609 | |
… | |
… | |
826 | $text .= "UNLIMITED"; |
611 | $text .= "UNLIMITED"; |
827 | } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { |
612 | } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) { |
828 | $text .= util::format_time $rules->{time}; |
613 | $text .= util::format_time $rules->{time}; |
829 | $text .= " ABS"; |
614 | $text .= " ABS"; |
830 | } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { |
615 | } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) { |
831 | $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count}; |
616 | $text .= util::format_time $rules->{time}; |
832 | $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; |
617 | $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count}; |
833 | } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { |
618 | } elsif ($rules->{timesys} == TIMESYS_CANADIAN) { |
834 | $text .= util::format_time $rules->{time}; |
619 | $text .= util::format_time $rules->{time}; |
835 | $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; |
620 | $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count}; |
836 | } |
621 | } |
837 | |
622 | |
|
|
623 | $text .= "\nFlags:"; |
|
|
624 | $text .= " private" if $self->is_private; |
|
|
625 | $text .= " started" if $self->is_inprogress; |
|
|
626 | $text .= " adjourned" if $self->is_adjourned; |
|
|
627 | $text .= " scored" if $self->is_scored; |
|
|
628 | $text .= " saved" if $self->is_saved; |
|
|
629 | |
|
|
630 | if ($self->is_inprogress) { |
|
|
631 | $text .= "\nHandicap: " . $self->{handicap}; |
|
|
632 | $text .= "\nKomi: " . $self->{komi}; |
|
|
633 | $text .= "\nSize: " . $self->size_string; |
|
|
634 | } |
|
|
635 | |
|
|
636 | if ($self->is_scored) { |
|
|
637 | $text .= "\nResult: " . $self->score_string; |
|
|
638 | } |
|
|
639 | |
838 | $self->{text}->append_text ("<infoblock>$text</infoblock>"); |
640 | $inlay->append_text ("<infoblock>$text</infoblock>"); |
839 | } |
|
|
840 | |
641 | |
841 | sub inject_resign_game { |
642 | } |
|
|
643 | |
|
|
644 | sub event_update_rules { |
842 | my ($self, $msg) = @_; |
645 | my ($self, $rules) = @_; |
|
|
646 | |
|
|
647 | $self->{rules} = $rules; |
|
|
648 | |
|
|
649 | if ($self->{user}) { |
|
|
650 | $self->{userpanel}[$_]->configure ($self->{app}, $self->{user}[$_], $rules) |
|
|
651 | for COLOUR_BLACK, COLOUR_WHITE; |
|
|
652 | } |
|
|
653 | |
|
|
654 | sound::play 3, "gamestart"; |
|
|
655 | |
|
|
656 | $self->{rules_inlay}->refresh; |
|
|
657 | } |
|
|
658 | |
|
|
659 | sub event_resign_game { |
|
|
660 | my ($self, $player) = @_; |
843 | |
661 | |
844 | sound::play 3, "resign"; |
662 | sound::play 3, "resign"; |
845 | |
|
|
846 | $self->{text}->append_text ("\n<infoblock><header>Resign</header>" |
663 | $self->{chat}->append_text ("\n<infoblock><header>Resign</header>" |
847 | . "\n<user>" |
664 | . "\n<user>" |
848 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
665 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
849 | . "</user> resigned.</infoblock>"); |
666 | . "</user> resigned.</infoblock>"); |
850 | } |
667 | } |
851 | |
668 | |
|
|
669 | sub event_out_of_time { |
|
|
670 | my ($self, $player) = @_; |
|
|
671 | |
|
|
672 | sound::play 3, "timewin"; |
|
|
673 | $self->{chat}->append_text ("\n<infoblock><header>Out of Time</header>" |
|
|
674 | . "\n<user>" |
|
|
675 | . (util::toxml $self->{user}[$msg->{player}]->as_string) |
|
|
676 | . "</user> ran out of time and lost.</infoblock>"); |
|
|
677 | } |
|
|
678 | |
|
|
679 | sub event_done { |
|
|
680 | my ($self) = @_; |
|
|
681 | |
|
|
682 | if ($self->{done}[1 - $self->{colour}] && !$self->{done}[$self->{colour}]) { |
|
|
683 | $self->{chat}->append_text ("\n<infoblock><header>Done</header>" |
|
|
684 | . "\nYour opponent pressed done."); |
|
|
685 | } |
|
|
686 | } |
|
|
687 | |
852 | sub inject_final_result { |
688 | sub inject_final_result { |
853 | my ($self, $msg) = @_; |
689 | my ($self, $msg) = @_; |
854 | |
690 | |
855 | $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>" |
691 | $self->{chat}->append_text ("<infoblock>\n<header>Game Over</header>" |
856 | . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) |
692 | . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string) |
857 | . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) |
693 | . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string) |
858 | . "</infoblock>" |
694 | . "</infoblock>" |
859 | ); |
695 | ); |
860 | } |
696 | } |
861 | |
697 | |
862 | sub destroy { |
698 | sub inject_set_gametime { |
|
|
699 | my ($self, $msg) = @_; |
|
|
700 | |
|
|
701 | $self->{timers} = [ |
|
|
702 | [$msg->{NOW}, $msg->{black_time}, $msg->{black_moves}], |
|
|
703 | [$msg->{NOW}, $msg->{white_time}, $msg->{white_moves}], |
|
|
704 | ]; |
|
|
705 | |
|
|
706 | print "SGT\n";#d# |
|
|
707 | $self->update_timers ($self->{timers}) |
|
|
708 | if $self->{showmove} == @{$self->{path}}; |
|
|
709 | } |
|
|
710 | |
|
|
711 | sub inject_req_undo { |
|
|
712 | my ($self, $msg) = @_; |
|
|
713 | |
|
|
714 | my $inlay = $self->{undo_inlay} ||= $self->{chat}->new_inlay; |
|
|
715 | return if $inlay->{ignore}; |
|
|
716 | |
|
|
717 | sound::play 3, "warning" unless $inlay->{count}; |
|
|
718 | $inlay->{count}++; |
|
|
719 | |
|
|
720 | $inlay->clear; |
|
|
721 | $inlay->append_text ("\n<undo>Undo requested ($inlay->{count} times)</undo>\n"); |
|
|
722 | $inlay->append_button ("Grant", sub { |
|
|
723 | $inlay->clear; |
|
|
724 | $self->send (grant_undo => channel => $self->{channel}); |
|
|
725 | }); |
|
|
726 | $inlay->append_button ("Ignore", sub { |
|
|
727 | $inlay->clear; |
|
|
728 | $inlay->{ignore} = 1; |
|
|
729 | # but leave inlay, so further undo requests get counted |
|
|
730 | }); |
|
|
731 | |
|
|
732 | $self->{chat}->set_end; |
|
|
733 | } |
|
|
734 | |
|
|
735 | sub inject_new_game { |
|
|
736 | my ($self, $msg) = @_; |
|
|
737 | |
|
|
738 | $self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>"); |
|
|
739 | delete $self->{cid}; |
|
|
740 | } |
|
|
741 | |
|
|
742 | sub draw_challenge { |
863 | my ($self) = @_; |
743 | my ($self, $id) = @_; |
864 | $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy |
744 | |
865 | for BLACK, WHITE; |
745 | my $info = $self->{challenge}{$id}; |
866 | $self->SUPER::destroy; |
746 | my $inlay = $info->{inlay}; |
867 | delete $appwin::gamelist->{game}{$self->{channel}}; |
747 | my $rules = $info->{rules}; |
|
|
748 | |
|
|
749 | my $as_black = $info->{black}{name} eq $self->{conn}{name} ? 1 : 0;; |
|
|
750 | my $opponent = $as_black ? $info->{white} : $info->{black}; |
|
|
751 | |
|
|
752 | my ($size, $time, $interval, $count); |
|
|
753 | |
|
|
754 | if (!$self->{channel}) { |
|
|
755 | $inlay->append_text ("\nNotes: "); |
|
|
756 | $inlay->append_entry (\$info->{notes}, 20, ""); |
|
|
757 | $inlay->append_text ("\nGlobal Offer: "); |
|
|
758 | $inlay->append_optionmenu (\$info->{flags}, |
|
|
759 | 0 => "No", |
|
|
760 | 2 => "Yes", |
|
|
761 | ); |
|
|
762 | } else { |
|
|
763 | $inlay->append_text ("\nNotes: " . util::toxml $info->{notes}); |
|
|
764 | } |
|
|
765 | |
|
|
766 | $inlay->append_text ("\nType: "); |
|
|
767 | $inlay->append_optionmenu ( |
|
|
768 | \$info->{gametype}, |
|
|
769 | GAMETYPE_DEMONSTRATION , "Demonstration", |
|
|
770 | GAMETYPE_DEMONSTRATION | GAMETYPE_PRIVATE, "Demonstration (P)", |
|
|
771 | GAMETYPE_TEACHING , "Teaching", |
|
|
772 | GAMETYPE_TEACHING | GAMETYPE_PRIVATE, "Teaching (P)", |
|
|
773 | GAMETYPE_SIMUL , "Simul (not yet!)", |
|
|
774 | GAMETYPE_FREE , "Free", |
|
|
775 | GAMETYPE_RATED , "Rated", |
|
|
776 | sub { |
|
|
777 | $size->set_history (2) if $_[0] eq GAMETYPE_RATED; |
|
|
778 | }, |
|
|
779 | ); |
|
|
780 | |
|
|
781 | if ($self->{channel}) { |
|
|
782 | $inlay->append_text ("\nMy Colour: "); |
|
|
783 | $inlay->append_optionmenu ( |
|
|
784 | \$as_black, |
|
|
785 | 0 => "White", |
|
|
786 | 1 => "Black", |
|
|
787 | sub { |
|
|
788 | if ($info->{$_[0] ? "black" : "white"}{name} ne $self->{conn}{name}) { |
|
|
789 | ($info->{black}, $info->{white}) = ($info->{white}, $info->{black}); |
|
|
790 | } |
|
|
791 | } |
|
|
792 | ); |
|
|
793 | } |
|
|
794 | |
|
|
795 | $inlay->append_text ("\nRuleset: "); |
|
|
796 | $inlay->append_optionmenu ( |
|
|
797 | \$info->{rules}{ruleset}, |
|
|
798 | RULESET_JAPANESE , "Japanese", |
|
|
799 | RULESET_CHINESE , "Chinese", |
|
|
800 | RULESET_AGA , "AGA", |
|
|
801 | RULESET_NEW_ZEALAND, "New Zealand", |
|
|
802 | ); |
|
|
803 | |
|
|
804 | $inlay->append_text ("\nSize: "); |
|
|
805 | $size = $inlay->append_optionmenu ( |
|
|
806 | \$info->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38 |
|
|
807 | ); |
|
|
808 | |
|
|
809 | if ($self->{channel}) { |
|
|
810 | $inlay->append_text ("\nHandicap: "); |
|
|
811 | $inlay->append_optionmenu (\$info->{rules}{handicap}, map +($_, $_), 0..9); |
|
|
812 | |
|
|
813 | $inlay->append_text ("\nKomi: "); |
|
|
814 | $inlay->append_entry (\$info->{rules}{komi}, 5); |
|
|
815 | } |
|
|
816 | |
|
|
817 | $inlay->append_text ("\nTimesys: "); |
|
|
818 | $inlay->append_optionmenu ( |
|
|
819 | \$info->{rules}{timesys}, |
|
|
820 | &TIMESYS_NONE => "None", |
|
|
821 | &TIMESYS_ABSOLUTE => "Absolute", |
|
|
822 | &TIMESYS_BYO_YOMI => "Byo Yomi", |
|
|
823 | &TIMESYS_CANADIAN => "Canadian", |
|
|
824 | sub { |
|
|
825 | my ($new) = @_; |
|
|
826 | |
|
|
827 | if ($new eq TIMESYS_NONE) { |
|
|
828 | $time->hide; |
|
|
829 | $interval->hide; |
|
|
830 | $count->hide; |
|
|
831 | } else { |
|
|
832 | $time->show; |
|
|
833 | $time->set_text ($self->{app}{defaults}{time}); |
|
|
834 | if ($new eq TIMESYS_ABSOLUTE) { |
|
|
835 | $interval->hide; |
|
|
836 | $count->hide; |
|
|
837 | } else { |
|
|
838 | $interval->show; |
|
|
839 | $count->show; |
|
|
840 | if ($new eq TIMESYS_BYO_YOMI) { |
|
|
841 | $interval->set_text ($self->{app}{defaults}{byo_time}); |
|
|
842 | $count->set_text ($self->{app}{defaults}{byo_period}); |
|
|
843 | } elsif ($new eq TIMESYS_CANADIAN) { |
|
|
844 | $interval->set_text ($self->{app}{defaults}{can_time}); |
|
|
845 | $count->set_text ($self->{app}{defaults}{can_period}); |
|
|
846 | } |
|
|
847 | } |
|
|
848 | } |
|
|
849 | } |
|
|
850 | ); |
|
|
851 | |
|
|
852 | $inlay->append_text ("\nMain Time: "); |
|
|
853 | $time = $inlay->append_entry (\$info->{rules}{time}, 5); |
|
|
854 | $inlay->append_text ("\nInterval: "); |
|
|
855 | $interval = $inlay->append_entry (\$info->{rules}{interval}, 3); |
|
|
856 | $inlay->append_text ("\nPeriods/Stones: "); |
|
|
857 | $count = $inlay->append_entry (\$info->{rules}{count}, 2); |
|
|
858 | |
|
|
859 | $inlay->append_text ("\n"); |
|
|
860 | |
|
|
861 | if (!$self->{channel}) { |
|
|
862 | $inlay->append_button ("Create Challenge", sub { |
|
|
863 | $inlay->clear; |
|
|
864 | $self->{cid} = $self->{conn}->alloc_clientid; |
|
|
865 | $self->send (new_game => |
|
|
866 | channel => delete $self->{roomid}, |
|
|
867 | gametype => $info->{gametype}, |
|
|
868 | cid => $self->{cid}, |
|
|
869 | flags => $info->{flags}, |
|
|
870 | rules => $info->{rules}, |
|
|
871 | notes => $info->{notes}, |
|
|
872 | ); |
|
|
873 | }); |
|
|
874 | } else { |
|
|
875 | $inlay->append_button ("OK", sub { |
|
|
876 | $inlay->clear; |
|
|
877 | $self->send (challenge => |
|
|
878 | channel => $self->{channel}, |
|
|
879 | black => $info->{black}, |
|
|
880 | white => $info->{white}, |
|
|
881 | gametype => $info->{gametype}, |
|
|
882 | cid => $info->{cid}, |
|
|
883 | rules => $info->{rules}, |
|
|
884 | ); |
|
|
885 | }); |
|
|
886 | if (exists $self->{challenge}{""}) { |
|
|
887 | $inlay->append_button ("Reject", sub { |
|
|
888 | $inlay->clear; |
|
|
889 | $self->send (reject_challenge => |
|
|
890 | channel => $self->{channel}, |
|
|
891 | name => $opponent->{name}, |
|
|
892 | gametype => $info->{gametype}, |
|
|
893 | cid => $info->{cid}, |
|
|
894 | rules => $info->{rules}, |
|
|
895 | ); |
|
|
896 | }); |
|
|
897 | } |
|
|
898 | } |
|
|
899 | } |
|
|
900 | |
|
|
901 | sub draw_users { |
|
|
902 | my ($self, $inlay) = @_; |
|
|
903 | |
|
|
904 | for (sort keys %{$self->{users}}) { |
|
|
905 | $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>"); |
|
|
906 | } |
|
|
907 | } |
|
|
908 | |
|
|
909 | sub event_challenge { |
|
|
910 | my ($self, $info) = @_; |
|
|
911 | |
|
|
912 | my $as_black = $info->{black}->{name} eq $self->{conn}{name}; |
|
|
913 | my $opponent = $as_black ? $info->{white} : $info->{black}; |
|
|
914 | |
|
|
915 | my $id = $opponent->{name}; |
|
|
916 | |
|
|
917 | $self->{challenge}{$id} = $info; |
|
|
918 | $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( |
|
|
919 | exists $self->{challenge}{""} |
|
|
920 | ? "Challenge from $opponent->{name}" |
|
|
921 | : "Challenge to $opponent->{name}", |
|
|
922 | sub { |
|
|
923 | $self->{challenge}{$id}{inlay} = $_[0]; |
|
|
924 | $self->draw_challenge ($id); |
|
|
925 | }, |
|
|
926 | !exists $self->{challenge}{""} # only open when not offerer |
|
|
927 | ); |
868 | } |
928 | } |
869 | |
929 | |
870 | 1; |
930 | 1; |
871 | |
931 | |